diff --git a/.bazelrc b/.bazelrc
index 872b401b8af9..60c7b1d54ad7 100644
--- a/.bazelrc
+++ b/.bazelrc
@@ -92,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
@@ -105,20 +105,15 @@ build:remote --remote_executor=remotebuildexecution.googleapis.com
 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.
-build:remote --host_javabase=@rbe_ubuntu1604_angular//java:jdk
-build:remote --javabase=@rbe_ubuntu1604_angular//java:jdk
-build:remote --host_java_toolchain=@bazel_tools//tools/jdk:toolchain_hostjdk8
-build:remote --java_toolchain=@bazel_tools//tools/jdk:toolchain_hostjdk8
-build:remote --crosstool_top=@rbe_ubuntu1604_angular//cc:toolchain
-build:remote --action_env=BAZEL_DO_NOT_DETECT_CPP_TOOLCHAIN=1
-build:remote --extra_toolchains=@rbe_ubuntu1604_angular//config:cc-toolchain
-build:remote --extra_execution_platforms=//tools:rbe_ubuntu1604-angular
-build:remote --host_platform=//tools:rbe_ubuntu1604-angular
-build:remote --platforms=//tools:rbe_ubuntu1604-angular
-
- # Set remote caching settings
+# Setup the toolchain and platform for the remote build execution. The platform
+# is provided by the shared dev-infra package and targets k8 remote containers.
+build:remote --crosstool_top=@npm//@angular/dev-infra-private/bazel/remote-execution/cpp:cc_toolchain_suite
+build:remote --extra_toolchains=@npm//@angular/dev-infra-private/bazel/remote-execution/cpp:cc_toolchain
+build:remote --extra_execution_platforms=//tools:rbe_platform_with_network_access
+build:remote --host_platform=//tools:rbe_platform_with_network_access
+build:remote --platforms=//tools:rbe_platform_with_network_access
+
+# Set remote caching settings
 build:remote --remote_accept_cached=true
 
 # Force remote executions to consider the entire run as linux.
diff --git a/.bazelversion b/.bazelversion
index 54f6b9be19dc..fcdb2e109f68 100644
--- a/.bazelversion
+++ b/.bazelversion
@@ -1,3 +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
diff --git a/.circleci/config.yml b/.circleci/config.yml
index bcab988200a5..125a8bd7f81b 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -10,7 +10,7 @@
 version: 2.1
 
 orbs:
-  browser-tools: circleci/browser-tools@1.0.1
+  browser-tools: circleci/browser-tools@1.1.3
 
 # Variables
 
@@ -29,6 +29,8 @@ var_5: &only_release_branches
   filters:
     branches:
       only:
+        - main
+        # TODO(BRANCH_RENAME_CLEANUP): remove
         - master
         - /\d+\.\d+\.x/
 
@@ -68,6 +70,14 @@ executors:
 # Command Definitions
 # https://circleci.com/docs/2.0/reusing-config/#authoring-reusable-commands
 commands:
+  fail_fast:
+    steps:
+      - run:
+          name: 'Cancel workflow on fail'
+          when: on_fail
+          command: |
+            curl -X POST --header "Content-Type: application/json" "https://circleci.com/api/v2/workflow/${CIRCLE_WORKFLOW_ID}/cancel?circle-token=${CIRCLE_TOKEN}"
+
   custom_attach_workspace:
     description: Attach workspace at a predefined location
     steps:
@@ -97,7 +107,7 @@ commands:
             openssl aes-256-cbc -d -in .circleci/gcp_token -md md5 -k "${<< parameters.key >>}" -out /home/circleci/.gcp_credentials;
             sudo bash -c "echo -e 'build --google_credentials=/home/circleci/.gcp_credentials' >> .bazelrc.user";
             # Upload/don't upload local results to cache based on environment
-            if [[ -n "{$CIRCLE_PR_NUMBER}" ]]; then
+            if [[ -n "{$CIRCLE_PULL_REQUEST}" ]]; then
               sudo bash -c "echo -e 'build:remote --remote_upload_local_results=false\n' >> .bazelrc.user";
               echo "Not uploading local build results to remote cache.";
             else
@@ -154,11 +164,6 @@ jobs:
     steps:
       - custom_attach_workspace
       - run: yarn lint
-      - run: 'yarn bazel:format -mode=check ||
-          (echo "BUILD files not formatted. Please run ''yarn bazel:format''" ; exit 1)'
-      # Run the skylark linter to check our Bazel rules
-      - run: 'yarn bazel:lint ||
-          (echo -e "\n.bzl files have lint errors. Please run ''yarn bazel:lint-fix''"; exit 1)'
 
   validate:
     executor: action-executor
@@ -172,6 +177,15 @@ jobs:
             else
               echo "This build is not over a PR, nothing to do."
             fi
+      - run:
+          name: Validate Code Formatting
+          command: yarn -s ng-dev format changed <<pipeline.git.base_revision>> --check
+      - run:
+          name: Validate NgBot Configuration
+          command: yarn ng-dev ngbot verify
+      - run:
+          name: Validate Circular Dependencies
+          command: yarn ts-circular-deps:check
       - run:
           command: yarn -s admin validate
 
@@ -203,6 +217,7 @@ jobs:
           command: |
             mkdir /mnt/ramdisk/e2e-yarn
             node ./tests/legacy-cli/run_e2e --nb-shards=${CIRCLE_NODE_TOTAL} --shard=${CIRCLE_NODE_INDEX} <<# parameters.snapshots >>--ng-snapshots<</ parameters.snapshots >> --yarn --tmpdir=/mnt/ramdisk/e2e-yarn --glob="{tests/basic/**,tests/update/**,tests/commands/add/**}"
+      - fail_fast
 
   test-browsers:
     executor:
@@ -228,6 +243,7 @@ jobs:
       - run: node ./tests/legacy-cli/run_e2e ./tests/legacy-cli/e2e/tests/misc/browsers.ts --ve
       - run: node ./tests/legacy-cli/run_e2e ./tests/legacy-cli/e2e/tests/misc/browsers.ts
       - run: ./scripts/saucelabs/stop-tunnel.sh
+      - fail_fast
 
   build:
     executor: action-executor
@@ -246,6 +262,7 @@ jobs:
       - run:
           command: yarn bazel:test
           no_output_timeout: 20m
+      - fail_fast
 
   snapshot_publish:
     executor: action-executor
@@ -263,6 +280,7 @@ jobs:
           name: Deployment to Snapshot
           command: |
             yarn admin snapshots --verbose --githubTokenFile=${HOME}/github_token
+      - fail_fast
 
   # Windows jobs
   e2e-cli-win:
@@ -283,11 +301,12 @@ jobs:
       - run:
           name: Execute E2E Tests
           command: |
-            if (Test-Path env:CIRCLE_PR_NUMBER) {
+            if (Test-Path env:CIRCLE_PULL_REQUEST) {
               node tests\legacy-cli\run_e2e.js "--glob={tests/basic/**,tests/i18n/extract-ivy*.ts,tests/build/profile.ts}" --nb-shards=$env:CIRCLE_NODE_TOTAL --shard=$env:CIRCLE_NODE_INDEX
             } else {
               node tests\legacy-cli\run_e2e.js --nb-shards=$env:CIRCLE_NODE_TOTAL --shard=$env:CIRCLE_NODE_INDEX
             }
+      - fail_fast
 
 workflows:
   version: 2
@@ -316,18 +335,20 @@ workflows:
           name: e2e-cli-ng-snapshots
           snapshots: true
           requires:
-            - e2e-cli
+            - build
           filters:
             branches:
               only:
                 - renovate/angular
+                - main
+                # TODO(BRANCH_RENAME_CLEANUP): remove
                 - master
       - e2e-cli:
           name: e2e-cli-node-12
-          nodeversion: '12.18'
+          nodeversion: '12.20'
           <<: *only_release_branches
           requires:
-            - e2e-cli
+            - build
       - test-browsers:
           requires:
             - build
@@ -343,7 +364,7 @@ workflows:
       # Windows jobs
       - e2e-cli-win:
           requires:
-            - test
+            - build
 
       # Publish jobs
       - snapshot_publish:
@@ -352,3 +373,25 @@ workflows:
             - build
             - test
             - e2e-cli
+
+  nightly:
+    triggers:
+      - schedule:
+          cron: '0 0 * * *'
+          filters:
+            branches:
+              only:
+                - 12.2.x
+    jobs:
+      # Linux jobs
+      - setup
+      - build:
+          requires:
+            - setup
+      - e2e-cli:
+          name: e2e-cli-nightly
+          requires:
+            - build
+      - test-browsers:
+          requires:
+            - build
diff --git a/.circleci/env.sh b/.circleci/env.sh
index d24334473255..eef417500d18 100755
--- a/.circleci/env.sh
+++ b/.circleci/env.sh
@@ -22,7 +22,7 @@ setPublicVar PATH "${HOME}/.npm-global/bin:${PATH}";
 # Define SauceLabs environment variables for CircleCI.
 ####################################################################################################
 setPublicVar SAUCE_USERNAME "angular-tooling";
-setSecretVar SAUCE_ACCESS_KEY "8c4ffce86ae6-c419-8ef4-0513-54267305";
+setSecretVar SAUCE_ACCESS_KEY "e05dabf6fe0e-2c18-abf4-496d-1d010490";
 setPublicVar SAUCE_LOG_FILE /tmp/angular/sauce-connect.log
 setPublicVar SAUCE_READY_FILE /tmp/angular/sauce-connect-ready-file.lock
 setPublicVar SAUCE_PID_FILE /tmp/angular/sauce-connect-pid-file.lock
diff --git a/.eslintignore b/.eslintignore
new file mode 100644
index 000000000000..c3cc98e062af
--- /dev/null
+++ b/.eslintignore
@@ -0,0 +1,13 @@
+/bazel-out/
+/dist-schema/
+/goldens/public-api
+/packages/angular_devkit/build_angular/test/
+/packages/angular_devkit/build_webpack/test/
+/packages/angular_devkit/schematics_cli/blank/project-files/
+/packages/angular_devkit/schematics_cli/blank/schematic-files/
+/packages/angular_devkit/schematics_cli/schematic/files/
+/tests/
+.yarn/
+dist/
+node_modules/
+third_party/
\ No newline at end of file
diff --git a/.eslintrc.json b/.eslintrc.json
new file mode 100644
index 000000000000..930377419a9e
--- /dev/null
+++ b/.eslintrc.json
@@ -0,0 +1,118 @@
+{
+  "root": true,
+  "env": {
+    "es6": true,
+    "node": true
+  },
+  "extends": [
+    "eslint:recommended",
+    "plugin:import/typescript",
+    "plugin:@typescript-eslint/recommended",
+    "plugin:@typescript-eslint/recommended-requiring-type-checking",
+    "prettier"
+  ],
+  "parser": "@typescript-eslint/parser",
+  "parserOptions": {
+    "project": "tsconfig.json",
+    "sourceType": "module"
+  },
+  "plugins": ["eslint-plugin-import", "header", "@typescript-eslint"],
+  "rules": {
+    "@typescript-eslint/consistent-type-assertions": "error",
+    "@typescript-eslint/no-explicit-any": "error",
+    "@typescript-eslint/no-non-null-assertion": "error",
+    "@typescript-eslint/no-unnecessary-qualifier": "error",
+    "@typescript-eslint/no-unused-expressions": "error",
+    "curly": "error",
+    "header/header": [
+      "error",
+      "block",
+      [
+        "*",
+        " * @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",
+        " "
+      ],
+      2
+    ],
+    "import/first": "error",
+    "import/newline-after-import": "error",
+    "import/no-absolute-path": "error",
+    "import/no-duplicates": "error",
+    "import/no-extraneous-dependencies": ["off", { "devDependencies": false }],
+    "import/no-unassigned-import": ["error", { "allow": ["symbol-observable"] }],
+    "import/order": [
+      "error",
+      {
+        "alphabetize": { "order": "asc" },
+        "groups": [["builtin", "external"], "parent", "sibling", "index"]
+      }
+    ],
+    "max-len": [
+      "error",
+      {
+        "code": 140,
+        "ignoreUrls": true
+      }
+    ],
+    "max-lines-per-function": ["error", { "max": 200 }],
+    "no-caller": "error",
+    "no-console": "error",
+    "no-empty": ["error", { "allowEmptyCatch": true }],
+    "no-eval": "error",
+    "no-multiple-empty-lines": ["error"],
+    "no-throw-literal": "error",
+    "padding-line-between-statements": [
+      "error",
+      {
+        "blankLine": "always",
+        "prev": "*",
+        "next": "return"
+      }
+    ],
+    "sort-imports": ["error", { "ignoreDeclarationSort": true }],
+    "spaced-comment": [
+      "error",
+      "always",
+      {
+        "markers": ["/"]
+      }
+    ],
+
+    /* TODO: evaluate usage of these rules and fix issues as needed */
+    "no-case-declarations": "off",
+    "no-fallthrough": "off",
+    "no-underscore-dangle": "off",
+    "no-useless-escape": "off",
+    "@typescript-eslint/await-thenable": "off",
+    "@typescript-eslint/ban-types": "off",
+    "@typescript-eslint/no-empty-function": "off",
+    "@typescript-eslint/explicit-module-boundary-types": "off",
+    "@typescript-eslint/no-implied-eval": "off",
+    "@typescript-eslint/no-var-requires": "off",
+    "@typescript-eslint/no-unnecessary-type-assertion": "off",
+    "@typescript-eslint/no-unsafe-assignment": "off",
+    "@typescript-eslint/no-unsafe-call": "off",
+    "@typescript-eslint/no-unsafe-member-access": "off",
+    "@typescript-eslint/no-unsafe-return": "off",
+    "@typescript-eslint/no-unused-vars": "off",
+    "@typescript-eslint/prefer-regexp-exec": "off",
+    "@typescript-eslint/require-await": "off",
+    "@typescript-eslint/restrict-plus-operands": "off",
+    "@typescript-eslint/restrict-template-expressions": "off",
+    "@typescript-eslint/unbound-method": "off"
+  },
+  "overrides": [
+    {
+      "files": ["!packages/**", "**/*_spec.ts"],
+      "rules": {
+        "import/no-extraneous-dependencies": ["error", { "devDependencies": true }],
+        "max-lines-per-function": "off",
+        "no-console": "off"
+      }
+    }
+  ]
+}
diff --git a/.github/ISSUE_TEMPLATE/1-bug-report.md b/.github/ISSUE_TEMPLATE/1-bug-report.md
index c24ab5b7ef34..bc0cec42df0e 100644
--- a/.github/ISSUE_TEMPLATE/1-bug-report.md
+++ b/.github/ISSUE_TEMPLATE/1-bug-report.md
@@ -2,6 +2,7 @@
 name: "\U0001F41E Bug report"
 about: Report a bug in Angular CLI
 ---
+
 <!--🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅
 
 Oh hi there! 😄
@@ -11,10 +12,10 @@ Existing issues often contain information about workarounds, resolution, or prog
 
 🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅-->
 
-
 # 🐞 Bug report
 
 ### Command (mark with an `x`)
+
 <!-- Can you pin-point the command or commands that are effected by this bug? -->
 <!-- ✍️edit: -->
 
@@ -34,26 +35,24 @@ Existing issues often contain information about workarounds, resolution, or prog
 - [ ] version
 - [ ] doc
 
-
 ### Is this a regression?
 
 <!-- Did this behavior use to work in the previous version? -->
 <!-- ✍️--> Yes, the previous version in which this bug was not present was: ....
 
-
 ### Description
 
 <!-- ✍️--> A clear and concise description of the problem...
 
-
 ## 🔬 Minimal Reproduction
+
 <!--
 Simple steps to reproduce this bug.
 
 Please include: commands run (including args), packages added, related code changes.
 
-If reproduction steps are not enough for reproduction of your issue, please create a minimal GitHub repository with the reproduction of the issue. 
-A good way to make a minimal reproduction is to create a new app via `ng new repro-app` and add the minimum possible code to show the problem. 
+If reproduction steps are not enough for reproduction of your issue, please create a minimal GitHub repository with the reproduction of the issue.
+A good way to make a minimal reproduction is to create a new app via `ng new repro-app` and add the minimum possible code to show the problem.
 Share the link to the repo below along with step-by-step instructions to reproduce the problem, as well as expected and actual behavior.
 
 Issues that don't have enough info and can't be reproduced will be closed.
@@ -62,14 +61,15 @@ You can read more about issue submission guidelines here: https://github.com/ang
 -->
 
 ## 🔥 Exception or Error
+
 <pre><code>
 <!-- If the issue is accompanied by an exception or an error, please share it below: -->
 <!-- ✍️-->
 
 </code></pre>
 
-
 ## 🌍 Your Environment
+
 <pre><code>
 <!-- run `ng version` and paste output below -->
 <!-- ✍️-->
@@ -77,6 +77,7 @@ You can read more about issue submission guidelines here: https://github.com/ang
 </code></pre>
 
 **Anything else relevant?**
+
 <!-- ✍️Is this a browser specific issue? If so, please specify the browser and version. -->
 
 <!-- ✍️Do any of these matter: operating system, IDE, package manager, HTTP server, ...? If so, please mention it below. -->
diff --git a/.github/ISSUE_TEMPLATE/2-feature-request.md b/.github/ISSUE_TEMPLATE/2-feature-request.md
index 9210f5135779..f129bc107360 100644
--- a/.github/ISSUE_TEMPLATE/2-feature-request.md
+++ b/.github/ISSUE_TEMPLATE/2-feature-request.md
@@ -1,8 +1,8 @@
 ---
 name: "\U0001F680 Feature request"
 about: Suggest a feature for Angular CLI
-
 ---
+
 <!--🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅
 
 Oh hi there! 😄
@@ -12,13 +12,13 @@ Existing issues often contain information about workarounds, resolution, or prog
 
 🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅🔅-->
 
-
 # 🚀 Feature request
 
-
 ### Command (mark with an `x`)
+
 <!-- Can you pin-point the command or commands that are relevant for this feature request? -->
 <!-- ✍️edit: -->
+
 - [ ] new
 - [ ] build
 - [ ] serve
@@ -36,12 +36,13 @@ Existing issues often contain information about workarounds, resolution, or prog
 - [ ] doc
 
 ### Description
-<!-- ✍️--> A clear and concise description of the problem or missing capability...
 
+<!-- ✍️--> A clear and concise description of the problem or missing capability...
 
 ### Describe the solution you'd like
-<!-- ✍️--> If you have a solution in mind, please describe it.
 
+<!-- ✍️--> If you have a solution in mind, please describe it.
 
 ### Describe alternatives you've considered
+
 <!-- ✍️--> Have you considered any alternative solutions or workarounds?
diff --git a/.github/ISSUE_TEMPLATE/3-docs-bug.md b/.github/ISSUE_TEMPLATE/3-docs-bug.md
index 7cd9ec28753a..7270bb2a963f 100644
--- a/.github/ISSUE_TEMPLATE/3-docs-bug.md
+++ b/.github/ISSUE_TEMPLATE/3-docs-bug.md
@@ -1,7 +1,6 @@
 ---
-name: "📚 Docs or angular.io issue report"
+name: '📚 Docs or angular.io issue report'
 about: Report an issue in Angular's documentation or angular.io application
-
 ---
 
 🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑
diff --git a/.github/ISSUE_TEMPLATE/4-security-issue-disclosure.md b/.github/ISSUE_TEMPLATE/4-security-issue-disclosure.md
index 70736318d2a3..a5c2c1707fda 100644
--- a/.github/ISSUE_TEMPLATE/4-security-issue-disclosure.md
+++ b/.github/ISSUE_TEMPLATE/4-security-issue-disclosure.md
@@ -1,7 +1,6 @@
 ---
 name: ⚠️ Security issue disclosure
 about: Report a security issue in Angular Framework, Material, or CLI
-
 ---
 
 🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑
diff --git a/.github/ISSUE_TEMPLATE/5-support-request.md b/.github/ISSUE_TEMPLATE/5-support-request.md
index cdbd2e887db7..509f8d4797bc 100644
--- a/.github/ISSUE_TEMPLATE/5-support-request.md
+++ b/.github/ISSUE_TEMPLATE/5-support-request.md
@@ -1,14 +1,13 @@
 ---
-name: "❓ Support request"
+name: '❓ Support request'
 about: Questions and requests for support
-
 ---
 
 🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑
 
 Please do not file questions or support requests on the GitHub issues tracker.
 
-You can get your questions answered using other communication channels. Please see: 
+You can get your questions answered using other communication channels. Please see:
 https://github.com/angular/angular-cli/blob/master/CONTRIBUTING.md#question
 
 Thank you!
diff --git a/.github/ISSUE_TEMPLATE/6-angular-framework.md b/.github/ISSUE_TEMPLATE/6-angular-framework.md
index 8a689c55de35..8ab207b2389f 100644
--- a/.github/ISSUE_TEMPLATE/6-angular-framework.md
+++ b/.github/ISSUE_TEMPLATE/6-angular-framework.md
@@ -1,7 +1,6 @@
 ---
-name: "⚡Angular Framework"
+name: '⚡Angular Framework'
 about: Issues and feature requests for Angular Framework
-
 ---
 
 🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑
diff --git a/.github/ISSUE_TEMPLATE/7-angular-material.md b/.github/ISSUE_TEMPLATE/7-angular-material.md
index fab3fe5b67c8..10b27db5c86f 100644
--- a/.github/ISSUE_TEMPLATE/7-angular-material.md
+++ b/.github/ISSUE_TEMPLATE/7-angular-material.md
@@ -1,7 +1,6 @@
 ---
 name: "\U0001F48E Angular Material"
 about: Issues and feature requests for Angular Material
-
 ---
 
 🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑🛑
diff --git a/.github/SAVED_REPLIES.md b/.github/SAVED_REPLIES.md
index 29e19832903c..466b8ad5ee52 100644
--- a/.github/SAVED_REPLIES.md
+++ b/.github/SAVED_REPLIES.md
@@ -4,52 +4,52 @@ The following are canned responses that the Angular CLI team should use to close
 
 Since GitHub currently doesn't allow us to have a repository-wide or organization-wide list of [saved replies](https://help.github.com/articles/working-with-saved-replies/), these replies need to be maintained by individual team members. Since the responses can be modified in the future, all responses are versioned to simplify the process of keeping the responses up to date.
 
-
 ## Angular CLI: Already Fixed (v1)
+
 ```
 Thanks for reporting this issue. Luckily, it has already been fixed in one of the recent releases. Please update to the most recent version to resolve the problem.
 
 If the problem persists in your application after upgrading, please open a new issue, provide a simple repository reproducing the problem, and describe the difference between the expected and current behavior. You can use `ng new repro-app` to create a new project where you reproduce the problem.
 ```
 
-
 ## Angular CLI: Don't Understand (v1)
+
 ```
 I'm sorry, but we don't understand the problem you are reporting.
 
 If the problem persists, please open a new issue, provide a simple repository reproducing the problem, and describe the difference between the expected and current behavior. You can use `ng new repro-app` to create a new project where you reproduce the problem.
 ```
 
-
 ## Angular CLI: Duplicate (v1.1)
+
 ```
 Thanks for reporting this issue. However, this issue is a duplicate of #<ISSUE_NUMBER>. Please subscribe to that issue for future updates.
 ```
 
-
 ## Angular CLI: Insufficient Information Provided (v1)
+
 ```
 Thanks for reporting this issue. However, you didn't provide sufficient information for us to understand and reproduce the problem. Please check out [our submission guidelines](https://github.com/angular/angular-cli/blob/master/CONTRIBUTING.md#-submitting-an-issue) to understand why we can't act on issues that are lacking important information.
 
 If the problem persists, please file a new issue and ensure you provide all of the required information when filling out the issue template.
 ```
 
-
 ## Angular CLI: NPM install issue (v1)
+
 ```
 This seems like a problem with your node/npm and not with Angular CLI.
 
 Please have a look at the [fixing npm permissions page](https://docs.npmjs.com/getting-started/fixing-npm-permissions), [common errors page](https://docs.npmjs.com/troubleshooting/common-errors), [npm issue tracker](https://github.com/npm/npm/issues), or open a new issue if the problem you are experiencing isn't known.
 ```
 
-
 ## Angular CLI: Issue Outside of Angular CLI (v1.1)
+
 ```
 I'm sorry, but this issue is not caused by Angular CLI. Please contact the author(s) of the <PROJECT NAME> project or file an issue on their issue tracker.
 ```
 
-
 ## Angular CLI: Non-reproducible (v1)
+
 ```
 I'm sorry, but we can't reproduce the problem following the instructions you provided.
 Remember that we have a large number of issues to resolve, and have only a limited amount of time to reproduce your issue.
@@ -60,24 +60,24 @@ If the problem persists, please open a new issue following [our submission guide
 A good way to make a minimal repro is to create a new app via `ng new repro-app` and adding the minimum possible code to show the problem. Then you can push this repository to github and link it here.
 ```
 
-
 ## Angular CLI: Obsolete (v1)
+
 ```
 Thanks for reporting this issue. This issue is now obsolete due to changes in the recent releases. Please update to the most recent Angular CLI version.
 
 If the problem persists after upgrading, please open a new issue, provide a simple repository reproducing the problem, and describe the difference between the expected and current behavior.
 ```
 
-
 ## Angular CLI: Support Request (v1)
+
 ```
 Hello, we reviewed this issue and determined that it doesn't fall into the bug report or feature request category. This issue tracker is not suitable for support requests, please repost your issue on [StackOverflow](http://stackoverflow.com/) using tag `angular-cli`.
 
 If you are wondering why we don't resolve support issues via the issue tracker, please [check out this explanation](https://github.com/angular/angular-cli/blob/master/CONTRIBUTING.md#-got-a-question-or-problem).
 ```
 
-
 ## Angular CLI: Static Analysis errors (v1)
+
 ```
 Hello, errors like `Error encountered resolving symbol values statically` mean that there has been some problem in statically analyzing your app.
 
@@ -93,6 +93,7 @@ In that case, please open an issue in https://github.com/angular/angular.
 ```
 
 ## Angular CLI: Lockfiles (v1)
+
 ```
 I'd like to remind everyone that **you only have reproducible installs if you use a lockfile**. Both [NPM v5+](https://docs.npmjs.com/files/package-locks) and [Yarn](https://yarnpkg.com/lang/en/docs/yarn-lock/) support lockfiles. If your CI works one day but not the next and you did not change your code or `package.json`, it is likely because one of your dependencies had a bad release and you did not have a lockfile.
 
diff --git a/.github/angular-robot.yml b/.github/angular-robot.yml
index 03cda7b51d33..e4a402d300b3 100644
--- a/.github/angular-robot.yml
+++ b/.github/angular-robot.yml
@@ -7,18 +7,20 @@ merge:
     # set to true to disable
     disabled: false
     # the name of the status
-    context: "ci/angular: merge status"
+    context: 'ci/angular: merge status'
     # text to show when all checks pass
-    successText: "All checks passed!"
+    successText: 'All checks passed!'
     # text to show when some checks are failing
-    failureText: "The following checks are failing:"
+    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: "action: merge"
+  mergeLabel: 'action: merge'
 
   # list of checks that will determine if the merge label can be added
   checks:
@@ -28,39 +30,44 @@ merge:
     requireReviews: true
     # list of labels that a PR needs to have, checked with a regexp (e.g. "target:" will work for the label "target: major")
     requiredLabels:
-      - "target: *"
-      - "cla: yes"
+      - 'target: *'
+      - 'cla: yes'
 
     # list of labels that a PR shouldn't have, checked after the required labels with a regexp
     forbiddenLabels:
-      - "action: cleanup"
-      - "action: review"
-      - "PR state: blocked"
-      - "cla: no"
+      - 'action: cleanup'
+      - 'action: review'
+      - 'PR state: blocked'
+      - 'cla: no'
 
     # list of PR statuses that need to be successful
     requiredStatuses:
-      - "ci/circleci: build"
-      - "ci/circleci: setup"
-      - "ci/circleci: lint"
-      - "ci/circleci: validate"
-      - "ci/circleci: test"
-      - "ci/circleci: e2e-cli-win"
-      - "ci/circleci: e2e-cli"
-      - "ci/circleci: test-browsers"
-      - "ci/angular: size"
-      - "cla/google"
+      - 'ci/circleci: build'
+      - 'ci/circleci: setup'
+      - 'ci/circleci: lint'
+      - 'ci/circleci: validate'
+      - 'ci/circleci: test'
+      - 'ci/circleci: e2e-cli-win'
+      - 'ci/circleci: e2e-cli'
+      - 'ci/circleci: test-browsers'
+      - 'ci/angular: size'
+      - 'cla/google'
 
   # 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
@@ -71,30 +78,24 @@ triage:
   defaultMilestone: 12,
   # arrays of labels that determine if an issue has been triaged by the caretaker
   l1TriageLabels:
-    -
-      - "comp: *"
+    - - 'comp: *'
   # arrays of labels that determine if an issue has been fully triaged
   l2TriageLabels:
-    -
-      - "type: bug/fix"
-      - "severity*"
-      - "freq*"
-      - "comp: *"
-    -
-      - "type: feature"
-      - "comp: *"
-    -
-      - "type: refactor"
-      - "comp: *"
-    -
-      - "type: RFC / Discussion / question"
-      - "comp: *"
-    -
-      - "type: docs"
-      - "comp: *"
+    - - 'type: bug/fix'
+      - 'severity*'
+      - 'freq*'
+      - 'comp: *'
+    - - 'type: feature'
+      - 'comp: *'
+    - - 'type: refactor'
+      - 'comp: *'
+    - - 'type: RFC / Discussion / question'
+      - 'comp: *'
+    - - 'type: docs'
+      - 'comp: *'
 
 # Size checking
 size:
-  circleCiStatusName: "ci/circleci: e2e-cli"
+  circleCiStatusName: 'ci/circleci: e2e-cli'
   maxSizeIncrease: 10000
   comment: false
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
index 6499bb344192..cc8aa2b2c506 100644
--- a/.github/dependabot.yml
+++ b/.github/dependabot.yml
@@ -1,16 +1,16 @@
 version: 2
 
 updates:
-  - package-ecosystem: "npm"
-    directory: "/"
+  - package-ecosystem: 'npm'
+    directory: '/'
     schedule:
-      interval: "daily"
+      interval: 'daily'
     commit-message:
-      prefix: "build"
+      prefix: 'build'
     labels:
-      - "comp: build & ci"
-      - "target: patch"
-      - "action: merge"
+      - 'comp: build & ci'
+      - 'target: patch'
+      - 'action: merge'
     # Disable version updates
     # This does not affect security updates
     open-pull-requests-limit: 0
diff --git a/.github/workflows/dev-infra.yml b/.github/workflows/dev-infra.yml
new file mode 100644
index 000000000000..51fe79480f75
--- /dev/null
+++ b/.github/workflows/dev-infra.yml
@@ -0,0 +1,14 @@
+name: DevInfra
+
+on:
+  pull_request_target:
+    types: [opened, synchronize, reopened]
+
+jobs:
+  breaking-changes-label:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v2
+      - uses: angular/dev-infra/github-actions/breaking-changes-label@861dc90572784e714aeaa9dfb20ceebeb57cdb07
+        with:
+          angular-robot-key: ${{ secrets.ANGULAR_ROBOT_PRIVATE_KEY }}
diff --git a/.github/workflows/lock-closed.yml b/.github/workflows/lock-closed.yml
index b43e8601204e..c8e81beac98a 100644
--- a/.github/workflows/lock-closed.yml
+++ b/.github/workflows/lock-closed.yml
@@ -9,6 +9,6 @@ jobs:
   lock_closed:
     runs-on: ubuntu-latest
     steps:
-      - uses: angular/dev-infra/github-actions/lock-closed@0fc6f4d839e93312ed0dd9a2be88d4c11e947a0b
+      - 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 357df0969694..91652321da0e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -41,9 +41,11 @@ npm-debug.log*
 yarn-error.log*
 .ng_pkg_build/
 .ng-dev.log
+.ng-dev.err*.log
 .ng-dev.user*
 .husky/_
 .bazelrc.user
+.eslintcache
 
 # Mac OSX Finder files.
 **/.DS_Store
diff --git a/.husky/.gitignore b/.husky/.gitignore
deleted file mode 100644
index 31354ec13899..000000000000
--- a/.husky/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-_
diff --git a/.husky/pre-commit b/.husky/pre-commit
new file mode 100755
index 000000000000..84611a58eec9
--- /dev/null
+++ b/.husky/pre-commit
@@ -0,0 +1,4 @@
+#!/bin/sh
+. "$(dirname $0)/_/husky.sh"
+
+yarn -s ng-dev format staged;
\ No newline at end of file
diff --git a/.monorepo.json b/.monorepo.json
index cab101ad56e0..0cf9710d62e8 100644
--- a/.monorepo.json
+++ b/.monorepo.json
@@ -41,12 +41,9 @@
     "Angular CLI": "http://github.com/angular/angular-cli"
   },
   "packages": {
-    "@_/benchmark": {
-    },
-    "@_/builders": {
-    },
-    "devkit": {
-    },
+    "@_/benchmark": {},
+    "@_/builders": {},
+    "devkit": {},
     "@angular/cli": {
       "name": "Angular CLI",
       "section": "Tooling",
diff --git a/.ng-dev/commit-message.ts b/.ng-dev/commit-message.ts
index 06bd8eb244fc..03f02ef856ea 100644
--- a/.ng-dev/commit-message.ts
+++ b/.ng-dev/commit-message.ts
@@ -1,5 +1,9 @@
 // tslint:disable-next-line: no-implicit-dependencies
-import { COMMIT_TYPES, CommitMessageConfig, ScopeRequirement } from '@angular/dev-infra-private/commit-message/config';
+import {
+  COMMIT_TYPES,
+  CommitMessageConfig,
+  ScopeRequirement,
+} from '@angular/dev-infra-private/ng-dev/commit-message/config';
 import { packages } from '../lib/packages';
 
 /**
@@ -16,7 +20,5 @@ export const commitMessage: CommitMessageConfig = {
   maxLineLength: Infinity,
   minBodyLength: 0,
   minBodyLengthTypeExcludes: ['docs'],
-  scopes: [
-    ...Object.keys(packages),
-  ],
+  scopes: [...Object.keys(packages)],
 };
diff --git a/.ng-dev/config.ts b/.ng-dev/config.ts
index a5d99ef26f13..1727da8f3df9 100644
--- a/.ng-dev/config.ts
+++ b/.ng-dev/config.ts
@@ -1,3 +1,5 @@
 export { commitMessage } from './commit-message';
+export { format } from './format';
 export { github } from './github';
 export { merge } from './merge';
+export { release } from './release';
diff --git a/.ng-dev/format.ts b/.ng-dev/format.ts
new file mode 100644
index 000000000000..b7cf1afb190a
--- /dev/null
+++ b/.ng-dev/format.ts
@@ -0,0 +1,11 @@
+import { FormatConfig } from '@angular/dev-infra-private/ng-dev/format/config';
+
+/**
+ * Configuration for the `ng-dev format` command.
+ */
+export const format: FormatConfig = {
+  'prettier': {
+    matchers: ['**/*.{ts,js,json,yml,yaml,md}'],
+  },
+  'buildifier': true,
+};
diff --git a/.ng-dev/github.ts b/.ng-dev/github.ts
index 9d5a406aaa14..b1af287af493 100644
--- a/.ng-dev/github.ts
+++ b/.ng-dev/github.ts
@@ -1,4 +1,4 @@
-import { GithubConfig } from '@angular/dev-infra-private/utils/config';
+import { GithubConfig } from '@angular/dev-infra-private/ng-dev/utils/config';
 
 /**
  * Github configuration for the ng-dev command. This repository is
@@ -7,4 +7,5 @@ import { GithubConfig } from '@angular/dev-infra-private/utils/config';
 export const github: GithubConfig = {
   owner: 'angular',
   name: 'angular-cli',
+  mainBranchName: 'main',
 };
diff --git a/.ng-dev/merge.ts b/.ng-dev/merge.ts
index eb41a469caad..7dcdede80310 100644
--- a/.ng-dev/merge.ts
+++ b/.ng-dev/merge.ts
@@ -1,5 +1,5 @@
-import { DevInfraMergeConfig } from '@angular/dev-infra-private/pr/merge/config';
-import { getDefaultTargetLabelConfiguration } from '@angular/dev-infra-private/pr/merge/defaults';
+import { DevInfraMergeConfig } from '@angular/dev-infra-private/ng-dev/pr/merge/config';
+import { getDefaultTargetLabelConfiguration } from '@angular/dev-infra-private/ng-dev/pr/merge/defaults';
 import { github } from './github';
 import { release } from './release';
 
@@ -7,15 +7,14 @@ 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 => {
+export const merge: DevInfraMergeConfig['merge'] = async (api) => {
   return {
     githubApiMerge: {
       default: 'rebase',
-      labels: [
-        {pattern: 'squash commits', method: 'squash'},
-      ],
+      labels: [{ pattern: 'squash commits', method: 'squash' }],
     },
     claSignedLabel: 'cla: yes',
+    breakingChangeLabel: 'flag: breaking change',
     mergeReadyLabel: /^action: merge(-assistance)?/,
     caretakerNoteLabel: /(action: merge-assistance)/,
     commitMessageFixupLabel: 'commit message fixup',
diff --git a/.ng-dev/release.ts b/.ng-dev/release.ts
index 175b763add66..c6071a9313f6 100644
--- a/.ng-dev/release.ts
+++ b/.ng-dev/release.ts
@@ -1,11 +1,23 @@
-import { ReleaseConfig } from '@angular/dev-infra-private/release/config';
-import { packages } from '../lib/packages';
+import '../lib/bootstrap-local';
+
+import { ReleaseConfig } from '@angular/dev-infra-private/ng-dev/release/config';
+import { releasePackages } from '../lib/packages';
+import buildPackages from '../scripts/build';
+
+const npmPackages = Object.keys(releasePackages);
 
 /** 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 () => {},
+  npmPackages,
+  buildPackages: () => buildPackages(),
+  releaseNotes: {
+    groupOrder: [
+      '@angular/cli',
+      '@schematics/angular',
+      '@angular-devkit/architect-cli',
+      '@angular-devkit/schematics-cli',
+    ],
+  },
+  publishRegistry: 'https://wombat-dressing-room.appspot.com',
+  releasePrLabels: ['action: merge'],
 };
diff --git a/.npmrc b/.npmrc
new file mode 100644
index 000000000000..c42da845b449
--- /dev/null
+++ b/.npmrc
@@ -0,0 +1 @@
+engine-strict = true
diff --git a/.prettierignore b/.prettierignore
index fbcd212375a5..d1cd003e83c5 100644
--- a/.prettierignore
+++ b/.prettierignore
@@ -1 +1,14 @@
-/etc/api
+/bazel-out/
+/docs/design/analytics.md
+/dist-schema/
+/goldens/public-api
+/packages/angular_devkit/build_angular/test/
+/packages/angular_devkit/core/src/workspace/json/test/
+/packages/angular_devkit/schematics_cli/blank/project-files/
+/packages/angular_devkit/schematics_cli/blank/schematic-files/
+/packages/angular_devkit/schematics_cli/schematic/files/
+/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/CHANGELOG.md b/CHANGELOG.md
new file mode 100644
index 000000000000..1226ca89e070
--- /dev/null
+++ b/CHANGELOG.md
@@ -0,0 +1,9965 @@
+<a name="12.2.18"></a>
+
+# 12.2.18 (2022-07-21)
+
+### @angular-devkit/build-angular
+
+| Commit                                                                                              | Type | Description                             |
+| --------------------------------------------------------------------------------------------------- | ---- | --------------------------------------- |
+| [4d723ca95](https://github.com/angular/angular-cli/commit/4d723ca95913fd8643059d22151571f240cec998) | fix  | update terser to address CVE-2022-25858 |
+
+## Special Thanks
+
+Alan Agius, Joey Perrott and Paul Gschwendtner
+
+<!-- CHANGELOG SPLIT MARKER -->
+
+<a name="12.2.17"></a>
+
+# 12.2.17 (2022-03-31)
+
+### @angular-devkit/architect-cli
+
+| Commit                                                                                              | Type | Description                  |
+| --------------------------------------------------------------------------------------------------- | ---- | ---------------------------- |
+| [ccb0f95f3](https://github.com/angular/angular-cli/commit/ccb0f95f33ff0d23a0ff9b237d0d78fc4c864787) | fix  | update `minimist` to `1.2.6` |
+
+### @angular-devkit/schematics-cli
+
+| Commit                                                                                              | Type | Description                  |
+| --------------------------------------------------------------------------------------------------- | ---- | ---------------------------- |
+| [abcdf4df2](https://github.com/angular/angular-cli/commit/abcdf4df20c29907ee28a38842942464addcf259) | fix  | update `minimist` to `1.2.6` |
+
+### @angular-devkit/benchmark
+
+| Commit                                                                                              | Type | Description                  |
+| --------------------------------------------------------------------------------------------------- | ---- | ---------------------------- |
+| [2656a330e](https://github.com/angular/angular-cli/commit/2656a330eb365f37c3b6f8894436b4449d157e63) | fix  | update `minimist` to `1.2.6` |
+
+## Special Thanks
+
+Alan Agius
+
+<!-- CHANGELOG SPLIT MARKER -->
+
+<a name="12.2.16"></a>
+
+# 12.2.16 (2022-01-31)
+
+### @angular-devkit/build-angular
+
+| Commit                                                                                              | Type | Description                     |
+| --------------------------------------------------------------------------------------------------- | ---- | ------------------------------- |
+| [ebfdcc635](https://github.com/angular/angular-cli/commit/ebfdcc635ad700bc4696a36131203e172de6c59b) | fix  | invalid browsers version ranges |
+
+## Special Thanks
+
+Alan Agius
+
+<!-- CHANGELOG SPLIT MARKER -->
+
+<a name="12.2.15"></a>
+
+# 12.2.15 (2022-01-12)
+
+### @angular-devkit/build-angular
+
+| Commit                                                                                              | Type | Description                                         |
+| --------------------------------------------------------------------------------------------------- | ---- | --------------------------------------------------- |
+| [526115fdb](https://github.com/angular/angular-cli/commit/526115fdb7d35ff01f5dbdb6027d9f5e925e4056) | fix  | updated webpack-dev-server to latest security patch |
+
+## Special Thanks
+
+iRealNirmal
+
+<!-- CHANGELOG SPLIT MARKER -->
+
+<a name="12.2.14"></a>
+
+# 12.2.14 (2021-12-07)
+
+### @angular/cli
+
+| Commit                                                                                              | Type | Description                                                                               |
+| --------------------------------------------------------------------------------------------------- | ---- | ----------------------------------------------------------------------------------------- |
+| [30295b33e](https://github.com/angular/angular-cli/commit/30295b33ed74667f31e9d3a4a0017910a85fd734) | fix  | error when updating Angular packages across multi-major migrations                        |
+| [e07bd059e](https://github.com/angular/angular-cli/commit/e07bd059e3d6bc6b40191c036c467595ed119da7) | fix  | logic which determines which temp version of the CLI is to be download during `ng update` |
+| [ce1ec0420](https://github.com/angular/angular-cli/commit/ce1ec0420770a8e28c1c1301df9e5eb4548d4c53) | fix  | update `ng update` output for Angular packages                                            |
+| [dd9f8df52](https://github.com/angular/angular-cli/commit/dd9f8df5204d639272f183795ebd48d7994df427) | fix  | update `pacote` to `12.0.2`                                                               |
+
+## Special Thanks
+
+Alan Agius and Doug Parker
+
+<!-- CHANGELOG SPLIT MARKER -->
+
+<a name="12.2.13"></a>
+
+# 12.2.13 (2021-11-03)
+
+### @angular-devkit/build-angular
+
+| Commit                                                                                              | Type | Description                                           |
+| --------------------------------------------------------------------------------------------------- | ---- | ----------------------------------------------------- |
+| [a2bd940e4](https://github.com/angular/angular-cli/commit/a2bd940e4ab44db57b0fc69d5346d2862a19c879) | fix  | add verbose logging for differential loading and i18n |
+
+## Special Thanks
+
+Charles Lyding and Doug Parker
+
+<!-- CHANGELOG SPLIT MARKER -->
+
+<a name="12.2.12"></a>
+
+# 12.2.12 (2021-10-27)
+
+### @angular-devkit/build-angular
+
+| Commit                                                                                              | Type | Description                                                      |
+| --------------------------------------------------------------------------------------------------- | ---- | ---------------------------------------------------------------- |
+| [2decc2d26](https://github.com/angular/angular-cli/commit/2decc2d265ad32df3a7834337f82f00d723eaa74) | fix  | avoid extra filesystem access with i18n and differential loading |
+| [802b1b037](https://github.com/angular/angular-cli/commit/802b1b0378c1816dbfd8f4320b5d69e82f0c7aa6) | fix  | remove potential race condition in i18n worker execution         |
+| [cce88c2e1](https://github.com/angular/angular-cli/commit/cce88c2e1cb673434dcd495dea1df751ca9d3592) | fix  | update `critters` to version `0.0.12`                            |
+
+## Special Thanks
+
+Alan Agius, Charles Lyding and Mikhail Vasiliev
+
+<!-- CHANGELOG SPLIT MARKER -->
+
+<a name="12.2.11"></a>
+
+# 12.2.11 (2021-10-20)
+
+### @angular/cli
+
+| Commit                                                                                              | Type | Description                                              |
+| --------------------------------------------------------------------------------------------------- | ---- | -------------------------------------------------------- |
+| [e0112603c](https://github.com/angular/angular-cli/commit/e0112603c139847c649413ba95faef93d9b74bf0) | fix  | add engine field support for npm 8 and higher            |
+| [b93e63ff6](https://github.com/angular/angular-cli/commit/b93e63ff6b99ecdf4d5861feea3dd5b5adf86061) | fix  | correct grammar error in Analytics consent prompt        |
+| [008094bd1](https://github.com/angular/angular-cli/commit/008094bd1690aa73fdfd18852fd7b8b274c22e7f) | fix  | run stable migrations when package version is prerelease |
+
+### @angular-devkit/build-angular
+
+| Commit                                                                                              | Type | Description                                      |
+| --------------------------------------------------------------------------------------------------- | ---- | ------------------------------------------------ |
+| [227bf2e86](https://github.com/angular/angular-cli/commit/227bf2e86b8a6e6fe41fdbc0f77365d96d79d831) | fix  | add "Failed to compile" message                  |
+| [6173609c5](https://github.com/angular/angular-cli/commit/6173609c5b1fd27c75cee8dd9b67de9ef332ef98) | fix  | transform remapped sourcemap into a plain object |
+| [349047523](https://github.com/angular/angular-cli/commit/349047523ad0110a25d7f730cd0160b76dcfc265) | fix  | update `esbuild` to 0.13.8                       |
+| [892eeadd1](https://github.com/angular/angular-cli/commit/892eeadd11f8b702094640addc8a6f16236e5e08) | fix  | update `mini-css-extract-plugin` to 2.4.2        |
+| [8d52d9b7f](https://github.com/angular/angular-cli/commit/8d52d9b7faa44be5063905ed54b3c0d12d506af4) | fix  | use a separate worker pool for i18n inlining     |
+
+## Special Thanks
+
+Alan Agius, Charles Lyding, Extacy and Sushrit_Lawliet
+
+<!-- CHANGELOG SPLIT MARKER -->
+
+<a name="12.2.10"></a>
+
+# 12.2.10 (2021-10-13)
+
+### @angular/cli
+
+| Commit                                                                                              | Type | Description                                                     |
+| --------------------------------------------------------------------------------------------------- | ---- | --------------------------------------------------------------- |
+| [73a47af80](https://github.com/angular/angular-cli/commit/73a47af80e15a4b9d5b97956458bacafb43138bd) | fix  | accept `UA-00000-0` format in analytics `tracking` id           |
+| [d2e24d396](https://github.com/angular/angular-cli/commit/d2e24d396551ff89d6178c8bdb56db30531e1bb0) | fix  | generate new random user ID when passing empty string to `uuid` |
+
+### @schematics/angular
+
+| Commit                                                                                              | Type | Description                                         |
+| --------------------------------------------------------------------------------------------------- | ---- | --------------------------------------------------- |
+| [f6ed31fdf](https://github.com/angular/angular-cli/commit/f6ed31fdf2fe0f2a73f09c39e82e4b6bd6ccc6a6) | fix  | wrap bootstrapping code in an HMR compatible manner |
+
+### @angular-devkit/build-angular
+
+| Commit                                                                                              | Type | Description                                                 |
+| --------------------------------------------------------------------------------------------------- | ---- | ----------------------------------------------------------- |
+| [7b01a0004](https://github.com/angular/angular-cli/commit/7b01a000432810f09c7871a95c9d2e6e5f35af85) | fix  | enable custom `es2015` conditional exports                  |
+| [892567487](https://github.com/angular/angular-cli/commit/8925674870973ce58e4f5b911fd3768811248916) | fix  | improve fidelity and performance of babel loader sourcemaps |
+
+## Special Thanks
+
+Alan Agius and Charles Lyding
+
+<!-- CHANGELOG SPLIT MARKER -->
+
+<a name="12.2.9"></a>
+
+# 12.2.9 (2021-10-06)
+
+### @angular-devkit/build-angular
+
+| Commit                                                                                              | Type | Description                                          |
+| --------------------------------------------------------------------------------------------------- | ---- | ---------------------------------------------------- |
+| [9d45b7752](https://github.com/angular/angular-cli/commit/9d45b77522a9693c4876fdfd741e8869e89e0268) | fix  | add web-streams-polyfill to downlevel exclusion list |
+| [ccedf53a8](https://github.com/angular/angular-cli/commit/ccedf53a820a748b56c84528294b36c7af30dbaf) | fix  | update `esbuild` to `0.13.4`                         |
+
+## Special Thanks
+
+Alan Agius and Charles Lyding
+
+<!-- CHANGELOG SPLIT MARKER -->
+
+<a name="12.2.8"></a>
+
+# 12.2.8 (2021-10-01)
+
+### @angular-devkit/build-angular
+
+| Commit                                                                                              | Type | Description                                                   |
+| --------------------------------------------------------------------------------------------------- | ---- | ------------------------------------------------------------- |
+| [821a1b5a9](https://github.com/angular/angular-cli/commit/821a1b5a949d53f2e82f734062b711a166d42e24) | fix  | babel adjust enum plugin incorrectly transforming loose enums |
+
+## Special Thanks
+
+Paul Gschwendtner
+
+<!-- CHANGELOG SPLIT MARKER -->
+
+<a name="12.2.7"></a>
+
+# 12.2.7 (2021-09-22)
+
+### @angular-devkit/build-angular
+
+| Commit                                                                                              | Type | Description                                   |
+| --------------------------------------------------------------------------------------------------- | ---- | --------------------------------------------- |
+| [d856b4d23](https://github.com/angular/angular-cli/commit/d856b4d2369bea76ce65fc5f6d1585145ad41618) | fix  | support WASM-based esbuild optimizer fallback |
+
+## Special Thanks
+
+Alan Agius and Charles Lyding
+
+<!-- CHANGELOG SPLIT MARKER -->
+
+<a name="12.2.6"></a>
+
+# 12.2.6 (2021-09-15)
+
+### @angular/cli
+
+| Commit                                                                                              | Type | Description                                                       |
+| --------------------------------------------------------------------------------------------------- | ---- | ----------------------------------------------------------------- |
+| [8b21effad](https://github.com/angular/angular-cli/commit/8b21effad673877cf1a82ef7d0601393a65517fb) | fix  | handle `FORCE_COLOR` when stdout is not instance of `WriteStream` |
+
+### @angular-devkit/build-angular
+
+| Commit                                                                                              | Type | Description                                                       |
+| --------------------------------------------------------------------------------------------------- | ---- | ----------------------------------------------------------------- |
+| [ea60f0f52](https://github.com/angular/angular-cli/commit/ea60f0f527f2ab8fc5acc967138c4ae993946923) | fix  | handle `FORCE_COLOR` when stdout is not instance of `WriteStream` |
+
+## Special Thanks
+
+Alan Agius
+
+<!-- CHANGELOG SPLIT MARKER -->
+
+<a name="12.2.5"></a>
+
+# 12.2.5 (2021-09-08)
+
+### @angular-devkit/build-angular
+
+| Commit                                                                                              | Type | Description                                              |
+| --------------------------------------------------------------------------------------------------- | ---- | -------------------------------------------------------- |
+| [0498768c5](https://github.com/angular/angular-cli/commit/0498768c54de225a40c28fdf27bb1fc43959ba20) | fix  | disable dev-server response compression                  |
+| [367fce2e9](https://github.com/angular/angular-cli/commit/367fce2e9f9389c41f2ed5361ef6749198c49785) | fix  | improve Safari browserslist to esbuild target conversion |
+
+## Special Thanks:
+
+Alan Agius and Charles Lyding
+
+<a name="12.2.4"></a>
+
+# 12.2.4 (2021-09-01)
+
+### @angular-devkit/build-angular
+
+| Commit                                                                                              | Type | Description                                 |
+| --------------------------------------------------------------------------------------------------- | ---- | ------------------------------------------- |
+| [aaadef026](https://github.com/angular/angular-cli/commit/aaadef02698ba729ca04ccd4159bda5b6582babb) | fix  | update `esbuild` to `0.12.24`               |
+| [f8a9f4a01](https://github.com/angular/angular-cli/commit/f8a9f4a0100286b7cf656ffbe486c3424cad5172) | fix  | update `mini-css-extract-plugin` to `2.2.1` |
+
+## Special Thanks
+
+Alan Agius
+
+<a name="12.2.3"></a>
+
+# 12.2.3 (2021-08-26)
+
+### @angular-devkit/build-angular
+
+| Commit                                                                                              | Type | Description                                                    |
+| --------------------------------------------------------------------------------------------------- | ---- | -------------------------------------------------------------- |
+| [3e3321857](https://github.com/angular/angular-cli/commit/3e33218578007f93a131dc8be569e9985179098f) | fix  | RGBA converted to hex notation in component styles breaks IE11 |
+
+## Special Thanks:
+
+Alan Agius and Trevor Karjanis
+
+<a name="12.2.2"></a>
+
+# 12.2.2 (2021-08-18)
+
+### @angular-devkit/build-angular
+
+| Commit                                                                                              | Description                                                 |
+| --------------------------------------------------------------------------------------------------- | ----------------------------------------------------------- |
+| [a55118a75](https://github.com/angular/angular-cli/commit/a55118a753555c0082cfd434379559df7e3eb7f9) | fix: provide supported browsers to esbuild                  |
+| [81baa4f95](https://github.com/angular/angular-cli/commit/81baa4f956443fcc718f9021fd23ab7064d04607) | fix: update Angular peer dependencies to 12.2 stable        |
+| [297410ae8](https://github.com/angular/angular-cli/commit/297410ae860860d71905639cf38b49ff05813845) | fix: handle undefined entrypoints when marking async chunks |
+
+### @ngtools/webpack
+
+| Commit                                                                                              | Description                                          |
+| --------------------------------------------------------------------------------------------------- | ---------------------------------------------------- |
+| [b7199f366](https://github.com/angular/angular-cli/commit/b7199f366841d976b502ad5f1923e24ea2f6b302) | fix: update Angular peer dependencies to 12.2 stable |
+
+## Special Thanks:
+
+Alan Agius, Charles Lyding, Joey Perrott and Simon Primetzhofer
+
+<a name="12.2.1"></a>
+
+# 12.2.1 (2021-08-11)
+
+### @angular/cli
+
+| Commit                                                                                              | Description                                                                                                     |
+| --------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------- |
+| [8dc3c895a](https://github.com/angular/angular-cli/commit/8dc3c895a6531316e672031c8d0815781f0c089a) | fix(@angular/cli): show error when using non-TTY terminal without passing `--skip-confirmation` during `ng add` |
+
+### @angular-devkit/schematics-cli
+
+| Commit                                                                                              | Description                                                                 |
+| --------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------- |
+| [eded01270](https://github.com/angular/angular-cli/commit/eded01270f9aa70f6ba4806a068de8d1c0a52454) | fix(@angular-devkit/schematics-cli): log when in debug and/or dry run modes |
+
+### @angular-devkit/build-angular
+
+| Commit                                                                                              | Description                                                                                              |
+| --------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------------------------------- |
+| [22e0208a9](https://github.com/angular/angular-cli/commit/22e0208a9ee6257213b3bf93ac61a2c3d4ac9504) | fix(@angular-devkit/build-angular): ensure native async is downlevelled in third-party libraries         |
+| [9b4b86fb0](https://github.com/angular/angular-cli/commit/9b4b86fb0d9c88a3c714f5eabf925859bb7b71bb) | fix(@angular-devkit/build-angular): support both pure annotation forms for static properties             |
+| [cea028090](https://github.com/angular/angular-cli/commit/cea0280908db39308ac5fa37374b138ceb79ecea) | fix(@angular-devkit/build-angular): do not consume inline sourcemaps when vendor sourcemaps is disabled. |
+| [e7ec0346e](https://github.com/angular/angular-cli/commit/e7ec0346e69c090ded7d9ec6d3574deb79926db0) | fix(@angular-devkit/build-angular): avoid attempting to optimize copied JavaScript assets                |
+| [4f757c2bc](https://github.com/angular/angular-cli/commit/4f757c2bcf1356d33eaa86bc3b715c0a6b7c2ed8) | fix(@angular-devkit/build-angular): handle null maps in JavaScript optimizer worker                      |
+
+## Special Thanks:
+
+Alan Agius and Charles Lyding
+
+<a name="12.2.0"></a>
+
+# 12.2.0 (2021-08-04)
+
+### @angular/cli
+
+| Commit                                                                                              | Description                                                                                            |
+| --------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------ |
+| [259e26979](https://github.com/angular/angular-cli/commit/259e26979ebc712ee08fd36fb68a9576c1e02447) | fix(@angular/cli): merge npmrc files values                                                            |
+| [c1eddbdc9](https://github.com/angular/angular-cli/commit/c1eddbdc98631fdfff287ce566d79ed43b601e0f) | fix(@angular/cli): handle `YARN_` environment variables during `ng update` and `ng add`                |
+| [6b00d1270](https://github.com/angular/angular-cli/commit/6b00d1270acaf33f32ee68c4254ce06951ddcb8c) | fix(@angular/cli): handle NPM_CONFIG environment variables during ng update and ng add                 |
+| [88ee85c41](https://github.com/angular/angular-cli/commit/88ee85c4178e37b72001e8946b70a46ba739a0b7) | fix(@angular/cli): disable update notifier when retrieving package manager version during `ng version` |
+
+### @angular-devkit/build-angular
+
+| Commit                                                                                              | Description                                                                                                                    |
+| --------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------ |
+| [d750c686f](https://github.com/angular/angular-cli/commit/d750c686fd26f3ccfccb039027bd816a91279497) | fix(@angular-devkit/build-angular): add priority to copy-webpack-plugin patterns                                               |
+| [4bcd1dc9e](https://github.com/angular/angular-cli/commit/4bcd1dc9ee744343a465d73d51d4a062964a3714) | fix(@angular-devkit/build-angular): allow classes with pure annotated static properties to be optimized                        |
+| [ceade0c27](https://github.com/angular/angular-cli/commit/ceade0c27e4b8b0e731e6ca5128fd86cf071d029) | fix(@angular-devkit/build-angular): dasherize disable-host-check suggestion                                                    |
+| [8383c6b42](https://github.com/angular/angular-cli/commit/8383c6b421f7005a25a3bff0826048f3a24f3030) | fix(@angular-devkit/build-angular): silence Sass compiler warnings from 3rd party stylesheets                                  |
+| [07763702f](https://github.com/angular/angular-cli/commit/07763702fd244ba44aebb714a295dbf5ba72b91d) | fix(@angular-devkit/build-angular): force linker `sourceMapping` option to false.                                              |
+| [a5c69722f](https://github.com/angular/angular-cli/commit/a5c69722ffeceb72dcd46901c2bb983e5dc8bf32) | fix(@angular-devkit/build-angular): ensure `NG_PERSISTENT_BUILD_CACHE` always creates a cache in the specified cache directory |
+| [c65b04999](https://github.com/angular/angular-cli/commit/c65b049996a8de9d9fcc66631872424cbe5f13f9) | fix(@angular-devkit/build-angular): fail browser build when index generation fails                                             |
+| [3d71c63b3](https://github.com/angular/angular-cli/commit/3d71c63b3a11946ebfca3f0d97d4fbf8dca16255) | fix(@angular-devkit/build-angular): fix issue were `@media all` causing critical CSS inling to fail                            |
+| [9a04975a2](https://github.com/angular/angular-cli/commit/9a04975a2170c3ecc2c09c32bd15a89c613e198f) | fix(@angular-devkit/build-angular): `extractLicenses` didn't have an effect when using server builder                          |
+| [2ac8e9c0e](https://github.com/angular/angular-cli/commit/2ac8e9c0e131bf7fcb2c6e92500eeaa112efcefb) | fix(@angular-devkit/build-angular): display incompatibility errors                                                             |
+| [2c2b49919](https://github.com/angular/angular-cli/commit/2c2b499193fb319e1c9cb92318610353b7720e2b) | fix(@angular-devkit/build-angular): limit advanced terser passes to two                                                        |
+| [1be3b0783](https://github.com/angular/angular-cli/commit/1be3b07836659487e4aa9b8c71c673635e268a60) | fix(@angular-devkit/build-angular): exclude `outputPath` from persistent build cache key                                       |
+| [fefd6d042](https://github.com/angular/angular-cli/commit/fefd6d04213e61d3f48c0484d8c6a8dcff1ecd34) | perf(@angular-devkit/build-angular): use `esbuild` as a CSS optimizer for component styles                                     |
+| [18cfa0431](https://github.com/angular/angular-cli/commit/18cfa04317230f934ccba798c080543bb389725f) | feat(@angular-devkit/build-angular): add support to inline Adobe Fonts                                                         |
+| [9a751f0f8](https://github.com/angular/angular-cli/commit/9a751f0f81919d67f5eeeaecbe807d5c216f6a7a) | fix(@angular-devkit/build-angular): handle `ENOENT` and `ENOTDIR` errors when deleting outputs                                 |
+| [41e645792](https://github.com/angular/angular-cli/commit/41e64579213b9d4a7c976ea45daa6b32d980df10) | fix(@angular-devkit/build-angular): downlevel `for await...of` when targetting ES2018+                                         |
+| [070a13364](https://github.com/angular/angular-cli/commit/070a1336478d721bbbb474622f50fab455cda26c) | fix(@angular-devkit/build-angular): configure webpack target in common configuration                                           |
+| [da32daa75](https://github.com/angular/angular-cli/commit/da32daa75d08d4be177af5fa16088398d7fb427b) | perf(@angular-devkit/build-angular): use combination of `esbuild` and `terser` as a JavaScript optimizer                       |
+| [6a2b11906](https://github.com/angular/angular-cli/commit/6a2b11906e4173562a82b3654ff662dd05513049) | perf(@angular-devkit/build-angular): cache JavaScriptOptimizerPlugin results                                                   |
+| [ab17b1721](https://github.com/angular/angular-cli/commit/ab17b1721c05366e592cf805ad6d25e672b314bf) | fix(@angular-devkit/build-angular): handle ng-packagr errors more gracefully.                                                  |
+| [d4c5f8518](https://github.com/angular/angular-cli/commit/d4c5f8518d4801b9fd76de289a015dcbb8d8f69b) | fix(@angular-devkit/build-angular): control linker template sourcemapping via builder sourcemap options                        |
+| [06181c2fb](https://github.com/angular/angular-cli/commit/06181c2fbf5a20396b2d0e2b3925ceb1276947fb) | fix(@angular-devkit/build-angular): parse web-workers in tests when webWorkerTsConfig is defined                               |
+
+### @angular-devkit/build-webpack
+
+| Commit                                                                                              | Description                                                            |
+| --------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------- |
+| [615353022](https://github.com/angular/angular-cli/commit/61535302204a2a767f85053b7efaa6ac5ac64098) | fix(@angular-devkit/build-webpack): emit result when webpack is closed |
+
+### @ngtools/webpack
+
+| Commit                                                                                              | Description                                                                          |
+| --------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------ |
+| [dbbcf5c8c](https://github.com/angular/angular-cli/commit/dbbcf5c8c4ec4427609942f4ef7053c1b51773c9) | fix(@ngtools/webpack): only track file dependencies                                  |
+| [7536338e0](https://github.com/angular/angular-cli/commit/7536338e0becc7f9cde62becbde58e18a270cb31) | fix(@ngtools/webpack): allow generated assets of Angular component resources         |
+| [720feee34](https://github.com/angular/angular-cli/commit/720feee34f910fc11c40e2f68d919d61b7d6cbec) | fix(@ngtools/webpack): avoid non-actionable template type-checker syntax diagnostics |
+| [6a7bcf330](https://github.com/angular/angular-cli/commit/6a7bcf3300b459aef80fcf98f2475c977f6244dc) | fix(@ngtools/webpack): encode component style data                                   |
+| [12c14b565](https://github.com/angular/angular-cli/commit/12c14b56537d65d6986e245ab1ae4dd9aa8dd378) | fix(@ngtools/webpack): remove no longer needed component styles workaround           |
+
+### @schematics/angular
+
+| Commit                                                                                              | Description                                                                                         |
+| --------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------- |
+| [20fd33f6d](https://github.com/angular/angular-cli/commit/20fd33f6d4ce6cef1feb508a0221222e83a85630) | feat(@schematics/angular): destroy test module after every test                                     |
+| [5b10d4f54](https://github.com/angular/angular-cli/commit/5b10d4f549ebc12645ad08cba8ab7b91eaa87d28) | fix(@schematics/angular): remove unsafe any usage in application spec file                          |
+| [1b5e18e7b](https://github.com/angular/angular-cli/commit/1b5e18e7b401efb7ec73d99c4d77d9b29e956724) | fix(@schematics/angular): replace interactive `div` with `button` in application component template |
+| [0907b6941](https://github.com/angular/angular-cli/commit/0907b694174d6d684d965baf6cd37b87f49742e8) | fix(@schematics/angular): use stricter semver for `karma-jasmine-html-reporter`                     |
+| [8ad1539c5](https://github.com/angular/angular-cli/commit/8ad1539c5e73bad30eb6eb340379d64db208098c) | fix(@schematics/angular): add 'none' value for the 'style' option of the component schematic        |
+| [e5ba29c7d](https://github.com/angular/angular-cli/commit/e5ba29c7d54cbd83057cf23a21119ea5a3146993) | fix(@schematics/angular): display warning during migrations when using third-party builders         |
+| [a44dc02fe](https://github.com/angular/angular-cli/commit/a44dc02feecaf8735f2dc6128a5b6cc5666b4434) | fix(@schematics/angular): add devtools to ng new                                                    |
+
+## Special Thanks:
+
+Alan Agius, Charles Lyding, David Scourfield, Doug Parker, hien-pham, Joey Perrott, LeonEck, Mike
+Jancar, twerske, Vaibhav Singh and originalfrostig
+
+<a name="12.2.0-rc.0"></a>
+
+# 12.2.0-rc.0 (2021-07-28)
+
+### @angular/cli
+
+| Commit                                                                                              | Description                                 |
+| --------------------------------------------------------------------------------------------------- | ------------------------------------------- |
+| [259e26979](https://github.com/angular/angular-cli/commit/259e26979ebc712ee08fd36fb68a9576c1e02447) | fix(@angular/cli): merge npmrc files values |
+
+### @angular-devkit/build-angular
+
+| Commit                                                                                              | Description                                                                      |
+| --------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------- |
+| [d750c686f](https://github.com/angular/angular-cli/commit/d750c686fd26f3ccfccb039027bd816a91279497) | fix(@angular-devkit/build-angular): add priority to copy-webpack-plugin patterns |
+
+### @angular-devkit/build-webpack
+
+| Commit                                                                                              | Description                                                            |
+| --------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------- |
+| [615353022](https://github.com/angular/angular-cli/commit/61535302204a2a767f85053b7efaa6ac5ac64098) | fix(@angular-devkit/build-webpack): emit result when webpack is closed |
+
+## Special Thanks:
+
+Alan Agius, Charles Lyding, Joey Perrott and originalfrostig
+
+<a name="12.1.4"></a>
+
+# 12.1.4 (2021-07-28)
+
+### @angular/cli
+
+| Commit                                                                                              | Description                                 |
+| --------------------------------------------------------------------------------------------------- | ------------------------------------------- |
+| [e02c97dd0](https://github.com/angular/angular-cli/commit/e02c97dd09399443438b32cf1ad47fa0f7011df3) | fix(@angular/cli): merge npmrc files values |
+
+### @schematics/angular
+
+| Commit                                                                                              | Description                                                                          |
+| --------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------ |
+| [cfc267426](https://github.com/angular/angular-cli/commit/cfc267426716e9ecf0c9833720cb35298284f699) | fix(@schematics/angular): ensure valid SemVer range for new project Angular packages |
+
+### @angular-devkit/build-angular
+
+| Commit                                                                                              | Description                                                                      |
+| --------------------------------------------------------------------------------------------------- | -------------------------------------------------------------------------------- |
+| [55c0bddc8](https://github.com/angular/angular-cli/commit/55c0bddc8b2425309f00733eca96c06f60f867d5) | fix(@angular-devkit/build-angular): add priority to copy-webpack-plugin patterns |
+
+### @angular-devkit/build-webpack
+
+| Commit                                                                                              | Description                                                            |
+| --------------------------------------------------------------------------------------------------- | ---------------------------------------------------------------------- |
+| [b3736a3c0](https://github.com/angular/angular-cli/commit/b3736a3c09f39f5ee5dc12d98535fe4b6803ea3b) | fix(@angular-devkit/build-webpack): emit result when webpack is closed |
+
+## Special Thanks:
+
+Alan Agius, Charles Lyding, Joey Perrott and originalfrostig
+
+<a name="12.2.0-next.3"></a>
+
+# 12.2.0-next.3 (2021-07-21)
+
+### @angular/cli
+
+| Commit                                                                                              | Description                                                                             |
+| --------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------- |
+| [c1eddbdc9](https://github.com/angular/angular-cli/commit/c1eddbdc98631fdfff287ce566d79ed43b601e0f) | fix(@angular/cli): handle `YARN_` environment variables during `ng update` and `ng add` |
+| [6b00d1270](https://github.com/angular/angular-cli/commit/6b00d1270acaf33f32ee68c4254ce06951ddcb8c) | fix(@angular/cli): handle NPM_CONFIG environment variables during ng update and ng add  |
+
+### @angular-devkit/build-angular
+
+| Commit                                                                                              | Description                                                                                             |
+| --------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------- |
+| [4bcd1dc9e](https://github.com/angular/angular-cli/commit/4bcd1dc9ee744343a465d73d51d4a062964a3714) | fix(@angular-devkit/build-angular): allow classes with pure annotated static properties to be optimized |
+| [ceade0c27](https://github.com/angular/angular-cli/commit/ceade0c27e4b8b0e731e6ca5128fd86cf071d029) | fix(@angular-devkit/build-angular): dasherize disable-host-check suggestion                             |
+
+## Special Thanks:
+
+Alan Agius, Charles Lyding, Joey Perrott, LeonEck and Mike Jancar
+
+<a name="12.1.3"></a>
+
+# 12.1.3 (2021-07-21)
+
+### @angular/cli
+
+| Commit                                                                                              | Description                                                                             |
+| --------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------- |
+| [eaa2378b6](https://github.com/angular/angular-cli/commit/eaa2378b6bc69a2485cce742ef95b0b94ae994c6) | fix(@angular/cli): handle `YARN_` environment variables during `ng update` and `ng add` |
+| [4b9a41bde](https://github.com/angular/angular-cli/commit/4b9a41bdedcdc4e115e8956d31126c5bf6f442ca) | fix(@angular/cli): handle NPM_CONFIG environment variables during ng update and ng add  |
+
+### @angular-devkit/build-angular
+
+| Commit                                                                                              | Description                                                                                             |
+| --------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------- |
+| [04e9ffe4f](https://github.com/angular/angular-cli/commit/04e9ffe4f6b262ce5ef630310bed318e1466d238) | fix(@angular-devkit/build-angular): allow classes with pure annotated static properties to be optimized |
+| [6ae17e265](https://github.com/angular/angular-cli/commit/6ae17e26547a0174f7a8910c514016db60fe4c7a) | fix(@angular-devkit/build-angular): dasherize disable-host-check suggestion                             |
+
+## Special Thanks:
+
+Alan Agius, Charles Lyding, Joey Perrott, LeonEck and Mike Jancar
+
+<a name="v12.2.0-next.2"></a>
+
+# v12.2.0-next.2 (2021-07-14)
+
+# Commits
+
+<table>
+<tbody>
+
+<tr><td colspan=3><h3>@angular-devkit/build-angular (12.2.0-next.2)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/8383c6b421f7005a25a3bff0826048f3a24f3030"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/8383c6b-fix-green.svg" />
+</a>
+  </td>
+
+  <td>silence Sass compiler warnings from 3rd party stylesheets</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/21235">
+  [Closes #21235]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/07763702fd244ba44aebb714a295dbf5ba72b91d"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/0776370-fix-green.svg" />
+</a>
+  </td>
+
+  <td>force linker `sourceMapping` option to false.</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/21271">
+  [Closes #21271]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/a5c69722ffeceb72dcd46901c2bb983e5dc8bf32"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/a5c6972-fix-green.svg" />
+</a>
+  </td>
+
+  <td>ensure `NG_PERSISTENT_BUILD_CACHE` always creates a cache in the specified cache directory</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/c65b049996a8de9d9fcc66631872424cbe5f13f9"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/c65b049-fix-green.svg" />
+</a>
+  </td>
+
+  <td>fail browser build when index generation fails</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/3d71c63b3a11946ebfca3f0d97d4fbf8dca16255"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/3d71c63-fix-green.svg" />
+</a>
+  </td>
+
+  <td>fix issue were `@media all` causing critical CSS inling to fail</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/20804">
+  [Closes #20804]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/9a04975a2170c3ecc2c09c32bd15a89c613e198f"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/9a04975-fix-green.svg" />
+</a>
+  </td>
+
+  <td>`extractLicenses` didn't have an effect when using server builder</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/2ac8e9c0e131bf7fcb2c6e92500eeaa112efcefb"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/2ac8e9c-fix-green.svg" />
+</a>
+  </td>
+
+  <td>display incompatibility errors</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/21322">
+  [Closes #21322]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/2c2b499193fb319e1c9cb92318610353b7720e2b"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/2c2b499-fix-green.svg" />
+</a>
+  </td>
+
+  <td>limit advanced terser passes to two</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/1be3b07836659487e4aa9b8c71c673635e268a60"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/1be3b07-fix-green.svg" />
+</a>
+  </td>
+
+  <td>exclude `outputPath` from persistent build cache key</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/21275">
+  [Closes #21275]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/fefd6d04213e61d3f48c0484d8c6a8dcff1ecd34"><img
+   align="top"
+   title="Performance Improvement" src="https://img.shields.io/badge/fefd6d0-perf-orange.svg" />
+</a>
+  </td>
+
+  <td>use `esbuild` as a CSS optimizer for component styles</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr><td colspan=3><h3>@ngtools/webpack (12.2.0-next.2)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/dbbcf5c8c4ec4427609942f4ef7053c1b51773c9"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/dbbcf5c-fix-green.svg" />
+</a>
+  </td>
+
+  <td>only track file dependencies</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/21228">
+  [Closes #21228]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/7536338e0becc7f9cde62becbde58e18a270cb31"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/7536338-fix-green.svg" />
+</a>
+  </td>
+
+  <td>allow generated assets of Angular component resources</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/720feee34f910fc11c40e2f68d919d61b7d6cbec"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/720feee-fix-green.svg" />
+</a>
+  </td>
+
+  <td>avoid non-actionable template type-checker syntax diagnostics</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr></tr>
+
+<tr><td colspan=3><h3>@schematics/angular (12.2.0-next.2)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/20fd33f6d4ce6cef1feb508a0221222e83a85630"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/20fd33f-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>destroy test module after every test</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/21280">
+  [Closes #21280]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/5b10d4f549ebc12645ad08cba8ab7b91eaa87d28"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/5b10d4f-fix-green.svg" />
+</a>
+  </td>
+
+  <td>remove unsafe any usage in application spec file</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/1b5e18e7b401efb7ec73d99c4d77d9b29e956724"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/1b5e18e-fix-green.svg" />
+</a>
+  </td>
+
+  <td>replace interactive `div` with `button` in application component template</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/0907b694174d6d684d965baf6cd37b87f49742e8"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/0907b69-fix-green.svg" />
+</a>
+  </td>
+
+  <td>use stricter semver for `karma-jasmine-html-reporter`</td>
+
+  <td>
+  </td>
+</tr>
+
+</tbody>
+</table>
+
+---
+
+---
+
+# Special Thanks
+
+Alan Agius, Charles Lyding, Joey Perrott
+
+<a name="v12.1.2"></a>
+
+# v12.1.2 (2021-07-14)
+
+# Commits
+
+<table>
+<tbody>
+
+<tr><td colspan=3><h3>@angular-devkit/build-angular (12.1.2)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/9d48d69aa851eaca3d491495b8d33d155780fa0d"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/9d48d69-fix-green.svg" />
+</a>
+  </td>
+
+  <td>silence Sass compiler warnings from 3rd party stylesheets</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/21235">
+  [Closes #21235]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/9abf44d354efc3c29f53bf167cd18939a310867b"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/9abf44d-fix-green.svg" />
+</a>
+  </td>
+
+  <td>ensure `NG_PERSISTENT_BUILD_CACHE` always creates a cache in the specified cache directory</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/159dc5f9270f4e4a4942dd3eb53198c6b9cd9a6b"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/159dc5f-fix-green.svg" />
+</a>
+  </td>
+
+  <td>force linker `sourceMapping` option to false.</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/21271">
+  [Closes #21271]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/7cad85dad15a60310d23dc216d8ebe3b7eea594f"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/7cad85d-fix-green.svg" />
+</a>
+  </td>
+
+  <td>fail browser build when index generation fails</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/08c317d1630bd81aaafc3552f753324d7751e39d"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/08c317d-fix-green.svg" />
+</a>
+  </td>
+
+  <td>`extractLicenses` didn't have an effect when using server builder</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/c21f6505e3026efaf277aabf5f6878ae3d185c1e"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/c21f650-fix-green.svg" />
+</a>
+  </td>
+
+  <td>fix issue were `@media all` causing critical CSS inling to fail</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/20804">
+  [Closes #20804]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/f3b2dc46e91e8cb97cc2f5aef32b701cd527c589"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/f3b2dc4-fix-green.svg" />
+</a>
+  </td>
+
+  <td>display incompatibility errors</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/21322">
+  [Closes #21322]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/5219c050438aff0806b2da813ef74cd9fff2c2f5"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/5219c05-fix-green.svg" />
+</a>
+  </td>
+
+  <td>exclude `outputPath` from persistent build cache key</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/21275">
+  [Closes #21275]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr><td colspan=3><h3>@ngtools/webpack (12.1.2)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/736a5f89deaca85f487b78aec9ff66d4118ceb6a"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/736a5f8-fix-green.svg" />
+</a>
+  </td>
+
+  <td>only track file dependencies</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/21228">
+  [Closes #21228]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/e1074eb4a54f4140d0e3cffd6dd30e2efe7c18e2"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/e1074eb-fix-green.svg" />
+</a>
+  </td>
+
+  <td>allow generated assets of Angular component resources</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/30638d4525b8dc260cb11488088aa7393083227a"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/30638d4-fix-green.svg" />
+</a>
+  </td>
+
+  <td>avoid non-actionable template type-checker syntax diagnostics</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr></tr>
+
+<tr><td colspan=3><h3>@schematics/angular (12.1.2)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/09ec1f48d67fa7772df8cd86345a01ed5cf6493c"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/09ec1f4-fix-green.svg" />
+</a>
+  </td>
+
+  <td>remove unsafe any usage in application spec file</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/191dc498521b43d944f5871f1fc8a3dcf80dfaa1"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/191dc49-fix-green.svg" />
+</a>
+  </td>
+
+  <td>replace interactive `div` with `button` in application component template</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/a729381c039771eb17ca8aefc010b4d13ec17285"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/a729381-fix-green.svg" />
+</a>
+  </td>
+
+  <td>use stricter semver for `karma-jasmine-html-reporter`</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr></tr>
+
+</tbody>
+</table>
+
+---
+
+---
+
+# Special Thanks
+
+Alan Agius, Charles Lyding, Joey Perrott, Terence D. Honles
+
+<a name="v12.1.1"></a>
+
+# v12.1.1 (2021-07-01)
+
+# Commits
+
+<table>
+<tbody>
+
+<tr><td colspan=3><h3>@angular-devkit/build-angular (12.1.1)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/8e52c9c56ddbc9c627508fd41c5b3693b7515197"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/8e52c9c-fix-green.svg" />
+</a>
+  </td>
+
+  <td>handle `ENOENT` and `ENOTDIR` errors when deleting outputs</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/21202">
+  [Closes #21202]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/dd60228974a75b3c6b2ae98521444f0354161240"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/dd60228-fix-green.svg" />
+</a>
+  </td>
+
+  <td>downlevel `for await...of` when targetting ES2018+</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/21196">
+  [Closes #21196]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/2039d6201fa91136a0815f0622787dcccedf0e65"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/2039d62-fix-green.svg" />
+</a>
+  </td>
+
+  <td>configure webpack target in common configuration</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/21239">
+  [Closes #21239]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/49f5755db27f5860c3c71aef2ae532a719f9aa3b"><img
+   align="top"
+   title="Performance Improvement" src="https://img.shields.io/badge/49f5755-perf-orange.svg" />
+</a>
+  </td>
+
+  <td>update `mini-css-extract-plugin` to `1.6.2`</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/2105677a468f95bf9097a37cadd8041865a85658"><img
+   align="top"
+   title="Performance Improvement" src="https://img.shields.io/badge/2105677-perf-orange.svg" />
+</a>
+  </td>
+
+  <td>update `webpack` to `5.41.1`</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr></tr>
+
+<tr><td colspan=3><h3>@angular/cli (12.1.1)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/e2375c9de8845ba16d3ec22e83922d9138d6f265"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/e2375c9-fix-green.svg" />
+</a>
+  </td>
+
+  <td>disable update notifier when retrieving package manager version during `ng version`</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/21172">
+  [Closes #21172]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr></tr>
+
+<tr><td colspan=3><h3>@ngtools/webpack (12.1.1)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/81c7cf232d34e6664edfbe340e6d620d55b4965a"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/81c7cf2-fix-green.svg" />
+</a>
+  </td>
+
+  <td>encode component style data</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/21236">
+  [Closes #21236]<br />
+</a>
+
+  </td>
+</tr>
+
+</tbody>
+</table>
+
+---
+
+---
+
+# Special Thanks
+
+Alan Agius, Charles Lyding, Doug Parker
+<a name="v12.2.0-next.1"></a>
+
+# v12.2.0-next.1 (2021-07-01)
+
+# Commits
+
+<table>
+<tbody>
+
+<tr><td colspan=3><h3>@angular-devkit/build-angular (12.2.0-next.1)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/18cfa04317230f934ccba798c080543bb389725f"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/18cfa04-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>add support to inline Adobe Fonts</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/21186">
+  [Closes #21186]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/9a751f0f81919d67f5eeeaecbe807d5c216f6a7a"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/9a751f0-fix-green.svg" />
+</a>
+  </td>
+
+  <td>handle `ENOENT` and `ENOTDIR` errors when deleting outputs</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/21202">
+  [Closes #21202]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/41e64579213b9d4a7c976ea45daa6b32d980df10"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/41e6457-fix-green.svg" />
+</a>
+  </td>
+
+  <td>downlevel `for await...of` when targetting ES2018+</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/21196">
+  [Closes #21196]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/070a1336478d721bbbb474622f50fab455cda26c"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/070a133-fix-green.svg" />
+</a>
+  </td>
+
+  <td>configure webpack target in common configuration</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/21239">
+  [Closes #21239]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/da32daa75d08d4be177af5fa16088398d7fb427b"><img
+   align="top"
+   title="Performance Improvement" src="https://img.shields.io/badge/da32daa-perf-orange.svg" />
+</a>
+  </td>
+
+  <td>use combination of `esbuild` and `terser` as a JavaScript optimizer</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/6a2b11906e4173562a82b3654ff662dd05513049"><img
+   align="top"
+   title="Performance Improvement" src="https://img.shields.io/badge/6a2b119-perf-orange.svg" />
+</a>
+  </td>
+
+  <td>cache JavaScriptOptimizerPlugin results</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr><td colspan=3><h3>@angular/cli (12.2.0-next.1)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/88ee85c4178e37b72001e8946b70a46ba739a0b7"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/88ee85c-fix-green.svg" />
+</a>
+  </td>
+
+  <td>disable update notifier when retrieving package manager version during `ng version`</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/21172">
+  [Closes #21172]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr></tr>
+
+<tr><td colspan=3><h3>@ngtools/webpack (12.2.0-next.1)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/6a7bcf3300b459aef80fcf98f2475c977f6244dc"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/6a7bcf3-fix-green.svg" />
+</a>
+  </td>
+
+  <td>encode component style data</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/21236">
+  [Closes #21236]<br />
+</a>
+
+  </td>
+</tr>
+
+</tbody>
+</table>
+
+---
+
+---
+
+# Special Thanks
+
+Alan Agius, Charles Lyding, Doug Parker
+<a name="v12.2.0-next.0"></a>
+
+# v12.2.0-next.0 (2021-06-24)
+
+# Commits
+
+<table>
+<tbody>
+
+<tr><td colspan=3><h3>@angular-devkit/build-angular (12.1.0)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/ab17b1721c05366e592cf805ad6d25e672b314bf"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/ab17b17-fix-green.svg" />
+</a>
+  </td>
+
+  <td>handle ng-packagr errors more gracefully.</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/d4c5f8518d4801b9fd76de289a015dcbb8d8f69b"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/d4c5f85-fix-green.svg" />
+</a>
+  </td>
+
+  <td>control linker template sourcemapping via builder sourcemap options</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/06181c2fbf5a20396b2d0e2b3925ceb1276947fb"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/06181c2-fix-green.svg" />
+</a>
+  </td>
+
+  <td>parse web-workers in tests when webWorkerTsConfig is defined</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr></tr>
+
+<tr><td colspan=3><h3>@ngtools/webpack (12.1.0)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/12c14b56537d65d6986e245ab1ae4dd9aa8dd378"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/12c14b5-fix-green.svg" />
+</a>
+  </td>
+
+  <td>remove no longer needed component styles workaround</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr></tr>
+
+<tr><td colspan=3><h3>@schematics/angular (12.1.0)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/8ad1539c5e73bad30eb6eb340379d64db208098c"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/8ad1539-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>add 'none' value for the 'style' option of the component schematic</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/e5ba29c7d54cbd83057cf23a21119ea5a3146993"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/e5ba29c-fix-green.svg" />
+</a>
+  </td>
+
+  <td>display warning during migrations when using third-party builders</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/a44dc02feecaf8735f2dc6128a5b6cc5666b4434"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/a44dc02-fix-green.svg" />
+</a>
+  </td>
+
+  <td>add devtools to ng new</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr></tr>
+
+</tbody>
+</table>
+
+---
+
+---
+
+# Special Thanks
+
+Alan Agius, Charles Lyding, Doug Parker, Vaibhav Singh, Joey Perrott, twerske, David Scourfield, hien-pham
+<a name="v12.1.0"></a>
+
+# v12.1.0 (2021-06-24)
+
+# Commits
+
+<table>
+<tbody>
+
+<tr><td colspan=3><h3>@angular-devkit/build-angular (12.1.0)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/c146e9c086025e49dd207e039dc738a143e5672e"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/c146e9c-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>enable webpack Trusted Types support</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/fb21c4a968c8b4d8a3d17237d0864b795fffba49"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/fb21c4a-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>deprecate protractor builder</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/b35ef57b0f6e3b437ae81d475fb932adc212f939"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/b35ef57-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>suppport using TypeScript 4.3</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/79c5284892f79de6dfb54b5433a5fa5f6e0cb044"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/79c5284-fix-green.svg" />
+</a>
+  </td>
+
+  <td>revert open to 8.0.2</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/20807">
+  [Closes #20807]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/92c9be44fa4510ab6eccd0dfde82696d70412b39"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/92c9be4-fix-green.svg" />
+</a>
+  </td>
+
+  <td>correctly ignore inline styles during i18n extraction</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/0fe6cfef644211e21f71e7166dd017f9e07ab2e2"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/0fe6cfe-fix-green.svg" />
+</a>
+  </td>
+
+  <td>use the name as chunk filename instead of id</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/ab17b1721c05366e592cf805ad6d25e672b314bf"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/ab17b17-fix-green.svg" />
+</a>
+  </td>
+
+  <td>handle ng-packagr errors more gracefully.</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/d4c5f8518d4801b9fd76de289a015dcbb8d8f69b"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/d4c5f85-fix-green.svg" />
+</a>
+  </td>
+
+  <td>control linker template sourcemapping via builder sourcemap options</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/06181c2fbf5a20396b2d0e2b3925ceb1276947fb"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/06181c2-fix-green.svg" />
+</a>
+  </td>
+
+  <td>parse web-workers in tests when webWorkerTsConfig is defined</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/0ebf7569f6506a673996dc2f8a7edcc4cbc61d81"><img
+   align="top"
+   title="Performance Improvement" src="https://img.shields.io/badge/0ebf756-perf-orange.svg" />
+</a>
+  </td>
+
+  <td>use CSS optimization plugin that leverages workers</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/f90a8324b46bd96e87a7b889a74aab432a391015"><img
+   align="top"
+   title="Performance Improvement" src="https://img.shields.io/badge/f90a832-perf-orange.svg" />
+</a>
+  </td>
+
+  <td>enable opt-in usage of file system cache</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr></tr>
+
+<tr><td colspan=3><h3>@angular/cli (12.1.0)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/57640bebfd0de417456db6c5d3cead45d528c055"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/57640be-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>show Node.js version support status in version command</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/20879">
+  [Closes #20879]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/77c96f8b2ae219bf69dc9d5278cff39dc981c680"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/77c96f8-fix-green.svg" />
+</a>
+  </td>
+
+  <td>handle unscoped authentication details in `.npmrc` files</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/e9717e58120dc1c91ddb228a8f6d25b94e7401bf"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/e9717e5-fix-green.svg" />
+</a>
+  </td>
+
+  <td>don't resolve `.npmrc` from parent directories</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr></tr>
+
+<tr><td colspan=3><h3>@ngtools/webpack (12.1.0)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/76308fecaa510bebaa869d250ca2102175e1dfd1"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/76308fe-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>support using TypeScript 4.3</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/f9657bc919a223e449d2dd559347eed85b1f8919"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/f9657bc-fix-green.svg" />
+</a>
+  </td>
+
+  <td>remove redundant inline style cache</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/0c2a862db00ccfe3d309c34b3788001c719aa21d"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/0c2a862-fix-green.svg" />
+</a>
+  </td>
+
+  <td>ensure plugin provided Webpack instance is used</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/f2f15c089361bb55a809563c55a327887a401d43"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/f2f15c0-fix-green.svg" />
+</a>
+  </td>
+
+  <td>disable caching for ngcc synchronous Webpack resolver</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/12c14b56537d65d6986e245ab1ae4dd9aa8dd378"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/12c14b5-fix-green.svg" />
+</a>
+  </td>
+
+  <td>remove no longer needed component styles workaround</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr></tr>
+
+<tr><td colspan=3><h3>@schematics/angular (12.1.0)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/4251343aee405275ab3e5d8e3be85cab79047f43"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/4251343-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>create new projects with TypeScript 4.3</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/c9f531d70398babba1b1eb96a38dea1068c10f0a"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/c9f531d-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>add migration to replace deprecated `--prod`</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/21036">
+  [Closes #21036]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/8ad1539c5e73bad30eb6eb340379d64db208098c"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/8ad1539-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>add 'none' value for the 'style' option of the component schematic</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/e5ba29c7d54cbd83057cf23a21119ea5a3146993"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/e5ba29c-fix-green.svg" />
+</a>
+  </td>
+
+  <td>display warning during migrations when using third-party builders</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/a44dc02feecaf8735f2dc6128a5b6cc5666b4434"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/a44dc02-fix-green.svg" />
+</a>
+  </td>
+
+  <td>add devtools to ng new</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr></tr>
+
+</tbody>
+</table>
+
+---
+
+---
+
+# Special Thanks
+
+Alan Agius, Charles Lyding, Doug Parker, Joey Perrott, Bjarki, Vaibhav Singh, twerske, David Scourfield, hien-pham, Alberto Calvo, Paul Gschwendtner, Keen Yee Liau
+<a name="v12.1.0-next.6"></a>
+
+# v12.1.0-next.6 (2021-06-17)
+
+# Commits
+
+<table>
+<tbody>
+
+<tr><td colspan=3><h3>@angular-devkit/build-angular (12.1.0-next.6)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/071c8d10ce347a8acb40833ef0b2480986625ab5"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/071c8d1-fix-green.svg" />
+</a>
+  </td>
+
+  <td>don't parse `new Worker` syntax when `webWorkerTsConfig` is not defined in karma builder</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/21108">
+  [Closes #21108]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/83602515faa1f50dbc250f4eb59886984310c490"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/8360251-fix-green.svg" />
+</a>
+  </td>
+
+  <td>explicitly set compilation target in test configuration</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/21111">
+  [Closes #21111]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/0fe6cfef644211e21f71e7166dd017f9e07ab2e2"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/0fe6cfe-fix-green.svg" />
+</a>
+  </td>
+
+  <td>use the name as chunk filename instead of id</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/f90a8324b46bd96e87a7b889a74aab432a391015"><img
+   align="top"
+   title="Performance Improvement" src="https://img.shields.io/badge/f90a832-perf-orange.svg" />
+</a>
+  </td>
+
+  <td>enable opt-in usage of file system cache</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr><td colspan=3><h3>@angular/cli (12.1.0-next.6)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/77c96f8b2ae219bf69dc9d5278cff39dc981c680"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/77c96f8-fix-green.svg" />
+</a>
+  </td>
+
+  <td>handle unscoped authentication details in `.npmrc` files</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/e9717e58120dc1c91ddb228a8f6d25b94e7401bf"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/e9717e5-fix-green.svg" />
+</a>
+  </td>
+
+  <td>don't resolve `.npmrc` from parent directories</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr><td colspan=3><h3>@schematics/angular (12.1.0-next.6)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/c9f531d70398babba1b1eb96a38dea1068c10f0a"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/c9f531d-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>add migration to replace deprecated `--prod`</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/21036">
+  [Closes #21036]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr></tr>
+
+</tbody>
+</table>
+
+---
+
+---
+
+# Special Thanks
+
+Alan Agius, Joey Perrott, Alberto Calvo, Charles Lyding
+<a name="v12.0.5"></a>
+
+# v12.0.5 (2021-06-17)
+
+# Commits
+
+<table>
+<tbody>
+
+<tr><td colspan=3><h3>@angular-devkit/build-angular (12.0.5)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/427c4223488be5564de13c13d4daca85a83a9ad6"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/427c422-fix-green.svg" />
+</a>
+  </td>
+
+  <td>don't parse `new Worker` syntax when `webWorkerTsConfig` is not defined in karma builder</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/21108">
+  [Closes #21108]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/f2ce053885a718f7a040e2ff66deef1fe9042cea"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/f2ce053-fix-green.svg" />
+</a>
+  </td>
+
+  <td>explicitly set compilation target in test configuration</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/21111">
+  [Closes #21111]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr><td colspan=3><h3>@angular/cli (12.0.5)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/911b5e4d9cea185dcfb9afd3ce73bf1f258556bc"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/911b5e4-fix-green.svg" />
+</a>
+  </td>
+
+  <td>handle unscoped authentication details in .npmrc files</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr></tr>
+
+</tbody>
+</table>
+
+---
+
+---
+
+# Special Thanks
+
+Alan Agius, Joey Perrott
+
+<a name="v12.1.0-next.5"></a>
+
+# v12.1.0-next.5 (2021-06-10)
+
+# Commits
+
+<table>
+<tbody>
+
+<tr><td colspan=3><h3>@angular-devkit/build-angular (12.1.0-next.5)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/b35ef57b0f6e3b437ae81d475fb932adc212f939"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/b35ef57-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>suppport using TypeScript 4.3</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/11a414e4689fc33270ee0a99667c9019616a7edb"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/11a414e-fix-green.svg" />
+</a>
+  </td>
+
+  <td>ensure all Webpack Stats assets are present on rebuilds</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/21038">
+  [Closes #21038]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/1dd5c28f8d32e382d271a3da2bed25f16e88153a"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/1dd5c28-fix-green.svg" />
+</a>
+  </td>
+
+  <td>dispose Sass worker resources on Webpack shutdown</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/20985">
+  [Closes #20985]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/bd829675235ad7f862b4ccdfc317ec87e3b34710"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/bd82967-fix-green.svg" />
+</a>
+  </td>
+
+  <td>show progress during re-builds</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/2d0d82ba5b00944fc201977befee4c70ffbef243"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/2d0d82b-fix-green.svg" />
+</a>
+  </td>
+
+  <td>correctly mark async chunks as non initial in dev-server</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/c43ace73835fb2a21f3ff3eceec4e44e05937d72"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/c43ace7-fix-green.svg" />
+</a>
+  </td>
+
+  <td>add web-workers in lazy chunks in stats output</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/21059">
+  [Closes #21059]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/dc5a58528a9612b709fbd0e7bab9122ce7d680e3"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/dc5a585-fix-green.svg" />
+</a>
+  </td>
+
+  <td>styles CSS files not available in unit tests</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/21054">
+  [Closes #21054]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/699802d48853cedbf9468b94d196fd8106d43485"><img
+   align="top"
+   title="Performance Improvement" src="https://img.shields.io/badge/699802d-perf-orange.svg" />
+</a>
+  </td>
+
+  <td>reduce memory usage by cleaning output directory before emitting</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr><td colspan=3><h3>@angular-devkit/schematics (12.1.0-next.5)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/a30525b68bc54a75fc0b0cc432b739c1db5da7a1"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/a30525b-fix-green.svg" />
+</a>
+  </td>
+
+  <td>handle updating renamed files</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/14255">
+  [Closes #14255]<br />
+</a>
+
+<a href="https://github.com/angular/angular-cli/issues/21083">
+  [Closes #21083]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr></tr>
+
+<tr><td colspan=3><h3>@angular/cli (12.1.0-next.5)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/0978ff5dc826b1a861e0492dada5f173b269c648"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/0978ff5-fix-green.svg" />
+</a>
+  </td>
+
+  <td>avoid shell exec when bootstrapping update command</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/cf3b22de581104d276806d7083f199049dfc93f1"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/cf3b22d-fix-green.svg" />
+</a>
+  </td>
+
+  <td>correctly redirect nested Angular schematic dependency requests</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/21075">
+  [Closes #21075]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr><td colspan=3><h3>@ngtools/webpack (12.1.0-next.5)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/76308fecaa510bebaa869d250ca2102175e1dfd1"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/76308fe-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>support using TypeScript 4.3</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/0c2a862db00ccfe3d309c34b3788001c719aa21d"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/0c2a862-fix-green.svg" />
+</a>
+  </td>
+
+  <td>ensure plugin provided Webpack instance is used</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/f2f15c089361bb55a809563c55a327887a401d43"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/f2f15c0-fix-green.svg" />
+</a>
+  </td>
+
+  <td>disable caching for ngcc synchronous Webpack resolver</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr></tr>
+
+<tr><td colspan=3><h3>@schematics/angular (12.1.0-next.5)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/4251343aee405275ab3e5d8e3be85cab79047f43"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/4251343-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>create new projects with TypeScript 4.3</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/052b8fa4db63bf0c08aa95ca727bd18420f19f6e"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/052b8fa-fix-green.svg" />
+</a>
+  </td>
+
+  <td>added webWorkerTsConfig into test option</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/d13a8661046023419d74c2d626a6b2adc4027c90"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/d13a866-fix-green.svg" />
+</a>
+  </td>
+
+  <td>working with formatting</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr></tr>
+
+</tbody>
+</table>
+
+---
+
+---
+
+# Special Thanks
+
+Charles Lyding, Alan Agius, Doug Parker, Santosh Mahto, Joey Perrott
+<a name="v12.0.4"></a>
+
+# v12.0.4 (2021-06-09)
+
+# Commits
+
+<table>
+<tbody>
+
+<tr><td colspan=3><h3>@angular-devkit/build-angular (12.0.4)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/10a263a7af99fbdafea799ae6d41d893ad888fb6"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/10a263a-fix-green.svg" />
+</a>
+  </td>
+
+  <td>ensure all Webpack Stats assets are present on rebuilds</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/21038">
+  [Closes #21038]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/8575056949e1a8bc7d90d76e7647f7064d69201e"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/8575056-fix-green.svg" />
+</a>
+  </td>
+
+  <td>dispose Sass worker resources on Webpack shutdown</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/20985">
+  [Closes #20985]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/2b166566b615e100f17a74e96e65f69c5cb67097"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/2b16656-fix-green.svg" />
+</a>
+  </td>
+
+  <td>show progress during re-builds</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/83a9c469282bcbda392d9ba6fd2991b96eeb7c5e"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/83a9c46-fix-green.svg" />
+</a>
+  </td>
+
+  <td>correctly mark async chunks as non initial in dev-server</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/3fcf3181f46a6feaf2fa9283f1465bf46f2a0714"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/3fcf318-fix-green.svg" />
+</a>
+  </td>
+
+  <td>add web-workers in lazy chunks in stats output</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/21059">
+  [Closes #21059]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/7604e62e2e8a3ce4f95f11f2804d220c45cb0a04"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/7604e62-fix-green.svg" />
+</a>
+  </td>
+
+  <td>styles CSS files not available in unit tests</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/21054">
+  [Closes #21054]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/4c2bd2f5a6de7eb3b1d75998fc80afc9ce8a1143"><img
+   align="top"
+   title="Performance Improvement" src="https://img.shields.io/badge/4c2bd2f-perf-orange.svg" />
+</a>
+  </td>
+
+  <td>reduce memory usage by cleaning output directory before emitting</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr></tr>
+
+<tr><td colspan=3><h3>@angular-devkit/schematics (12.0.4)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/4b98448d965080dabaacc8a9cd4f9f1387d2ec65"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/4b98448-fix-green.svg" />
+</a>
+  </td>
+
+  <td>handle updating renamed files</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/14255">
+  [Closes #14255]<br />
+</a>
+
+<a href="https://github.com/angular/angular-cli/issues/21083">
+  [Closes #21083]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr></tr>
+
+<tr><td colspan=3><h3>@angular/cli (12.0.4)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/c00a045d852126bb5dc862b0e5e98ec5915ef045"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/c00a045-fix-green.svg" />
+</a>
+  </td>
+
+  <td>avoid shell exec when bootstrapping update command</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/814f0bb669423baf0f04e15ae739a9d4070a8dc0"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/814f0bb-fix-green.svg" />
+</a>
+  </td>
+
+  <td>correctly redirect nested Angular schematic dependency requests</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/21075">
+  [Closes #21075]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr><td colspan=3><h3>@ngtools/webpack (12.0.4)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/e09dc5c2ae56573e56f64f62421e604f86c91b29"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/e09dc5c-fix-green.svg" />
+</a>
+  </td>
+
+  <td>ensure plugin provided Webpack instance is used</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr></tr>
+
+<tr><td colspan=3><h3>@schematics/angular (12.0.4)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/b867066396e11254c135822fadb12362496af67b"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/b867066-fix-green.svg" />
+</a>
+  </td>
+
+  <td>added webWorkerTsConfig into test option</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/b57580e50b0988ed4b99afbbd0d43170e41fcdce"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/b57580e-fix-green.svg" />
+</a>
+  </td>
+
+  <td>working with formatting</td>
+
+  <td>
+  </td>
+</tr>
+
+</tbody>
+</table>
+
+---
+
+---
+
+# Special Thanks
+
+Alan Agius, Charles Lyding, Santosh Mahto, Joey Perrott, Doug Parker
+<a name="v12.0.3"></a>
+
+# v12.0.3 (2021-06-02)
+
+# Commits
+
+<table>
+<tbody>
+
+<tr><td colspan=3><h3>@angular-devkit/build-angular (12.0.3)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/19ef42a37e705cc81ec18a04fc69d01e14937136"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/19ef42a-fix-green.svg" />
+</a>
+  </td>
+
+  <td>do not resolve web-workers in server builds</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/20877">
+  [Closes #20877]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/662a2b8409d778fa89761e5ab81afa4c5baaec38"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/662a2b8-fix-green.svg" />
+</a>
+  </td>
+
+  <td>provided earlier build feedback in console</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/20957">
+  [Closes #20957]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/83fbaca6428f6581a2a52dee22eb3afdf6287062"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/83fbaca-fix-green.svg" />
+</a>
+  </td>
+
+  <td>correctly ignore inline styles during i18n extraction</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/20968">
+  [Closes #20968]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/bd88af5154e379a2f587edaf594b05f93af38080"><img
+   align="top"
+   title="Performance Improvement" src="https://img.shields.io/badge/bd88af5-perf-orange.svg" />
+</a>
+  </td>
+
+  <td>update `license-webpack-plugin` to `2.3.19`</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr><td colspan=3><h3>@angular-devkit/build-webpack (0.1200.3)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/c68572f4eab8f129d6948fbe5f238d3d1324f1ed"><img
+   align="top"
+   title="Performance Improvement" src="https://img.shields.io/badge/c68572f-perf-orange.svg" />
+</a>
+  </td>
+
+  <td>include only required stats in webpackStats</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr></tr>
+
+<tr><td colspan=3><h3>@angular-devkit/core (12.0.3)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/bf1122bd2fc4c50e6e72739f7197b7d1e547ea4f"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/bf1122b-fix-green.svg" />
+</a>
+  </td>
+
+  <td>show allowed enum values when validation on enum fails</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/86161a1ec3fd1bf6d93b50e5dd8ece46fe0fe9a4"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/86161a1-fix-green.svg" />
+</a>
+  </td>
+
+  <td>handle complex smart defaults in schemas</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/f457f0e42bc573c72c3a3bbf99d6dda3d996a326"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/f457f0e-fix-green.svg" />
+</a>
+  </td>
+
+  <td>handle async schema validations</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/7bba44662b3d7809b45a11d7eca09493e777a762"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/7bba446-fix-green.svg" />
+</a>
+  </td>
+
+  <td>transform path using getSystemPath for NodeJsAsyncHost's `exists` method</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr><td colspan=3><h3>@angular/cli (12.0.3)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/6c2642189ceed3d247cc9df97a9a4ef53dbf99d7"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/6c26421-fix-green.svg" />
+</a>
+  </td>
+
+  <td>update supported range of node versions to be less restrictive</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/20796">
+  [Closes #20796]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr></tr>
+
+<tr><td colspan=3><h3>@ngtools/webpack (12.0.3)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/ff87570b22a57b0ccd0382d3244dfb53d1c4e772"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/ff87570-fix-green.svg" />
+</a>
+  </td>
+
+  <td>normalize paths when adding file dependencies</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/20891">
+  [Closes #20891]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/a9c3a35fc2777926689928b68d730cbbcddfe200"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/a9c3a35-fix-green.svg" />
+</a>
+  </td>
+
+  <td>remove redundant inline style cache</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr><td colspan=3><h3>@schematics/angular (12.0.3)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/06e0a724f67f4c4bdc3d1efe5c8d4c21b7669738"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/06e0a72-fix-green.svg" />
+</a>
+  </td>
+
+  <td>make version 12 workspace config migration idempotent</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/20979">
+  [Closes #20979]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/b36c0c96ec55aa93764ae5b46e932267495d9a8b"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/b36c0c9-fix-green.svg" />
+</a>
+  </td>
+
+  <td>show better error when non existing project is passed to the component schematic</td>
+
+  <td>
+  </td>
+</tr>
+
+</tbody>
+</table>
+
+---
+
+---
+
+# Special Thanks
+
+Alan Agius, Doug Parker, Charles Lyding, why520crazy
+<a name="v12.1.0-next.4"></a>
+
+# v12.1.0-next.4 (2021-06-02)
+
+# Commits
+
+<table>
+<tbody>
+
+<tr><td colspan=3><h3>@angular-devkit/build-angular (12.1.0-next.4)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/77f81dc7f72c218e3b26c92c15b927b505f91240"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/77f81dc-fix-green.svg" />
+</a>
+  </td>
+
+  <td>do not resolve web-workers in server builds</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/20877">
+  [Closes #20877]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/f9acdc75caa52366174649042e2e987b6e5c2a83"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/f9acdc7-fix-green.svg" />
+</a>
+  </td>
+
+  <td>provided earlier build feedback in console</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/20957">
+  [Closes #20957]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/92c9be44fa4510ab6eccd0dfde82696d70412b39"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/92c9be4-fix-green.svg" />
+</a>
+  </td>
+
+  <td>correctly ignore inline styles during i18n extraction</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr></tr>
+
+<tr><td colspan=3><h3>@angular-devkit/build-webpack (0.1201.0-next.4)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/023d0937c44f94e297aa0980cb05e9c52d3d0045"><img
+   align="top"
+   title="Performance Improvement" src="https://img.shields.io/badge/023d093-perf-orange.svg" />
+</a>
+  </td>
+
+  <td>include only required stats in webpackStats</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr></tr>
+
+<tr><td colspan=3><h3>@angular-devkit/core (12.1.0-next.4)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/600d266ca4ea478f8f23664140cdb4c2db26d74c"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/600d266-fix-green.svg" />
+</a>
+  </td>
+
+  <td>show allowed enum values when validation on enum fails</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/9f85bc5625845fd244a123477ed475b28356cf68"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/9f85bc5-fix-green.svg" />
+</a>
+  </td>
+
+  <td>handle complex smart defaults in schemas</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/06af7d7e7b6b3f5b854555771db3b60b9484d4b3"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/06af7d7-fix-green.svg" />
+</a>
+  </td>
+
+  <td>handle async schema validations</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/966c0aebbc8c80d68c859a0d0ea083c9a1ccbd23"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/966c0ae-fix-green.svg" />
+</a>
+  </td>
+
+  <td>transform path using getSystemPath for NodeJsAsyncHost's `exists` method</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr><td colspan=3><h3>@angular/cli (12.1.0-next.4)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/6467717e0286713c5d9a78b7b70faf0078865dc4"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/6467717-fix-green.svg" />
+</a>
+  </td>
+
+  <td>update supported range of node versions to be less restrictive</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/20796">
+  [Closes #20796]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr></tr>
+
+<tr><td colspan=3><h3>@ngtools/webpack (12.1.0-next.4)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/3afa5567cb6c5ebfb43c2aa447f4c7d6a0e60c75"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/3afa556-fix-green.svg" />
+</a>
+  </td>
+
+  <td>normalize paths when adding file dependencies</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/20891">
+  [Closes #20891]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/f9657bc919a223e449d2dd559347eed85b1f8919"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/f9657bc-fix-green.svg" />
+</a>
+  </td>
+
+  <td>remove redundant inline style cache</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr><td colspan=3><h3>@schematics/angular (12.1.0-next.4)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/afc9d10688ab9308a1a8b51a80e0aedf24b66bfc"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/afc9d10-fix-green.svg" />
+</a>
+  </td>
+
+  <td>make version 12 workspace config migration idempotent</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/20979">
+  [Closes #20979]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/7cd801eb066543fe751ac6b7840c279e37b6e74a"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/7cd801e-fix-green.svg" />
+</a>
+  </td>
+
+  <td>show better error when non existing project is passed to the component schematic</td>
+
+  <td>
+  </td>
+</tr>
+
+</tbody>
+</table>
+
+---
+
+---
+
+# Special Thanks
+
+Alan Agius, Doug Parker, Charles Lyding, why520crazy
+<a name="v12.1.0-next.3"></a>
+
+# v12.1.0-next.3 (2021-05-26)
+
+# Commits
+
+<table>
+<tbody>
+
+<tr><td colspan=3><h3>@angular-devkit/build-angular (12.1.0-next.3)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/c146e9c086025e49dd207e039dc738a143e5672e"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/c146e9c-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>enable webpack Trusted Types support</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/fb21c4a968c8b4d8a3d17237d0864b795fffba49"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/fb21c4a-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>deprecate protractor builder</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/4dc7cf952961183abcd201db6a5747a7b22e5953"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/4dc7cf9-fix-green.svg" />
+</a>
+  </td>
+
+  <td>ensure Sass worker implementation supports Node.js 12.14</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/bea90a6130836c79bab5d64f94eb30ddfd5a12ff"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/bea90a6-fix-green.svg" />
+</a>
+  </td>
+
+  <td>don't add `.hot-update.js` script tags</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/20855">
+  [Closes #20855]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/d1953bf1aab39743058cdf73debc8493af503fc0"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/d1953bf-fix-green.svg" />
+</a>
+  </td>
+
+  <td>correctly generate ServiceWorker config on Windows</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/20894">
+  [Closes #20894]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/9433bb61799d0078a6b0481acf2fb9f7a659d892"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/9433bb6-fix-green.svg" />
+</a>
+  </td>
+
+  <td>ensure latest inline stylesheet data is used during rebuilds</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/6e07cb19c0d25a32d51ecc323bbd17eba4ed693f"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/6e07cb1-fix-green.svg" />
+</a>
+  </td>
+
+  <td>allow  i18n extraction on application that uses web-workers</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/20930">
+  [Closes #20930]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/02bea8cc18ab3d514eae85fc26f970e962fe689b"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/02bea8c-fix-green.svg" />
+</a>
+  </td>
+
+  <td>hide stacktraces from dart-sass errors</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/861a69567c48bdb5f985c88262e5e0e70ebf2999"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/861a695-fix-green.svg" />
+</a>
+  </td>
+
+  <td>resolve absolute outputPath properly</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/20935">
+  [Closes #20935]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/7ff41e4e5a61c1e9a165aa629ae04cce2da968b5"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/7ff41e4-fix-green.svg" />
+</a>
+  </td>
+
+  <td>show `--disable-host-check` warning only when not using `disableHostCheck`</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/20951">
+  [Closes #20951]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/1ab2ef9a3f3d416241db9f34e285da265d9cc27f"><img
+   align="top"
+   title="Performance Improvement" src="https://img.shields.io/badge/1ab2ef9-perf-orange.svg" />
+</a>
+  </td>
+
+  <td>disable CSS optimization parallelism for components styles</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/20883">
+  [Closes #20883]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/640a749515726eb9ee961a7f07a15a8e3b456d92"><img
+   align="top"
+   title="Performance Improvement" src="https://img.shields.io/badge/640a749-perf-orange.svg" />
+</a>
+  </td>
+
+  <td>load postcss-preset-env configuration once</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr><td colspan=3><h3>@angular/cli (12.1.0-next.3)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/57640bebfd0de417456db6c5d3cead45d528c055"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/57640be-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>show Node.js version support status in version command</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/20879">
+  [Closes #20879]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/15e5bfa55b7a78286026a5097276b141f11d2074"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/15e5bfa-fix-green.svg" />
+</a>
+  </td>
+
+  <td>ng update on windows to allow path</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr><td colspan=3><h3>@ngtools/webpack (12.1.0-next.3)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/5855374eb540d4d23855c6e00018c64be71e8b45"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/5855374-fix-green.svg" />
+</a>
+  </td>
+
+  <td>re-emit component stylesheet assets</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/20882">
+  [Closes #20882]<br />
+</a>
+
+  </td>
+</tr>
+
+</tbody>
+</table>
+
+---
+
+---
+
+# Special Thanks
+
+Alan Agius, Charles Lyding, Doug Parker, Bjarki, Hassan Sani, JoostK, George Kalpakas, Joey Perrott
+<a name="v12.0.2"></a>
+
+# v12.0.2 (2021-05-26)
+
+# Commits
+
+<table>
+<tbody>
+
+<tr><td colspan=3><h3>@angular-devkit/build-angular (12.0.2)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/6482a64b91ac5ce51e7396836f0089e3d6003d35"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/6482a64-fix-green.svg" />
+</a>
+  </td>
+
+  <td>ensure Sass worker implementation supports Node.js 12.14</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/3764a3155b80d22ebc6a08cac8d52e5df59ccd89"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/3764a31-fix-green.svg" />
+</a>
+  </td>
+
+  <td>don't add `.hot-update.js` script tags</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/20855">
+  [Closes #20855]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/467172ce086196c56eb73c37dd02c21efdbe0e14"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/467172c-fix-green.svg" />
+</a>
+  </td>
+
+  <td>correctly generate ServiceWorker config on Windows</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/20894">
+  [Closes #20894]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/8e741e187a2885c52e97ef084b5cbbf20d9c89fe"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/8e741e1-fix-green.svg" />
+</a>
+  </td>
+
+  <td>ensure latest inline stylesheet data is used during rebuilds</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/224dbbc06e77a1044b988909997c6084c828bfe8"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/224dbbc-fix-green.svg" />
+</a>
+  </td>
+
+  <td>allow  i18n extraction on application that uses web-workers</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/20930">
+  [Closes #20930]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/fb8bd56ceb854ca23946e88925a982b2e2747532"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/fb8bd56-fix-green.svg" />
+</a>
+  </td>
+
+  <td>hide stacktraces from dart-sass errors</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/b0dd4e1ad0235849013e4be049df5e0c75ee8c57"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/b0dd4e1-fix-green.svg" />
+</a>
+  </td>
+
+  <td>resolve absolute outputPath properly</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/20935">
+  [Closes #20935]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/923f56e3ffc0ceb476cd3a5aecfbb17bff105fd6"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/923f56e-fix-green.svg" />
+</a>
+  </td>
+
+  <td>show `--disable-host-check` warning only when not using `disableHostCheck`</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/20951">
+  [Closes #20951]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/394a0012abb7de3712fa8ccceac6ffe9c886d46d"><img
+   align="top"
+   title="Performance Improvement" src="https://img.shields.io/badge/394a001-perf-orange.svg" />
+</a>
+  </td>
+
+  <td>update PostCSS to 8.3</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/72a7bc0d225d75560c30f295e0a2a0b5ff5802d9"><img
+   align="top"
+   title="Performance Improvement" src="https://img.shields.io/badge/72a7bc0-perf-orange.svg" />
+</a>
+  </td>
+
+  <td>disable CSS optimization parallelism for components styles</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/20883">
+  [Closes #20883]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/22985624d5d7a867386c94121964e2ded91584c4"><img
+   align="top"
+   title="Performance Improvement" src="https://img.shields.io/badge/2298562-perf-orange.svg" />
+</a>
+  </td>
+
+  <td>load postcss-preset-env configuration once</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr></tr>
+
+<tr><td colspan=3><h3>@angular/cli (12.0.2)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/f4e1c6712140fbbd71fb6709ae63ccc502ed1fb7"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/f4e1c67-fix-green.svg" />
+</a>
+  </td>
+
+  <td>ng update on windows to allow path</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr></tr>
+
+<tr><td colspan=3><h3>@ngtools/webpack (12.0.2)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/99cb11712ffa060e20b0d94719288f61285b98c9"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/99cb117-fix-green.svg" />
+</a>
+  </td>
+
+  <td>re-emit component stylesheet assets</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/20882">
+  [Closes #20882]<br />
+</a>
+
+  </td>
+</tr>
+
+</tbody>
+</table>
+
+---
+
+---
+
+# Special Thanks
+
+Alan Agius, Charles Lyding, Doug Parker, Hassan Sani, JoostK, George Kalpakas, Joey Perrott
+<a name="v12.0.1"></a>
+
+# v12.0.1 (2021-05-19)
+
+# Commits
+
+<table>
+<tbody>
+
+<tr><td colspan=3><h3>@angular-devkit/build-angular (12.0.1)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/6b26f661e6db0f1ac1f7de50f5ab92dbeb554bd3"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/6b26f66-fix-green.svg" />
+</a>
+  </td>
+
+  <td>add experimental web-assembly</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/20762">
+  [Closes #20762]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/3943f5c1f1e9a9092c337cf8b79007733f664c3b"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/3943f5c-fix-green.svg" />
+</a>
+  </td>
+
+  <td>fix error with inline styles when running extract-i18n</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/69da7553235a49caa3f552bc9c9a657b1d4fca5d"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/69da755-fix-green.svg" />
+</a>
+  </td>
+
+  <td>add `NG_BUILD_MAX_WORKERS` settimgs to control maximum number of workers</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/4ac556ba636952c96685803bf33a442b3982a13d"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/4ac556b-fix-green.svg" />
+</a>
+  </td>
+
+  <td>non injected styles should not count as initial</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/20781">
+  [Closes #20781]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/a125e6745afefaa77989e99e4adcfa83e999af71"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/a125e67-fix-green.svg" />
+</a>
+  </td>
+
+  <td>revert open to 8.0.2</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/20807">
+  [Closes #20807]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/1e34e9874057d72261438f33a82c96e1e0b937ed"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/1e34e98-fix-green.svg" />
+</a>
+  </td>
+
+  <td>correctly resolve babel runtime helpers</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/20800">
+  [Closes #20800]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/894feaf8eeb8b22afb7740763750ddd8abaff7d4"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/894feaf-fix-green.svg" />
+</a>
+  </td>
+
+  <td>compile schema in synchronously</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/20847">
+  [Closes #20847]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/b89fdc36123e401a2df11b59b477d842fc8cec15"><img
+   align="top"
+   title="Performance Improvement" src="https://img.shields.io/badge/b89fdc3-perf-orange.svg" />
+</a>
+  </td>
+
+  <td>execute dart-sass in a worker</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/d5a46a1ba58a4f116056da205715840066f3a76b"><img
+   align="top"
+   title="Performance Improvement" src="https://img.shields.io/badge/d5a46a1-perf-orange.svg" />
+</a>
+  </td>
+
+  <td>reduce JSON stats</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/5e72056d6bcbf6b80afe65e0e6374893384e417e"><img
+   align="top"
+   title="Performance Improvement" src="https://img.shields.io/badge/5e72056-perf-orange.svg" />
+</a>
+  </td>
+
+  <td>use CSS optimization plugin that leverages workers</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/7718efe98ad892ffd08d253935f9be7443a4ad9f"><img
+   align="top"
+   title="Performance Improvement" src="https://img.shields.io/badge/7718efe-perf-orange.svg" />
+</a>
+  </td>
+
+  <td>render Sass using a pool of workers</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/b36a35d6aabac94dc604bac71f3e8619cfdf6b5d"><img
+   align="top"
+   title="Performance Improvement" src="https://img.shields.io/badge/b36a35d-perf-orange.svg" />
+</a>
+  </td>
+
+  <td>clean no-longer used assets during builds</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr><td colspan=3><h3>@angular/cli (12.0.1)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/a8175921880271568066f15e8d3204c411967e88"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/a817592-fix-green.svg" />
+</a>
+  </td>
+
+  <td>cannot locate bin for temporary package</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/c0694cad3c0ad84847eaa89a2143a0d81458b12b"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/c0694ca-fix-green.svg" />
+</a>
+  </td>
+
+  <td>clean node modules directory prior to updating</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/effc96196a917162c3d6d52057f2c5658ae15215"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/effc961-fix-green.svg" />
+</a>
+  </td>
+
+  <td>improve `--prod` deprecation warning</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/20806">
+  [Closes #20806]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr></tr>
+
+<tr><td colspan=3><h3>@ngtools/webpack (12.0.1)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/fd9ad77ab854ea5291bd172dc2a004066e46c0df"><img
+   align="top"
+   title="Performance Improvement" src="https://img.shields.io/badge/fd9ad77-perf-orange.svg" />
+</a>
+  </td>
+
+  <td>reduce non-watch mode TypeScript diagnostic analysis overhead</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr></tr>
+
+<tr><td colspan=3><h3>@schematics/angular (12.0.1)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/da99ff904749ed6e9f5b3fe2055af95dff5d8f90"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/da99ff9-fix-green.svg" />
+</a>
+  </td>
+
+  <td>remove --prod option from README template</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/c0b6a5d38913736a820badf6154760fb23ce47df"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/c0b6a5d-fix-green.svg" />
+</a>
+  </td>
+
+  <td>don't add `skipTest` option to module schematic options</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/20811">
+  [Closes #20811]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/f47e45641a2f494b7afdf5db4455ab98e73cc9f2"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/f47e456-fix-green.svg" />
+</a>
+  </td>
+
+  <td>add migration to remove `skipTests` from `@schematics/angular:module`</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/20848">
+  [Closes #20848]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr></tr>
+
+</tbody>
+</table>
+
+---
+
+---
+
+# Special Thanks
+
+Alan Agius, Charles Lyding, Joey Perrott, Keen Yee Liau, Luca Vazzano, Pankaj Patil, Ryan Lester, Terence D. Honles, Alan Cohen
+
+<a name="v12.1.0-next.2"></a>
+
+# v12.1.0-next.2 (2021-05-19)
+
+# Commits
+
+<table>
+<tbody>
+
+<tr><td colspan=3><h3>@angular-devkit/build-angular (12.1.0-next.2)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/7df9d19297d1160e6b8614f1763e11b307aeef8b"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/7df9d19-fix-green.svg" />
+</a>
+  </td>
+
+  <td>add experimental web-assembly</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/20762">
+  [Closes #20762]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/4367c3a5626aa92b1301746519602d52bc7cd1b0"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/4367c3a-fix-green.svg" />
+</a>
+  </td>
+
+  <td>add `NG_BUILD_MAX_WORKERS` settimgs to control maximum number of workers</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/2643fb11a96befa5800683433a65b37c6bbeb6d7"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/2643fb1-fix-green.svg" />
+</a>
+  </td>
+
+  <td>non injected styles should not count as initial</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/20781">
+  [Closes #20781]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/79c5284892f79de6dfb54b5433a5fa5f6e0cb044"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/79c5284-fix-green.svg" />
+</a>
+  </td>
+
+  <td>revert open to 8.0.2</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/20807">
+  [Closes #20807]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/d34dc8853d24195f3e8cf49777664f1a353216a2"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/d34dc88-fix-green.svg" />
+</a>
+  </td>
+
+  <td>correctly resolve babel runtime helpers</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/20800">
+  [Closes #20800]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/43926a21ba1b689804d35f282f80842e8c63286a"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/43926a2-fix-green.svg" />
+</a>
+  </td>
+
+  <td>compile schema in synchronously</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/20847">
+  [Closes #20847]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/cc7f75f25b5c38c73912023cd26fd0c82192344c"><img
+   align="top"
+   title="Performance Improvement" src="https://img.shields.io/badge/cc7f75f-perf-orange.svg" />
+</a>
+  </td>
+
+  <td>execute dart-sass in a worker</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/d9566bfac84a913b6d6f6dcfb8ae94279d71708b"><img
+   align="top"
+   title="Performance Improvement" src="https://img.shields.io/badge/d9566bf-perf-orange.svg" />
+</a>
+  </td>
+
+  <td>reduce JSON stats</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/0ebf7569f6506a673996dc2f8a7edcc4cbc61d81"><img
+   align="top"
+   title="Performance Improvement" src="https://img.shields.io/badge/0ebf756-perf-orange.svg" />
+</a>
+  </td>
+
+  <td>use CSS optimization plugin that leverages workers</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/438c6d932e169dbfdf2877daae40f646b7e17667"><img
+   align="top"
+   title="Performance Improvement" src="https://img.shields.io/badge/438c6d9-perf-orange.svg" />
+</a>
+  </td>
+
+  <td>render Sass using a pool of workers</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/f5f41ea929444102cede1a6aef8bd75937c45a6e"><img
+   align="top"
+   title="Performance Improvement" src="https://img.shields.io/badge/f5f41ea-perf-orange.svg" />
+</a>
+  </td>
+
+  <td>clean no-longer used assets during builds</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr></tr>
+
+<tr><td colspan=3><h3>@angular/cli (12.1.0-next.2)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/6e34d1bf897dcbf76d8edd40a3d70e4d3f190312"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/6e34d1b-fix-green.svg" />
+</a>
+  </td>
+
+  <td>cannot locate bin for temporary package</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/6926b37c0c8093dd5427e80cb8da9e41a15c6cc0"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/6926b37-fix-green.svg" />
+</a>
+  </td>
+
+  <td>clean node modules directory prior to updating</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/ddb92d815e4030abbce0cb58b460b4d8af8543ae"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/ddb92d8-fix-green.svg" />
+</a>
+  </td>
+
+  <td>improve `--prod` deprecation warning</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/20806">
+  [Closes #20806]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr></tr>
+
+<tr><td colspan=3><h3>@ngtools/webpack (12.1.0-next.2)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/4f2df00511cdd0d358c040090eca68733539ac0e"><img
+   align="top"
+   title="Performance Improvement" src="https://img.shields.io/badge/4f2df00-perf-orange.svg" />
+</a>
+  </td>
+
+  <td>reduce non-watch mode TypeScript diagnostic analysis overhead</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr></tr>
+
+<tr><td colspan=3><h3>@schematics/angular (12.1.0-next.2)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/ff752951b0280a029eb77e2ac5bf7cd0eabdbc48"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/ff75295-fix-green.svg" />
+</a>
+  </td>
+
+  <td>remove --prod option from README template</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/36b5040cc470cdb2c0554785a9a368ce3c226ad1"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/36b5040-fix-green.svg" />
+</a>
+  </td>
+
+  <td>don't add `skipTest` option to module schematic options</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/20811">
+  [Closes #20811]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/1080a52c963207c731fbad2641dda357e0af539d"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/1080a52-fix-green.svg" />
+</a>
+  </td>
+
+  <td>add migration to remove `skipTests` from `@schematics/angular:module`</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/20848">
+  [Closes #20848]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr></tr>
+
+</tbody>
+</table>
+
+---
+
+---
+
+# Special Thanks
+
+Alan Agius, Charles Lyding, Joey Perrott, Keen Yee Liau, Luca Vazzano, Pankaj Patil, Ryan Lester, Alan Cohen, Paul Gschwendtner
+<a name="v12.0.0"></a>
+
+# v12.0.0 (2021-05-12)
+
+# Commits
+
+<table>
+<tbody>
+
+<tr><td colspan=3><h3>@angular-devkit/architect (0.1200.0)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/1da359ac08d1a5503ab152db72ee6cee927391b8"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/1da359a-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>add implementation for defaultConfiguration</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr></tr>
+
+<tr><td colspan=3><h3>@angular-devkit/build-angular (12.0.0)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/93376177235108ed15a2fbba8ea079bc565802ce"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/9337617-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>add `postcss-preset-env` with stage 3 features</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/fa5cf53b644c96a50d09dce5f9e9ee401bf66053"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/fa5cf53-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>drop support for karma version 5.2</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/44e75be5b127545bf87e2d6d61370944f4d380a1"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/44e75be-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>drop support for ng-packagr version 11</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/aa3ea885ed69cfde0914abae547e15d6d499a908"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/aa3ea88-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>enable inlineCritical by default</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/71eab3ddb603cb70a98120012a174cb159d9b28d"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/71eab3d-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>show warning during build when project requires IE 11 support</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/1525e7ab2c3c6cd95ee91cf01243af78174246ca"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/1525e7a-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>expose legacy-migrate message format</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/2616ef0d3fdf6821a60f5ae9dcb54d65be0506e1"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/2616ef0-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>integrate JIT mode linker</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/20281">
+  [Closes #20281]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/d883ce5d7e39de774fe90e4ccdbc9a84a600b7e8"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/d883ce5-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>upgrade to Webpack 5 throughout the build system</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/d47b4417d46f85f9f5bb460576d32aa0104e6d43"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/d47b441-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>support processing component inline CSS styles</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/bac563e5ee1efcda4bfb1334ecc0906796584cbd"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/bac563e-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>support specifying stylesheet language for inline component styles</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/6a7d1e0be4c59b27e78d1b03c083bdb2982c3845"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/6a7d1e0-fix-green.svg" />
+</a>
+  </td>
+
+  <td>remove left-over `experimentalRollupPass` option</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/d5645675fd555e7f1afd523d4f2d42095034fc46"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/d564567-fix-green.svg" />
+</a>
+  </td>
+
+  <td>support writing large Webpack stat outputs</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/ac4c109bebac3ea3d562f000c46a98d61b1bd148"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/ac4c109-fix-green.svg" />
+</a>
+  </td>
+
+  <td>ensure output directory is present before writing stats JSON</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/012700ace56d6d0e35d6798c5a19534ffa5a5a0e"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/012700a-fix-green.svg" />
+</a>
+  </td>
+
+  <td>remove deprecated View Engine support for i18n extraction</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/677913fc389f0ffa20e3e1928d7244427c07ef35"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/677913f-fix-green.svg" />
+</a>
+  </td>
+
+  <td>remove usage of deprecated View Engine compiler</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/eca5a01f6e8d1c3ad874d74c58e6ffbddab6a031"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/eca5a01-fix-green.svg" />
+</a>
+  </td>
+
+  <td>remove deprecated i18nLocale and i18nFormat options from i18n-extract</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/f1453126666af62a4ac4b4adca7d4282ecac0038"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/f145312-fix-green.svg" />
+</a>
+  </td>
+
+  <td>update karma builder to use non-deprecated API</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/bd0aba7c80cee63f6fbcb94247fdf3506e9b4afa"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/bd0aba7-fix-green.svg" />
+</a>
+  </td>
+
+  <td>disable webpack cache when using `NG_BUILD_CACHE`</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/cc52e5453cbf40810f56b6ea443c5f089c635a5d"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/cc52e54-fix-green.svg" />
+</a>
+  </td>
+
+  <td>remove duplicate application bundle generation complete message</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/27e63e2b33be48b26a44da69c09198ef9a8dce21"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/27e63e2-fix-green.svg" />
+</a>
+  </td>
+
+  <td>mark programmatic builder execution functions as experimental</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/88bea1ad72e5b5df8c7e4870fa49f517c263ba05"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/88bea1a-fix-green.svg" />
+</a>
+  </td>
+
+  <td>avoid double build optimizer processing</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/a6e5103b9d3b3c20a5593542823d784e1e68896f"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/a6e5103-fix-green.svg" />
+</a>
+  </td>
+
+  <td>replace Webpack 4 `hashForChunk` hook usage</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/c53a17886a263e686151c440938233e5f245218d"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/c53a178-fix-green.svg" />
+</a>
+  </td>
+
+  <td>use new Webpack watch API in karma webpack plugin</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/bac34e5268b1aa9348edcf079240668bb6583b5f"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/bac34e5-fix-green.svg" />
+</a>
+  </td>
+
+  <td>recover from CSS optimization errors</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/88467b3b659f2ae6a34f2214705d2dec4c046c76"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/88467b3-fix-green.svg" />
+</a>
+  </td>
+
+  <td>disable Webpack 5 automatic public path support</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/898a486315a9e2762208c6b95b439751928e1ec7"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/898a486-fix-green.svg" />
+</a>
+  </td>
+
+  <td>always inject live reload client when using live reload</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/656f8d75a3368a5affd1c55145841123dafdb007"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/656f8d7-fix-green.svg" />
+</a>
+  </td>
+
+  <td>change several builder options defaults</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/7a8686abe9d490f22ff25f6b02709c9e18d3c410"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/7a8686a-fix-green.svg" />
+</a>
+  </td>
+
+  <td>show warning when using stylus</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/33ca65aaa80c22c708c64a19f0374f5493244995"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/33ca65a-fix-green.svg" />
+</a>
+  </td>
+
+  <td>avoid triggering file change after file build</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/57ac7f306b23063f50c5f63edacb9f64685ba00b"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/57ac7f3-fix-green.svg" />
+</a>
+  </td>
+
+  <td>remove left-over `forkTypeChecker` option</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/c8d2d687108701f6aec0956970683a1c3f03d0e3"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/c8d2d68-fix-green.svg" />
+</a>
+  </td>
+
+  <td>disable CSS declaration sorting optimizations</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/20693">
+  [Closes #20693]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/00ff390feaeb457812d67c367f65ba799d3ac66a"><img
+   align="top"
+   title="Performance Improvement" src="https://img.shields.io/badge/00ff390-perf-orange.svg" />
+</a>
+  </td>
+
+  <td>disable `showCircularDependencies` by default</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/fa0fc45b8782910e09689bd40a6f8d2743c5b0ce"><img
+   align="top"
+   title="Performance Improvement" src="https://img.shields.io/badge/fa0fc45-perf-orange.svg" />
+</a>
+  </td>
+
+  <td>use Webpack's GC memory caching in watch mode</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/9a32ed9800eb4494e72537bacae4104692a54d70"><img
+   align="top"
+   title="Performance Improvement" src="https://img.shields.io/badge/9a32ed9-perf-orange.svg" />
+</a>
+  </td>
+
+  <td>improve incremental time during Karma tests</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/54696e788a04c0bfad3514e2e36d420d7dee5aee"><img
+   align="top"
+   title="Performance Improvement" src="https://img.shields.io/badge/54696e7-perf-orange.svg" />
+</a>
+  </td>
+
+  <td>avoid async downlevel for known ES2015 code</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr></tr>
+
+<tr><td colspan=3><h3>@angular-devkit/build-optimizer (0.1200.0)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/1f83f305db88aeb5164f6d13869f7cc10e44527e"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/1f83f30-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>support Webpack 5</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr></tr>
+
+<tr><td colspan=3><h3>@angular-devkit/build-webpack (0.1200.0)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/ff32ada86b486d96922c693f703e25e01848d020"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/ff32ada-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>provide output path in builder results</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/18c954129279d68b5c02c9f486a7db34be5492d1"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/18c9541-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>support Webpack 5</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr><td colspan=3><h3>@angular-devkit/core (12.0.0)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/8e981d08809a7f1084b5cae7a539217d6fe7f757"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/8e981d0-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>add handling for `defaultConfiguration` target definition property</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/08753138d336fb870a66face70f5624ba64b4c69"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/0875313-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>update schema validator</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/3bb3c6cd51d24fe5636cdcf63670ea164f57aa63"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/3bb3c6c-fix-green.svg" />
+</a>
+  </td>
+
+  <td>ensure job input values are processed in order</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/4a68ad7c4b787c8daff75a80f2a36b6301a509b3"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/4a68ad7-fix-green.svg" />
+</a>
+  </td>
+
+  <td>improve handling of set schema values</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/20594">
+  [Closes #20594]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr><td colspan=3><h3>@angular/cli (12.0.0)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/f7e3e2335dfd6f54f435c95baa024c60a94b791c"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/f7e3e23-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>add `defaultConfiguration` property to architect schema</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/a5877bf91765af71c1368fd2fb61d29079931205"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/a5877bf-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>deprecate `--prod` command line argument</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/985dc1a4c71693ad78c35f5d6e95397f9753239e"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/985dc1a-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>confirm ng add action before installation</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/79856644b4d476d50013eafee949d1a508b86104"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/7985664-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>support TypeScript 4.2</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/b179a704829fef72191045a443b4b7eb7d20141c"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/b179a70-fix-green.svg" />
+</a>
+  </td>
+
+  <td>ensure odd number Node.js version message is a warning</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/065ac4546fbb4928245609d52c1f6d81fdd48cb9"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/065ac45-fix-green.svg" />
+</a>
+  </td>
+
+  <td>remove npm 7 incompatibility notification</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/06335515eb05c84d8dfdbfa10f8e3201b714d5da"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/0633551-fix-green.svg" />
+</a>
+  </td>
+
+  <td>avoid exceptions for expected errors in architect commands</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/e84fa72751b377ec4cf2419357190a79b0513377"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/e84fa72-fix-green.svg" />
+</a>
+  </td>
+
+  <td>ensure update migrations are fully executed</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/8a805fe0b9a0db3329aa51d95a41f3baacd45feb"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/8a805fe-fix-green.svg" />
+</a>
+  </td>
+
+  <td>exclude deprecated packages with removal migrations from update</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/d68cb92dc2113753e7eefb91e54b70a60c1acd94"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/d68cb92-fix-green.svg" />
+</a>
+  </td>
+
+  <td>add message update updating from non LTS versions of the CLI</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/5cc1a4e382b0fb43339bddbf9f2fcbddbda7744a"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/5cc1a4e-fix-green.svg" />
+</a>
+  </td>
+
+  <td>ignore `tsickle` during updates</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/cd198d5f2f04558bb7f518c6db19a6236f83b620"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/cd198d5-fix-green.svg" />
+</a>
+  </td>
+
+  <td>run all migrations when updating from or between prereleases</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/7c288c81a0caa9dba098c49e29f38d9dbd38c55b"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/7c288c8-fix-green.svg" />
+</a>
+  </td>
+
+  <td>add package manager name and version in `ng version` output</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/07e8bf99903daa72914d192ba6d7a43b7f8652b8"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/07e8bf9-fix-green.svg" />
+</a>
+  </td>
+
+  <td>Support XDG Base Directory Specfication</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/3a231300ba046ce1e2a11ab98bb16f1be7ba25a8"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/3a23130-fix-green.svg" />
+</a>
+  </td>
+
+  <td>don't display options multiple times in schematics help output</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/95cb13e6e3377a52cc67f89196ae8322743d3b08"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/95cb13e-fix-green.svg" />
+</a>
+  </td>
+
+  <td>change package installation to async</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/bc015937b2117f47c0caa5cad265b938d5b1afe6"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/bc01593-fix-green.svg" />
+</a>
+  </td>
+
+  <td>infer schematic defaults correctly when using `--project`</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/20666">
+  [Closes #20666]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/8b0cefbed2e9253313067b5b715844ddac3fd808"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/8b0cefb-fix-green.svg" />
+</a>
+  </td>
+
+  <td>propagate update's force option to package managers</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/853fdffcb8752bc2217bdad2d8bb23a26457c63e"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/853fdff-fix-green.svg" />
+</a>
+  </td>
+
+  <td>allow unsetting config when value is `undefined`</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/c0efbe7c67a3edb2dd053fbce2f9debb1bdd180b"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/c0efbe7-fix-green.svg" />
+</a>
+  </td>
+
+  <td>allow config object to be of JSON.</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/8524d20fd7484449971df894a977aa5be83cb3ec"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/8524d20-fix-green.svg" />
+</a>
+  </td>
+
+  <td>disallow additional properties in builders sections</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr></tr>
+
+<tr><td colspan=3><h3>@ngtools/webpack (12.0.0)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/789e05d800c1093881d24a066fb7881c26332349"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/789e05d-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>support Webpack 5</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/0dc73276cafd42415dcaa6507ab221f1116273b5"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/0dc7327-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>drop support for string based lazy loading</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/46e9d0e8a646805ba9e48aac1bc95761f2668571"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/46e9d0e-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>support multiple plugin instances per compilation</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/5e5b2d9b1a15dc0f4f1690bab109bdd8e5613be3"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/5e5b2d9-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>support generating data URIs for inline component styles in JIT</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/8c7d56e03adb9c3303760fc2e38e2d6d96452bac"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/8c7d56e-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>support processing inline component styles in AOT</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/3504c43e48d8e265ca0943005f3cea2d25290cbd"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/3504c43-fix-green.svg" />
+</a>
+  </td>
+
+  <td>remove Webpack 5 deprecation warning in resource loader</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/430ee441bd2e5729a8a24f72a1df8fd782c9f9f6"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/430ee44-fix-green.svg" />
+</a>
+  </td>
+
+  <td>use correct Webpack asset stage in resource loader</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/160102ae57d780dded6c9002faf07b601a866d3d"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/160102a-fix-green.svg" />
+</a>
+  </td>
+
+  <td>remove Webpack plugin for deprecated ViewEngine compiler</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/ca5ceaa10780bf5d05262bd2bc2e5909d51d3aa9"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/ca5ceaa-fix-green.svg" />
+</a>
+  </td>
+
+  <td>only track actual resource file dependencies</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/95aa2b8f925ee295b8edf659b5d8e706d122ffec"><img
+   align="top"
+   title="Performance Improvement" src="https://img.shields.io/badge/95aa2b8-perf-orange.svg" />
+</a>
+  </td>
+
+  <td>avoid adding transitive dependencies to Webpack's dependency graph</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/dfefd6ba4fcda6baa3dc172978ca84acaa48ec54"><img
+   align="top"
+   title="Performance Improvement" src="https://img.shields.io/badge/dfefd6b-perf-orange.svg" />
+</a>
+  </td>
+
+  <td>use precalculated dependencies in unused file check</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/aeebd14f04b8e520b0144a77e765da807a08dda0"><img
+   align="top"
+   title="Performance Improvement" src="https://img.shields.io/badge/aeebd14-perf-orange.svg" />
+</a>
+  </td>
+
+  <td>only check affected files for Angular semantic diagnostics</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/22ac3b387c2a4231556e188bb7e6d9eda6989a39"><img
+   align="top"
+   title="Performance Improvement" src="https://img.shields.io/badge/22ac3b3-perf-orange.svg" />
+</a>
+  </td>
+
+  <td>cache results of processed inline resources</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/057ba0cfefe9ae22bc90ffa4d7ab2aebd4848c93"><img
+   align="top"
+   title="Performance Improvement" src="https://img.shields.io/badge/057ba0c-perf-orange.svg" />
+</a>
+  </td>
+
+  <td>rebuild Angular required files asynchronously</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/1ec630fa88bfc818eea9d0810b2c7a6bf8268eb5"><img
+   align="top"
+   title="Performance Improvement" src="https://img.shields.io/badge/1ec630f-perf-orange.svg" />
+</a>
+  </td>
+
+  <td>reduce source file and Webpack module iteration</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr></tr>
+
+<tr><td colspan=3><h3>@schematics/angular (12.0.0)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/f424529d9ccaeb16643a8383ad3647af82062b16"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/f424529-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>add migration to remove deprecated options from 'angular.json'</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/b105ed63c7610dd1397a3d24d4a7439564a019aa"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/b105ed6-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>strict mode by default</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/bb38f85202f749040b241c8277280fab21c3379c"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/bb38f85-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>use new zone.js entry-points</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/7d57dd2f3e7d36cc4ed2c356f79139486790cbfa"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/7d57dd2-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>add migration to use new zone.js entry-points</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/96a4467ce90fb6b88f5be39f73c8fd64ce057a4a"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/96a4467-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>add migration to remove emitDecoratorMetadata</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/1199205bc2844e2c83d8f8e5092e89f8bd24eec1"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/1199205-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>augment `universal` schematics to import `platform-server` shims</td>
+
+  <td>
+<a href="https://github.com/angular/angular/issues/40559">
+  [Closes #40559]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/d19d2ccae55f96d4d8260da6572f34a47616a89b"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/d19d2cc-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>update new project dependencies version</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/20106">
+  [Closes #20106]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/1de6d71edd899465a01c65790f6fb04159acc821"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/1de6d71-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>production builds by default</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/3b7470d4836bcfff31ee4bf90ec4396f2905c633"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/3b7470d-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>deprecate `legacyBrowsers` application and ng-new option</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/f4875b967ae9ca5640cb27bfb37166528cab88d8"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/f4875b9-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>add migration to remove `lazyModules` configuration option</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/3ee12af89be58ccea8996e2e86a18a23d193abbe"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/3ee12af-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>add migration to update lazy loading string syntax to use dynamic imports</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/81129e12d0ae4cbaeb5ab537facb7990be9b8b45"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/81129e1-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>update several TypeScript compilation target (Syntax)</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/226a8d274d27d191651926bc7970af11cfee2597"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/226a8d2-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>remove tslint and codelyzer from new projects</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/20105">
+  [Closes #20105]<br />
+</a>
+
+<a href="https://github.com/angular/angular-cli/issues/18465">
+  [Closes #18465]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/c7e126609f4a0d86bd47a226717ab6430fd85cfd"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/c7e1266-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>add production by default optional migration</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/f22f7e7371c0daa2dc59110cd21e3ff3fb4620d5"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/f22f7e7-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>update new workspaces to use Karma 6.3</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/8582ddc35e153b8bc409d0505f29bc43e6cef455"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/8582ddc-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>remove `entryComponent` from `component` schematic</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/695a01ba02b8c6e9656ed5ed5b0c5e17760ba21d"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/695a01b-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>configure new libraries to be published in Ivy partial mode</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/84e023120864c014a2d1a275265c0941a0a16df2"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/84e0231-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>update `jasmine-spec-reporter` to version 7</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/e33a3061f02828303e3c6ef508b5b23cbc73eef2"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/e33a306-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>migrate web workers to support Webpack 5</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/575b1a75b17f0b03748c137c07976e00be4c8b51"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/575b1a7-fix-green.svg" />
+</a>
+  </td>
+
+  <td>only update removed v12 options in migration</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/ba6f546a026a3dba613c1c54ce0c767fe0940d0f"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/ba6f546-fix-green.svg" />
+</a>
+  </td>
+
+  <td>add `additionalProperties` to all schemas</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/663c4bc9c10aa3df3defa188a1ba8f90c63b2722"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/663c4bc-fix-green.svg" />
+</a>
+  </td>
+
+  <td>remove references to the prod flag</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/3bf831fac6166f6943a78b34bfd5f3c167f8911d"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/3bf831f-fix-green.svg" />
+</a>
+  </td>
+
+  <td>only show legacy browsers deprecation warning when option is used</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/09daf7a7e0886738f25f071aa5e072e1dc06bf7e"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/09daf7a-fix-green.svg" />
+</a>
+  </td>
+
+  <td>remove leftover workspace tslint config</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/fb14945c02a3f150d6965e77324416b1ec7cc575"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/fb14945-fix-green.svg" />
+</a>
+  </td>
+
+  <td>correctly handle adding multi-line strings to `@NgModule` metadata</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/645353db26e9d6e8f893322a52b320ccd5ca1d5d"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/645353d-fix-green.svg" />
+</a>
+  </td>
+
+  <td>run update-i18n migration for server builder</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/df988c249363682aa6f9d3d95ae3b8636e24ebf9"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/df988c2-fix-green.svg" />
+</a>
+  </td>
+
+  <td>update web-worker to support Webpack 5</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/1bf976f663e938164eb3ff55540ea0b3934d3a00"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/1bf976f-fix-green.svg" />
+</a>
+  </td>
+
+  <td>set `inlineStyleLanguage` when application `style` option is used</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/ab44cb2df79da301dc5cde167bc8a51cfe15e1d6"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/ab44cb2-fix-green.svg" />
+</a>
+  </td>
+
+  <td>set `inlineStyleLanguage` for universal if present in build options</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/21b601b5a77a70c6239249833e8639d7dd9cee98"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/21b601b-fix-green.svg" />
+</a>
+  </td>
+
+  <td>remove jasmine-spec-reporter and ts-node from default workspace</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/81471c06cf8583ec81a409c2c8037edf784c945e"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/81471c0-fix-green.svg" />
+</a>
+  </td>
+
+  <td>remove Protractor from home page</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/bc3f8dc34265f9a31dffd92598a03c0d8fe88aa5"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/bc3f8dc-fix-green.svg" />
+</a>
+  </td>
+
+  <td>remove lint command from package.json</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/20618">
+  [Closes #20618]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/0ca35b1d47fa5003e4ed5d821b5573d6352a4dcc"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/0ca35b1-fix-green.svg" />
+</a>
+  </td>
+
+  <td>fix migration for namedChunks and option</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/82158881a49b3104783c971e8a8155480fe13042"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/8215888-fix-green.svg" />
+</a>
+  </td>
+
+  <td>add "type" option in enum schematic</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/89360ab4876db6fcf92f5508971da49228543e08"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/89360ab-fix-green.svg" />
+</a>
+  </td>
+
+  <td>only run `emitDecoratorMetadata` removal migration in safe workspaces</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/ec7f3ad19c21e7a7106ff6a44edf676168b46054"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/ec7f3ad-fix-green.svg" />
+</a>
+  </td>
+
+  <td>replace `clientProject` with `project`</td>
+
+  <td>
+  </td>
+</tr>
+
+</tbody>
+</table>
+
+---
+
+<a href="#breaking-changes">&nbsp;</a>
+
+# Breaking Changes
+
+<h3>
+    @schematics/angular: remove `stylus` from `style` options (<a href="https://github.com/angular/angular-cli/commit/fd729aca0e74c242797d4697786fbede06bc844b">fd729ac</a>)
+</h3>
+`styl` (Stylus) is no longer a supported value as `style` in `application`, `component`, `ng-new` schematics. Stylus is not actively maintained and only 0.3% of the Angular CLI users use it.
+
+(cherry picked from commit 0272fc55b67d1a3f986b996c8eb21aea31eedf51)
+
+<h3>
+    @angular-devkit/build-angular: change several builder options defaults (<a href="https://github.com/angular/angular-cli/commit/656f8d75a3368a5affd1c55145841123dafdb007">656f8d7</a>)
+</h3>
+A number of browser and server builder options have had their default values changed. The aim of these changes is to reduce the configuration complexity and support the new "production builds by default" initiative.
+
+**Browser builder**
+| Option | Previous default value | New default value |
+|----------------------------------------|---------------------------|-------------------|
+| optimization | false | true |
+| aot | false | true |
+| buildOptimizer | false | true |
+| sourceMap | true | false |
+| extractLicenses | false | true |
+| namedChunks | true | false |
+| vendorChunk | true | false |
+
+**Server builder**
+| Option | Previous default value | New default value |
+|---------------|------------------------|-------------------|
+| optimization | false | true |
+| sourceMap | true | false |
+
+(cherry picked from commit 0a74d0d28daf68510459ed73ef048c91bfcabbbc)
+
+<h3>
+    @angular-devkit/core: update schema validator (<a href="https://github.com/angular/angular-cli/commit/08753138d336fb870a66face70f5624ba64b4c69">0875313</a>)
+</h3>
+support for JSON Schema draft-04 and draft-06 is removed. If you have schemas using the `id` keyword replace them with `$id`. For an interim period we will auto rename any top level `id` keyword to `$id`.
+
+**NB**: This change only effects schematics and builders authors.
+
+<h3>
+    @angular-devkit/build-angular: upgrade to Webpack 5 throughout the build system (<a href="https://github.com/angular/angular-cli/commit/d883ce5d7e39de774fe90e4ccdbc9a84a600b7e8">d883ce5</a>)
+</h3>
+Webpack 5 lazy loaded file name changes
+Webpack 5 generates similar but differently named files for lazy loaded JavaScript files in development configurations (when the `namedChunks` option is enabled).
+For the majority of users this change should have no effect on the application and/or build process. Production builds should also not be affected as the `namedChunks` option is disabled by default in production configurations.
+However, if a project's post-build process makes assumptions as to the file names then adjustments may need to be made to account for the new naming paradigm.
+Such post-build processes could include custom file transformations after the build, integration into service-side frameworks, or deployment procedures.
+Example development file name change: `lazy-lazy-module.js` --> `src_app_lazy_lazy_module_ts.js`
+
+Webpack 5 now includes web worker support. However, the structure of the URL within the `Worker` constructor must be in a specific format that differs from the current requirement.
+Web worker usage should be updated as shown below (where `./app.worker` should be replaced with the actual worker name):
+Before: `new Worker('./app.worker', ...)`
+After: `new Worker(new URL('./app.worker', import.meta.url), ...)`
+
+<h3>
+    @ngtools/webpack: remove Webpack plugin for deprecated ViewEngine compiler (<a href="https://github.com/angular/angular-cli/commit/160102ae57d780dded6c9002faf07b601a866d3d">160102a</a>)
+</h3>
+Removal of View Engine support from application builds
+With the removal of the deprecated View Engine compiler in Angular version 12 for applications, the View Engine Webpack plugin has been removed.
+The Ivy-based Webpack plugin is the default used within the Angular CLI.
+If using a custom standalone Webpack configuration, the removed `AngularCompilerPlugin` should be replaced with the Ivy-based `AngularWebpackPlugin`.
+
+<h3>
+    @angular-devkit/build-angular: remove deprecated i18n options from server and browser builder (<a href="https://github.com/angular/angular-cli/commit/5cf9a08dc7a1c84568d00df8f957d55b10ce0193">5cf9a08</a>)
+</h3>
+Removal of deprecated browser and server command options.
+- `i18nFile`,  use `locales` object in the project metadata instead.
+- `i18nFormat`, No longer needed as the format will be determined automatically.
+- `i18nLocale`, use `localize` option instead.
+
+<h3>
+    @angular-devkit/build-angular: remove deprecated i18nLocale and i18nFormat options from i18n-extract (<a href="https://github.com/angular/angular-cli/commit/eca5a01f6e8d1c3ad874d74c58e6ffbddab6a031">eca5a01</a>)
+</h3>
+Removal of deprecated `extract-i18n` command options
+The deprecated `i18nLocale` option has been removed and the `i18n.sourceLocale` within a project's configuration should be used instead.
+The deprecated `i18nFormat` option has been removed and the `format` option should be used instead.
+
+<h3>
+    @angular-devkit/build-angular: remove usage of deprecated View Engine compiler (<a href="https://github.com/angular/angular-cli/commit/677913fc389f0ffa20e3e1928d7244427c07ef35">677913f</a>)
+</h3>
+Removal of View Engine support from application builds
+With the removal of the deprecated View Engine compiler in Angular version 12 for applications, Ivy-based compilation will always be used when building an application.
+The default behavior for applications is to use the Ivy compiler when building and no changes are required for these applications.
+For applications that have opted-out of Ivy, a warning will be shown and an Ivy-based build will be attempted. If the build fails,
+the application may need to be updated to become Ivy compatible.
+
+<h3>
+    @schematics/angular: remove `entryComponent` from `component` schematic (<a href="https://github.com/angular/angular-cli/commit/8582ddc35e153b8bc409d0505f29bc43e6cef455">8582ddc</a>)
+</h3>
+`entryComponent` option has been removed from the `component` schematic as this was intended to be used with the the now no longer supported ViewEngine rendering engine.
+
+<h3>
+    @angular-devkit/build-angular: remove view engine app-shell generation (<a href="https://github.com/angular/angular-cli/commit/1c2aeeb46a23fd511c89f9c8800ac2a5ab0c2734">1c2aeeb</a>)
+</h3>
+App-shell builder now only supports generation using Ivy
+
+<h3>
+    @angular-devkit/build-angular: remove deprecated View Engine support for i18n extraction (<a href="https://github.com/angular/angular-cli/commit/012700ace56d6d0e35d6798c5a19534ffa5a5a0e">012700a</a>)
+</h3>
+Removal of View Engine support from i18n extraction
+With the removal of the deprecated View Engine compiler in Angular version 12 for applications, the `ng extract-i18n` command will now always use the Ivy compiler.
+The `--ivy` option has also been removed as Ivy-based extraction is always enabled.
+The default behavior for applications is to use the Ivy compiler for building/extraction and no changes are required for these applications.
+For applications that have opted-out of Ivy, a warning will be shown and Ivy-based extraction will be attempted. If the extraction fails,
+the application may need to be updated to become Ivy compatible.
+
+<h3>
+    @angular/cli: confirm ng add action before installation (<a href="https://github.com/angular/angular-cli/commit/985dc1a4c71693ad78c35f5d6e95397f9753239e">985dc1a</a>)
+</h3>
+The `ng add` command will now ask the user to confirm the package and version prior to installing and executing an uninstalled package.
+This new behavior allows a user to abort the action if the version selected is not appropriate or if a typo occurred on the command line and an incorrect package would be installed.
+A `--skip-confirmation` option has been added to skip the prompt and directly install and execute the package. This option is useful in CI and non-TTY scenarios such as automated scripts.
+
+<h3>
+    @angular-devkit/build-angular: remove deprecated `lazyModules` option (<a href="https://github.com/angular/angular-cli/commit/8d669123236c49e7f6bee1a7171c002abe03df1a">8d66912</a>)
+</h3>
+Server and Browser builder `lazyModules` option has been removed without replacement.
+
+<h3>
+    @ngtools/webpack: drop support for string based lazy loading (<a href="https://github.com/angular/angular-cli/commit/0dc73276cafd42415dcaa6507ab221f1116273b5">0dc7327</a>)
+</h3>
+With this change we drop support for string based lazy loading `./lazy.module#LazyModule`  use dynamic imports instead.
+
+The following options which were used to support the above syntax were removed without replacement.
+
+- discoverLazyRoutes
+- additionalLazyModules
+- additionalLazyModuleResources
+- contextElementDependencyConstructor
+
+<h3>
+    @angular-devkit/build-angular: enable inlineCritical by default (<a href="https://github.com/angular/angular-cli/commit/aa3ea885ed69cfde0914abae547e15d6d499a908">aa3ea88</a>)
+</h3>
+Critical CSS inlining is now enabled by default. If you wish to turn this off set `inlineCritical` to `false`.
+
+See: https://angular.io/guide/workspace-config#optimization-configuration
+
+<h3>
+    @angular-devkit/build-angular: drop support for zone.js 0.10 (<a href="https://github.com/angular/angular-cli/commit/f309516bcdcee711fc5693b5f14d6fef1cfa5dba">f309516</a>)
+</h3>
+Minimum supported `zone.js` version is `0.11.4`
+
+<h3>
+    @angular-devkit/build-angular: drop support for ng-packagr version 11 (<a href="https://github.com/angular/angular-cli/commit/44e75be5b127545bf87e2d6d61370944f4d380a1">44e75be</a>)
+</h3>
+Minimum supported `ng-packagr` version is `12.0.0-next`
+
+<h3>
+    @angular-devkit/build-angular: drop support for karma version 5.2 (<a href="https://github.com/angular/angular-cli/commit/fa5cf53b644c96a50d09dce5f9e9ee401bf66053">fa5cf53</a>)
+</h3>
+Minimum supported `karma` version is `6.0.0`
+
+<h3>
+    set minimum Node.js version to 12.13 (<a href="https://github.com/angular/angular-cli/commit/d1f616930de4a8312e3441410098d9f248855d9d">d1f6169</a>)
+</h3>
+Node.js version 10 will become EOL on 2021-04-30.
+Angular CLI 12 will require Node.js 12.13+ or 14.15+. Node.js 12.13 and 14.15 are the first LTS releases for their respective majors.
+
+<h3>
+    @angular-devkit/build-angular: remove file-loader dependency (<a href="https://github.com/angular/angular-cli/commit/6732294ff34ca35698cec5a9ca91b664dd684289">6732294</a>)
+</h3>
+The unsupported/undocumented, Webpack specific functionality to `import`/`require()` a non-module file has been removed.
+
+Before
+
+```js
+import img from './images/asset.png';
+```
+
+After
+
+```html
+<img src="images/asset.png" />
+```
+
+---
+
+# Special Thanks
+
+Alan Agius, Charles Lyding, Keen Yee Liau, Joey Perrott, Doug Parker, Cédric Exbrayat, Douglas Parker, George Kalpakas, Sam Bulatov, Joshua Chapman, Santosh Yadav, David Shevitz, Kristiyan Kostadinov
+<a name="v12.0.0-rc.3"></a>
+
+# v12.0.0-rc.3 (2021-05-10)
+
+# Commits
+
+<table>
+<tbody>
+
+<tr><td colspan=3><h3>@angular/cli (12.0.0-rc.3)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/8b0cefbed2e9253313067b5b715844ddac3fd808"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/8b0cefb-fix-green.svg" />
+</a>
+  </td>
+
+  <td>propagate update's force option to package managers</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/853fdffcb8752bc2217bdad2d8bb23a26457c63e"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/853fdff-fix-green.svg" />
+</a>
+  </td>
+
+  <td>allow unsetting config when value is `undefined`</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/c0efbe7c67a3edb2dd053fbce2f9debb1bdd180b"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/c0efbe7-fix-green.svg" />
+</a>
+  </td>
+
+  <td>allow config object to be of JSON.</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/8524d20fd7484449971df894a977aa5be83cb3ec"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/8524d20-fix-green.svg" />
+</a>
+  </td>
+
+  <td>disallow additional properties in builders sections</td>
+
+  <td>
+  </td>
+</tr>
+
+</tbody>
+</table>
+
+---
+
+# Special Thanks
+
+Alan Agius, Charles Lyding, Joey Perrott
+<a name="v12.0.0-rc.2"></a>
+
+# v12.0.0-rc.2 (2021-05-05)
+
+# Commits
+
+<table>
+<tbody>
+
+<tr><td colspan=3><h3>@angular-devkit/build-angular (12.0.0-rc.2)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/c8d2d687108701f6aec0956970683a1c3f03d0e3"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/c8d2d68-fix-green.svg" />
+</a>
+  </td>
+
+  <td>disable CSS declaration sorting optimizations</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/20693">
+  [Closes #20693]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr></tr>
+
+<tr><td colspan=3><h3>@angular/cli (12.0.0-rc.2)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/3a231300ba046ce1e2a11ab98bb16f1be7ba25a8"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/3a23130-fix-green.svg" />
+</a>
+  </td>
+
+  <td>don't display options multiple times in schematics help output</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/95cb13e6e3377a52cc67f89196ae8322743d3b08"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/95cb13e-fix-green.svg" />
+</a>
+  </td>
+
+  <td>change package installation to async</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/bc015937b2117f47c0caa5cad265b938d5b1afe6"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/bc01593-fix-green.svg" />
+</a>
+  </td>
+
+  <td>infer schematic defaults correctly when using `--project`</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/20666">
+  [Closes #20666]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr></tr>
+
+<tr><td colspan=3><h3>@ngtools/webpack (12.0.0-rc.2)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/057ba0cfefe9ae22bc90ffa4d7ab2aebd4848c93"><img
+   align="top"
+   title="Performance Improvement" src="https://img.shields.io/badge/057ba0c-perf-orange.svg" />
+</a>
+  </td>
+
+  <td>rebuild Angular required files asynchronously</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/1ec630fa88bfc818eea9d0810b2c7a6bf8268eb5"><img
+   align="top"
+   title="Performance Improvement" src="https://img.shields.io/badge/1ec630f-perf-orange.svg" />
+</a>
+  </td>
+
+  <td>reduce source file and Webpack module iteration</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr><td colspan=3><h3>@schematics/angular (12.0.0-rc.2)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/82158881a49b3104783c971e8a8155480fe13042"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/8215888-fix-green.svg" />
+</a>
+  </td>
+
+  <td>add "type" option in enum schematic</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/89360ab4876db6fcf92f5508971da49228543e08"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/89360ab-fix-green.svg" />
+</a>
+  </td>
+
+  <td>only run `emitDecoratorMetadata` removal migration in safe workspaces</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/ec7f3ad19c21e7a7106ff6a44edf676168b46054"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/ec7f3ad-fix-green.svg" />
+</a>
+  </td>
+
+  <td>replace `clientProject` with `project`</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr></tr>
+
+</tbody>
+</table>
+
+---
+
+---
+
+# Special Thanks
+
+Alan Agius, Charles Lyding, Keen Yee Liau, Sam Bulatov, Doug Parker
+<a name="v12.0.0-rc.1"></a>
+
+# v12.0.0-rc.1 (2021-04-28)
+
+# Commits
+
+<table>
+<tbody>
+
+<tr><td colspan=3><h3>@angular-devkit/build-angular (12.0.0-rc.1)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/57ac7f306b23063f50c5f63edacb9f64685ba00b"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/57ac7f3-fix-green.svg" />
+</a>
+  </td>
+
+  <td>remove left-over `forkTypeChecker` option</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/46a5261cd0e857501d616ee9dbae41415498c54b"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/46a5261-fix-green.svg" />
+</a>
+  </td>
+
+  <td>output webpack-dev-server and webpack-dev-middleware errors</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/9a32ed9800eb4494e72537bacae4104692a54d70"><img
+   align="top"
+   title="Performance Improvement" src="https://img.shields.io/badge/9a32ed9-perf-orange.svg" />
+</a>
+  </td>
+
+  <td>improve incremental time during Karma tests</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/54696e788a04c0bfad3514e2e36d420d7dee5aee"><img
+   align="top"
+   title="Performance Improvement" src="https://img.shields.io/badge/54696e7-perf-orange.svg" />
+</a>
+  </td>
+
+  <td>avoid async downlevel for known ES2015 code</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr><td colspan=3><h3>@angular-devkit/core (12.0.0-rc.1)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/4a68ad7c4b787c8daff75a80f2a36b6301a509b3"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/4a68ad7-fix-green.svg" />
+</a>
+  </td>
+
+  <td>improve handling of set schema values</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/20594">
+  [Closes #20594]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr></tr>
+
+<tr><td colspan=3><h3>@angular/cli (12.0.0-rc.1)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/7c288c81a0caa9dba098c49e29f38d9dbd38c55b"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/7c288c8-fix-green.svg" />
+</a>
+  </td>
+
+  <td>add package manager name and version in `ng version` output</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/07e8bf99903daa72914d192ba6d7a43b7f8652b8"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/07e8bf9-fix-green.svg" />
+</a>
+  </td>
+
+  <td>Support XDG Base Directory Specfication</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr><td colspan=3><h3>@schematics/angular (12.0.0-rc.1)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/21b601b5a77a70c6239249833e8639d7dd9cee98"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/21b601b-fix-green.svg" />
+</a>
+  </td>
+
+  <td>remove jasmine-spec-reporter and ts-node from default workspace</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/81471c06cf8583ec81a409c2c8037edf784c945e"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/81471c0-fix-green.svg" />
+</a>
+  </td>
+
+  <td>remove Protractor from home page</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/bc3f8dc34265f9a31dffd92598a03c0d8fe88aa5"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/bc3f8dc-fix-green.svg" />
+</a>
+  </td>
+
+  <td>remove lint command from package.json</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/20618">
+  [Closes #20618]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/dd1d4efd592e5ed5338e17e80042e10dbf29eb8d"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/dd1d4ef-fix-green.svg" />
+</a>
+  </td>
+
+  <td>avoid unuse imports for canLoad guard generation</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/0ca35b1d47fa5003e4ed5d821b5573d6352a4dcc"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/0ca35b1-fix-green.svg" />
+</a>
+  </td>
+
+  <td>fix migration for namedChunks and option</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr></tr>
+
+<tr><td colspan=3><h3>@angular-devkit/schematics-cli (12.0.0-rc.1)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/94957d18bc80110614116996d83f68d8433c9ab8"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/94957d1-fix-green.svg" />
+</a>
+  </td>
+
+  <td>accept windows like paths for schematics</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr></tr>
+
+</tbody>
+</table>
+
+---
+
+---
+
+# Special Thanks
+
+Alan Agius, Charles Lyding, Joey Perrott, Cédric Exbrayat, Doug Parker, Joshua Chapman, Billy Lando, Santosh Yadav, mzocateli
+<a name="v12.0.0-rc.0"></a>
+
+# v12.0.0-rc.0 (2021-04-21)
+
+# Commits
+
+<table>
+<tbody>
+
+<tr><td colspan=3><h3>@angular-devkit/build-angular (12.0.0-rc.0)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/88bea1ad72e5b5df8c7e4870fa49f517c263ba05"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/88bea1a-fix-green.svg" />
+</a>
+  </td>
+
+  <td>avoid double build optimizer processing</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/a6e5103b9d3b3c20a5593542823d784e1e68896f"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/a6e5103-fix-green.svg" />
+</a>
+  </td>
+
+  <td>replace Webpack 4 `hashForChunk` hook usage</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/c53a17886a263e686151c440938233e5f245218d"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/c53a178-fix-green.svg" />
+</a>
+  </td>
+
+  <td>use new Webpack watch API in karma webpack plugin</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/bac34e5268b1aa9348edcf079240668bb6583b5f"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/bac34e5-fix-green.svg" />
+</a>
+  </td>
+
+  <td>recover from CSS optimization errors</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/88467b3b659f2ae6a34f2214705d2dec4c046c76"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/88467b3-fix-green.svg" />
+</a>
+  </td>
+
+  <td>disable Webpack 5 automatic public path support</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/898a486315a9e2762208c6b95b439751928e1ec7"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/898a486-fix-green.svg" />
+</a>
+  </td>
+
+  <td>always inject live reload client when using live reload</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/656f8d75a3368a5affd1c55145841123dafdb007"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/656f8d7-fix-green.svg" />
+</a>
+  </td>
+
+  <td>change several builder options defaults</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/7a8686abe9d490f22ff25f6b02709c9e18d3c410"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/7a8686a-fix-green.svg" />
+</a>
+  </td>
+
+  <td>show warning when using stylus</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/a11f4644861616f7d0929e62ae9833e795dd8649"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/a11f464-fix-green.svg" />
+</a>
+  </td>
+
+  <td>set Tailwind CSS mode when using Tailwind</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/33ca65aaa80c22c708c64a19f0374f5493244995"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/33ca65a-fix-green.svg" />
+</a>
+  </td>
+
+  <td>avoid triggering file change after file build</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/fa0fc45b8782910e09689bd40a6f8d2743c5b0ce"><img
+   align="top"
+   title="Performance Improvement" src="https://img.shields.io/badge/fa0fc45-perf-orange.svg" />
+</a>
+  </td>
+
+  <td>use Webpack's GC memory caching in watch mode</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr></tr>
+
+<tr><td colspan=3><h3>@angular/cli (12.0.0-rc.0)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/5cc1a4e382b0fb43339bddbf9f2fcbddbda7744a"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/5cc1a4e-fix-green.svg" />
+</a>
+  </td>
+
+  <td>ignore `tsickle` during updates</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/cd198d5f2f04558bb7f518c6db19a6236f83b620"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/cd198d5-fix-green.svg" />
+</a>
+  </td>
+
+  <td>run all migrations when updating from or between prereleases</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr><td colspan=3><h3>@ngtools/webpack (12.0.0-rc.0)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/ca5ceaa10780bf5d05262bd2bc2e5909d51d3aa9"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/ca5ceaa-fix-green.svg" />
+</a>
+  </td>
+
+  <td>only track actual resource file dependencies</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/22ac3b387c2a4231556e188bb7e6d9eda6989a39"><img
+   align="top"
+   title="Performance Improvement" src="https://img.shields.io/badge/22ac3b3-perf-orange.svg" />
+</a>
+  </td>
+
+  <td>cache results of processed inline resources</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr><td colspan=3><h3>@schematics/angular (12.0.0-rc.0)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/1bf976f663e938164eb3ff55540ea0b3934d3a00"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/1bf976f-fix-green.svg" />
+</a>
+  </td>
+
+  <td>set `inlineStyleLanguage` when application `style` option is used</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/ab44cb2df79da301dc5cde167bc8a51cfe15e1d6"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/ab44cb2-fix-green.svg" />
+</a>
+  </td>
+
+  <td>set `inlineStyleLanguage` for universal if present in build options</td>
+
+  <td>
+  </td>
+</tr>
+
+</tbody>
+</table>
+
+---
+
+# Breaking Changes
+
+<h3>
+    @schematics/angular: remove `stylus` from `style` options (<a href="https://github.com/angular/angular-cli/commit/fd729aca0e74c242797d4697786fbede06bc844b">fd729ac</a>)
+</h3>
+`styl` (Stylus) is no longer a supported value as `style` in `application`, `component`, `ng-new` schematics. Stylus is not actively maintained and only 0.3% of the Angular CLI users use it.
+
+(cherry picked from commit 0272fc55b67d1a3f986b996c8eb21aea31eedf51)
+
+<h3>
+    @angular-devkit/build-angular: change several builder options defaults (<a href="https://github.com/angular/angular-cli/commit/656f8d75a3368a5affd1c55145841123dafdb007">656f8d7</a>)
+</h3>
+A number of browser and server builder options have had their default values changed. The aim of these changes is to reduce the configuration complexity and support the new "production builds by default" initiative.
+
+**Browser builder**
+| Option | Previous default value | New default value |
+|----------------------------------------|---------------------------|-------------------|
+| optimization | false | true |
+| aot | false | true |
+| buildOptimizer | false | true |
+| sourceMap | true | false |
+| extractLicenses | false | true |
+| namedChunks | true | false |
+| vendorChunk | true | false |
+
+**Server builder**
+| Option | Previous default value | New default value |
+|---------------|------------------------|-------------------|
+| optimization | false | true |
+| sourceMap | true | false |
+
+(cherry picked from commit 0a74d0d28daf68510459ed73ef048c91bfcabbbc)
+
+---
+
+# Special Thanks
+
+Alan Agius, Charles Lyding, Keen Yee Liau, Joey Perrott, David Shevitz
+<a name="v12.0.0-next.9"></a>
+
+# v12.0.0-next.9 (2021-04-14)
+
+# Commits
+
+<table>
+<tbody>
+
+<tr><td colspan=3><h3>@angular-devkit/build-angular (12.0.0-next.9)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/d883ce5d7e39de774fe90e4ccdbc9a84a600b7e8"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/d883ce5-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>upgrade to Webpack 5 throughout the build system</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/d47b4417d46f85f9f5bb460576d32aa0104e6d43"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/d47b441-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>support processing component inline CSS styles</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/bac563e5ee1efcda4bfb1334ecc0906796584cbd"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/bac563e-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>support specifying stylesheet language for inline component styles</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/f1453126666af62a4ac4b4adca7d4282ecac0038"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/f145312-fix-green.svg" />
+</a>
+  </td>
+
+  <td>update karma builder to use non-deprecated API</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/bd0aba7c80cee63f6fbcb94247fdf3506e9b4afa"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/bd0aba7-fix-green.svg" />
+</a>
+  </td>
+
+  <td>disable webpack cache when using `NG_BUILD_CACHE`</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/cc52e5453cbf40810f56b6ea443c5f089c635a5d"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/cc52e54-fix-green.svg" />
+</a>
+  </td>
+
+  <td>remove duplicate application bundle generation complete message</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/27e63e2b33be48b26a44da69c09198ef9a8dce21"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/27e63e2-fix-green.svg" />
+</a>
+  </td>
+
+  <td>mark programmatic builder execution functions as experimental</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr></tr>
+
+<tr><td colspan=3><h3>@angular-devkit/build-webpack (0.1200.0-next.9)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/18c954129279d68b5c02c9f486a7db34be5492d1"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/18c9541-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>support Webpack 5</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr></tr>
+
+<tr><td colspan=3><h3>@angular-devkit/core (12.0.0-next.9)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/08753138d336fb870a66face70f5624ba64b4c69"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/0875313-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>update schema validator</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr></tr>
+
+<tr><td colspan=3><h3>@angular/cli (12.0.0-next.9)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/d68cb92dc2113753e7eefb91e54b70a60c1acd94"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/d68cb92-fix-green.svg" />
+</a>
+  </td>
+
+  <td>add message update updating from non LTS versions of the CLI</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr></tr>
+
+<tr><td colspan=3><h3>@ngtools/webpack (12.0.0-next.9)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/46e9d0e8a646805ba9e48aac1bc95761f2668571"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/46e9d0e-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>support multiple plugin instances per compilation</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/5e5b2d9b1a15dc0f4f1690bab109bdd8e5613be3"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/5e5b2d9-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>support generating data URIs for inline component styles in JIT</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/8c7d56e03adb9c3303760fc2e38e2d6d96452bac"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/8c7d56e-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>support processing inline component styles in AOT</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr></tr>
+
+<tr><td colspan=3><h3>@schematics/angular (12.0.0-next.9)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/695a01ba02b8c6e9656ed5ed5b0c5e17760ba21d"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/695a01b-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>configure new libraries to be published in Ivy partial mode</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/84e023120864c014a2d1a275265c0941a0a16df2"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/84e0231-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>update `jasmine-spec-reporter` to version 7</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/e33a3061f02828303e3c6ef508b5b23cbc73eef2"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/e33a306-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>migrate web workers to support Webpack 5</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/df988c249363682aa6f9d3d95ae3b8636e24ebf9"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/df988c2-fix-green.svg" />
+</a>
+  </td>
+
+  <td>update web-worker to support Webpack 5</td>
+
+  <td>
+  </td>
+</tr>
+
+</tbody>
+</table>
+
+---
+
+# Breaking Changes
+
+<h3>
+    @angular-devkit/core: update schema validator (<a href="https://github.com/angular/angular-cli/commit/08753138d336fb870a66face70f5624ba64b4c69">0875313</a>)
+</h3>
+support for JSON Schema draft-04 and draft-06 is removed. If you have schemas using the `id` keyword replace them with `$id`. For an interim period we will auto rename any top level `id` keyword to `$id`.
+
+**NB**: This change only effects schematics and builders authors.
+
+<h3>
+    @angular-devkit/build-angular: upgrade to Webpack 5 throughout the build system (<a href="https://github.com/angular/angular-cli/commit/d883ce5d7e39de774fe90e4ccdbc9a84a600b7e8">d883ce5</a>)
+</h3>
+Webpack 5 generates similar but differently named files for lazy loaded JavaScript files in development configurations (when the `namedChunks` option is enabled).
+For the majority of users this change should have no effect on the application and/or build process. Production builds should also not be affected as the `namedChunks` option is disabled by default in production configurations.
+However, if a project's post-build process makes assumptions as to the file names then adjustments may need to be made to account for the new naming paradigm.
+Such post-build processes could include custom file transformations after the build, integration into service-side frameworks, or deployment procedures.
+Example development file name change: `lazy-lazy-module.js` --> `src_app_lazy_lazy_module_ts.js`
+
+<h3>
+    @angular-devkit/build-angular: upgrade to Webpack 5 throughout the build system (<a href="https://github.com/angular/angular-cli/commit/d883ce5d7e39de774fe90e4ccdbc9a84a600b7e8">d883ce5</a>)
+</h3>
+Webpack 5 now includes web worker support. However, the structure of the URL within the `Worker` constructor must be in a specific format that differs from the current requirement.
+Web worker usage should be updated as shown below (where `./app.worker` should be replaced with the actual worker name):
+
+Before:
+
+```
+new Worker('./app.worker', ...)
+```
+
+After:
+
+```
+new Worker(new URL('./app.worker', import.meta.url), ...)
+```
+
+---
+
+# Special Thanks
+
+Alan Agius, Charles Lyding, Keen Yee Liau, Doug Parker, Douglas Parker
+<a name="v12.0.0-next.8"></a>
+
+# v12.0.0-next.8 (2021-04-07)
+
+# Commits
+
+<table>
+<tbody>
+
+<tr><td colspan=3><h3>@angular-devkit/build-angular (0.1200.0-next.8)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/eca5a01f6e8d1c3ad874d74c58e6ffbddab6a031"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/eca5a01-fix-green.svg" />
+</a>
+  </td>
+
+  <td>remove deprecated i18nLocale and i18nFormat options from i18n-extract</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr></tr>
+
+<tr><td colspan=3><h3>@ngtools/webpack (12.0.0-next.8)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/160102ae57d780dded6c9002faf07b601a866d3d"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/160102a-fix-green.svg" />
+</a>
+  </td>
+
+  <td>remove Webpack plugin for deprecated ViewEngine compiler</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr></tr>
+
+<tr><td colspan=3><h3>@schematics/angular (12.0.0-next.8)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/645353db26e9d6e8f893322a52b320ccd5ca1d5d"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/645353d-fix-green.svg" />
+</a>
+  </td>
+
+  <td>run update-i18n migration for server builder</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr></tr>
+
+</tbody>
+</table>
+
+---
+
+# Breaking Changes
+
+<h3>
+    @ngtools/webpack: remove Webpack plugin for deprecated ViewEngine compiler (<a href="https://github.com/angular/angular-cli/commit/160102ae57d780dded6c9002faf07b601a866d3d">160102a</a>)
+</h3>
+Removal of View Engine support from application builds
+With the removal of the deprecated View Engine compiler in Angular version 12 for applications, the View Engine Webpack plugin has been removed.
+The Ivy-based Webpack plugin is the default used within the Angular CLI.
+If using a custom standalone Webpack configuration, the removed `AngularCompilerPlugin` should be replaced with the Ivy-based `AngularWebpackPlugin`.
+
+<h3>
+    @angular-devkit/build-angular: remove deprecated i18n options from server and browser builder (<a href="https://github.com/angular/angular-cli/commit/5cf9a08dc7a1c84568d00df8f957d55b10ce0193">5cf9a08</a>)
+</h3>
+Removal of deprecated browser and server command options.
+- `i18nFile`,  use `locales` object in the project metadata instead.
+- `i18nFormat`, No longer needed as the format will be determined automatically.
+- `i18nLocale`, use `localize` option instead.
+
+<h3>
+    @angular-devkit/build-angular: remove deprecated i18nLocale and i18nFormat options from i18n-extract (<a href="https://github.com/angular/angular-cli/commit/eca5a01f6e8d1c3ad874d74c58e6ffbddab6a031">eca5a01</a>)
+</h3>
+Removal of deprecated `extract-i18n` command options
+The deprecated `i18nLocale` option has been removed and the `i18n.sourceLocale` within a project's configuration should be used instead.
+The deprecated `i18nFormat` option has been removed and the `format` option should be used instead.
+
+---
+
+# Special Thanks
+
+Charles Lyding, Renovate Bot, Alan Agius, Doug Parker, Joey Perrott
+<a name="v12.0.0-next.7"></a>
+
+# v12.0.0-next.7 (2021-04-02)
+
+# Commits
+
+<table>
+<tbody>
+
+<tr><td colspan=3><h3>@angular-devkit/build-angular (0.1200.0-next.7)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/51cb3181ea947b851bab42e816a87bb181dad15e"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/51cb318-fix-green.svg" />
+</a>
+  </td>
+
+  <td>validate scripts and styles bundleName</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/20360">
+  [Closes #20360]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/012700ace56d6d0e35d6798c5a19534ffa5a5a0e"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/012700a-fix-green.svg" />
+</a>
+  </td>
+
+  <td>remove deprecated View Engine support for i18n extraction</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/677913fc389f0ffa20e3e1928d7244427c07ef35"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/677913f-fix-green.svg" />
+</a>
+  </td>
+
+  <td>remove usage of deprecated View Engine compiler</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr></tr>
+
+<tr><td colspan=3><h3>@angular/cli (12.0.0-next.7)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/e84fa72751b377ec4cf2419357190a79b0513377"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/e84fa72-fix-green.svg" />
+</a>
+  </td>
+
+  <td>ensure update migrations are fully executed</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/8a805fe0b9a0db3329aa51d95a41f3baacd45feb"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/8a805fe-fix-green.svg" />
+</a>
+  </td>
+
+  <td>exclude deprecated packages with removal migrations from update</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr><td colspan=3><h3>@ngtools/webpack (12.0.0-next.7)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/430ee441bd2e5729a8a24f72a1df8fd782c9f9f6"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/430ee44-fix-green.svg" />
+</a>
+  </td>
+
+  <td>use correct Webpack asset stage in resource loader</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/aeebd14f04b8e520b0144a77e765da807a08dda0"><img
+   align="top"
+   title="Performance Improvement" src="https://img.shields.io/badge/aeebd14-perf-orange.svg" />
+</a>
+  </td>
+
+  <td>only check affected files for Angular semantic diagnostics</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr><td colspan=3><h3>@schematics/angular (12.0.0-next.7)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/8582ddc35e153b8bc409d0505f29bc43e6cef455"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/8582ddc-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>remove `entryComponent` from `component` schematic</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/fb14945c02a3f150d6965e77324416b1ec7cc575"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/fb14945-fix-green.svg" />
+</a>
+  </td>
+
+  <td>correctly handle adding multi-line strings to `@NgModule` metadata</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/6fa88567211ededc657f5cbeb71afb8592191058"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/6fa8856-fix-green.svg" />
+</a>
+  </td>
+
+  <td>explicitly specify ServiceWorker registration strategy</td>
+
+  <td>
+  </td>
+</tr>
+
+</tbody>
+</table>
+
+---
+
+# Breaking Changes
+
+<h3>
+    @angular-devkit/build-angular: remove usage of deprecated View Engine compiler (<a href="https://github.com/angular/angular-cli/commit/677913fc389f0ffa20e3e1928d7244427c07ef35">677913f</a>)
+</h3>
+Removal of View Engine support from application builds
+With the removal of the deprecated View Engine compiler in Angular version 12 for applications, Ivy-based compilation will always be used when building an application.
+The default behavior for applications is to use the Ivy compiler when building and no changes are required for these applications.
+For applications that have opted-out of Ivy, a warning will be shown and an Ivy-based build will be attempted. If the build fails,
+the application may need to be updated to become Ivy compatible.
+
+<h3>
+    @schematics/angular: remove `entryComponent` from `component` schematic (<a href="https://github.com/angular/angular-cli/commit/8582ddc35e153b8bc409d0505f29bc43e6cef455">8582ddc</a>)
+</h3>
+`entryComponent` option has been removed from the `component` schematic as this was intended to be used with the the now no longer supported ViewEngine rendering engine.
+
+<h3>
+    @angular-devkit/build-angular: remove view engine app-shell generation (<a href="https://github.com/angular/angular-cli/commit/1c2aeeb46a23fd511c89f9c8800ac2a5ab0c2734">1c2aeeb</a>)
+</h3>
+App-shell builder now only supports generation using Ivy
+
+<h3>
+    @angular-devkit/build-angular: remove deprecated View Engine support for i18n extraction (<a href="https://github.com/angular/angular-cli/commit/012700ace56d6d0e35d6798c5a19534ffa5a5a0e">012700a</a>)
+</h3>
+Removal of View Engine support from i18n extraction
+With the removal of the deprecated View Engine compiler in Angular version 12 for applications, the `ng extract-i18n` command will now always use the Ivy compiler.
+The `--ivy` option has also been removed as Ivy-based extraction is always enabled.
+The default behavior for applications is to use the Ivy compiler for building/extraction and no changes are required for these applications.
+For applications that have opted-out of Ivy, a warning will be shown and Ivy-based extraction will be attempted. If the extraction fails,
+the application may need to be updated to become Ivy compatible.
+
+---
+
+# Special Thanks
+
+Charles Lyding, Alan Agius, Renovate Bot, George Kalpakas, Joey Perrott, Keen Yee Liau
+<a name="v12.0.0-next.6"></a>
+
+# v12.0.0-next.6 (2021-03-24)
+
+# Commits
+
+<table>
+<tbody>
+
+<tr><td colspan=3><h3>@angular-devkit/build-angular (0.1200.0-next.6)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/ac4c109bebac3ea3d562f000c46a98d61b1bd148"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/ac4c109-fix-green.svg" />
+</a>
+  </td>
+
+  <td>ensure output directory is present before writing stats JSON</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr></tr>
+
+<tr><td colspan=3><h3>@schematics/angular (12.0.0-next.6)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/c7e126609f4a0d86bd47a226717ab6430fd85cfd"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/c7e1266-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>add production by default optional migration</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/f22f7e7371c0daa2dc59110cd21e3ff3fb4620d5"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/f22f7e7-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>update new workspaces to use Karma 6.3</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/09daf7a7e0886738f25f071aa5e072e1dc06bf7e"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/09daf7a-fix-green.svg" />
+</a>
+  </td>
+
+  <td>remove leftover workspace tslint config</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr></tr>
+
+</tbody>
+</table>
+
+---
+
+---
+
+# Special Thanks
+
+Renovate Bot, Alan Agius, Charles Lyding, Keen Yee Liau
+<a name="v12.0.0-next.5"></a>
+
+# v12.0.0-next.5 (2021-03-18)
+
+# Commits
+
+<table>
+<tbody>
+
+<tr><td colspan=3><h3>@angular-devkit/build-angular (0.1200.0-next.5)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/1525e7ab2c3c6cd95ee91cf01243af78174246ca"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/1525e7a-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>expose legacy-migrate message format</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/2616ef0d3fdf6821a60f5ae9dcb54d65be0506e1"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/2616ef0-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>integrate JIT mode linker</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/20281">
+  [Closes #20281]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/075c988dd14711755516261e3e6150c316d866cb"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/075c988-fix-green.svg" />
+</a>
+  </td>
+
+  <td>display correct filename for bundles that are ES2016+</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/9714aa92bfb7babb1a6720515b543614acd47cac"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/9714aa9-fix-green.svg" />
+</a>
+  </td>
+
+  <td>don't load an input sourcemap from file when using Babel</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/d5645675fd555e7f1afd523d4f2d42095034fc46"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/d564567-fix-green.svg" />
+</a>
+  </td>
+
+  <td>support writing large Webpack stat outputs</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/63a2dbb8b42c6c62e37b27c42238860f7e57b87f"><img
+   align="top"
+   title="Performance Improvement" src="https://img.shields.io/badge/63a2dbb-perf-orange.svg" />
+</a>
+  </td>
+
+  <td>skip FESM2015 from `async` transformation</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/3affd28f5ebdaa9fb8f3239292e3d0060f655d07"><img
+   align="top"
+   title="Performance Improvement" src="https://img.shields.io/badge/3affd28-perf-orange.svg" />
+</a>
+  </td>
+
+  <td>remove Webpack Stats.toJson usage in analytics plugin</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/699b641b85632f9581f3638ccd8aa359dd8aa57f"><img
+   align="top"
+   title="Performance Improvement" src="https://img.shields.io/badge/699b641-perf-orange.svg" />
+</a>
+  </td>
+
+  <td>remove Webpack Stats.toJson usage in karma plugin</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/2d6e82fa106e9dfd1bb4909d56e5730195c6b2e6"><img
+   align="top"
+   title="Performance Improvement" src="https://img.shields.io/badge/2d6e82f-perf-orange.svg" />
+</a>
+  </td>
+
+  <td>enforce Babel not to load sourcemaps from file</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/00ff390feaeb457812d67c367f65ba799d3ac66a"><img
+   align="top"
+   title="Performance Improvement" src="https://img.shields.io/badge/00ff390-perf-orange.svg" />
+</a>
+  </td>
+
+  <td>disable `showCircularDependencies` by default</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr><td colspan=3><h3>@angular-devkit/build-webpack (0.1200.0-next.5)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/ff32ada86b486d96922c693f703e25e01848d020"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/ff32ada-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>provide output path in builder results</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr></tr>
+
+<tr><td colspan=3><h3>@angular/cli (12.0.0-next.5)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/985dc1a4c71693ad78c35f5d6e95397f9753239e"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/985dc1a-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>confirm ng add action before installation</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/79856644b4d476d50013eafee949d1a508b86104"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/7985664-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>support TypeScript 4.2</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/d254d058f9be6b6a696bd39a37c2457776b46806"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/d254d05-fix-green.svg" />
+</a>
+  </td>
+
+  <td>remove `project` from required properties in ng-packagr schema</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr></tr>
+
+<tr><td colspan=3><h3>@ngtools/webpack (12.0.0-next.5)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/3504c43e48d8e265ca0943005f3cea2d25290cbd"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/3504c43-fix-green.svg" />
+</a>
+  </td>
+
+  <td>remove Webpack 5 deprecation warning in resource loader</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/95aa2b8f925ee295b8edf659b5d8e706d122ffec"><img
+   align="top"
+   title="Performance Improvement" src="https://img.shields.io/badge/95aa2b8-perf-orange.svg" />
+</a>
+  </td>
+
+  <td>avoid adding transitive dependencies to Webpack's dependency graph</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/dfefd6ba4fcda6baa3dc172978ca84acaa48ec54"><img
+   align="top"
+   title="Performance Improvement" src="https://img.shields.io/badge/dfefd6b-perf-orange.svg" />
+</a>
+  </td>
+
+  <td>use precalculated dependencies in unused file check</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr></tr>
+
+<tr><td colspan=3><h3>@schematics/angular (12.0.0-next.5)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/81129e12d0ae4cbaeb5ab537facb7990be9b8b45"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/81129e1-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>update several TypeScript compilation target (Syntax)</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/226a8d274d27d191651926bc7970af11cfee2597"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/226a8d2-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>remove tslint and codelyzer from new projects</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/20105">
+  [Closes #20105]<br />
+</a>
+
+<a href="https://github.com/angular/angular-cli/issues/18465">
+  [Closes #18465]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/663c4bc9c10aa3df3defa188a1ba8f90c63b2722"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/663c4bc-fix-green.svg" />
+</a>
+  </td>
+
+  <td>remove references to the prod flag</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/9ea34ba202b2cccfdda820b4975de54cd56acf43"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/9ea34ba-fix-green.svg" />
+</a>
+  </td>
+
+  <td>fix youtube icon margin</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/3bf831fac6166f6943a78b34bfd5f3c167f8911d"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/3bf831f-fix-green.svg" />
+</a>
+  </td>
+
+  <td>only show legacy browsers deprecation warning when option is used</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/ee4918db40b0b30d58e1119a0291954234d4f797"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/ee4918d-fix-green.svg" />
+</a>
+  </td>
+
+  <td>remove Native value from viewEncapsulation option</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/870173633a54f7dbd06a420adb3dc3593d6010c4"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/8701736-fix-green.svg" />
+</a>
+  </td>
+
+  <td>use title for svg on home page</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr></tr>
+
+</tbody>
+</table>
+
+---
+
+# Breaking Changes
+
+<h3>
+    @angular/cli: confirm ng add action before installation (<a href="https://github.com/angular/angular-cli/commit/985dc1a4c71693ad78c35f5d6e95397f9753239e">985dc1a</a>)
+</h3>
+The `ng add` command will now ask the user to confirm the package and version prior to installing and executing an uninstalled package.
+This new behavior allows a user to abort the action if the version selected is not appropriate or if a typo occurred on the command line and an incorrect package would be installed.
+A `--skip-confirmation` option has been added to skip the prompt and directly install and execute the package. This option is useful in CI and non-TTY scenarios such as automated scripts.
+
+---
+
+# Special Thanks
+
+Alan Agius, Charles Lyding, Renovate Bot, Doug Parker, Cédric Exbrayat, Kristiyan Kostadinov, Mouad Ennaciri, Omar Hasan
+<a name="v12.0.0-next.4"></a>
+
+# v12.0.0-next.4 (2021-03-10)
+
+# Commits
+
+<table>
+<tbody>
+
+<tr><td colspan=3><h3>@angular-devkit/architect (0.1200.0-next.4)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/1da359ac08d1a5503ab152db72ee6cee927391b8"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/1da359a-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>add implementation for defaultConfiguration</td>
+
+  <td>
+  </td>
+</tr>
+<tr></tr>
+
+<tr><td colspan=3><h3>@angular-devkit/build-angular (0.1200.0-next.4)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/71eab3ddb603cb70a98120012a174cb159d9b28d"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/71eab3d-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>show warning during build when project requires IE 11 support</td>
+
+  <td>
+  </td>
+</tr>
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/84f39778cc37c997d0b2b5295f766e08d4c94c78"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/84f3977-fix-green.svg" />
+</a>
+  </td>
+
+  <td>only remove nomodule and defer attributes empty values</td>
+
+  <td>
+
+<a href="https://github.com/angular/angular-cli/issues/20207">
+  [Closes #20207]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr><td colspan=3><h3>@angular-devkit/core (12.0.0-next.4)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/8e981d08809a7f1084b5cae7a539217d6fe7f757"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/8e981d0-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>add handling for `defaultConfiguration` target definition property</td>
+
+  <td>
+  </td>
+</tr>
+<tr></tr>
+
+<tr><td colspan=3><h3>@angular/cli (12.0.0-next.4)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/a5877bf91765af71c1368fd2fb61d29079931205"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/a5877bf-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>deprecate `--prod` command line argument</td>
+
+  <td>
+  </td>
+</tr>
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/f7e3e2335dfd6f54f435c95baa024c60a94b791c"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/f7e3e23-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>add `defaultConfiguration` property to architect schema</td>
+
+  <td>
+  </td>
+</tr>
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/06335515eb05c84d8dfdbfa10f8e3201b714d5da"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/0633551-fix-green.svg" />
+</a>
+  </td>
+
+  <td>avoid exceptions for expected errors in architect commands</td>
+
+  <td>
+  </td>
+</tr>
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/5f8155dc33b1f95f81562cf40a56fdbd0f4140e4"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/5f8155d-fix-green.svg" />
+</a>
+  </td>
+
+  <td>add ng-packagr builder schema in IDE schema</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr><td colspan=3><h3>@ngtools/webpack (12.0.0-next.4)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/0dc73276cafd42415dcaa6507ab221f1116273b5"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/0dc7327-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>drop support for string based lazy loading</td>
+
+  <td>
+  </td>
+</tr>
+<tr></tr>
+
+<tr><td colspan=3><h3>@schematics/angular (12.0.0-next.4)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/3ee12af89be58ccea8996e2e86a18a23d193abbe"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/3ee12af-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>add migration to update lazy loading string syntax to use dynamic imports</td>
+
+  <td>
+  </td>
+</tr>
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/f4875b967ae9ca5640cb27bfb37166528cab88d8"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/f4875b9-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>add migration to remove `lazyModules` configuration option</td>
+
+  <td>
+  </td>
+</tr>
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/3b7470d4836bcfff31ee4bf90ec4396f2905c633"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/3b7470d-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>deprecate `legacyBrowsers` application and ng-new option</td>
+
+  <td>
+  </td>
+</tr>
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/1de6d71edd899465a01c65790f6fb04159acc821"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/1de6d71-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>production builds by default</td>
+
+  <td>
+  </td>
+</tr>
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/ba6f546a026a3dba613c1c54ce0c767fe0940d0f"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/ba6f546-fix-green.svg" />
+</a>
+  </td>
+
+  <td>add `additionalProperties` to all schemas</td>
+
+  <td>
+  </td>
+</tr>
+<tr></tr>
+
+</tbody>
+</table>
+
+---
+
+# Breaking Changes
+
+<h3>
+    @angular-devkit/build-angular: remove deprecated `lazyModules` option (<a href="https://github.com/angular/angular-cli/commit/8d669123236c49e7f6bee1a7171c002abe03df1a">8d66912</a>)
+</h3>
+Server and Browser builder `lazyModules` option has been removed without replacement.
+
+<h3>
+    @ngtools/webpack: drop support for string based lazy loading (<a href="https://github.com/angular/angular-cli/commit/0dc73276cafd42415dcaa6507ab221f1116273b5">0dc7327</a>)
+</h3>
+With this change we drop support for string based lazy loading `./lazy.module#LazyModule`  use dynamic imports instead.
+
+The following options which were used to support the above syntax were removed without replacement.
+
+- discoverLazyRoutes
+- additionalLazyModules
+- additionalLazyModuleResources
+- contextElementDependencyConstructor
+
+---
+
+# Special Thanks
+
+Alan Agius, Charles Lyding, Renovate Bot, Joey Perrott
+<a name="v12.0.0-next.3"></a>
+
+# v12.0.0-next.3 (2021-03-03)
+
+# Commits
+
+<table>
+<tbody>
+
+<tr><td colspan=3><h3>@angular-devkit/build-angular (0.1200.0-next.3)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/aa3ea885ed69cfde0914abae547e15d6d499a908"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/aa3ea88-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>enable inlineCritical by default</td>
+
+  <td>
+  </td>
+</tr>
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/6a7d1e0be4c59b27e78d1b03c083bdb2982c3845"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/6a7d1e0-fix-green.svg" />
+</a>
+  </td>
+
+  <td>remove left-over `experimentalRollupPass` option</td>
+
+  <td>
+  </td>
+</tr>
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/11b1d9c2d1fb75df968fa31b5fcdeeb072f87b52"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/11b1d9c-fix-green.svg" />
+</a>
+  </td>
+
+  <td>inline critical font-face rules when using crittical css inlining</td>
+
+  <td>
+  </td>
+</tr>
+<tr></tr>
+
+<tr><td colspan=3><h3>@schematics/angular (12.0.0-next.3)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/f127136033f604b443568e7ade1ff26f50ec1dbe"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/f127136-fix-green.svg" />
+</a>
+  </td>
+
+  <td>update ng new links</td>
+
+  <td>
+  </td>
+</tr>
+<tr></tr>
+
+</tbody>
+</table>
+
+---
+
+# Breaking Changes
+
+<h3>
+    @angular-devkit/build-angular: enable inlineCritical by default (<a href="https://github.com/angular/angular-cli/commit/aa3ea885ed69cfde0914abae547e15d6d499a908">aa3ea88</a>)
+</h3>
+Critical CSS inlining is now enabled by default. If you wish to turn this off set `inlineCritical` to `false`.
+
+See: https://angular.io/guide/workspace-config#optimization-configuration
+
+---
+
+# Special Thanks
+
+Renovate Bot, Charles Lyding, Alan Agius, Keen Yee Liau, Douglas Parker, twerske
+<a name="v12.0.0-next.2"></a>
+
+# v12.0.0-next.2 (2021-02-24)
+
+# Commits
+
+<table>
+<tbody>
+
+<tr><td colspan=3><h3>@angular-devkit/build-angular (0.1200.0-next.2)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/7ef73c8524b864244da027284d8bb3402f7ed8d3"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/7ef73c8-fix-green.svg" />
+</a>
+  </td>
+
+  <td>only show index and service worker status once</td>
+
+  <td>
+  </td>
+</tr>
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/2ef39498b03da036b3214c20a9b160b3efef4d5e"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/2ef3949-fix-green.svg" />
+</a>
+  </td>
+
+  <td>disable declaration and declarationMap</td>
+
+  <td>
+
+<a href="https://github.com/angular/angular-cli/issues/20103">
+  [Closes #20103]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr><td colspan=3><h3>@angular/cli (12.0.0-next.2)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/065ac4546fbb4928245609d52c1f6d81fdd48cb9"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/065ac45-fix-green.svg" />
+</a>
+  </td>
+
+  <td>remove npm 7 incompatibility notification</td>
+
+  <td>
+  </td>
+</tr>
+<tr></tr>
+
+<tr><td colspan=3><h3>@schematics/angular (12.0.0-next.2)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/d19d2ccae55f96d4d8260da6572f34a47616a89b"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/d19d2cc-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>update new project dependencies version</td>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/issues/20106">
+  [Closes #20106]<br />
+</a>
+
+  </td>
+</tr>
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/1199205bc2844e2c83d8f8e5092e89f8bd24eec1"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/1199205-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>augment `universal` schematics to import `platform-server` shims</td>
+
+  <td>
+<a href="https://github.com/angular/angular/issues/40559">
+  [Closes #40559]<br />
+</a>
+
+  </td>
+</tr>
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/96a4467ce90fb6b88f5be39f73c8fd64ce057a4a"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/96a4467-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>add migration to remove emitDecoratorMetadata</td>
+
+  <td>
+  </td>
+</tr>
+<tr></tr>
+
+</tbody>
+</table>
+
+---
+
+---
+
+# Special Thanks
+
+Renovate Bot, Charles Lyding, Alan Agius, Doug Parker, Joey Perrott, Jefiozie, George Kalpakas, Keen Yee Liau
+<a name="v12.0.0-next.1"></a>
+
+# v12.0.0-next.1 (2021-02-17)
+
+# Commits
+
+<table>
+<tbody>
+
+<tr><td colspan=3><h3>@angular-devkit/build-angular (0.1200.0-next.1)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/44e75be5b127545bf87e2d6d61370944f4d380a1"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/44e75be-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>drop support for ng-packagr version 11</td>
+
+  <td>
+  </td>
+</tr>
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/fa5cf53b644c96a50d09dce5f9e9ee401bf66053"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/fa5cf53-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>drop support for karma version 5.2</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr><td colspan=3><h3>@angular-devkit/build-optimizer (0.1200.0-next.1)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/1f83f305db88aeb5164f6d13869f7cc10e44527e"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/1f83f30-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>support Webpack 5</td>
+
+  <td>
+  </td>
+</tr>
+<tr></tr>
+
+<tr><td colspan=3><h3>@angular/cli (12.0.0-next.1)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/3d99468b455825fd97146e6496e7d712100e235a"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/3d99468-fix-green.svg" />
+</a>
+  </td>
+
+  <td>support update migration packages with no entry points</td>
+
+  <td>
+
+<a href="https://github.com/angular/angular-cli/issues/20032">
+  [Closes #20032]<br />
+</a>
+
+  </td>
+</tr>
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/b179a704829fef72191045a443b4b7eb7d20141c"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/b179a70-fix-green.svg" />
+</a>
+  </td>
+
+  <td>ensure odd number Node.js version message is a warning</td>
+
+  <td>
+  </td>
+</tr>
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/9a44bf4aaf6c800043e44c8b238453fd4d295fb5"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/9a44bf4-fix-green.svg" />
+</a>
+  </td>
+
+  <td>improve error logging when resolving update migrations</td>
+
+  <td>
+  </td>
+</tr>
+<tr></tr>
+
+<tr><td colspan=3><h3>@ngtools/webpack (12.0.0-next.1)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/789e05d800c1093881d24a066fb7881c26332349"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/789e05d-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>support Webpack 5</td>
+
+  <td>
+  </td>
+</tr>
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/c6e65e434614b8076e66c636c1c9c6c241ce750f"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/c6e65e4-fix-green.svg" />
+</a>
+  </td>
+
+  <td>normalize paths when pruning AOT rebuild requests</td>
+
+  <td>
+  </td>
+</tr>
+
+<tr><td colspan=3><h3>@schematics/angular (12.0.0-next.1)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/7d57dd2f3e7d36cc4ed2c356f79139486790cbfa"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/7d57dd2-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>add migration to use new zone.js entry-points</td>
+
+  <td>
+  </td>
+</tr>
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/bb38f85202f749040b241c8277280fab21c3379c"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/bb38f85-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>use new zone.js entry-points</td>
+
+  <td>
+  </td>
+</tr>
+
+</tbody>
+</table>
+
+---
+
+# Breaking Changes
+
+<h3>
+    @angular-devkit/build-angular: drop support for zone.js 0.10 (<a href="https://github.com/angular/angular-cli/commit/f309516bcdcee711fc5693b5f14d6fef1cfa5dba">f309516</a>)
+</h3>
+Minimum supported `zone.js` version is `0.11.4`
+
+<h3>
+    @angular-devkit/build-angular: drop support for ng-packagr version 11 (<a href="https://github.com/angular/angular-cli/commit/44e75be5b127545bf87e2d6d61370944f4d380a1">44e75be</a>)
+</h3>
+Minimum supported `ng-packagr` version is `12.0.0-next`
+
+<h3>
+    @angular-devkit/build-angular: drop support for karma version 5.2 (<a href="https://github.com/angular/angular-cli/commit/fa5cf53b644c96a50d09dce5f9e9ee401bf66053">fa5cf53</a>)
+</h3>
+Minimum supported `karma` version is `6.0.0`
+
+---
+
+# Special Thanks
+
+Renovate Bot, Alan Agius, Charles Lyding, Keen Yee Liau, Aravind V Nair
+<a name="v12.0.0-next.0"></a>
+
+# v12.0.0-next.0 (2021-02-11)
+
+# Commits
+
+<table>
+<tbody>
+
+<tr><td colspan=3><h3>@angular-devkit/build-angular (0.1200.0-next.0)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/93376177235108ed15a2fbba8ea079bc565802ce"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/9337617-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>add `postcss-preset-env` with stage 3 features</td>
+
+  <td>
+  </td>
+</tr>
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/fe90b766df2eee2c1289c0f43fb7504377152a51"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/fe90b76-fix-green.svg" />
+</a>
+  </td>
+
+  <td>ensure i18n extraction sourcemaps are fully configured</td>
+
+  <td>
+  </td>
+</tr>
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/1b5971a0bc0560067f5fdb993d52485dd1226b6c"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/1b5971a-fix-green.svg" />
+</a>
+  </td>
+
+  <td>the root Tailwind configuration file is always picked</td>
+
+  <td>
+  </td>
+</tr>
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/a7ffce10ee18d069aab3ef6cc010cfb08e77813e"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/a7ffce1-fix-green.svg" />
+</a>
+  </td>
+
+  <td>fixed ignoring of karma plugins config</td>
+
+  <td>
+
+<a href="https://github.com/angular/angular-cli/issues/19993">
+  [Closes #19993]<br />
+</a>
+
+  </td>
+</tr>
+
+<tr><td colspan=3><h3>@angular-devkit/core (12.0.0-next.0)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/3bb3c6cd51d24fe5636cdcf63670ea164f57aa63"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/3bb3c6c-fix-green.svg" />
+</a>
+  </td>
+
+  <td>ensure job input values are processed in order</td>
+
+  <td>
+  </td>
+</tr>
+<tr></tr>
+
+<tr><td colspan=3><h3>@angular/cli (12.0.0-next.0)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/52aaa8c167dee989b782b5561cb16c5a75e4c2af"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/52aaa8c-fix-green.svg" />
+</a>
+  </td>
+
+  <td>update NPM 7 guidance</td>
+
+  <td>
+  </td>
+</tr>
+<tr></tr>
+
+<tr><td colspan=3><h3>@ngtools/webpack (12.0.0-next.0)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/9eb7fb53bb1e85e551b7b05f4442c0a9e3e9ef8a"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/9eb7fb5-fix-green.svg" />
+</a>
+  </td>
+
+  <td>reduce overhead of Angular compiler rebuild requests</td>
+
+  <td>
+  </td>
+</tr>
+<tr></tr>
+
+<tr><td colspan=3><h3>@schematics/angular (12.0.0-next.0)</h3></td></tr>
+  <tr>
+    <td><b>Commit</b>
+    <td><b>Description</b>
+    <td><b>Notes</b>
+  </tr>
+
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/b105ed63c7610dd1397a3d24d4a7439564a019aa"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/b105ed6-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>strict mode by default</td>
+
+  <td>
+  </td>
+</tr>
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/f424529d9ccaeb16643a8383ad3647af82062b16"><img
+   align="top"
+   title="Feature" src="https://img.shields.io/badge/f424529-feat-blue.svg" />
+</a>
+  </td>
+
+  <td>add migration to remove deprecated options from 'angular.json'</td>
+
+  <td>
+  </td>
+</tr>
+<tr>
+
+  <td>
+<a href="https://github.com/angular/angular-cli/commit/575b1a75b17f0b03748c137c07976e00be4c8b51"><img
+   align="top"
+   title="Bug Fix" src="https://img.shields.io/badge/575b1a7-fix-green.svg" />
+</a>
+  </td>
+
+  <td>only update removed v12 options in migration</td>
+
+  <td>
+  </td>
+</tr>
+<tr></tr>
+
+</tbody>
+</table>
+
+---
+
+# Breaking Changes
+
+<h3>
+    set minimum Node.js version to 12.13 (<a href="https://github.com/angular/angular-cli/commit/d1f616930de4a8312e3441410098d9f248855d9d">d1f6169</a>)
+</h3>
+Node.js version 10 will become EOL on 2021-04-30.
+Angular CLI 12 will require Node.js 12.13+ or 14.15+. Node.js 12.13 and 14.15 are the first LTS releases for their respective majors.
+
+<h3>
+    @angular-devkit/build-angular: remove file-loader dependency (<a href="https://github.com/angular/angular-cli/commit/6732294ff34ca35698cec5a9ca91b664dd684289">6732294</a>)
+</h3>
+The unsupported/undocumented, Webpack specific functionality to `import`/`require()` a non-module file has been removed.
+
+Before
+
+```js
+import img from './images/asset.png';
+```
+
+After
+
+```html
+<img src="images/asset.png" />
+```
+
+---
+
+# Special Thanks
+
+Renovate Bot, Charles Lyding, Alan Agius, Doug Parker, Bruno Baia, Amadou Sall, S. Iftekhar Hossain
+
+---
+
+**Note: For release notes prior to this CHANGELOG see [release notes](https://github.com/angular/angular-cli/releases).**
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index 2c0ac1a2d099..7797df999f36 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -288,18 +288,18 @@ To test if your change effect the public API you need to run the API guardian on
 For example in case `@angular-devkit/core` package was modified you need to run:
 
 ```bash
-yarn bazel test //etc/api:angular_devkit_core_api
+yarn bazel test //goldens/public-api:angular_devkit_core_api
 ```
 
 You can also test all packages by running:
 ```bash
-yarn bazel test //etc/api ...
+yarn bazel test //goldens/public-api ...
 ```
 
 If you modified the public API, the test will fail. To update the golden files you need to run:
 
 ```bash
-yarn bazel run //etc/api:angular_devkit_core_api.accept
+yarn bazel run //goldens/public-api:angular_devkit_core_api.accept
 ```
 
 **Note**: In some cases we use aliased symbols to create namespaces.
diff --git a/README.md b/README.md
index 340f9daa8e70..4bae010dfd5a 100644
--- a/README.md
+++ b/README.md
@@ -49,7 +49,7 @@ To get started locally, follow these instructions:
 
 1. If you haven't done it already, [make a fork of this repo](https://github.com/angular/angular-cli/fork).
 1. Clone to your local computer using `git`.
-1. Make sure that you have Node 10.13 or later installed. See instructions [here](https://nodejs.org/en/download/).
+1. Make sure that you have Node 12.14 or 14.0 installed. See instructions [here](https://nodejs.org/en/download/).
 1. Make sure that you have `yarn` installed; see instructions [here](https://yarnpkg.com/lang/en/docs/install/).
 1. Run `yarn` (no arguments) from the root of your clone of this project to install dependencies.
 
diff --git a/WORKSPACE b/WORKSPACE
index 5d9b136e9034..e2a27f373a6d 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 = "55a25a762fcf9c9b88ab54436581e671bc9f4f523cb5a1bd32459ebec7be68a8",
-    urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/3.2.2/rules_nodejs-3.2.2.tar.gz"],
+    sha256 = "8f5f192ba02319254aaf2cdcca00ec12eaafeb979a80a1e946773c520ae0a2c9",
+    urls = ["https://github.com/bazelbuild/rules_nodejs/releases/download/3.7.0/rules_nodejs-3.7.0.tar.gz"],
 )
 
 # Check the bazel version and download npm dependencies
@@ -31,52 +31,13 @@ check_rules_nodejs_version(minimum_version_string = "2.0.0")
 
 # Setup the Node.js toolchain
 node_repositories(
-    node_version = "12.20.2",
+    node_version = "14.16.1",
     package_json = ["//:package.json"],
-    yarn_version = "1.22.4",
 )
 
 yarn_install(
     name = "npm",
-    data = [
-        "//: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",
 )
-
-##########################
-# Remote Execution Setup #
-##########################
-# Bring in bazel_toolchains for RBE setup configuration.
-http_archive(
-    name = "bazel_toolchains",
-    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")
-load("@bazel_toolchains//rules:rbe_repo.bzl", "rbe_autoconfig")
-
-rbe_autoconfig(
-    name = "rbe_ubuntu1604_angular",
-    # 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/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>
-    # and marketplace.gcr.io/google/rbe-ubuntu16-04:<base_container_digest> have
-    # the same Clang and JDK installed. Clang is needed because of the dependency on
-    # @com_google_protobuf. Java is needed for the Bazel's test executor Java tool.
-    digest = "sha256:f743114235a43355bf8324e2ba0fa6a597236fe06f7bc99aaa9ac703631c306b",
-    env = clang_env(),
-    registry = "marketplace.gcr.io",
-    # We can't use the default "ubuntu16_04" RBE image provided by the autoconfig because we need
-    # a specific Linux kernel that comes with "libx11" in order to run headless browser tests.
-    repository = "google/rbe-ubuntu16-04-webtest",
-    use_checked_in_confs = "Force",
-)
diff --git a/bin/README.md b/bin/README.md
index 6f3d6c17fbd2..8995780c706b 100644
--- a/bin/README.md
+++ b/bin/README.md
@@ -6,11 +6,11 @@ Each file in this directory follows this pattern:
 
 1. JavaScript only.
 1. Requires `../lib/bootstrap-local.js` to bootstrap TypeScript and Node integration.
-1. Requires `../lib/packages` and use the package metadata to find the binary script for the 
-package the script is bootstrapping.
+1. Requires `../lib/packages` and use the package metadata to find the binary script for the
+   package the script is bootstrapping.
 1. Call out main, or simply require the file if it has no export.
 
-`devkit-admin` does not follow this pattern as it needs to setup logging and run some localized 
+`devkit-admin` does not follow this pattern as it needs to setup logging and run some localized
 logic.
 
 In order to add a new script, you should make sure it's in the root `package.json`, so people
diff --git a/bin/architect b/bin/architect
index 7885feefe26a..664ffb1a9785 100755
--- a/bin/architect
+++ b/bin/architect
@@ -1,11 +1,12 @@
 #!/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
  */
+
 'use strict';
 
 
diff --git a/bin/benchmark b/bin/benchmark
index 4ada663d8bfc..cd97efb60fd5 100755
--- a/bin/benchmark
+++ b/bin/benchmark
@@ -1,11 +1,12 @@
 #!/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
  */
+
 'use strict';
 
 
diff --git a/bin/build-optimizer b/bin/build-optimizer
index 6f540387043c..7b784140fbd3 100755
--- a/bin/build-optimizer
+++ b/bin/build-optimizer
@@ -1,11 +1,12 @@
 #!/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
  */
+
 'use strict';
 
 
diff --git a/bin/devkit-admin b/bin/devkit-admin
index 707a854a5b37..e84cee4e7b4a 100755
--- a/bin/devkit-admin
+++ b/bin/devkit-admin
@@ -1,11 +1,12 @@
 #!/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
  */
+
 'use strict';
 
 /**
diff --git a/bin/ng b/bin/ng
index d43c5512e47b..2835ad006929 100755
--- a/bin/ng
+++ b/bin/ng
@@ -1,11 +1,12 @@
 #!/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
  */
+
 'use strict';
 
 
diff --git a/bin/schematics b/bin/schematics
index ea3f5176befa..773dff5b360d 100755
--- a/bin/schematics
+++ b/bin/schematics
@@ -1,11 +1,12 @@
 #!/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
  */
+
 'use strict';
 
 
diff --git a/docs/README.md b/docs/README.md
index a8f139c01847..1aa9fc8f9262 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -1,6 +1,6 @@
 # `/docs` Folder
 
-This folder is used for all documentation. It contains a number of subfolders with short 
+This folder is used for all documentation. It contains a number of subfolders with short
 descriptions here.
 
 ## `/docs/design`
diff --git a/docs/design/analytics.md b/docs/design/analytics.md
index 1658f5d4b91a..88fcd37b8247 100644
--- a/docs/design/analytics.md
+++ b/docs/design/analytics.md
@@ -1,20 +1,23 @@
 # Usage Metrics Gathering
+
 This document list exactly what is gathered and how.
 
 Any change to analytics should most probably include a change to this document.
 
 # Pageview
+
 Each command creates a pageview with the path `/command/${commandName}/${subcommandName}`. IE.
 `ng generate component my-component --dryRun` would create a page view with the path
 `/command/generate/@schematics_angular/component`.
 
 We use page views to keep track of sessions more effectively, and to tag events to a page.
 
-Project names and target names will be removed. 
+Project names and target names will be removed.
 The command `ng run some-project:lint:some-configuration` will create a page view with the path
 `/command/run`.
 
 # Dimensions
+
 Google Analytics Custom Dimensions are used to track system values and flag values. These
 dimensions are aggregated automatically on the backend.
 
@@ -37,6 +40,7 @@ PROJECT NAME TO BUILD OR A MODULE NAME.**
 Note: There's a limit of 20 custom dimensions.
 
 ### List Of All Dimensions
+
 <!--DIMENSIONS_TABLE_BEGIN-->
 | Id | Flag | Type |
 |:---:|:---|:---|
@@ -65,6 +69,7 @@ Note: There's a limit of 20 custom dimensions.
 # Metrics
 
 ### List of All Metrics
+
 <!--METRICS_TABLE_BEGIN-->
 | Id | Flag | Type |
 |:---:|:---|:---|
@@ -86,12 +91,14 @@ Note: There's a limit of 20 custom dimensions.
 <!--METRICS_TABLE_END-->
 
 # Operating System and Node Version
+
 A User Agent string is built to "fool" Google Analytics into reading the Operating System and
 version fields from it. The base dimensions are used for those.
 
 Node version is our App ID, but a dimension is also used to get the numeric MAJOR.MINOR of node.
 
 # Debugging
+
 Using `DEBUG=universal-analytics` will report all calls to the universal-analytics library,
 including queuing events and sending them to the server.
 
@@ -105,6 +112,7 @@ Using `DEBUG=ng:analytics:log` will show what we actually send to GA.
 See [the `debug` NPM library](https://www.npmjs.com/package/debug) for more information.
 
 # Disabling Usage Analytics
+
 There are 2 ways of disabling usage analytics:
 
 1. using `ng analytics off` (or changing the global configuration file yourself). This is the same
@@ -115,9 +123,10 @@ There are 2 ways of disabling usage analytics:
    below).
 
 # CI
+
 A special user named `ci` is used for analytics for tracking CI information. This is a convention
 and is in no way enforced.
 
 Running on CI by default will disable analytics (because of a lack of TTY on STDIN/OUT). It can be
 manually enabled using either a global configuration with a value of `ci`, or using the
-`NG_CLI_ANALYTICS=ci` environment variable. 
+`NG_CLI_ANALYTICS=ci` environment variable.
diff --git a/docs/design/build-system.md b/docs/design/build-system.md
index 93df444fa2ce..fe730f3f9fdd 100644
--- a/docs/design/build-system.md
+++ b/docs/design/build-system.md
@@ -8,6 +8,7 @@ This document describes a top level view of the functionality in `@angular-devki
 Deprecated or soon to be removed features are not described here.
 
 In broad strokes the main areas are:
+
 - loading and processing sources
 - code splitting
 - production optimizations
@@ -16,7 +17,6 @@ In broad strokes the main areas are:
 Many tools are used in this process, and most of these steps happen within a [Webpack](https://webpack.js.org/) build.
 We maintain a number of Webpack-centric plugins in this repository, some of these are public but most are private since they are very specific to our setup.
 
-
 ## Overview diagram
 
 Below is a diagram of processing sources go through.
@@ -31,7 +31,6 @@ Relative paths, such as `./raw-css-loader.ts`, refer to internal plugins, while
 Sources for Angular CLI browser apps are comprised of TypeScript files, style sheets, assets, scripts, and third party dependencies.
 A given build will load these sources from disk, process them, and bundle them together.
 
-
 ### TypeScript and Ahead-Of-Time Compilation
 
 Angular builds rely heavily on TypeScript-specific functionality for [Ahead-of-Time template compilation](https://angular.io/guide/aot-compiler) (AOT).
@@ -58,20 +57,17 @@ Global stylesheets are injected into the `index.html` file, while component styl
 The build system supports plain CSS stylesheets as well as the Sass, LESS and Stylus CSS pre-processors.
 Stylesheet processing functionality is provided by `sass-loader`, `less-loader`, `stylus-loader`, `postcss-loader`, `postcss-import`, augmented in the build system by custom webpack plugins.
 
-
 ### Assets
 
 Assets in the build system refer specifically to a list of files or directories that are meant to be copied verbatim as build artifacts.
 These files are not processed and commonly include images, favicons, pdfs and other generic file types.
 They are loaded into the compilation using `copy-webpack-plugin`.
 
-
 ### Scripts
 
 Scripts in the build system refer specifically to JavaScript files that are meant to be loaded directly on `index.html` without being processed.
 They are loaded into the compilation using a custom webpack plugin.
 
-
 ### Third party dependencies
 
 Third party dependencies are mostly inside `node_modules` and are referenced via imports in source files.
@@ -89,7 +85,6 @@ Once the actual JavaScript file is determined, it is loaded into the compilation
 
 This resolution strategy supports the [Angular Package Format](https://docs.google.com/document/d/1CZC2rcpxffTDfRDs6p1cfbmKNLA6x5O-NtkJglDaBVs/edit#heading=h.k0mh3o8u5hx).
 
-
 ## Code splitting
 
 Code is automatically split into different files (or chunks, for js files) based on a few different triggers.
@@ -102,13 +97,11 @@ If multiple asynchronous chunks contain a reference to the same module, it is pl
 
 There is also a special chunk called `runtime` that contains the module loading logic and is loaded before the others.
 
-
 ## Optimizations
 
 The build system contains optimizations aimed at improving the performance (for development builds) or the size of artifacts (for production builds).
 These are often mutually exclusive and thus we cannot just default to always using them.
 
-
 ### Development optimizations
 
 Development optimizations focus on reducing rebuild time on watched builds.
@@ -125,7 +118,6 @@ In development however, we skip the CSS extraction and leave it as JavaScript co
 Watched builds split the processing load of TypeScript compilation between file emission on the main process and type checking on a forked process.
 Large projects can also opt-out of AOT compilation for faster rebuilds.
 
-
 ### Production optimizations
 
 Angular CLI focuses on enabling tree-shaking (removing unused modules) and dead code elimination (removing unused module code).
@@ -153,7 +145,6 @@ Modules that were concatenated when lazy modules are not present might not be co
 
 Aside from tree-shaking, scripts and styles (as defined in the sources above) also undergo optimizations via [Terser](https://github.com/terser/terser) and [CleanCSS](https://github.com/jakubpawlowicz/clean-css) respectively.
 
-
 ## Post-processing steps
 
 There are some steps that are meant to operate over whole applications and thus happen after the compilation finishes and outputs files.
@@ -161,29 +152,31 @@ The steps are described in the order in which they are executed during a build.
 The execution order was determined based on the complexity of the step with a primary goal of minimizing the repetition of computationally expensive operations.
 
 ### Differential Loading
+
 Differential loading is a strategy that allows your web application to support multiple browsers, but only load the necessary code that the browser needs.
 When differential loading is enabled, the CLI generates two distinct variants of application bundles.
 
-* The first contains ES2015 syntax, takes advantage of built-in support in modern browsers, ships fewer polyfills, and results in a smaller total size.
-* The second contains code in the older ES5 syntax, along with all necessary polyfills for Angular to function. This results in a larger total size, but supports older browsers.
+- The first contains ES2015 syntax, takes advantage of built-in support in modern browsers, ships fewer polyfills, and results in a smaller total size.
+- The second contains code in the older ES5 syntax, along with all necessary polyfills for Angular to function. This results in a larger total size, but supports older browsers.
 
 This process as designed has the advantage that only one full compilation of the application in ES2015 syntax is required.
 This removes a large amount of otherwise unnecessary and duplicate processing such as module resolution and dead code elimination.
 It also guarantees that the application is ES5 compliant including third-party code.
 The two variants of application bundles are created by the following steps:
-1) A full build of the application is performed using an ES2015 output target.
-The application's global stylesheets, scripts, and assets are also processed during this step via the full build.  These elements are reused for both of application variants.
-2) A copy of the JavaScript output application files are transformed (commonly referred to as down-leveled) to ES5 compatible syntax.
-ES2015+ syntax elements such as classes are converted into functionally equivalent ES5 code structures.
-3) An additional ES5-only polyfills file is generated that contains the required Angular polyfills for ES5-only browsers.
-4) A single index HTML file is created that references both application variants and is designed to only load the appropriate files for each browser.
+
+1. A full build of the application is performed using an ES2015 output target.
+   The application's global stylesheets, scripts, and assets are also processed during this step via the full build. These elements are reused for both of application variants.
+2. A copy of the JavaScript output application files are transformed (commonly referred to as down-leveled) to ES5 compatible syntax.
+   ES2015+ syntax elements such as classes are converted into functionally equivalent ES5 code structures.
+3. An additional ES5-only polyfills file is generated that contains the required Angular polyfills for ES5-only browsers.
+4. A single index HTML file is created that references both application variants and is designed to only load the appropriate files for each browser.
 
 To support loading the file sets in the appropriate browsers, the HTML `script` element's `type` and `nomodule` attributes are leveraged.
 Browsers will only load a script with a known type.
 The ES2015 files are referenced using a type of `module` which is only supported on browsers that support ES2015+ code.
 Since browsers that do not support ES2015+ code also do not support the `module` script type, these scripts are ignored for browsers that cannot parse and execute the ES2015 code.
 Browsers that support the `module` script type also support the `nomodule` attribute.
-This attribute instructs a browser that supports module scripts to ignore the script with the attribute.  There is one browser exception in this case: Safari 10.1.
+This attribute instructs a browser that supports module scripts to ignore the script with the attribute. There is one browser exception in this case: Safari 10.1.
 This browser supports module scripts but does not support the `nomodule` attribute.
 To support this case, a special polyfill script is included to provide a workaround for the browser.
 This arrangement of script elements ensures that ES5-only browsers will only execute the ES5 script files and browsers that support ES2015+ will only execute the ES2015 script files.
@@ -198,4 +191,4 @@ This sort of localization produces one application for each locale, each in thei
 
 The third and last post-processing step is the creation of a [service worker](https://developer.mozilla.org/en-US/docs/Web/API/Service_Worker_API).
 A listing of final application files is taken, fingerprinted according to their content, and added to the service worker manifest.
-This must be the last step because it needs each application file to not be modified further.
\ No newline at end of file
+This must be the last step because it needs each application file to not be modified further.
diff --git a/docs/design/deployurl-basehref.md b/docs/design/deployurl-basehref.md
index 160975423aeb..71a804c073e4 100644
--- a/docs/design/deployurl-basehref.md
+++ b/docs/design/deployurl-basehref.md
@@ -1,18 +1,18 @@
-| | Deploy URL | Base HREF |
-|--|:--:|:--:|
-| Initial scripts (index.html) | ✅ 👍 | ✅ 👍  |
-| Initial stylesheets (index.html) | ✅ 👍  | ✅ 👍  |
-| Lazy scripts (routes/import()/etc.) | ✅ 👍  | ✅ 👍  |
-| Processed CSS resources (images/fonts/etc.) | ✅ 👍  | ✅ 👍 |
-| Relative template (HTML) assets | ❌ 👎 | ✅ 👍  |
-| Angular Router Default Base (APP_BASE_HREF) | ❌ | ✅ *1 |
-| Single reference in deployed Application | ❌ 👎  | ✅ 👍 |
-| Special resource logic within CLI | ✅ 👎 | ❌ 👍 |
-| Relative fetch/XMLHttpRequest | ❌ | ✅ |
+|                                             | Deploy URL | Base HREF |
+| ------------------------------------------- | :--------: | :-------: |
+| Initial scripts (index.html)                |   ✅ 👍    |   ✅ 👍   |
+| Initial stylesheets (index.html)            |   ✅ 👍    |   ✅ 👍   |
+| Lazy scripts (routes/import()/etc.)         |   ✅ 👍    |   ✅ 👍   |
+| Processed CSS resources (images/fonts/etc.) |   ✅ 👍    |   ✅ 👍   |
+| Relative template (HTML) assets             |   ❌ 👎    |   ✅ 👍   |
+| Angular Router Default Base (APP_BASE_HREF) |     ❌     |  ✅ \*1   |
+| Single reference in deployed Application    |   ❌ 👎    |   ✅ 👍   |
+| Special resource logic within CLI           |   ✅ 👎    |   ❌ 👍   |
+| Relative fetch/XMLHttpRequest               |     ❌     |    ✅     |
 
 ✅ - has/affects the item/trait
 ❌ - does not have/affect the item/trait
 👍 - favorable behavior
 👎 - unfavorable behavior
 
-*1 -- Users with more complicated setups may need to manually configure the `APP_BASE_HREF` token within the application.  (e.g., application routing base is `/` but assets/scripts/etc. are at `/assets/`)
\ No newline at end of file
+\*1 -- Users with more complicated setups may need to manually configure the `APP_BASE_HREF` token within the application. (e.g., application routing base is `/` but assets/scripts/etc. are at `/assets/`)
diff --git a/docs/design/ngConfig.md b/docs/design/ngConfig.md
index bfb7377a992a..17be6f3a0070 100644
--- a/docs/design/ngConfig.md
+++ b/docs/design/ngConfig.md
@@ -4,11 +4,11 @@
 
 Currently, a project scaffolded with the CLI has no way of specifying options and configurations affecting their projects. There are ways to affect the build (with the `angular-cli-build.js` file), but the following questions cannot be answered without actual project options:
 
-* Where in my directory is my karma.conf file?
-* What is my firebase database URL?
-* Where is my client code?
-* How can I use a different lazy-loading boundary prefix (or none at all)?
-* Any other backend I want to run prior to `ng serve`?
+- Where in my directory is my karma.conf file?
+- What is my firebase database URL?
+- Where is my client code?
+- How can I use a different lazy-loading boundary prefix (or none at all)?
+- Any other backend I want to run prior to `ng serve`?
 
 # Proposed Solution
 
@@ -18,7 +18,6 @@ One solution would be to keep the data in the `package.json`. Unfortunately, the
 
 Instead of polluting the package file, a `.angular-cli.json` file will be created that contains all the values. Access to that file will be allowed to the user if he knows the structure of the file (unknown keys will be kept but ignored), and it's easy to read and write.
 
-
 ## Fallback
 
 There should be two `.angular-cli.json` files; one for the project and a general one. The general one should contain information that can be useful when scaffolding new apps, or informations about the user.
@@ -39,7 +38,7 @@ Every PR that would change the schema should include the update to the `d.ts`.
 
 The new command `get` should be used to output values on the terminal. It takes a set of flags and an optional array of [paths](#path);
 
-* `--glob` or `-g`; the path follows a glob format, where `*` can be replaced by any amount of characters and `?` by a single character. This will output `name=value` for each values matched.
+- `--glob` or `-g`; the path follows a glob format, where `*` can be replaced by any amount of characters and `?` by a single character. This will output `name=value` for each values matched.
 
 Otherwise, outputs the value of the path passed in. If multiple paths are passed in, they follow the format of `name=value`.
 
@@ -47,14 +46,14 @@ Otherwise, outputs the value of the path passed in. If multiple paths are passed
 
 The new command `set` should be used to set values in the local configuration file. It takes a set of flags and an optional array of `[path](#path)=value`;
 
-* `--global`; sets the value in the global configuration.
-* `--remove`; removes the key (no value should be passed in).
+- `--global`; sets the value in the global configuration.
+- `--remove`; removes the key (no value should be passed in).
 
 The schema needs to be taken into account when setting the value of the field;
 
-* If the field is a number, the string received from the command line is parsed. `NaN` throws an error.
-* If the field is an object, an error is thrown.
-* If the path is inside an object but the object hasn't been defined yet, sets the object with empty values (use the schema to create a valid object).
+- If the field is a number, the string received from the command line is parsed. `NaN` throws an error.
+- If the field is an object, an error is thrown.
+- If the path is inside an object but the object hasn't been defined yet, sets the object with empty values (use the schema to create a valid object).
 
 #### Path<a name="path"></a>
 
@@ -77,8 +76,12 @@ A simple API would return the TypeScript interface:
 ```typescript
 class Config {
   // ...
-  get local(): ICliConfig { /* ... */ }
-  get global(): ICliConfig { /* ... */ }
+  get local(): ICliConfig {
+    /* ... */
+  }
+  get global(): ICliConfig {
+    /* ... */
+  }
 }
 ```
 
@@ -115,14 +118,14 @@ The following stands true:
 ```typescript
 const config = new Config(/* ... */);
 
-console.log(config.local.key1.key2.value);   // 0, even if it doesn't exist.
-console.log(config.local.key1.key2.value2);  // 2, local overrides.
-console.log(config.local.key1.key2.value3);  // 3.
-console.log(config.local.key1.key2.value4);  // Schema's default value.
+console.log(config.local.key1.key2.value); // 0, even if it doesn't exist.
+console.log(config.local.key1.key2.value2); // 2, local overrides.
+console.log(config.local.key1.key2.value3); // 3.
+console.log(config.local.key1.key2.value4); // Schema's default value.
 
-console.log(config.global.key1.key2.value);   // 0.
-console.log(config.global.key1.key2.value2);  // 1, only global.
-console.log(config.global.key1.key2.value3);  // Schema's default value.
+console.log(config.global.key1.key2.value); // 0.
+console.log(config.global.key1.key2.value2); // 1, only global.
+console.log(config.global.key1.key2.value3); // Schema's default value.
 
 config.local.key1.key2.value = 1;
 // Now the value is 1 inside the local. Global stays the same.
@@ -132,7 +135,7 @@ config.local.key1.key2.value3 = 5;
 
 config.global.key1.key2.value4 = 99;
 // The local config stays the same.
-console.log(config.local.key1.key2.value4);  // 99, the global value.
+console.log(config.local.key1.key2.value4); // 99, the global value.
 
-config.save();  // Commits if there's a change to global and/or local.
+config.save(); // Commits if there's a change to global and/or local.
 ```
diff --git a/docs/design/third-party-libraries.md b/docs/design/third-party-libraries.md
index 0428efe62832..69ac6a7c8de5 100644
--- a/docs/design/third-party-libraries.md
+++ b/docs/design/third-party-libraries.md
@@ -10,18 +10,18 @@ with metadata that we expect. This document explores ways to improve on the proc
 The following use cases need to be supported by `ng install`:
 
 1. Support for _any_ thirdparties, ultimately falling back to running `npm install` only and
-doing nothing else, if necessary.
+   doing nothing else, if necessary.
 1. Not a new package manager.
 1. Metadata storage by thirdparties in `package.json`. This must be accessible by plugins for
-the build process or even when scaffolding.
+   the build process or even when scaffolding.
 1. Proper configuration of SystemJs in the browser.
 1. SystemJS configuration managed by the user needs to be kept separated from the autogenerated
-part.
+   part.
 1. The build process right now is faulty because the `tmp/` directory used by Broccoli is
-inside the project. TypeScript when using `moduleResolution: "node"` can resolve the
-`node_modules` directory (since it's in an ancestor folder), which means that TypeScript
-compiles properly, but the build does not copy files used by TypeScript to `dist/`. We need
-to proper map the imports and move them to `tmp` before compiling, then to `dist/` properly.
+   inside the project. TypeScript when using `moduleResolution: "node"` can resolve the
+   `node_modules` directory (since it's in an ancestor folder), which means that TypeScript
+   compiles properly, but the build does not copy files used by TypeScript to `dist/`. We need
+   to proper map the imports and move them to `tmp` before compiling, then to `dist/` properly.
 1. Potentially hook into scaffolding.
 1. Potentially hook into the build.
 1. Safe uninstall path.
@@ -34,27 +34,32 @@ Here's a few stories that should work right off:
 $ ng new my-app && cd my-app/
 $ ng install jquery
 ```
+
 ^(this makes jQuery available in the index)
 
 ```sh
 $ ng install angularfire2
 > Please specify your Firebase database URL [my-app.firebaseio.com]: _
 ```
+
 ^(makes firebase available and provided to the App)
 
 ```sh
 $ ng install angularfire2 --dbUrl=my-firebase-db.example.com
 ```
+
 ^(skip prompts for values passed on the command line)
 
 ```sh
 $ ng install angularfire2 --quiet
 ```
+
 ^(using `--quiet` to skip all prompts and use default values)
 
 ```sh
 $ ng install less
 ```
+
 ^(now compiles CSS files with less for the appropriate extensions)
 
 # Proposed Solution
@@ -80,13 +85,16 @@ The `install` task will perform the following subtasks:
 
    These packages can be used to wrap libraries that we want to support but can't update
    easily, like Jasmine or LESS.
+
 1. **Install typings.** See the [Typings](#typings) section.
 1. **Run `postinstall` scripts.**
 
 # Proof of Concept
+
 A proof of concept is being developed.
 
 # Hooks
+
 The third party library can implement hooks into the scaffolding, and the build system. The
 CLI's tasks will look for the proper hooks prior to running and execute them.
 
@@ -96,12 +104,14 @@ checking for the `package['angular-cli']['hooks']['${hookName}']`. The hooks are
 tree, there is no guarantee for the order of execution.
 
 ## Install Hooks
+
 The only tricky part here is install hooks. The installed package should recursively call
 its `(pre|post|)install` hooks only on packages that are newly installed. It should call
 `(pre|post|)reinstall` on those who were already installed. A map of the currently installed
 packages should be kept before performing `npm install`.
 
 # <a name="appData">appData</a>
+
 The `angular-cli` key in the generated app should be used for Angular CLI specific data.
 This includes the CLI configuration itself, as well as third-parties library configuration.
 
@@ -137,11 +147,12 @@ in the data without user interaction. The special strings `${...}` can be used t
 with special values in the default string values. The values are taken from the `package.json`.
 
 We use a declarative style to enforce sensible defaults and make sure developers think about
-this. *In the case where developers want more complex interaction, they can use the
-install/uninstall hooks to prompt users.* But 3rd party libraries developers need to be aware
+this. _In the case where developers want more complex interaction, they can use the
+install/uninstall hooks to prompt users._ But 3rd party libraries developers need to be aware
 that those hooks might not prompt users (no STDIN) and throw an error.
 
 # <a name="providers">Providers</a>
+
 Adding Angular providers to the app should be seamless. The install process will create a
 `providers.js` from all the providers contained in all the dependencies. The User can disclude
 providers it doesn't want.
@@ -163,15 +174,18 @@ ng providers database angularfirebase2
 Or, alternatively, the user can add its own providers and dependencies to its components.
 
 # Dependencies
+
 Because dependencies are handled by `npm`, we don't have to handle it.
 
 # <a name="typings">Typings</a>
+
 Typings should be added, but failure to find typings should not be a failure of installation. The
 user might still want to install custom typings himself in the worst case.
 
 The `typings` package can be used to install/verify that typings exist. If the typings do not exist natively, we should tell the user to install the ambient version if he wants to.
 
 # Index.html
+
 We do not touch the `index.html` file during the installation task. The default page should
 link to a SystemJS configuration file that is auto generated by the CLI and not user
 configurable (see SystemJS below). If the user install a third party library, like jQuery, and
@@ -181,6 +195,7 @@ The `index.html` also includes a section to configure SystemJS that can be manag
 This is separate from the generated code.
 
 # SystemJS
+
 It is important that SystemJS works without any modifications by the user. It is also important
 to leave the liberty to the user to change the SystemJS configuration so that it fits their needs.
 
@@ -190,6 +205,7 @@ being pulled from a CDN in production. During the `ng build` process for product
 SystemJS configuration script will be rebuilt to fetch from the CDN.
 
 # Upgrade Strategy
+
 The upgrade process simply uses NPM. If new appData is added, it should be added manually using
 a migration hook for `postinstall`.
 
diff --git a/docs/process/bazel.md b/docs/process/bazel.md
index fb540e7b61ea..fe136061fe25 100644
--- a/docs/process/bazel.md
+++ b/docs/process/bazel.md
@@ -52,7 +52,6 @@ Then you will find the intermediate test files in `bazel-out/k8-fastbuild/bin`,
 Tests that are sharded, via the `shard_count` attribute, can fail if you reduce the number of tests or focus only a few.
 This will cause some shards to execute 0 tests, which makes the exit with an error code.
 
-
 Tests that are marked as flaky, via the `flaky` attribute, will repeat when they fail.
 This will cause any focused test to be repeated multiple time, since the presence of focused tests
 causes jasmine to exit with a non-zero exit code.
@@ -67,4 +66,3 @@ with the yarn workspace symlinks in node_modules.
 
 1. Yarn workspaces is not compatible with Bazel-managed deps
    [(#12736)](https://github.com/angular/angular-cli/issues/12736)
-
diff --git a/docs/process/release.md b/docs/process/release.md
index 76593d04d31f..0405c483377d 100644
--- a/docs/process/release.md
+++ b/docs/process/release.md
@@ -2,9 +2,10 @@
 
 1. Clone the Angular-CLI repo. A local copy works just fine.
 1. Create an upstream remote:
-  ```bash
-  $ git remote add upstream https://github.com/angular/angular-cli.git
-  ```
+
+```bash
+$ git remote add upstream https://github.com/angular/angular-cli.git
+```
 
 # Caretaker
 
@@ -16,21 +17,22 @@ Each shift consists of two caretakers. The primary caretaker is responsible for
 merging PRs to master and patch whereas the secondary caretaker is responsible
 for the release. Primary-secondary pairs are as follows:
 
-Primary | Secondary
---------|----------
-Alan    | Doug
-Charles | Keen
-Filipe  | Joey
+| Primary | Secondary |
+| ------- | --------- |
+| Alan    | Doug      |
+| Charles | Keen      |
+| Filipe  | Joey      |
 
 ## 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
-`target` label to understand where it should be merged to.  You can find which branches a specific
+`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.
 
 When ready to merge a PR, run the following command:
+
 ```
 yarn ng-dev pr merge <pr>
 ```
@@ -51,16 +53,22 @@ In general, cherry picks for LTS should only be done if it meets one of the crit
 
 # Release
 
-## Before releasing
+For each version to be released, check out the associated branch and:
 
-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
+1. Increment the CLI version number in
+   [`package.json`](https://github.com/angular/angular-cli/blob/master/package.json).
+1. 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)
+   to match the lastest framework patch version for the associated minor.
+   - This number _usually_ aligns with the CLI version **but not always**. Framework may have
+     required a hotfix release, which could desync the two version numbers. Check the latest version
+     with `yarn info @angular/core dist-tags` or look at the most recent FW release in the
+     [#news channel](https://angular-team.slack.com/archives/C0439GUGA).
 
 As commits are cherry-picked when PRs are merged, creating the release should be a matter of creating a tag.
 
 ```bash
-git add packages/schematics/angular/utility/latest-versions.ts
+git add packages/schematics/angular/utility/latest-versions.ts package.json
 git commit -m 'release: vXX'
 git tag -a 'vXX' -m 'release: tag vXX'
 ```
@@ -80,12 +88,12 @@ Now push the commit and the tag to the upstream repository. **Make sure to use
 git push upstream --follow-tags
 ```
 
-### Authenticating
+## Authenticating
 
 **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 login 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`:
 
@@ -97,7 +105,7 @@ After closing the tab, you have successfully logged in, it is time to publish.
 
 **NOTE: After publishing, remove the token added to your `~/.npmrc` file to logout.**
 
-### Publishing
+## Publishing
 
 **This can ONLY be done by a Google employee.**
 
@@ -107,12 +115,14 @@ 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
 rm -rf node_modules/ && yarn install --frozen-lockfile # Reload dependencies
 yarn admin publish --tag latest
 ```
 
 If also publishing a prerelease, check out `master`, then run:
+
 ```bash
 rm -rf node_modules/ && yarn install --frozen-lockfile # Reload dependencies
 yarn admin publish --tag next
@@ -128,7 +138,7 @@ rm -rf node_modules/ && yarn # Reload dependencies
 yarn admin publish --tag v8-lts
 ```
 
-### Release Notes
+## Release Notes
 
 `yarn run -s admin changelog` takes `from` and `to` arguments which are any valid git
 ref.
@@ -149,25 +159,11 @@ using the `--githubToken` flag. You just then have to confirm the draft.
 
 > **Tags containing `next` or `rc` should be marked as pre-release.**
 
-## Post-release Version Update
+## Post-release
 
-**For each released version**:
-
-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. `DevkitBuildAngular` 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 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
-```
-
-Then make a PR and assign it to the next primary caretaker.
-
-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.
+Don't forget to update the Slack [#tools](https://angular-team.slack.com/archives/C46U16D4Z) channel
+topic with the next caretaker shift from the
+[calendar](https://calendar.google.com/calendar/embed?src=angular.io_jf53juok1lhpm84hv6bo6fmgbc%40group.calendar.google.com&ctz=America%2FLos_Angeles).
 
 ## Publishing a Major Version
 
@@ -188,3 +184,13 @@ packages.
 ```bash
 yarn admin dist-tag --version 10.0.0 --tag latest
 ```
+
+## Changing shifts
+
+If you need to update the
+[caretaker calendar](https://calendar.google.com/calendar/embed?src=angular.io_jf53juok1lhpm84hv6bo6fmgbc%40group.calendar.google.com&ctz=America%2FLos_Angeles)
+to modify shifts, **make sure you are logged in as your @angular.io account** and
+click the "+ Google Calendar" button in the bottom right to add it to your Google
+Calendar account. You should then be able to find and modify events on
+calendar.google.com. The calendar is a part of the `angular.io` organization, so
+events can only be modified by users in the same organization.
diff --git a/docs/specifications/schematic-prompts.md b/docs/specifications/schematic-prompts.md
index 08092ef20235..a7c83e6e6d94 100644
--- a/docs/specifications/schematic-prompts.md
+++ b/docs/specifications/schematic-prompts.md
@@ -1,8 +1,8 @@
 # Schematic Prompts
 
-Schematic prompts provide the ability to introduce user interaction into the schematic execution. The schematic runtime supports the ability to allow schematic options to be configured to display a customizable question to the user and then use the response as the value for the option.  These prompts are displayed before the execution of the schematic.  This allows users direct the operation of the schematic without requiring indepth knowledge of the full spectrum of options available to the user.
+Schematic prompts provide the ability to introduce user interaction into the schematic execution. The schematic runtime supports the ability to allow schematic options to be configured to display a customizable question to the user and then use the response as the value for the option. These prompts are displayed before the execution of the schematic. This allows users direct the operation of the schematic without requiring indepth knowledge of the full spectrum of options available to the user.
 
-To enable this capability, the JSON Schema used to define the schematic's options supports extensions to allow the declarative definition of the prompts and their respective behavior.  No additional logic or changes are required to the JavaScript for a schematic to support the prompts.
+To enable this capability, the JSON Schema used to define the schematic's options supports extensions to allow the declarative definition of the prompts and their respective behavior. No additional logic or changes are required to the JavaScript for a schematic to support the prompts.
 
 ## Basic Usage
 
@@ -10,67 +10,69 @@ To illustrate the addition of a prompt to an existing schematic the following ex
 
 ```json
 {
-    "properties": {
-        "name": {
-            "type": "string",
-            "minLength": 1,
-            "default": "world"
-        },
-        "useColor": {
-            "type": "boolean"
-        }
+  "properties": {
+    "name": {
+      "type": "string",
+      "minLength": 1,
+      "default": "world"
+    },
+    "useColor": {
+      "type": "boolean"
     }
+  }
 }
 ```
 
-Suppose it would be preferred if the user was asked for their name.  This can be accomplished by augmenting the `name` property definition with an `x-prompt` field.
+Suppose it would be preferred if the user was asked for their name. This can be accomplished by augmenting the `name` property definition with an `x-prompt` field.
+
 ```json
 "x-prompt": "What is your name?"
 ```
-In most cases, only the text of the prompt is required.  To minimize the amount of necessary configuration, the above _shorthand_ form is supported and will typically be all that is required.  Full details regarding the _longhand_ form can be found in the **Configuration Reference** section.
 
-Adding a prompt to allow the user to decided whether the schematic will use color when executing its hello action is also very similar.  The schema with both prompts would be as follows:
+In most cases, only the text of the prompt is required. To minimize the amount of necessary configuration, the above _shorthand_ form is supported and will typically be all that is required. Full details regarding the _longhand_ form can be found in the **Configuration Reference** section.
+
+Adding a prompt to allow the user to decided whether the schematic will use color when executing its hello action is also very similar. The schema with both prompts would be as follows:
+
 ```json
 {
-    "properties": {
-        "name": {
-            "type": "string",
-            "minLength": 1,
-            "default": "world",
-            "x-prompt": "What is your name?"
-        },
-        "useColor": {
-            "type": "boolean",
-            "x-prompt": "Would you like the response in color?"
-        }
+  "properties": {
+    "name": {
+      "type": "string",
+      "minLength": 1,
+      "default": "world",
+      "x-prompt": "What is your name?"
+    },
+    "useColor": {
+      "type": "boolean",
+      "x-prompt": "Would you like the response in color?"
     }
+  }
 }
 ```
 
 Prompts have several different types which provide the ability to display an input method that best represents the schematic option's potential values.
 
-* `confirmation` - A **yes** or **no** question; ideal for boolean options
-* `input` - textual input; ideal for string or number options
-* `list` - a predefined set of items which may be selected
+- `confirmation` - A **yes** or **no** question; ideal for boolean options
+- `input` - textual input; ideal for string or number options
+- `list` - a predefined set of items which may be selected
 
-When using the _shorthand_ form, the most appropriate type will automatically be selected based on the property's schema.  In the example, the `name` prompt will use an `input` type because it it is a `string` property.  The `useColor` prompt will use a `confirmation` type because it is a boolean property with `yes` corresponding to `true` and `no` corresponding to `false`.
+When using the _shorthand_ form, the most appropriate type will automatically be selected based on the property's schema. In the example, the `name` prompt will use an `input` type because it it is a `string` property. The `useColor` prompt will use a `confirmation` type because it is a boolean property with `yes` corresponding to `true` and `no` corresponding to `false`.
 
-It is also important that the response from the user conforms to the contraints of the property.  By specifying constraints using the JSON schema, the prompt runtime will automatically validate the response provided by the user.  If the value is not acceptable, the user will be asked to enter a new value.  This ensures that any values passed to the schematic will meet the expectations of the schematic's implementation  and removes the need to add additional checks within the schematic's code.
+It is also important that the response from the user conforms to the contraints of the property. By specifying constraints using the JSON schema, the prompt runtime will automatically validate the response provided by the user. If the value is not acceptable, the user will be asked to enter a new value. This ensures that any values passed to the schematic will meet the expectations of the schematic's implementation and removes the need to add additional checks within the schematic's code.
 
-##  Configuration Reference
+## Configuration Reference
 
-The `x-prompt` field supports two alternatives to enable a prompt for a schematic option.  A shorthand form when additional customization is not required and a longhand form providing the ability for more control over the prompt.  All user responses are validated against the property's schema. For example, string type properties can use a minimum length or regular expression constraint to control the allowed values.  In the event the response fails validation, the user will be asked to enter a new value.
+The `x-prompt` field supports two alternatives to enable a prompt for a schematic option. A shorthand form when additional customization is not required and a longhand form providing the ability for more control over the prompt. All user responses are validated against the property's schema. For example, string type properties can use a minimum length or regular expression constraint to control the allowed values. In the event the response fails validation, the user will be asked to enter a new value.
 
 ### Longhand Form
 
-In the this form, the `x-prompt` field is an object with subfields that can be used to customize the behavior of the prompt.  Note that some fields only apply to specific prompt types.
-
-| Field | Data Value | Default |
-|-|-|-|
-| `type` | `confirmation`, `input`, `list` | see shorthand section for details
-| `message` | string | N/A (required)
-| `items` | string and/or `label`/`value` object pair | only valid with type `list`
+In the this form, the `x-prompt` field is an object with subfields that can be used to customize the behavior of the prompt. Note that some fields only apply to specific prompt types.
 
+| Field     | Data Value                                | Default                           |
+| --------- | ----------------------------------------- | --------------------------------- |
+| `type`    | `confirmation`, `input`, `list`           | see shorthand section for details |
+| `message` | string                                    | N/A (required)                    |
+| `items`   | string and/or `label`/`value` object pair | only valid with type `list`       |
 
 ### Shorthand Form
 
@@ -78,44 +80,44 @@ In the this form, the `x-prompt` field is an object with subfields that can be u
 
 For this usage, the type of the prompt is determined by the type of the containing property.
 
-| Property Schema  | Prompt Type | Notes |
-|-|:-:|:-:|
-| `"type": "boolean"` | `confirmation`  |   |
-| `"type": "string"`  | `input`  |   |
-| `"type": "number"`  | `input` | only valid numbers accepted  |
-| `"type": "integer"` | `input` | only valid numbers accepted  |
-| `"enum": [...]` | `list` | enum members become list selections
+| Property Schema     |  Prompt Type   |                Notes                |
+| ------------------- | :------------: | :---------------------------------: |
+| `"type": "boolean"` | `confirmation` |                                     |
+| `"type": "string"`  |    `input`     |                                     |
+| `"type": "number"`  |    `input`     |     only valid numbers accepted     |
+| `"type": "integer"` |    `input`     |     only valid numbers accepted     |
+| `"enum": [...]`     |     `list`     | enum members become list selections |
 
 ### `x-prompt` Schema
 
 ```json
 {
-    "oneOf": [
-        { "type": "string" },
-        {
-            "type": "object",
-            "properties": {
-                "type": { "type": "string" },
-                "message": { "type": "string" },
-                "items": {
-                    "type": "array",
-                    "items": {
-                        "oneOf": [
-                            { "type": "string" },
-                            {
-                                "type": "object",
-                                "properties": {
-                                    "label": { "type": "string" },
-                                    "value": { }
-                                },
-                                "required": [ "value" ]
-                            }
-                        ]
-                    }
-                }
-            },
-            "required": [ "message" ]
+  "oneOf": [
+    { "type": "string" },
+    {
+      "type": "object",
+      "properties": {
+        "type": { "type": "string" },
+        "message": { "type": "string" },
+        "items": {
+          "type": "array",
+          "items": {
+            "oneOf": [
+              { "type": "string" },
+              {
+                "type": "object",
+                "properties": {
+                  "label": { "type": "string" },
+                  "value": {}
+                },
+                "required": ["value"]
+              }
+            ]
+          }
         }
-    ]
+      },
+      "required": ["message"]
+    }
+  ]
 }
-```
\ No newline at end of file
+```
diff --git a/docs/specifications/update.md b/docs/specifications/update.md
index da02a01a7cac..00f1d3f2819b 100644
--- a/docs/specifications/update.md
+++ b/docs/specifications/update.md
@@ -1,4 +1,3 @@
-
 # Update Command
 
 `ng update` is a new command in the CLI to update one or multiple packages, its peer dependencies, and the peer dependencies that depends on it.
@@ -11,16 +10,16 @@ If there are inconsistencies, for example if peer dependencies cannot be matches
 ng update <package1 [package2 [...]]> [options]
 ```
 
-You can specify more than one package. Each package follows the convention of `[@scope/]packageName[@version-range-or-dist-tag]`. Packages not found in your dependencies will trigger an error. Any package that has a higher version in your `package.json` will trigger an error. 
+You can specify more than one package. Each package follows the convention of `[@scope/]packageName[@version-range-or-dist-tag]`. Packages not found in your dependencies will trigger an error. Any package that has a higher version in your `package.json` will trigger an error.
 
-| Flag | Argument | Description |
-|---|---|---|
-| `--all` | `boolean` | If true, implies that all dependencies should be updated. Defaults is false, using dependencies from the command line instead. |
-| `--force` | `boolean` | If true, skip the verification step and perform the update even if some peer dependencies would be invalidated. Peer dependencies errors will still be shown as warning. Defaults to false. |
-| `--next` | `boolean` | If true, allows version discovery to include Beta and RC. Defaults to false. |
-| `--migrate-only` | `boolean` | If true, don't change the `package.json` file, only apply migration scripts. |
-| `--from` | `version` | Apply migrations from a certain version number. |
-| `--to` | `version` | Apply migrations up to a certain version number (inclusive). By default will update to the installed version. |
+| Flag             | Argument  | Description                                                                                                                                                                                 |
+| ---------------- | --------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `--all`          | `boolean` | If true, implies that all dependencies should be updated. Defaults is false, using dependencies from the command line instead.                                                              |
+| `--force`        | `boolean` | If true, skip the verification step and perform the update even if some peer dependencies would be invalidated. Peer dependencies errors will still be shown as warning. Defaults to false. |
+| `--next`         | `boolean` | If true, allows version discovery to include Beta and RC. Defaults to false.                                                                                                                |
+| `--migrate-only` | `boolean` | If true, don't change the `package.json` file, only apply migration scripts.                                                                                                                |
+| `--from`         | `version` | Apply migrations from a certain version number.                                                                                                                                             |
+| `--to`           | `version` | Apply migrations up to a certain version number (inclusive). By default will update to the installed version.                                                                               |
 
 ## Details
 
@@ -28,39 +27,37 @@ The schematic performs the following steps, in order:
 
 1. Get all installed package names and versions from the `package.json` into `dependencyMap: Map<string, string>`.
 1. From that map, fetch all `package.json` from the NPM repository, which contains all versions, and gather them in a `Map<string, NpmPackageJson>`.
-  1. At the same time, update the `Map<>` with the version of the package which is believed to be installed (largest version number matching the version range).
-  1. **WARNING**: this might not be the exact installed versions, unfortunately. We should have a proper `package-lock.json` loader, and support `yarn.lock` as well, but these are stretch goals (and where do we stop).
-1. For each packages mentioned on the command line, update to the target version (by default largest non-beta non-rc version):  
-
-  ```python
-  # ARGV    The packages being requested by the user.
-  # NPM     A map of package name to a map of version to PackageJson structure.
-  # V       A map of package name to available versions.
-  # PKG     A map of package name to PackageJson structure, for the installed versions.
-  # next    A flag for the "--next" command line argument.
-
-  # First add all updating packages' peer dependencies. This should be recursive but simplified
-  # here for readability.
-  ARGV += [ NPM[p][max([ v for v in V[p] if (not is_beta(v) or next) ])].peerDependencies
-            for p in ARGV ]
-
-  for p in ARGV:
-    x = max([ v for v in V[p] if (not is_beta(v) or next) ])
-
-    for other in set(PKG.keys()) - set([ p ]):
-      # Verify all packages' peer dependencies.
-      if has(other.peerDependencies, p) and !compatible(x, other.peerDependencies[p]):
-        showError('Cannot update dependency "%s": "%s" is incompatible with the updated dependency' % (x, other))
-
-      if any( has(other.peerDependencies, peer) and !compatible(x, other.peerDependencies[peer])
-              for peer in PKG[p].peerDependencies.keys() ):
-        showError('Cannot update dependency "%s": "%s" depends on an incompatible peer dependency' % (x, other))
-
-    update_package_json(p, x)
+1. At the same time, update the `Map<>` with the version of the package which is believed to be installed (largest version number matching the version range).
+1. **WARNING**: this might not be the exact installed versions, unfortunately. We should have a proper `package-lock.json` loader, and support `yarn.lock` as well, but these are stretch goals (and where do we stop).
+1. For each packages mentioned on the command line, update to the target version (by default largest non-beta non-rc version):
+
+```python
+# ARGV    The packages being requested by the user.
+# NPM     A map of package name to a map of version to PackageJson structure.
+# V       A map of package name to available versions.
+# PKG     A map of package name to PackageJson structure, for the installed versions.
+# next    A flag for the "--next" command line argument.
+
+# First add all updating packages' peer dependencies. This should be recursive but simplified
+# here for readability.
+ARGV += [ NPM[p][max([ v for v in V[p] if (not is_beta(v) or next) ])].peerDependencies
+          for p in ARGV ]
+
+for p in ARGV:
+  x = max([ v for v in V[p] if (not is_beta(v) or next) ])
+
+  for other in set(PKG.keys()) - set([ p ]):
+    # Verify all packages' peer dependencies.
+    if has(other.peerDependencies, p) and !compatible(x, other.peerDependencies[p]):
+      showError('Cannot update dependency "%s": "%s" is incompatible with the updated dependency' % (x, other))
+
+    if any( has(other.peerDependencies, peer) and !compatible(x, other.peerDependencies[peer])
+            for peer in PKG[p].peerDependencies.keys() ):
+      showError('Cannot update dependency "%s": "%s" depends on an incompatible peer dependency' % (x, other))
+
+  update_package_json(p, x)
 ```
 
-
-
 ## Library Developers
 
 Libraries are responsible for defining their own update schematics. The `ng update` tool will update the package.json, and if it detects the `"ng-update"` key in package.json of the library, will run the update schematic on it (with version information metadata).
@@ -71,14 +68,15 @@ If a library does not define the `"ng-update"` key in their package.json, they a
 
 In order to implement migrations in a library, the author must add the `ng-update` key to its `package.json`. This key contains the following fields:
 
-| Field Name | Type | Description |
-|---|---|---|
-| `requirements` | `{ [packageName: string]: VersionRange }` | A map of package names to version to check for minimal requirement. If one of the libraries listed here does not match the version range specified in `requirements`, an error will be shown to the user to manually update those libraries. For example, `@angular/core` does not support updates from versions earlier than 5, so this field would be `{ '@angular/core': '>= 5' }`.
-| `migrations` | `string` | A relative path (or resolved using Node module resolution) to a Schematics collection definition. |
-| `packageGroup` | `string[]` | A list of npm packages that are to be grouped together. When running the update schematic it will automatically include all packages as part of the packageGroup in the update (if the user also installed them). |
-| `packageGroupName` | `string` | The name of the packageGroup to use. By default, uses the first package in the packageGroup. The packageGroupName needs to be part of the packageGroup and should be a valid package name. |
+| Field Name         | Type                                      | Description                                                                                                                                                                                                                                                                                                                                                                            |
+| ------------------ | ----------------------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `requirements`     | `{ [packageName: string]: VersionRange }` | A map of package names to version to check for minimal requirement. If one of the libraries listed here does not match the version range specified in `requirements`, an error will be shown to the user to manually update those libraries. For example, `@angular/core` does not support updates from versions earlier than 5, so this field would be `{ '@angular/core': '>= 5' }`. |
+| `migrations`       | `string`                                  | A relative path (or resolved using Node module resolution) to a Schematics collection definition.                                                                                                                                                                                                                                                                                      |
+| `packageGroup`     | `string[]`                                | A list of npm packages that are to be grouped together. When running the update schematic it will automatically include all packages as part of the packageGroup in the update (if the user also installed them).                                                                                                                                                                      |
+| `packageGroupName` | `string`                                  | The name of the packageGroup to use. By default, uses the first package in the packageGroup. The packageGroupName needs to be part of the packageGroup and should be a valid package name.                                                                                                                                                                                             |
 
 #### Example given:
+
 Library my-lib wants to have 2 steps to update from version 4 -> 4.5 and 4.5 to 5. It would add this information in its `package.json`:
 
 ```json
@@ -150,10 +148,11 @@ There might be additional packages that are outdated.
 I have a dependency on Angular, Material and CLI. I want to update the CLI, then Angular, then Material in separate steps.
 
 #### Details
+
 1. `ng update @angular/cli`.  
-Updates the CLI and packages that have a peer dependencies on the CLI (none), running refactoring tools from CLI 1 to 6.
+   Updates the CLI and packages that have a peer dependencies on the CLI (none), running refactoring tools from CLI 1 to 6.
 1. `ng update @angular/core`.  
-Updates the Core package and all packages that have a peer dependency on it. This can get tricky if `@angular/material` get caught in the update because the version installed does not directly allow the new version of `@angular/core`. In this case 
+   Updates the Core package and all packages that have a peer dependency on it. This can get tricky if `@angular/material` get caught in the update because the version installed does not directly allow the new version of `@angular/core`. In this case
 
 ### Complex Case
 
@@ -182,10 +181,9 @@ ng update @angular/material
 ```
 
 - update `@angular/material` to latest version, that should be compatible with the current `@angular/core`.
-- if that version is not compatible with you 
+- if that version is not compatible with you
 - tell the user about a higher version that requires an update to `@angular/core`.
 
-
 ## Notes
 
 1. if someone is on CLI 1.5, the command is not supported. The user needs to update to `@angular/cli@latest`, then `ng update @angular/cli`. Post install hook will check versions of cli configuration and show a message to run the `ng update` command.
diff --git a/etc/README.md b/etc/README.md
deleted file mode 100644
index b0c2447c9b1d..000000000000
--- a/etc/README.md
+++ /dev/null
@@ -1,3 +0,0 @@
-# `/etc` Folder
-
-This folder is for files that doesn't fit in other directories in the root folder.
diff --git a/etc/api/BUILD.bazel b/etc/api/BUILD.bazel
deleted file mode 100644
index 1d70fb1c9a14..000000000000
--- a/etc/api/BUILD.bazel
+++ /dev/null
@@ -1,54 +0,0 @@
-load("@npm//ts-api-guardian:index.bzl", "ts_api_guardian_test")
-
-[ts_api_guardian_test(
-    name = "%s_%s_%sapi" % (
-        bundle[0],
-        bundle[1],
-        bundle[2].replace("src/", "").replace("index", "").replace("_golden-api", "").replace("/", "_"),
-    ),
-    actual = "angular_cli/packages/%s/%s/npm_package/%s.d.ts" % (
-        bundle[0],
-        bundle[1],
-        bundle[2],
-    ),
-    allow_module_identifiers = [
-        "fs",
-        "ts",
-        "ajv",
-        "Symbol",
-        "webpack",
-    ],
-    data = glob([
-        "%s/%s/**/*.d.ts" % (
-            bundle[0],
-            bundle[1],
-        ),
-    ]) + [
-        "//packages/%s/%s:npm_package" % (
-            bundle[0],
-            bundle[1],
-        ),
-    ],
-    golden = "angular_cli/etc/api/%s/%s/%s.d.ts" % (
-        bundle[0],
-        bundle[1],
-        bundle[2],
-    ),
-    # We don't want to analyse these exports nor add them to the golden files
-    # in most cases it's because Ts API Guardian doesn't support Symbol Aliases.
-    # Note: $ must be escaped to $$ because these patterns will be executed by shell
-    # and $ has a special meaning there.
-    strip_export_pattern = [
-        # @angular-devkit/architect
-        "^BuilderProgressState$$",
-        # @angular-devkit/schematics
-        "^workflow$$",
-        "^formats$$",
-        # @angular-devkit/build-optimizer
-        "^buildOptimizerLoader$$",
-    ],
-    # At the moment using this will ignore a big change
-    use_angular_tag_rules = False,
-) for bundle in [b[:-len(".d.ts")].split("/", 2) for b in glob(
-    ["**/*.d.ts"],
-)]]
diff --git a/etc/api/angular_devkit/architect/src/index.d.ts b/etc/api/angular_devkit/architect/src/index.d.ts
deleted file mode 100644
index ec27026f5791..000000000000
--- a/etc/api/angular_devkit/architect/src/index.d.ts
+++ /dev/null
@@ -1,95 +0,0 @@
-export declare class Architect {
-    constructor(_host: ArchitectHost, registry?: json.schema.SchemaRegistry, additionalJobRegistry?: experimental.jobs.Registry);
-    has(name: experimental.jobs.JobName): Observable<boolean>;
-    scheduleBuilder(name: string, options: json.JsonObject, scheduleOptions?: ScheduleOptions): Promise<BuilderRun>;
-    scheduleTarget(target: Target, overrides?: json.JsonObject, scheduleOptions?: ScheduleOptions): Promise<BuilderRun>;
-}
-
-export interface BuilderContext {
-    readonly analytics: analytics.Analytics;
-    builder: BuilderInfo;
-    currentDirectory: string;
-    id: number;
-    logger: logging.LoggerApi;
-    target?: Target;
-    workspaceRoot: string;
-    addTeardown(teardown: () => (Promise<void> | void)): void;
-    getBuilderNameForTarget(target: Target): Promise<string>;
-    getProjectMetadata(projectName: string): Promise<json.JsonObject>;
-    getProjectMetadata(target: Target): Promise<json.JsonObject>;
-    getTargetOptions(target: Target): Promise<json.JsonObject>;
-    reportProgress(current: number, total?: number, status?: string): void;
-    reportRunning(): void;
-    reportStatus(status: string): void;
-    scheduleBuilder(builderName: string, options?: json.JsonObject, scheduleOptions?: ScheduleOptions): Promise<BuilderRun>;
-    scheduleTarget(target: Target, overrides?: json.JsonObject, scheduleOptions?: ScheduleOptions): Promise<BuilderRun>;
-    validateOptions<T extends json.JsonObject = json.JsonObject>(options: json.JsonObject, builderName: string): Promise<T>;
-}
-
-export interface BuilderHandlerFn<A> {
-    (input: A, context: BuilderContext): BuilderOutputLike;
-}
-
-export declare type BuilderInfo = json.JsonObject & {
-    builderName: string;
-    description: string;
-    optionSchema: json.schema.JsonSchema;
-};
-
-export declare type BuilderInput = json.JsonObject & RealBuilderInput;
-
-export declare type BuilderOutput = json.JsonObject & RealBuilderOutput;
-
-export declare type BuilderOutputLike = AsyncIterable<BuilderOutput> | SubscribableOrPromise<BuilderOutput> | BuilderOutput;
-
-export declare type BuilderProgress = json.JsonObject & RealBuilderProgress & TypedBuilderProgress;
-
-export declare type BuilderProgressReport = BuilderProgress & ({
-    target?: Target;
-    builder: BuilderInfo;
-});
-
-export declare type BuilderRegistry = experimental.jobs.Registry<json.JsonObject, BuilderInput, BuilderOutput>;
-
-export interface BuilderRun {
-    id: number;
-    info: BuilderInfo;
-    output: Observable<BuilderOutput>;
-    progress: Observable<BuilderProgressReport>;
-    result: Promise<BuilderOutput>;
-    stop(): Promise<void>;
-}
-
-export declare function createBuilder<OptT = json.JsonObject, OutT extends BuilderOutput = BuilderOutput>(fn: BuilderHandlerFn<OptT>): Builder<OptT & json.JsonObject>;
-
-export declare function fromAsyncIterable<T>(iterable: AsyncIterable<T>): Observable<T>;
-
-export declare function isBuilderOutput(obj: any): obj is BuilderOutput;
-
-export interface ScheduleOptions {
-    analytics?: analytics.Analytics;
-    logger?: logging.Logger;
-}
-
-export declare function scheduleTargetAndForget(context: BuilderContext, target: Target, overrides?: json.JsonObject, scheduleOptions?: ScheduleOptions): Observable<BuilderOutput>;
-
-export declare type Target = json.JsonObject & RealTarget;
-
-export declare function targetFromTargetString(str: string): Target;
-
-export declare function targetStringFromTarget({ project, target, configuration }: Target): string;
-
-export declare type TypedBuilderProgress = ({
-    state: BuilderProgressState.Stopped;
-} | {
-    state: BuilderProgressState.Error;
-    error: json.JsonValue;
-} | {
-    state: BuilderProgressState.Waiting;
-    status?: string;
-} | {
-    state: BuilderProgressState.Running;
-    status?: string;
-    current: number;
-    total?: number;
-});
diff --git a/etc/api/angular_devkit/architect/testing/index.d.ts b/etc/api/angular_devkit/architect/testing/index.d.ts
deleted file mode 100644
index 8c3b4f571820..000000000000
--- a/etc/api/angular_devkit/architect/testing/index.d.ts
+++ /dev/null
@@ -1,31 +0,0 @@
-export declare class TestingArchitectHost implements ArchitectHost {
-    currentDirectory: string;
-    workspaceRoot: string;
-    constructor(workspaceRoot?: string, currentDirectory?: string, _backendHost?: ArchitectHost | null);
-    addBuilder(builderName: string, builder: Builder, description?: string, optionSchema?: json.schema.JsonSchema): void;
-    addBuilderFromPackage(packageName: string): Promise<void>;
-    addTarget(target: Target, builderName: string, options?: json.JsonObject): void;
-    getBuilderNameForTarget(target: Target): Promise<string | null>;
-    getCurrentDirectory(): Promise<string>;
-    getOptionsForTarget(target: Target): Promise<json.JsonObject | null>;
-    getProjectMetadata(target: Target | string): Promise<json.JsonObject | null>;
-    getWorkspaceRoot(): Promise<string>;
-    loadBuilder(info: BuilderInfo): Promise<Builder | null>;
-    resolveBuilder(builderName: string): Promise<BuilderInfo | null>;
-}
-
-export declare class TestProjectHost extends NodeJsSyncHost {
-    protected _templateRoot: Path;
-    constructor(_templateRoot: Path);
-    appendToFile(path: string, str: string): void;
-    copyFile(from: string, to: string): void;
-    fileMatchExists(dir: string, regex: RegExp): PathFragment | undefined;
-    initialize(): Observable<void>;
-    replaceInFile(path: string, match: RegExp | string, replacement: string): void;
-    restore(): Observable<void>;
-    root(): Path;
-    scopedSync(): virtualFs.SyncDelegateHost<Stats>;
-    writeMultipleFiles(files: {
-        [path: string]: string | ArrayBufferLike | Buffer;
-    }): void;
-}
diff --git a/etc/api/angular_devkit/benchmark/src/index.d.ts b/etc/api/angular_devkit/benchmark/src/index.d.ts
deleted file mode 100644
index 5a35f3d1b139..000000000000
--- a/etc/api/angular_devkit/benchmark/src/index.d.ts
+++ /dev/null
@@ -1,100 +0,0 @@
-export interface AggregatedMetric extends Metric {
-    componentValues: number[];
-}
-
-export interface AggregatedProcessStats {
-    cpu: number;
-    ctime: number;
-    elapsed: number;
-    memory: number;
-    pid: number;
-    ppid: number;
-    processes: number;
-    timestamp: number;
-}
-
-export declare const aggregateMetricGroups: (g1: MetricGroup, g2: MetricGroup) => MetricGroup;
-
-export declare const aggregateMetrics: (m1: Metric | AggregatedMetric, m2: Metric | AggregatedMetric) => AggregatedMetric;
-
-export declare type BenchmarkReporter = (command: Command, groups: MetricGroup[]) => void;
-
-export declare type Capture = (stats: Observable<AggregatedProcessStats>) => Observable<MetricGroup>;
-
-export declare class Command {
-    args: string[];
-    cmd: string;
-    cwd: string;
-    expectedExitCode: number;
-    constructor(cmd: string, args?: string[], cwd?: string, expectedExitCode?: number);
-    toString(): string;
-}
-
-export declare const cumulativeMovingAverage: (acc: number, val: number, accSize: number) => number;
-
-export declare const defaultReporter: (logger: logging.Logger) => BenchmarkReporter;
-
-export declare const defaultStatsCapture: Capture;
-
-export declare class LocalMonitoredProcess implements MonitoredProcess {
-    stats$: Observable<AggregatedProcessStats>;
-    stderr$: Observable<Buffer>;
-    stdout$: Observable<Buffer>;
-    constructor(command: Command, useProcessTime?: boolean);
-    resetElapsedTimer(): void;
-    run(): Observable<number>;
-}
-
-export declare function main({ args, stdout, stderr, }: MainOptions): Promise<0 | 1>;
-
-export interface MainOptions {
-    args: string[];
-    stderr?: ProcessOutput;
-    stdout?: ProcessOutput;
-}
-
-export declare const max: (v1: number, v2: number) => number;
-
-export declare class MaximumRetriesExceeded extends BaseException {
-    constructor(retries: number);
-}
-
-export interface Metric {
-    componentValues?: number[];
-    name: string;
-    unit: string;
-    value: number;
-}
-
-export interface MetricGroup {
-    metrics: (Metric | AggregatedMetric)[];
-    name: string;
-}
-
-export interface MonitoredProcess {
-    stats$: Observable<AggregatedProcessStats>;
-    stderr$: Observable<Buffer>;
-    stdout$: Observable<Buffer>;
-    run(): Observable<number>;
-    toString(): string;
-}
-
-export declare function runBenchmark({ command, captures, reporters, iterations, retries, logger, }: RunBenchmarkOptions): Observable<MetricGroup[]>;
-
-export interface RunBenchmarkOptions {
-    captures: Capture[];
-    command: Command;
-    expectedExitCode?: number;
-    iterations?: number;
-    logger?: logging.Logger;
-    reporters: BenchmarkReporter[];
-    retries?: number;
-}
-
-export declare function runBenchmarkWatch({ command, captures, reporters, iterations, retries, logger, watchMatcher, watchTimeout, watchCommand, }: RunBenchmarkWatchOptions): Observable<MetricGroup[]>;
-
-export interface RunBenchmarkWatchOptions extends RunBenchmarkOptions {
-    watchCommand: Command;
-    watchMatcher: string;
-    watchTimeout?: number;
-}
diff --git a/etc/api/angular_devkit/build_optimizer/src/_golden-api.d.ts b/etc/api/angular_devkit/build_optimizer/src/_golden-api.d.ts
deleted file mode 100644
index b22aeaa7522c..000000000000
--- a/etc/api/angular_devkit/build_optimizer/src/_golden-api.d.ts
+++ /dev/null
@@ -1,32 +0,0 @@
-export declare function buildOptimizer(options: BuildOptimizerOptions): TransformJavascriptOutput;
-
-export declare const buildOptimizerLoaderPath: string;
-
-export declare class BuildOptimizerWebpackPlugin {
-    apply(compiler: Compiler): void;
-}
-
-export default function buildOptimizerLoader(this: {
-    resourcePath: string;
-    _module: {
-        factoryMeta: {
-            skipBuildOptimizer?: boolean;
-            sideEffectFree?: boolean;
-        };
-    };
-    cacheable(): void;
-    callback(error?: Error | null, content?: string, sourceMap?: unknown): void;
-    getOptions(): unknown;
-}, content: string, previousSourceMap: RawSourceMap): void;
-
-export declare function getPrefixClassesTransformer(): ts.TransformerFactory<ts.SourceFile>;
-
-export declare function getPrefixFunctionsTransformer(): ts.TransformerFactory<ts.SourceFile>;
-
-export declare function getScrubFileTransformer(program?: ts.Program): ts.TransformerFactory<ts.SourceFile>;
-
-export declare function getScrubFileTransformerForCore(program?: ts.Program): ts.TransformerFactory<ts.SourceFile>;
-
-export declare function getWrapEnumsTransformer(): ts.TransformerFactory<ts.SourceFile>;
-
-export declare function transformJavascript(options: TransformJavascriptOptions): TransformJavascriptOutput;
diff --git a/etc/api/angular_devkit/core/node/_golden-api.d.ts b/etc/api/angular_devkit/core/node/_golden-api.d.ts
deleted file mode 100644
index a897c6bb88e4..000000000000
--- a/etc/api/angular_devkit/core/node/_golden-api.d.ts
+++ /dev/null
@@ -1,42 +0,0 @@
-export declare function createConsoleLogger(verbose?: boolean, stdout?: ProcessOutput, stderr?: ProcessOutput, colors?: Partial<Record<logging.LogLevel, (s: string) => string>>): logging.Logger;
-
-export declare function isDirectory(filePath: string): boolean;
-
-export declare function isFile(filePath: string): boolean;
-
-export declare class NodeJsAsyncHost implements virtualFs.Host<Stats> {
-    get capabilities(): virtualFs.HostCapabilities;
-    delete(path: Path): Observable<void>;
-    exists(path: Path): Observable<boolean>;
-    isDirectory(path: Path): Observable<boolean>;
-    isFile(path: Path): Observable<boolean>;
-    list(path: Path): Observable<PathFragment[]>;
-    read(path: Path): Observable<virtualFs.FileBuffer>;
-    rename(from: Path, to: Path): Observable<void>;
-    stat(path: Path): Observable<virtualFs.Stats<Stats>>;
-    watch(path: Path, _options?: virtualFs.HostWatchOptions): Observable<virtualFs.HostWatchEvent> | null;
-    write(path: Path, content: virtualFs.FileBuffer): Observable<void>;
-}
-
-export declare class NodeJsSyncHost implements virtualFs.Host<Stats> {
-    get capabilities(): virtualFs.HostCapabilities;
-    delete(path: Path): Observable<void>;
-    exists(path: Path): Observable<boolean>;
-    isDirectory(path: Path): Observable<boolean>;
-    isFile(path: Path): Observable<boolean>;
-    list(path: Path): Observable<PathFragment[]>;
-    read(path: Path): Observable<virtualFs.FileBuffer>;
-    rename(from: Path, to: Path): Observable<void>;
-    stat(path: Path): Observable<virtualFs.Stats<Stats>>;
-    watch(path: Path, _options?: virtualFs.HostWatchOptions): Observable<virtualFs.HostWatchEvent> | null;
-    write(path: Path, content: virtualFs.FileBuffer): Observable<void>;
-}
-
-export declare class NodeModuleJobRegistry<MinimumArgumentValueT extends JsonValue = JsonValue, MinimumInputValueT extends JsonValue = JsonValue, MinimumOutputValueT extends JsonValue = JsonValue> implements core_experimental.jobs.Registry<MinimumArgumentValueT, MinimumInputValueT, MinimumOutputValueT> {
-    protected _resolve(name: string): string | null;
-    get<A extends MinimumArgumentValueT, I extends MinimumInputValueT, O extends MinimumOutputValueT>(name: core_experimental.jobs.JobName): Observable<core_experimental.jobs.JobHandler<A, I, O> | null>;
-}
-
-export interface ProcessOutput {
-    write(buffer: string | Buffer): boolean;
-}
diff --git a/etc/api/angular_devkit/core/node/testing/index.d.ts b/etc/api/angular_devkit/core/node/testing/index.d.ts
deleted file mode 100644
index 8c3e41b98aad..000000000000
--- a/etc/api/angular_devkit/core/node/testing/index.d.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-export declare class TempScopedNodeJsSyncHost extends virtualFs.ScopedHost<fs.Stats> {
-    protected _root: Path;
-    protected _sync?: virtualFs.SyncDelegateHost<fs.Stats>;
-    get files(): Path[];
-    get root(): Path;
-    get sync(): virtualFs.SyncDelegateHost<fs.Stats>;
-    constructor();
-}
diff --git a/etc/api/angular_devkit/core/src/_golden-api.d.ts b/etc/api/angular_devkit/core/src/_golden-api.d.ts
deleted file mode 100644
index 10390f0ff530..000000000000
--- a/etc/api/angular_devkit/core/src/_golden-api.d.ts
+++ /dev/null
@@ -1,1097 +0,0 @@
-export declare function addUndefinedDefaults(value: JsonValue, _pointer: JsonPointer, schema?: JsonSchema): JsonValue;
-
-export declare class AliasHost<StatsT extends object = {}> extends ResolverHost<StatsT> {
-    protected _aliases: Map<Path, Path>;
-    get aliases(): Map<Path, Path>;
-    protected _resolve(path: Path): Path;
-}
-
-export interface Analytics {
-    event(category: string, action: string, options?: EventOptions): void;
-    flush(): Promise<void>;
-    pageview(path: string, options?: PageviewOptions): void;
-    screenview(screenName: string, appName: string, options?: ScreenviewOptions): void;
-    timing(category: string, variable: string, time: string | number, options?: TimingOptions): void;
-}
-
-export declare type AnalyticsForwarderFn = (report: JsonObject & AnalyticsReport) => void;
-
-export declare type AnalyticsReport = AnalyticsReportEvent | AnalyticsReportScreenview | AnalyticsReportPageview | AnalyticsReportTiming;
-
-export interface AnalyticsReportBase extends JsonObject {
-    kind: AnalyticsReportKind;
-}
-
-export declare class AnalyticsReporter {
-    protected _analytics: Analytics;
-    constructor(_analytics: Analytics);
-    report(report: AnalyticsReport): void;
-}
-
-export interface AnalyticsReportEvent extends AnalyticsReportBase {
-    action: string;
-    category: string;
-    kind: AnalyticsReportKind.Event;
-    options: JsonObject & EventOptions;
-}
-
-export declare enum AnalyticsReportKind {
-    Event = "event",
-    Screenview = "screenview",
-    Pageview = "pageview",
-    Timing = "timing"
-}
-
-export interface AnalyticsReportPageview extends AnalyticsReportBase {
-    kind: AnalyticsReportKind.Pageview;
-    options: JsonObject & PageviewOptions;
-    path: string;
-}
-
-export interface AnalyticsReportScreenview extends AnalyticsReportBase {
-    appName: string;
-    kind: AnalyticsReportKind.Screenview;
-    options: JsonObject & ScreenviewOptions;
-    screenName: string;
-}
-
-export interface AnalyticsReportTiming extends AnalyticsReportBase {
-    category: string;
-    kind: AnalyticsReportKind.Timing;
-    options: JsonObject & TimingOptions;
-    time: string | number;
-    variable: string;
-}
-
-export declare function asPosixPath(path: Path): PosixPath;
-
-export declare function asWindowsPath(path: Path): WindowsPath;
-
-export declare class BaseException extends Error {
-    constructor(message?: string);
-}
-
-export declare function basename(path: Path): PathFragment;
-
-export declare function buildJsonPointer(fragments: string[]): JsonPointer;
-
-export declare function camelize(str: string): string;
-
-export declare function capitalize(str: string): string;
-
-export declare class CircularDependencyFoundException extends BaseException {
-    constructor();
-}
-
-export declare function classify(str: string): string;
-
-export declare function clean<T>(array: Array<T | undefined>): Array<T>;
-
-export declare class ContentHasMutatedException extends BaseException {
-    constructor(path: string);
-}
-
-export declare class CordHost extends SimpleMemoryHost {
-    protected _back: ReadonlyHost;
-    protected _filesToCreate: Set<Path>;
-    protected _filesToDelete: Set<Path>;
-    protected _filesToOverwrite: Set<Path>;
-    protected _filesToRename: Map<Path, Path>;
-    protected _filesToRenameRevert: Map<Path, Path>;
-    get backend(): ReadonlyHost;
-    get capabilities(): HostCapabilities;
-    constructor(_back: ReadonlyHost);
-    clone(): CordHost;
-    commit(host: Host, force?: boolean): Observable<void>;
-    create(path: Path, content: FileBuffer): Observable<void>;
-    delete(path: Path): Observable<void>;
-    exists(path: Path): Observable<boolean>;
-    isDirectory(path: Path): Observable<boolean>;
-    isFile(path: Path): Observable<boolean>;
-    list(path: Path): Observable<PathFragment[]>;
-    overwrite(path: Path, content: FileBuffer): Observable<void>;
-    read(path: Path): Observable<FileBuffer>;
-    records(): CordHostRecord[];
-    rename(from: Path, to: Path): Observable<void>;
-    stat(path: Path): Observable<Stats | null> | null;
-    watch(path: Path, options?: HostWatchOptions): null;
-    willCreate(path: Path): boolean;
-    willDelete(path: Path): boolean;
-    willOverwrite(path: Path): boolean;
-    willRename(path: Path): boolean;
-    willRenameTo(path: Path, to: Path): boolean;
-    write(path: Path, content: FileBuffer): Observable<void>;
-}
-
-export interface CordHostCreate {
-    content: FileBuffer;
-    kind: 'create';
-    path: Path;
-}
-
-export interface CordHostDelete {
-    kind: 'delete';
-    path: Path;
-}
-
-export interface CordHostOverwrite {
-    content: FileBuffer;
-    kind: 'overwrite';
-    path: Path;
-}
-
-export declare type CordHostRecord = CordHostCreate | CordHostOverwrite | CordHostRename | CordHostDelete;
-
-export interface CordHostRename {
-    from: Path;
-    kind: 'rename';
-    to: Path;
-}
-
-export declare class CoreSchemaRegistry implements SchemaRegistry {
-    constructor(formats?: SchemaFormat[]);
-    protected _resolver(ref: string, validate?: ValidateFunction): {
-        context?: ValidateFunction;
-        schema?: JsonObject;
-    };
-    addFormat(format: SchemaFormat): void;
-    addPostTransform(visitor: JsonVisitor, deps?: JsonVisitor[]): void;
-    addPreTransform(visitor: JsonVisitor, deps?: JsonVisitor[]): void;
-    addSmartDefaultProvider<T>(source: string, provider: SmartDefaultProvider<T>): void;
-    compile(schema: JsonSchema): Observable<SchemaValidator>;
-    flatten(schema: JsonObject): Observable<JsonObject>;
-    registerUriHandler(handler: UriHandler): void;
-    usePromptProvider(provider: PromptProvider): void;
-    useXDeprecatedProvider(onUsage: (message: string) => void): void;
-}
-
-export declare function createSyncHost<StatsT extends object = {}>(handler: SyncHostHandler<StatsT>): Host<StatsT>;
-
-export declare function createWorkspaceHost(host: virtualFs.Host): WorkspaceHost;
-
-export interface CustomDimensionsAndMetricsOptions {
-    dimensions?: (boolean | number | string)[];
-    metrics?: (boolean | number | string)[];
-}
-
-export declare function dasherize(str: string): string;
-
-export declare function decamelize(str: string): string;
-
-export declare function deepCopy<T extends any>(value: T): T;
-
-export declare type DefinitionCollectionListener<V extends object> = (name: string, action: 'add' | 'remove' | 'replace', newValue: V | undefined, oldValue: V | undefined, collection: DefinitionCollection<V>) => void;
-
-export declare class DependencyNotFoundException extends BaseException {
-    constructor();
-}
-
-export declare function dirname(path: Path): Path;
-
-export declare class Empty implements ReadonlyHost {
-    readonly capabilities: HostCapabilities;
-    exists(path: Path): Observable<boolean>;
-    isDirectory(path: Path): Observable<boolean>;
-    isFile(path: Path): Observable<boolean>;
-    list(path: Path): Observable<PathFragment[]>;
-    read(path: Path): Observable<FileBuffer>;
-    stat(path: Path): Observable<Stats<{}> | null>;
-}
-
-export interface EventOptions extends CustomDimensionsAndMetricsOptions {
-    label?: string;
-    value?: string;
-}
-
-export declare function extname(path: Path): string;
-
-export declare class FileAlreadyExistException extends BaseException {
-    constructor(path: string);
-}
-
-export declare const fileBuffer: TemplateTag<FileBuffer>;
-
-export declare type FileBuffer = ArrayBuffer;
-
-export declare type FileBufferLike = ArrayBufferLike;
-
-export declare function fileBufferToString(fileBuffer: FileBuffer): string;
-
-export declare class FileDoesNotExistException extends BaseException {
-    constructor(path: string);
-}
-
-export declare class ForwardingAnalytics implements Analytics {
-    protected _fn: AnalyticsForwarderFn;
-    constructor(_fn: AnalyticsForwarderFn);
-    event(category: string, action: string, options?: EventOptions): void;
-    flush(): Promise<void>;
-    pageview(path: string, options?: PageviewOptions): void;
-    screenview(screenName: string, appName: string, options?: ScreenviewOptions): void;
-    timing(category: string, variable: string, time: string | number, options?: TimingOptions): void;
-}
-
-export declare function fragment(path: string): PathFragment;
-
-export declare function getSystemPath(path: Path): string;
-
-export declare function getTypesOfSchema(schema: JsonSchema): Set<string>;
-
-export interface Host<StatsT extends object = {}> extends ReadonlyHost<StatsT> {
-    delete(path: Path): Observable<void>;
-    rename(from: Path, to: Path): Observable<void>;
-    watch(path: Path, options?: HostWatchOptions): Observable<HostWatchEvent> | null;
-    write(path: Path, content: FileBufferLike): Observable<void>;
-}
-
-export interface HostCapabilities {
-    synchronous: boolean;
-}
-
-export interface HostWatchEvent {
-    readonly path: Path;
-    readonly time: Date;
-    readonly type: HostWatchEventType;
-}
-
-export declare const enum HostWatchEventType {
-    Changed = 0,
-    Created = 1,
-    Deleted = 2,
-    Renamed = 3
-}
-
-export interface HostWatchOptions {
-    readonly persistent?: boolean;
-    readonly recursive?: boolean;
-}
-
-export declare function indentBy(indentations: number): TemplateTag;
-
-export declare class IndentLogger extends Logger {
-    constructor(name: string, parent?: Logger | null, indentation?: string);
-}
-
-export declare class InvalidJsonCharacterException extends JsonException {
-    character: number;
-    invalidChar: string;
-    line: number;
-    offset: number;
-    constructor(context: JsonParserContext);
-}
-
-export declare class InvalidPathException extends BaseException {
-    constructor(path: string);
-}
-
-export declare class InvalidUpdateRecordException extends BaseException {
-    constructor();
-}
-
-export declare function isAbsolute(p: Path): boolean;
-
-export declare function isJsonArray(value: JsonValue): value is JsonArray;
-
-export declare function isJsonObject(value: JsonValue): value is JsonObject;
-
-export declare function isPromise(obj: any): obj is Promise<any>;
-
-export declare function join(p1: Path, ...others: string[]): Path;
-
-export declare function joinJsonPointer(root: JsonPointer, ...others: string[]): JsonPointer;
-
-export interface JsonArray extends Array<JsonValue> {
-}
-
-export interface JsonAstArray extends JsonAstNodeBase {
-    readonly elements: JsonAstNode[];
-    readonly kind: 'array';
-    readonly value: JsonArray;
-}
-
-export interface JsonAstComment extends JsonAstNodeBase {
-    readonly content: string;
-    readonly kind: 'comment';
-}
-
-export interface JsonAstConstantFalse extends JsonAstNodeBase {
-    readonly kind: 'false';
-    readonly value: false;
-}
-
-export interface JsonAstConstantNull extends JsonAstNodeBase {
-    readonly kind: 'null';
-    readonly value: null;
-}
-
-export interface JsonAstConstantTrue extends JsonAstNodeBase {
-    readonly kind: 'true';
-    readonly value: true;
-}
-
-export interface JsonAstIdentifier extends JsonAstNodeBase {
-    readonly kind: 'identifier';
-    readonly value: string;
-}
-
-export interface JsonAstKeyValue extends JsonAstNodeBase {
-    readonly key: JsonAstString | JsonAstIdentifier;
-    readonly kind: 'keyvalue';
-    readonly value: JsonAstNode;
-}
-
-export interface JsonAstMultilineComment extends JsonAstNodeBase {
-    readonly content: string;
-    readonly kind: 'multicomment';
-}
-
-export declare type JsonAstNode = JsonAstNumber | JsonAstString | JsonAstIdentifier | JsonAstArray | JsonAstObject | JsonAstConstantFalse | JsonAstConstantNull | JsonAstConstantTrue;
-
-export interface JsonAstNodeBase {
-    readonly comments?: (JsonAstComment | JsonAstMultilineComment)[];
-    readonly end: Position;
-    readonly start: Position;
-    readonly text: string;
-}
-
-export interface JsonAstNumber extends JsonAstNodeBase {
-    readonly kind: 'number';
-    readonly value: number;
-}
-
-export interface JsonAstObject extends JsonAstNodeBase {
-    readonly kind: 'object';
-    readonly properties: JsonAstKeyValue[];
-    readonly value: JsonObject;
-}
-
-export interface JsonAstString extends JsonAstNodeBase {
-    readonly kind: 'string';
-    readonly value: string;
-}
-
-export declare class JsonException extends BaseException {
-}
-
-export interface JsonObject {
-    [prop: string]: JsonValue;
-}
-
-export declare enum JsonParseMode {
-    Strict = 0,
-    CommentsAllowed = 1,
-    SingleQuotesAllowed = 2,
-    IdentifierKeyNamesAllowed = 4,
-    TrailingCommasAllowed = 8,
-    HexadecimalNumberAllowed = 16,
-    MultiLineStringAllowed = 32,
-    LaxNumberParsingAllowed = 64,
-    NumberConstantsAllowed = 128,
-    Default = 0,
-    Loose = 255,
-    Json = 0,
-    Json5 = 255
-}
-
-export interface JsonParserContext {
-    readonly mode: JsonParseMode;
-    readonly original: string;
-    position: Position;
-    previous: Position;
-}
-
-export declare type JsonPointer = string & {
-    __PRIVATE_DEVKIT_JSON_POINTER: void;
-};
-
-export interface JsonSchemaVisitor {
-    (current: JsonObject | JsonArray, pointer: JsonPointer, parentSchema?: JsonObject | JsonArray, index?: string): void;
-}
-
-export declare type JsonValue = JsonAstNode['value'];
-
-export interface JsonVisitor {
-    (value: JsonValue, pointer: JsonPointer, schema?: JsonObject, root?: JsonObject | JsonArray): Observable<JsonValue> | JsonValue;
-}
-
-export declare class LevelCapLogger extends LevelTransformLogger {
-    readonly levelCap: LogLevel;
-    readonly name: string;
-    readonly parent: Logger | null;
-    constructor(name: string, parent: Logger | null, levelCap: LogLevel);
-    static levelMap: {
-        [cap: string]: {
-            [level: string]: string;
-        };
-    };
-}
-
-export declare class LevelTransformLogger extends Logger {
-    readonly levelTransform: (level: LogLevel) => LogLevel;
-    readonly name: string;
-    readonly parent: Logger | null;
-    constructor(name: string, parent: Logger | null, levelTransform: (level: LogLevel) => LogLevel);
-    createChild(name: string): Logger;
-    log(level: LogLevel, message: string, metadata?: JsonObject): void;
-}
-
-export declare function levenshtein(a: string, b: string): number;
-
-export interface LogEntry extends LoggerMetadata {
-    level: LogLevel;
-    message: string;
-    timestamp: number;
-}
-
-export declare class Logger extends Observable<LogEntry> implements LoggerApi {
-    protected _metadata: LoggerMetadata;
-    protected get _observable(): Observable<LogEntry>;
-    protected set _observable(v: Observable<LogEntry>);
-    protected readonly _subject: Subject<LogEntry>;
-    readonly name: string;
-    readonly parent: Logger | null;
-    constructor(name: string, parent?: Logger | null);
-    asApi(): LoggerApi;
-    complete(): void;
-    createChild(name: string): Logger;
-    debug(message: string, metadata?: JsonObject): void;
-    error(message: string, metadata?: JsonObject): void;
-    fatal(message: string, metadata?: JsonObject): void;
-    forEach(next: (value: LogEntry) => void, PromiseCtor?: typeof Promise): Promise<void>;
-    info(message: string, metadata?: JsonObject): void;
-    lift<R>(operator: Operator<LogEntry, R>): Observable<R>;
-    log(level: LogLevel, message: string, metadata?: JsonObject): void;
-    next(entry: LogEntry): void;
-    subscribe(): Subscription;
-    subscribe(observer: PartialObserver<LogEntry>): Subscription;
-    subscribe(next?: (value: LogEntry) => void, error?: (error: Error) => void, complete?: () => void): Subscription;
-    toString(): string;
-    warn(message: string, metadata?: JsonObject): void;
-}
-
-export interface LoggerApi {
-    createChild(name: string): Logger;
-    debug(message: string, metadata?: JsonObject): void;
-    error(message: string, metadata?: JsonObject): void;
-    fatal(message: string, metadata?: JsonObject): void;
-    info(message: string, metadata?: JsonObject): void;
-    log(level: LogLevel, message: string, metadata?: JsonObject): void;
-    warn(message: string, metadata?: JsonObject): void;
-}
-
-export interface LoggerMetadata extends JsonObject {
-    name: string;
-    path: string[];
-}
-
-export declare class LoggingAnalytics implements Analytics {
-    protected _logger: Logger;
-    constructor(_logger: Logger);
-    event(category: string, action: string, options?: EventOptions): void;
-    flush(): Promise<void>;
-    pageview(path: string, options?: PageviewOptions): void;
-    screenview(screenName: string, appName: string, options?: ScreenviewOptions): void;
-    timing(category: string, variable: string, time: string | number, options?: TimingOptions): void;
-}
-
-export declare type LogLevel = 'debug' | 'info' | 'warn' | 'error' | 'fatal';
-
-export declare function mapObject<T, V>(obj: {
-    [k: string]: T;
-}, mapper: (k: string, v: T) => V): {
-    [k: string]: V;
-};
-
-export declare class MergeConflictException extends BaseException {
-    constructor(path: string);
-}
-
-export declare class MultiAnalytics implements Analytics {
-    protected _backends: Analytics[];
-    constructor(_backends?: Analytics[]);
-    event(category: string, action: string, options?: EventOptions): void;
-    flush(): Promise<void>;
-    pageview(path: string, options?: PageviewOptions): void;
-    push(...backend: Analytics[]): void;
-    screenview(screenName: string, appName: string, options?: ScreenviewOptions): void;
-    timing(category: string, variable: string, time: string | number, options?: TimingOptions): void;
-}
-
-export declare enum NgCliAnalyticsDimensions {
-    CpuCount = 1,
-    CpuSpeed = 2,
-    RamInGigabytes = 3,
-    NodeVersion = 4,
-    NgAddCollection = 6,
-    NgIvyEnabled = 8,
-    BuildErrors = 20
-}
-
-export declare const NgCliAnalyticsDimensionsFlagInfo: {
-    [name: string]: [string, string];
-};
-
-export declare enum NgCliAnalyticsMetrics {
-    NgComponentCount = 1,
-    UNUSED_2 = 2,
-    UNUSED_3 = 3,
-    UNUSED_4 = 4,
-    BuildTime = 5,
-    NgOnInitCount = 6,
-    InitialChunkSize = 7,
-    TotalChunkCount = 8,
-    TotalChunkSize = 9,
-    LazyChunkCount = 10,
-    LazyChunkSize = 11,
-    AssetCount = 12,
-    AssetSize = 13,
-    PolyfillSize = 14,
-    CssSize = 15
-}
-
-export declare const NgCliAnalyticsMetricsFlagInfo: {
-    [name: string]: [string, string];
-};
-
-export declare function noCacheNormalize(path: string): Path;
-
-export declare class NoopAnalytics implements Analytics {
-    event(): void;
-    flush(): Promise<void>;
-    pageview(): void;
-    screenview(): void;
-    timing(): void;
-}
-
-export declare function normalize(path: string): Path;
-
-export declare const NormalizedRoot: Path;
-
-export declare const NormalizedSep: Path;
-
-export declare class NullLogger extends Logger {
-    constructor(parent?: Logger | null);
-    asApi(): LoggerApi;
-}
-
-export declare function oneLine(strings: TemplateStringsArray, ...values: any[]): string;
-
-export interface PageviewOptions extends CustomDimensionsAndMetricsOptions {
-    hostname?: string;
-    title?: string;
-}
-
-export declare function parseJson(input: string, mode?: JsonParseMode, options?: ParseJsonOptions): JsonValue;
-
-export declare function parseJsonAst(input: string, mode?: JsonParseMode): JsonAstNode;
-
-export interface ParseJsonOptions {
-    path?: string;
-}
-
-export declare function parseJsonPointer(pointer: JsonPointer): string[];
-
-export declare class PartiallyOrderedSet<T> implements Set<T> {
-    get [Symbol.toStringTag](): 'Set';
-    get size(): number;
-    [Symbol.iterator](): Generator<T, void, unknown>;
-    protected _checkCircularDependencies(item: T, deps: Set<T>): void;
-    add(item: T, deps?: (Set<T> | T[])): this;
-    clear(): void;
-    delete(item: T): boolean;
-    entries(): IterableIterator<[T, T]>;
-    forEach(callbackfn: (value: T, value2: T, set: PartiallyOrderedSet<T>) => void, thisArg?: any): void;
-    has(item: T): boolean;
-    keys(): IterableIterator<T>;
-    values(): IterableIterator<T>;
-}
-
-export declare const path: TemplateTag<Path>;
-
-export declare type Path = string & {
-    __PRIVATE_DEVKIT_PATH: void;
-};
-
-export declare class PathCannotBeFragmentException extends BaseException {
-    constructor(path: string);
-}
-
-export declare type PathFragment = Path & {
-    __PRIVATE_DEVKIT_PATH_FRAGMENT: void;
-};
-
-export declare class PathIsDirectoryException extends BaseException {
-    constructor(path: string);
-}
-
-export declare class PathIsFileException extends BaseException {
-    constructor(path: string);
-}
-
-export declare class PathMustBeAbsoluteException extends BaseException {
-    constructor(path: string);
-}
-
-export declare class PathSpecificJsonException extends JsonException {
-    exception: JsonException;
-    path: string;
-    constructor(path: string, exception: JsonException);
-}
-
-export declare class PatternMatchingHost<StatsT extends object = {}> extends ResolverHost<StatsT> {
-    protected _patterns: Map<RegExp, ReplacementFunction>;
-    protected _resolve(path: Path): Path;
-    addPattern(pattern: string | string[], replacementFn: ReplacementFunction): void;
-}
-
-export interface Position {
-    readonly character: number;
-    readonly line: number;
-    readonly offset: number;
-}
-
-export declare type PosixPath = string & {
-    __PRIVATE_DEVKIT_POSIX_PATH: void;
-};
-
-export declare class PriorityQueue<T> {
-    get size(): number;
-    constructor(_comparator: (x: T, y: T) => number);
-    clear(): void;
-    peek(): T | undefined;
-    pop(): T | undefined;
-    push(item: T): void;
-    toArray(): Array<T>;
-}
-
-export interface ProjectDefinition {
-    readonly extensions: Record<string, JsonValue | undefined>;
-    prefix?: string;
-    root: string;
-    sourceRoot?: string;
-    readonly targets: TargetDefinitionCollection;
-}
-
-export declare class ProjectDefinitionCollection extends DefinitionCollection<ProjectDefinition> {
-    constructor(initial?: Record<string, ProjectDefinition>, listener?: DefinitionCollectionListener<ProjectDefinition>);
-    add(definition: {
-        name: string;
-        root: string;
-        sourceRoot?: string;
-        prefix?: string;
-        targets?: Record<string, TargetDefinition | undefined>;
-        [key: string]: unknown;
-    }): ProjectDefinition;
-    set(name: string, value: ProjectDefinition): this;
-}
-
-export interface PromptDefinition {
-    default?: string | string[] | number | boolean | null;
-    id: string;
-    items?: Array<string | {
-        value: JsonValue;
-        label: string;
-    }>;
-    message: string;
-    multiselect?: boolean;
-    propertyTypes: Set<string>;
-    raw?: string | JsonObject;
-    type: string;
-    validator?: (value: JsonValue) => boolean | string | Promise<boolean | string>;
-}
-
-export declare type PromptProvider = (definitions: Array<PromptDefinition>) => SubscribableOrPromise<{
-    [id: string]: JsonValue;
-}>;
-
-export interface ReadonlyHost<StatsT extends object = {}> {
-    readonly capabilities: HostCapabilities;
-    exists(path: Path): Observable<boolean>;
-    isDirectory(path: Path): Observable<boolean>;
-    isFile(path: Path): Observable<boolean>;
-    list(path: Path): Observable<PathFragment[]>;
-    read(path: Path): Observable<FileBuffer>;
-    stat(path: Path): Observable<Stats<StatsT> | null> | null;
-}
-
-export declare function readWorkspace(path: string, host: WorkspaceHost, format?: WorkspaceFormat): Promise<{
-    workspace: WorkspaceDefinition;
-}>;
-
-export interface ReferenceResolver<ContextT> {
-    (ref: string, context?: ContextT): {
-        context?: ContextT;
-        schema?: JsonObject;
-    };
-}
-
-export declare function relative(from: Path, to: Path): Path;
-
-export declare type ReplacementFunction = (path: Path) => Path;
-
-export declare function resetNormalizeCache(): void;
-
-export declare function resolve(p1: Path, p2: Path): Path;
-
-export declare abstract class ResolverHost<T extends object> implements Host<T> {
-    protected _delegate: Host<T>;
-    get capabilities(): HostCapabilities;
-    constructor(_delegate: Host<T>);
-    protected abstract _resolve(path: Path): Path;
-    delete(path: Path): Observable<void>;
-    exists(path: Path): Observable<boolean>;
-    isDirectory(path: Path): Observable<boolean>;
-    isFile(path: Path): Observable<boolean>;
-    list(path: Path): Observable<PathFragment[]>;
-    read(path: Path): Observable<FileBuffer>;
-    rename(from: Path, to: Path): Observable<void>;
-    stat(path: Path): Observable<Stats<T> | null> | null;
-    watch(path: Path, options?: HostWatchOptions): Observable<HostWatchEvent> | null;
-    write(path: Path, content: FileBuffer): Observable<void>;
-}
-
-export declare class SafeReadonlyHost<StatsT extends object = {}> implements ReadonlyHost<StatsT> {
-    get capabilities(): HostCapabilities;
-    constructor(_delegate: ReadonlyHost<StatsT>);
-    exists(path: Path): Observable<boolean>;
-    isDirectory(path: Path): Observable<boolean>;
-    isFile(path: Path): Observable<boolean>;
-    list(path: Path): Observable<PathFragment[]>;
-    read(path: Path): Observable<FileBuffer>;
-    stat(path: Path): Observable<Stats<StatsT> | null> | null;
-}
-
-export interface SchemaFormat {
-    formatter: SchemaFormatter;
-    name: string;
-}
-
-export declare type SchemaFormatter = Format;
-
-export interface SchemaKeywordValidator {
-    (data: JsonValue, schema: JsonValue, parent: JsonObject | JsonArray | undefined, parentProperty: string | number | undefined, pointer: JsonPointer, rootData: JsonValue): boolean | Observable<boolean>;
-}
-
-export interface SchemaRegistry {
-    addFormat(format: SchemaFormat): void;
-    addPostTransform(visitor: JsonVisitor, deps?: JsonVisitor[]): void;
-    addPreTransform(visitor: JsonVisitor, deps?: JsonVisitor[]): void;
-    addSmartDefaultProvider<T>(source: string, provider: SmartDefaultProvider<T>): void;
-    compile(schema: Object): Observable<SchemaValidator>;
-    flatten(schema: JsonObject | string): Observable<JsonObject>;
-    usePromptProvider(provider: PromptProvider): void;
-    useXDeprecatedProvider(onUsage: (message: string) => void): void;
-}
-
-export declare class SchemaValidationException extends BaseException {
-    readonly errors: SchemaValidatorError[];
-    constructor(errors?: SchemaValidatorError[], baseMessage?: string);
-    static createMessages(errors?: SchemaValidatorError[]): string[];
-}
-
-export interface SchemaValidator {
-    (data: JsonValue, options?: SchemaValidatorOptions): Observable<SchemaValidatorResult>;
-}
-
-export declare type SchemaValidatorError = ErrorObject;
-
-export interface SchemaValidatorOptions {
-    applyPostTransforms?: boolean;
-    applyPreTransforms?: boolean;
-    withPrompts?: boolean;
-}
-
-export interface SchemaValidatorResult {
-    data: JsonValue;
-    errors?: SchemaValidatorError[];
-    success: boolean;
-}
-
-export declare class ScopedHost<T extends object> extends ResolverHost<T> {
-    protected _root: Path;
-    constructor(delegate: Host<T>, _root?: Path);
-    protected _resolve(path: Path): Path;
-}
-
-export interface ScreenviewOptions extends CustomDimensionsAndMetricsOptions {
-    appId?: string;
-    appInstallerId?: string;
-    appVersion?: string;
-}
-
-export declare class SimpleMemoryHost implements Host<{}> {
-    protected _cache: Map<Path, Stats<SimpleMemoryHostStats>>;
-    get capabilities(): HostCapabilities;
-    constructor();
-    protected _delete(path: Path): void;
-    protected _exists(path: Path): boolean;
-    protected _isDirectory(path: Path): boolean;
-    protected _isFile(path: Path): boolean;
-    protected _list(path: Path): PathFragment[];
-    protected _newDirStats(): {
-        inspect(): string;
-        isFile(): boolean;
-        isDirectory(): boolean;
-        size: number;
-        atime: Date;
-        ctime: Date;
-        mtime: Date;
-        birthtime: Date;
-        content: null;
-    };
-    protected _newFileStats(content: FileBuffer, oldStats?: Stats<SimpleMemoryHostStats>): {
-        inspect(): string;
-        isFile(): boolean;
-        isDirectory(): boolean;
-        size: number;
-        atime: Date;
-        ctime: Date;
-        mtime: Date;
-        birthtime: Date;
-        content: ArrayBuffer;
-    };
-    protected _read(path: Path): FileBuffer;
-    protected _rename(from: Path, to: Path): void;
-    protected _stat(path: Path): Stats<SimpleMemoryHostStats> | null;
-    protected _toAbsolute(path: Path): Path;
-    protected _updateWatchers(path: Path, type: HostWatchEventType): void;
-    protected _watch(path: Path, options?: HostWatchOptions): Observable<HostWatchEvent>;
-    protected _write(path: Path, content: FileBuffer): void;
-    delete(path: Path): Observable<void>;
-    exists(path: Path): Observable<boolean>;
-    isDirectory(path: Path): Observable<boolean>;
-    isFile(path: Path): Observable<boolean>;
-    list(path: Path): Observable<PathFragment[]>;
-    read(path: Path): Observable<FileBuffer>;
-    rename(from: Path, to: Path): Observable<void>;
-    reset(): void;
-    stat(path: Path): Observable<Stats<{}> | null> | null;
-    watch(path: Path, options?: HostWatchOptions): Observable<HostWatchEvent> | null;
-    write(path: Path, content: FileBuffer): Observable<void>;
-}
-
-export interface SimpleMemoryHostStats {
-    readonly content: FileBuffer | null;
-}
-
-export interface SmartDefaultProvider<T> {
-    (schema: JsonObject): T | Observable<T>;
-}
-
-export declare function split(path: Path): PathFragment[];
-
-export declare type Stats<T extends object = {}> = T & {
-    isFile(): boolean;
-    isDirectory(): boolean;
-    readonly size: number;
-    readonly atime: Date;
-    readonly mtime: Date;
-    readonly ctime: Date;
-    readonly birthtime: Date;
-};
-
-export declare function stringToFileBuffer(str: string): FileBuffer;
-
-export declare function stripIndent(strings: TemplateStringsArray, ...values: any[]): string;
-
-export declare function stripIndents(strings: TemplateStringsArray, ...values: any[]): string;
-
-export declare class SyncDelegateHost<T extends object = {}> {
-    protected _delegate: Host<T>;
-    get capabilities(): HostCapabilities;
-    get delegate(): Host<T>;
-    constructor(_delegate: Host<T>);
-    protected _doSyncCall<ResultT>(observable: Observable<ResultT>): ResultT;
-    delete(path: Path): void;
-    exists(path: Path): boolean;
-    isDirectory(path: Path): boolean;
-    isFile(path: Path): boolean;
-    list(path: Path): PathFragment[];
-    read(path: Path): FileBuffer;
-    rename(from: Path, to: Path): void;
-    stat(path: Path): Stats<T> | null;
-    watch(path: Path, options?: HostWatchOptions): Observable<HostWatchEvent> | null;
-    write(path: Path, content: FileBufferLike): void;
-}
-
-export interface SyncHostHandler<StatsT extends object = {}> {
-    delete(path: Path): void;
-    exists(path: Path): boolean;
-    isDirectory(path: Path): boolean;
-    isFile(path: Path): boolean;
-    list(path: Path): PathFragment[];
-    read(path: Path): FileBuffer;
-    rename(from: Path, to: Path): void;
-    stat(path: Path): Stats<StatsT> | null;
-    write(path: Path, content: FileBufferLike): void;
-}
-
-export declare class SynchronousDelegateExpectedException extends BaseException {
-    constructor();
-}
-
-export interface TargetDefinition {
-    builder: string;
-    configurations?: Record<string, Record<string, JsonValue | undefined> | undefined>;
-    defaultConfiguration?: string;
-    options?: Record<string, JsonValue | undefined>;
-}
-
-export declare class TargetDefinitionCollection extends DefinitionCollection<TargetDefinition> {
-    constructor(initial?: Record<string, TargetDefinition>, listener?: DefinitionCollectionListener<TargetDefinition>);
-    add(definition: {
-        name: string;
-    } & TargetDefinition): TargetDefinition;
-    set(name: string, value: TargetDefinition): this;
-}
-
-export declare function template<T>(content: string, options?: TemplateOptions): (input: T) => string;
-
-export interface TemplateAst {
-    children: TemplateAstNode[];
-    content: string;
-    fileName: string;
-}
-
-export interface TemplateAstBase {
-    end: Position;
-    start: Position;
-}
-
-export interface TemplateAstComment extends TemplateAstBase {
-    kind: 'comment';
-    text: string;
-}
-
-export interface TemplateAstContent extends TemplateAstBase {
-    content: string;
-    kind: 'content';
-}
-
-export interface TemplateAstEscape extends TemplateAstBase {
-    expression: string;
-    kind: 'escape';
-}
-
-export interface TemplateAstEvaluate extends TemplateAstBase {
-    expression: string;
-    kind: 'evaluate';
-}
-
-export interface TemplateAstInterpolate extends TemplateAstBase {
-    expression: string;
-    kind: 'interpolate';
-}
-
-export declare type TemplateAstNode = TemplateAstContent | TemplateAstEvaluate | TemplateAstComment | TemplateAstEscape | TemplateAstInterpolate;
-
-export interface TemplateOptions {
-    fileName?: string;
-    module?: boolean | {
-        exports: {};
-    };
-    sourceMap?: boolean;
-    sourceRoot?: string;
-    sourceURL?: string;
-}
-
-export declare function templateParser(sourceText: string, fileName: string): TemplateAst;
-
-export interface TemplateTag<R = string> {
-    (template: TemplateStringsArray, ...substitutions: any[]): R;
-}
-
-export declare namespace test {
-    type TestLogRecord = {
-        kind: 'write' | 'read' | 'delete' | 'list' | 'exists' | 'isDirectory' | 'isFile' | 'stat' | 'watch';
-        path: Path;
-    } | {
-        kind: 'rename';
-        from: Path;
-        to: Path;
-    };
-    class TestHost extends SimpleMemoryHost {
-        protected _records: TestLogRecord[];
-        protected _sync: SyncDelegateHost<{}> | null;
-        get files(): Path[];
-        get records(): TestLogRecord[];
-        get sync(): SyncDelegateHost<{}>;
-        constructor(map?: {
-            [path: string]: string;
-        });
-        $exists(path: string): boolean;
-        $isDirectory(path: string): boolean;
-        $isFile(path: string): boolean;
-        $list(path: string): PathFragment[];
-        $read(path: string): string;
-        $write(path: string, content: string): void;
-        protected _delete(path: Path): void;
-        protected _exists(path: Path): boolean;
-        protected _isDirectory(path: Path): boolean;
-        protected _isFile(path: Path): boolean;
-        protected _list(path: Path): PathFragment[];
-        protected _read(path: Path): ArrayBuffer;
-        protected _rename(from: Path, to: Path): void;
-        protected _stat(path: Path): Stats<SimpleMemoryHostStats> | null;
-        protected _watch(path: Path, options?: HostWatchOptions): Observable<HostWatchEvent>;
-        protected _write(path: Path, content: FileBuffer): void;
-        clearRecords(): void;
-        clone(): TestHost;
-    }
-}
-
-export interface TimingOptions extends CustomDimensionsAndMetricsOptions {
-    label?: string;
-}
-
-export declare class TransformLogger extends Logger {
-    constructor(name: string, transform: (stream: Observable<LogEntry>) => Observable<LogEntry>, parent?: Logger | null);
-}
-
-export declare function trimNewlines(strings: TemplateStringsArray, ...values: any[]): string;
-
-export declare function underscore(str: string): string;
-
-export declare class UnexpectedEndOfInputException extends JsonException {
-    constructor(_context: JsonParserContext);
-}
-
-export declare class UnimplementedException extends BaseException {
-    constructor();
-}
-
-export declare class UnknownException extends BaseException {
-    constructor(message: string);
-}
-
-export declare class UnsupportedPlatformException extends BaseException {
-    constructor();
-}
-
-export declare type UriHandler = (uri: string) => Observable<JsonObject> | Promise<JsonObject> | null | undefined;
-
-export declare function visitJson<ContextT>(json: JsonValue, visitor: JsonVisitor, schema?: JsonSchema, refResolver?: ReferenceResolver<ContextT>, context?: ContextT): Observable<JsonValue>;
-
-export declare function visitJsonSchema(schema: JsonSchema, visitor: JsonSchemaVisitor): void;
-
-export declare type WindowsPath = string & {
-    __PRIVATE_DEVKIT_WINDOWS_PATH: void;
-};
-
-export interface WorkspaceDefinition {
-    readonly extensions: Record<string, JsonValue | undefined>;
-    readonly projects: ProjectDefinitionCollection;
-}
-
-export declare enum WorkspaceFormat {
-    JSON = 0
-}
-
-export interface WorkspaceHost {
-    isDirectory(path: string): Promise<boolean>;
-    isFile(path: string): Promise<boolean>;
-    readFile(path: string): Promise<string>;
-    writeFile(path: string, data: string): Promise<void>;
-}
-
-export declare function writeWorkspace(workspace: WorkspaceDefinition, host: WorkspaceHost, path?: string, format?: WorkspaceFormat): Promise<void>;
diff --git a/etc/api/angular_devkit/schematics/src/_golden-api.d.ts b/etc/api/angular_devkit/schematics/src/_golden-api.d.ts
deleted file mode 100644
index 444923c61bc1..000000000000
--- a/etc/api/angular_devkit/schematics/src/_golden-api.d.ts
+++ /dev/null
@@ -1,620 +0,0 @@
-export declare type Action = CreateFileAction | OverwriteFileAction | RenameFileAction | DeleteFileAction;
-
-export interface ActionBase {
-    readonly id: number;
-    readonly parent: number;
-    readonly path: Path;
-}
-
-export declare class ActionList implements Iterable<Action> {
-    get length(): number;
-    [Symbol.iterator](): IterableIterator<Action>;
-    protected _action(action: Partial<Action>): void;
-    create(path: Path, content: Buffer): void;
-    delete(path: Path): void;
-    find(predicate: (value: Action) => boolean): Action | null;
-    forEach(fn: (value: Action, index: number, array: Action[]) => void, thisArg?: {}): void;
-    get(i: number): Action;
-    has(action: Action): boolean;
-    optimize(): void;
-    overwrite(path: Path, content: Buffer): void;
-    push(action: Action): void;
-    rename(path: Path, to: Path): void;
-}
-
-export declare function apply(source: Source, rules: Rule[]): Source;
-
-export declare function applyContentTemplate<T>(options: T): FileOperator;
-
-export declare function applyPathTemplate<T extends PathTemplateData>(data: T, options?: PathTemplateOptions): FileOperator;
-
-export declare function applyTemplates<T>(options: T): Rule;
-
-export declare function applyToSubtree(path: string, rules: Rule[]): Rule;
-
-export declare function asSource(rule: Rule): Source;
-
-export declare type AsyncFileOperator = (tree: FileEntry) => Observable<FileEntry | null>;
-
-export declare abstract class BaseWorkflow implements Workflow {
-    protected _context: WorkflowExecutionContext[];
-    protected _dryRun: boolean;
-    protected _engine: Engine<{}, {}>;
-    protected _engineHost: EngineHost<{}, {}>;
-    protected _force: boolean;
-    protected _host: virtualFs.Host;
-    protected _lifeCycle: Subject<LifeCycleEvent>;
-    protected _registry: schema.CoreSchemaRegistry;
-    protected _reporter: Subject<DryRunEvent>;
-    get context(): Readonly<WorkflowExecutionContext>;
-    get engine(): Engine<{}, {}>;
-    get engineHost(): EngineHost<{}, {}>;
-    get lifeCycle(): Observable<LifeCycleEvent>;
-    get registry(): schema.SchemaRegistry;
-    get reporter(): Observable<DryRunEvent>;
-    constructor(options: BaseWorkflowOptions);
-    protected _createSinks(): Sink[];
-    execute(options: Partial<WorkflowExecutionContext> & RequiredWorkflowExecutionContext): Observable<void>;
-}
-
-export interface BaseWorkflowOptions {
-    dryRun?: boolean;
-    engineHost: EngineHost<{}, {}>;
-    force?: boolean;
-    host: virtualFs.Host;
-    registry?: schema.CoreSchemaRegistry;
-}
-
-export declare function branchAndMerge(rule: Rule, strategy?: MergeStrategy): Rule;
-
-export declare function callRule(rule: Rule, input: Tree | Observable<Tree>, context: SchematicContext): Observable<Tree>;
-
-export declare function callSource(source: Source, context: SchematicContext): Observable<Tree>;
-
-export declare function chain(rules: Rule[]): Rule;
-
-export declare class CircularCollectionException extends BaseException {
-    constructor(name: string);
-}
-
-export interface Collection<CollectionMetadataT extends object, SchematicMetadataT extends object> {
-    readonly baseDescriptions?: Array<CollectionDescription<CollectionMetadataT>>;
-    readonly description: CollectionDescription<CollectionMetadataT>;
-    createSchematic(name: string, allowPrivate?: boolean): Schematic<CollectionMetadataT, SchematicMetadataT>;
-    listSchematicNames(): string[];
-}
-
-export declare type CollectionDescription<CollectionMetadataT extends object> = CollectionMetadataT & {
-    readonly name: string;
-    readonly extends?: string[];
-};
-
-export declare class CollectionImpl<CollectionT extends object, SchematicT extends object> implements Collection<CollectionT, SchematicT> {
-    readonly baseDescriptions?: CollectionDescription<CollectionT>[] | undefined;
-    get description(): CollectionDescription<CollectionT>;
-    get name(): string;
-    constructor(_description: CollectionDescription<CollectionT>, _engine: SchematicEngine<CollectionT, SchematicT>, baseDescriptions?: CollectionDescription<CollectionT>[] | undefined);
-    createSchematic(name: string, allowPrivate?: boolean): Schematic<CollectionT, SchematicT>;
-    listSchematicNames(): string[];
-}
-
-export declare function composeFileOperators(operators: FileOperator[]): FileOperator;
-
-export declare class ContentHasMutatedException extends BaseException {
-    constructor(path: string);
-}
-
-export declare function contentTemplate<T>(options: T): Rule;
-
-export interface CreateFileAction extends ActionBase {
-    readonly content: Buffer;
-    readonly kind: 'c';
-}
-
-export declare class DelegateTree implements Tree {
-    protected _other: Tree;
-    get actions(): Action[];
-    get root(): DirEntry;
-    constructor(_other: Tree);
-    apply(action: Action, strategy?: MergeStrategy): void;
-    beginUpdate(path: string): UpdateRecorder;
-    branch(): Tree;
-    commitUpdate(record: UpdateRecorder): void;
-    create(path: string, content: Buffer | string): void;
-    delete(path: string): void;
-    exists(path: string): boolean;
-    get(path: string): FileEntry | null;
-    getDir(path: string): DirEntry;
-    merge(other: Tree, strategy?: MergeStrategy): void;
-    overwrite(path: string, content: Buffer | string): void;
-    read(path: string): Buffer | null;
-    rename(from: string, to: string): void;
-    visit(visitor: FileVisitor): void;
-}
-
-export interface DeleteFileAction extends ActionBase {
-    readonly kind: 'd';
-}
-
-export interface DirEntry {
-    readonly parent: DirEntry | null;
-    readonly path: Path;
-    readonly subdirs: PathFragment[];
-    readonly subfiles: PathFragment[];
-    dir(name: PathFragment): DirEntry;
-    file(name: PathFragment): FileEntry | null;
-    visit(visitor: FileVisitor): void;
-}
-
-export interface DryRunCreateEvent {
-    content: Buffer;
-    kind: 'create';
-    path: string;
-}
-
-export interface DryRunDeleteEvent {
-    kind: 'delete';
-    path: string;
-}
-
-export interface DryRunErrorEvent {
-    description: 'alreadyExist' | 'doesNotExist';
-    kind: 'error';
-    path: string;
-}
-
-export declare type DryRunEvent = DryRunErrorEvent | DryRunDeleteEvent | DryRunCreateEvent | DryRunUpdateEvent | DryRunRenameEvent;
-
-export interface DryRunRenameEvent {
-    kind: 'rename';
-    path: string;
-    to: string;
-}
-
-export declare class DryRunSink extends HostSink {
-    protected _fileAlreadyExistExceptionSet: Set<string>;
-    protected _fileDoesNotExistExceptionSet: Set<string>;
-    protected _subject: Subject<DryRunEvent>;
-    readonly reporter: Observable<DryRunEvent>;
-    constructor(host: virtualFs.Host, force?: boolean);
-    _done(): Observable<void>;
-    protected _fileAlreadyExistException(path: string): void;
-    protected _fileDoesNotExistException(path: string): void;
-}
-
-export interface DryRunUpdateEvent {
-    content: Buffer;
-    kind: 'update';
-    path: string;
-}
-
-export declare function empty(): Source;
-
-export declare class EmptyTree extends HostTree {
-    constructor();
-}
-
-export interface Engine<CollectionMetadataT extends object, SchematicMetadataT extends object> {
-    readonly defaultMergeStrategy: MergeStrategy;
-    readonly workflow: Workflow | null;
-    createCollection(name: string, requester?: Collection<CollectionMetadataT, SchematicMetadataT>): Collection<CollectionMetadataT, SchematicMetadataT>;
-    createContext(schematic: Schematic<CollectionMetadataT, SchematicMetadataT>, parent?: Partial<TypedSchematicContext<CollectionMetadataT, SchematicMetadataT>>, executionOptions?: Partial<ExecutionOptions>): TypedSchematicContext<CollectionMetadataT, SchematicMetadataT>;
-    createSchematic(name: string, collection: Collection<CollectionMetadataT, SchematicMetadataT>): Schematic<CollectionMetadataT, SchematicMetadataT>;
-    createSourceFromUrl(url: Url, context: TypedSchematicContext<CollectionMetadataT, SchematicMetadataT>): Source;
-    executePostTasks(): Observable<void>;
-    transformOptions<OptionT extends object, ResultT extends object>(schematic: Schematic<CollectionMetadataT, SchematicMetadataT>, options: OptionT, context?: TypedSchematicContext<CollectionMetadataT, SchematicMetadataT>): Observable<ResultT>;
-}
-
-export interface EngineHost<CollectionMetadataT extends object, SchematicMetadataT extends object> {
-    readonly defaultMergeStrategy?: MergeStrategy;
-    createCollectionDescription(name: string, requester?: CollectionDescription<CollectionMetadataT>): CollectionDescription<CollectionMetadataT>;
-    createSchematicDescription(name: string, collection: CollectionDescription<CollectionMetadataT>): SchematicDescription<CollectionMetadataT, SchematicMetadataT> | null;
-    createSourceFromUrl(url: Url, context: TypedSchematicContext<CollectionMetadataT, SchematicMetadataT>): Source | null;
-    createTaskExecutor(name: string): Observable<TaskExecutor>;
-    getSchematicRuleFactory<OptionT extends object>(schematic: SchematicDescription<CollectionMetadataT, SchematicMetadataT>, collection: CollectionDescription<CollectionMetadataT>): RuleFactory<OptionT>;
-    hasTaskExecutor(name: string): boolean;
-    listSchematicNames(collection: CollectionDescription<CollectionMetadataT>): string[];
-    transformContext(context: TypedSchematicContext<CollectionMetadataT, SchematicMetadataT>): TypedSchematicContext<CollectionMetadataT, SchematicMetadataT> | void;
-    transformOptions<OptionT extends object, ResultT extends object>(schematic: SchematicDescription<CollectionMetadataT, SchematicMetadataT>, options: OptionT, context?: TypedSchematicContext<CollectionMetadataT, SchematicMetadataT>): Observable<ResultT>;
-}
-
-export interface ExecutionOptions {
-    interactive: boolean;
-    scope: string;
-}
-
-export declare function externalSchematic<OptionT extends object>(collectionName: string, schematicName: string, options: OptionT, executionOptions?: Partial<ExecutionOptions>): Rule;
-
-export declare class FileAlreadyExistException extends BaseException {
-    constructor(path: string);
-}
-
-export declare class FileDoesNotExistException extends BaseException {
-    constructor(path: string);
-}
-
-export interface FileEntry {
-    readonly content: Buffer;
-    readonly path: Path;
-}
-
-export declare type FileOperator = (entry: FileEntry) => FileEntry | null;
-
-export interface FilePredicate<T> {
-    (path: Path, entry?: Readonly<FileEntry> | null): T;
-}
-
-export declare type FileVisitor = FilePredicate<void>;
-
-export declare const FileVisitorCancelToken: symbol;
-
-export declare function filter(predicate: FilePredicate<boolean>): Rule;
-
-export declare class FilterHostTree extends HostTree {
-    constructor(tree: HostTree, filter?: FilePredicate<boolean>);
-}
-
-export declare function forEach(operator: FileOperator): Rule;
-
-export declare class HostCreateTree extends HostTree {
-    constructor(host: virtualFs.ReadonlyHost);
-}
-
-export declare class HostDirEntry implements DirEntry {
-    protected _host: virtualFs.SyncDelegateHost;
-    protected _tree: Tree;
-    readonly parent: DirEntry | null;
-    readonly path: Path;
-    get subdirs(): PathFragment[];
-    get subfiles(): PathFragment[];
-    constructor(parent: DirEntry | null, path: Path, _host: virtualFs.SyncDelegateHost, _tree: Tree);
-    dir(name: PathFragment): DirEntry;
-    file(name: PathFragment): FileEntry | null;
-    visit(visitor: FileVisitor): void;
-}
-
-export declare class HostSink extends SimpleSinkBase {
-    protected _filesToCreate: Map<Path, UpdateBuffer>;
-    protected _filesToDelete: Set<Path>;
-    protected _filesToRename: Set<[Path, Path]>;
-    protected _filesToUpdate: Map<Path, UpdateBuffer>;
-    protected _force: boolean;
-    protected _host: virtualFs.Host;
-    constructor(_host: virtualFs.Host, _force?: boolean);
-    protected _createFile(path: Path, content: Buffer): Observable<void>;
-    protected _deleteFile(path: Path): Observable<void>;
-    _done(): Observable<void>;
-    protected _overwriteFile(path: Path, content: Buffer): Observable<void>;
-    protected _renameFile(from: Path, to: Path): Observable<void>;
-    protected _validateCreateAction(action: CreateFileAction): Observable<void>;
-    protected _validateFileExists(p: Path): Observable<boolean>;
-}
-
-export declare class HostTree implements Tree {
-    protected _backend: virtualFs.ReadonlyHost<{}>;
-    get actions(): Action[];
-    get root(): DirEntry;
-    constructor(_backend?: virtualFs.ReadonlyHost<{}>);
-    protected _normalizePath(path: string): Path;
-    protected _willCreate(path: Path): boolean;
-    protected _willDelete(path: Path): boolean;
-    protected _willOverwrite(path: Path): boolean;
-    protected _willRename(path: Path): boolean;
-    apply(action: Action, strategy?: MergeStrategy): void;
-    beginUpdate(path: string): UpdateRecorder;
-    branch(): Tree;
-    commitUpdate(record: UpdateRecorder): void;
-    create(path: string, content: Buffer | string): void;
-    delete(path: string): void;
-    exists(path: string): boolean;
-    get(path: string): FileEntry | null;
-    getDir(path: string): DirEntry;
-    merge(other: Tree, strategy?: MergeStrategy): void;
-    overwrite(path: string, content: Buffer | string): void;
-    read(path: string): Buffer | null;
-    rename(from: string, to: string): void;
-    visit(visitor: FileVisitor): void;
-    static isHostTree(tree: Tree): tree is HostTree;
-}
-
-export declare const htmlSelectorFormat: schema.SchemaFormat;
-
-export declare class InvalidPipeException extends BaseException {
-    constructor(name: string);
-}
-
-export declare class InvalidRuleResultException extends BaseException {
-    constructor(value?: {});
-}
-
-export declare class InvalidSchematicsNameException extends BaseException {
-    constructor(name: string);
-}
-
-export declare class InvalidSourceResultException extends BaseException {
-    constructor(value?: {});
-}
-
-export declare class InvalidUpdateRecordException extends BaseException {
-    constructor();
-}
-
-export declare function isAction(action: any): action is Action;
-
-export declare function isContentAction(action: Action): action is CreateFileAction | OverwriteFileAction;
-
-export interface LifeCycleEvent {
-    kind: 'start' | 'end' | 'workflow-start' | 'workflow-end' | 'post-tasks-start' | 'post-tasks-end';
-}
-
-export declare class MergeConflictException extends BaseException {
-    constructor(path: string);
-}
-
-export declare enum MergeStrategy {
-    AllowOverwriteConflict = 2,
-    AllowCreationConflict = 4,
-    AllowDeleteConflict = 8,
-    Default = 0,
-    Error = 1,
-    ContentOnly = 2,
-    Overwrite = 14
-}
-
-export declare function mergeWith(source: Source, strategy?: MergeStrategy): Rule;
-
-export declare function move(from: string, to?: string): Rule;
-
-export declare function noop(): Rule;
-
-export declare class OptionIsNotDefinedException extends BaseException {
-    constructor(name: string);
-}
-
-export interface OverwriteFileAction extends ActionBase {
-    readonly content: Buffer;
-    readonly kind: 'o';
-}
-
-export declare function partitionApplyMerge(predicate: FilePredicate<boolean>, ruleYes: Rule, ruleNo?: Rule): Rule;
-
-export declare const pathFormat: schema.SchemaFormat;
-
-export declare function pathTemplate<T extends PathTemplateData>(options: T): Rule;
-
-export declare type PathTemplateData = {
-    [key: string]: PathTemplateValue | PathTemplateData | PathTemplatePipeFunction;
-};
-
-export interface PathTemplateOptions {
-    interpolationEnd: string;
-    interpolationStart: string;
-    pipeSeparator?: string;
-}
-
-export declare type PathTemplatePipeFunction = (x: string) => PathTemplateValue;
-
-export declare type PathTemplateValue = boolean | string | number | undefined;
-
-export declare class PrivateSchematicException extends BaseException {
-    constructor(name: string, collection: CollectionDescription<{}>);
-}
-
-export interface RandomOptions {
-    multi?: boolean | number;
-    multiFiles?: boolean | number;
-    root?: string;
-}
-
-export interface RenameFileAction extends ActionBase {
-    readonly kind: 'r';
-    readonly to: Path;
-}
-
-export declare function renameTemplateFiles(): Rule;
-
-export interface RequiredWorkflowExecutionContext {
-    collection: string;
-    options: object;
-    schematic: string;
-}
-
-export declare type Rule = (tree: Tree, context: SchematicContext) => Tree | Observable<Tree> | Rule | Promise<void | Rule> | void;
-
-export declare type RuleFactory<T extends object> = (options: T) => Rule;
-
-export declare function schematic<OptionT extends object>(schematicName: string, options: OptionT, executionOptions?: Partial<ExecutionOptions>): Rule;
-
-export interface Schematic<CollectionMetadataT extends object, SchematicMetadataT extends object> {
-    readonly collection: Collection<CollectionMetadataT, SchematicMetadataT>;
-    readonly description: SchematicDescription<CollectionMetadataT, SchematicMetadataT>;
-    call<OptionT extends object>(options: OptionT, host: Observable<Tree>, parentContext?: Partial<TypedSchematicContext<CollectionMetadataT, SchematicMetadataT>>, executionOptions?: Partial<ExecutionOptions>): Observable<Tree>;
-}
-
-export declare type SchematicContext = TypedSchematicContext<{}, {}>;
-
-export declare type SchematicDescription<CollectionMetadataT extends object, SchematicMetadataT extends object> = SchematicMetadataT & {
-    readonly collection: CollectionDescription<CollectionMetadataT>;
-    readonly name: string;
-    readonly private?: boolean;
-    readonly hidden?: boolean;
-};
-
-export declare class SchematicEngine<CollectionT extends object, SchematicT extends object> implements Engine<CollectionT, SchematicT> {
-    protected _workflow?: Workflow | undefined;
-    get defaultMergeStrategy(): MergeStrategy;
-    get workflow(): Workflow | null;
-    constructor(_host: EngineHost<CollectionT, SchematicT>, _workflow?: Workflow | undefined);
-    createCollection(name: string, requester?: Collection<CollectionT, SchematicT>): Collection<CollectionT, SchematicT>;
-    createContext(schematic: Schematic<CollectionT, SchematicT>, parent?: Partial<TypedSchematicContext<CollectionT, SchematicT>>, executionOptions?: Partial<ExecutionOptions>): TypedSchematicContext<CollectionT, SchematicT>;
-    createSchematic(name: string, collection: Collection<CollectionT, SchematicT>, allowPrivate?: boolean): Schematic<CollectionT, SchematicT>;
-    createSourceFromUrl(url: Url, context: TypedSchematicContext<CollectionT, SchematicT>): Source;
-    executePostTasks(): Observable<void>;
-    listSchematicNames(collection: Collection<CollectionT, SchematicT>): string[];
-    transformOptions<OptionT extends object, ResultT extends object>(schematic: Schematic<CollectionT, SchematicT>, options: OptionT, context?: TypedSchematicContext<CollectionT, SchematicT>): Observable<ResultT>;
-}
-
-export declare class SchematicEngineConflictingException extends BaseException {
-    constructor();
-}
-
-export declare class SchematicImpl<CollectionT extends object, SchematicT extends object> implements Schematic<CollectionT, SchematicT> {
-    get collection(): Collection<CollectionT, SchematicT>;
-    get description(): SchematicDescription<CollectionT, SchematicT>;
-    constructor(_description: SchematicDescription<CollectionT, SchematicT>, _factory: RuleFactory<{}>, _collection: Collection<CollectionT, SchematicT>, _engine: Engine<CollectionT, SchematicT>);
-    call<OptionT extends object>(options: OptionT, host: Observable<Tree>, parentContext?: Partial<TypedSchematicContext<CollectionT, SchematicT>>, executionOptions?: Partial<ExecutionOptions>): Observable<Tree>;
-}
-
-export declare class SchematicsException extends BaseException {
-}
-
-export declare abstract class SimpleSinkBase implements Sink {
-    postCommit: () => void | Observable<void>;
-    postCommitAction: (action: Action) => void | Observable<void>;
-    preCommit: () => void | Observable<void>;
-    preCommitAction: (action: Action) => void | Action | PromiseLike<Action> | Observable<Action>;
-    protected abstract _createFile(path: string, content: Buffer): Observable<void>;
-    protected abstract _deleteFile(path: string): Observable<void>;
-    protected abstract _done(): Observable<void>;
-    protected _fileAlreadyExistException(path: string): void;
-    protected _fileDoesNotExistException(path: string): void;
-    protected abstract _overwriteFile(path: string, content: Buffer): Observable<void>;
-    protected abstract _renameFile(path: string, to: string): Observable<void>;
-    protected _validateCreateAction(action: CreateFileAction): Observable<void>;
-    protected _validateDeleteAction(action: DeleteFileAction): Observable<void>;
-    protected abstract _validateFileExists(p: string): Observable<boolean>;
-    protected _validateOverwriteAction(action: OverwriteFileAction): Observable<void>;
-    protected _validateRenameAction(action: RenameFileAction): Observable<void>;
-    commit(tree: Tree): Observable<void>;
-    commitSingleAction(action: Action): Observable<void>;
-    validateSingleAction(action: Action): Observable<void>;
-}
-
-export interface Sink {
-    commit(tree: Tree): Observable<void>;
-}
-
-export declare function source(tree: Tree): Source;
-
-export declare type Source = (context: SchematicContext) => Tree | Observable<Tree>;
-
-export declare const standardFormats: schema.SchemaFormat[];
-
-export interface TaskConfiguration<T = {}> {
-    dependencies?: Array<TaskId>;
-    name: string;
-    options?: T;
-}
-
-export interface TaskConfigurationGenerator<T = {}> {
-    toConfiguration(): TaskConfiguration<T>;
-}
-
-export declare type TaskExecutor<T = {}> = (options: T | undefined, context: SchematicContext) => Promise<void> | Observable<void>;
-
-export interface TaskExecutorFactory<T> {
-    readonly name: string;
-    create(options?: T): Promise<TaskExecutor> | Observable<TaskExecutor>;
-}
-
-export interface TaskId {
-    readonly id: number;
-}
-
-export interface TaskInfo {
-    readonly configuration: TaskConfiguration;
-    readonly context: SchematicContext;
-    readonly id: number;
-    readonly priority: number;
-}
-
-export declare class TaskScheduler {
-    constructor(_context: SchematicContext);
-    finalize(): ReadonlyArray<TaskInfo>;
-    schedule<T>(taskConfiguration: TaskConfiguration<T>): TaskId;
-}
-
-export declare function template<T>(options: T): Rule;
-
-export declare const TEMPLATE_FILENAME_RE: RegExp;
-
-export declare type Tree = TreeInterface;
-
-export interface TreeConstructor {
-    branch(tree: TreeInterface): TreeInterface;
-    empty(): TreeInterface;
-    merge(tree: TreeInterface, other: TreeInterface, strategy?: MergeStrategy): TreeInterface;
-    optimize(tree: TreeInterface): TreeInterface;
-    partition(tree: TreeInterface, predicate: FilePredicate<boolean>): [TreeInterface, TreeInterface];
-}
-
-export declare const TreeSymbol: symbol;
-
-export interface TypedSchematicContext<CollectionMetadataT extends object, SchematicMetadataT extends object> {
-    readonly analytics?: analytics.Analytics;
-    readonly debug: boolean;
-    readonly engine: Engine<CollectionMetadataT, SchematicMetadataT>;
-    readonly interactive: boolean;
-    readonly logger: logging.LoggerApi;
-    readonly schematic: Schematic<CollectionMetadataT, SchematicMetadataT>;
-    readonly strategy: MergeStrategy;
-    addTask<T>(task: TaskConfigurationGenerator<T>, dependencies?: Array<TaskId>): TaskId;
-}
-
-export declare class UnimplementedException extends BaseException {
-    constructor();
-}
-
-export declare class UnknownActionException extends BaseException {
-    constructor(action: Action);
-}
-
-export declare class UnknownCollectionException extends BaseException {
-    constructor(name: string);
-}
-
-export declare class UnknownPipeException extends BaseException {
-    constructor(name: string);
-}
-
-export declare class UnknownSchematicException extends BaseException {
-    constructor(name: string, collection: CollectionDescription<{}>);
-}
-
-export declare class UnknownTaskDependencyException extends BaseException {
-    constructor(id: TaskId);
-}
-
-export declare class UnknownUrlSourceProtocol extends BaseException {
-    constructor(url: string);
-}
-
-export declare class UnregisteredTaskException extends BaseException {
-    constructor(name: string, schematic?: SchematicDescription<{}, {}>);
-}
-
-export declare class UnsuccessfulWorkflowExecution extends BaseException {
-    constructor();
-}
-
-export interface UpdateRecorder {
-    insertLeft(index: number, content: Buffer | string): UpdateRecorder;
-    insertRight(index: number, content: Buffer | string): UpdateRecorder;
-    remove(index: number, length: number): UpdateRecorder;
-}
-
-export declare function url(urlString: string): Source;
-
-export declare function when(predicate: FilePredicate<boolean>, operator: FileOperator): FileOperator;
-
-export interface Workflow {
-    readonly context: Readonly<WorkflowExecutionContext>;
-    execute(options: Partial<WorkflowExecutionContext> & RequiredWorkflowExecutionContext): Observable<void>;
-}
-
-export interface WorkflowExecutionContext extends RequiredWorkflowExecutionContext {
-    allowPrivate?: boolean;
-    debug: boolean;
-    logger: logging.Logger;
-    parentContext?: Readonly<WorkflowExecutionContext>;
-}
diff --git a/etc/api/angular_devkit/schematics/testing/index.d.ts b/etc/api/angular_devkit/schematics/testing/index.d.ts
deleted file mode 100644
index 76192b31b905..000000000000
--- a/etc/api/angular_devkit/schematics/testing/index.d.ts
+++ /dev/null
@@ -1,15 +0,0 @@
-export declare class SchematicTestRunner {
-    get engine(): SchematicEngine<{}, {}>;
-    get logger(): logging.Logger;
-    get tasks(): TaskConfiguration[];
-    constructor(_collectionName: string, collectionPath: string);
-    callRule(rule: Rule, tree: Tree, parentContext?: Partial<SchematicContext>): Observable<Tree>;
-    registerCollection(collectionName: string, collectionPath: string): void;
-    runExternalSchematicAsync<SchematicSchemaT>(collectionName: string, schematicName: string, opts?: SchematicSchemaT, tree?: Tree): Observable<UnitTestTree>;
-    runSchematicAsync<SchematicSchemaT>(schematicName: string, opts?: SchematicSchemaT, tree?: Tree): Observable<UnitTestTree>;
-}
-
-export declare class UnitTestTree extends DelegateTree {
-    get files(): string[];
-    readContent(path: string): string;
-}
diff --git a/goldens/BUILD.bazel b/goldens/BUILD.bazel
new file mode 100644
index 000000000000..3b3283026537
--- /dev/null
+++ b/goldens/BUILD.bazel
@@ -0,0 +1,8 @@
+package(default_visibility = ["//visibility:public"])
+
+filegroup(
+    name = "public-api",
+    srcs = glob([
+        "public-api/**/*.md",
+    ]),
+)
diff --git a/goldens/circular-deps/packages.json b/goldens/circular-deps/packages.json
new file mode 100644
index 000000000000..fe51488c7066
--- /dev/null
+++ b/goldens/circular-deps/packages.json
@@ -0,0 +1 @@
+[]
diff --git a/goldens/public-api/angular_devkit/architect/src/index.md b/goldens/public-api/angular_devkit/architect/src/index.md
new file mode 100644
index 000000000000..3c61b83eb5c3
--- /dev/null
+++ b/goldens/public-api/angular_devkit/architect/src/index.md
@@ -0,0 +1,151 @@
+## API Report File for "@angular-devkit/architect"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+
+import { analytics } from '@angular-devkit/core';
+import { experimental } from '@angular-devkit/core';
+import { json } from '@angular-devkit/core';
+import { logging } from '@angular-devkit/core';
+import { Observable } from 'rxjs';
+import { SubscribableOrPromise } from 'rxjs';
+
+// @public (undocumented)
+export class Architect {
+    constructor(_host: ArchitectHost, registry?: json.schema.SchemaRegistry, additionalJobRegistry?: experimental.jobs.Registry);
+    // (undocumented)
+    has(name: experimental.jobs.JobName): Observable<boolean>;
+    // (undocumented)
+    scheduleBuilder(name: string, options: json.JsonObject, scheduleOptions?: ScheduleOptions): Promise<BuilderRun>;
+    // (undocumented)
+    scheduleTarget(target: Target, overrides?: json.JsonObject, scheduleOptions?: ScheduleOptions): Promise<BuilderRun>;
+}
+
+// @public
+export interface BuilderContext {
+    addTeardown(teardown: () => Promise<void> | void): void;
+    readonly analytics: analytics.Analytics;
+    builder: BuilderInfo;
+    currentDirectory: string;
+    getBuilderNameForTarget(target: Target): Promise<string>;
+    // (undocumented)
+    getProjectMetadata(projectName: string): Promise<json.JsonObject>;
+    // (undocumented)
+    getProjectMetadata(target: Target): Promise<json.JsonObject>;
+    getTargetOptions(target: Target): Promise<json.JsonObject>;
+    id: number;
+    logger: logging.LoggerApi;
+    reportProgress(current: number, total?: number, status?: string): void;
+    reportRunning(): void;
+    reportStatus(status: string): void;
+    scheduleBuilder(builderName: string, options?: json.JsonObject, scheduleOptions?: ScheduleOptions_2): Promise<BuilderRun>;
+    scheduleTarget(target: Target, overrides?: json.JsonObject, scheduleOptions?: ScheduleOptions_2): Promise<BuilderRun>;
+    target?: Target;
+    validateOptions<T extends json.JsonObject = json.JsonObject>(options: json.JsonObject, builderName: string): Promise<T>;
+    workspaceRoot: string;
+}
+
+// @public
+export interface BuilderHandlerFn<A> {
+    (input: A, context: BuilderContext): BuilderOutputLike;
+}
+
+// @public
+export type BuilderInfo = json.JsonObject & {
+    builderName: string;
+    description: string;
+    optionSchema: json.schema.JsonSchema;
+};
+
+// @public
+export type BuilderInput = json.JsonObject & Schema;
+
+// @public (undocumented)
+export type BuilderOutput = json.JsonObject & Schema_2;
+
+// @public
+export type BuilderOutputLike = AsyncIterable<BuilderOutput> | SubscribableOrPromise<BuilderOutput> | BuilderOutput;
+
+// @public (undocumented)
+export type BuilderProgress = json.JsonObject & Schema_3 & TypedBuilderProgress;
+
+// @public
+export type BuilderProgressReport = BuilderProgress & {
+    target?: Target;
+    builder: BuilderInfo;
+};
+
+// @public (undocumented)
+export enum BuilderProgressState {
+    // (undocumented)
+    Error = "error",
+    // (undocumented)
+    Running = "running",
+    // (undocumented)
+    Stopped = "stopped",
+    // (undocumented)
+    Waiting = "waiting"
+}
+
+// @public (undocumented)
+export type BuilderRegistry = experimental.jobs.Registry<json.JsonObject, BuilderInput, BuilderOutput>;
+
+// @public
+export interface BuilderRun {
+    id: number;
+    info: BuilderInfo;
+    output: Observable<BuilderOutput>;
+    progress: Observable<BuilderProgressReport>;
+    result: Promise<BuilderOutput>;
+    stop(): Promise<void>;
+}
+
+// @public (undocumented)
+export function createBuilder<OptT = json.JsonObject, OutT extends BuilderOutput = BuilderOutput>(fn: BuilderHandlerFn<OptT>): Builder<OptT & json.JsonObject>;
+
+// @public (undocumented)
+export function fromAsyncIterable<T>(iterable: AsyncIterable<T>): Observable<T>;
+
+// @public (undocumented)
+export function isBuilderOutput(obj: any): obj is BuilderOutput;
+
+// @public (undocumented)
+export interface ScheduleOptions {
+    // (undocumented)
+    analytics?: analytics.Analytics;
+    // (undocumented)
+    logger?: logging.Logger;
+}
+
+// @public
+export function scheduleTargetAndForget(context: BuilderContext, target: Target, overrides?: json.JsonObject, scheduleOptions?: ScheduleOptions_2): Observable<BuilderOutput>;
+
+// @public (undocumented)
+export type Target = json.JsonObject & Target_2;
+
+// @public
+export function targetFromTargetString(str: string): Target;
+
+// @public
+export function targetStringFromTarget({ project, target, configuration }: Target): string;
+
+// @public
+export type TypedBuilderProgress = {
+    state: BuilderProgressState.Stopped;
+} | {
+    state: BuilderProgressState.Error;
+    error: json.JsonValue;
+} | {
+    state: BuilderProgressState.Waiting;
+    status?: string;
+} | {
+    state: BuilderProgressState.Running;
+    status?: string;
+    current: number;
+    total?: number;
+};
+
+// (No @packageDocumentation comment for this package)
+
+```
diff --git a/goldens/public-api/angular_devkit/build_angular/src/index.md b/goldens/public-api/angular_devkit/build_angular/src/index.md
new file mode 100644
index 000000000000..929172cb118f
--- /dev/null
+++ b/goldens/public-api/angular_devkit/build_angular/src/index.md
@@ -0,0 +1,327 @@
+## API Report File for "@angular-devkit/build-angular"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+
+import { BuilderContext } from '@angular-devkit/architect';
+import { BuilderOutput } from '@angular-devkit/architect';
+import { BuildResult } from '@angular-devkit/build-webpack';
+import { ConfigOptions } from 'karma';
+import { DevServerBuildOutput } from '@angular-devkit/build-webpack';
+import { json } from '@angular-devkit/core';
+import { JsonObject } from '@angular-devkit/core';
+import { Observable } from 'rxjs';
+import webpack from 'webpack';
+import * as webpack_2 from 'webpack';
+import { WebpackLoggingCallback } from '@angular-devkit/build-webpack';
+
+// @public (undocumented)
+export type AssetPattern = AssetPatternObject | string;
+
+// @public (undocumented)
+export interface AssetPatternObject {
+    followSymlinks?: boolean;
+    glob: string;
+    ignore?: string[];
+    input: string;
+    output: string;
+}
+
+// @public
+export interface BrowserBuilderOptions {
+    allowedCommonJsDependencies?: string[];
+    aot?: boolean;
+    assets?: AssetPattern[];
+    baseHref?: string;
+    budgets?: Budget[];
+    buildOptimizer?: boolean;
+    commonChunk?: boolean;
+    crossOrigin?: CrossOrigin;
+    deleteOutputPath?: boolean;
+    deployUrl?: string;
+    // @deprecated
+    extractCss?: boolean;
+    extractLicenses?: boolean;
+    fileReplacements?: FileReplacement[];
+    i18nMissingTranslation?: I18NMissingTranslation;
+    index: IndexUnion;
+    inlineStyleLanguage?: InlineStyleLanguage;
+    localize?: Localize;
+    main: string;
+    namedChunks?: boolean;
+    ngswConfigPath?: string;
+    optimization?: OptimizationUnion;
+    outputHashing?: OutputHashing;
+    outputPath: string;
+    poll?: number;
+    polyfills?: string;
+    preserveSymlinks?: boolean;
+    progress?: boolean;
+    resourcesOutputPath?: string;
+    scripts?: ExtraEntryPoint[];
+    serviceWorker?: boolean;
+    // @deprecated
+    showCircularDependencies?: boolean;
+    sourceMap?: SourceMapUnion;
+    statsJson?: boolean;
+    stylePreprocessorOptions?: StylePreprocessorOptions;
+    styles?: ExtraEntryPoint[];
+    subresourceIntegrity?: boolean;
+    tsConfig: string;
+    vendorChunk?: boolean;
+    verbose?: boolean;
+    watch?: boolean;
+    webWorkerTsConfig?: string;
+}
+
+// @public
+export type BrowserBuilderOutput = json.JsonObject & BuilderOutput & {
+    baseOutputPath: string;
+    outputPaths: string[];
+    outputPath: string;
+};
+
+// @public (undocumented)
+export interface Budget {
+    baseline?: string;
+    error?: string;
+    maximumError?: string;
+    maximumWarning?: string;
+    minimumError?: string;
+    minimumWarning?: string;
+    name?: string;
+    type: Type;
+    warning?: string;
+}
+
+// @public
+export enum CrossOrigin {
+    // (undocumented)
+    Anonymous = "anonymous",
+    // (undocumented)
+    None = "none",
+    // (undocumented)
+    UseCredentials = "use-credentials"
+}
+
+// @public (undocumented)
+export type DevServerBuilderOptions = Schema & json.JsonObject;
+
+// @public
+export type DevServerBuilderOutput = DevServerBuildOutput & {
+    baseUrl: string;
+};
+
+// @public
+export function executeBrowserBuilder(options: BrowserBuilderOptions, context: BuilderContext, transforms?: {
+    webpackConfiguration?: ExecutionTransformer<webpack.Configuration>;
+    logging?: WebpackLoggingCallback;
+    indexHtml?: IndexHtmlTransform;
+}): Observable<BrowserBuilderOutput>;
+
+// @public
+export function executeDevServerBuilder(options: DevServerBuilderOptions, context: BuilderContext, transforms?: {
+    webpackConfiguration?: ExecutionTransformer<webpack.Configuration>;
+    logging?: WebpackLoggingCallback;
+    indexHtml?: IndexHtmlTransform;
+}): Observable<DevServerBuilderOutput>;
+
+// @public
+export function executeExtractI18nBuilder(options: ExtractI18nBuilderOptions, context: BuilderContext, transforms?: {
+    webpackConfiguration?: ExecutionTransformer<webpack.Configuration>;
+}): Promise<BuildResult>;
+
+// @public
+export function executeKarmaBuilder(options: KarmaBuilderOptions, context: BuilderContext, transforms?: {
+    webpackConfiguration?: ExecutionTransformer<webpack_2.Configuration>;
+    karmaOptions?: (options: KarmaConfigOptions) => KarmaConfigOptions;
+}): Observable<BuilderOutput>;
+
+// @public
+export function executeNgPackagrBuilder(options: NgPackagrBuilderOptions, context: BuilderContext): Observable<BuilderOutput>;
+
+// @public
+export function executeProtractorBuilder(options: ProtractorBuilderOptions, context: BuilderContext): Promise<BuilderOutput>;
+
+// @public
+export function executeServerBuilder(options: ServerBuilderOptions, context: BuilderContext, transforms?: {
+    webpackConfiguration?: ExecutionTransformer<webpack.Configuration>;
+}): Observable<ServerBuilderOutput>;
+
+// @public
+export type ExecutionTransformer<T> = (input: T) => T | Promise<T>;
+
+// @public (undocumented)
+export type ExtractI18nBuilderOptions = Schema_2 & JsonObject;
+
+// @public (undocumented)
+export type ExtraEntryPoint = ExtraEntryPointObject | string;
+
+// @public (undocumented)
+export interface ExtraEntryPointObject {
+    bundleName?: string;
+    inject?: boolean;
+    input: string;
+}
+
+// @public (undocumented)
+export interface FileReplacement {
+    // (undocumented)
+    replace?: string;
+    // (undocumented)
+    replaceWith?: string;
+    // (undocumented)
+    src?: string;
+    // (undocumented)
+    with?: string;
+}
+
+// @public
+export interface KarmaBuilderOptions {
+    assets?: AssetPattern_2[];
+    browsers?: string;
+    codeCoverage?: boolean;
+    codeCoverageExclude?: string[];
+    fileReplacements?: FileReplacement_2[];
+    include?: string[];
+    inlineStyleLanguage?: InlineStyleLanguage_2;
+    karmaConfig: string;
+    main: string;
+    poll?: number;
+    polyfills?: string;
+    preserveSymlinks?: boolean;
+    progress?: boolean;
+    reporters?: string[];
+    scripts?: ExtraEntryPoint_2[];
+    sourceMap?: SourceMapUnion_3;
+    stylePreprocessorOptions?: StylePreprocessorOptions_2;
+    styles?: ExtraEntryPoint_2[];
+    tsConfig: string;
+    watch?: boolean;
+    webWorkerTsConfig?: string;
+}
+
+// @public (undocumented)
+export type KarmaConfigOptions = ConfigOptions & {
+    buildWebpack?: unknown;
+    configFile?: string;
+};
+
+// @public
+export interface NgPackagrBuilderOptions {
+    project: string;
+    tsConfig?: string;
+    watch?: boolean;
+}
+
+// @public (undocumented)
+export interface OptimizationObject {
+    fonts?: FontsUnion;
+    scripts?: boolean;
+    styles?: StylesUnion;
+}
+
+// @public
+export type OptimizationUnion = boolean | OptimizationObject;
+
+// @public
+export enum OutputHashing {
+    // (undocumented)
+    All = "all",
+    // (undocumented)
+    Bundles = "bundles",
+    // (undocumented)
+    Media = "media",
+    // (undocumented)
+    None = "none"
+}
+
+// @public
+export interface ProtractorBuilderOptions {
+    baseUrl?: string;
+    devServerTarget?: string;
+    grep?: string;
+    host?: string;
+    invertGrep?: boolean;
+    port?: number;
+    protractorConfig: string;
+    specs?: string[];
+    suite?: string;
+    webdriverUpdate?: boolean;
+}
+
+// @public (undocumented)
+export interface ServerBuilderOptions {
+    bundleDependencies?: BundleDependenciesUnion;
+    deleteOutputPath?: boolean;
+    deployUrl?: string;
+    externalDependencies?: string[];
+    extractLicenses?: boolean;
+    fileReplacements?: FileReplacement_3[];
+    i18nMissingTranslation?: I18NMissingTranslation_2;
+    inlineStyleLanguage?: InlineStyleLanguage_3;
+    localize?: Localize_2;
+    main: string;
+    namedChunks?: boolean;
+    optimization?: OptimizationUnion_3;
+    outputHashing?: OutputHashing_2;
+    outputPath: string;
+    poll?: number;
+    preserveSymlinks?: boolean;
+    progress?: boolean;
+    resourcesOutputPath?: string;
+    // @deprecated
+    showCircularDependencies?: boolean;
+    sourceMap?: SourceMapUnion_4;
+    statsJson?: boolean;
+    stylePreprocessorOptions?: StylePreprocessorOptions_3;
+    tsConfig: string;
+    verbose?: boolean;
+    watch?: boolean;
+}
+
+// @public
+export type ServerBuilderOutput = json.JsonObject & BuilderOutput & {
+    baseOutputPath: string;
+    outputPaths: string[];
+    outputPath: string;
+};
+
+// @public (undocumented)
+export interface SourceMapObject {
+    hidden?: boolean;
+    scripts?: boolean;
+    styles?: boolean;
+    vendor?: boolean;
+}
+
+// @public
+export type SourceMapUnion = boolean | SourceMapObject;
+
+// @public
+export interface StylePreprocessorOptions {
+    includePaths?: string[];
+}
+
+// @public
+export enum Type {
+    // (undocumented)
+    All = "all",
+    // (undocumented)
+    AllScript = "allScript",
+    // (undocumented)
+    Any = "any",
+    // (undocumented)
+    AnyComponentStyle = "anyComponentStyle",
+    // (undocumented)
+    AnyScript = "anyScript",
+    // (undocumented)
+    Bundle = "bundle",
+    // (undocumented)
+    Initial = "initial"
+}
+
+// (No @packageDocumentation comment for this package)
+
+```
diff --git a/goldens/public-api/angular_devkit/build_optimizer/src/index.md b/goldens/public-api/angular_devkit/build_optimizer/src/index.md
new file mode 100644
index 000000000000..390e23bfac2d
--- /dev/null
+++ b/goldens/public-api/angular_devkit/build_optimizer/src/index.md
@@ -0,0 +1,57 @@
+## API Report File for "@angular-devkit/build-optimizer"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+
+import type { Compiler } from 'webpack';
+import { RawSourceMap } from 'source-map';
+import * as ts from 'typescript';
+
+// @public (undocumented)
+export function buildOptimizer(options: BuildOptimizerOptions): TransformJavascriptOutput;
+
+// @public (undocumented)
+export function buildOptimizerLoader(this: {
+    resourcePath: string;
+    _module: {
+        factoryMeta: {
+            skipBuildOptimizer?: boolean;
+            sideEffectFree?: boolean;
+        };
+    };
+    cacheable(): void;
+    callback(error?: Error | null, content?: string, sourceMap?: unknown): void;
+    getOptions(): unknown;
+}, content: string, previousSourceMap: RawSourceMap): void;
+
+// @public (undocumented)
+export const buildOptimizerLoaderPath: string;
+
+// @public (undocumented)
+export class BuildOptimizerWebpackPlugin {
+    // (undocumented)
+    apply(compiler: Compiler): void;
+}
+
+// @public (undocumented)
+export function getPrefixClassesTransformer(): ts.TransformerFactory<ts.SourceFile>;
+
+// @public (undocumented)
+export function getPrefixFunctionsTransformer(): ts.TransformerFactory<ts.SourceFile>;
+
+// @public (undocumented)
+export function getScrubFileTransformer(program?: ts.Program): ts.TransformerFactory<ts.SourceFile>;
+
+// @public (undocumented)
+export function getScrubFileTransformerForCore(program?: ts.Program): ts.TransformerFactory<ts.SourceFile>;
+
+// @public (undocumented)
+export function getWrapEnumsTransformer(): ts.TransformerFactory<ts.SourceFile>;
+
+// @public (undocumented)
+export function transformJavascript(options: TransformJavascriptOptions): TransformJavascriptOutput;
+
+// (No @packageDocumentation comment for this package)
+
+```
diff --git a/goldens/public-api/angular_devkit/build_webpack/src/index.md b/goldens/public-api/angular_devkit/build_webpack/src/index.md
new file mode 100644
index 000000000000..312a1a6d319c
--- /dev/null
+++ b/goldens/public-api/angular_devkit/build_webpack/src/index.md
@@ -0,0 +1,78 @@
+## API Report File for "@angular-devkit/build-webpack"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+
+import { BuilderContext } from '@angular-devkit/architect';
+import { BuilderOutput } from '@angular-devkit/architect';
+import { Observable } from 'rxjs';
+import webpack from 'webpack';
+import WebpackDevServer from 'webpack-dev-server';
+
+// @public (undocumented)
+export type BuildResult = BuilderOutput & {
+    emittedFiles?: EmittedFiles[];
+    webpackStats?: webpack.StatsCompilation;
+    outputPath: string;
+};
+
+// @public (undocumented)
+export type DevServerBuildOutput = BuildResult & {
+    port: number;
+    family: string;
+    address: string;
+};
+
+// @public (undocumented)
+export interface EmittedFiles {
+    // (undocumented)
+    asset?: boolean;
+    // (undocumented)
+    extension: string;
+    // (undocumented)
+    file: string;
+    // (undocumented)
+    id?: string;
+    // (undocumented)
+    initial: boolean;
+    // (undocumented)
+    name?: string;
+}
+
+// @public (undocumented)
+export function runWebpack(config: webpack.Configuration, context: BuilderContext, options?: {
+    logging?: WebpackLoggingCallback;
+    webpackFactory?: WebpackFactory;
+    shouldProvideStats?: boolean;
+}): Observable<BuildResult>;
+
+// @public (undocumented)
+export function runWebpackDevServer(config: webpack.Configuration, context: BuilderContext, options?: {
+    devServerConfig?: WebpackDevServer.Configuration;
+    logging?: WebpackLoggingCallback;
+    webpackFactory?: WebpackFactory;
+    webpackDevServerFactory?: WebpackDevServerFactory;
+}): Observable<DevServerBuildOutput>;
+
+// @public (undocumented)
+export type WebpackBuilderSchema = Schema;
+
+// @public (undocumented)
+export type WebpackDevServerFactory = typeof WebpackDevServer;
+
+// @public (undocumented)
+export interface WebpackFactory {
+    // (undocumented)
+    (config: webpack.Configuration): Observable<webpack.Compiler> | webpack.Compiler;
+}
+
+// @public (undocumented)
+export interface WebpackLoggingCallback {
+    // (undocumented)
+    (stats: webpack.Stats, config: webpack.Configuration): void;
+}
+
+// (No @packageDocumentation comment for this package)
+
+```
diff --git a/goldens/public-api/angular_devkit/core/node/index.md b/goldens/public-api/angular_devkit/core/node/index.md
new file mode 100644
index 000000000000..9369e9a056a3
--- /dev/null
+++ b/goldens/public-api/angular_devkit/core/node/index.md
@@ -0,0 +1,1322 @@
+## API Report File for "@angular-devkit/core_node"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+
+import { ErrorObject } from 'ajv';
+import { Format } from 'ajv';
+import { Observable } from 'rxjs';
+import { Observer } from 'rxjs';
+import { Operator } from 'rxjs';
+import { PartialObserver } from 'rxjs';
+import { Stats as Stats_2 } from 'fs';
+import { Subject } from 'rxjs';
+import { SubscribableOrPromise } from 'rxjs';
+import { Subscription } from 'rxjs';
+import { ValidateFunction } from 'ajv';
+
+// @public (undocumented)
+function addUndefinedDefaults(value: JsonValue, _pointer: JsonPointer, schema?: JsonSchema): JsonValue;
+
+// @public
+class AliasHost<StatsT extends object = {}> extends ResolverHost<StatsT> {
+    // (undocumented)
+    get aliases(): Map<Path, Path>;
+    // (undocumented)
+    protected _aliases: Map<Path, Path>;
+    // (undocumented)
+    protected _resolve(path: Path): Path;
+}
+
+// @public (undocumented)
+function buildJsonPointer(fragments: string[]): JsonPointer;
+
+// @public (undocumented)
+class ChannelAlreadyExistException extends BaseException {
+    constructor(name: string);
+}
+
+// @public
+class CordHost extends SimpleMemoryHost {
+    constructor(_back: ReadonlyHost);
+    // (undocumented)
+    protected _back: ReadonlyHost;
+    // (undocumented)
+    get backend(): ReadonlyHost;
+    // (undocumented)
+    get capabilities(): HostCapabilities;
+    clone(): CordHost;
+    commit(host: Host, force?: boolean): Observable<void>;
+    create(path: Path, content: FileBuffer): Observable<void>;
+    // (undocumented)
+    delete(path: Path): Observable<void>;
+    // (undocumented)
+    exists(path: Path): Observable<boolean>;
+    // (undocumented)
+    protected _filesToCreate: Set<Path>;
+    // (undocumented)
+    protected _filesToDelete: Set<Path>;
+    // (undocumented)
+    protected _filesToOverwrite: Set<Path>;
+    // (undocumented)
+    protected _filesToRename: Map<Path, Path>;
+    // (undocumented)
+    protected _filesToRenameRevert: Map<Path, Path>;
+    // (undocumented)
+    isDirectory(path: Path): Observable<boolean>;
+    // (undocumented)
+    isFile(path: Path): Observable<boolean>;
+    // (undocumented)
+    list(path: Path): Observable<PathFragment[]>;
+    // (undocumented)
+    overwrite(path: Path, content: FileBuffer): Observable<void>;
+    // (undocumented)
+    read(path: Path): Observable<FileBuffer>;
+    // (undocumented)
+    records(): CordHostRecord[];
+    // (undocumented)
+    rename(from: Path, to: Path): Observable<void>;
+    // (undocumented)
+    stat(path: Path): Observable<Stats | null> | null;
+    // (undocumented)
+    watch(path: Path, options?: HostWatchOptions): null;
+    // (undocumented)
+    willCreate(path: Path): boolean;
+    // (undocumented)
+    willDelete(path: Path): boolean;
+    // (undocumented)
+    willOverwrite(path: Path): boolean;
+    // (undocumented)
+    willRename(path: Path): boolean;
+    // (undocumented)
+    willRenameTo(path: Path, to: Path): boolean;
+    // (undocumented)
+    write(path: Path, content: FileBuffer): Observable<void>;
+}
+
+// @public (undocumented)
+interface CordHostCreate {
+    // (undocumented)
+    content: FileBuffer;
+    // (undocumented)
+    kind: 'create';
+    // (undocumented)
+    path: Path;
+}
+
+// @public (undocumented)
+interface CordHostDelete {
+    // (undocumented)
+    kind: 'delete';
+    // (undocumented)
+    path: Path;
+}
+
+// @public (undocumented)
+interface CordHostOverwrite {
+    // (undocumented)
+    content: FileBuffer;
+    // (undocumented)
+    kind: 'overwrite';
+    // (undocumented)
+    path: Path;
+}
+
+// @public (undocumented)
+type CordHostRecord = CordHostCreate | CordHostOverwrite | CordHostRename | CordHostDelete;
+
+// @public (undocumented)
+interface CordHostRename {
+    // (undocumented)
+    from: Path;
+    // (undocumented)
+    kind: 'rename';
+    // (undocumented)
+    to: Path;
+}
+
+// @public (undocumented)
+class CoreSchemaRegistry implements SchemaRegistry {
+    constructor(formats?: SchemaFormat[]);
+    // (undocumented)
+    addFormat(format: SchemaFormat): void;
+    addPostTransform(visitor: JsonVisitor, deps?: JsonVisitor[]): void;
+    addPreTransform(visitor: JsonVisitor, deps?: JsonVisitor[]): void;
+    // (undocumented)
+    addSmartDefaultProvider<T>(source: string, provider: SmartDefaultProvider<T>): void;
+    compile(schema: JsonSchema): Observable<SchemaValidator>;
+    // @deprecated
+    flatten(schema: JsonObject): Observable<JsonObject>;
+    // (undocumented)
+    registerUriHandler(handler: UriHandler): void;
+    // (undocumented)
+    protected _resolver(ref: string, validate?: ValidateFunction): {
+        context?: ValidateFunction;
+        schema?: JsonObject;
+    };
+    // (undocumented)
+    usePromptProvider(provider: PromptProvider): void;
+    // (undocumented)
+    useXDeprecatedProvider(onUsage: (message: string) => void): void;
+}
+
+// @public
+export function createConsoleLogger(verbose?: boolean, stdout?: ProcessOutput, stderr?: ProcessOutput, colors?: Partial<Record<logging.LogLevel, (s: string) => string>>): logging.Logger;
+
+// @public
+function createDispatcher<A extends JsonValue, I extends JsonValue, O extends JsonValue>(options?: Partial<Readwrite<JobDescription>>): JobDispatcher<A, I, O>;
+
+// @public
+function createJobFactory<A extends JsonValue, I extends JsonValue, O extends JsonValue>(loader: () => Promise<JobHandler<A, I, O>>, options?: Partial<JobDescription>): JobHandler<A, I, O>;
+
+// @public
+function createJobHandler<A extends JsonValue, I extends JsonValue, O extends JsonValue>(fn: SimpleJobHandlerFn<A, I, O>, options?: Partial<JobDescription>): JobHandler<A, I, O>;
+
+// @public
+function createLoggerJob<A extends JsonValue, I extends JsonValue, O extends JsonValue>(job: JobHandler<A, I, O>, logger: LoggerApi): JobHandler<A, I, O>;
+
+// @public (undocumented)
+function createSyncHost<StatsT extends object = {}>(handler: SyncHostHandler<StatsT>): Host<StatsT>;
+
+// @public (undocumented)
+class Empty implements ReadonlyHost {
+    // (undocumented)
+    readonly capabilities: HostCapabilities;
+    // (undocumented)
+    exists(path: Path): Observable<boolean>;
+    // (undocumented)
+    isDirectory(path: Path): Observable<boolean>;
+    // (undocumented)
+    isFile(path: Path): Observable<boolean>;
+    // (undocumented)
+    list(path: Path): Observable<PathFragment[]>;
+    // (undocumented)
+    read(path: Path): Observable<FileBuffer>;
+    // (undocumented)
+    stat(path: Path): Observable<Stats<{}> | null>;
+}
+
+declare namespace experimental {
+    export {
+        NodeModuleJobRegistry
+    }
+}
+export { experimental }
+
+// @public
+class FallbackRegistry<MinimumArgumentValueT extends JsonValue = JsonValue, MinimumInputValueT extends JsonValue = JsonValue, MinimumOutputValueT extends JsonValue = JsonValue> implements Registry<MinimumArgumentValueT, MinimumInputValueT, MinimumOutputValueT> {
+    constructor(_fallbacks?: Registry<MinimumArgumentValueT, MinimumInputValueT, MinimumOutputValueT>[]);
+    // (undocumented)
+    addFallback(registry: Registry): void;
+    // (undocumented)
+    protected _fallbacks: Registry<MinimumArgumentValueT, MinimumInputValueT, MinimumOutputValueT>[];
+    // (undocumented)
+    get<A extends MinimumArgumentValueT = MinimumArgumentValueT, I extends MinimumInputValueT = MinimumInputValueT, O extends MinimumOutputValueT = MinimumOutputValueT>(name: JobName): Observable<JobHandler<A, I, O> | null>;
+}
+
+// @public (undocumented)
+type FileBuffer = ArrayBuffer;
+
+// @public (undocumented)
+const fileBuffer: TemplateTag<FileBuffer>;
+
+// @public (undocumented)
+type FileBufferLike = ArrayBufferLike;
+
+// @public (undocumented)
+function fileBufferToString(fileBuffer: FileBuffer): string;
+
+declare namespace fs {
+    export {
+        isFile,
+        isDirectory
+    }
+}
+export { fs }
+
+// @public (undocumented)
+function getTypesOfSchema(schema: JsonSchema): Set<string>;
+
+// @public (undocumented)
+interface Host<StatsT extends object = {}> extends ReadonlyHost<StatsT> {
+    // (undocumented)
+    delete(path: Path): Observable<void>;
+    // (undocumented)
+    rename(from: Path, to: Path): Observable<void>;
+    // (undocumented)
+    watch(path: Path, options?: HostWatchOptions): Observable<HostWatchEvent> | null;
+    // (undocumented)
+    write(path: Path, content: FileBufferLike): Observable<void>;
+}
+
+// @public (undocumented)
+interface HostCapabilities {
+    // (undocumented)
+    synchronous: boolean;
+}
+
+// @public (undocumented)
+interface HostWatchEvent {
+    // (undocumented)
+    readonly path: Path;
+    // (undocumented)
+    readonly time: Date;
+    // (undocumented)
+    readonly type: HostWatchEventType;
+}
+
+// @public (undocumented)
+const enum HostWatchEventType {
+    // (undocumented)
+    Changed = 0,
+    // (undocumented)
+    Created = 1,
+    // (undocumented)
+    Deleted = 2,
+    // (undocumented)
+    Renamed = 3
+}
+
+// @public (undocumented)
+interface HostWatchOptions {
+    // (undocumented)
+    readonly persistent?: boolean;
+    // (undocumented)
+    readonly recursive?: boolean;
+}
+
+// @public (undocumented)
+class IndentLogger extends Logger {
+    constructor(name: string, parent?: Logger | null, indentation?: string);
+}
+
+// @public @deprecated (undocumented)
+function isDirectory(filePath: string): boolean;
+
+// @public @deprecated (undocumented)
+function isFile(filePath: string): boolean;
+
+// @public (undocumented)
+function isJobHandler<A extends JsonValue, I extends JsonValue, O extends JsonValue>(value: unknown): value is JobHandler<A, I, O>;
+
+// @public (undocumented)
+function isJsonSchema(value: unknown): value is JsonSchema;
+
+// @public
+interface Job<ArgumentT extends JsonValue = JsonValue, InputT extends JsonValue = JsonValue, OutputT extends JsonValue = JsonValue> {
+    readonly argument: ArgumentT;
+    readonly description: Observable<JobDescription>;
+    getChannel<T extends JsonValue>(name: string, schema?: schema.JsonSchema): Observable<T>;
+    readonly inboundBus: Observer<JobInboundMessage<InputT>>;
+    readonly input: Observer<InputT>;
+    readonly outboundBus: Observable<JobOutboundMessage<OutputT>>;
+    readonly output: Observable<OutputT>;
+    ping(): Observable<never>;
+    readonly state: JobState;
+    stop(): void;
+}
+
+// @public (undocumented)
+class JobArgumentSchemaValidationError extends schema.SchemaValidationException {
+    constructor(errors?: schema.SchemaValidatorError[]);
+}
+
+// @public
+interface JobDescription extends JsonObject {
+    // (undocumented)
+    readonly argument: DeepReadonly<schema.JsonSchema>;
+    // (undocumented)
+    readonly input: DeepReadonly<schema.JsonSchema>;
+    // (undocumented)
+    readonly name: JobName;
+    // (undocumented)
+    readonly output: DeepReadonly<schema.JsonSchema>;
+}
+
+// @public
+interface JobDispatcher<A extends JsonValue, I extends JsonValue, O extends JsonValue> extends JobHandler<A, I, O> {
+    addConditionalJob(predicate: (args: A) => boolean, name: string): void;
+    setDefaultJob(name: JobName | null | JobHandler<JsonValue, JsonValue, JsonValue>): void;
+}
+
+// @public (undocumented)
+class JobDoesNotExistException extends BaseException {
+    constructor(name: JobName);
+}
+
+// @public
+interface JobHandler<ArgT extends JsonValue, InputT extends JsonValue, OutputT extends JsonValue> {
+    // (undocumented)
+    (argument: ArgT, context: JobHandlerContext<ArgT, InputT, OutputT>): Observable<JobOutboundMessage<OutputT>>;
+    // (undocumented)
+    jobDescription: Partial<JobDescription>;
+}
+
+// @public
+interface JobHandlerContext<MinimumArgumentValueT extends JsonValue = JsonValue, MinimumInputValueT extends JsonValue = JsonValue, MinimumOutputValueT extends JsonValue = JsonValue> {
+    // (undocumented)
+    readonly dependencies: Job<JsonValue, JsonValue, JsonValue>[];
+    // (undocumented)
+    readonly description: JobDescription;
+    // (undocumented)
+    readonly inboundBus: Observable<JobInboundMessage<MinimumInputValueT>>;
+    // (undocumented)
+    readonly scheduler: Scheduler<JsonValue, JsonValue, JsonValue>;
+}
+
+// @public (undocumented)
+type JobInboundMessage<InputT extends JsonValue> = JobInboundMessagePing | JobInboundMessageStop | JobInboundMessageInput<InputT>;
+
+// @public
+interface JobInboundMessageBase extends JsonObject {
+    readonly kind: JobInboundMessageKind;
+}
+
+// @public
+interface JobInboundMessageInput<InputT extends JsonValue> extends JobInboundMessageBase {
+    // (undocumented)
+    readonly kind: JobInboundMessageKind.Input;
+    readonly value: InputT;
+}
+
+// @public
+enum JobInboundMessageKind {
+    // (undocumented)
+    Input = "in",
+    // (undocumented)
+    Ping = "ip",
+    // (undocumented)
+    Stop = "is"
+}
+
+// @public
+interface JobInboundMessagePing extends JobInboundMessageBase {
+    readonly id: number;
+    // (undocumented)
+    readonly kind: JobInboundMessageKind.Ping;
+}
+
+// @public (undocumented)
+class JobInboundMessageSchemaValidationError extends schema.SchemaValidationException {
+    constructor(errors?: schema.SchemaValidatorError[]);
+}
+
+// @public
+interface JobInboundMessageStop extends JobInboundMessageBase {
+    // (undocumented)
+    readonly kind: JobInboundMessageKind.Stop;
+}
+
+// @public
+type JobName = string;
+
+// @public (undocumented)
+class JobNameAlreadyRegisteredException extends BaseException {
+    constructor(name: JobName);
+}
+
+// @public
+type JobOutboundMessage<OutputT extends JsonValue> = JobOutboundMessageOnReady | JobOutboundMessageStart | JobOutboundMessageOutput<OutputT> | JobOutboundMessageChannelCreate | JobOutboundMessageChannelMessage | JobOutboundMessageChannelError | JobOutboundMessageChannelComplete | JobOutboundMessageEnd | JobOutboundMessagePong;
+
+// @public
+interface JobOutboundMessageBase {
+    readonly description: JobDescription;
+    readonly kind: JobOutboundMessageKind;
+}
+
+// @public
+interface JobOutboundMessageChannelBase extends JobOutboundMessageBase {
+    readonly name: string;
+}
+
+// @public
+interface JobOutboundMessageChannelComplete extends JobOutboundMessageChannelBase {
+    // (undocumented)
+    readonly kind: JobOutboundMessageKind.ChannelComplete;
+}
+
+// @public
+interface JobOutboundMessageChannelCreate extends JobOutboundMessageChannelBase {
+    // (undocumented)
+    readonly kind: JobOutboundMessageKind.ChannelCreate;
+}
+
+// @public
+interface JobOutboundMessageChannelError extends JobOutboundMessageChannelBase {
+    readonly error: JsonValue;
+    // (undocumented)
+    readonly kind: JobOutboundMessageKind.ChannelError;
+}
+
+// @public
+interface JobOutboundMessageChannelMessage extends JobOutboundMessageChannelBase {
+    // (undocumented)
+    readonly kind: JobOutboundMessageKind.ChannelMessage;
+    readonly message: JsonValue;
+}
+
+// @public
+interface JobOutboundMessageEnd extends JobOutboundMessageBase {
+    // (undocumented)
+    readonly kind: JobOutboundMessageKind.End;
+}
+
+// @public
+enum JobOutboundMessageKind {
+    // (undocumented)
+    ChannelComplete = "cc",
+    // (undocumented)
+    ChannelCreate = "cn",
+    // (undocumented)
+    ChannelError = "ce",
+    // (undocumented)
+    ChannelMessage = "cm",
+    // (undocumented)
+    End = "e",
+    // (undocumented)
+    OnReady = "c",
+    // (undocumented)
+    Output = "o",
+    // (undocumented)
+    Pong = "p",
+    // (undocumented)
+    Start = "s"
+}
+
+// @public
+interface JobOutboundMessageOnReady extends JobOutboundMessageBase {
+    // (undocumented)
+    readonly kind: JobOutboundMessageKind.OnReady;
+}
+
+// @public
+interface JobOutboundMessageOutput<OutputT extends JsonValue> extends JobOutboundMessageBase {
+    // (undocumented)
+    readonly kind: JobOutboundMessageKind.Output;
+    readonly value: OutputT;
+}
+
+// @public
+interface JobOutboundMessagePong extends JobOutboundMessageBase {
+    readonly id: number;
+    // (undocumented)
+    readonly kind: JobOutboundMessageKind.Pong;
+}
+
+// @public
+interface JobOutboundMessageStart extends JobOutboundMessageBase {
+    // (undocumented)
+    readonly kind: JobOutboundMessageKind.Start;
+}
+
+// @public (undocumented)
+class JobOutputSchemaValidationError extends schema.SchemaValidationException {
+    constructor(errors?: schema.SchemaValidatorError[]);
+}
+
+declare namespace jobs {
+    export {
+        isJobHandler,
+        JobName,
+        JobHandler,
+        JobHandlerContext,
+        JobDescription,
+        JobInboundMessageKind,
+        JobInboundMessageBase,
+        JobInboundMessagePing,
+        JobInboundMessageStop,
+        JobInboundMessageInput,
+        JobInboundMessage,
+        JobOutboundMessageKind,
+        JobOutboundMessageBase,
+        JobOutboundMessageOnReady,
+        JobOutboundMessageStart,
+        JobOutboundMessageOutput,
+        JobOutboundMessageChannelBase,
+        JobOutboundMessageChannelMessage,
+        JobOutboundMessageChannelError,
+        JobOutboundMessageChannelCreate,
+        JobOutboundMessageChannelComplete,
+        JobOutboundMessageEnd,
+        JobOutboundMessagePong,
+        JobOutboundMessage,
+        JobState,
+        Job,
+        ScheduleJobOptions,
+        Registry,
+        Scheduler,
+        createJobHandler,
+        createJobFactory,
+        createLoggerJob,
+        ChannelAlreadyExistException,
+        SimpleJobHandlerContext,
+        SimpleJobHandlerFn,
+        JobNameAlreadyRegisteredException,
+        JobDoesNotExistException,
+        createDispatcher,
+        JobDispatcher,
+        FallbackRegistry,
+        RegisterJobOptions,
+        SimpleJobRegistry,
+        JobArgumentSchemaValidationError,
+        JobInboundMessageSchemaValidationError,
+        JobOutputSchemaValidationError,
+        SimpleScheduler,
+        strategy
+    }
+}
+
+// @public
+enum JobState {
+    Ended = "ended",
+    Errored = "errored",
+    Queued = "queued",
+    Ready = "ready",
+    Started = "started"
+}
+
+// @public (undocumented)
+function joinJsonPointer(root: JsonPointer, ...others: string[]): JsonPointer;
+
+// @public (undocumented)
+type JsonPointer = string & {
+    __PRIVATE_DEVKIT_JSON_POINTER: void;
+};
+
+// @public
+type JsonSchema = JsonObject | boolean;
+
+// @public (undocumented)
+interface JsonSchemaVisitor {
+    // (undocumented)
+    (current: JsonObject | JsonArray, pointer: JsonPointer, parentSchema?: JsonObject | JsonArray, index?: string): void;
+}
+
+// @public (undocumented)
+interface JsonVisitor {
+    // (undocumented)
+    (value: JsonValue, pointer: JsonPointer, schema?: JsonObject, root?: JsonObject | JsonArray): Observable<JsonValue> | JsonValue;
+}
+
+// @public (undocumented)
+class LevelCapLogger extends LevelTransformLogger {
+    constructor(name: string, parent: Logger | null, levelCap: LogLevel);
+    // (undocumented)
+    readonly levelCap: LogLevel;
+    // (undocumented)
+    static levelMap: {
+        [cap: string]: {
+            [level: string]: string;
+        };
+    };
+    // (undocumented)
+    readonly name: string;
+    // (undocumented)
+    readonly parent: Logger | null;
+}
+
+// @public (undocumented)
+class LevelTransformLogger extends Logger {
+    constructor(name: string, parent: Logger | null, levelTransform: (level: LogLevel) => LogLevel);
+    // (undocumented)
+    createChild(name: string): Logger;
+    // (undocumented)
+    readonly levelTransform: (level: LogLevel) => LogLevel;
+    // (undocumented)
+    log(level: LogLevel, message: string, metadata?: JsonObject): void;
+    // (undocumented)
+    readonly name: string;
+    // (undocumented)
+    readonly parent: Logger | null;
+}
+
+// @public (undocumented)
+interface LogEntry extends LoggerMetadata {
+    // (undocumented)
+    level: LogLevel;
+    // (undocumented)
+    message: string;
+    // (undocumented)
+    timestamp: number;
+}
+
+// @public (undocumented)
+class Logger extends Observable<LogEntry> implements LoggerApi {
+    constructor(name: string, parent?: Logger | null);
+    // (undocumented)
+    asApi(): LoggerApi;
+    // (undocumented)
+    complete(): void;
+    // (undocumented)
+    createChild(name: string): Logger;
+    // (undocumented)
+    debug(message: string, metadata?: JsonObject): void;
+    // (undocumented)
+    error(message: string, metadata?: JsonObject): void;
+    // (undocumented)
+    fatal(message: string, metadata?: JsonObject): void;
+    // (undocumented)
+    forEach(next: (value: LogEntry) => void, PromiseCtor?: typeof Promise): Promise<void>;
+    // (undocumented)
+    info(message: string, metadata?: JsonObject): void;
+    // (undocumented)
+    lift<R>(operator: Operator<LogEntry, R>): Observable<R>;
+    // (undocumented)
+    log(level: LogLevel, message: string, metadata?: JsonObject): void;
+    // (undocumented)
+    protected _metadata: LoggerMetadata;
+    // (undocumented)
+    readonly name: string;
+    // (undocumented)
+    next(entry: LogEntry): void;
+    // (undocumented)
+    protected get _observable(): Observable<LogEntry>;
+    protected set _observable(v: Observable<LogEntry>);
+    // (undocumented)
+    readonly parent: Logger | null;
+    // (undocumented)
+    protected readonly _subject: Subject<LogEntry>;
+    // (undocumented)
+    subscribe(): Subscription;
+    // (undocumented)
+    subscribe(observer: PartialObserver<LogEntry>): Subscription;
+    // (undocumented)
+    subscribe(next?: (value: LogEntry) => void, error?: (error: Error) => void, complete?: () => void): Subscription;
+    // (undocumented)
+    toString(): string;
+    // (undocumented)
+    warn(message: string, metadata?: JsonObject): void;
+}
+
+// @public (undocumented)
+interface LoggerApi {
+    // (undocumented)
+    createChild(name: string): Logger;
+    // (undocumented)
+    debug(message: string, metadata?: JsonObject): void;
+    // (undocumented)
+    error(message: string, metadata?: JsonObject): void;
+    // (undocumented)
+    fatal(message: string, metadata?: JsonObject): void;
+    // (undocumented)
+    info(message: string, metadata?: JsonObject): void;
+    // (undocumented)
+    log(level: LogLevel, message: string, metadata?: JsonObject): void;
+    // (undocumented)
+    warn(message: string, metadata?: JsonObject): void;
+}
+
+// @public (undocumented)
+interface LoggerMetadata extends JsonObject {
+    // (undocumented)
+    name: string;
+    // (undocumented)
+    path: string[];
+}
+
+// @public (undocumented)
+type LogLevel = 'debug' | 'info' | 'warn' | 'error' | 'fatal';
+
+// @public
+function mergeSchemas(...schemas: (JsonSchema | undefined)[]): JsonSchema;
+
+// @public
+export class NodeJsAsyncHost implements virtualFs.Host<Stats_2> {
+    // (undocumented)
+    get capabilities(): virtualFs.HostCapabilities;
+    // (undocumented)
+    delete(path: Path): Observable<void>;
+    // (undocumented)
+    exists(path: Path): Observable<boolean>;
+    // (undocumented)
+    isDirectory(path: Path): Observable<boolean>;
+    // (undocumented)
+    isFile(path: Path): Observable<boolean>;
+    // (undocumented)
+    list(path: Path): Observable<PathFragment[]>;
+    // (undocumented)
+    read(path: Path): Observable<virtualFs.FileBuffer>;
+    // (undocumented)
+    rename(from: Path, to: Path): Observable<void>;
+    // (undocumented)
+    stat(path: Path): Observable<virtualFs.Stats<Stats_2>>;
+    // (undocumented)
+    watch(path: Path, _options?: virtualFs.HostWatchOptions): Observable<virtualFs.HostWatchEvent> | null;
+    // (undocumented)
+    write(path: Path, content: virtualFs.FileBuffer): Observable<void>;
+}
+
+// @public
+export class NodeJsSyncHost implements virtualFs.Host<Stats_2> {
+    // (undocumented)
+    get capabilities(): virtualFs.HostCapabilities;
+    // (undocumented)
+    delete(path: Path): Observable<void>;
+    // (undocumented)
+    exists(path: Path): Observable<boolean>;
+    // (undocumented)
+    isDirectory(path: Path): Observable<boolean>;
+    // (undocumented)
+    isFile(path: Path): Observable<boolean>;
+    // (undocumented)
+    list(path: Path): Observable<PathFragment[]>;
+    // (undocumented)
+    read(path: Path): Observable<virtualFs.FileBuffer>;
+    // (undocumented)
+    rename(from: Path, to: Path): Observable<void>;
+    // (undocumented)
+    stat(path: Path): Observable<virtualFs.Stats<Stats_2>>;
+    // (undocumented)
+    watch(path: Path, _options?: virtualFs.HostWatchOptions): Observable<virtualFs.HostWatchEvent> | null;
+    // (undocumented)
+    write(path: Path, content: virtualFs.FileBuffer): Observable<void>;
+}
+
+// @public (undocumented)
+class NodeModuleJobRegistry<MinimumArgumentValueT extends JsonValue = JsonValue, MinimumInputValueT extends JsonValue = JsonValue, MinimumOutputValueT extends JsonValue = JsonValue> implements experimental_2.jobs.Registry<MinimumArgumentValueT, MinimumInputValueT, MinimumOutputValueT> {
+    get<A extends MinimumArgumentValueT, I extends MinimumInputValueT, O extends MinimumOutputValueT>(name: experimental_2.jobs.JobName): Observable<experimental_2.jobs.JobHandler<A, I, O> | null>;
+    // (undocumented)
+    protected _resolve(name: string): string | null;
+}
+
+// @public (undocumented)
+class NullLogger extends Logger {
+    constructor(parent?: Logger | null);
+    // (undocumented)
+    asApi(): LoggerApi;
+}
+
+// @public (undocumented)
+function parseJsonPointer(pointer: JsonPointer): string[];
+
+// @public (undocumented)
+class PatternMatchingHost<StatsT extends object = {}> extends ResolverHost<StatsT> {
+    // (undocumented)
+    addPattern(pattern: string | string[], replacementFn: ReplacementFunction): void;
+    // (undocumented)
+    protected _patterns: Map<RegExp, ReplacementFunction>;
+    // (undocumented)
+    protected _resolve(path: Path): Path;
+}
+
+// @public (undocumented)
+export interface ProcessOutput {
+    // (undocumented)
+    write(buffer: string | Buffer): boolean;
+}
+
+// @public (undocumented)
+interface PromptDefinition {
+    // (undocumented)
+    default?: string | string[] | number | boolean | null;
+    // (undocumented)
+    id: string;
+    // (undocumented)
+    items?: Array<string | {
+        value: JsonValue;
+        label: string;
+    }>;
+    // (undocumented)
+    message: string;
+    // (undocumented)
+    multiselect?: boolean;
+    // (undocumented)
+    propertyTypes: Set<string>;
+    // (undocumented)
+    raw?: string | JsonObject;
+    // (undocumented)
+    type: string;
+    // (undocumented)
+    validator?: (value: JsonValue) => boolean | string | Promise<boolean | string>;
+}
+
+// @public (undocumented)
+type PromptProvider = (definitions: Array<PromptDefinition>) => SubscribableOrPromise<{
+    [id: string]: JsonValue;
+}>;
+
+// @public (undocumented)
+interface ReadonlyHost<StatsT extends object = {}> {
+    // (undocumented)
+    readonly capabilities: HostCapabilities;
+    // (undocumented)
+    exists(path: Path): Observable<boolean>;
+    // (undocumented)
+    isDirectory(path: Path): Observable<boolean>;
+    // (undocumented)
+    isFile(path: Path): Observable<boolean>;
+    // (undocumented)
+    list(path: Path): Observable<PathFragment[]>;
+    // (undocumented)
+    read(path: Path): Observable<FileBuffer>;
+    // (undocumented)
+    stat(path: Path): Observable<Stats<StatsT> | null> | null;
+}
+
+// @public (undocumented)
+interface ReferenceResolver<ContextT> {
+    // (undocumented)
+    (ref: string, context?: ContextT): {
+        context?: ContextT;
+        schema?: JsonObject;
+    };
+}
+
+// @public
+interface RegisterJobOptions extends Partial<JobDescription> {
+}
+
+// @public (undocumented)
+interface Registry<MinimumArgumentValueT extends JsonValue = JsonValue, MinimumInputValueT extends JsonValue = JsonValue, MinimumOutputValueT extends JsonValue = JsonValue> {
+    get<A extends MinimumArgumentValueT, I extends MinimumInputValueT, O extends MinimumOutputValueT>(name: JobName): Observable<JobHandler<A, I, O> | null>;
+}
+
+// @public (undocumented)
+type ReplacementFunction = (path: Path) => Path;
+
+// @public
+abstract class ResolverHost<T extends object> implements Host<T> {
+    constructor(_delegate: Host<T>);
+    // (undocumented)
+    get capabilities(): HostCapabilities;
+    // (undocumented)
+    protected _delegate: Host<T>;
+    // (undocumented)
+    delete(path: Path): Observable<void>;
+    // (undocumented)
+    exists(path: Path): Observable<boolean>;
+    // (undocumented)
+    isDirectory(path: Path): Observable<boolean>;
+    // (undocumented)
+    isFile(path: Path): Observable<boolean>;
+    // (undocumented)
+    list(path: Path): Observable<PathFragment[]>;
+    // (undocumented)
+    read(path: Path): Observable<FileBuffer>;
+    // (undocumented)
+    rename(from: Path, to: Path): Observable<void>;
+    // (undocumented)
+    protected abstract _resolve(path: Path): Path;
+    // (undocumented)
+    stat(path: Path): Observable<Stats<T> | null> | null;
+    // (undocumented)
+    watch(path: Path, options?: HostWatchOptions): Observable<HostWatchEvent> | null;
+    // (undocumented)
+    write(path: Path, content: FileBuffer): Observable<void>;
+}
+
+// @public
+class SafeReadonlyHost<StatsT extends object = {}> implements ReadonlyHost<StatsT> {
+    constructor(_delegate: ReadonlyHost<StatsT>);
+    // (undocumented)
+    get capabilities(): HostCapabilities;
+    // (undocumented)
+    exists(path: Path): Observable<boolean>;
+    // (undocumented)
+    isDirectory(path: Path): Observable<boolean>;
+    // (undocumented)
+    isFile(path: Path): Observable<boolean>;
+    // (undocumented)
+    list(path: Path): Observable<PathFragment[]>;
+    // (undocumented)
+    read(path: Path): Observable<FileBuffer>;
+    // (undocumented)
+    stat(path: Path): Observable<Stats<StatsT> | null> | null;
+}
+
+// @public
+interface ScheduleJobOptions {
+    dependencies?: Job | Job[];
+}
+
+// @public
+interface Scheduler<MinimumArgumentValueT extends JsonValue = JsonValue, MinimumInputValueT extends JsonValue = JsonValue, MinimumOutputValueT extends JsonValue = JsonValue> {
+    getDescription(name: JobName): Observable<JobDescription | null>;
+    has(name: JobName): Observable<boolean>;
+    pause(): () => void;
+    schedule<A extends MinimumArgumentValueT, I extends MinimumInputValueT, O extends MinimumOutputValueT>(name: JobName, argument: A, options?: ScheduleJobOptions): Job<A, I, O>;
+}
+
+// @public (undocumented)
+interface SchemaFormat {
+    // (undocumented)
+    formatter: SchemaFormatter;
+    // (undocumented)
+    name: string;
+}
+
+// @public (undocumented)
+type SchemaFormatter = Format;
+
+// @public (undocumented)
+interface SchemaKeywordValidator {
+    // (undocumented)
+    (data: JsonValue, schema: JsonValue, parent: JsonObject | JsonArray | undefined, parentProperty: string | number | undefined, pointer: JsonPointer, rootData: JsonValue): boolean | Observable<boolean>;
+}
+
+// @public (undocumented)
+interface SchemaRegistry {
+    // (undocumented)
+    addFormat(format: SchemaFormat): void;
+    addPostTransform(visitor: JsonVisitor, deps?: JsonVisitor[]): void;
+    addPreTransform(visitor: JsonVisitor, deps?: JsonVisitor[]): void;
+    // (undocumented)
+    addSmartDefaultProvider<T>(source: string, provider: SmartDefaultProvider<T>): void;
+    // (undocumented)
+    compile(schema: Object): Observable<SchemaValidator>;
+    // @deprecated (undocumented)
+    flatten(schema: JsonObject | string): Observable<JsonObject>;
+    // (undocumented)
+    usePromptProvider(provider: PromptProvider): void;
+    // (undocumented)
+    useXDeprecatedProvider(onUsage: (message: string) => void): void;
+}
+
+// @public (undocumented)
+class SchemaValidationException extends BaseException {
+    constructor(errors?: SchemaValidatorError[], baseMessage?: string);
+    // (undocumented)
+    static createMessages(errors?: SchemaValidatorError[]): string[];
+    // (undocumented)
+    readonly errors: SchemaValidatorError[];
+}
+
+// @public (undocumented)
+interface SchemaValidator {
+    // (undocumented)
+    (data: JsonValue, options?: SchemaValidatorOptions): Observable<SchemaValidatorResult>;
+}
+
+// @public (undocumented)
+type SchemaValidatorError = Partial<ErrorObject>;
+
+// @public (undocumented)
+interface SchemaValidatorOptions {
+    // (undocumented)
+    applyPostTransforms?: boolean;
+    // (undocumented)
+    applyPreTransforms?: boolean;
+    // (undocumented)
+    withPrompts?: boolean;
+}
+
+// @public (undocumented)
+interface SchemaValidatorResult {
+    // (undocumented)
+    data: JsonValue;
+    // (undocumented)
+    errors?: SchemaValidatorError[];
+    // (undocumented)
+    success: boolean;
+}
+
+// @public (undocumented)
+class ScopedHost<T extends object> extends ResolverHost<T> {
+    constructor(delegate: Host<T>, _root?: Path);
+    // (undocumented)
+    protected _resolve(path: Path): Path;
+    // (undocumented)
+    protected _root: Path;
+}
+
+// @public
+interface SimpleJobHandlerContext<A extends JsonValue, I extends JsonValue, O extends JsonValue> extends JobHandlerContext<A, I, O> {
+    // (undocumented)
+    createChannel: (name: string) => Observer<JsonValue>;
+    // (undocumented)
+    input: Observable<I>;
+}
+
+// @public
+type SimpleJobHandlerFn<A extends JsonValue, I extends JsonValue, O extends JsonValue> = (input: A, context: SimpleJobHandlerContext<A, I, O>) => O | Promise<O> | Observable<O>;
+
+// @public
+class SimpleJobRegistry<MinimumArgumentValueT extends JsonValue = JsonValue, MinimumInputValueT extends JsonValue = JsonValue, MinimumOutputValueT extends JsonValue = JsonValue> implements Registry<MinimumArgumentValueT, MinimumInputValueT, MinimumOutputValueT> {
+    // (undocumented)
+    get<A extends MinimumArgumentValueT = MinimumArgumentValueT, I extends MinimumInputValueT = MinimumInputValueT, O extends MinimumOutputValueT = MinimumOutputValueT>(name: JobName): Observable<JobHandler<A, I, O> | null>;
+    getJobNames(): JobName[];
+    register<A extends MinimumArgumentValueT, I extends MinimumInputValueT, O extends MinimumOutputValueT>(name: JobName, handler: JobHandler<A, I, O>, options?: RegisterJobOptions): void;
+    register<ArgumentT extends JsonValue, InputT extends JsonValue, OutputT extends JsonValue>(handler: JobHandler<ArgumentT, InputT, OutputT>, options?: RegisterJobOptions & {
+        name: string;
+    }): void;
+    // (undocumented)
+    protected _register<ArgumentT extends JsonValue, InputT extends JsonValue, OutputT extends JsonValue>(name: JobName, handler: JobHandler<ArgumentT, InputT, OutputT>, options: RegisterJobOptions): void;
+}
+
+// @public (undocumented)
+class SimpleMemoryHost implements Host<{}> {
+    constructor();
+    // (undocumented)
+    protected _cache: Map<Path, Stats<SimpleMemoryHostStats>>;
+    // (undocumented)
+    get capabilities(): HostCapabilities;
+    // (undocumented)
+    delete(path: Path): Observable<void>;
+    // (undocumented)
+    protected _delete(path: Path): void;
+    // (undocumented)
+    exists(path: Path): Observable<boolean>;
+    // (undocumented)
+    protected _exists(path: Path): boolean;
+    // (undocumented)
+    isDirectory(path: Path): Observable<boolean>;
+    // (undocumented)
+    protected _isDirectory(path: Path): boolean;
+    // (undocumented)
+    isFile(path: Path): Observable<boolean>;
+    // (undocumented)
+    protected _isFile(path: Path): boolean;
+    // (undocumented)
+    list(path: Path): Observable<PathFragment[]>;
+    // (undocumented)
+    protected _list(path: Path): PathFragment[];
+    // (undocumented)
+    protected _newDirStats(): {
+        inspect(): string;
+        isFile(): boolean;
+        isDirectory(): boolean;
+        size: number;
+        atime: Date;
+        ctime: Date;
+        mtime: Date;
+        birthtime: Date;
+        content: null;
+    };
+    // (undocumented)
+    protected _newFileStats(content: FileBuffer, oldStats?: Stats<SimpleMemoryHostStats>): {
+        inspect(): string;
+        isFile(): boolean;
+        isDirectory(): boolean;
+        size: number;
+        atime: Date;
+        ctime: Date;
+        mtime: Date;
+        birthtime: Date;
+        content: ArrayBuffer;
+    };
+    // (undocumented)
+    read(path: Path): Observable<FileBuffer>;
+    // (undocumented)
+    protected _read(path: Path): FileBuffer;
+    // (undocumented)
+    rename(from: Path, to: Path): Observable<void>;
+    // (undocumented)
+    protected _rename(from: Path, to: Path): void;
+    // (undocumented)
+    reset(): void;
+    // (undocumented)
+    stat(path: Path): Observable<Stats<{}> | null> | null;
+    // (undocumented)
+    protected _stat(path: Path): Stats<SimpleMemoryHostStats> | null;
+    // (undocumented)
+    protected _toAbsolute(path: Path): Path;
+    // (undocumented)
+    protected _updateWatchers(path: Path, type: HostWatchEventType): void;
+    // (undocumented)
+    watch(path: Path, options?: HostWatchOptions): Observable<HostWatchEvent> | null;
+    // (undocumented)
+    protected _watch(path: Path, options?: HostWatchOptions): Observable<HostWatchEvent>;
+    // (undocumented)
+    write(path: Path, content: FileBuffer): Observable<void>;
+    protected _write(path: Path, content: FileBuffer): void;
+}
+
+// @public (undocumented)
+interface SimpleMemoryHostStats {
+    // (undocumented)
+    readonly content: FileBuffer | null;
+}
+
+// @public
+class SimpleScheduler<MinimumArgumentT extends JsonValue = JsonValue, MinimumInputT extends JsonValue = JsonValue, MinimumOutputT extends JsonValue = JsonValue> implements Scheduler<MinimumArgumentT, MinimumInputT, MinimumOutputT> {
+    constructor(_jobRegistry: Registry<MinimumArgumentT, MinimumInputT, MinimumOutputT>, _schemaRegistry?: schema.SchemaRegistry);
+    getDescription(name: JobName): Observable<JobDescription | null>;
+    has(name: JobName): Observable<boolean>;
+    // (undocumented)
+    protected _jobRegistry: Registry<MinimumArgumentT, MinimumInputT, MinimumOutputT>;
+    pause(): () => void;
+    schedule<A extends MinimumArgumentT, I extends MinimumInputT, O extends MinimumOutputT>(name: JobName, argument: A, options?: ScheduleJobOptions): Job<A, I, O>;
+    // (undocumented)
+    protected _scheduleJob<A extends MinimumArgumentT, I extends MinimumInputT, O extends MinimumOutputT>(name: JobName, argument: A, options: ScheduleJobOptions, waitable: Observable<never>): Job<A, I, O>;
+    // (undocumented)
+    protected _schemaRegistry: schema.SchemaRegistry;
+}
+
+// @public (undocumented)
+interface SmartDefaultProvider<T> {
+    // (undocumented)
+    (schema: JsonObject): T | Observable<T>;
+}
+
+// @public (undocumented)
+type Stats<T extends object = {}> = T & {
+    isFile(): boolean;
+    isDirectory(): boolean;
+    readonly size: number;
+    readonly atime: Date;
+    readonly mtime: Date;
+    readonly ctime: Date;
+    readonly birthtime: Date;
+};
+
+// @public (undocumented)
+namespace strategy {
+    // (undocumented)
+    type JobStrategy<A extends JsonValue = JsonValue, I extends JsonValue = JsonValue, O extends JsonValue = JsonValue> = (handler: JobHandler<A, I, O>, options?: Partial<Readonly<JobDescription>>) => JobHandler<A, I, O>;
+    function memoize<A extends JsonValue = JsonValue, I extends JsonValue = JsonValue, O extends JsonValue = JsonValue>(replayMessages?: boolean): JobStrategy<A, I, O>;
+    function reuse<A extends JsonValue = JsonValue, I extends JsonValue = JsonValue, O extends JsonValue = JsonValue>(replayMessages?: boolean): JobStrategy<A, I, O>;
+    function serialize<A extends JsonValue = JsonValue, I extends JsonValue = JsonValue, O extends JsonValue = JsonValue>(): JobStrategy<A, I, O>;
+}
+
+// @public (undocumented)
+function stringToFileBuffer(str: string): FileBuffer;
+
+// @public
+class SyncDelegateHost<T extends object = {}> {
+    constructor(_delegate: Host<T>);
+    // (undocumented)
+    get capabilities(): HostCapabilities;
+    // (undocumented)
+    get delegate(): Host<T>;
+    // (undocumented)
+    protected _delegate: Host<T>;
+    // (undocumented)
+    delete(path: Path): void;
+    // (undocumented)
+    protected _doSyncCall<ResultT>(observable: Observable<ResultT>): ResultT;
+    // (undocumented)
+    exists(path: Path): boolean;
+    // (undocumented)
+    isDirectory(path: Path): boolean;
+    // (undocumented)
+    isFile(path: Path): boolean;
+    // (undocumented)
+    list(path: Path): PathFragment[];
+    // (undocumented)
+    read(path: Path): FileBuffer;
+    // (undocumented)
+    rename(from: Path, to: Path): void;
+    // (undocumented)
+    stat(path: Path): Stats<T> | null;
+    // (undocumented)
+    watch(path: Path, options?: HostWatchOptions): Observable<HostWatchEvent> | null;
+    // (undocumented)
+    write(path: Path, content: FileBufferLike): void;
+}
+
+// @public (undocumented)
+interface SyncHostHandler<StatsT extends object = {}> {
+    // (undocumented)
+    delete(path: Path): void;
+    // (undocumented)
+    exists(path: Path): boolean;
+    // (undocumented)
+    isDirectory(path: Path): boolean;
+    // (undocumented)
+    isFile(path: Path): boolean;
+    // (undocumented)
+    list(path: Path): PathFragment[];
+    // (undocumented)
+    read(path: Path): FileBuffer;
+    // (undocumented)
+    rename(from: Path, to: Path): void;
+    // (undocumented)
+    stat(path: Path): Stats<StatsT> | null;
+    // (undocumented)
+    write(path: Path, content: FileBufferLike): void;
+}
+
+// @public (undocumented)
+class SynchronousDelegateExpectedException extends BaseException {
+    constructor();
+}
+
+// @public (undocumented)
+namespace test {
+    // (undocumented)
+    class TestHost extends SimpleMemoryHost {
+        // (undocumented)
+        $exists(path: string): boolean;
+        // (undocumented)
+        $isDirectory(path: string): boolean;
+        // (undocumented)
+        $isFile(path: string): boolean;
+        // (undocumented)
+        $list(path: string): PathFragment[];
+        // (undocumented)
+        $read(path: string): string;
+        // (undocumented)
+        $write(path: string, content: string): void;
+        constructor(map?: {
+            [path: string]: string;
+        });
+        // (undocumented)
+        clearRecords(): void;
+        // (undocumented)
+        clone(): TestHost;
+        // (undocumented)
+        protected _delete(path: Path): void;
+        // (undocumented)
+        protected _exists(path: Path): boolean;
+        // (undocumented)
+        get files(): Path[];
+        // (undocumented)
+        protected _isDirectory(path: Path): boolean;
+        // (undocumented)
+        protected _isFile(path: Path): boolean;
+        // (undocumented)
+        protected _list(path: Path): PathFragment[];
+        // (undocumented)
+        protected _read(path: Path): ArrayBuffer;
+        // (undocumented)
+        get records(): TestLogRecord[];
+        // (undocumented)
+        protected _records: TestLogRecord[];
+        // (undocumented)
+        protected _rename(from: Path, to: Path): void;
+        // (undocumented)
+        protected _stat(path: Path): Stats<SimpleMemoryHostStats> | null;
+        // (undocumented)
+        get sync(): SyncDelegateHost<{}>;
+        // (undocumented)
+        protected _sync: SyncDelegateHost<{}> | null;
+        // (undocumented)
+        protected _watch(path: Path, options?: HostWatchOptions): Observable<HostWatchEvent>;
+        // (undocumented)
+        protected _write(path: Path, content: FileBuffer): void;
+    }
+    // (undocumented)
+    type TestLogRecord = {
+        kind: 'write' | 'read' | 'delete' | 'list' | 'exists' | 'isDirectory' | 'isFile' | 'stat' | 'watch';
+        path: Path;
+    } | {
+        kind: 'rename';
+        from: Path;
+        to: Path;
+    };
+}
+
+// @public (undocumented)
+class TransformLogger extends Logger {
+    constructor(name: string, transform: (stream: Observable<LogEntry>) => Observable<LogEntry>, parent?: Logger | null);
+}
+
+declare namespace transforms {
+    export {
+        addUndefinedDefaults
+    }
+}
+
+// @public (undocumented)
+type UriHandler = (uri: string) => Observable<JsonObject> | Promise<JsonObject> | null | undefined;
+
+// @public
+function visitJson<ContextT>(json: JsonValue, visitor: JsonVisitor, schema?: JsonSchema, refResolver?: ReferenceResolver<ContextT>, context?: ContextT): Observable<JsonValue>;
+
+// @public (undocumented)
+function visitJsonSchema(schema: JsonSchema, visitor: JsonSchemaVisitor): void;
+
+// (No @packageDocumentation comment for this package)
+
+```
diff --git a/goldens/public-api/angular_devkit/core/src/index.md b/goldens/public-api/angular_devkit/core/src/index.md
new file mode 100644
index 000000000000..2bdb179410ad
--- /dev/null
+++ b/goldens/public-api/angular_devkit/core/src/index.md
@@ -0,0 +1,2367 @@
+## API Report File for "@angular-devkit/core"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+
+import { ErrorObject } from 'ajv';
+import { Format } from 'ajv';
+import { Observable } from 'rxjs';
+import { Observer } from 'rxjs';
+import { Operator } from 'rxjs';
+import { PartialObserver } from 'rxjs';
+import { Position as Position_2 } from 'source-map';
+import { Subject } from 'rxjs';
+import { SubscribableOrPromise } from 'rxjs';
+import { Subscription } from 'rxjs';
+import { ValidateFunction } from 'ajv';
+
+// @public (undocumented)
+function addUndefinedDefaults(value: JsonValue, _pointer: JsonPointer, schema?: JsonSchema): JsonValue;
+
+// @public
+class AliasHost<StatsT extends object = {}> extends ResolverHost<StatsT> {
+    // (undocumented)
+    get aliases(): Map<Path, Path>;
+    // (undocumented)
+    protected _aliases: Map<Path, Path>;
+    // (undocumented)
+    protected _resolve(path: Path): Path;
+}
+
+// @public
+interface Analytics {
+    // (undocumented)
+    event(category: string, action: string, options?: EventOptions): void;
+    // (undocumented)
+    flush(): Promise<void>;
+    // (undocumented)
+    pageview(path: string, options?: PageviewOptions): void;
+    // (undocumented)
+    screenview(screenName: string, appName: string, options?: ScreenviewOptions): void;
+    // (undocumented)
+    timing(category: string, variable: string, time: string | number, options?: TimingOptions): void;
+}
+
+declare namespace analytics {
+    export {
+        NgCliAnalyticsDimensions,
+        NgCliAnalyticsMetrics,
+        NgCliAnalyticsDimensionsFlagInfo,
+        NgCliAnalyticsMetricsFlagInfo,
+        CustomDimensionsAndMetricsOptions,
+        EventOptions,
+        ScreenviewOptions,
+        PageviewOptions,
+        TimingOptions,
+        Analytics,
+        AnalyticsReportKind,
+        AnalyticsReportBase,
+        AnalyticsReportEvent,
+        AnalyticsReportScreenview,
+        AnalyticsReportPageview,
+        AnalyticsReportTiming,
+        AnalyticsReport,
+        AnalyticsForwarderFn,
+        ForwardingAnalytics,
+        AnalyticsReporter,
+        LoggingAnalytics,
+        MultiAnalytics,
+        NoopAnalytics
+    }
+}
+export { analytics }
+
+// @public
+type AnalyticsForwarderFn = (report: JsonObject & AnalyticsReport) => void;
+
+// @public (undocumented)
+type AnalyticsReport = AnalyticsReportEvent | AnalyticsReportScreenview | AnalyticsReportPageview | AnalyticsReportTiming;
+
+// @public (undocumented)
+interface AnalyticsReportBase extends JsonObject {
+    // (undocumented)
+    kind: AnalyticsReportKind;
+}
+
+// @public (undocumented)
+class AnalyticsReporter {
+    constructor(_analytics: Analytics);
+    // (undocumented)
+    protected _analytics: Analytics;
+    // (undocumented)
+    report(report: AnalyticsReport): void;
+}
+
+// @public (undocumented)
+interface AnalyticsReportEvent extends AnalyticsReportBase {
+    // (undocumented)
+    action: string;
+    // (undocumented)
+    category: string;
+    // (undocumented)
+    kind: AnalyticsReportKind.Event;
+    // (undocumented)
+    options: JsonObject & EventOptions;
+}
+
+// @public (undocumented)
+enum AnalyticsReportKind {
+    // (undocumented)
+    Event = "event",
+    // (undocumented)
+    Pageview = "pageview",
+    // (undocumented)
+    Screenview = "screenview",
+    // (undocumented)
+    Timing = "timing"
+}
+
+// @public (undocumented)
+interface AnalyticsReportPageview extends AnalyticsReportBase {
+    // (undocumented)
+    kind: AnalyticsReportKind.Pageview;
+    // (undocumented)
+    options: JsonObject & PageviewOptions;
+    // (undocumented)
+    path: string;
+}
+
+// @public (undocumented)
+interface AnalyticsReportScreenview extends AnalyticsReportBase {
+    // (undocumented)
+    appName: string;
+    // (undocumented)
+    kind: AnalyticsReportKind.Screenview;
+    // (undocumented)
+    options: JsonObject & ScreenviewOptions;
+    // (undocumented)
+    screenName: string;
+}
+
+// @public (undocumented)
+interface AnalyticsReportTiming extends AnalyticsReportBase {
+    // (undocumented)
+    category: string;
+    // (undocumented)
+    kind: AnalyticsReportKind.Timing;
+    // (undocumented)
+    options: JsonObject & TimingOptions;
+    // (undocumented)
+    time: string | number;
+    // (undocumented)
+    variable: string;
+}
+
+// @public (undocumented)
+export function asPosixPath(path: Path): PosixPath;
+
+// @public (undocumented)
+export function asWindowsPath(path: Path): WindowsPath;
+
+// @public
+export class BaseException extends Error {
+    constructor(message?: string);
+}
+
+// @public
+export function basename(path: Path): PathFragment;
+
+// @public (undocumented)
+function buildJsonPointer(fragments: string[]): JsonPointer;
+
+// @public
+function camelize(str: string): string;
+
+// @public
+function capitalize(str: string): string;
+
+// @public (undocumented)
+class ChannelAlreadyExistException extends BaseException {
+    constructor(name: string);
+}
+
+// @public (undocumented)
+export class CircularDependencyFoundException extends BaseException {
+    constructor();
+}
+
+// @public
+function classify(str: string): string;
+
+// @public @deprecated (undocumented)
+export function clean<T>(array: Array<T | undefined>): Array<T>;
+
+// @public (undocumented)
+export class ContentHasMutatedException extends BaseException {
+    constructor(path: string);
+}
+
+// @public
+class CordHost extends SimpleMemoryHost {
+    constructor(_back: ReadonlyHost);
+    // (undocumented)
+    protected _back: ReadonlyHost;
+    // (undocumented)
+    get backend(): ReadonlyHost;
+    // (undocumented)
+    get capabilities(): HostCapabilities;
+    clone(): CordHost;
+    commit(host: Host, force?: boolean): Observable<void>;
+    create(path: Path, content: FileBuffer): Observable<void>;
+    // (undocumented)
+    delete(path: Path): Observable<void>;
+    // (undocumented)
+    exists(path: Path): Observable<boolean>;
+    // (undocumented)
+    protected _filesToCreate: Set<Path>;
+    // (undocumented)
+    protected _filesToDelete: Set<Path>;
+    // (undocumented)
+    protected _filesToOverwrite: Set<Path>;
+    // (undocumented)
+    protected _filesToRename: Map<Path, Path>;
+    // (undocumented)
+    protected _filesToRenameRevert: Map<Path, Path>;
+    // (undocumented)
+    isDirectory(path: Path): Observable<boolean>;
+    // (undocumented)
+    isFile(path: Path): Observable<boolean>;
+    // (undocumented)
+    list(path: Path): Observable<PathFragment[]>;
+    // (undocumented)
+    overwrite(path: Path, content: FileBuffer): Observable<void>;
+    // (undocumented)
+    read(path: Path): Observable<FileBuffer>;
+    // (undocumented)
+    records(): CordHostRecord[];
+    // (undocumented)
+    rename(from: Path, to: Path): Observable<void>;
+    // (undocumented)
+    stat(path: Path): Observable<Stats | null> | null;
+    // (undocumented)
+    watch(path: Path, options?: HostWatchOptions): null;
+    // (undocumented)
+    willCreate(path: Path): boolean;
+    // (undocumented)
+    willDelete(path: Path): boolean;
+    // (undocumented)
+    willOverwrite(path: Path): boolean;
+    // (undocumented)
+    willRename(path: Path): boolean;
+    // (undocumented)
+    willRenameTo(path: Path, to: Path): boolean;
+    // (undocumented)
+    write(path: Path, content: FileBuffer): Observable<void>;
+}
+
+// @public (undocumented)
+interface CordHostCreate {
+    // (undocumented)
+    content: FileBuffer;
+    // (undocumented)
+    kind: 'create';
+    // (undocumented)
+    path: Path;
+}
+
+// @public (undocumented)
+interface CordHostDelete {
+    // (undocumented)
+    kind: 'delete';
+    // (undocumented)
+    path: Path;
+}
+
+// @public (undocumented)
+interface CordHostOverwrite {
+    // (undocumented)
+    content: FileBuffer;
+    // (undocumented)
+    kind: 'overwrite';
+    // (undocumented)
+    path: Path;
+}
+
+// @public (undocumented)
+type CordHostRecord = CordHostCreate | CordHostOverwrite | CordHostRename | CordHostDelete;
+
+// @public (undocumented)
+interface CordHostRename {
+    // (undocumented)
+    from: Path;
+    // (undocumented)
+    kind: 'rename';
+    // (undocumented)
+    to: Path;
+}
+
+// @public (undocumented)
+class CoreSchemaRegistry implements SchemaRegistry {
+    constructor(formats?: SchemaFormat[]);
+    // (undocumented)
+    addFormat(format: SchemaFormat): void;
+    addPostTransform(visitor: JsonVisitor, deps?: JsonVisitor[]): void;
+    addPreTransform(visitor: JsonVisitor, deps?: JsonVisitor[]): void;
+    // (undocumented)
+    addSmartDefaultProvider<T>(source: string, provider: SmartDefaultProvider<T>): void;
+    compile(schema: JsonSchema): Observable<SchemaValidator>;
+    // @deprecated
+    flatten(schema: JsonObject): Observable<JsonObject>;
+    // (undocumented)
+    registerUriHandler(handler: UriHandler): void;
+    // (undocumented)
+    protected _resolver(ref: string, validate?: ValidateFunction): {
+        context?: ValidateFunction;
+        schema?: JsonObject;
+    };
+    // (undocumented)
+    usePromptProvider(provider: PromptProvider): void;
+    // (undocumented)
+    useXDeprecatedProvider(onUsage: (message: string) => void): void;
+}
+
+// @public
+function createDispatcher<A extends JsonValue, I extends JsonValue, O extends JsonValue>(options?: Partial<Readwrite<JobDescription>>): JobDispatcher<A, I, O>;
+
+// @public
+function createJobFactory<A extends JsonValue, I extends JsonValue, O extends JsonValue>(loader: () => Promise<JobHandler<A, I, O>>, options?: Partial<JobDescription>): JobHandler<A, I, O>;
+
+// @public
+function createJobHandler<A extends JsonValue, I extends JsonValue, O extends JsonValue>(fn: SimpleJobHandlerFn<A, I, O>, options?: Partial<JobDescription>): JobHandler<A, I, O>;
+
+// @public
+function createLoggerJob<A extends JsonValue, I extends JsonValue, O extends JsonValue>(job: JobHandler<A, I, O>, logger: LoggerApi): JobHandler<A, I, O>;
+
+// @public (undocumented)
+function createSyncHost<StatsT extends object = {}>(handler: SyncHostHandler<StatsT>): Host<StatsT>;
+
+// @public (undocumented)
+function createWorkspaceHost(host: virtualFs.Host): WorkspaceHost;
+
+// @public
+interface CustomDimensionsAndMetricsOptions {
+    // (undocumented)
+    dimensions?: (boolean | number | string)[];
+    // (undocumented)
+    metrics?: (boolean | number | string)[];
+}
+
+// @public
+function dasherize(str: string): string;
+
+// @public
+function decamelize(str: string): string;
+
+// @public (undocumented)
+export function deepCopy<T extends any>(value: T): T;
+
+// @public (undocumented)
+export type DeepReadonly<T> = T extends (infer R)[] ? DeepReadonlyArray<R> : T extends Function ? T : T extends object ? DeepReadonlyObject<T> : T;
+
+// @public (undocumented)
+export interface DeepReadonlyArray<T> extends Array<DeepReadonly<T>> {
+}
+
+// @public (undocumented)
+export type DeepReadonlyObject<T> = {
+    readonly [P in keyof T]: DeepReadonly<T[P]>;
+};
+
+// @public (undocumented)
+type DefinitionCollectionListener<V extends object> = (name: string, action: 'add' | 'remove' | 'replace', newValue: V | undefined, oldValue: V | undefined, collection: DefinitionCollection<V>) => void;
+
+// @public (undocumented)
+export class DependencyNotFoundException extends BaseException {
+    constructor();
+}
+
+// @public
+export function dirname(path: Path): Path;
+
+// @public (undocumented)
+class Empty implements ReadonlyHost {
+    // (undocumented)
+    readonly capabilities: HostCapabilities;
+    // (undocumented)
+    exists(path: Path): Observable<boolean>;
+    // (undocumented)
+    isDirectory(path: Path): Observable<boolean>;
+    // (undocumented)
+    isFile(path: Path): Observable<boolean>;
+    // (undocumented)
+    list(path: Path): Observable<PathFragment[]>;
+    // (undocumented)
+    read(path: Path): Observable<FileBuffer>;
+    // (undocumented)
+    stat(path: Path): Observable<Stats<{}> | null>;
+}
+
+// @public (undocumented)
+interface EventOptions extends CustomDimensionsAndMetricsOptions {
+    // (undocumented)
+    label?: string;
+    // (undocumented)
+    value?: string;
+}
+
+declare namespace experimental {
+    export {
+        jobs
+    }
+}
+export { experimental }
+
+// @public (undocumented)
+export function extname(path: Path): string;
+
+// @public
+class FallbackRegistry<MinimumArgumentValueT extends JsonValue = JsonValue, MinimumInputValueT extends JsonValue = JsonValue, MinimumOutputValueT extends JsonValue = JsonValue> implements Registry<MinimumArgumentValueT, MinimumInputValueT, MinimumOutputValueT> {
+    constructor(_fallbacks?: Registry<MinimumArgumentValueT, MinimumInputValueT, MinimumOutputValueT>[]);
+    // (undocumented)
+    addFallback(registry: Registry): void;
+    // (undocumented)
+    protected _fallbacks: Registry<MinimumArgumentValueT, MinimumInputValueT, MinimumOutputValueT>[];
+    // (undocumented)
+    get<A extends MinimumArgumentValueT = MinimumArgumentValueT, I extends MinimumInputValueT = MinimumInputValueT, O extends MinimumOutputValueT = MinimumOutputValueT>(name: JobName): Observable<JobHandler<A, I, O> | null>;
+}
+
+// @public (undocumented)
+export class FileAlreadyExistException extends BaseException {
+    constructor(path: string);
+}
+
+// @public (undocumented)
+type FileBuffer = ArrayBuffer;
+
+// @public (undocumented)
+const fileBuffer: TemplateTag<FileBuffer>;
+
+// @public (undocumented)
+type FileBufferLike = ArrayBufferLike;
+
+// @public (undocumented)
+function fileBufferToString(fileBuffer: FileBuffer): string;
+
+// @public (undocumented)
+export class FileDoesNotExistException extends BaseException {
+    constructor(path: string);
+}
+
+// @public
+class ForwardingAnalytics implements Analytics {
+    constructor(_fn: AnalyticsForwarderFn);
+    // (undocumented)
+    event(category: string, action: string, options?: EventOptions): void;
+    // (undocumented)
+    flush(): Promise<void>;
+    // (undocumented)
+    protected _fn: AnalyticsForwarderFn;
+    // (undocumented)
+    pageview(path: string, options?: PageviewOptions): void;
+    // (undocumented)
+    screenview(screenName: string, appName: string, options?: ScreenviewOptions): void;
+    // (undocumented)
+    timing(category: string, variable: string, time: string | number, options?: TimingOptions): void;
+}
+
+// @public (undocumented)
+export function fragment(path: string): PathFragment;
+
+// @public (undocumented)
+export function getSystemPath(path: Path): string;
+
+// @public (undocumented)
+function getTypesOfSchema(schema: JsonSchema): Set<string>;
+
+// @public (undocumented)
+interface Host<StatsT extends object = {}> extends ReadonlyHost<StatsT> {
+    // (undocumented)
+    delete(path: Path): Observable<void>;
+    // (undocumented)
+    rename(from: Path, to: Path): Observable<void>;
+    // (undocumented)
+    watch(path: Path, options?: HostWatchOptions): Observable<HostWatchEvent> | null;
+    // (undocumented)
+    write(path: Path, content: FileBufferLike): Observable<void>;
+}
+
+// @public (undocumented)
+interface HostCapabilities {
+    // (undocumented)
+    synchronous: boolean;
+}
+
+// @public (undocumented)
+interface HostWatchEvent {
+    // (undocumented)
+    readonly path: Path;
+    // (undocumented)
+    readonly time: Date;
+    // (undocumented)
+    readonly type: HostWatchEventType;
+}
+
+// @public (undocumented)
+const enum HostWatchEventType {
+    // (undocumented)
+    Changed = 0,
+    // (undocumented)
+    Created = 1,
+    // (undocumented)
+    Deleted = 2,
+    // (undocumented)
+    Renamed = 3
+}
+
+// @public (undocumented)
+interface HostWatchOptions {
+    // (undocumented)
+    readonly persistent?: boolean;
+    // (undocumented)
+    readonly recursive?: boolean;
+}
+
+// @public (undocumented)
+function indentBy(indentations: number): TemplateTag;
+
+// @public (undocumented)
+class IndentLogger extends Logger {
+    constructor(name: string, parent?: Logger | null, indentation?: string);
+}
+
+// @public @deprecated
+export class InvalidJsonCharacterException extends JsonException {
+    constructor(context: JsonParserContext);
+    // (undocumented)
+    character: number;
+    // (undocumented)
+    invalidChar: string;
+    // (undocumented)
+    line: number;
+    // (undocumented)
+    offset: number;
+}
+
+// @public (undocumented)
+export class InvalidPathException extends BaseException {
+    constructor(path: string);
+}
+
+// @public (undocumented)
+export class InvalidUpdateRecordException extends BaseException {
+    constructor();
+}
+
+// @public
+export function isAbsolute(p: Path): boolean;
+
+// @public (undocumented)
+function isJobHandler<A extends JsonValue, I extends JsonValue, O extends JsonValue>(value: unknown): value is JobHandler<A, I, O>;
+
+// @public (undocumented)
+export function isJsonArray(value: JsonValue): value is JsonArray;
+
+// @public (undocumented)
+export function isJsonObject(value: JsonValue): value is JsonObject;
+
+// @public (undocumented)
+function isJsonSchema(value: unknown): value is JsonSchema;
+
+// @public
+export function isPromise(obj: any): obj is Promise<any>;
+
+// @public
+interface Job<ArgumentT extends JsonValue = JsonValue, InputT extends JsonValue = JsonValue, OutputT extends JsonValue = JsonValue> {
+    readonly argument: ArgumentT;
+    readonly description: Observable<JobDescription>;
+    getChannel<T extends JsonValue>(name: string, schema?: schema.JsonSchema): Observable<T>;
+    readonly inboundBus: Observer<JobInboundMessage<InputT>>;
+    readonly input: Observer<InputT>;
+    readonly outboundBus: Observable<JobOutboundMessage<OutputT>>;
+    readonly output: Observable<OutputT>;
+    ping(): Observable<never>;
+    readonly state: JobState;
+    stop(): void;
+}
+
+// @public (undocumented)
+class JobArgumentSchemaValidationError extends schema.SchemaValidationException {
+    constructor(errors?: schema.SchemaValidatorError[]);
+}
+
+// @public
+interface JobDescription extends JsonObject {
+    // (undocumented)
+    readonly argument: DeepReadonly<schema.JsonSchema>;
+    // (undocumented)
+    readonly input: DeepReadonly<schema.JsonSchema>;
+    // (undocumented)
+    readonly name: JobName;
+    // (undocumented)
+    readonly output: DeepReadonly<schema.JsonSchema>;
+}
+
+// @public
+interface JobDispatcher<A extends JsonValue, I extends JsonValue, O extends JsonValue> extends JobHandler<A, I, O> {
+    addConditionalJob(predicate: (args: A) => boolean, name: string): void;
+    setDefaultJob(name: JobName | null | JobHandler<JsonValue, JsonValue, JsonValue>): void;
+}
+
+// @public (undocumented)
+class JobDoesNotExistException extends BaseException {
+    constructor(name: JobName);
+}
+
+// @public
+interface JobHandler<ArgT extends JsonValue, InputT extends JsonValue, OutputT extends JsonValue> {
+    // (undocumented)
+    (argument: ArgT, context: JobHandlerContext<ArgT, InputT, OutputT>): Observable<JobOutboundMessage<OutputT>>;
+    // (undocumented)
+    jobDescription: Partial<JobDescription>;
+}
+
+// @public
+interface JobHandlerContext<MinimumArgumentValueT extends JsonValue = JsonValue, MinimumInputValueT extends JsonValue = JsonValue, MinimumOutputValueT extends JsonValue = JsonValue> {
+    // (undocumented)
+    readonly dependencies: Job<JsonValue, JsonValue, JsonValue>[];
+    // (undocumented)
+    readonly description: JobDescription;
+    // (undocumented)
+    readonly inboundBus: Observable<JobInboundMessage<MinimumInputValueT>>;
+    // (undocumented)
+    readonly scheduler: Scheduler<JsonValue, JsonValue, JsonValue>;
+}
+
+// @public (undocumented)
+type JobInboundMessage<InputT extends JsonValue> = JobInboundMessagePing | JobInboundMessageStop | JobInboundMessageInput<InputT>;
+
+// @public
+interface JobInboundMessageBase extends JsonObject {
+    readonly kind: JobInboundMessageKind;
+}
+
+// @public
+interface JobInboundMessageInput<InputT extends JsonValue> extends JobInboundMessageBase {
+    // (undocumented)
+    readonly kind: JobInboundMessageKind.Input;
+    readonly value: InputT;
+}
+
+// @public
+enum JobInboundMessageKind {
+    // (undocumented)
+    Input = "in",
+    // (undocumented)
+    Ping = "ip",
+    // (undocumented)
+    Stop = "is"
+}
+
+// @public
+interface JobInboundMessagePing extends JobInboundMessageBase {
+    readonly id: number;
+    // (undocumented)
+    readonly kind: JobInboundMessageKind.Ping;
+}
+
+// @public (undocumented)
+class JobInboundMessageSchemaValidationError extends schema.SchemaValidationException {
+    constructor(errors?: schema.SchemaValidatorError[]);
+}
+
+// @public
+interface JobInboundMessageStop extends JobInboundMessageBase {
+    // (undocumented)
+    readonly kind: JobInboundMessageKind.Stop;
+}
+
+// @public
+type JobName = string;
+
+// @public (undocumented)
+class JobNameAlreadyRegisteredException extends BaseException {
+    constructor(name: JobName);
+}
+
+// @public
+type JobOutboundMessage<OutputT extends JsonValue> = JobOutboundMessageOnReady | JobOutboundMessageStart | JobOutboundMessageOutput<OutputT> | JobOutboundMessageChannelCreate | JobOutboundMessageChannelMessage | JobOutboundMessageChannelError | JobOutboundMessageChannelComplete | JobOutboundMessageEnd | JobOutboundMessagePong;
+
+// @public
+interface JobOutboundMessageBase {
+    readonly description: JobDescription;
+    readonly kind: JobOutboundMessageKind;
+}
+
+// @public
+interface JobOutboundMessageChannelBase extends JobOutboundMessageBase {
+    readonly name: string;
+}
+
+// @public
+interface JobOutboundMessageChannelComplete extends JobOutboundMessageChannelBase {
+    // (undocumented)
+    readonly kind: JobOutboundMessageKind.ChannelComplete;
+}
+
+// @public
+interface JobOutboundMessageChannelCreate extends JobOutboundMessageChannelBase {
+    // (undocumented)
+    readonly kind: JobOutboundMessageKind.ChannelCreate;
+}
+
+// @public
+interface JobOutboundMessageChannelError extends JobOutboundMessageChannelBase {
+    readonly error: JsonValue;
+    // (undocumented)
+    readonly kind: JobOutboundMessageKind.ChannelError;
+}
+
+// @public
+interface JobOutboundMessageChannelMessage extends JobOutboundMessageChannelBase {
+    // (undocumented)
+    readonly kind: JobOutboundMessageKind.ChannelMessage;
+    readonly message: JsonValue;
+}
+
+// @public
+interface JobOutboundMessageEnd extends JobOutboundMessageBase {
+    // (undocumented)
+    readonly kind: JobOutboundMessageKind.End;
+}
+
+// @public
+enum JobOutboundMessageKind {
+    // (undocumented)
+    ChannelComplete = "cc",
+    // (undocumented)
+    ChannelCreate = "cn",
+    // (undocumented)
+    ChannelError = "ce",
+    // (undocumented)
+    ChannelMessage = "cm",
+    // (undocumented)
+    End = "e",
+    // (undocumented)
+    OnReady = "c",
+    // (undocumented)
+    Output = "o",
+    // (undocumented)
+    Pong = "p",
+    // (undocumented)
+    Start = "s"
+}
+
+// @public
+interface JobOutboundMessageOnReady extends JobOutboundMessageBase {
+    // (undocumented)
+    readonly kind: JobOutboundMessageKind.OnReady;
+}
+
+// @public
+interface JobOutboundMessageOutput<OutputT extends JsonValue> extends JobOutboundMessageBase {
+    // (undocumented)
+    readonly kind: JobOutboundMessageKind.Output;
+    readonly value: OutputT;
+}
+
+// @public
+interface JobOutboundMessagePong extends JobOutboundMessageBase {
+    readonly id: number;
+    // (undocumented)
+    readonly kind: JobOutboundMessageKind.Pong;
+}
+
+// @public
+interface JobOutboundMessageStart extends JobOutboundMessageBase {
+    // (undocumented)
+    readonly kind: JobOutboundMessageKind.Start;
+}
+
+// @public (undocumented)
+class JobOutputSchemaValidationError extends schema.SchemaValidationException {
+    constructor(errors?: schema.SchemaValidatorError[]);
+}
+
+declare namespace jobs {
+    export {
+        isJobHandler,
+        JobName,
+        JobHandler,
+        JobHandlerContext,
+        JobDescription,
+        JobInboundMessageKind,
+        JobInboundMessageBase,
+        JobInboundMessagePing,
+        JobInboundMessageStop,
+        JobInboundMessageInput,
+        JobInboundMessage,
+        JobOutboundMessageKind,
+        JobOutboundMessageBase,
+        JobOutboundMessageOnReady,
+        JobOutboundMessageStart,
+        JobOutboundMessageOutput,
+        JobOutboundMessageChannelBase,
+        JobOutboundMessageChannelMessage,
+        JobOutboundMessageChannelError,
+        JobOutboundMessageChannelCreate,
+        JobOutboundMessageChannelComplete,
+        JobOutboundMessageEnd,
+        JobOutboundMessagePong,
+        JobOutboundMessage,
+        JobState,
+        Job,
+        ScheduleJobOptions,
+        Registry,
+        Scheduler,
+        createJobHandler,
+        createJobFactory,
+        createLoggerJob,
+        ChannelAlreadyExistException,
+        SimpleJobHandlerContext,
+        SimpleJobHandlerFn,
+        JobNameAlreadyRegisteredException,
+        JobDoesNotExistException,
+        createDispatcher,
+        JobDispatcher,
+        FallbackRegistry,
+        RegisterJobOptions,
+        SimpleJobRegistry,
+        JobArgumentSchemaValidationError,
+        JobInboundMessageSchemaValidationError,
+        JobOutputSchemaValidationError,
+        SimpleScheduler,
+        strategy
+    }
+}
+
+// @public
+enum JobState {
+    Ended = "ended",
+    Errored = "errored",
+    Queued = "queued",
+    Ready = "ready",
+    Started = "started"
+}
+
+// @public
+export function join(p1: Path, ...others: string[]): Path;
+
+// @public (undocumented)
+function joinJsonPointer(root: JsonPointer, ...others: string[]): JsonPointer;
+
+declare namespace json {
+    export {
+        schema,
+        isJsonObject,
+        isJsonArray,
+        Position,
+        JsonAstNode,
+        JsonAstNodeBase,
+        JsonAstNumber,
+        JsonAstString,
+        JsonAstIdentifier,
+        JsonArray,
+        JsonAstArray,
+        JsonObject,
+        JsonAstKeyValue,
+        JsonAstObject,
+        JsonAstConstantFalse,
+        JsonAstConstantNull,
+        JsonAstConstantTrue,
+        JsonAstMultilineComment,
+        JsonAstComment,
+        JsonValue,
+        parseJsonAst,
+        parseJson,
+        JsonException,
+        InvalidJsonCharacterException,
+        UnexpectedEndOfInputException,
+        PathSpecificJsonException,
+        JsonParserContext,
+        JsonParseMode,
+        ParseJsonOptions
+    }
+}
+export { json }
+
+// @public (undocumented)
+export interface JsonArray extends Array<JsonValue> {
+}
+
+// @public (undocumented)
+export interface JsonAstArray extends JsonAstNodeBase {
+    // (undocumented)
+    readonly elements: JsonAstNode[];
+    // (undocumented)
+    readonly kind: 'array';
+    // (undocumented)
+    readonly value: JsonArray;
+}
+
+// @public (undocumented)
+export interface JsonAstComment extends JsonAstNodeBase {
+    // (undocumented)
+    readonly content: string;
+    // (undocumented)
+    readonly kind: 'comment';
+}
+
+// @public (undocumented)
+export interface JsonAstConstantFalse extends JsonAstNodeBase {
+    // (undocumented)
+    readonly kind: 'false';
+    // (undocumented)
+    readonly value: false;
+}
+
+// @public (undocumented)
+export interface JsonAstConstantNull extends JsonAstNodeBase {
+    // (undocumented)
+    readonly kind: 'null';
+    // (undocumented)
+    readonly value: null;
+}
+
+// @public (undocumented)
+export interface JsonAstConstantTrue extends JsonAstNodeBase {
+    // (undocumented)
+    readonly kind: 'true';
+    // (undocumented)
+    readonly value: true;
+}
+
+// @public (undocumented)
+export interface JsonAstIdentifier extends JsonAstNodeBase {
+    // (undocumented)
+    readonly kind: 'identifier';
+    // (undocumented)
+    readonly value: string;
+}
+
+// @public (undocumented)
+export interface JsonAstKeyValue extends JsonAstNodeBase {
+    // (undocumented)
+    readonly key: JsonAstString | JsonAstIdentifier;
+    // (undocumented)
+    readonly kind: 'keyvalue';
+    // (undocumented)
+    readonly value: JsonAstNode;
+}
+
+// @public (undocumented)
+export interface JsonAstMultilineComment extends JsonAstNodeBase {
+    // (undocumented)
+    readonly content: string;
+    // (undocumented)
+    readonly kind: 'multicomment';
+}
+
+// @public (undocumented)
+export type JsonAstNode = JsonAstNumber | JsonAstString | JsonAstIdentifier | JsonAstArray | JsonAstObject | JsonAstConstantFalse | JsonAstConstantNull | JsonAstConstantTrue;
+
+// @public (undocumented)
+export interface JsonAstNodeBase {
+    // (undocumented)
+    readonly comments?: (JsonAstComment | JsonAstMultilineComment)[];
+    // (undocumented)
+    readonly end: Position;
+    // (undocumented)
+    readonly start: Position;
+    // (undocumented)
+    readonly text: string;
+}
+
+// @public (undocumented)
+export interface JsonAstNumber extends JsonAstNodeBase {
+    // (undocumented)
+    readonly kind: 'number';
+    // (undocumented)
+    readonly value: number;
+}
+
+// @public (undocumented)
+export interface JsonAstObject extends JsonAstNodeBase {
+    // (undocumented)
+    readonly kind: 'object';
+    // (undocumented)
+    readonly properties: JsonAstKeyValue[];
+    // (undocumented)
+    readonly value: JsonObject;
+}
+
+// @public (undocumented)
+export interface JsonAstString extends JsonAstNodeBase {
+    // (undocumented)
+    readonly kind: 'string';
+    // (undocumented)
+    readonly value: string;
+}
+
+// @public (undocumented)
+export class JsonException extends BaseException {
+}
+
+// @public (undocumented)
+export interface JsonObject {
+    // (undocumented)
+    [prop: string]: JsonValue;
+}
+
+// @public
+export enum JsonParseMode {
+    // (undocumented)
+    CommentsAllowed = 1,
+    // (undocumented)
+    Default = 0,
+    // (undocumented)
+    HexadecimalNumberAllowed = 16,
+    // (undocumented)
+    IdentifierKeyNamesAllowed = 4,
+    // (undocumented)
+    Json = 0,
+    // (undocumented)
+    Json5 = 255,
+    // (undocumented)
+    LaxNumberParsingAllowed = 64,
+    // (undocumented)
+    Loose = 255,
+    // (undocumented)
+    MultiLineStringAllowed = 32,
+    // (undocumented)
+    NumberConstantsAllowed = 128,
+    // (undocumented)
+    SingleQuotesAllowed = 2,
+    // (undocumented)
+    Strict = 0,
+    // (undocumented)
+    TrailingCommasAllowed = 8
+}
+
+// @public @deprecated
+export interface JsonParserContext {
+    // (undocumented)
+    readonly mode: JsonParseMode;
+    // (undocumented)
+    readonly original: string;
+    // (undocumented)
+    position: Position;
+    // (undocumented)
+    previous: Position;
+}
+
+// @public (undocumented)
+type JsonPointer = string & {
+    __PRIVATE_DEVKIT_JSON_POINTER: void;
+};
+
+// @public
+type JsonSchema = JsonObject | boolean;
+
+// @public (undocumented)
+interface JsonSchemaVisitor {
+    // (undocumented)
+    (current: JsonObject | JsonArray, pointer: JsonPointer, parentSchema?: JsonObject | JsonArray, index?: string): void;
+}
+
+// @public (undocumented)
+export type JsonValue = JsonAstNode['value'];
+
+// @public (undocumented)
+interface JsonVisitor {
+    // (undocumented)
+    (value: JsonValue, pointer: JsonPointer, schema?: JsonObject, root?: JsonObject | JsonArray): Observable<JsonValue> | JsonValue;
+}
+
+// @public (undocumented)
+class LevelCapLogger extends LevelTransformLogger {
+    constructor(name: string, parent: Logger | null, levelCap: LogLevel);
+    // (undocumented)
+    readonly levelCap: LogLevel;
+    // (undocumented)
+    static levelMap: {
+        [cap: string]: {
+            [level: string]: string;
+        };
+    };
+    // (undocumented)
+    readonly name: string;
+    // (undocumented)
+    readonly parent: Logger | null;
+}
+
+// @public (undocumented)
+class LevelTransformLogger extends Logger {
+    constructor(name: string, parent: Logger | null, levelTransform: (level: LogLevel) => LogLevel);
+    // (undocumented)
+    createChild(name: string): Logger;
+    // (undocumented)
+    readonly levelTransform: (level: LogLevel) => LogLevel;
+    // (undocumented)
+    log(level: LogLevel, message: string, metadata?: JsonObject): void;
+    // (undocumented)
+    readonly name: string;
+    // (undocumented)
+    readonly parent: Logger | null;
+}
+
+// @public
+function levenshtein(a: string, b: string): number;
+
+// @public (undocumented)
+interface LogEntry extends LoggerMetadata {
+    // (undocumented)
+    level: LogLevel;
+    // (undocumented)
+    message: string;
+    // (undocumented)
+    timestamp: number;
+}
+
+// @public (undocumented)
+class Logger extends Observable<LogEntry> implements LoggerApi {
+    constructor(name: string, parent?: Logger | null);
+    // (undocumented)
+    asApi(): LoggerApi;
+    // (undocumented)
+    complete(): void;
+    // (undocumented)
+    createChild(name: string): Logger;
+    // (undocumented)
+    debug(message: string, metadata?: JsonObject): void;
+    // (undocumented)
+    error(message: string, metadata?: JsonObject): void;
+    // (undocumented)
+    fatal(message: string, metadata?: JsonObject): void;
+    // (undocumented)
+    forEach(next: (value: LogEntry) => void, PromiseCtor?: typeof Promise): Promise<void>;
+    // (undocumented)
+    info(message: string, metadata?: JsonObject): void;
+    // (undocumented)
+    lift<R>(operator: Operator<LogEntry, R>): Observable<R>;
+    // (undocumented)
+    log(level: LogLevel, message: string, metadata?: JsonObject): void;
+    // (undocumented)
+    protected _metadata: LoggerMetadata;
+    // (undocumented)
+    readonly name: string;
+    // (undocumented)
+    next(entry: LogEntry): void;
+    // (undocumented)
+    protected get _observable(): Observable<LogEntry>;
+    protected set _observable(v: Observable<LogEntry>);
+    // (undocumented)
+    readonly parent: Logger | null;
+    // (undocumented)
+    protected readonly _subject: Subject<LogEntry>;
+    // (undocumented)
+    subscribe(): Subscription;
+    // (undocumented)
+    subscribe(observer: PartialObserver<LogEntry>): Subscription;
+    // (undocumented)
+    subscribe(next?: (value: LogEntry) => void, error?: (error: Error) => void, complete?: () => void): Subscription;
+    // (undocumented)
+    toString(): string;
+    // (undocumented)
+    warn(message: string, metadata?: JsonObject): void;
+}
+
+// @public (undocumented)
+interface LoggerApi {
+    // (undocumented)
+    createChild(name: string): Logger;
+    // (undocumented)
+    debug(message: string, metadata?: JsonObject): void;
+    // (undocumented)
+    error(message: string, metadata?: JsonObject): void;
+    // (undocumented)
+    fatal(message: string, metadata?: JsonObject): void;
+    // (undocumented)
+    info(message: string, metadata?: JsonObject): void;
+    // (undocumented)
+    log(level: LogLevel, message: string, metadata?: JsonObject): void;
+    // (undocumented)
+    warn(message: string, metadata?: JsonObject): void;
+}
+
+// @public (undocumented)
+interface LoggerMetadata extends JsonObject {
+    // (undocumented)
+    name: string;
+    // (undocumented)
+    path: string[];
+}
+
+declare namespace logging {
+    export {
+        IndentLogger,
+        LevelTransformLogger,
+        LevelCapLogger,
+        LoggerMetadata,
+        LogEntry,
+        LoggerApi,
+        LogLevel,
+        Logger,
+        NullLogger,
+        TransformLogger
+    }
+}
+export { logging }
+
+// @public
+class LoggingAnalytics implements Analytics {
+    constructor(_logger: Logger);
+    // (undocumented)
+    event(category: string, action: string, options?: EventOptions): void;
+    // (undocumented)
+    flush(): Promise<void>;
+    // (undocumented)
+    protected _logger: Logger;
+    // (undocumented)
+    pageview(path: string, options?: PageviewOptions): void;
+    // (undocumented)
+    screenview(screenName: string, appName: string, options?: ScreenviewOptions): void;
+    // (undocumented)
+    timing(category: string, variable: string, time: string | number, options?: TimingOptions): void;
+}
+
+// @public (undocumented)
+type LogLevel = 'debug' | 'info' | 'warn' | 'error' | 'fatal';
+
+// @public @deprecated (undocumented)
+export function mapObject<T, V>(obj: {
+    [k: string]: T;
+}, mapper: (k: string, v: T) => V): {
+    [k: string]: V;
+};
+
+// @public (undocumented)
+export class MergeConflictException extends BaseException {
+    constructor(path: string);
+}
+
+// @public
+function mergeSchemas(...schemas: (JsonSchema | undefined)[]): JsonSchema;
+
+// @public
+class MultiAnalytics implements Analytics {
+    constructor(_backends?: Analytics[]);
+    // (undocumented)
+    protected _backends: Analytics[];
+    // (undocumented)
+    event(category: string, action: string, options?: EventOptions): void;
+    // (undocumented)
+    flush(): Promise<void>;
+    // (undocumented)
+    pageview(path: string, options?: PageviewOptions): void;
+    // (undocumented)
+    push(...backend: Analytics[]): void;
+    // (undocumented)
+    screenview(screenName: string, appName: string, options?: ScreenviewOptions): void;
+    // (undocumented)
+    timing(category: string, variable: string, time: string | number, options?: TimingOptions): void;
+}
+
+// @public
+enum NgCliAnalyticsDimensions {
+    // (undocumented)
+    BuildErrors = 20,
+    // (undocumented)
+    CpuCount = 1,
+    // (undocumented)
+    CpuSpeed = 2,
+    // (undocumented)
+    NgAddCollection = 6,
+    // (undocumented)
+    NgIvyEnabled = 8,
+    // (undocumented)
+    NodeVersion = 4,
+    // (undocumented)
+    RamInGigabytes = 3
+}
+
+// @public (undocumented)
+const NgCliAnalyticsDimensionsFlagInfo: {
+    [name: string]: [string, string];
+};
+
+// @public (undocumented)
+enum NgCliAnalyticsMetrics {
+    // (undocumented)
+    AssetCount = 12,
+    // (undocumented)
+    AssetSize = 13,
+    // (undocumented)
+    BuildTime = 5,
+    // (undocumented)
+    CssSize = 15,
+    // (undocumented)
+    InitialChunkSize = 7,
+    // (undocumented)
+    LazyChunkCount = 10,
+    // (undocumented)
+    LazyChunkSize = 11,
+    // (undocumented)
+    NgComponentCount = 1,
+    // (undocumented)
+    NgOnInitCount = 6,
+    // (undocumented)
+    PolyfillSize = 14,
+    // (undocumented)
+    TotalChunkCount = 8,
+    // (undocumented)
+    TotalChunkSize = 9,
+    // (undocumented)
+    UNUSED_2 = 2,
+    // (undocumented)
+    UNUSED_3 = 3,
+    // (undocumented)
+    UNUSED_4 = 4
+}
+
+// @public (undocumented)
+const NgCliAnalyticsMetricsFlagInfo: {
+    [name: string]: [string, string];
+};
+
+// @public
+export function noCacheNormalize(path: string): Path;
+
+// @public
+class NoopAnalytics implements Analytics {
+    // (undocumented)
+    event(): void;
+    // (undocumented)
+    flush(): Promise<void>;
+    // (undocumented)
+    pageview(): void;
+    // (undocumented)
+    screenview(): void;
+    // (undocumented)
+    timing(): void;
+}
+
+// @public
+export function normalize(path: string): Path;
+
+// @public
+export const NormalizedRoot: Path;
+
+// @public
+export const NormalizedSep: Path;
+
+// @public (undocumented)
+class NullLogger extends Logger {
+    constructor(parent?: Logger | null);
+    // (undocumented)
+    asApi(): LoggerApi;
+}
+
+// @public (undocumented)
+function oneLine(strings: TemplateStringsArray, ...values: any[]): string;
+
+// @public (undocumented)
+interface PageviewOptions extends CustomDimensionsAndMetricsOptions {
+    // (undocumented)
+    hostname?: string;
+    // (undocumented)
+    title?: string;
+}
+
+// @public @deprecated
+export function parseJson(input: string, mode?: JsonParseMode, options?: ParseJsonOptions): JsonValue;
+
+// @public @deprecated
+export function parseJsonAst(input: string, mode?: JsonParseMode): JsonAstNode;
+
+// @public @deprecated
+export interface ParseJsonOptions {
+    path?: string;
+}
+
+// @public (undocumented)
+function parseJsonPointer(pointer: JsonPointer): string[];
+
+// @public (undocumented)
+export class PartiallyOrderedSet<T> implements Set<T> {
+    // (undocumented)
+    [Symbol.iterator](): Generator<T, void, unknown>;
+    // (undocumented)
+    get [Symbol.toStringTag](): 'Set';
+    // (undocumented)
+    add(item: T, deps?: Set<T> | T[]): this;
+    // (undocumented)
+    protected _checkCircularDependencies(item: T, deps: Set<T>): void;
+    // (undocumented)
+    clear(): void;
+    // (undocumented)
+    delete(item: T): boolean;
+    entries(): IterableIterator<[T, T]>;
+    // (undocumented)
+    forEach(callbackfn: (value: T, value2: T, set: PartiallyOrderedSet<T>) => void, thisArg?: any): void;
+    // (undocumented)
+    has(item: T): boolean;
+    keys(): IterableIterator<T>;
+    // (undocumented)
+    get size(): number;
+    values(): IterableIterator<T>;
+}
+
+// @public
+export type Path = string & {
+    __PRIVATE_DEVKIT_PATH: void;
+};
+
+// @public (undocumented)
+export const path: TemplateTag<Path>;
+
+// @public (undocumented)
+export class PathCannotBeFragmentException extends BaseException {
+    constructor(path: string);
+}
+
+// @public
+export type PathFragment = Path & {
+    __PRIVATE_DEVKIT_PATH_FRAGMENT: void;
+};
+
+// @public (undocumented)
+export class PathIsDirectoryException extends BaseException {
+    constructor(path: string);
+}
+
+// @public (undocumented)
+export class PathIsFileException extends BaseException {
+    constructor(path: string);
+}
+
+// @public (undocumented)
+export class PathMustBeAbsoluteException extends BaseException {
+    constructor(path: string);
+}
+
+// @public @deprecated
+export class PathSpecificJsonException extends JsonException {
+    constructor(path: string, exception: JsonException);
+    // (undocumented)
+    exception: JsonException;
+    // (undocumented)
+    path: string;
+}
+
+// @public (undocumented)
+class PatternMatchingHost<StatsT extends object = {}> extends ResolverHost<StatsT> {
+    // (undocumented)
+    addPattern(pattern: string | string[], replacementFn: ReplacementFunction): void;
+    // (undocumented)
+    protected _patterns: Map<RegExp, ReplacementFunction>;
+    // (undocumented)
+    protected _resolve(path: Path): Path;
+}
+
+// @public
+export interface Position {
+    // (undocumented)
+    readonly character: number;
+    // (undocumented)
+    readonly line: number;
+    // (undocumented)
+    readonly offset: number;
+}
+
+// @public (undocumented)
+export type PosixPath = string & {
+    __PRIVATE_DEVKIT_POSIX_PATH: void;
+};
+
+// @public
+export class PriorityQueue<T> {
+    constructor(_comparator: (x: T, y: T) => number);
+    // (undocumented)
+    clear(): void;
+    // (undocumented)
+    peek(): T | undefined;
+    // (undocumented)
+    pop(): T | undefined;
+    // (undocumented)
+    push(item: T): void;
+    // (undocumented)
+    get size(): number;
+    // (undocumented)
+    toArray(): Array<T>;
+}
+
+// @public (undocumented)
+interface ProjectDefinition {
+    // (undocumented)
+    readonly extensions: Record<string, JsonValue | undefined>;
+    // (undocumented)
+    prefix?: string;
+    // (undocumented)
+    root: string;
+    // (undocumented)
+    sourceRoot?: string;
+    // (undocumented)
+    readonly targets: TargetDefinitionCollection;
+}
+
+// @public (undocumented)
+class ProjectDefinitionCollection extends DefinitionCollection<ProjectDefinition> {
+    constructor(initial?: Record<string, ProjectDefinition>, listener?: DefinitionCollectionListener<ProjectDefinition>);
+    // (undocumented)
+    add(definition: {
+        name: string;
+        root: string;
+        sourceRoot?: string;
+        prefix?: string;
+        targets?: Record<string, TargetDefinition | undefined>;
+        [key: string]: unknown;
+    }): ProjectDefinition;
+    // (undocumented)
+    set(name: string, value: ProjectDefinition): this;
+}
+
+// @public (undocumented)
+interface PromptDefinition {
+    // (undocumented)
+    default?: string | string[] | number | boolean | null;
+    // (undocumented)
+    id: string;
+    // (undocumented)
+    items?: Array<string | {
+        value: JsonValue;
+        label: string;
+    }>;
+    // (undocumented)
+    message: string;
+    // (undocumented)
+    multiselect?: boolean;
+    // (undocumented)
+    propertyTypes: Set<string>;
+    // (undocumented)
+    raw?: string | JsonObject;
+    // (undocumented)
+    type: string;
+    // (undocumented)
+    validator?: (value: JsonValue) => boolean | string | Promise<boolean | string>;
+}
+
+// @public (undocumented)
+type PromptProvider = (definitions: Array<PromptDefinition>) => SubscribableOrPromise<{
+    [id: string]: JsonValue;
+}>;
+
+// @public (undocumented)
+interface ReadonlyHost<StatsT extends object = {}> {
+    // (undocumented)
+    readonly capabilities: HostCapabilities;
+    // (undocumented)
+    exists(path: Path): Observable<boolean>;
+    // (undocumented)
+    isDirectory(path: Path): Observable<boolean>;
+    // (undocumented)
+    isFile(path: Path): Observable<boolean>;
+    // (undocumented)
+    list(path: Path): Observable<PathFragment[]>;
+    // (undocumented)
+    read(path: Path): Observable<FileBuffer>;
+    // (undocumented)
+    stat(path: Path): Observable<Stats<StatsT> | null> | null;
+}
+
+// @public
+function readWorkspace(path: string, host: WorkspaceHost, format?: WorkspaceFormat): Promise<{
+    workspace: WorkspaceDefinition;
+}>;
+
+// @public (undocumented)
+export type Readwrite<T> = {
+    -readonly [P in keyof T]: T[P];
+};
+
+// @public (undocumented)
+interface ReferenceResolver<ContextT> {
+    // (undocumented)
+    (ref: string, context?: ContextT): {
+        context?: ContextT;
+        schema?: JsonObject;
+    };
+}
+
+// @public
+interface RegisterJobOptions extends Partial<JobDescription> {
+}
+
+// @public (undocumented)
+interface Registry<MinimumArgumentValueT extends JsonValue = JsonValue, MinimumInputValueT extends JsonValue = JsonValue, MinimumOutputValueT extends JsonValue = JsonValue> {
+    get<A extends MinimumArgumentValueT, I extends MinimumInputValueT, O extends MinimumOutputValueT>(name: JobName): Observable<JobHandler<A, I, O> | null>;
+}
+
+// @public
+export function relative(from: Path, to: Path): Path;
+
+// @public (undocumented)
+type ReplacementFunction = (path: Path) => Path;
+
+// @public
+export function resetNormalizeCache(): void;
+
+// @public
+export function resolve(p1: Path, p2: Path): Path;
+
+// @public
+abstract class ResolverHost<T extends object> implements Host<T> {
+    constructor(_delegate: Host<T>);
+    // (undocumented)
+    get capabilities(): HostCapabilities;
+    // (undocumented)
+    protected _delegate: Host<T>;
+    // (undocumented)
+    delete(path: Path): Observable<void>;
+    // (undocumented)
+    exists(path: Path): Observable<boolean>;
+    // (undocumented)
+    isDirectory(path: Path): Observable<boolean>;
+    // (undocumented)
+    isFile(path: Path): Observable<boolean>;
+    // (undocumented)
+    list(path: Path): Observable<PathFragment[]>;
+    // (undocumented)
+    read(path: Path): Observable<FileBuffer>;
+    // (undocumented)
+    rename(from: Path, to: Path): Observable<void>;
+    // (undocumented)
+    protected abstract _resolve(path: Path): Path;
+    // (undocumented)
+    stat(path: Path): Observable<Stats<T> | null> | null;
+    // (undocumented)
+    watch(path: Path, options?: HostWatchOptions): Observable<HostWatchEvent> | null;
+    // (undocumented)
+    write(path: Path, content: FileBuffer): Observable<void>;
+}
+
+// @public
+class SafeReadonlyHost<StatsT extends object = {}> implements ReadonlyHost<StatsT> {
+    constructor(_delegate: ReadonlyHost<StatsT>);
+    // (undocumented)
+    get capabilities(): HostCapabilities;
+    // (undocumented)
+    exists(path: Path): Observable<boolean>;
+    // (undocumented)
+    isDirectory(path: Path): Observable<boolean>;
+    // (undocumented)
+    isFile(path: Path): Observable<boolean>;
+    // (undocumented)
+    list(path: Path): Observable<PathFragment[]>;
+    // (undocumented)
+    read(path: Path): Observable<FileBuffer>;
+    // (undocumented)
+    stat(path: Path): Observable<Stats<StatsT> | null> | null;
+}
+
+// @public
+interface ScheduleJobOptions {
+    dependencies?: Job | Job[];
+}
+
+// @public
+interface Scheduler<MinimumArgumentValueT extends JsonValue = JsonValue, MinimumInputValueT extends JsonValue = JsonValue, MinimumOutputValueT extends JsonValue = JsonValue> {
+    getDescription(name: JobName): Observable<JobDescription | null>;
+    has(name: JobName): Observable<boolean>;
+    pause(): () => void;
+    schedule<A extends MinimumArgumentValueT, I extends MinimumInputValueT, O extends MinimumOutputValueT>(name: JobName, argument: A, options?: ScheduleJobOptions): Job<A, I, O>;
+}
+
+declare namespace schema {
+    export {
+        transforms,
+        JsonPointer,
+        SchemaValidatorResult,
+        SchemaValidatorError,
+        SchemaValidatorOptions,
+        SchemaValidator,
+        SchemaFormatter,
+        SchemaFormat,
+        SmartDefaultProvider,
+        SchemaKeywordValidator,
+        PromptDefinition,
+        PromptProvider,
+        SchemaRegistry,
+        JsonSchemaVisitor,
+        JsonVisitor,
+        buildJsonPointer,
+        joinJsonPointer,
+        parseJsonPointer,
+        UriHandler,
+        SchemaValidationException,
+        CoreSchemaRegistry,
+        isJsonSchema,
+        mergeSchemas,
+        JsonSchema,
+        visitJson,
+        visitJsonSchema,
+        ReferenceResolver,
+        getTypesOfSchema
+    }
+}
+export { schema }
+
+// @public (undocumented)
+interface SchemaFormat {
+    // (undocumented)
+    formatter: SchemaFormatter;
+    // (undocumented)
+    name: string;
+}
+
+// @public (undocumented)
+type SchemaFormatter = Format;
+
+// @public (undocumented)
+interface SchemaKeywordValidator {
+    // (undocumented)
+    (data: JsonValue, schema: JsonValue, parent: JsonObject | JsonArray | undefined, parentProperty: string | number | undefined, pointer: JsonPointer, rootData: JsonValue): boolean | Observable<boolean>;
+}
+
+// @public (undocumented)
+interface SchemaRegistry {
+    // (undocumented)
+    addFormat(format: SchemaFormat): void;
+    addPostTransform(visitor: JsonVisitor, deps?: JsonVisitor[]): void;
+    addPreTransform(visitor: JsonVisitor, deps?: JsonVisitor[]): void;
+    // (undocumented)
+    addSmartDefaultProvider<T>(source: string, provider: SmartDefaultProvider<T>): void;
+    // (undocumented)
+    compile(schema: Object): Observable<SchemaValidator>;
+    // @deprecated (undocumented)
+    flatten(schema: JsonObject | string): Observable<JsonObject>;
+    // (undocumented)
+    usePromptProvider(provider: PromptProvider): void;
+    // (undocumented)
+    useXDeprecatedProvider(onUsage: (message: string) => void): void;
+}
+
+// @public (undocumented)
+class SchemaValidationException extends BaseException {
+    constructor(errors?: SchemaValidatorError[], baseMessage?: string);
+    // (undocumented)
+    static createMessages(errors?: SchemaValidatorError[]): string[];
+    // (undocumented)
+    readonly errors: SchemaValidatorError[];
+}
+
+// @public (undocumented)
+interface SchemaValidator {
+    // (undocumented)
+    (data: JsonValue, options?: SchemaValidatorOptions): Observable<SchemaValidatorResult>;
+}
+
+// @public (undocumented)
+type SchemaValidatorError = Partial<ErrorObject>;
+
+// @public (undocumented)
+interface SchemaValidatorOptions {
+    // (undocumented)
+    applyPostTransforms?: boolean;
+    // (undocumented)
+    applyPreTransforms?: boolean;
+    // (undocumented)
+    withPrompts?: boolean;
+}
+
+// @public (undocumented)
+interface SchemaValidatorResult {
+    // (undocumented)
+    data: JsonValue;
+    // (undocumented)
+    errors?: SchemaValidatorError[];
+    // (undocumented)
+    success: boolean;
+}
+
+// @public (undocumented)
+class ScopedHost<T extends object> extends ResolverHost<T> {
+    constructor(delegate: Host<T>, _root?: Path);
+    // (undocumented)
+    protected _resolve(path: Path): Path;
+    // (undocumented)
+    protected _root: Path;
+}
+
+// @public (undocumented)
+interface ScreenviewOptions extends CustomDimensionsAndMetricsOptions {
+    // (undocumented)
+    appId?: string;
+    // (undocumented)
+    appInstallerId?: string;
+    // (undocumented)
+    appVersion?: string;
+}
+
+// @public
+interface SimpleJobHandlerContext<A extends JsonValue, I extends JsonValue, O extends JsonValue> extends JobHandlerContext<A, I, O> {
+    // (undocumented)
+    createChannel: (name: string) => Observer<JsonValue>;
+    // (undocumented)
+    input: Observable<I>;
+}
+
+// @public
+type SimpleJobHandlerFn<A extends JsonValue, I extends JsonValue, O extends JsonValue> = (input: A, context: SimpleJobHandlerContext<A, I, O>) => O | Promise<O> | Observable<O>;
+
+// @public
+class SimpleJobRegistry<MinimumArgumentValueT extends JsonValue = JsonValue, MinimumInputValueT extends JsonValue = JsonValue, MinimumOutputValueT extends JsonValue = JsonValue> implements Registry<MinimumArgumentValueT, MinimumInputValueT, MinimumOutputValueT> {
+    // (undocumented)
+    get<A extends MinimumArgumentValueT = MinimumArgumentValueT, I extends MinimumInputValueT = MinimumInputValueT, O extends MinimumOutputValueT = MinimumOutputValueT>(name: JobName): Observable<JobHandler<A, I, O> | null>;
+    getJobNames(): JobName[];
+    register<A extends MinimumArgumentValueT, I extends MinimumInputValueT, O extends MinimumOutputValueT>(name: JobName, handler: JobHandler<A, I, O>, options?: RegisterJobOptions): void;
+    register<ArgumentT extends JsonValue, InputT extends JsonValue, OutputT extends JsonValue>(handler: JobHandler<ArgumentT, InputT, OutputT>, options?: RegisterJobOptions & {
+        name: string;
+    }): void;
+    // (undocumented)
+    protected _register<ArgumentT extends JsonValue, InputT extends JsonValue, OutputT extends JsonValue>(name: JobName, handler: JobHandler<ArgumentT, InputT, OutputT>, options: RegisterJobOptions): void;
+}
+
+// @public (undocumented)
+class SimpleMemoryHost implements Host<{}> {
+    constructor();
+    // (undocumented)
+    protected _cache: Map<Path, Stats<SimpleMemoryHostStats>>;
+    // (undocumented)
+    get capabilities(): HostCapabilities;
+    // (undocumented)
+    delete(path: Path): Observable<void>;
+    // (undocumented)
+    protected _delete(path: Path): void;
+    // (undocumented)
+    exists(path: Path): Observable<boolean>;
+    // (undocumented)
+    protected _exists(path: Path): boolean;
+    // (undocumented)
+    isDirectory(path: Path): Observable<boolean>;
+    // (undocumented)
+    protected _isDirectory(path: Path): boolean;
+    // (undocumented)
+    isFile(path: Path): Observable<boolean>;
+    // (undocumented)
+    protected _isFile(path: Path): boolean;
+    // (undocumented)
+    list(path: Path): Observable<PathFragment[]>;
+    // (undocumented)
+    protected _list(path: Path): PathFragment[];
+    // (undocumented)
+    protected _newDirStats(): {
+        inspect(): string;
+        isFile(): boolean;
+        isDirectory(): boolean;
+        size: number;
+        atime: Date;
+        ctime: Date;
+        mtime: Date;
+        birthtime: Date;
+        content: null;
+    };
+    // (undocumented)
+    protected _newFileStats(content: FileBuffer, oldStats?: Stats<SimpleMemoryHostStats>): {
+        inspect(): string;
+        isFile(): boolean;
+        isDirectory(): boolean;
+        size: number;
+        atime: Date;
+        ctime: Date;
+        mtime: Date;
+        birthtime: Date;
+        content: ArrayBuffer;
+    };
+    // (undocumented)
+    read(path: Path): Observable<FileBuffer>;
+    // (undocumented)
+    protected _read(path: Path): FileBuffer;
+    // (undocumented)
+    rename(from: Path, to: Path): Observable<void>;
+    // (undocumented)
+    protected _rename(from: Path, to: Path): void;
+    // (undocumented)
+    reset(): void;
+    // (undocumented)
+    stat(path: Path): Observable<Stats<{}> | null> | null;
+    // (undocumented)
+    protected _stat(path: Path): Stats<SimpleMemoryHostStats> | null;
+    // (undocumented)
+    protected _toAbsolute(path: Path): Path;
+    // (undocumented)
+    protected _updateWatchers(path: Path, type: HostWatchEventType): void;
+    // (undocumented)
+    watch(path: Path, options?: HostWatchOptions): Observable<HostWatchEvent> | null;
+    // (undocumented)
+    protected _watch(path: Path, options?: HostWatchOptions): Observable<HostWatchEvent>;
+    // (undocumented)
+    write(path: Path, content: FileBuffer): Observable<void>;
+    protected _write(path: Path, content: FileBuffer): void;
+}
+
+// @public (undocumented)
+interface SimpleMemoryHostStats {
+    // (undocumented)
+    readonly content: FileBuffer | null;
+}
+
+// @public
+class SimpleScheduler<MinimumArgumentT extends JsonValue = JsonValue, MinimumInputT extends JsonValue = JsonValue, MinimumOutputT extends JsonValue = JsonValue> implements Scheduler<MinimumArgumentT, MinimumInputT, MinimumOutputT> {
+    constructor(_jobRegistry: Registry<MinimumArgumentT, MinimumInputT, MinimumOutputT>, _schemaRegistry?: schema.SchemaRegistry);
+    getDescription(name: JobName): Observable<JobDescription | null>;
+    has(name: JobName): Observable<boolean>;
+    // (undocumented)
+    protected _jobRegistry: Registry<MinimumArgumentT, MinimumInputT, MinimumOutputT>;
+    pause(): () => void;
+    schedule<A extends MinimumArgumentT, I extends MinimumInputT, O extends MinimumOutputT>(name: JobName, argument: A, options?: ScheduleJobOptions): Job<A, I, O>;
+    // (undocumented)
+    protected _scheduleJob<A extends MinimumArgumentT, I extends MinimumInputT, O extends MinimumOutputT>(name: JobName, argument: A, options: ScheduleJobOptions, waitable: Observable<never>): Job<A, I, O>;
+    // (undocumented)
+    protected _schemaRegistry: schema.SchemaRegistry;
+}
+
+// @public (undocumented)
+interface SmartDefaultProvider<T> {
+    // (undocumented)
+    (schema: JsonObject): T | Observable<T>;
+}
+
+// @public
+export function split(path: Path): PathFragment[];
+
+// @public (undocumented)
+type Stats<T extends object = {}> = T & {
+    isFile(): boolean;
+    isDirectory(): boolean;
+    readonly size: number;
+    readonly atime: Date;
+    readonly mtime: Date;
+    readonly ctime: Date;
+    readonly birthtime: Date;
+};
+
+// @public (undocumented)
+namespace strategy {
+    // (undocumented)
+    type JobStrategy<A extends JsonValue = JsonValue, I extends JsonValue = JsonValue, O extends JsonValue = JsonValue> = (handler: JobHandler<A, I, O>, options?: Partial<Readonly<JobDescription>>) => JobHandler<A, I, O>;
+    function memoize<A extends JsonValue = JsonValue, I extends JsonValue = JsonValue, O extends JsonValue = JsonValue>(replayMessages?: boolean): JobStrategy<A, I, O>;
+    function reuse<A extends JsonValue = JsonValue, I extends JsonValue = JsonValue, O extends JsonValue = JsonValue>(replayMessages?: boolean): JobStrategy<A, I, O>;
+    function serialize<A extends JsonValue = JsonValue, I extends JsonValue = JsonValue, O extends JsonValue = JsonValue>(): JobStrategy<A, I, O>;
+}
+
+declare namespace strings {
+    export {
+        decamelize,
+        dasherize,
+        camelize,
+        classify,
+        underscore,
+        capitalize,
+        levenshtein
+    }
+}
+export { strings }
+
+// @public (undocumented)
+function stringToFileBuffer(str: string): FileBuffer;
+
+// @public (undocumented)
+function stripIndent(strings: TemplateStringsArray, ...values: any[]): string;
+
+// @public (undocumented)
+function stripIndents(strings: TemplateStringsArray, ...values: any[]): string;
+
+// @public
+class SyncDelegateHost<T extends object = {}> {
+    constructor(_delegate: Host<T>);
+    // (undocumented)
+    get capabilities(): HostCapabilities;
+    // (undocumented)
+    get delegate(): Host<T>;
+    // (undocumented)
+    protected _delegate: Host<T>;
+    // (undocumented)
+    delete(path: Path): void;
+    // (undocumented)
+    protected _doSyncCall<ResultT>(observable: Observable<ResultT>): ResultT;
+    // (undocumented)
+    exists(path: Path): boolean;
+    // (undocumented)
+    isDirectory(path: Path): boolean;
+    // (undocumented)
+    isFile(path: Path): boolean;
+    // (undocumented)
+    list(path: Path): PathFragment[];
+    // (undocumented)
+    read(path: Path): FileBuffer;
+    // (undocumented)
+    rename(from: Path, to: Path): void;
+    // (undocumented)
+    stat(path: Path): Stats<T> | null;
+    // (undocumented)
+    watch(path: Path, options?: HostWatchOptions): Observable<HostWatchEvent> | null;
+    // (undocumented)
+    write(path: Path, content: FileBufferLike): void;
+}
+
+// @public (undocumented)
+interface SyncHostHandler<StatsT extends object = {}> {
+    // (undocumented)
+    delete(path: Path): void;
+    // (undocumented)
+    exists(path: Path): boolean;
+    // (undocumented)
+    isDirectory(path: Path): boolean;
+    // (undocumented)
+    isFile(path: Path): boolean;
+    // (undocumented)
+    list(path: Path): PathFragment[];
+    // (undocumented)
+    read(path: Path): FileBuffer;
+    // (undocumented)
+    rename(from: Path, to: Path): void;
+    // (undocumented)
+    stat(path: Path): Stats<StatsT> | null;
+    // (undocumented)
+    write(path: Path, content: FileBufferLike): void;
+}
+
+// @public (undocumented)
+class SynchronousDelegateExpectedException extends BaseException {
+    constructor();
+}
+
+declare namespace tags {
+    export {
+        oneLine,
+        indentBy,
+        stripIndent,
+        stripIndents,
+        trimNewlines,
+        TemplateTag
+    }
+}
+export { tags }
+
+// @public (undocumented)
+interface TargetDefinition {
+    // (undocumented)
+    builder: string;
+    // (undocumented)
+    configurations?: Record<string, Record<string, JsonValue | undefined> | undefined>;
+    // (undocumented)
+    defaultConfiguration?: string;
+    // (undocumented)
+    options?: Record<string, JsonValue | undefined>;
+}
+
+// @public (undocumented)
+class TargetDefinitionCollection extends DefinitionCollection<TargetDefinition> {
+    constructor(initial?: Record<string, TargetDefinition>, listener?: DefinitionCollectionListener<TargetDefinition>);
+    // (undocumented)
+    add(definition: {
+        name: string;
+    } & TargetDefinition): TargetDefinition;
+    // (undocumented)
+    set(name: string, value: TargetDefinition): this;
+}
+
+// @public
+export function template<T>(content: string, options?: TemplateOptions): (input: T) => string;
+
+// @public
+export interface TemplateAst {
+    // (undocumented)
+    children: TemplateAstNode[];
+    // (undocumented)
+    content: string;
+    // (undocumented)
+    fileName: string;
+}
+
+// @public
+export interface TemplateAstBase {
+    // (undocumented)
+    end: Position_2;
+    // (undocumented)
+    start: Position_2;
+}
+
+// @public
+export interface TemplateAstComment extends TemplateAstBase {
+    // (undocumented)
+    kind: 'comment';
+    // (undocumented)
+    text: string;
+}
+
+// @public
+export interface TemplateAstContent extends TemplateAstBase {
+    // (undocumented)
+    content: string;
+    // (undocumented)
+    kind: 'content';
+}
+
+// @public
+export interface TemplateAstEscape extends TemplateAstBase {
+    // (undocumented)
+    expression: string;
+    // (undocumented)
+    kind: 'escape';
+}
+
+// @public
+export interface TemplateAstEvaluate extends TemplateAstBase {
+    // (undocumented)
+    expression: string;
+    // (undocumented)
+    kind: 'evaluate';
+}
+
+// @public
+export interface TemplateAstInterpolate extends TemplateAstBase {
+    // (undocumented)
+    expression: string;
+    // (undocumented)
+    kind: 'interpolate';
+}
+
+// @public (undocumented)
+export type TemplateAstNode = TemplateAstContent | TemplateAstEvaluate | TemplateAstComment | TemplateAstEscape | TemplateAstInterpolate;
+
+// @public (undocumented)
+export interface TemplateOptions {
+    // (undocumented)
+    fileName?: string;
+    // (undocumented)
+    module?: boolean | {
+        exports: {};
+    };
+    // (undocumented)
+    sourceMap?: boolean;
+    // (undocumented)
+    sourceRoot?: string;
+    // (undocumented)
+    sourceURL?: string;
+}
+
+// @public
+export function templateParser(sourceText: string, fileName: string): TemplateAst;
+
+// @public
+interface TemplateTag<R = string> {
+    // (undocumented)
+    (template: TemplateStringsArray, ...substitutions: any[]): R;
+}
+
+// @public (undocumented)
+namespace test {
+    // (undocumented)
+    class TestHost extends SimpleMemoryHost {
+        // (undocumented)
+        $exists(path: string): boolean;
+        // (undocumented)
+        $isDirectory(path: string): boolean;
+        // (undocumented)
+        $isFile(path: string): boolean;
+        // (undocumented)
+        $list(path: string): PathFragment[];
+        // (undocumented)
+        $read(path: string): string;
+        // (undocumented)
+        $write(path: string, content: string): void;
+        constructor(map?: {
+            [path: string]: string;
+        });
+        // (undocumented)
+        clearRecords(): void;
+        // (undocumented)
+        clone(): TestHost;
+        // (undocumented)
+        protected _delete(path: Path): void;
+        // (undocumented)
+        protected _exists(path: Path): boolean;
+        // (undocumented)
+        get files(): Path[];
+        // (undocumented)
+        protected _isDirectory(path: Path): boolean;
+        // (undocumented)
+        protected _isFile(path: Path): boolean;
+        // (undocumented)
+        protected _list(path: Path): PathFragment[];
+        // (undocumented)
+        protected _read(path: Path): ArrayBuffer;
+        // (undocumented)
+        get records(): TestLogRecord[];
+        // (undocumented)
+        protected _records: TestLogRecord[];
+        // (undocumented)
+        protected _rename(from: Path, to: Path): void;
+        // (undocumented)
+        protected _stat(path: Path): Stats<SimpleMemoryHostStats> | null;
+        // (undocumented)
+        get sync(): SyncDelegateHost<{}>;
+        // (undocumented)
+        protected _sync: SyncDelegateHost<{}> | null;
+        // (undocumented)
+        protected _watch(path: Path, options?: HostWatchOptions): Observable<HostWatchEvent>;
+        // (undocumented)
+        protected _write(path: Path, content: FileBuffer): void;
+    }
+    // (undocumented)
+    type TestLogRecord = {
+        kind: 'write' | 'read' | 'delete' | 'list' | 'exists' | 'isDirectory' | 'isFile' | 'stat' | 'watch';
+        path: Path;
+    } | {
+        kind: 'rename';
+        from: Path;
+        to: Path;
+    };
+}
+
+// @public (undocumented)
+interface TimingOptions extends CustomDimensionsAndMetricsOptions {
+    // (undocumented)
+    label?: string;
+}
+
+// @public (undocumented)
+class TransformLogger extends Logger {
+    constructor(name: string, transform: (stream: Observable<LogEntry>) => Observable<LogEntry>, parent?: Logger | null);
+}
+
+declare namespace transforms {
+    export {
+        addUndefinedDefaults
+    }
+}
+
+// @public (undocumented)
+function trimNewlines(strings: TemplateStringsArray, ...values: any[]): string;
+
+// @public
+function underscore(str: string): string;
+
+// @public @deprecated
+export class UnexpectedEndOfInputException extends JsonException {
+    constructor(_context: JsonParserContext);
+}
+
+// @public (undocumented)
+export class UnimplementedException extends BaseException {
+    constructor();
+}
+
+// @public (undocumented)
+export class UnknownException extends BaseException {
+    constructor(message: string);
+}
+
+// @public (undocumented)
+export class UnsupportedPlatformException extends BaseException {
+    constructor();
+}
+
+// @public (undocumented)
+type UriHandler = (uri: string) => Observable<JsonObject> | Promise<JsonObject> | null | undefined;
+
+declare namespace virtualFs {
+    export {
+        AliasHost,
+        stringToFileBuffer,
+        fileBufferToString,
+        fileBuffer,
+        createSyncHost,
+        SyncHostHandler,
+        Empty,
+        FileBuffer,
+        FileBufferLike,
+        HostWatchOptions,
+        HostWatchEventType,
+        Stats,
+        HostWatchEvent,
+        HostCapabilities,
+        ReadonlyHost,
+        Host,
+        SimpleMemoryHostStats,
+        SimpleMemoryHost,
+        ReplacementFunction,
+        PatternMatchingHost,
+        CordHostCreate,
+        CordHostOverwrite,
+        CordHostRename,
+        CordHostDelete,
+        CordHostRecord,
+        CordHost,
+        SafeReadonlyHost,
+        ScopedHost,
+        SynchronousDelegateExpectedException,
+        SyncDelegateHost,
+        ResolverHost,
+        test
+    }
+}
+export { virtualFs }
+
+// @public
+function visitJson<ContextT>(json: JsonValue, visitor: JsonVisitor, schema?: JsonSchema, refResolver?: ReferenceResolver<ContextT>, context?: ContextT): Observable<JsonValue>;
+
+// @public (undocumented)
+function visitJsonSchema(schema: JsonSchema, visitor: JsonSchemaVisitor): void;
+
+// @public (undocumented)
+export type WindowsPath = string & {
+    __PRIVATE_DEVKIT_WINDOWS_PATH: void;
+};
+
+// @public (undocumented)
+interface WorkspaceDefinition {
+    // (undocumented)
+    readonly extensions: Record<string, JsonValue | undefined>;
+    // (undocumented)
+    readonly projects: ProjectDefinitionCollection;
+}
+
+// @public
+enum WorkspaceFormat {
+    // (undocumented)
+    JSON = 0
+}
+
+// @public (undocumented)
+interface WorkspaceHost {
+    // (undocumented)
+    isDirectory(path: string): Promise<boolean>;
+    // (undocumented)
+    isFile(path: string): Promise<boolean>;
+    // (undocumented)
+    readFile(path: string): Promise<string>;
+    // (undocumented)
+    writeFile(path: string, data: string): Promise<void>;
+}
+
+declare namespace workspaces {
+    export {
+        WorkspaceHost,
+        createWorkspaceHost,
+        WorkspaceFormat,
+        readWorkspace,
+        writeWorkspace,
+        WorkspaceDefinition,
+        ProjectDefinition,
+        TargetDefinition,
+        DefinitionCollectionListener,
+        ProjectDefinitionCollection,
+        TargetDefinitionCollection
+    }
+}
+export { workspaces }
+
+// @public
+function writeWorkspace(workspace: WorkspaceDefinition, host: WorkspaceHost, path?: string, format?: WorkspaceFormat): Promise<void>;
+
+// (No @packageDocumentation comment for this package)
+
+```
diff --git a/goldens/public-api/angular_devkit/schematics/src/index.md b/goldens/public-api/angular_devkit/schematics/src/index.md
new file mode 100644
index 000000000000..a65d73a318b2
--- /dev/null
+++ b/goldens/public-api/angular_devkit/schematics/src/index.md
@@ -0,0 +1,1044 @@
+## API Report File for "@angular-devkit/schematics"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+
+import { analytics } from '@angular-devkit/core';
+import { BaseException } from '@angular-devkit/core';
+import { logging } from '@angular-devkit/core';
+import { Observable } from 'rxjs';
+import { Path } from '@angular-devkit/core';
+import { PathFragment } from '@angular-devkit/core';
+import { schema } from '@angular-devkit/core';
+import { Subject } from 'rxjs';
+import { Url } from 'url';
+import { virtualFs } from '@angular-devkit/core';
+
+// @public (undocumented)
+export type Action = CreateFileAction | OverwriteFileAction | RenameFileAction | DeleteFileAction;
+
+// @public (undocumented)
+export interface ActionBase {
+    // (undocumented)
+    readonly id: number;
+    // (undocumented)
+    readonly parent: number;
+    // (undocumented)
+    readonly path: Path;
+}
+
+// @public (undocumented)
+export class ActionList implements Iterable<Action> {
+    // (undocumented)
+    [Symbol.iterator](): IterableIterator<Action>;
+    // (undocumented)
+    protected _action(action: Partial<Action>): void;
+    // (undocumented)
+    create(path: Path, content: Buffer): void;
+    // (undocumented)
+    delete(path: Path): void;
+    // (undocumented)
+    find(predicate: (value: Action) => boolean): Action | null;
+    // (undocumented)
+    forEach(fn: (value: Action, index: number, array: Action[]) => void, thisArg?: {}): void;
+    // (undocumented)
+    get(i: number): Action;
+    // (undocumented)
+    has(action: Action): boolean;
+    // (undocumented)
+    get length(): number;
+    // (undocumented)
+    optimize(): void;
+    // (undocumented)
+    overwrite(path: Path, content: Buffer): void;
+    // (undocumented)
+    push(action: Action): void;
+    // (undocumented)
+    rename(path: Path, to: Path): void;
+}
+
+// @public
+export function apply(source: Source, rules: Rule[]): Source;
+
+// @public (undocumented)
+export function applyContentTemplate<T>(options: T): FileOperator;
+
+// @public (undocumented)
+export function applyPathTemplate<T extends PathTemplateData>(data: T, options?: PathTemplateOptions): FileOperator;
+
+// @public (undocumented)
+export function applyTemplates<T>(options: T): Rule;
+
+// @public (undocumented)
+export function applyToSubtree(path: string, rules: Rule[]): Rule;
+
+// @public (undocumented)
+export function asSource(rule: Rule): Source;
+
+// @public (undocumented)
+export type AsyncFileOperator = (tree: FileEntry) => Observable<FileEntry | null>;
+
+// @public
+abstract class BaseWorkflow implements Workflow {
+    constructor(options: BaseWorkflowOptions);
+    // (undocumented)
+    get context(): Readonly<WorkflowExecutionContext>;
+    // (undocumented)
+    protected _context: WorkflowExecutionContext[];
+    // (undocumented)
+    protected _createSinks(): Sink[];
+    // (undocumented)
+    protected _dryRun: boolean;
+    // (undocumented)
+    get engine(): Engine<{}, {}>;
+    // (undocumented)
+    protected _engine: Engine<{}, {}>;
+    // (undocumented)
+    get engineHost(): EngineHost<{}, {}>;
+    // (undocumented)
+    protected _engineHost: EngineHost<{}, {}>;
+    // (undocumented)
+    execute(options: Partial<WorkflowExecutionContext> & RequiredWorkflowExecutionContext): Observable<void>;
+    // (undocumented)
+    protected _force: boolean;
+    // (undocumented)
+    protected _host: virtualFs.Host;
+    // (undocumented)
+    get lifeCycle(): Observable<LifeCycleEvent>;
+    // (undocumented)
+    protected _lifeCycle: Subject<LifeCycleEvent>;
+    // (undocumented)
+    get registry(): schema.SchemaRegistry;
+    // (undocumented)
+    protected _registry: schema.CoreSchemaRegistry;
+    // (undocumented)
+    get reporter(): Observable<DryRunEvent>;
+    // (undocumented)
+    protected _reporter: Subject<DryRunEvent>;
+}
+
+// @public (undocumented)
+interface BaseWorkflowOptions {
+    // (undocumented)
+    dryRun?: boolean;
+    // (undocumented)
+    engineHost: EngineHost<{}, {}>;
+    // (undocumented)
+    force?: boolean;
+    // (undocumented)
+    host: virtualFs.Host;
+    // (undocumented)
+    registry?: schema.CoreSchemaRegistry;
+}
+
+// @public (undocumented)
+export function branchAndMerge(rule: Rule, strategy?: MergeStrategy): Rule;
+
+// @public (undocumented)
+export function callRule(rule: Rule, input: Tree_2 | Observable<Tree_2>, context: SchematicContext): Observable<Tree_2>;
+
+// @public (undocumented)
+export function callSource(source: Source, context: SchematicContext): Observable<Tree_2>;
+
+// @public
+export function chain(rules: Rule[]): Rule;
+
+// @public (undocumented)
+export class CircularCollectionException extends BaseException {
+    constructor(name: string);
+}
+
+// @public
+export interface Collection<CollectionMetadataT extends object, SchematicMetadataT extends object> {
+    // (undocumented)
+    readonly baseDescriptions?: Array<CollectionDescription<CollectionMetadataT>>;
+    // (undocumented)
+    createSchematic(name: string, allowPrivate?: boolean): Schematic<CollectionMetadataT, SchematicMetadataT>;
+    // (undocumented)
+    readonly description: CollectionDescription<CollectionMetadataT>;
+    // (undocumented)
+    listSchematicNames(): string[];
+}
+
+// @public
+export type CollectionDescription<CollectionMetadataT extends object> = CollectionMetadataT & {
+    readonly name: string;
+    readonly extends?: string[];
+};
+
+// @public (undocumented)
+export class CollectionImpl<CollectionT extends object, SchematicT extends object> implements Collection<CollectionT, SchematicT> {
+    constructor(_description: CollectionDescription<CollectionT>, _engine: SchematicEngine<CollectionT, SchematicT>, baseDescriptions?: CollectionDescription<CollectionT>[] | undefined);
+    // (undocumented)
+    readonly baseDescriptions?: CollectionDescription<CollectionT>[] | undefined;
+    // (undocumented)
+    createSchematic(name: string, allowPrivate?: boolean): Schematic<CollectionT, SchematicT>;
+    // (undocumented)
+    get description(): CollectionDescription<CollectionT>;
+    // (undocumented)
+    listSchematicNames(): string[];
+    // (undocumented)
+    get name(): string;
+}
+
+// @public (undocumented)
+export function composeFileOperators(operators: FileOperator[]): FileOperator;
+
+// @public (undocumented)
+export class ContentHasMutatedException extends BaseException {
+    constructor(path: string);
+}
+
+// @public (undocumented)
+export function contentTemplate<T>(options: T): Rule;
+
+// @public (undocumented)
+export interface CreateFileAction extends ActionBase {
+    // (undocumented)
+    readonly content: Buffer;
+    // (undocumented)
+    readonly kind: 'c';
+}
+
+// @public (undocumented)
+export class DelegateTree implements Tree_2 {
+    constructor(_other: Tree_2);
+    // (undocumented)
+    get actions(): Action[];
+    // (undocumented)
+    apply(action: Action, strategy?: MergeStrategy): void;
+    // (undocumented)
+    beginUpdate(path: string): UpdateRecorder;
+    // (undocumented)
+    branch(): Tree_2;
+    // (undocumented)
+    commitUpdate(record: UpdateRecorder): void;
+    // (undocumented)
+    create(path: string, content: Buffer | string): void;
+    // (undocumented)
+    delete(path: string): void;
+    // (undocumented)
+    exists(path: string): boolean;
+    // (undocumented)
+    get(path: string): FileEntry | null;
+    // (undocumented)
+    getDir(path: string): DirEntry;
+    // (undocumented)
+    merge(other: Tree_2, strategy?: MergeStrategy): void;
+    // (undocumented)
+    protected _other: Tree_2;
+    // (undocumented)
+    overwrite(path: string, content: Buffer | string): void;
+    // (undocumented)
+    read(path: string): Buffer | null;
+    // (undocumented)
+    rename(from: string, to: string): void;
+    // (undocumented)
+    get root(): DirEntry;
+    // (undocumented)
+    visit(visitor: FileVisitor): void;
+}
+
+// @public (undocumented)
+export interface DeleteFileAction extends ActionBase {
+    // (undocumented)
+    readonly kind: 'd';
+}
+
+// @public (undocumented)
+export interface DirEntry {
+    // (undocumented)
+    dir(name: PathFragment): DirEntry;
+    // (undocumented)
+    file(name: PathFragment): FileEntry | null;
+    // (undocumented)
+    readonly parent: DirEntry | null;
+    // (undocumented)
+    readonly path: Path;
+    // (undocumented)
+    readonly subdirs: PathFragment[];
+    // (undocumented)
+    readonly subfiles: PathFragment[];
+    // (undocumented)
+    visit(visitor: FileVisitor): void;
+}
+
+// @public (undocumented)
+export interface DryRunCreateEvent {
+    // (undocumented)
+    content: Buffer;
+    // (undocumented)
+    kind: 'create';
+    // (undocumented)
+    path: string;
+}
+
+// @public (undocumented)
+export interface DryRunDeleteEvent {
+    // (undocumented)
+    kind: 'delete';
+    // (undocumented)
+    path: string;
+}
+
+// @public (undocumented)
+export interface DryRunErrorEvent {
+    // (undocumented)
+    description: 'alreadyExist' | 'doesNotExist';
+    // (undocumented)
+    kind: 'error';
+    // (undocumented)
+    path: string;
+}
+
+// @public (undocumented)
+export type DryRunEvent = DryRunErrorEvent | DryRunDeleteEvent | DryRunCreateEvent | DryRunUpdateEvent | DryRunRenameEvent;
+
+// @public (undocumented)
+export interface DryRunRenameEvent {
+    // (undocumented)
+    kind: 'rename';
+    // (undocumented)
+    path: string;
+    // (undocumented)
+    to: string;
+}
+
+// @public (undocumented)
+export class DryRunSink extends HostSink {
+    constructor(host: virtualFs.Host, force?: boolean);
+    // (undocumented)
+    _done(): Observable<void>;
+    // (undocumented)
+    protected _fileAlreadyExistException(path: string): void;
+    // (undocumented)
+    protected _fileAlreadyExistExceptionSet: Set<string>;
+    // (undocumented)
+    protected _fileDoesNotExistException(path: string): void;
+    // (undocumented)
+    protected _fileDoesNotExistExceptionSet: Set<string>;
+    // (undocumented)
+    readonly reporter: Observable<DryRunEvent>;
+    // (undocumented)
+    protected _subject: Subject<DryRunEvent>;
+}
+
+// @public (undocumented)
+export interface DryRunUpdateEvent {
+    // (undocumented)
+    content: Buffer;
+    // (undocumented)
+    kind: 'update';
+    // (undocumented)
+    path: string;
+}
+
+// @public
+export function empty(): Source;
+
+// @public (undocumented)
+export class EmptyTree extends HostTree {
+    constructor();
+}
+
+// @public
+export interface Engine<CollectionMetadataT extends object, SchematicMetadataT extends object> {
+    // (undocumented)
+    createCollection(name: string, requester?: Collection<CollectionMetadataT, SchematicMetadataT>): Collection<CollectionMetadataT, SchematicMetadataT>;
+    // (undocumented)
+    createContext(schematic: Schematic<CollectionMetadataT, SchematicMetadataT>, parent?: Partial<TypedSchematicContext<CollectionMetadataT, SchematicMetadataT>>, executionOptions?: Partial<ExecutionOptions>): TypedSchematicContext<CollectionMetadataT, SchematicMetadataT>;
+    // (undocumented)
+    createSchematic(name: string, collection: Collection<CollectionMetadataT, SchematicMetadataT>): Schematic<CollectionMetadataT, SchematicMetadataT>;
+    // (undocumented)
+    createSourceFromUrl(url: Url, context: TypedSchematicContext<CollectionMetadataT, SchematicMetadataT>): Source;
+    // (undocumented)
+    readonly defaultMergeStrategy: MergeStrategy;
+    // (undocumented)
+    executePostTasks(): Observable<void>;
+    // (undocumented)
+    transformOptions<OptionT extends object, ResultT extends object>(schematic: Schematic<CollectionMetadataT, SchematicMetadataT>, options: OptionT, context?: TypedSchematicContext<CollectionMetadataT, SchematicMetadataT>): Observable<ResultT>;
+    // (undocumented)
+    readonly workflow: Workflow | null;
+}
+
+// @public
+export interface EngineHost<CollectionMetadataT extends object, SchematicMetadataT extends object> {
+    // (undocumented)
+    createCollectionDescription(name: string, requester?: CollectionDescription<CollectionMetadataT>): CollectionDescription<CollectionMetadataT>;
+    // (undocumented)
+    createSchematicDescription(name: string, collection: CollectionDescription<CollectionMetadataT>): SchematicDescription<CollectionMetadataT, SchematicMetadataT> | null;
+    // (undocumented)
+    createSourceFromUrl(url: Url, context: TypedSchematicContext<CollectionMetadataT, SchematicMetadataT>): Source | null;
+    // (undocumented)
+    createTaskExecutor(name: string): Observable<TaskExecutor>;
+    // (undocumented)
+    readonly defaultMergeStrategy?: MergeStrategy;
+    // (undocumented)
+    getSchematicRuleFactory<OptionT extends object>(schematic: SchematicDescription<CollectionMetadataT, SchematicMetadataT>, collection: CollectionDescription<CollectionMetadataT>): RuleFactory<OptionT>;
+    // (undocumented)
+    hasTaskExecutor(name: string): boolean;
+    // (undocumented)
+    listSchematicNames(collection: CollectionDescription<CollectionMetadataT>): string[];
+    // (undocumented)
+    transformContext(context: TypedSchematicContext<CollectionMetadataT, SchematicMetadataT>): TypedSchematicContext<CollectionMetadataT, SchematicMetadataT> | void;
+    // (undocumented)
+    transformOptions<OptionT extends object, ResultT extends object>(schematic: SchematicDescription<CollectionMetadataT, SchematicMetadataT>, options: OptionT, context?: TypedSchematicContext<CollectionMetadataT, SchematicMetadataT>): Observable<ResultT>;
+}
+
+// @public (undocumented)
+export interface ExecutionOptions {
+    // (undocumented)
+    interactive: boolean;
+    // (undocumented)
+    scope: string;
+}
+
+// @public
+export function externalSchematic<OptionT extends object>(collectionName: string, schematicName: string, options: OptionT, executionOptions?: Partial<ExecutionOptions>): Rule;
+
+// @public (undocumented)
+export class FileAlreadyExistException extends BaseException {
+    constructor(path: string);
+}
+
+// @public (undocumented)
+export class FileDoesNotExistException extends BaseException {
+    constructor(path: string);
+}
+
+// @public (undocumented)
+export interface FileEntry {
+    // (undocumented)
+    readonly content: Buffer;
+    // (undocumented)
+    readonly path: Path;
+}
+
+// @public
+export type FileOperator = (entry: FileEntry) => FileEntry | null;
+
+// @public (undocumented)
+export interface FilePredicate<T> {
+    // (undocumented)
+    (path: Path, entry?: Readonly<FileEntry> | null): T;
+}
+
+// @public (undocumented)
+export type FileVisitor = FilePredicate<void>;
+
+// @public (undocumented)
+export const FileVisitorCancelToken: symbol;
+
+// @public (undocumented)
+export function filter(predicate: FilePredicate<boolean>): Rule;
+
+// @public (undocumented)
+export class FilterHostTree extends HostTree {
+    constructor(tree: HostTree, filter?: FilePredicate<boolean>);
+}
+
+// @public (undocumented)
+export function forEach(operator: FileOperator): Rule;
+
+declare namespace formats {
+    export {
+        htmlSelectorFormat,
+        pathFormat,
+        standardFormats
+    }
+}
+export { formats }
+
+// @public (undocumented)
+export class HostCreateTree extends HostTree {
+    constructor(host: virtualFs.ReadonlyHost);
+}
+
+// @public (undocumented)
+export class HostDirEntry implements DirEntry {
+    constructor(parent: DirEntry | null, path: Path, _host: virtualFs.SyncDelegateHost, _tree: Tree_2);
+    // (undocumented)
+    dir(name: PathFragment): DirEntry;
+    // (undocumented)
+    file(name: PathFragment): FileEntry | null;
+    // (undocumented)
+    protected _host: virtualFs.SyncDelegateHost;
+    // (undocumented)
+    readonly parent: DirEntry | null;
+    // (undocumented)
+    readonly path: Path;
+    // (undocumented)
+    get subdirs(): PathFragment[];
+    // (undocumented)
+    get subfiles(): PathFragment[];
+    // (undocumented)
+    protected _tree: Tree_2;
+    // (undocumented)
+    visit(visitor: FileVisitor): void;
+}
+
+// @public (undocumented)
+export class HostSink extends SimpleSinkBase {
+    constructor(_host: virtualFs.Host, _force?: boolean);
+    // (undocumented)
+    protected _createFile(path: Path, content: Buffer): Observable<void>;
+    // (undocumented)
+    protected _deleteFile(path: Path): Observable<void>;
+    // (undocumented)
+    _done(): Observable<void>;
+    // (undocumented)
+    protected _filesToCreate: Map<Path, UpdateBuffer>;
+    // (undocumented)
+    protected _filesToDelete: Set<Path>;
+    // (undocumented)
+    protected _filesToRename: Set<[Path, Path]>;
+    // (undocumented)
+    protected _filesToUpdate: Map<Path, UpdateBuffer>;
+    // (undocumented)
+    protected _force: boolean;
+    // (undocumented)
+    protected _host: virtualFs.Host;
+    // (undocumented)
+    protected _overwriteFile(path: Path, content: Buffer): Observable<void>;
+    // (undocumented)
+    protected _renameFile(from: Path, to: Path): Observable<void>;
+    // (undocumented)
+    protected _validateCreateAction(action: CreateFileAction): Observable<void>;
+    // (undocumented)
+    protected _validateFileExists(p: Path): Observable<boolean>;
+}
+
+// @public (undocumented)
+export class HostTree implements Tree_2 {
+    constructor(_backend?: virtualFs.ReadonlyHost<{}>);
+    // (undocumented)
+    get actions(): Action[];
+    // (undocumented)
+    apply(action: Action, strategy?: MergeStrategy): void;
+    // (undocumented)
+    protected _backend: virtualFs.ReadonlyHost<{}>;
+    // (undocumented)
+    beginUpdate(path: string): UpdateRecorder;
+    // (undocumented)
+    branch(): Tree_2;
+    // (undocumented)
+    commitUpdate(record: UpdateRecorder): void;
+    // (undocumented)
+    create(path: string, content: Buffer | string): void;
+    // (undocumented)
+    delete(path: string): void;
+    // (undocumented)
+    exists(path: string): boolean;
+    // (undocumented)
+    get(path: string): FileEntry | null;
+    // (undocumented)
+    getDir(path: string): DirEntry;
+    // (undocumented)
+    static isHostTree(tree: Tree_2): tree is HostTree;
+    // (undocumented)
+    merge(other: Tree_2, strategy?: MergeStrategy): void;
+    // (undocumented)
+    protected _normalizePath(path: string): Path;
+    // (undocumented)
+    overwrite(path: string, content: Buffer | string): void;
+    // (undocumented)
+    read(path: string): Buffer | null;
+    // (undocumented)
+    rename(from: string, to: string): void;
+    // (undocumented)
+    get root(): DirEntry;
+    // (undocumented)
+    visit(visitor: FileVisitor): void;
+    // (undocumented)
+    protected _willCreate(path: Path): boolean;
+    // (undocumented)
+    protected _willDelete(path: Path): boolean;
+    // (undocumented)
+    protected _willOverwrite(path: Path): boolean;
+    // (undocumented)
+    protected _willRename(path: Path): boolean;
+}
+
+// @public (undocumented)
+const htmlSelectorFormat: schema.SchemaFormat;
+
+// @public (undocumented)
+export class InvalidPipeException extends BaseException {
+    constructor(name: string);
+}
+
+// @public
+export class InvalidRuleResultException extends BaseException {
+    constructor(value?: {});
+}
+
+// @public (undocumented)
+export class InvalidSchematicsNameException extends BaseException {
+    constructor(name: string);
+}
+
+// @public (undocumented)
+export class InvalidSourceResultException extends BaseException {
+    constructor(value?: {});
+}
+
+// @public (undocumented)
+export class InvalidUpdateRecordException extends BaseException {
+    constructor();
+}
+
+// @public @deprecated (undocumented)
+export function isAction(action: any): action is Action;
+
+// @public (undocumented)
+export function isContentAction(action: Action): action is CreateFileAction | OverwriteFileAction;
+
+// @public (undocumented)
+interface LifeCycleEvent {
+    // (undocumented)
+    kind: 'start' | 'end' | 'workflow-start' | 'workflow-end' | 'post-tasks-start' | 'post-tasks-end';
+}
+
+// @public (undocumented)
+export class MergeConflictException extends BaseException {
+    constructor(path: string);
+}
+
+// @public (undocumented)
+export enum MergeStrategy {
+    // (undocumented)
+    AllowCreationConflict = 4,
+    // (undocumented)
+    AllowDeleteConflict = 8,
+    // (undocumented)
+    AllowOverwriteConflict = 2,
+    // (undocumented)
+    ContentOnly = 2,
+    // (undocumented)
+    Default = 0,
+    // (undocumented)
+    Error = 1,
+    // (undocumented)
+    Overwrite = 14
+}
+
+// @public
+export function mergeWith(source: Source, strategy?: MergeStrategy): Rule;
+
+// @public (undocumented)
+export function move(from: string, to?: string): Rule;
+
+// @public (undocumented)
+export function noop(): Rule;
+
+// @public (undocumented)
+export class OptionIsNotDefinedException extends BaseException {
+    constructor(name: string);
+}
+
+// @public (undocumented)
+export interface OverwriteFileAction extends ActionBase {
+    // (undocumented)
+    readonly content: Buffer;
+    // (undocumented)
+    readonly kind: 'o';
+}
+
+// @public (undocumented)
+export function partitionApplyMerge(predicate: FilePredicate<boolean>, ruleYes: Rule, ruleNo?: Rule): Rule;
+
+// @public (undocumented)
+const pathFormat: schema.SchemaFormat;
+
+// @public (undocumented)
+export function pathTemplate<T extends PathTemplateData>(options: T): Rule;
+
+// @public (undocumented)
+export type PathTemplateData = {
+    [key: string]: PathTemplateValue | PathTemplateData | PathTemplatePipeFunction;
+};
+
+// @public (undocumented)
+export interface PathTemplateOptions {
+    // (undocumented)
+    interpolationEnd: string;
+    // (undocumented)
+    interpolationStart: string;
+    // (undocumented)
+    pipeSeparator?: string;
+}
+
+// @public (undocumented)
+export type PathTemplatePipeFunction = (x: string) => PathTemplateValue;
+
+// @public (undocumented)
+export type PathTemplateValue = boolean | string | number | undefined;
+
+// @public (undocumented)
+export class PrivateSchematicException extends BaseException {
+    constructor(name: string, collection: CollectionDescription<{}>);
+}
+
+// @public (undocumented)
+export interface RandomOptions {
+    // (undocumented)
+    multi?: boolean | number;
+    // (undocumented)
+    multiFiles?: boolean | number;
+    // (undocumented)
+    root?: string;
+}
+
+// @public (undocumented)
+export interface RenameFileAction extends ActionBase {
+    // (undocumented)
+    readonly kind: 'r';
+    // (undocumented)
+    readonly to: Path;
+}
+
+// @public
+export function renameTemplateFiles(): Rule;
+
+// @public (undocumented)
+interface RequiredWorkflowExecutionContext {
+    // (undocumented)
+    collection: string;
+    // (undocumented)
+    options: object;
+    // (undocumented)
+    schematic: string;
+}
+
+// @public (undocumented)
+export type Rule = (tree: Tree_2, context: SchematicContext) => Tree_2 | Observable<Tree_2> | Rule | Promise<void | Rule> | void;
+
+// @public
+export type RuleFactory<T extends object> = (options: T) => Rule;
+
+// @public
+export interface Schematic<CollectionMetadataT extends object, SchematicMetadataT extends object> {
+    // (undocumented)
+    call<OptionT extends object>(options: OptionT, host: Observable<Tree_2>, parentContext?: Partial<TypedSchematicContext<CollectionMetadataT, SchematicMetadataT>>, executionOptions?: Partial<ExecutionOptions>): Observable<Tree_2>;
+    // (undocumented)
+    readonly collection: Collection<CollectionMetadataT, SchematicMetadataT>;
+    // (undocumented)
+    readonly description: SchematicDescription<CollectionMetadataT, SchematicMetadataT>;
+}
+
+// @public
+export function schematic<OptionT extends object>(schematicName: string, options: OptionT, executionOptions?: Partial<ExecutionOptions>): Rule;
+
+// @public
+export type SchematicContext = TypedSchematicContext<{}, {}>;
+
+// @public
+export type SchematicDescription<CollectionMetadataT extends object, SchematicMetadataT extends object> = SchematicMetadataT & {
+    readonly collection: CollectionDescription<CollectionMetadataT>;
+    readonly name: string;
+    readonly private?: boolean;
+    readonly hidden?: boolean;
+};
+
+// @public (undocumented)
+export class SchematicEngine<CollectionT extends object, SchematicT extends object> implements Engine<CollectionT, SchematicT> {
+    constructor(_host: EngineHost<CollectionT, SchematicT>, _workflow?: Workflow | undefined);
+    // (undocumented)
+    createCollection(name: string, requester?: Collection<CollectionT, SchematicT>): Collection<CollectionT, SchematicT>;
+    // (undocumented)
+    createContext(schematic: Schematic<CollectionT, SchematicT>, parent?: Partial<TypedSchematicContext<CollectionT, SchematicT>>, executionOptions?: Partial<ExecutionOptions>): TypedSchematicContext<CollectionT, SchematicT>;
+    // (undocumented)
+    createSchematic(name: string, collection: Collection<CollectionT, SchematicT>, allowPrivate?: boolean): Schematic<CollectionT, SchematicT>;
+    // (undocumented)
+    createSourceFromUrl(url: Url, context: TypedSchematicContext<CollectionT, SchematicT>): Source;
+    // (undocumented)
+    get defaultMergeStrategy(): MergeStrategy;
+    // (undocumented)
+    executePostTasks(): Observable<void>;
+    // (undocumented)
+    listSchematicNames(collection: Collection<CollectionT, SchematicT>): string[];
+    // (undocumented)
+    transformOptions<OptionT extends object, ResultT extends object>(schematic: Schematic<CollectionT, SchematicT>, options: OptionT, context?: TypedSchematicContext<CollectionT, SchematicT>): Observable<ResultT>;
+    // (undocumented)
+    get workflow(): Workflow | null;
+    // (undocumented)
+    protected _workflow?: Workflow | undefined;
+}
+
+// @public (undocumented)
+export class SchematicEngineConflictingException extends BaseException {
+    constructor();
+}
+
+// @public (undocumented)
+export class SchematicImpl<CollectionT extends object, SchematicT extends object> implements Schematic<CollectionT, SchematicT> {
+    constructor(_description: SchematicDescription<CollectionT, SchematicT>, _factory: RuleFactory<{}>, _collection: Collection<CollectionT, SchematicT>, _engine: Engine<CollectionT, SchematicT>);
+    // (undocumented)
+    call<OptionT extends object>(options: OptionT, host: Observable<Tree_2>, parentContext?: Partial<TypedSchematicContext<CollectionT, SchematicT>>, executionOptions?: Partial<ExecutionOptions>): Observable<Tree_2>;
+    // (undocumented)
+    get collection(): Collection<CollectionT, SchematicT>;
+    // (undocumented)
+    get description(): SchematicDescription<CollectionT, SchematicT>;
+}
+
+// @public (undocumented)
+export class SchematicsException extends BaseException {
+}
+
+// @public (undocumented)
+export abstract class SimpleSinkBase implements Sink {
+    // (undocumented)
+    commit(tree: Tree_2): Observable<void>;
+    // (undocumented)
+    commitSingleAction(action: Action): Observable<void>;
+    // (undocumented)
+    protected abstract _createFile(path: string, content: Buffer): Observable<void>;
+    // (undocumented)
+    protected abstract _deleteFile(path: string): Observable<void>;
+    // (undocumented)
+    protected abstract _done(): Observable<void>;
+    // (undocumented)
+    protected _fileAlreadyExistException(path: string): void;
+    // (undocumented)
+    protected _fileDoesNotExistException(path: string): void;
+    // (undocumented)
+    protected abstract _overwriteFile(path: string, content: Buffer): Observable<void>;
+    // (undocumented)
+    postCommit: () => void | Observable<void>;
+    // (undocumented)
+    postCommitAction: (action: Action) => void | Observable<void>;
+    // (undocumented)
+    preCommit: () => void | Observable<void>;
+    // (undocumented)
+    preCommitAction: (action: Action) => void | Action | PromiseLike<Action> | Observable<Action>;
+    // (undocumented)
+    protected abstract _renameFile(path: string, to: string): Observable<void>;
+    // (undocumented)
+    protected _validateCreateAction(action: CreateFileAction): Observable<void>;
+    // (undocumented)
+    protected _validateDeleteAction(action: DeleteFileAction): Observable<void>;
+    // (undocumented)
+    protected abstract _validateFileExists(p: string): Observable<boolean>;
+    // (undocumented)
+    protected _validateOverwriteAction(action: OverwriteFileAction): Observable<void>;
+    // (undocumented)
+    protected _validateRenameAction(action: RenameFileAction): Observable<void>;
+    // (undocumented)
+    validateSingleAction(action: Action): Observable<void>;
+}
+
+// @public (undocumented)
+export interface Sink {
+    // (undocumented)
+    commit(tree: Tree_2): Observable<void>;
+}
+
+// @public
+export type Source = (context: SchematicContext) => Tree_2 | Observable<Tree_2>;
+
+// @public
+export function source(tree: Tree_2): Source;
+
+// @public (undocumented)
+const standardFormats: schema.SchemaFormat[];
+
+// @public (undocumented)
+export interface TaskConfiguration<T = {}> {
+    // (undocumented)
+    dependencies?: Array<TaskId>;
+    // (undocumented)
+    name: string;
+    // (undocumented)
+    options?: T;
+}
+
+// @public (undocumented)
+export interface TaskConfigurationGenerator<T = {}> {
+    // (undocumented)
+    toConfiguration(): TaskConfiguration<T>;
+}
+
+// @public (undocumented)
+export type TaskExecutor<T = {}> = (options: T | undefined, context: SchematicContext) => Promise<void> | Observable<void>;
+
+// @public (undocumented)
+export interface TaskExecutorFactory<T> {
+    // (undocumented)
+    create(options?: T): Promise<TaskExecutor> | Observable<TaskExecutor>;
+    // (undocumented)
+    readonly name: string;
+}
+
+// @public (undocumented)
+export interface TaskId {
+    // (undocumented)
+    readonly id: number;
+}
+
+// @public (undocumented)
+export interface TaskInfo {
+    // (undocumented)
+    readonly configuration: TaskConfiguration;
+    // (undocumented)
+    readonly context: SchematicContext;
+    // (undocumented)
+    readonly id: number;
+    // (undocumented)
+    readonly priority: number;
+}
+
+// @public (undocumented)
+export class TaskScheduler {
+    constructor(_context: SchematicContext);
+    // (undocumented)
+    finalize(): ReadonlyArray<TaskInfo>;
+    // (undocumented)
+    schedule<T>(taskConfiguration: TaskConfiguration<T>): TaskId;
+}
+
+// @public (undocumented)
+export function template<T>(options: T): Rule;
+
+// @public (undocumented)
+export const TEMPLATE_FILENAME_RE: RegExp;
+
+// @public (undocumented)
+export type Tree = Tree_2;
+
+// @public (undocumented)
+export const Tree: TreeConstructor;
+
+// @public (undocumented)
+export interface TreeConstructor {
+    // (undocumented)
+    branch(tree: Tree_2): Tree_2;
+    // (undocumented)
+    empty(): Tree_2;
+    // (undocumented)
+    merge(tree: Tree_2, other: Tree_2, strategy?: MergeStrategy): Tree_2;
+    // (undocumented)
+    optimize(tree: Tree_2): Tree_2;
+    // (undocumented)
+    partition(tree: Tree_2, predicate: FilePredicate<boolean>): [Tree_2, Tree_2];
+}
+
+// @public (undocumented)
+export const TreeSymbol: symbol;
+
+// @public
+export interface TypedSchematicContext<CollectionMetadataT extends object, SchematicMetadataT extends object> {
+    // (undocumented)
+    addTask<T>(task: TaskConfigurationGenerator<T>, dependencies?: Array<TaskId>): TaskId;
+    // @deprecated (undocumented)
+    readonly analytics?: analytics.Analytics;
+    // (undocumented)
+    readonly debug: boolean;
+    // (undocumented)
+    readonly engine: Engine<CollectionMetadataT, SchematicMetadataT>;
+    // (undocumented)
+    readonly interactive: boolean;
+    // (undocumented)
+    readonly logger: logging.LoggerApi;
+    // (undocumented)
+    readonly schematic: Schematic<CollectionMetadataT, SchematicMetadataT>;
+    // (undocumented)
+    readonly strategy: MergeStrategy;
+}
+
+// @public (undocumented)
+export class UnimplementedException extends BaseException {
+    constructor();
+}
+
+// @public (undocumented)
+export class UnknownActionException extends BaseException {
+    constructor(action: Action);
+}
+
+// @public (undocumented)
+export class UnknownCollectionException extends BaseException {
+    constructor(name: string);
+}
+
+// @public (undocumented)
+export class UnknownPipeException extends BaseException {
+    constructor(name: string);
+}
+
+// @public (undocumented)
+export class UnknownSchematicException extends BaseException {
+    constructor(name: string, collection: CollectionDescription<{}>);
+}
+
+// @public (undocumented)
+export class UnknownTaskDependencyException extends BaseException {
+    constructor(id: TaskId);
+}
+
+// @public (undocumented)
+export class UnknownUrlSourceProtocol extends BaseException {
+    constructor(url: string);
+}
+
+// @public (undocumented)
+export class UnregisteredTaskException extends BaseException {
+    constructor(name: string, schematic?: SchematicDescription<{}, {}>);
+}
+
+// @public (undocumented)
+export class UnsuccessfulWorkflowExecution extends BaseException {
+    constructor();
+}
+
+// @public (undocumented)
+export interface UpdateRecorder {
+    // (undocumented)
+    insertLeft(index: number, content: Buffer | string): UpdateRecorder;
+    // (undocumented)
+    insertRight(index: number, content: Buffer | string): UpdateRecorder;
+    // (undocumented)
+    remove(index: number, length: number): UpdateRecorder;
+}
+
+// @public (undocumented)
+export function url(urlString: string): Source;
+
+// @public (undocumented)
+export function when(predicate: FilePredicate<boolean>, operator: FileOperator): FileOperator;
+
+// @public (undocumented)
+interface Workflow {
+    // (undocumented)
+    readonly context: Readonly<WorkflowExecutionContext>;
+    // (undocumented)
+    execute(options: Partial<WorkflowExecutionContext> & RequiredWorkflowExecutionContext): Observable<void>;
+}
+
+declare namespace workflow {
+    export {
+        BaseWorkflowOptions,
+        BaseWorkflow,
+        RequiredWorkflowExecutionContext,
+        WorkflowExecutionContext,
+        LifeCycleEvent,
+        Workflow
+    }
+}
+export { workflow }
+
+// @public (undocumented)
+interface WorkflowExecutionContext extends RequiredWorkflowExecutionContext {
+    // (undocumented)
+    allowPrivate?: boolean;
+    // (undocumented)
+    debug: boolean;
+    // (undocumented)
+    logger: logging.Logger;
+    // (undocumented)
+    parentContext?: Readonly<WorkflowExecutionContext>;
+}
+
+// (No @packageDocumentation comment for this package)
+
+```
diff --git a/etc/api/angular_devkit/schematics/tasks/index.d.ts b/goldens/public-api/angular_devkit/schematics/tasks/index.md
similarity index 51%
rename from etc/api/angular_devkit/schematics/tasks/index.d.ts
rename to goldens/public-api/angular_devkit/schematics/tasks/index.md
index 1ce44e1880fd..4875a046ae74 100644
--- a/etc/api/angular_devkit/schematics/tasks/index.d.ts
+++ b/goldens/public-api/angular_devkit/schematics/tasks/index.md
@@ -1,43 +1,80 @@
-export declare class NodePackageInstallTask implements TaskConfigurationGenerator<NodePackageTaskOptions> {
+## API Report File for "@angular-devkit/schematics_tasks"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+
+import { JsonObject } from '@angular-devkit/core';
+
+// @public (undocumented)
+export class NodePackageInstallTask implements TaskConfigurationGenerator<NodePackageTaskOptions> {
+    constructor(workingDirectory?: string);
+    constructor(options: NodePackageInstallTaskOptions);
+    // (undocumented)
     hideOutput: boolean;
+    // (undocumented)
     packageManager?: string;
+    // (undocumented)
     packageName?: string;
+    // (undocumented)
     quiet: boolean;
-    workingDirectory?: string;
-    constructor(options: NodePackageInstallTaskOptions);
-    constructor(workingDirectory?: string);
+    // (undocumented)
     toConfiguration(): TaskConfiguration<NodePackageTaskOptions>;
+    // (undocumented)
+    workingDirectory?: string;
 }
 
-export declare class NodePackageLinkTask implements TaskConfigurationGenerator<NodePackageTaskOptions> {
+// @public (undocumented)
+export class NodePackageLinkTask implements TaskConfigurationGenerator<NodePackageTaskOptions> {
+    constructor(packageName?: string | undefined, workingDirectory?: string | undefined);
+    // (undocumented)
     packageName?: string | undefined;
+    // (undocumented)
     quiet: boolean;
-    workingDirectory?: string | undefined;
-    constructor(packageName?: string | undefined, workingDirectory?: string | undefined);
+    // (undocumented)
     toConfiguration(): TaskConfiguration<NodePackageTaskOptions>;
+    // (undocumented)
+    workingDirectory?: string | undefined;
 }
 
-export declare class RepositoryInitializerTask implements TaskConfigurationGenerator<RepositoryInitializerTaskOptions> {
-    commitOptions?: CommitOptions | undefined;
-    workingDirectory?: string | undefined;
+// @public (undocumented)
+export class RepositoryInitializerTask implements TaskConfigurationGenerator<RepositoryInitializerTaskOptions> {
     constructor(workingDirectory?: string | undefined, commitOptions?: CommitOptions | undefined);
+    // (undocumented)
+    commitOptions?: CommitOptions | undefined;
+    // (undocumented)
     toConfiguration(): TaskConfiguration<RepositoryInitializerTaskOptions>;
+    // (undocumented)
+    workingDirectory?: string | undefined;
 }
 
-export declare class RunSchematicTask<T> implements TaskConfigurationGenerator<RunSchematicTaskOptions<T>> {
+// @public (undocumented)
+export class RunSchematicTask<T> implements TaskConfigurationGenerator<RunSchematicTaskOptions<T>> {
+    constructor(s: string, o: T);
+    constructor(c: string, s: string, o: T);
+    // (undocumented)
     protected _collection: string | null;
+    // (undocumented)
     protected _options: T;
+    // (undocumented)
     protected _schematic: string;
-    constructor(c: string, s: string, o: T);
-    constructor(s: string, o: T);
+    // (undocumented)
     toConfiguration(): TaskConfiguration<RunSchematicTaskOptions<T>>;
 }
 
-export declare class TslintFixTask implements TaskConfigurationGenerator<TslintFixTaskOptions> {
-    protected _configOrPath: null | string | JsonObject;
-    protected _options: TslintFixTaskOptionsBase;
+// @public @deprecated (undocumented)
+export class TslintFixTask implements TaskConfigurationGenerator<TslintFixTaskOptions> {
     constructor(config: JsonObject, options: TslintFixTaskOptionsBase);
     constructor(options: TslintFixTaskOptionsBase);
     constructor(path: string, options: TslintFixTaskOptionsBase);
+    // (undocumented)
+    protected _configOrPath: null | string | JsonObject;
+    // (undocumented)
+    protected _options: TslintFixTaskOptionsBase;
+    // (undocumented)
     toConfiguration(): TaskConfiguration<TslintFixTaskOptions>;
 }
+
+// (No @packageDocumentation comment for this package)
+
+```
diff --git a/goldens/public-api/angular_devkit/schematics/testing/index.md b/goldens/public-api/angular_devkit/schematics/testing/index.md
new file mode 100644
index 000000000000..48a4f5a7bb4f
--- /dev/null
+++ b/goldens/public-api/angular_devkit/schematics/testing/index.md
@@ -0,0 +1,43 @@
+## API Report File for "@angular-devkit/schematics_testing"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+
+import { analytics } from '@angular-devkit/core';
+import { logging } from '@angular-devkit/core';
+import { Observable } from 'rxjs';
+import { Path } from '@angular-devkit/core';
+import { PathFragment } from '@angular-devkit/core';
+import { Url } from 'url';
+
+// @public (undocumented)
+export class SchematicTestRunner {
+    constructor(_collectionName: string, collectionPath: string);
+    // (undocumented)
+    callRule(rule: Rule, tree: Tree_2, parentContext?: Partial<SchematicContext>): Observable<Tree_2>;
+    // (undocumented)
+    get engine(): SchematicEngine<{}, {}>;
+    // (undocumented)
+    get logger(): logging.Logger;
+    // (undocumented)
+    registerCollection(collectionName: string, collectionPath: string): void;
+    // (undocumented)
+    runExternalSchematicAsync<SchematicSchemaT>(collectionName: string, schematicName: string, opts?: SchematicSchemaT, tree?: Tree_2): Observable<UnitTestTree>;
+    // (undocumented)
+    runSchematicAsync<SchematicSchemaT>(schematicName: string, opts?: SchematicSchemaT, tree?: Tree_2): Observable<UnitTestTree>;
+    // (undocumented)
+    get tasks(): TaskConfiguration[];
+}
+
+// @public (undocumented)
+export class UnitTestTree extends DelegateTree {
+    // (undocumented)
+    get files(): string[];
+    // (undocumented)
+    readContent(path: string): string;
+}
+
+// (No @packageDocumentation comment for this package)
+
+```
diff --git a/etc/api/angular_devkit/schematics/tools/index.d.ts b/goldens/public-api/angular_devkit/schematics/tools/index.md
similarity index 50%
rename from etc/api/angular_devkit/schematics/tools/index.d.ts
rename to goldens/public-api/angular_devkit/schematics/tools/index.md
index 3573352ab41e..325fb9680214 100644
--- a/etc/api/angular_devkit/schematics/tools/index.d.ts
+++ b/goldens/public-api/angular_devkit/schematics/tools/index.md
@@ -1,165 +1,282 @@
-export declare class CollectionCannotBeResolvedException extends BaseException {
+## API Report File for "@angular-devkit/schematics_tools"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+
+/// <reference types="node" />
+
+import { analytics } from '@angular-devkit/core';
+import { BaseException } from '@angular-devkit/core';
+import { InvalidJsonCharacterException } from '@angular-devkit/core';
+import { JsonObject } from '@angular-devkit/core';
+import { logging } from '@angular-devkit/core';
+import { Observable } from 'rxjs';
+import { Path } from '@angular-devkit/core';
+import { PathFragment } from '@angular-devkit/core';
+import { schema } from '@angular-devkit/core';
+import { UnexpectedEndOfInputException } from '@angular-devkit/core';
+import { Url } from 'url';
+import { virtualFs } from '@angular-devkit/core';
+import { workflow } from '@angular-devkit/schematics';
+
+// @public (undocumented)
+export class CollectionCannotBeResolvedException extends BaseException {
     constructor(name: string);
 }
 
-export declare class CollectionMissingFieldsException extends BaseException {
+// @public (undocumented)
+export class CollectionMissingFieldsException extends BaseException {
     constructor(name: string);
 }
 
-export declare class CollectionMissingSchematicsMapException extends BaseException {
+// @public (undocumented)
+export class CollectionMissingSchematicsMapException extends BaseException {
     constructor(name: string);
 }
 
-export declare type ContextTransform = (context: FileSystemSchematicContext) => FileSystemSchematicContext;
+// @public (undocumented)
+export type ContextTransform = (context: FileSystemSchematicContext) => FileSystemSchematicContext;
 
-export declare class ExportStringRef<T> {
+// @public
+export class ExportStringRef<T> {
+    constructor(ref: string, parentPath?: string, inner?: boolean);
+    // (undocumented)
     get module(): string;
+    // (undocumented)
     get path(): string;
+    // (undocumented)
     get ref(): T | undefined;
-    constructor(ref: string, parentPath?: string, inner?: boolean);
 }
 
-export declare class FactoryCannotBeResolvedException extends BaseException {
+// @public (undocumented)
+export class FactoryCannotBeResolvedException extends BaseException {
     constructor(name: string);
 }
 
-export declare type FileSystemCollection = Collection<FileSystemCollectionDescription, FileSystemSchematicDescription>;
+// @public (undocumented)
+export type FileSystemCollection = Collection<FileSystemCollectionDescription, FileSystemSchematicDescription>;
 
-export declare type FileSystemCollectionDesc = CollectionDescription<FileSystemCollectionDescription>;
+// @public (undocumented)
+export type FileSystemCollectionDesc = CollectionDescription<FileSystemCollectionDescription>;
 
+// @public (undocumented)
 export interface FileSystemCollectionDescription {
+    // (undocumented)
     readonly name: string;
+    // (undocumented)
     readonly path: string;
+    // (undocumented)
     readonly schematics: {
         [name: string]: FileSystemSchematicDesc;
     };
+    // (undocumented)
     readonly version?: string;
 }
 
-export declare type FileSystemEngine = Engine<FileSystemCollectionDescription, FileSystemSchematicDescription>;
+// @public
+export type FileSystemEngine = Engine<FileSystemCollectionDescription, FileSystemSchematicDescription>;
 
-export declare class FileSystemEngineHost extends FileSystemEngineHostBase {
-    protected _root: string;
+// @public
+export class FileSystemEngineHost extends FileSystemEngineHostBase {
     constructor(_root: string);
+    // (undocumented)
+    createTaskExecutor(name: string): Observable<TaskExecutor>;
+    // (undocumented)
+    hasTaskExecutor(name: string): boolean;
+    // (undocumented)
     protected _resolveCollectionPath(name: string): string;
+    // (undocumented)
     protected _resolveReferenceString(refString: string, parentPath: string): {
         ref: RuleFactory<{}>;
         path: string;
     } | null;
+    // (undocumented)
+    protected _root: string;
+    // (undocumented)
     protected _transformCollectionDescription(name: string, desc: Partial<FileSystemCollectionDesc>): FileSystemCollectionDesc;
+    // (undocumented)
     protected _transformSchematicDescription(name: string, _collection: FileSystemCollectionDesc, desc: Partial<FileSystemSchematicDesc>): FileSystemSchematicDesc;
-    createTaskExecutor(name: string): Observable<TaskExecutor>;
-    hasTaskExecutor(name: string): boolean;
 }
 
-export declare abstract class FileSystemEngineHostBase implements FileSystemEngineHost {
-    protected abstract _resolveCollectionPath(name: string, requester?: string): string;
-    protected abstract _resolveReferenceString(name: string, parentPath: string): {
-        ref: RuleFactory<{}>;
-        path: string;
-    } | null;
-    protected abstract _transformCollectionDescription(name: string, desc: Partial<FileSystemCollectionDesc>): FileSystemCollectionDesc;
-    protected abstract _transformSchematicDescription(name: string, collection: FileSystemCollectionDesc, desc: Partial<FileSystemSchematicDesc>): FileSystemSchematicDesc;
+// @public
+export abstract class FileSystemEngineHostBase implements FileSystemEngineHost_2 {
+    // (undocumented)
     createCollectionDescription(name: string, requester?: FileSystemCollectionDesc): FileSystemCollectionDesc;
+    // (undocumented)
     createSchematicDescription(name: string, collection: FileSystemCollectionDesc): FileSystemSchematicDesc | null;
+    // (undocumented)
     createSourceFromUrl(url: Url): Source | null;
+    // (undocumented)
     createTaskExecutor(name: string): Observable<TaskExecutor>;
+    // (undocumented)
     getSchematicRuleFactory<OptionT extends object>(schematic: FileSystemSchematicDesc, _collection: FileSystemCollectionDesc): RuleFactory<OptionT>;
+    // (undocumented)
     hasTaskExecutor(name: string): boolean;
+    // (undocumented)
     listSchematicNames(collection: FileSystemCollectionDesc): string[];
+    // (undocumented)
     registerContextTransform(t: ContextTransform): void;
+    // (undocumented)
     registerOptionsTransform<T extends object, R extends object>(t: OptionTransform<T, R>): void;
+    // (undocumented)
     registerTaskExecutor<T>(factory: TaskExecutorFactory<T>, options?: T): void;
+    // (undocumented)
+    protected abstract _resolveCollectionPath(name: string, requester?: string): string;
+    // (undocumented)
+    protected abstract _resolveReferenceString(name: string, parentPath: string): {
+        ref: RuleFactory<{}>;
+        path: string;
+    } | null;
+    // (undocumented)
+    protected abstract _transformCollectionDescription(name: string, desc: Partial<FileSystemCollectionDesc>): FileSystemCollectionDesc;
+    // (undocumented)
     transformContext(context: FileSystemSchematicContext): FileSystemSchematicContext;
+    // (undocumented)
     transformOptions<OptionT extends object, ResultT extends object>(schematic: FileSystemSchematicDesc, options: OptionT, context?: FileSystemSchematicContext): Observable<ResultT>;
+    // (undocumented)
+    protected abstract _transformSchematicDescription(name: string, collection: FileSystemCollectionDesc, desc: Partial<FileSystemSchematicDesc>): FileSystemSchematicDesc;
 }
 
-export declare type FileSystemSchematic = Schematic<FileSystemCollectionDescription, FileSystemSchematicDescription>;
+// @public (undocumented)
+export type FileSystemSchematic = Schematic<FileSystemCollectionDescription, FileSystemSchematicDescription>;
 
-export declare type FileSystemSchematicContext = TypedSchematicContext<FileSystemCollectionDescription, FileSystemSchematicDescription>;
+// @public (undocumented)
+export type FileSystemSchematicContext = TypedSchematicContext<FileSystemCollectionDescription, FileSystemSchematicDescription>;
 
-export declare type FileSystemSchematicDesc = SchematicDescription<FileSystemCollectionDescription, FileSystemSchematicDescription>;
+// @public (undocumented)
+export type FileSystemSchematicDesc = SchematicDescription<FileSystemCollectionDescription, FileSystemSchematicDescription>;
 
+// @public (undocumented)
 export interface FileSystemSchematicDescription extends FileSystemSchematicJsonDescription {
+    // (undocumented)
     readonly factoryFn: RuleFactory<{}>;
+    // (undocumented)
     readonly path: string;
+    // (undocumented)
     readonly schemaJson?: JsonObject;
 }
 
+// @public (undocumented)
 export interface FileSystemSchematicJsonDescription {
+    // (undocumented)
     readonly aliases?: string[];
+    // (undocumented)
     readonly collection: FileSystemCollectionDescription;
+    // (undocumented)
     readonly description: string;
+    // (undocumented)
     readonly extends?: string;
+    // (undocumented)
     readonly factory: string;
+    // (undocumented)
     readonly name: string;
+    // (undocumented)
     readonly schema?: string;
 }
 
-export declare class InvalidCollectionJsonException extends BaseException {
+// @public (undocumented)
+export class InvalidCollectionJsonException extends BaseException {
     constructor(_name: string, path: string, jsonException?: UnexpectedEndOfInputException | InvalidJsonCharacterException);
 }
 
-export declare class NodeModulesEngineHost extends FileSystemEngineHostBase {
+// @public
+export class NodeModulesEngineHost extends FileSystemEngineHostBase {
     constructor(paths?: string[] | undefined);
+    // (undocumented)
     protected _resolveCollectionPath(name: string, requester?: string): string;
+    // (undocumented)
     protected _resolveReferenceString(refString: string, parentPath: string): {
         ref: RuleFactory<{}>;
         path: string;
     } | null;
+    // (undocumented)
     protected _transformCollectionDescription(name: string, desc: Partial<FileSystemCollectionDesc>): FileSystemCollectionDesc;
+    // (undocumented)
     protected _transformSchematicDescription(name: string, _collection: FileSystemCollectionDesc, desc: Partial<FileSystemSchematicDesc>): FileSystemSchematicDesc;
 }
 
-export declare class NodeModulesTestEngineHost extends NodeModulesEngineHost {
-    get tasks(): TaskConfiguration<{}>[];
-    protected _resolveCollectionPath(name: string, requester?: string): string;
+// @public
+export class NodeModulesTestEngineHost extends NodeModulesEngineHost {
+    // (undocumented)
     clearTasks(): void;
+    // (undocumented)
     registerCollection(name: string, path: string): void;
+    // (undocumented)
+    protected _resolveCollectionPath(name: string, requester?: string): string;
+    // (undocumented)
+    get tasks(): TaskConfiguration<{}>[];
+    // (undocumented)
     transformContext(context: FileSystemSchematicContext): FileSystemSchematicContext;
 }
 
-export declare class NodePackageDoesNotSupportSchematics extends BaseException {
+// @public (undocumented)
+export class NodePackageDoesNotSupportSchematics extends BaseException {
     constructor(name: string);
 }
 
-export declare class NodeWorkflow extends workflow.BaseWorkflow {
-    get engine(): FileSystemEngine;
-    get engineHost(): NodeModulesEngineHost;
+// @public
+export class NodeWorkflow extends workflow.BaseWorkflow {
+    constructor(root: string, options: NodeWorkflowOptions);
     constructor(host: virtualFs.Host, options: NodeWorkflowOptions & {
         root?: Path;
     });
-    constructor(root: string, options: NodeWorkflowOptions);
+    // (undocumented)
+    get engine(): FileSystemEngine;
+    // (undocumented)
+    get engineHost(): NodeModulesEngineHost;
 }
 
+// @public (undocumented)
 export interface NodeWorkflowOptions {
+    // (undocumented)
     dryRun?: boolean;
+    // (undocumented)
     engineHostCreator?: (options: NodeWorkflowOptions) => NodeModulesEngineHost;
+    // (undocumented)
     force?: boolean;
+    // (undocumented)
     optionTransforms?: OptionTransform<object, object>[];
+    // (undocumented)
     packageManager?: string;
+    // (undocumented)
+    packageManagerForce?: boolean;
+    // (undocumented)
     packageRegistry?: string;
+    // (undocumented)
     registry?: schema.CoreSchemaRegistry;
+    // (undocumented)
     resolvePaths?: string[];
+    // (undocumented)
     schemaValidation?: boolean;
 }
 
-export declare type OptionTransform<T extends object, R extends object> = (schematic: FileSystemSchematicDescription, options: T, context?: FileSystemSchematicContext) => Observable<R> | PromiseLike<R> | R;
+// @public (undocumented)
+export type OptionTransform<T extends object, R extends object> = (schematic: FileSystemSchematicDescription, options: T, context?: FileSystemSchematicContext) => Observable<R> | PromiseLike<R> | R;
 
-export declare class SchematicMissingDescriptionException extends BaseException {
+// @public (undocumented)
+export class SchematicMissingDescriptionException extends BaseException {
     constructor(name: string);
 }
 
-export declare class SchematicMissingFactoryException extends BaseException {
+// @public (undocumented)
+export class SchematicMissingFactoryException extends BaseException {
     constructor(name: string);
 }
 
-export declare class SchematicMissingFieldsException extends BaseException {
+// @public (undocumented)
+export class SchematicMissingFieldsException extends BaseException {
     constructor(name: string);
 }
 
-export declare class SchematicNameCollisionException extends BaseException {
+// @public (undocumented)
+export class SchematicNameCollisionException extends BaseException {
     constructor(name: string);
 }
 
-export declare function validateOptionsWithSchema(registry: schema.SchemaRegistry): <T extends {}>(schematic: FileSystemSchematicDescription, options: T, context?: FileSystemSchematicContext | undefined) => Observable<T>;
+// @public (undocumented)
+export function validateOptionsWithSchema(registry: schema.SchemaRegistry): <T extends {}>(schematic: FileSystemSchematicDescription, options: T, context?: FileSystemSchematicContext | undefined) => Observable<T>;
+
+// (No @packageDocumentation comment for this package)
+
+```
diff --git a/goldens/public-api/manage.js b/goldens/public-api/manage.js
new file mode 100644
index 000000000000..66029f35e4a5
--- /dev/null
+++ b/goldens/public-api/manage.js
@@ -0,0 +1,54 @@
+const {exec} = require('shelljs');
+const minimist = require('minimist');
+
+// Remove all command line flags from the arguments.
+const argv = minimist(process.argv.slice(2));
+// The command the user would like to run, either 'accept' or 'test'
+const USER_COMMAND = argv._[0];
+// The shell command to query for all Public API guard tests.
+const BAZEL_PUBLIC_API_TARGET_QUERY_CMD =
+    `yarn -s bazel query --output label 'kind(nodejs_test, ...) intersect attr("tags", "api_guard", ...)'`
+// Bazel targets for testing Public API goldens
+process.stdout.write('Gathering all Public API targets');
+const ALL_PUBLIC_API_TESTS = exec(BAZEL_PUBLIC_API_TARGET_QUERY_CMD, {silent: true})
+                                 .trim()
+                                 .split('\n')
+                                 .map(test => test.trim());
+process.stdout.clearLine();
+process.stdout.cursorTo(0);
+// Bazel targets for generating Public API goldens
+const ALL_PUBLIC_API_ACCEPTS = ALL_PUBLIC_API_TESTS.map(test => `${test}.accept`);
+
+/**
+ * Run the provided bazel commands on each provided target individually.
+ */
+function runBazelCommandOnTargets(command, targets, present) {
+  for (const target of targets) {
+    process.stdout.write(`${present}: ${target}`);
+    const commandResult = exec(`yarn -s bazel ${command} ${target}`, {silent: true});
+    process.stdout.clearLine();
+    process.stdout.cursorTo(0);
+    if (commandResult.code) {
+      console.error(`Failed ${command}: ${target}`);
+      console.group();
+      console.error(commandResult.stdout || commandResult.stderr);
+      console.groupEnd();
+    } else {
+      console.log(`Successful ${command}: ${target}`);
+    }
+  }
+}
+
+switch (USER_COMMAND) {
+  case 'accept':
+    runBazelCommandOnTargets('run', ALL_PUBLIC_API_ACCEPTS, 'Running');
+    break;
+  case 'test':
+    runBazelCommandOnTargets('test', ALL_PUBLIC_API_TESTS, 'Testing');
+    break;
+  default:
+    console.warn('Invalid command provided.');
+    console.warn();
+    console.warn(`Run this script with either "accept" and "test"`);
+    break;
+}
\ No newline at end of file
diff --git a/goldens/public-api/ngtools/webpack/src/index.md b/goldens/public-api/ngtools/webpack/src/index.md
new file mode 100644
index 000000000000..81003ff2d8c9
--- /dev/null
+++ b/goldens/public-api/ngtools/webpack/src/index.md
@@ -0,0 +1,65 @@
+## API Report File for "@ngtools/webpack"
+
+> Do not edit this file. It is a report generated by [API Extractor](https://api-extractor.com/).
+
+```ts
+
+import type { Compiler } from 'webpack';
+import { CompilerOptions } from '@angular/compiler-cli';
+import type { LoaderContext } from 'webpack';
+
+// @public (undocumented)
+function angularWebpackLoader(this: LoaderContext<unknown>, content: string, map: string): void;
+export default angularWebpackLoader;
+
+// @public (undocumented)
+export const AngularWebpackLoaderPath: string;
+
+// @public (undocumented)
+export class AngularWebpackPlugin {
+    constructor(options?: Partial<AngularWebpackPluginOptions>);
+    // (undocumented)
+    apply(compiler: Compiler): void;
+    // (undocumented)
+    get options(): AngularWebpackPluginOptions;
+}
+
+// @public (undocumented)
+export interface AngularWebpackPluginOptions {
+    // (undocumented)
+    compilerOptions?: CompilerOptions;
+    // (undocumented)
+    directTemplateLoading: boolean;
+    // (undocumented)
+    emitClassMetadata: boolean;
+    // (undocumented)
+    emitNgModuleScope: boolean;
+    // (undocumented)
+    fileReplacements: Record<string, string>;
+    // (undocumented)
+    inlineStyleFileExtension?: string;
+    // @deprecated (undocumented)
+    inlineStyleMimeType?: string;
+    // (undocumented)
+    jitMode: boolean;
+    // (undocumented)
+    substitutions: Record<string, string>;
+    // (undocumented)
+    tsconfig: string;
+}
+
+// @public @deprecated (undocumented)
+export namespace ivy {
+    const // (undocumented)
+    AngularWebpackLoaderPath: string;
+    const // (undocumented)
+    AngularWebpackPlugin: typeof ivyInternal.AngularWebpackPlugin;
+    // (undocumented)
+    export type AngularPluginOptions = ivyInternal.AngularWebpackPluginOptions;
+    // (undocumented)
+    export type AngularWebpackPlugin = ivyInternal.AngularWebpackPlugin;
+}
+
+// (No @packageDocumentation comment for this package)
+
+```
diff --git a/lib/bootstrap-local.js b/lib/bootstrap-local.js
index e491aad25108..c6441e56f47d 100644
--- a/lib/bootstrap-local.js
+++ b/lib/bootstrap-local.js
@@ -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
  */
+
 /* eslint-disable no-console */
 'use strict';
 const debug = require('debug');
@@ -26,7 +27,7 @@ debugLocal('starting bootstrap local');
 // This processes any extended configs
 const compilerOptions = ts.getParsedCommandLineOfConfigFile(
   path.join(__dirname, '../tsconfig-test.json'),
-  { },
+  {},
   ts.sys,
 ).options;
 
@@ -37,8 +38,10 @@ if (process.env['DEVKIT_PROFILING']) {
   try {
     profiler = require('v8-profiler-node8');
   } catch (err) {
-    throw new Error(`Could not require 'v8-profiler-node8'. You must install it separetely with` +
-      `'npm install v8-profiler-node8 --no-save.\n\nOriginal error:\n\n${err}`);
+    throw new Error(
+      `Could not require 'v8-profiler-node8'. You must install it separetely with` +
+        `'npm install v8-profiler-node8 --no-save.\n\nOriginal error:\n\n${err}`,
+    );
   }
 
   profiler.startProfiling();
@@ -72,7 +75,6 @@ if (process.env['DEVKIT_LONG_STACK_TRACE']) {
 global._DevKitIsLocal = true;
 global._DevKitRoot = path.resolve(__dirname, '..');
 
-
 const oldRequireTs = require.extensions['.ts'];
 require.extensions['.ts'] = function (m, filename) {
   // If we're in node module, either call the old hook or simply compile the
@@ -104,7 +106,6 @@ require.extensions['.ts'] = function (m, filename) {
   }
 };
 
-
 require.extensions['.ejs'] = function (m, filename) {
   debugBuildEjs(filename);
 
@@ -120,7 +121,6 @@ const builtinModules = Object.keys(process.binding('natives'));
 const packages = require('./packages').packages;
 // If we're running locally, meaning npm linked. This is basically "developer mode".
 if (!__dirname.match(new RegExp(`\\${path.sep}node_modules\\${path.sep}`))) {
-
   // We mock the module loader so that we can fake our packages when running locally.
   const Module = require('module');
   const oldLoad = Module._load;
@@ -143,7 +143,7 @@ if (!__dirname.match(new RegExp(`\\${path.sep}node_modules\\${path.sep}`))) {
     } else if (resolved && resolved.match(/[\\\/]node_modules[\\\/]/)) {
       return resolved;
     } else {
-      const match = Object.keys(packages).find(pkgName => request.startsWith(pkgName + '/'));
+      const match = Object.keys(packages).find((pkgName) => request.startsWith(pkgName + '/'));
       if (match) {
         const p = path.join(packages[match].root, request.substr(match.length));
         return oldResolve.call(this, p, parent);
@@ -168,7 +168,10 @@ if (!__dirname.match(new RegExp(`\\${path.sep}node_modules\\${path.sep}`))) {
 
             // This script has the be synchronous, so we spawnSync instead of, say, requiring the runner and calling
             // the method directly.
-            const tmpJsonSchemaPath = path.join(tmpRoot, maybeTsPath.replace(/[^0-9a-zA-Z.]/g, '_'));
+            const tmpJsonSchemaPath = path.join(
+              tmpRoot,
+              maybeTsPath.replace(/[^0-9a-zA-Z.]/g, '_'),
+            );
             try {
               if (!fs.existsSync(tmpJsonSchemaPath)) {
                 const quicktypeRunnerPath = path.join(__dirname, '../tools/quicktype_runner.js');
diff --git a/lib/packages.ts b/lib/packages.ts
index 8b5d3ca91304..ece8839d7771 100644
--- a/lib/packages.ts
+++ b/lib/packages.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
  */
-// tslint:disable-next-line: no-global-tslint-disable
-// tslint:disable: no-implicit-dependencies
+
 import { JsonObject } from '@angular-devkit/core';
 import { execSync } from 'child_process';
 import * as fs from 'fs';
@@ -16,11 +15,10 @@ import * as ts from 'typescript';
 const distRoot = path.join(__dirname, '../dist');
 const { packages: monorepoPackages } = require('../.monorepo.json');
 
-
 export interface PackageInfo {
   name: string;
   root: string;
-  bin: { [name: string]: string};
+  bin: { [name: string]: string };
   relative: string;
   main: string;
   dist: string;
@@ -40,7 +38,6 @@ export interface PackageInfo {
 }
 export type PackageMap = { [name: string]: PackageInfo };
 
-
 export function loadRootPackageJson() {
   return require('../package.json');
 }
@@ -76,19 +73,20 @@ function loadPackageJson(p: string) {
       case 'keywords':
         const a = pkg[key] || [];
         const b = Object.keys(
-          root[key].concat(a).reduce((acc: {[k: string]: boolean}, curr: string) => {
+          root[key].concat(a).reduce((acc: { [k: string]: boolean }, curr: string) => {
             acc[curr] = true;
 
             return acc;
-          }, {}));
+          }, {}),
+        );
         pkg[key] = b;
         break;
 
       // Overwrite engines to a common default.
       case 'engines':
         pkg['engines'] = {
-          'node': '>= 12.13.0',
-          'npm': '^6.11.0 || ^7.5.6',
+          'node': '^12.14.1 || >=14.0.0',
+          'npm': '^6.11.0 || ^7.5.6 || >=8.0.0',
           'yarn': '>= 1.13.0',
         };
         break;
@@ -102,54 +100,62 @@ function loadPackageJson(p: string) {
   return pkg;
 }
 
+function* _findPrimaryPackageJsonFiles(dir: string, exclude: RegExp): Iterable<string> {
+  const subdirectories = [];
+  for (const entry of fs.readdirSync(dir, { withFileTypes: true })) {
+    const p = path.join(dir, entry.name);
 
-function _findAllPackageJson(dir: string, exclude: RegExp): string[] {
-  const result: string[] = [];
-  fs.readdirSync(dir)
-    .forEach(fileName => {
-      const p = path.join(dir, fileName);
-
-      if (exclude.test(p)) {
-        return;
-      } else if (/[\/\\]node_modules[\/\\]/.test(p)) {
-        return;
-      } else if (fileName == 'package.json') {
-        result.push(p);
-      } else if (fs.statSync(p).isDirectory() && fileName != 'node_modules') {
-        result.push(..._findAllPackageJson(p, exclude));
-      }
-    });
+    if (exclude.test(p)) {
+      continue;
+    }
 
-  return result;
-}
+    if (entry.isDirectory() && entry.name !== 'node_modules') {
+      subdirectories.push(p);
+      continue;
+    }
+
+    if (entry.name === 'package.json') {
+      yield p;
 
+      // First package.json found will be the package's root package.json
+      // Secondary entrypoint package.json files should not be found here
+      return;
+    }
+  }
+
+  for (const directory of subdirectories) {
+    yield* _findPrimaryPackageJsonFiles(directory, exclude);
+  }
+}
 
 const tsConfigPath = path.join(__dirname, '../tsconfig.json');
 const tsConfig = ts.readConfigFile(tsConfigPath, ts.sys.readFile);
-const pattern = '^('
-  + (tsConfig.config.exclude as string[])
-    .map(ex => path.join(path.dirname(tsConfigPath), ex))
-    .map(ex => '('
-      + ex
-        .replace(/[\-\[\]{}()+?./\\^$|]/g, '\\$&')
-        .replace(/(\\\\|\\\/)\*\*/g, '((\/|\\\\).+?)?')
-        .replace(/\*/g, '[^/\\\\]*')
-      + ')')
-    .join('|')
-  + ')($|/|\\\\)';
+const pattern =
+  '^(' +
+  (tsConfig.config.exclude as string[])
+    .map((ex) => path.join(path.dirname(tsConfigPath), ex))
+    .map(
+      (ex) =>
+        '(' +
+        ex
+          .replace(/[\-\[\]{}()+?./\\^$|]/g, '\\$&')
+          .replace(/(\\\\|\\\/)\*\*/g, '((/|\\\\).+?)?')
+          .replace(/\*/g, '[^/\\\\]*') +
+        ')',
+    )
+    .join('|') +
+  ')($|/|\\\\)';
 const excludeRe = new RegExp(pattern);
 
 // Find all the package.json that aren't excluded from tsconfig.
-const packageJsonPaths = _findAllPackageJson(path.join(__dirname, '..'), excludeRe)
-  // Remove the root package.json.
-  .filter(p => p != path.join(__dirname, '../package.json'));
-
+const packageJsonPaths = [
+  ..._findPrimaryPackageJsonFiles(path.join(__dirname, '..', 'packages'), excludeRe),
+];
 
 function _exec(cmd: string) {
   return execSync(cmd).toString().trim();
 }
 
-
 let gitShaCache: string;
 function _getSnapshotHash(_pkg: PackageInfo): string {
   if (!gitShaCache) {
@@ -159,7 +165,6 @@ function _getSnapshotHash(_pkg: PackageInfo): string {
   return gitShaCache;
 }
 
-
 const stableVersion = loadRootPackageJson().version;
 const experimentalVersion = stableToExperimentalVersion(stableVersion);
 
@@ -177,71 +182,73 @@ export function stableToExperimentalVersion(stable: string): string {
 // All the supported packages. Go through the packages directory and create a map of
 // name => PackageInfo. This map is partial as it lacks some information that requires the
 // map itself to finish building.
-export const packages: PackageMap =
-  packageJsonPaths
-    .map(pkgPath => ({ root: path.dirname(pkgPath) }))
-    .reduce((packages: PackageMap, pkg) => {
-      const pkgRoot = pkg.root;
-      const packageJson = loadPackageJson(path.join(pkgRoot, 'package.json'));
-      const name = packageJson['name'];
-      if (!name) {
-        // Only build the entry if there's a package name.
-        return packages;
-      }
-      if (!(name in monorepoPackages)) {
-        throw new Error(
-          `Package ${name} found in ${JSON.stringify(pkg.root)}, not found in .monorepo.json.`,
-        );
-      }
-
-      const bin: {[name: string]: string} = {};
-      Object.keys(packageJson['bin'] || {}).forEach(binName => {
-        let p = path.resolve(pkg.root, packageJson['bin'][binName]);
-        if (!fs.existsSync(p)) {
-          p = p.replace(/\.js$/, '.ts');
-        }
-        bin[binName] = p;
-      });
-
-      const experimental = !!packageJson.private || !!packageJson.experimental;
-
-      packages[name] = {
-        build: path.join(distRoot, pkgRoot.substr(path.dirname(__dirname).length)),
-        dist: path.join(distRoot, name),
-        root: pkgRoot,
-        relative: path.relative(path.dirname(__dirname), pkgRoot),
-        main: path.resolve(pkgRoot, 'src/index.ts'),
-        private: !!packageJson.private,
-        experimental,
-        // yarn doesn't take kindly to @ in tgz filenames
-        // https://github.com/yarnpkg/yarn/issues/6339
-        tar: path.join(distRoot, name.replace(/\/|@/g, '_') + '.tgz'),
-        bin,
-        name,
-        packageJson,
-
-        snapshot: !!monorepoPackages[name].snapshotRepo,
-        snapshotRepo: monorepoPackages[name].snapshotRepo,
-        get snapshotHash() {
-          return _getSnapshotHash(this);
-        },
-
-        dependencies: [],
-        reverseDependencies: [],
-        version: experimental ? experimentalVersion : stableVersion,
-      };
-
+export const packages: PackageMap = packageJsonPaths
+  .map((pkgPath) => ({ root: path.dirname(pkgPath) }))
+  .reduce((packages: PackageMap, pkg) => {
+    const pkgRoot = pkg.root;
+    const packageJson = loadPackageJson(path.join(pkgRoot, 'package.json'));
+    const name = packageJson['name'];
+    if (!name) {
+      // Only build the entry if there's a package name.
       return packages;
-    }, {});
+    }
+    if (!(name in monorepoPackages)) {
+      throw new Error(
+        `Package ${name} found in ${JSON.stringify(pkg.root)}, not found in .monorepo.json.`,
+      );
+    }
 
+    const bin: { [name: string]: string } = {};
+    Object.keys(packageJson['bin'] || {}).forEach((binName) => {
+      let p = path.resolve(pkg.root, packageJson['bin'][binName]);
+      if (!fs.existsSync(p)) {
+        p = p.replace(/\.js$/, '.ts');
+      }
+      bin[binName] = p;
+    });
+
+    const experimental = !!packageJson.private || !!packageJson.experimental;
+
+    packages[name] = {
+      build: path.join(distRoot, pkgRoot.substr(path.dirname(__dirname).length)),
+      dist: path.join(distRoot, name),
+      root: pkgRoot,
+      relative: path.relative(path.dirname(__dirname), pkgRoot),
+      main: path.resolve(pkgRoot, 'src/index.ts'),
+      private: !!packageJson.private,
+      experimental,
+      // yarn doesn't take kindly to @ in tgz filenames
+      // https://github.com/yarnpkg/yarn/issues/6339
+      tar: path.join(distRoot, name.replace(/\/|@/g, '_') + '.tgz'),
+      bin,
+      name,
+      packageJson,
+
+      snapshot: !!monorepoPackages[name].snapshotRepo,
+      snapshotRepo: monorepoPackages[name].snapshotRepo,
+      get snapshotHash() {
+        return _getSnapshotHash(this);
+      },
+
+      dependencies: [],
+      reverseDependencies: [],
+      version: experimental ? experimentalVersion : stableVersion,
+    };
+
+    return packages;
+  }, {});
 
 // Update with dependencies.
 for (const pkgName of Object.keys(packages)) {
   const pkg = packages[pkgName];
   const pkgJson = require(path.join(pkg.root, 'package.json'));
-  pkg.dependencies = Object.keys(packages).filter(name => {
-    return name in (pkgJson.dependencies || {})
-        || name in (pkgJson.devDependencies || {});
+  pkg.dependencies = Object.keys(packages).filter((name) => {
+    return name in (pkgJson.dependencies || {}) || name in (pkgJson.devDependencies || {});
   });
-  pkg.dependencies.forEach(depName => packages[depName].reverseDependencies.push(pkgName));
+  pkg.dependencies.forEach((depName) => packages[depName].reverseDependencies.push(pkgName));
 }
+
+/** The set of packages which are built and released. */
+export const releasePackages = Object.fromEntries(
+  Object.entries(packages).filter(([_, pkg]) => !pkg.private),
+);
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 add85949007f..648764434235 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@angular/devkit-repo",
-  "version": "12.0.0-rc.0",
+  "version": "12.2.18",
   "private": true,
   "description": "Software Development Kit for Angular",
   "bin": {
@@ -20,30 +20,31 @@
   ],
   "scripts": {
     "admin": "node ./bin/devkit-admin",
-    "bazel:format": "find . -type f \\( -name \"*.bzl\" -or -name WORKSPACE -or -name BUILD -or -name BUILD.bazel \\) ! -path \"*/node_modules/*\" | xargs buildifier -v --warnings=attr-cfg,attr-license,attr-non-empty,attr-output-default,attr-single-file,constant-glob,ctx-args,depset-iteration,depset-union,dict-concatenation,duplicated-name,filetype,git-repository,http-archive,integer-division,load,load-on-top,native-build,native-package,output-group,package-name,package-on-top,positional-args,redefined-variable,repository-name,same-origin-load,string-iteration,unused-variable",
-    "bazel:lint": "yarn bazel:format --lint=warn",
-    "bazel:lint-fix": "yarn bazel:format --lint=fix",
-    "bazel:test": "bazel test //packages/... //etc/... ",
+    "bazel:test": "bazel test //packages/...",
     "build": "node ./bin/devkit-admin build",
     "build-tsc": "tsc -p tsconfig.json",
     "debug:test": "node --inspect-brk ./bin/devkit-admin test",
     "debug:test-large": "node --inspect-brk ./bin/devkit-admin test --large --spec-reporter",
-    "lint": "tslint --project tsconfig.json",
+    "lint": "eslint --cache --max-warnings=0 \"**/*.ts\"",
     "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 && 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 89.0.4389.0",
-    "ngcc": "ngcc --properties es2015 browser module main --first-only --create-ivy-entry-points"
+    "webdriver-update": "webdriver-manager update --standalone false --gecko false --versions.chrome 91.0.4472.19",
+    "ngcc": "ngcc --properties es2015 browser module main --first-only --create-ivy-entry-points",
+    "public-api:check": "node goldens/public-api/manage.js test",
+    "public-api:update": "node goldens/public-api/manage.js accept",
+    "ts-circular-deps:check": "ng-dev ts-circular-deps check --config ./packages/circular-deps-test.conf.js",
+    "ts-circular-deps:approve": "ng-dev ts-circular-deps approve --config ./packages/circular-deps-test.conf.js"
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/angular/angular-cli.git"
   },
   "engines": {
-    "node": ">=12.13.0 <15.0.0",
-    "yarn": ">=1.22.4"
+    "node": "^12.14.1 || ^14.0.0",
+    "yarn": ">=1.21.1 <2",
+    "npm": "Please use yarn instead of NPM to install dependencies"
   },
   "author": "Angular Authors",
   "license": "MIT",
@@ -62,50 +63,56 @@
       "@angular/compiler-cli"
     ]
   },
+  "resolutions": {
+    "**/@types/copy-webpack-plugin/webpack": "5.50.0",
+    "ajv-formats/ajv": "8.6.2"
+  },
   "devDependencies": {
-    "@angular/animations": "12.0.0-next.8",
-    "@angular/cdk": "11.2.9",
-    "@angular/common": "12.0.0-next.8",
-    "@angular/compiler": "12.0.0-next.8",
-    "@angular/compiler-cli": "12.0.0-next.8",
-    "@angular/core": "12.0.0-next.8",
-    "@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#0d8382f30f70ab220961c2d731c782519025332e",
-    "@angular/forms": "12.0.0-next.8",
-    "@angular/localize": "12.0.0-next.8",
-    "@angular/material": "11.2.9",
-    "@angular/platform-browser": "12.0.0-next.8",
-    "@angular/platform-browser-dynamic": "12.0.0-next.8",
-    "@angular/platform-server": "12.0.0-next.8",
-    "@angular/router": "12.0.0-next.8",
-    "@angular/service-worker": "12.0.0-next.8",
-    "@babel/core": "7.13.13",
-    "@babel/generator": "7.13.9",
-    "@babel/plugin-transform-runtime": "7.13.10",
-    "@babel/preset-env": "7.13.12",
-    "@babel/runtime": "7.13.10",
-    "@babel/template": "7.12.13",
-    "@bazel/bazelisk": "1.7.5",
+    "@ampproject/remapping": "1.0.1",
+    "@angular/animations": "12.2.1",
+    "@angular/cdk": "12.1.4",
+    "@angular/common": "12.2.1",
+    "@angular/compiler": "12.2.1",
+    "@angular/compiler-cli": "12.2.1",
+    "@angular/core": "12.2.1",
+    "@angular/dev-infra-private": "https://github.com/angular/dev-infra-private-builds.git#07a43c542704985a77ecabb4be12038e67419a65",
+    "@angular/forms": "12.2.1",
+    "@angular/localize": "12.2.1",
+    "@angular/material": "12.1.4",
+    "@angular/platform-browser": "12.2.1",
+    "@angular/platform-browser-dynamic": "12.2.1",
+    "@angular/platform-server": "12.2.1",
+    "@angular/router": "12.2.1",
+    "@angular/service-worker": "12.2.1",
+    "@babel/core": "7.14.8",
+    "@babel/generator": "7.14.8",
+    "@babel/helper-annotate-as-pure": "7.14.5",
+    "@babel/plugin-proposal-async-generator-functions": "7.14.7",
+    "@babel/plugin-transform-runtime": "7.14.5",
+    "@babel/preset-env": "7.14.8",
+    "@babel/runtime": "7.14.8",
+    "@babel/template": "7.14.5",
+    "@bazel/bazelisk": "1.10.1",
     "@bazel/buildifier": "4.0.1",
-    "@bazel/jasmine": "3.2.2",
-    "@bazel/typescript": "3.2.2",
-    "@discoveryjs/json-ext": "0.5.2",
+    "@bazel/jasmine": "3.7.0",
+    "@bazel/typescript": "3.7.0",
+    "@discoveryjs/json-ext": "0.5.3",
     "@jsdevtools/coverage-istanbul-loader": "3.0.5",
-    "@types/babel__core": "7.1.14",
-    "@types/babel__template": "7.4.0",
+    "@types/babel__core": "7.1.15",
+    "@types/babel__template": "7.4.1",
     "@types/cacache": "^15.0.0",
     "@types/caniuse-lite": "^1.0.0",
-    "@types/copy-webpack-plugin": "^6.0.0",
-    "@types/cssnano": "^4.0.0",
+    "@types/copy-webpack-plugin": "^8.0.0",
     "@types/debug": "^4.1.2",
     "@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.6.0",
+    "@types/jasmine": "~3.8.0",
     "@types/karma": "^6.3.0",
     "@types/loader-utils": "^2.0.0",
-    "@types/minimatch": "3.0.4",
+    "@types/minimatch": "3.0.5",
     "@types/minimist": "^1.2.0",
     "@types/node": "~12.12.6",
     "@types/node-fetch": "^2.1.6",
@@ -115,118 +122,119 @@
     "@types/postcss-preset-env": "^6.7.1",
     "@types/progress": "^2.0.3",
     "@types/resolve": "^1.17.1",
-    "@types/rimraf": "^3.0.0",
+    "@types/sass": "^1.16.0",
     "@types/semver": "^7.0.0",
     "@types/text-table": "^0.2.1",
     "@types/uuid": "^8.0.0",
     "@types/webpack-dev-server": "^3.1.7",
+    "@typescript-eslint/eslint-plugin": "4.28.5",
+    "@typescript-eslint/parser": "4.28.5",
     "@yarnpkg/lockfile": "1.1.0",
-    "ajv": "8.1.0",
-    "ajv-formats": "2.0.2",
+    "ajv": "8.6.2",
+    "ajv-formats": "2.1.0",
     "ansi-colors": "4.1.1",
     "babel-loader": "8.2.2",
     "bootstrap": "^4.0.0",
     "browserslist": "^4.9.1",
-    "cacache": "15.0.6",
+    "cacache": "15.2.0",
     "caniuse-lite": "^1.0.30001032",
     "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": "8.1.1",
-    "core-js": "3.10.1",
-    "critters": "0.0.10",
-    "css-loader": "5.2.1",
-    "cssnano": "5.0.1",
+    "copy-webpack-plugin": "9.0.1",
+    "core-js": "3.16.0",
+    "critters": "0.0.12",
+    "css-loader": "6.2.0",
+    "css-minimizer-webpack-plugin": "3.0.2",
     "debug": "^4.1.1",
-    "enhanced-resolve": "5.7.0",
+    "esbuild": "0.13.8",
+    "esbuild-wasm": "0.13.8",
+    "eslint": "7.31.0",
+    "eslint-config-prettier": "8.3.0",
+    "eslint-plugin-header": "3.1.1",
+    "eslint-plugin-import": "2.23.4",
     "express": "4.17.1",
     "fast-json-stable-stringify": "2.1.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",
+    "glob": "7.1.7",
     "http-proxy": "^1.18.1",
     "https-proxy-agent": "5.0.0",
-    "husky": "6.0.0",
-    "inquirer": "8.0.0",
+    "husky": "7.0.1",
+    "inquirer": "8.1.2",
     "jasmine": "^3.3.1",
-    "jasmine-core": "~3.7.0",
+    "jasmine-core": "~3.8.0",
     "jasmine-spec-reporter": "~7.0.0",
-    "jest-worker": "26.6.2",
     "jquery": "^3.3.1",
     "jsonc-parser": "3.0.0",
     "karma": "~6.3.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-jasmine-html-reporter": "~1.7.0",
     "karma-source-map-support": "1.4.0",
     "less": "4.1.1",
-    "less-loader": "8.1.0",
+    "less-loader": "10.0.1",
     "license-checker": "^25.0.0",
+    "license-webpack-plugin": "2.3.20",
     "loader-utils": "2.0.0",
     "magic-string": "0.25.7",
-    "mini-css-extract-plugin": "1.4.1",
+    "mini-css-extract-plugin": "2.4.2",
     "minimatch": "3.0.4",
-    "minimist": "^1.2.0",
-    "ng-packagr": "~12.0.0-next.0",
+    "minimist": "1.2.6",
+    "ng-packagr": "~12.1.2",
     "node-fetch": "^2.2.0",
-    "npm-registry-client": "8.6.0",
-    "open": "8.0.5",
-    "ora": "5.4.0",
-    "pacote": "11.3.1",
+    "open": "8.2.1",
+    "ora": "5.4.1",
+    "pacote": "12.0.2",
     "parse5-html-rewriting-stream": "6.0.1",
     "pidtree": "^0.5.0",
     "pidusage": "^2.0.17",
+    "piscina": "3.1.0",
     "popper.js": "^1.14.1",
-    "postcss": "8.2.10",
-    "postcss-import": "14.0.1",
-    "postcss-loader": "5.2.0",
+    "postcss": "8.3.6",
+    "postcss-import": "14.0.2",
+    "postcss-loader": "6.1.1",
     "postcss-preset-env": "6.7.0",
     "prettier": "^2.0.0",
     "protractor": "~7.0.0",
-    "puppeteer": "8.0.0",
-    "quicktype-core": "^6.0.69",
-    "raw-loader": "4.0.2",
-    "regenerator-runtime": "0.13.7",
-    "resolve-url-loader": "3.1.2",
-    "rimraf": "3.0.2",
+    "puppeteer": "10.1.0",
+    "quicktype-core": "6.0.69",
+    "regenerator-runtime": "0.13.9",
+    "resolve-url-loader": "4.0.0",
     "rxjs": "6.6.7",
-    "sass": "1.32.8",
-    "sass-loader": "11.0.1",
+    "rxjs-7": "npm:rxjs@7.4.0",
+    "sass": "1.36.0",
+    "sass-loader": "12.1.0",
     "sauce-connect-proxy": "https://saucelabs.com/downloads/sc-4.6.4-linux.tar.gz",
     "semver": "7.3.5",
     "source-map": "0.7.3",
-    "source-map-loader": "1.1.3",
+    "source-map-loader": "3.0.0",
     "source-map-support": "0.5.19",
     "spdx-satisfies": "^5.0.0",
-    "style-loader": "2.0.0",
+    "style-loader": "3.2.1",
     "stylus": "0.54.8",
-    "stylus-loader": "4.3.3",
-    "symbol-observable": "3.0.0",
-    "tar": "^6.0.0",
+    "stylus-loader": "6.1.0",
+    "symbol-observable": "4.0.0",
+    "tar": "^6.1.6",
     "temp": "^0.9.0",
-    "terser": "5.6.1",
-    "terser-webpack-plugin": "4.2.3",
+    "terser": "5.14.2",
+    "terser-webpack-plugin": "5.1.4",
     "text-table": "0.2.0",
-    "through2": "^4.0.0",
     "tree-kill": "1.2.2",
-    "ts-api-guardian": "0.6.0",
-    "ts-node": "^9.0.0",
-    "tslib": "^2.0.0",
+    "ts-node": "^10.0.0",
+    "tslib": "2.3.0",
     "tslint": "^6.1.3",
-    "tslint-no-circular-imports": "^0.7.0",
-    "tslint-sonarts": "1.9.0",
-    "typescript": "4.2.4",
-    "verdaccio": "5.0.1",
+    "typescript": "4.3.5",
+    "verdaccio": "5.1.2",
     "verdaccio-auth-memory": "^10.0.0",
-    "webpack": "5.32.0",
-    "webpack-dev-middleware": "4.1.0",
-    "webpack-dev-server": "3.11.2",
-    "webpack-merge": "5.7.3",
+    "webpack": "5.50.0",
+    "webpack-dev-middleware": "5.0.0",
+    "webpack-dev-server": "3.11.3",
+    "webpack-merge": "5.8.0",
     "webpack-subresource-integrity": "1.5.2",
     "zone.js": "^0.11.3"
   }
diff --git a/packages/README.md b/packages/README.md
index eb38cb395147..aab7eadc1c92 100644
--- a/packages/README.md
+++ b/packages/README.md
@@ -4,5 +4,5 @@ This folder is the root of all defined packages in this repository.
 
 Packages that are marked as `private: true` will not be published to NPM.
 
-This folder includes a directory for every scope in NPM, without the `@` sign. Then one folder 
+This folder includes a directory for every scope in NPM, without the `@` sign. Then one folder
 per package, which contains the `package.json`.
diff --git a/packages/angular/cli/BUILD.bazel b/packages/angular/cli/BUILD.bazel
index bea36e5ac0d0..018eccf08753 100644
--- a/packages/angular/cli/BUILD.bazel
+++ b/packages/angular/cli/BUILD.bazel
@@ -81,13 +81,17 @@ ts_library(
         "@npm//@types/node",
         "@npm//@types/npm-package-arg",
         "@npm//@types/resolve",
-        "@npm//@types/rimraf",
         "@npm//@types/semver",
         "@npm//@types/uuid",
+        "@npm//@yarnpkg/lockfile",
         "@npm//ansi-colors",
+        "@npm//ini",
         "@npm//jsonc-parser",
+        "@npm//npm-package-arg",
         "@npm//open",
         "@npm//ora",
+        "@npm//pacote",
+        "@npm//semver",
     ],
 )
 
diff --git a/packages/angular/cli/README.md b/packages/angular/cli/README.md
index 96b40aacbad5..954dcd7d702c 100644
--- a/packages/angular/cli/README.md
+++ b/packages/angular/cli/README.md
@@ -1,6 +1,7 @@
 ## Angular CLI
 
 <!-- Badges section here. -->
+
 [![Dependency Status][david-badge]][david-badge-url]
 [![devDependency Status][david-dev-badge]][david-dev-badge-url]
 
@@ -14,7 +15,6 @@
 [![GitHub forks](https://img.shields.io/github/forks/angular/angular-cli.svg?style=social&label=Fork)](https://github.com/angular/angular-cli/fork)
 [![GitHub stars](https://img.shields.io/github/stars/angular/angular-cli.svg?style=social&label=Star)](https://github.com/angular/angular-cli)
 
-
 ## Note
 
 If you are updating from a beta or RC version, check out our [1.0 Update Guide](https://github.com/angular/angular-cli/wiki/stories-1.0-update).
@@ -30,25 +30,27 @@ with NPM 5.5.1 or higher.
 
 ## Table of Contents
 
-* [Installation](#installation)
-* [Usage](#usage)
-* [Generating a New Project](#generating-and-serving-an-angular-project-via-a-development-server)
-* [Generating Components, Directives, Pipes and Services](#generating-components-directives-pipes-and-services)
-* [Updating Angular CLI](#updating-angular-cli)
-* [Development Hints for working on Angular CLI](#development-hints-for-working-on-angular-cli)
-* [Documentation](#documentation)
-* [License](#license)
+- [Installation](#installation)
+- [Usage](#usage)
+- [Generating a New Project](#generating-and-serving-an-angular-project-via-a-development-server)
+- [Generating Components, Directives, Pipes and Services](#generating-components-directives-pipes-and-services)
+- [Updating Angular CLI](#updating-angular-cli)
+- [Development Hints for working on Angular CLI](#development-hints-for-working-on-angular-cli)
+- [Documentation](#documentation)
+- [License](#license)
 
 ## Installation
 
 **BEFORE YOU INSTALL:** please read the [prerequisites](#prerequisites)
 
 ### Install Globally
+
 ```bash
 npm install -g @angular/cli
 ```
 
 ### Install Locally
+
 ```bash
 npm install @angular/cli
 ```
@@ -58,6 +60,7 @@ To run a locally installed version of the angular-cli, you can call `ng` command
 Alternatively, you can install [npx](https://www.npmjs.com/package/npx) and run `npx ng <command>` within the local directory where `npm install @angular/cli` was run, which will use the locally installed angular-cli.
 
 ### Install Specific Version (Example: 6.1.1)
+
 ```bash
 npm install -g @angular/cli@6.1.1
 ```
@@ -75,6 +78,7 @@ ng new PROJECT-NAME
 cd PROJECT-NAME
 ng serve
 ```
+
 Navigate to `http://localhost:4200/`. The app will automatically reload if you change any of the source files.
 
 You can configure the default HTTP host and port used by the development server with two command-line options :
@@ -102,33 +106,32 @@ ng g component ./newer-cmp
 ng g component feature/new-cmp
 # and your component will be generated in src/app/feature/new-cmp
 ```
-You can find all possible blueprints in the table below:
-
-Scaffold  | Usage
----       | ---
-[Component](https://angular.io/cli/generate#component)      | `ng g component my-new-component`
-[Directive](https://angular.io/cli/generate#directive)      | `ng g directive my-new-directive`
-[Pipe](https://angular.io/cli/generate#pipe)                | `ng g pipe my-new-pipe`
-[Service](https://angular.io/cli/generate#service)          | `ng g service my-new-service`
-[Class](https://angular.io/cli/generate#class)              | `ng g class my-new-class`
-[Guard](https://angular.io/cli/generate#guard)              | `ng g guard my-new-guard`
-[Interface](https://angular.io/cli/generate#interface)      | `ng g interface my-new-interface`
-[Enum](https://angular.io/cli/generate#enum)                | `ng g enum my-new-enum`
-[Module](https://angular.io/cli/generate#module)            | `ng g module my-module`
-
 
+You can find all possible blueprints in the table below:
 
+| Scaffold                                               | Usage                             |
+| ------------------------------------------------------ | --------------------------------- |
+| [Component](https://angular.io/cli/generate#component) | `ng g component my-new-component` |
+| [Directive](https://angular.io/cli/generate#directive) | `ng g directive my-new-directive` |
+| [Pipe](https://angular.io/cli/generate#pipe)           | `ng g pipe my-new-pipe`           |
+| [Service](https://angular.io/cli/generate#service)     | `ng g service my-new-service`     |
+| [Class](https://angular.io/cli/generate#class)         | `ng g class my-new-class`         |
+| [Guard](https://angular.io/cli/generate#guard)         | `ng g guard my-new-guard`         |
+| [Interface](https://angular.io/cli/generate#interface) | `ng g interface my-new-interface` |
+| [Enum](https://angular.io/cli/generate#enum)           | `ng g enum my-new-enum`           |
+| [Module](https://angular.io/cli/generate#module)       | `ng g module my-module`           |
 
 angular-cli will add reference to `components`, `directives` and `pipes` automatically in the `app.module.ts`. If you need to add this references to another custom module, follow these steps:
 
- 1. `ng g module new-module` to create a new module
- 2.  call `ng g component new-module/new-component`
+1. `ng g module new-module` to create a new module
+2. call `ng g component new-module/new-component`
 
 This should add the new `component`, `directive` or `pipe` reference to the `new-module` you've created.
 
 ### Updating Angular CLI
 
 If you're using Angular CLI `1.0.0-beta.28` or less, you need to uninstall `angular-cli` package. It should be done due to changing of package's name and scope from `angular-cli` to `@angular/cli`:
+
 ```bash
 npm uninstall -g angular-cli
 npm uninstall --save-dev angular-cli
@@ -137,6 +140,7 @@ npm uninstall --save-dev angular-cli
 To update Angular CLI to a new version, you must update both the global package and your project's local package.
 
 Global package:
+
 ```bash
 npm uninstall -g @angular/cli
 npm cache verify
@@ -145,6 +149,7 @@ npm install -g @angular/cli@latest
 ```
 
 Local project package:
+
 ```bash
 rm -rf node_modules dist # use rmdir /S/Q node_modules dist in Windows Command Prompt; use rm -r -fo node_modules,dist in Windows PowerShell
 npm install --save-dev @angular/cli@latest
@@ -155,7 +160,6 @@ If you are updating to 1.0 from a beta or RC version, check out our [1.0 Update
 
 You can find more details about changes between versions in [the Releases tab on GitHub](https://github.com/angular/angular-cli/releases).
 
-
 ## Development Hints for working on Angular CLI
 
 ### Working with master
@@ -231,15 +235,17 @@ For more informations about Node.js debugging in VS Code, see the related [VS Co
 In order to investigate performance issues, CPU profiling is often useful.
 
 To capture a CPU profiling, you can:
+
 1. install the v8-profiler-node8 dependency: `npm install v8-profiler-node8 --no-save`
 1. set the NG_CLI_PROFILING Environment variable to the file name you want:
-    * on Unix systems (Linux & Mac OS X): ̀`export NG_CLI_PROFILING=my-profile`
-    * on Windows: ̀̀`setx NG_CLI_PROFILING my-profile`
+   - on Unix systems (Linux & Mac OS X): ̀`export NG_CLI_PROFILING=my-profile`
+   - on Windows: ̀̀`setx NG_CLI_PROFILING my-profile`
 
 Then, just run the ng command on which you want to capture a CPU profile.
 You will then obtain a `my-profile.cpuprofile` file in the folder from which you ran the ng command.
 
 You can use the Chrome Devtools to process it. To do so:
+
 1. open `chrome://inspect/#devices` in Chrome
 1. click on "Open dedicated DevTools for Node"
 1. go to the "profiler" tab
@@ -256,7 +262,6 @@ The documentation for the Angular CLI is located on our [documentation website](
 
 [MIT](https://github.com/angular/angular-cli/blob/master/LICENSE)
 
-
 [travis-badge]: https://travis-ci.org/angular/angular-cli.svg?branch=master
 [travis-badge-url]: https://travis-ci.org/angular/angular-cli
 [david-badge]: https://david-dm.org/angular/angular-cli.svg
@@ -266,4 +271,3 @@ The documentation for the Angular CLI is located on our [documentation website](
 [npm-badge]: https://img.shields.io/npm/v/@angular/cli.svg
 [npm-badge-url]: https://www.npmjs.com/package/@angular/cli
 [license-url]: https://github.com/angular/angular-cli/blob/master/LICENSE
-
diff --git a/packages/angular/cli/bin/ng b/packages/angular/cli/bin/ng
index 09aea2a41bf0..889851add1f7 100755
--- a/packages/angular/cli/bin/ng
+++ b/packages/angular/cli/bin/ng
@@ -29,15 +29,15 @@ if (version[0] % 2 === 1 && version[0] > 14) {
 } else if (
   version[0] < 12 ||
   version[0] === 13 ||
-  (version[0] === 12 && version[1] < 13) ||
+  (version[0] === 12 && version[1] < 14) ||
   (version[0] === 14 && version[1] < 15)
 ) {
-  // Error and exit if less than 12.13 or 13.x or less than 14.15
+  // Error and exit if less than 12.14 or 13.x or less than 14.15
   console.error(
     'Node.js version ' +
       process.version +
       ' detected.\n' +
-      'The Angular CLI requires a minimum Node.js version of either v12.13 or v14.15.\n\n' +
+      'The Angular CLI requires a minimum Node.js version of either v12.14 or v14.15.\n\n' +
       'Please update your Node.js version or visit https://nodejs.org/ for additional instructions.\n',
   );
 
diff --git a/packages/angular/cli/bin/postinstall/analytics-prompt.js b/packages/angular/cli/bin/postinstall/analytics-prompt.js
index 04121439939e..b24c319ede10 100644
--- a/packages/angular/cli/bin/postinstall/analytics-prompt.js
+++ b/packages/angular/cli/bin/postinstall/analytics-prompt.js
@@ -10,7 +10,7 @@ try {
 
   analytics
     .hasGlobalAnalyticsConfiguration()
-    .then(hasGlobalConfig => {
+    .then((hasGlobalConfig) => {
       if (!hasGlobalConfig) {
         return analytics.promptGlobalAnalytics();
       }
diff --git a/packages/angular/cli/commands/add-impl.ts b/packages/angular/cli/commands/add-impl.ts
index 4f0188cd0415..722fac678db4 100644
--- a/packages/angular/cli/commands/add-impl.ts
+++ b/packages/angular/cli/commands/add-impl.ts
@@ -1,12 +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 { analytics, tags } from '@angular-devkit/core';
 import { NodePackageDoesNotSupportSchematics } from '@angular-devkit/schematics/tools';
+import npa from 'npm-package-arg';
 import { dirname, join } from 'path';
 import { intersects, prerelease, rcompare, satisfies, valid, validRange } from 'semver';
 import { PackageManager } from '../lib/config/workspace-schema';
@@ -27,12 +29,10 @@ import { Spinner } from '../utilities/spinner';
 import { isTTY } from '../utilities/tty';
 import { Schema as AddCommandSchema } from './add';
 
-const npa = require('npm-package-arg');
-
 export class AddCommand extends SchematicCommand<AddCommandSchema> {
-  readonly allowPrivateSchematics = true;
+  override readonly allowPrivateSchematics = true;
 
-  async initialize(options: AddCommandSchema & Arguments) {
+  override async initialize(options: AddCommandSchema & Arguments) {
     if (options.registry) {
       return super.initialize({ ...options, packageRegistry: options.registry });
     } else {
@@ -61,21 +61,12 @@ export class AddCommand extends SchematicCommand<AddCommandSchema> {
       return 1;
     }
 
-    if (packageIdentifier.registry && this.isPackageInstalled(packageIdentifier.name)) {
-      let validVersion = false;
-      const installedVersion = await this.findProjectVersion(packageIdentifier.name);
-      if (installedVersion) {
-        if (packageIdentifier.type === 'range') {
-          validVersion = satisfies(installedVersion, packageIdentifier.fetchSpec);
-        } else if (packageIdentifier.type === 'version') {
-          const v1 = valid(packageIdentifier.fetchSpec);
-          const v2 = valid(installedVersion);
-          validVersion = v1 !== null && v1 === v2;
-        } else if (!packageIdentifier.rawSpec) {
-          validVersion = true;
-        }
-      }
-
+    if (
+      packageIdentifier.name &&
+      packageIdentifier.registry &&
+      this.isPackageInstalled(packageIdentifier.name)
+    ) {
+      const validVersion = await this.isProjectVersionValid(packageIdentifier);
       if (validVersion) {
         // Already installed so just run schematic
         this.logger.info('Skipping installation: Package already installed');
@@ -91,7 +82,7 @@ export class AddCommand extends SchematicCommand<AddCommandSchema> {
     const usingYarn = packageManager === PackageManager.Yarn;
     spinner.info(`Using package manager: ${colors.grey(packageManager)}`);
 
-    if (packageIdentifier.type === 'tag' && !packageIdentifier.rawSpec) {
+    if (packageIdentifier.name && 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...');
@@ -125,12 +116,14 @@ export class AddCommand extends SchematicCommand<AddCommandSchema> {
         } else {
           packageIdentifier = npa.resolve(latestManifest.name, latestManifest.version);
         }
-        spinner.succeed(`Found compatible package version: ${colors.grey(packageIdentifier)}.`);
+        spinner.succeed(
+          `Found compatible package version: ${colors.grey(packageIdentifier.toString())}.`,
+        );
       } 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.deprecated,
-        ) as PackageManifest[];
+        );
 
         versionManifests.sort((a, b) => rcompare(a.version, b.version, true));
 
@@ -146,11 +139,15 @@ export class AddCommand extends SchematicCommand<AddCommandSchema> {
           spinner.warn("Unable to find compatible package.  Using 'latest'.");
         } else {
           packageIdentifier = newIdentifier;
-          spinner.succeed(`Found compatible package version: ${colors.grey(packageIdentifier)}.`);
+          spinner.succeed(
+            `Found compatible package version: ${colors.grey(packageIdentifier.toString())}.`,
+          );
         }
       } else {
         packageIdentifier = npa.resolve(latestManifest.name, latestManifest.version);
-        spinner.succeed(`Found compatible package version: ${colors.grey(packageIdentifier)}.`);
+        spinner.succeed(
+          `Found compatible package version: ${colors.grey(packageIdentifier.toString())}.`,
+        );
       }
     }
 
@@ -159,7 +156,7 @@ export class AddCommand extends SchematicCommand<AddCommandSchema> {
 
     try {
       spinner.start('Loading package information from registry...');
-      const manifest = await fetchPackageManifest(packageIdentifier, this.logger, {
+      const manifest = await fetchPackageManifest(packageIdentifier.toString(), this.logger, {
         registry: options.registry,
         verbose: options.verbose,
         usingYarn,
@@ -169,9 +166,7 @@ export class AddCommand extends SchematicCommand<AddCommandSchema> {
       collectionName = manifest.name;
 
       if (await this.hasMismatchedPeer(manifest)) {
-        spinner.warn(
-          'Package has unmet peer dependencies. Adding the package may not succeed.',
-        );
+        spinner.warn('Package has unmet peer dependencies. Adding the package may not succeed.');
       } else {
         spinner.succeed(`Package information loaded.`);
       }
@@ -190,7 +185,7 @@ export class AddCommand extends SchematicCommand<AddCommandSchema> {
       );
 
       if (!confirmationResponse) {
-        if (!isTTY) {
+        if (!isTTY()) {
           this.logger.error(
             'No terminal detected. ' +
               `'--skip-confirmation' can be used to bypass installation confirmation. ` +
@@ -203,45 +198,62 @@ export class AddCommand extends SchematicCommand<AddCommandSchema> {
       }
     }
 
-    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],
-          },
-        );
+    if (savePackage === false) {
+      // Temporary packages are located in a different directory
+      // Hence we need to resolve them using the temp path
+      const { status, tempNodeModules } = await installTempPackage(
+        packageIdentifier.raw,
+        packageManager,
+        options.registry ? [`--registry="${options.registry}"`] : undefined,
+      );
+      const resolvedCollectionPath = require.resolve(join(collectionName, 'package.json'), {
+        paths: [tempNodeModules],
+      });
 
-        collectionName = dirname(resolvedCollectionPath);
-      } else {
-        installPackage(
-          packageIdentifier.raw,
-          undefined,
-          packageManager,
-          savePackage,
-          options.registry ? [`--registry="${options.registry}"`] : undefined,
-        );
+      if (status !== 0) {
+        return status;
       }
-      spinner.succeed('Package successfully installed.');
-    } catch (error) {
-      spinner.fail(`Package installation failed: ${error.message}`);
 
-      return 1;
+      collectionName = dirname(resolvedCollectionPath);
+    } else {
+      const status = await installPackage(
+        packageIdentifier.raw,
+        packageManager,
+        savePackage,
+        options.registry ? [`--registry="${options.registry}"`] : undefined,
+      );
+
+      if (status !== 0) {
+        return status;
+      }
     }
 
     return this.executeSchematic(collectionName, options['--']);
   }
 
-  async reportAnalytics(
+  private async isProjectVersionValid(packageIdentifier: npa.Result): Promise<boolean> {
+    if (!packageIdentifier.name) {
+      return false;
+    }
+
+    let validVersion = false;
+    const installedVersion = await this.findProjectVersion(packageIdentifier.name);
+    if (installedVersion) {
+      if (packageIdentifier.type === 'range' && packageIdentifier.fetchSpec) {
+        validVersion = satisfies(installedVersion, packageIdentifier.fetchSpec);
+      } else if (packageIdentifier.type === 'version') {
+        const v1 = valid(packageIdentifier.fetchSpec);
+        const v2 = valid(installedVersion);
+        validVersion = v1 !== null && v1 === v2;
+      } else if (!packageIdentifier.rawSpec) {
+        validVersion = true;
+      }
+    }
+
+    return validVersion;
+  }
+
+  override async reportAnalytics(
     paths: string[],
     options: AddCommandSchema & Arguments,
     dimensions: (boolean | number | string)[] = [],
diff --git a/packages/angular/cli/commands/add.json b/packages/angular/cli/commands/add.json
index 014ec5ab4d6b..99cd82d897fb 100644
--- a/packages/angular/cli/commands/add.json
+++ b/packages/angular/cli/commands/add.json
@@ -42,8 +42,7 @@
           "default": false
         }
       },
-      "required": [
-      ]
+      "required": []
     },
     {
       "$ref": "./definitions.json#/definitions/interactive"
diff --git a/packages/angular/cli/commands/add.md b/packages/angular/cli/commands/add.md
index 465438a4e5b2..09cd2e239d76 100644
--- a/packages/angular/cli/commands/add.md
+++ b/packages/angular/cli/commands/add.md
@@ -2,6 +2,7 @@ Adds the npm package for a published library to your workspace, and configures
 the project in the current working directory (or the default project if you are
 not in a project directory) to use that library, as specified by the library's schematic.
 For example, adding `@angular/pwa` configures your project for PWA support:
+
 ```bash
 ng add @angular/pwa
 ```
diff --git a/packages/angular/cli/commands/analytics-impl.ts b/packages/angular/cli/commands/analytics-impl.ts
index 9174005d7b18..b0cc575ad173 100644
--- a/packages/angular/cli/commands/analytics-impl.ts
+++ b/packages/angular/cli/commands/analytics-impl.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 {
   promptGlobalAnalytics,
   promptProjectAnalytics,
@@ -12,8 +13,7 @@ import {
 } from '../models/analytics';
 import { Command } from '../models/command';
 import { Arguments } from '../models/interface';
-import { ProjectSetting, Schema as AnalyticsCommandSchema, SettingOrProject } from './analytics';
-
+import { Schema as AnalyticsCommandSchema, ProjectSetting, SettingOrProject } from './analytics';
 
 export class AnalyticsCommand extends Command<AnalyticsCommandSchema> {
   public async run(options: AnalyticsCommandSchema & Arguments) {
@@ -33,10 +33,14 @@ export class AnalyticsCommand extends Command<AnalyticsCommandSchema> {
 
         return 2;
       }
-    } else if (options.settingOrProject == SettingOrProject.Project
-               && options.projectSetting === undefined) {
-      this.logger.error(`Argument ${JSON.stringify(options.settingOrProject)} requires a second `
-                      + `argument of one of the following value: on, off.`);
+    } else if (
+      options.settingOrProject == SettingOrProject.Project &&
+      options.projectSetting === undefined
+    ) {
+      this.logger.error(
+        `Argument ${JSON.stringify(options.settingOrProject)} requires a second ` +
+          `argument of one of the following value: on, off.`,
+      );
 
       return 2;
     }
diff --git a/packages/angular/cli/commands/analytics-long.md b/packages/angular/cli/commands/analytics-long.md
index 60e0d86686e8..87b9925d1473 100644
--- a/packages/angular/cli/commands/analytics-long.md
+++ b/packages/angular/cli/commands/analytics-long.md
@@ -1,7 +1,8 @@
-The value of *settingOrProject* is one of the following.
-* "on" : Enables analytics gathering and reporting for the user.
-* "off" : Disables analytics gathering and reporting for the user.
-* "ci" : Enables analytics and configures reporting for use with Continuous Integration,
-which uses a common CI user.
-* "prompt" : Prompts the user to set the status interactively.
-* "project" : Sets the default status for the project to the *projectSetting* value, which can be any of the other values. The *projectSetting* argument is ignored for all other values of *settingOrProject*.
\ No newline at end of file
+The value of _settingOrProject_ is one of the following.
+
+- "on" : Enables analytics gathering and reporting for the user.
+- "off" : Disables analytics gathering and reporting for the user.
+- "ci" : Enables analytics and configures reporting for use with Continuous Integration,
+  which uses a common CI user.
+- "prompt" : Prompts the user to set the status interactively.
+- "project" : Sets the default status for the project to the _projectSetting_ value, which can be any of the other values. The _projectSetting_ argument is ignored for all other values of _settingOrProject_.
diff --git a/packages/angular/cli/commands/analytics.json b/packages/angular/cli/commands/analytics.json
index e34234d0e39d..ee2612b20399 100644
--- a/packages/angular/cli/commands/analytics.json
+++ b/packages/angular/cli/commands/analytics.json
@@ -14,13 +14,7 @@
     {
       "properties": {
         "settingOrProject": {
-          "enum": [
-            "on",
-            "off",
-            "ci",
-            "project",
-            "prompt"
-          ],
+          "enum": ["on", "off", "ci", "project", "prompt"],
           "description": "Directly enables or disables all usage analytics for the user, or prompts the user to set the status interactively, or sets the default status for the project.",
           "$default": {
             "$source": "argv",
@@ -28,11 +22,7 @@
           }
         },
         "projectSetting": {
-          "enum": [
-            "on",
-            "off",
-            "prompt"
-          ],
+          "enum": ["on", "off", "prompt"],
           "description": "Sets the default analytics enablement status for the project.",
           "$default": {
             "$source": "argv",
@@ -40,9 +30,7 @@
           }
         }
       },
-      "required": [
-        "settingOrProject"
-      ]
+      "required": ["settingOrProject"]
     },
     { "$ref": "./definitions.json#/definitions/base" }
   ]
diff --git a/packages/angular/cli/commands/build-impl.ts b/packages/angular/cli/commands/build-impl.ts
index 0bdd50b57949..2d983a7514b1 100644
--- a/packages/angular/cli/commands/build-impl.ts
+++ b/packages/angular/cli/commands/build-impl.ts
@@ -1,18 +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 { ArchitectCommand, ArchitectCommandOptions } from '../models/architect-command';
 import { Arguments } from '../models/interface';
 import { Schema as BuildCommandSchema } from './build';
 
 export class BuildCommand extends ArchitectCommand<BuildCommandSchema> {
-  public readonly target = 'build';
+  public override readonly target = 'build';
 
-  public async run(options: ArchitectCommandOptions & Arguments) {
+  public override async run(options: ArchitectCommandOptions & Arguments) {
     return this.runArchitectTarget(options);
   }
 }
diff --git a/packages/angular/cli/commands/build.json b/packages/angular/cli/commands/build.json
index 2dbe778cafed..df9d93b85a19 100644
--- a/packages/angular/cli/commands/build.json
+++ b/packages/angular/cli/commands/build.json
@@ -4,7 +4,7 @@
   "description": "Compiles an Angular app into an output directory named dist/ at the given output path. Must be executed from within a workspace directory.",
   "$longDescription": "./build-long.md",
 
-  "$aliases": [ "b" ],
+  "$aliases": ["b"],
   "$scope": "in",
   "$type": "architect",
   "$impl": "./build-impl#BuildCommand",
diff --git a/packages/angular/cli/commands/config-impl.ts b/packages/angular/cli/commands/config-impl.ts
index 329bc499a6f2..8736ad7ed807 100644
--- a/packages/angular/cli/commands/config-impl.ts
+++ b/packages/angular/cli/commands/config-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
@@ -10,21 +10,21 @@ import { JsonValue, tags } from '@angular-devkit/core';
 import { v4 as uuidV4 } from 'uuid';
 import { Command } from '../models/command';
 import { Arguments, CommandScope } from '../models/interface';
-import {
-  getWorkspaceRaw,
-  migrateLegacyGlobalConfig,
-  validateWorkspace,
-} from '../utilities/config';
+import { getWorkspaceRaw, migrateLegacyGlobalConfig, validateWorkspace } from '../utilities/config';
 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>([
+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()],
+  ['cli.analyticsSharing.uuid', (v) => (v === '' ? uuidV4() : `${v}`)],
 ]);
 
 /**
@@ -55,25 +55,40 @@ function parseJsonPath(path: string): (string | number)[] {
       const indices = match[2]
         .slice(1, -1)
         .split('][')
-        .map(x => (/^\d$/.test(x) ? +x : x.replace(/\"|\'/g, '')));
+        .map((x) => (/^\d$/.test(x) ? +x : x.replace(/\"|\'/g, '')));
       result.push(...indices);
     }
   }
 
-  return result.filter(fragment => fragment != null);
+  return result.filter((fragment) => fragment != null);
 }
 
 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)) {
+  switch (valueString) {
+    case 'true':
+      return true;
+    case 'false':
+      return false;
+    case 'null':
+      return null;
+    case 'undefined':
+      return undefined;
+  }
+
+  if (isFinite(+valueString)) {
     return +valueString;
   }
 
-  return value || undefined;
+  try {
+    // We use `JSON.parse` instead of `parseJson` because the latter will parse UUIDs
+    // and convert them into a numberic entities.
+    // Example: 73b61974-182c-48e4-b4c6-30ddf08c5c98 -> 73.
+    // These values should never contain comments, therefore using `JSON.parse` is safe.
+    return JSON.parse(valueString);
+  } catch {
+    return value;
+  }
 }
 
 export class ConfigCommand extends Command<ConfigCommandSchema> {
@@ -94,7 +109,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) {
diff --git a/packages/angular/cli/commands/config-long.md b/packages/angular/cli/commands/config-long.md
index 5f6052b3894a..7f44f63b3b32 100644
--- a/packages/angular/cli/commands/config-long.md
+++ b/packages/angular/cli/commands/config-long.md
@@ -10,4 +10,4 @@ while on the command line options can be given in either camelCase or dash-case.
 
 For further details, see [Workspace Configuration](guide/workspace-config).
 
-For configuration of CLI usage analytics, see [Gathering an Viewing CLI Usage Analytics](./usage-analytics-gathering).
\ No newline at end of file
+For configuration of CLI usage analytics, see [Gathering an Viewing CLI Usage Analytics](./usage-analytics-gathering).
diff --git a/packages/angular/cli/commands/config.json b/packages/angular/cli/commands/config.json
index 95a1f874119b..bec13fca4c0f 100644
--- a/packages/angular/cli/commands/config.json
+++ b/packages/angular/cli/commands/config.json
@@ -36,8 +36,7 @@
           "aliases": ["g"]
         }
       },
-      "required": [
-      ]
+      "required": []
     },
     { "$ref": "./definitions.json#/definitions/base" }
   ]
diff --git a/packages/angular/cli/commands/definitions.json b/packages/angular/cli/commands/definitions.json
index 5da8c67159a2..a18355349f46 100644
--- a/packages/angular/cli/commands/definitions.json
+++ b/packages/angular/cli/commands/definitions.json
@@ -16,9 +16,7 @@
         "configuration": {
           "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"
-          ]
+          "aliases": ["c"]
         },
         "prod": {
           "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.",
@@ -43,13 +41,13 @@
         "dryRun": {
           "type": "boolean",
           "default": false,
-          "aliases": [ "d" ],
+          "aliases": ["d"],
           "description": "Run through and reports activity without writing out results."
         },
         "force": {
           "type": "boolean",
           "default": false,
-          "aliases": [ "f" ],
+          "aliases": ["f"],
           "description": "Force overwriting of existing files."
         }
       }
diff --git a/packages/angular/cli/commands/deploy-impl.ts b/packages/angular/cli/commands/deploy-impl.ts
index 4572f27d8995..92b0ecd96f8e 100644
--- a/packages/angular/cli/commands/deploy-impl.ts
+++ b/packages/angular/cli/commands/deploy-impl.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 { ArchitectCommand } from '../models/architect-command';
 import { Arguments } from '../models/interface';
 import { Schema as DeployCommandSchema } from './deploy';
@@ -24,10 +25,12 @@ Find more packages on npm https://www.npmjs.com/search?q=ng%20deploy
 `;
 
 export class DeployCommand extends ArchitectCommand<DeployCommandSchema> {
-  public readonly target = 'deploy';
-  public readonly missingTargetError = BuilderMissing;
+  public override readonly target = 'deploy';
+  public override readonly missingTargetError = BuilderMissing;
 
-  public async initialize(options: DeployCommandSchema & Arguments): Promise<number | void> {
+  public override async initialize(
+    options: DeployCommandSchema & Arguments,
+  ): Promise<number | void> {
     if (!options.help) {
       return super.initialize(options);
     }
diff --git a/packages/angular/cli/commands/deploy-long.md b/packages/angular/cli/commands/deploy-long.md
index afe619565c0a..9d13ad2a9890 100644
--- a/packages/angular/cli/commands/deploy-long.md
+++ b/packages/angular/cli/commands/deploy-long.md
@@ -19,4 +19,4 @@ For example:
     }
   }
 }
- ```
\ No newline at end of file
+```
diff --git a/packages/angular/cli/commands/deploy.json b/packages/angular/cli/commands/deploy.json
index 31f6d8e7e4c5..cc7c860dde1c 100644
--- a/packages/angular/cli/commands/deploy.json
+++ b/packages/angular/cli/commands/deploy.json
@@ -22,9 +22,7 @@
         "configuration": {
           "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"
-          ]
+          "aliases": ["c"]
         }
       },
       "required": []
diff --git a/packages/angular/cli/commands/doc-impl.ts b/packages/angular/cli/commands/doc-impl.ts
index 1c1fc86d1535..b39665b68abe 100644
--- a/packages/angular/cli/commands/doc-impl.ts
+++ b/packages/angular/cli/commands/doc-impl.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 open from 'open';
+import open from 'open';
 import { Command } from '../models/command';
 import { Arguments } from '../models/interface';
 import { Schema as DocCommandSchema } from './doc';
@@ -37,10 +37,10 @@ export class DocCommand extends Command<DocCommandSchema> {
       // we try to get the current Angular version of the project
       // and use it if we can find it
       try {
-        /* tslint:disable-next-line:no-implicit-dependencies */
+        /* eslint-disable-next-line import/no-extraneous-dependencies */
         const currentNgVersion = (await import('@angular/core')).VERSION.major;
         domain = `v${currentNgVersion}.angular.io`;
-      } catch (e) { }
+      } catch (e) {}
     }
 
     let searchUrl = `https://${domain}/api?query=${options.keyword}`;
diff --git a/packages/angular/cli/commands/doc.json b/packages/angular/cli/commands/doc.json
index de6cf2ff6323..bb01549c6099 100644
--- a/packages/angular/cli/commands/doc.json
+++ b/packages/angular/cli/commands/doc.json
@@ -4,7 +4,7 @@
   "description": "Opens the official Angular documentation (angular.io) in a browser, and searches for a given keyword.",
   "$longDescription": "",
 
-  "$aliases": [ "d" ],
+  "$aliases": ["d"],
   "$type": "native",
   "$impl": "./doc-impl#DocCommand",
 
@@ -26,7 +26,7 @@
           "default": false,
           "description": "Search all of angular.io. Otherwise, searches only API reference documentation."
         },
-        "version" : {
+        "version": {
           "oneOf": [
             {
               "type": "number",
@@ -39,8 +39,7 @@
           "description": "Contains the version of Angular to use for the documentation. If not provided, the command uses your current Angular core version."
         }
       },
-      "required": [
-      ]
+      "required": []
     },
     { "$ref": "./definitions.json#/definitions/base" }
   ]
diff --git a/packages/angular/cli/commands/e2e-impl.ts b/packages/angular/cli/commands/e2e-impl.ts
index f24a44ca4122..5a1df466d97d 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
@@ -10,12 +10,25 @@ import { ArchitectCommand } from '../models/architect-command';
 import { Arguments } from '../models/interface';
 import { Schema as E2eCommandSchema } from './e2e';
 
-
 export class E2eCommand extends ArchitectCommand<E2eCommandSchema> {
-  public readonly target = 'e2e';
-  public readonly multiTarget = true;
+  public override readonly target = 'e2e';
+  public override readonly multiTarget = true;
+  public override readonly missingTargetError = `
+Cannot find "e2e" target for the specified project.
+
+You should add a package that implements end-to-end testing capabilities.
+
+For example:
+  Cypress: ng add @cypress/schematic
+  Nightwatch: ng add @nightwatch/schematics
+  WebdriverIO: ng add @wdio/schematics
+
+More options will be added to the list as they become available.
+`;
 
-  public async run(options: E2eCommandSchema & Arguments) {
-    return this.runArchitectTarget(options);
+  override async initialize(options: E2eCommandSchema & Arguments) {
+    if (!options.help) {
+      return super.initialize(options);
+    }
   }
 }
diff --git a/packages/angular/cli/commands/e2e-long.md b/packages/angular/cli/commands/e2e-long.md
index 6b651df713d9..26363135a8ce 100644
--- a/packages/angular/cli/commands/e2e-long.md
+++ b/packages/angular/cli/commands/e2e-long.md
@@ -1,2 +1,4 @@
-Must be executed from within a workspace directory.
-When a project name is not supplied, it will execute for all projects.
\ No newline at end of file
+The command takes an optional project name, as specified in the `projects` section of the `angular.json` workspace configuration file.
+When a project name is not supplied, executes the `e2e` builder for the default project.
+
+To use the `ng e2e` command, use `ng add` to add a package that implements end-to-end testing capabilities. Adding the package automatically updates your workspace configuration, adding an `e2e` [CLI builder](guide/cli-builder).
diff --git a/packages/angular/cli/commands/e2e.json b/packages/angular/cli/commands/e2e.json
index 602d4d0560a7..a8c8cccc4b62 100644
--- a/packages/angular/cli/commands/e2e.json
+++ b/packages/angular/cli/commands/e2e.json
@@ -1,10 +1,10 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "ng-cli://commands/e2e.json",
-  "description": "Builds and serves an Angular app, then runs end-to-end tests using Protractor.",
+  "description": "Builds and serves an Angular app, then runs end-to-end tests.",
   "$longDescription": "./e2e-long.md",
 
-  "$aliases": [ "e" ],
+  "$aliases": ["e"],
   "$scope": "in",
   "$type": "architect",
   "$impl": "./e2e-impl#E2eCommand",
diff --git a/packages/angular/cli/commands/easter-egg-impl.ts b/packages/angular/cli/commands/easter-egg-impl.ts
index 8e70d46dc827..3857c38444a5 100644
--- a/packages/angular/cli/commands/easter-egg-impl.ts
+++ b/packages/angular/cli/commands/easter-egg-impl.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 { Command } from '../models/command';
 import { colors } from '../utilities/color';
 import { Schema as AwesomeCommandSchema } from './easter-egg';
diff --git a/packages/angular/cli/commands/easter-egg.json b/packages/angular/cli/commands/easter-egg.json
index b42b12b1156e..79d9e1bb2edf 100644
--- a/packages/angular/cli/commands/easter-egg.json
+++ b/packages/angular/cli/commands/easter-egg.json
@@ -8,7 +8,5 @@
   "$impl": "./easter-egg-impl#AwesomeCommand",
 
   "type": "object",
-  "allOf": [
-    { "$ref": "./definitions.json#/definitions/base" }
-  ]
+  "allOf": [{ "$ref": "./definitions.json#/definitions/base" }]
 }
diff --git a/packages/angular/cli/commands/extract-i18n-impl.ts b/packages/angular/cli/commands/extract-i18n-impl.ts
index 00a8e2e4ce2d..3520d57d3e2d 100644
--- a/packages/angular/cli/commands/extract-i18n-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
@@ -11,21 +11,25 @@ import { Arguments } from '../models/interface';
 import { Schema as ExtractI18nCommandSchema } from './extract-i18n';
 
 export class ExtractI18nCommand extends ArchitectCommand<ExtractI18nCommandSchema> {
-  public readonly target = 'extract-i18n';
+  public override readonly target = 'extract-i18n';
 
-  public async run(options: ExtractI18nCommandSchema & Arguments) {
+  public override async run(options: ExtractI18nCommandSchema & Arguments) {
     const version = process.version.substr(1).split('.');
     if (Number(version[0]) === 12 && Number(version[1]) === 0) {
       this.logger.error(
-        'Due to a defect in Node.js 12.0, the command is not supported on this Node.js version. '
-        + 'Please upgrade to Node.js 12.1 or later.');
+        'Due to a defect in Node.js 12.0, the command is not supported on this Node.js version. ' +
+          'Please upgrade to Node.js 12.1 or later.',
+      );
 
       return 1;
     }
 
     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.`);
+      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/generate-impl.ts b/packages/angular/cli/commands/generate-impl.ts
index c32ccd7b87ea..49d71dd3555c 100644
--- a/packages/angular/cli/commands/generate-impl.ts
+++ b/packages/angular/cli/commands/generate-impl.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 { Arguments, SubCommandDescription } from '../models/interface';
 import { SchematicCommand } from '../models/schematic-command';
 import { colors } from '../utilities/color';
@@ -15,7 +16,7 @@ export class GenerateCommand extends SchematicCommand<GenerateCommandSchema> {
   // Allows us to resolve aliases before reporting analytics
   longSchematicName: string | undefined;
 
-  async initialize(options: GenerateCommandSchema & Arguments) {
+  override async initialize(options: GenerateCommandSchema & Arguments) {
     // Fill up the schematics property of the command description.
     const [collectionName, schematicName] = await this.parseSchematicInfo(options);
     this.collectionName = collectionName;
@@ -52,7 +53,7 @@ export class GenerateCommand extends SchematicCommand<GenerateCommandSchema> {
       }
     }
 
-    this.description.options.forEach(option => {
+    this.description.options.forEach((option) => {
       if (option.name == 'schematic') {
         option.subcommands = subcommands;
       }
@@ -74,7 +75,7 @@ export class GenerateCommand extends SchematicCommand<GenerateCommandSchema> {
     });
   }
 
-  async reportAnalytics(
+  override async reportAnalytics(
     paths: string[],
     options: GenerateCommandSchema & Arguments,
   ): Promise<void> {
@@ -89,7 +90,9 @@ export class GenerateCommand extends SchematicCommand<GenerateCommandSchema> {
     );
   }
 
-  private async parseSchematicInfo(options: GenerateCommandSchema): Promise<[string, string | undefined]> {
+  private async parseSchematicInfo(
+    options: GenerateCommandSchema,
+  ): Promise<[string, string | undefined]> {
     let collectionName = await this.getDefaultSchematicCollection();
 
     let schematicName = options.schematic;
@@ -101,12 +104,12 @@ export class GenerateCommand extends SchematicCommand<GenerateCommandSchema> {
     return [collectionName, schematicName];
   }
 
-  public async printHelp() {
+  public override async printHelp() {
     await super.printHelp();
 
     this.logger.info('');
     // Find the generate subcommand.
-    const subcommand = this.description.options.filter(x => x.subcommands)[0];
+    const subcommand = this.description.options.filter((x) => x.subcommands)[0];
     if (Object.keys((subcommand && subcommand.subcommands) || {}).length == 1) {
       this.logger.info(`\nTo see help for a schematic run:`);
       this.logger.info(colors.cyan(`  ng generate <schematic> --help`));
diff --git a/packages/angular/cli/commands/generate.json b/packages/angular/cli/commands/generate.json
index 833fe78436b3..53228340abd4 100644
--- a/packages/angular/cli/commands/generate.json
+++ b/packages/angular/cli/commands/generate.json
@@ -4,7 +4,7 @@
   "description": "Generates and/or modifies files based on a schematic.",
   "$longDescription": "",
 
-  "$aliases": [ "g" ],
+  "$aliases": ["g"],
   "$scope": "in",
   "$type": "schematics",
   "$impl": "./generate-impl#GenerateCommand",
@@ -22,8 +22,7 @@
           }
         }
       },
-      "required": [
-      ]
+      "required": []
     },
     { "$ref": "./definitions.json#/definitions/base" },
     { "$ref": "./definitions.json#/definitions/schematic" },
diff --git a/packages/angular/cli/commands/help-impl.ts b/packages/angular/cli/commands/help-impl.ts
index 9c30c5e2f608..c7ccc282493d 100644
--- a/packages/angular/cli/commands/help-impl.ts
+++ b/packages/angular/cli/commands/help-impl.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 { Command } from '../models/command';
 import { colors } from '../utilities/color';
 import { Schema as HelpCommandSchema } from './help';
diff --git a/packages/angular/cli/commands/help-long.md b/packages/angular/cli/commands/help-long.md
index b104a1a6c03e..cc4b790f906e 100644
--- a/packages/angular/cli/commands/help-long.md
+++ b/packages/angular/cli/commands/help-long.md
@@ -1,7 +1,7 @@
- For help with individual commands, use the `--help` or `-h` option with the command.
+For help with individual commands, use the `--help` or `-h` option with the command.
 
- For example,
+For example,
 
- ```sh
- ng help serve
- ```
+```sh
+ng help serve
+```
diff --git a/packages/angular/cli/commands/help.json b/packages/angular/cli/commands/help.json
index 266a6d72aa6d..a6513118d0e4 100644
--- a/packages/angular/cli/commands/help.json
+++ b/packages/angular/cli/commands/help.json
@@ -9,7 +9,5 @@
   "$impl": "./help-impl#HelpCommand",
 
   "type": "object",
-  "allOf": [
-    { "$ref": "./definitions.json#/definitions/base" }
-  ]
+  "allOf": [{ "$ref": "./definitions.json#/definitions/base" }]
 }
diff --git a/packages/angular/cli/commands/lint-impl.ts b/packages/angular/cli/commands/lint-impl.ts
index af2df1aaab64..8067ea26eea4 100644
--- a/packages/angular/cli/commands/lint-impl.ts
+++ b/packages/angular/cli/commands/lint-impl.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 { ArchitectCommand } from '../models/architect-command';
 import { Arguments } from '../models/interface';
 import { Schema as LintCommandSchema } from './lint';
@@ -19,11 +20,11 @@ For example:
 `;
 
 export class LintCommand extends ArchitectCommand<LintCommandSchema> {
-  readonly target = 'lint';
-  readonly multiTarget = true;
-  readonly missingTargetError = MissingBuilder;
+  override readonly target = 'lint';
+  override readonly multiTarget = true;
+  override readonly missingTargetError = MissingBuilder;
 
-  async initialize(options: LintCommandSchema & Arguments): Promise<number | void> {
+  override async initialize(options: LintCommandSchema & Arguments): Promise<number | void> {
     if (!options.help) {
       return super.initialize(options);
     }
diff --git a/packages/angular/cli/commands/lint-long.md b/packages/angular/cli/commands/lint-long.md
index 1588c8438fff..1c912b2489d7 100644
--- a/packages/angular/cli/commands/lint-long.md
+++ b/packages/angular/cli/commands/lint-long.md
@@ -1,5 +1,5 @@
 The command takes an optional project name, as specified in the `projects` section of the `angular.json` workspace configuration file.
-When a project name is not supplied, executes the `lint` builder for the default project.
+When a project name is not supplied, executes the `lint` builder for all projects.
 
 To use the `ng lint` command, use `ng add` to add a package that implements linting capabilities. Adding the package automatically updates your workspace configuration, adding a lint [CLI builder](guide/cli-builder).
 For example:
@@ -17,4 +17,4 @@ For example:
     }
   }
 }
- ```
\ No newline at end of file
+```
diff --git a/packages/angular/cli/commands/lint.json b/packages/angular/cli/commands/lint.json
index e157fe583f57..824632e79f76 100644
--- a/packages/angular/cli/commands/lint.json
+++ b/packages/angular/cli/commands/lint.json
@@ -24,9 +24,7 @@
         "configuration": {
           "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"
-          ]
+          "aliases": ["c"]
         }
       },
       "required": []
diff --git a/packages/angular/cli/commands/new-impl.ts b/packages/angular/cli/commands/new-impl.ts
index 55a91ea41fcc..b4869de0f043 100644
--- a/packages/angular/cli/commands/new-impl.ts
+++ b/packages/angular/cli/commands/new-impl.ts
@@ -1,31 +1,29 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of 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 { VERSION } from '../models/version';
 import { Schema as NewCommandSchema } from './new';
 
-
 export class NewCommand extends SchematicCommand<NewCommandSchema> {
-  public readonly allowMissingWorkspace = true;
-  schematicName = 'ng-new';
+  public override readonly allowMissingWorkspace = true;
+  override schematicName = 'ng-new';
 
-  async initialize(options: NewCommandSchema & Arguments) {
-    this.collectionName = options.collection || await this.getDefaultSchematicCollection();
+  override async initialize(options: NewCommandSchema & Arguments) {
+    this.collectionName = options.collection || (await this.getDefaultSchematicCollection());
 
     return super.initialize(options);
   }
 
   public async run(options: NewCommandSchema & Arguments) {
     // Register the version of the CLI in the registry.
-    const packageJson = require('../package.json');
-    const version = packageJson.version;
-
+    const version = VERSION.full;
     this._workflow.registry.addSmartDefaultProvider('ng-cli-version', () => version);
 
     return this.runSchematic({
@@ -37,5 +35,4 @@ export class NewCommand extends SchematicCommand<NewCommandSchema> {
       force: !!options.force,
     });
   }
-
 }
diff --git a/packages/angular/cli/commands/new.json b/packages/angular/cli/commands/new.json
index 640104d61524..90efa76056be 100644
--- a/packages/angular/cli/commands/new.json
+++ b/packages/angular/cli/commands/new.json
@@ -4,7 +4,7 @@
   "description": "Creates a new workspace and an initial Angular application.",
   "$longDescription": "./new.md",
 
-  "$aliases": [ "n" ],
+  "$aliases": ["n"],
   "$scope": "out",
   "$type": "schematic",
   "$impl": "./new-impl#NewCommand",
@@ -15,13 +15,13 @@
       "properties": {
         "collection": {
           "type": "string",
-          "aliases": [ "c" ],
+          "aliases": ["c"],
           "description": "A collection of schematics to use in generating the initial application."
         },
         "verbose": {
           "type": "boolean",
           "default": false,
-          "aliases": [ "v" ],
+          "aliases": ["v"],
           "description": "Add more details to output logging."
         }
       },
diff --git a/packages/angular/cli/commands/new.md b/packages/angular/cli/commands/new.md
index 5d344b5d4312..ca3f14b8d696 100644
--- a/packages/angular/cli/commands/new.md
+++ b/packages/angular/cli/commands/new.md
@@ -3,14 +3,14 @@ Creates and initializes a new Angular application that is the default project fo
 Provides interactive prompts for optional configuration, such as adding routing support.
 All prompts can safely be allowed to default.
 
-* The new workspace folder is given the specified project name, and contains configuration files at the top level.
+- The new workspace folder is given the specified project name, and contains configuration files at the top level.
 
-* 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.
+- 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 application'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 applications 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 applications in the workspace, you can create an empty workspace by setting the `--createApplication` option to false.
+If you plan to have multiple applications in the workspace, you can create an empty workspace by setting the `--create-application` 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
+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.
diff --git a/packages/angular/cli/commands/run-impl.ts b/packages/angular/cli/commands/run-impl.ts
index feefe731fa5b..d9cee91850aa 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
@@ -11,7 +11,7 @@ import { Arguments } from '../models/interface';
 import { Schema as RunCommandSchema } from './run';
 
 export class RunCommand extends ArchitectCommand<RunCommandSchema> {
-  public async run(options: ArchitectCommandOptions & Arguments) {
+  public override async run(options: ArchitectCommandOptions & Arguments) {
     if (options.target) {
       return this.runArchitectTarget(options);
     } else {
diff --git a/packages/angular/cli/commands/run-long.md b/packages/angular/cli/commands/run-long.md
index a95bbd78a27a..65a307fcd771 100644
--- a/packages/angular/cli/commands/run-long.md
+++ b/packages/angular/cli/commands/run-long.md
@@ -13,4 +13,4 @@ Execute the command using the following format.
 
 ```
 ng run project:target[:configuration]
-```
\ No newline at end of file
+```
diff --git a/packages/angular/cli/commands/run.json b/packages/angular/cli/commands/run.json
index cd269a7b34b2..f4e2287dbf35 100644
--- a/packages/angular/cli/commands/run.json
+++ b/packages/angular/cli/commands/run.json
@@ -24,11 +24,10 @@
         "configuration": {
           "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" ]
+          "aliases": ["c"]
         }
       },
-      "required": [
-      ]
+      "required": []
     },
     {
       "$ref": "./definitions.json#/definitions/base"
diff --git a/packages/angular/cli/commands/serve-impl.ts b/packages/angular/cli/commands/serve-impl.ts
index 04b51eee4e4a..9d8dc3bec6eb 100644
--- a/packages/angular/cli/commands/serve-impl.ts
+++ b/packages/angular/cli/commands/serve-impl.ts
@@ -1,22 +1,23 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+
 import { ArchitectCommand, ArchitectCommandOptions } from '../models/architect-command';
 import { Arguments } from '../models/interface';
 import { Schema as ServeCommandSchema } from './serve';
 
 export class ServeCommand extends ArchitectCommand<ServeCommandSchema> {
-  public readonly target = 'serve';
+  public override readonly target = 'serve';
 
-  public validate(_options: ArchitectCommandOptions & Arguments) {
+  public validate() {
     return true;
   }
 
-  public async run(options: ArchitectCommandOptions & Arguments) {
+  public override async run(options: ArchitectCommandOptions & Arguments) {
     return this.runArchitectTarget(options);
   }
 }
diff --git a/packages/angular/cli/commands/serve.json b/packages/angular/cli/commands/serve.json
index 8926362231d1..efc7ba4089ae 100644
--- a/packages/angular/cli/commands/serve.json
+++ b/packages/angular/cli/commands/serve.json
@@ -4,7 +4,7 @@
   "description": "Builds and serves your app, rebuilding on file changes.",
   "$longDescription": "",
 
-  "$aliases": [ "s" ],
+  "$aliases": ["s"],
   "$scope": "in",
   "$type": "architect",
   "$impl": "./serve-impl#ServeCommand",
diff --git a/packages/angular/cli/commands/test-impl.ts b/packages/angular/cli/commands/test-impl.ts
index 28f09df4d7b2..511520b0f02b 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
@@ -11,10 +11,10 @@ import { Arguments } from '../models/interface';
 import { Schema as TestCommandSchema } from './test';
 
 export class TestCommand extends ArchitectCommand<TestCommandSchema> {
-  public readonly target = 'test';
-  public readonly multiTarget = true;
+  public override readonly target = 'test';
+  public override readonly multiTarget = true;
 
-  public async run(options: ArchitectCommandOptions & Arguments) {
+  public override async run(options: ArchitectCommandOptions & Arguments) {
     return this.runArchitectTarget(options);
   }
 }
diff --git a/packages/angular/cli/commands/test-long.md b/packages/angular/cli/commands/test-long.md
index 64dae312ab47..25086c174e15 100644
--- a/packages/angular/cli/commands/test-long.md
+++ b/packages/angular/cli/commands/test-long.md
@@ -1,2 +1,2 @@
 Takes the name of the project, as specified in the `projects` section of the `angular.json` workspace configuration file.
-When a project name is not supplied, it will execute for all projects.
\ No newline at end of file
+When a project name is not supplied, it will execute for all projects.
diff --git a/packages/angular/cli/commands/test.json b/packages/angular/cli/commands/test.json
index a9ebb3f8044c..5fb4ce014c48 100644
--- a/packages/angular/cli/commands/test.json
+++ b/packages/angular/cli/commands/test.json
@@ -4,7 +4,7 @@
   "description": "Runs unit tests in a project.",
   "$longDescription": "./test-long.md",
 
-  "$aliases": [ "t" ],
+  "$aliases": ["t"],
   "$scope": "in",
   "$type": "architect",
   "$impl": "./test-impl#TestCommand",
diff --git a/packages/angular/cli/commands/update-impl.ts b/packages/angular/cli/commands/update-impl.ts
index f4f1f724254e..ad6285b931e6 100644
--- a/packages/angular/cli/commands/update-impl.ts
+++ b/packages/angular/cli/commands/update-impl.ts
@@ -1,22 +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
  */
+
 import { UnsuccessfulWorkflowExecution } from '@angular-devkit/schematics';
 import { NodeWorkflow } from '@angular-devkit/schematics/tools';
 import { execSync } from 'child_process';
 import * as fs from 'fs';
+import npa from 'npm-package-arg';
 import * as path from 'path';
 import * as semver from 'semver';
 import { PackageManager } from '../lib/config/workspace-schema';
 import { Command } from '../models/command';
 import { Arguments } from '../models/interface';
 import { SchematicEngineHost } from '../models/schematic-engine-host';
+import { VERSION } from '../models/version';
 import { colors } from '../utilities/color';
-import { runTempPackageBin } from '../utilities/install-package';
+import { installAllPackages, runTempPackageBin } from '../utilities/install-package';
 import { writeErrorToLogFile } from '../utilities/log-file';
 import { ensureCompatibleNpm, getPackageManager } from '../utilities/package-manager';
 import {
@@ -34,17 +37,11 @@ import {
 } from '../utilities/package-tree';
 import { Schema as UpdateCommandSchema } from './update';
 
-const npa = require('npm-package-arg') as (selector: string) => PackageIdentifier;
 const pickManifest = require('npm-pick-manifest') as (
   metadata: PackageMetadata,
   selector: string,
 ) => PackageManifest;
 
-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',
-);
-
 const UPDATE_SCHEMATIC_COLLECTION = path.join(
   __dirname,
   '../src/commands/update/schematic/collection.json',
@@ -60,24 +57,24 @@ const disableVersionCheck =
   disableVersionCheckEnv !== '0' &&
   disableVersionCheckEnv.toLowerCase() !== 'false';
 
+const ANGULAR_PACKAGES_REGEXP = /^@(?:angular|nguniversal)\//;
+
 export class UpdateCommand extends Command<UpdateCommandSchema> {
-  public readonly allowMissingWorkspace = true;
+  public override readonly allowMissingWorkspace = true;
   private workflow!: NodeWorkflow;
   private packageManager = PackageManager.Npm;
 
-  async initialize() {
+  override async initialize(options: UpdateCommandSchema & Arguments) {
     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,
-        engineHostCreator: (options) => new SchematicEngineHost(options.resolvePaths),
-      },
-    );
+    this.workflow = new NodeWorkflow(this.context.root, {
+      packageManager: this.packageManager,
+      packageManagerForce: options.force,
+      // __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(
@@ -89,7 +86,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;
 
@@ -119,11 +116,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 = [];
         }
       }
@@ -146,12 +143,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`,
         );
       }
 
@@ -169,7 +168,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}'.`);
 
@@ -191,10 +190,14 @@ export class UpdateCommand extends Command<UpdateCommandSchema> {
   private async executeMigrations(
     packageName: string,
     collectionPath: string,
-    range: semver.Range,
+    from: string,
+    to: string,
     commit?: boolean,
   ): Promise<boolean> {
     const collection = this.workflow.engine.createCollection(collectionPath);
+    const migrationRange = new semver.Range(
+      '>' + (semver.prerelease(from) ? from.split('-')[0] + '-0' : from) + ' <=' + to.split('-')[0],
+    );
     const migrations = [];
 
     for (const name of collection.listSchematicNames()) {
@@ -207,7 +210,7 @@ export class UpdateCommand extends Command<UpdateCommandSchema> {
         continue;
       }
 
-      if (semver.satisfies(description.version, range, { includePrerelease: true })) {
+      if (semver.satisfies(description.version, migrationRange, { includePrerelease: true })) {
         migrations.push(description as typeof schematic.description & { version: string });
       }
     }
@@ -218,15 +221,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> {
@@ -234,8 +235,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) {
@@ -268,23 +270,30 @@ export class UpdateCommand extends Command<UpdateCommandSchema> {
     return true;
   }
 
-  // tslint:disable-next-line:no-big-function
+  // eslint-disable-next-line max-lines-per-function
   async run(options: UpdateCommandSchema & Arguments) {
     await ensureCompatibleNpm(this.context.root);
 
-    // 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.',
+    // 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,
       );
 
-      return runTempPackageBin(
-        `@angular/cli@${options.next ? 'next' : 'latest'}`,
-        this.logger,
-        this.packageManager,
-        process.argv.slice(2),
-      );
+      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 runTempPackageBin(
+          `@angular/cli@${cliVersionToInstall}`,
+          this.packageManager,
+          process.argv.slice(2),
+        );
+      }
     }
 
     const logVerbose = (message: string) => {
@@ -294,9 +303,10 @@ export class UpdateCommand extends Command<UpdateCommandSchema> {
     };
 
     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.
@@ -319,7 +329,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;
@@ -334,7 +344,7 @@ export class UpdateCommand extends Command<UpdateCommandSchema> {
           packageIdentifier.fetchSpec = 'next';
         }
 
-        packages.push(packageIdentifier);
+        packages.push(packageIdentifier as PackageIdentifier);
       } catch (e) {
         this.logger.error(e.message);
 
@@ -386,7 +396,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) {
@@ -449,8 +461,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;
@@ -476,9 +487,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,
@@ -492,32 +503,16 @@ export class UpdateCommand extends Command<UpdateCommandSchema> {
           return 1;
         }
 
-        const migrationRange = new semver.Range(
-          '>' + from + ' <=' + (options.to || packageNode.version),
-        );
-
-        success = await this.executeMigrations(
+        result = await this.executeMigrations(
           packageName,
           migrations,
-          migrationRange,
+          from,
+          options.to || packageNode.version,
           options.createCommits,
         );
       }
 
-      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: {
@@ -607,33 +602,40 @@ export class UpdateCommand extends Command<UpdateCommandSchema> {
         return 1;
       }
 
-      if (node.package?.name === '@angular/cli') {
-        // Migrations for non LTS versions of Angular CLI are no longer included in @schematics/angular v12.
+      if (manifest.version === node.package?.version) {
+        this.logger.info(`Package '${packageName}' is already up to date.`);
+        continue;
+      }
+
+      if (node.package && ANGULAR_PACKAGES_REGEXP.test(node.package.name)) {
+        const { name, version } = node.package;
         const toBeInstalledMajorVersion = +manifest.version.split('.')[0];
-        const currentMajorVersion = +node.package.version.split('.')[0];
-        if (currentMajorVersion < 9 && toBeInstalledMajorVersion >= 12) {
-          const updateVersions: Record<number, number> = {
-            1: 6,
-            6: 7,
-            7: 8,
-            8: 9,
-          };
-
-          const updateTo = updateVersions[currentMajorVersion];
-          this.logger.error('Updating multiple major versions at once is not recommended. ' +
-            `Run 'ng update @angular/cli@${updateTo}' in your workspace directory ` +
-            `to update to latest '${updateTo}.x' version of '@angular/cli'.\n\n` +
-            'For more information about the update process, see https://update.angular.io/.');
+        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;
         }
       }
 
-      if (manifest.version === node.package?.version) {
-        this.logger.info(`Package '${packageName}' is already up to date.`);
-        continue;
-      }
-
       packagesToUpdate.push(requestIdentifier.toString());
     }
 
@@ -647,19 +649,39 @@ export class UpdateCommand extends Command<UpdateCommandSchema> {
       next: !!options.next,
       packageManager: this.packageManager,
       packages: packagesToUpdate,
-      migrateExternal: true,
     });
 
+    if (success) {
+      try {
+        // Remove existing node modules directory to provide a stronger guarantee that packages
+        // will be hoisted into the correct locations.
+        await fs.promises.rmdir(path.join(this.context.root, 'node_modules'), {
+          recursive: true,
+          maxRetries: 3,
+        });
+      } catch {}
+
+      const result = await installAllPackages(
+        this.packageManager,
+        options.force ? ['--force'] : [],
+        this.context.root,
+      );
+      if (result !== 0) {
+        return result;
+      }
+    }
+
     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;
       }
     }
 
     // This is a temporary workaround to allow data to be passed back from the update schematic
-    // tslint:disable-next-line: no-any
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const migrations = (global as any).externalMigrations as {
       package: string;
       collection: string;
@@ -733,7 +755,8 @@ export class UpdateCommand extends Command<UpdateCommandSchema> {
         const result = await this.executeMigrations(
           migration.package,
           migrations,
-          new semver.Range('>' + migration.from + ' <=' + migration.to),
+          migration.from,
+          migration.to,
           options.createCommits,
         );
 
@@ -741,10 +764,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;
@@ -774,8 +793,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;
     }
@@ -784,8 +802,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.
@@ -798,7 +815,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;
@@ -821,14 +841,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,
@@ -836,7 +858,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;
   }
 }
 
@@ -869,7 +922,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.json b/packages/angular/cli/commands/update.json
index c2eace203830..7de5a1935146 100644
--- a/packages/angular/cli/commands/update.json
+++ b/packages/angular/cli/commands/update.json
@@ -28,7 +28,7 @@
           }
         },
         "force": {
-          "description": "If false, will error out if installed packages are incompatible with the update.",
+          "description": "Ignore peer dependency version mismatches. Passes the `--force` flag to the package manager when installing packages.",
           "default": false,
           "type": "boolean"
         },
diff --git a/packages/angular/cli/commands/version-impl.ts b/packages/angular/cli/commands/version-impl.ts
index 1619eccee6d8..4503cfdc84cd 100644
--- a/packages/angular/cli/commands/version-impl.ts
+++ b/packages/angular/cli/commands/version-impl.ts
@@ -1,15 +1,23 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+
+import { execSync } from 'child_process';
 import * as path from 'path';
 import { Command } from '../models/command';
 import { colors } from '../utilities/color';
+import { getPackageManager } from '../utilities/package-manager';
 import { Schema as VersionCommandSchema } from './version';
 
+/**
+ * Major versions of Node.js that are officially supported by Angular.
+ */
+const SUPPORTED_NODE_MAJORS = [12, 14];
+
 interface PartialPackageInfo {
   name: string;
   version: string;
@@ -27,6 +35,9 @@ export class VersionCommand extends Command<VersionCommandSchema> {
       workspacePackage = require(path.resolve(this.context.root, 'package.json'));
     } catch {}
 
+    const [nodeMajor] = process.versions.node.split('.').map((part) => Number(part));
+    const unsupportedNodeVersion = !SUPPORTED_NODE_MAJORS.includes(nodeMajor);
+
     const patterns = [
       /^@angular\/.*/,
       /^@angular-devkit\/.*/,
@@ -48,19 +59,16 @@ export class VersionCommand extends Command<VersionCommandSchema> {
     ];
 
     const versions = packageNames
-      .filter(x => patterns.some(p => p.test(x)))
-      .reduce(
-        (acc, name) => {
-          if (name in acc) {
-            return acc;
-          }
+      .filter((x) => patterns.some((p) => p.test(x)))
+      .reduce((acc, name) => {
+        if (name in acc) {
+          return acc;
+        }
 
-          acc[name] = this.getVersion(name);
+        acc[name] = this.getVersion(name);
 
-          return acc;
-        },
-        {} as { [module: string]: string },
-      );
+        return acc;
+      }, {} as { [module: string]: string });
 
     const ngCliVersion = cliPackage.version;
     let angularCoreVersion = '';
@@ -97,14 +105,15 @@ export class VersionCommand extends Command<VersionCommandSchema> {
                 |___/
     `
       .split('\n')
-      .map(x => colors.red(x))
+      .map((x) => colors.red(x))
       .join('\n');
 
     this.logger.info(asciiArt);
     this.logger.info(
       `
       Angular CLI: ${ngCliVersion}
-      Node: ${process.versions.node}
+      Node: ${process.versions.node}${unsupportedNodeVersion ? ' (Unsupported)' : ''}
+      Package Manager: ${await this.getPackageManager()}
       OS: ${process.platform} ${process.arch}
 
       Angular: ${angularCoreVersion}
@@ -128,11 +137,17 @@ export class VersionCommand extends Command<VersionCommandSchema> {
       Package${namePad.slice(7)}Version
       -------${namePad.replace(/ /g, '-')}------------------
       ${Object.keys(versions)
-        .map(module => `${module}${namePad.slice(module.length)}${versions[module]}`)
+        .map((module) => `${module}${namePad.slice(module.length)}${versions[module]}`)
         .sort()
         .join('\n')}
     `.replace(/^ {6}/gm, ''),
     );
+
+    if (unsupportedNodeVersion) {
+      this.logger.warn(
+        `Warning: The current version of Node (${process.versions.node}) is not supported by Angular.`,
+      );
+    }
   }
 
   private getVersion(moduleName: string): string {
@@ -141,7 +156,7 @@ export class VersionCommand extends Command<VersionCommandSchema> {
 
     // Try to find the package in the workspace
     try {
-      packagePath = require.resolve(`${moduleName}/package.json`, { paths: [ this.context.root ]});
+      packagePath = require.resolve(`${moduleName}/package.json`, { paths: [this.context.root] });
     } catch {}
 
     // If not found, try to find within the CLI
@@ -163,4 +178,24 @@ export class VersionCommand extends Command<VersionCommandSchema> {
 
     return version || '<error>';
   }
+
+  private async getPackageManager(): Promise<string> {
+    try {
+      const manager = await getPackageManager(this.context.root);
+      const version = execSync(`${manager} --version`, {
+        encoding: 'utf8',
+        stdio: ['ignore', 'pipe', 'ignore'],
+        env: {
+          ...process.env,
+          //  NPM updater notifier will prevents the child process from closing until it timeout after 3 minutes.
+          NO_UPDATE_NOTIFIER: '1',
+          NPM_CONFIG_UPDATE_NOTIFIER: 'false',
+        },
+      }).trim();
+
+      return `${manager} ${version}`;
+    } catch {
+      return '<error>';
+    }
+  }
 }
diff --git a/packages/angular/cli/commands/version.json b/packages/angular/cli/commands/version.json
index 657cb14dce71..8f4c3ff1fdd1 100644
--- a/packages/angular/cli/commands/version.json
+++ b/packages/angular/cli/commands/version.json
@@ -4,12 +4,10 @@
   "description": "Outputs Angular CLI version.",
   "$longDescription": "",
 
-  "$aliases": [ "v" ],
+  "$aliases": ["v"],
   "$scope": "all",
   "$impl": "./version-impl#VersionCommand",
 
   "type": "object",
-  "allOf": [
-    { "$ref": "./definitions.json#/definitions/base" }
-  ]
+  "allOf": [{ "$ref": "./definitions.json#/definitions/base" }]
 }
diff --git a/packages/angular/cli/lib/cli/index.ts b/packages/angular/cli/lib/cli/index.ts
index 398a4734a572..679757fb6580 100644
--- a/packages/angular/cli/lib/cli/index.ts
+++ b/packages/angular/cli/lib/cli/index.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 { createConsoleLogger } from '@angular-devkit/core/node';
 import { format } from 'util';
 import { runCommand } from '../../models/command-runner';
@@ -16,41 +17,38 @@ import { findWorkspaceFile } from '../../utilities/project';
 export { VERSION, Version } from '../../models/version';
 
 const debugEnv = process.env['NG_DEBUG'];
-const isDebug =
-  debugEnv !== undefined &&
-  debugEnv !== '0' &&
-  debugEnv.toLowerCase() !== 'false';
+const isDebug = debugEnv !== undefined && debugEnv !== '0' && debugEnv.toLowerCase() !== 'false';
 
-// tslint:disable: no-console
-export default async function(options: { testing?: boolean; cliArgs: string[] }) {
+/* eslint-disable no-console */
+export default async function (options: { testing?: boolean; cliArgs: string[] }) {
   // This node version check ensures that the requirements of the project instance of the CLI are met
-  const version = process.versions.node.split('.').map(part => Number(part));
-  if (version[0] < 10 || version[0] === 11 || (version[0] === 10 && version[1] < 13)) {
+  const version = process.versions.node.split('.').map((part) => Number(part));
+  if (version[0] < 12 || (version[0] === 12 && version[1] < 14)) {
     process.stderr.write(
       `Node.js version ${process.version} detected.\n` +
-      'The Angular CLI requires a minimum Node.js version of either v10.13 or v12.0.\n\n' +
-      'Please update your Node.js version or visit https://nodejs.org/ for additional instructions.\n',
+        'The Angular CLI requires a minimum v12.14.\n\n' +
+        'Please update your Node.js version or visit https://nodejs.org/ for additional instructions.\n',
     );
 
     return 3;
   }
 
   const logger = createConsoleLogger(isDebug, process.stdout, process.stderr, {
-    info: s => (colors.enabled ? s : removeColor(s)),
-    debug: s => (colors.enabled ? s : removeColor(s)),
-    warn: s => (colors.enabled ? colors.bold.yellow(s) : removeColor(s)),
-    error: s => (colors.enabled ? colors.bold.red(s) : removeColor(s)),
-    fatal: s => (colors.enabled ? colors.bold.red(s) : removeColor(s)),
+    info: (s) => (colors.enabled ? s : removeColor(s)),
+    debug: (s) => (colors.enabled ? s : removeColor(s)),
+    warn: (s) => (colors.enabled ? colors.bold.yellow(s) : removeColor(s)),
+    error: (s) => (colors.enabled ? colors.bold.red(s) : removeColor(s)),
+    fatal: (s) => (colors.enabled ? colors.bold.red(s) : removeColor(s)),
   });
 
   // Redirect console to logger
-  console.info = console.log = function(...args) {
+  console.info = console.log = function (...args) {
     logger.info(format(...args));
   };
-  console.warn = function(...args) {
+  console.warn = function (...args) {
     logger.warn(format(...args));
   };
-  console.error = function(...args) {
+  console.error = function (...args) {
     logger.error(format(...args));
   };
 
@@ -113,7 +111,7 @@ export default async function(options: { testing?: boolean; cliArgs: string[] })
     }
 
     if (options.testing) {
-      // tslint:disable-next-line: no-debugger
+      // eslint-disable-next-line no-debugger
       debugger;
       throw err;
     }
diff --git a/packages/angular/cli/lib/config/workspace-schema.json b/packages/angular/cli/lib/config/workspace-schema.json
index 43bd1e07ddb4..58835571837b 100644
--- a/packages/angular/cli/lib/config/workspace-schema.json
+++ b/packages/angular/cli/lib/config/workspace-schema.json
@@ -27,7 +27,7 @@
     "projects": {
       "type": "object",
       "patternProperties": {
-        "^(?:@[a-zA-Z0-9_-]+\/)?[a-zA-Z0-9_-]+$": {
+        "^(?:@[a-zA-Z0-9_-]+/)?[a-zA-Z0-9_-]+$": {
           "$ref": "#/definitions/project"
         }
       },
@@ -35,9 +35,7 @@
     }
   },
   "additionalProperties": false,
-  "required": [
-    "version"
-  ],
+  "required": ["version"],
   "definitions": {
     "cliOptions": {
       "type": "object",
@@ -49,12 +47,7 @@
         "packageManager": {
           "description": "Specify which package manager tool to use.",
           "type": "string",
-          "enum": [
-            "npm",
-            "cnpm",
-            "yarn",
-            "pnpm"
-          ]
+          "enum": ["npm", "cnpm", "yarn", "pnpm"]
         },
         "warnings": {
           "description": "Control CLI specific console warnings",
@@ -67,10 +60,7 @@
           }
         },
         "analytics": {
-          "type": [
-            "boolean",
-            "string"
-          ],
+          "type": ["boolean", "string"],
           "description": "Share anonymous usage data with the Angular Team at Google."
         },
         "analyticsSharing": {
@@ -79,11 +69,12 @@
             "tracking": {
               "description": "Analytics sharing info tracking ID.",
               "type": "string",
-              "pattern": "^GA-\\d+-\\d+$"
+              "pattern": "^(GA|UA)?-\\d+-\\d+$"
             },
             "uuid": {
               "description": "Analytics sharing info universally unique identifier.",
-              "type": "string"
+              "type": "string",
+              "format": "uuid"
             }
           }
         }
@@ -173,10 +164,7 @@
         "projectType": {
           "type": "string",
           "description": "Project type.",
-          "enum": [
-            "application",
-            "library"
-          ]
+          "enum": ["application", "library"]
         },
         "architect": {
           "type": "object",
@@ -191,37 +179,23 @@
           }
         }
       },
-      "required": [
-        "root",
-        "projectType"
-      ],
+      "required": ["root", "projectType"],
       "anyOf": [
         {
-          "required": [
-            "architect"
-          ],
+          "required": ["architect"],
           "not": {
-            "required": [
-              "targets"
-            ]
+            "required": ["targets"]
           }
         },
         {
-          "required": [
-            "targets"
-          ],
+          "required": ["targets"],
           "not": {
-            "required": [
-              "architect"
-            ]
+            "required": ["architect"]
           }
         },
         {
           "not": {
-            "required": [
-              "targets",
-              "architect"
-            ]
+            "required": ["targets", "architect"]
           }
         }
       ],
@@ -351,12 +325,12 @@
                   }
                 }
               },
-              "required": [
-                "builder"
-              ]
+              "additionalProperties": false,
+              "required": ["builder"]
             },
             {
               "type": "object",
+              "additionalProperties": false,
               "properties": {
                 "builder": {
                   "const": "@angular-devkit/build-angular:app-shell"
@@ -378,6 +352,7 @@
             },
             {
               "type": "object",
+              "additionalProperties": false,
               "properties": {
                 "builder": {
                   "const": "@angular-devkit/build-angular:browser"
@@ -399,6 +374,7 @@
             },
             {
               "type": "object",
+              "additionalProperties": false,
               "properties": {
                 "builder": {
                   "const": "@angular-devkit/build-angular:dev-server"
@@ -420,6 +396,7 @@
             },
             {
               "type": "object",
+              "additionalProperties": false,
               "properties": {
                 "builder": {
                   "const": "@angular-devkit/build-angular:extract-i18n"
@@ -441,6 +418,7 @@
             },
             {
               "type": "object",
+              "additionalProperties": false,
               "properties": {
                 "builder": {
                   "const": "@angular-devkit/build-angular:karma"
@@ -462,6 +440,7 @@
             },
             {
               "type": "object",
+              "additionalProperties": false,
               "properties": {
                 "builder": {
                   "const": "@angular-devkit/build-angular:protractor"
@@ -483,6 +462,7 @@
             },
             {
               "type": "object",
+              "additionalProperties": false,
               "properties": {
                 "builder": {
                   "const": "@angular-devkit/build-angular:server"
@@ -504,6 +484,7 @@
             },
             {
               "type": "object",
+              "additionalProperties": false,
               "properties": {
                 "builder": {
                   "const": "@angular-devkit/build-angular:tslint"
@@ -525,10 +506,15 @@
             },
             {
               "type": "object",
+              "additionalProperties": false,
               "properties": {
                 "builder": {
                   "const": "@angular-devkit/build-angular:ng-packagr"
                 },
+                "defaultConfiguration": {
+                  "type": "string",
+                  "description": "A default named configuration to use when a target configuration is not provided."
+                },
                 "options": {
                   "$ref": "../../../../angular_devkit/build_angular/src/ng-packagr/schema.json"
                 },
@@ -561,9 +547,7 @@
           "$ref": "#/definitions/schematicOptions"
         }
       },
-      "required": [
-        "version"
-      ]
+      "required": ["version"]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/packages/angular/cli/lib/init.ts b/packages/angular/cli/lib/init.ts
index b817d8342145..cf18b8bcd77b 100644
--- a/packages/angular/cli/lib/init.ts
+++ b/packages/angular/cli/lib/init.ts
@@ -1,56 +1,20 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+
 import 'symbol-observable';
 // symbol polyfill must go first
-// tslint:disable-next-line:ordered-imports import-groups
-import * as fs from 'fs';
+import { promises as fs } from 'fs';
 import * as path from 'path';
 import { SemVer } from 'semver';
-import { Duplex } from 'stream';
+import { VERSION } from '../models/version';
 import { colors } from '../utilities/color';
 import { isWarningEnabled } from '../utilities/config';
 
-// Check if we need to profile this CLI run.
-if (process.env['NG_CLI_PROFILING']) {
-  let profiler: {
-    startProfiling: (name?: string, recsamples?: boolean) => void;
-    stopProfiling: (name?: string) => unknown;
-  };
-  try {
-    profiler = require('v8-profiler-node8'); // tslint:disable-line:no-implicit-dependencies
-  } catch (err) {
-    throw new Error(
-      `Could not require 'v8-profiler-node8'. You must install it separetely with ` +
-        `'npm install v8-profiler-node8 --no-save'.\n\nOriginal error:\n\n${err}`,
-    );
-  }
-
-  profiler.startProfiling();
-
-  const exitHandler = (options: { cleanup?: boolean; exit?: boolean }) => {
-    if (options.cleanup) {
-      const cpuProfile = profiler.stopProfiling();
-      fs.writeFileSync(
-        path.resolve(process.cwd(), process.env.NG_CLI_PROFILING || '') + '.cpuprofile',
-        JSON.stringify(cpuProfile),
-      );
-    }
-
-    if (options.exit) {
-      process.exit();
-    }
-  };
-
-  process.on('exit', () => exitHandler({ cleanup: true }));
-  process.on('SIGINT', () => exitHandler({ exit: true }));
-  process.on('uncaughtException', () => exitHandler({ exit: true }));
-}
-
 (async () => {
   /**
    * Disable Browserslist old data warning as otherwise with every release we'd need to update this dependency
@@ -81,19 +45,20 @@ if (process.env['NG_CLI_PROFILING']) {
     const projectLocalCli = require.resolve('@angular/cli', { paths: [process.cwd()] });
     cli = await import(projectLocalCli);
 
-    const globalVersion = new SemVer(require('../package.json').version);
+    const globalVersion = new SemVer(VERSION.full);
 
     // 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 localPackageJson = await fs.readFile(
+          path.join(path.dirname(projectLocalCli), '../../package.json'),
+          'utf-8',
         );
+        localVersion = (JSON.parse(localPackageJson) as { version: string }).version;
+      } catch (error) {
+        // eslint-disable-next-line  no-console
+        console.error('Version mismatch check skipped. Unable to retrieve local version: ' + error);
       }
     }
 
@@ -101,14 +66,18 @@ if (process.env['NG_CLI_PROFILING']) {
     try {
       isGlobalGreater = !!localVersion && globalVersion.compare(localVersion) > 0;
     } catch (error) {
-      // tslint:disable-next-line no-console
+      // eslint-disable-next-line  no-console
       console.error('Version mismatch check skipped. Unable to compare local version: ' + error);
     }
 
     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') {
+      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
@@ -117,7 +86,7 @@ if (process.env['NG_CLI_PROFILING']) {
           `version (${localVersion}). The local Angular CLI version is used.\n\n` +
           'To disable this warning use "ng config -g cli.warnings.versionMismatch false".';
 
-        // tslint:disable-next-line no-console
+        // eslint-disable-next-line  no-console
         console.error(colors.yellow(warning));
       }
     }
@@ -134,17 +103,19 @@ if (process.env['NG_CLI_PROFILING']) {
   }
 
   return cli;
-})().then(cli => {
-  return cli({
-    cliArgs: process.argv.slice(2),
-    inputStream: process.stdin,
-    outputStream: process.stdout,
+})()
+  .then((cli) => {
+    return cli({
+      cliArgs: process.argv.slice(2),
+      inputStream: process.stdin,
+      outputStream: process.stdout,
+    });
+  })
+  .then((exitCode: number) => {
+    process.exit(exitCode);
+  })
+  .catch((err: Error) => {
+    // eslint-disable-next-line  no-console
+    console.error('Unknown error: ' + err.toString());
+    process.exit(127);
   });
-}).then((exitCode: number) => {
-  process.exit(exitCode);
-})
-.catch((err: Error) => {
-  // tslint:disable-next-line no-console
-  console.error('Unknown error: ' + err.toString());
-  process.exit(127);
-});
diff --git a/packages/angular/cli/models/analytics-collector.ts b/packages/angular/cli/models/analytics-collector.ts
index 2d9d7f204aff..6754d5037059 100644
--- a/packages/angular/cli/models/analytics-collector.ts
+++ b/packages/angular/cli/models/analytics-collector.ts
@@ -1,14 +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 { analytics } from '@angular-devkit/core';
 import { execSync } from 'child_process';
-import * as debug from 'debug';
+import debug from 'debug';
 import * as https from 'https';
 import * as os from 'os';
 import * as querystring from 'querystring';
@@ -85,10 +85,7 @@ export class AnalyticsCollector implements analytics.Analytics {
   private readonly parameters: Record<string, string | number | boolean> = {};
   private readonly analyticsLogDebug = debug('ng:analytics:log');
 
-  constructor(
-    trackingId: string,
-    userId: string,
-  ) {
+  constructor(trackingId: string, userId: string) {
     // API Version
     this.parameters['v'] = '1';
     // User ID
@@ -113,8 +110,12 @@ export class AnalyticsCollector implements analytics.Analytics {
     this.parameters['cd' + analytics.NgCliAnalyticsDimensions.CpuCount] = os.cpus().length;
     // Get the first CPU's speed. It's very rare to have multiple CPUs of different speed (in most
     // non-ARM configurations anyway), so that's all we care about.
-    this.parameters['cd' + analytics.NgCliAnalyticsDimensions.CpuSpeed] = Math.floor(os.cpus()[0].speed);
-    this.parameters['cd' + analytics.NgCliAnalyticsDimensions.RamInGigabytes] = Math.round(os.totalmem() / (1024 * 1024 * 1024));
+    this.parameters['cd' + analytics.NgCliAnalyticsDimensions.CpuSpeed] = Math.floor(
+      os.cpus()[0].speed,
+    );
+    this.parameters['cd' + analytics.NgCliAnalyticsDimensions.RamInGigabytes] = Math.round(
+      os.totalmem() / (1024 * 1024 * 1024),
+    );
     this.parameters['cd' + analytics.NgCliAnalyticsDimensions.NodeVersion] = nodeVersion;
   }
 
@@ -128,7 +129,12 @@ export class AnalyticsCollector implements analytics.Analytics {
     this.addToQueue('pageview', { dp, dh, dt, metrics, dimensions });
   }
 
-  timing(utc: string, utv: string, utt: string | number, options: analytics.TimingOptions = {}): void {
+  timing(
+    utc: string,
+    utv: string,
+    utt: string | number,
+    options: analytics.TimingOptions = {},
+  ): void {
     const { label: utl, metrics, dimensions } = options;
     this.addToQueue('timing', { utc, utv, utt, utl, metrics, dimensions });
   }
@@ -163,7 +169,10 @@ export class AnalyticsCollector implements analytics.Analytics {
   private addToQueue(eventType: 'pageview', parameters: PageviewParameters): void;
   private addToQueue(eventType: 'timing', parameters: TimingParameters): void;
   private addToQueue(eventType: 'screenview', parameters: ScreenviewParameters): void;
-  private addToQueue(eventType: 'event' | 'pageview' | 'timing' | 'screenview', parameters: BaseParameters): void {
+  private addToQueue(
+    eventType: 'event' | 'pageview' | 'timing' | 'screenview',
+    parameters: BaseParameters,
+  ): void {
     const { metrics, dimensions, ...restParameters } = parameters;
     const data = {
       ...this.parameters,
@@ -180,21 +189,26 @@ export class AnalyticsCollector implements analytics.Analytics {
     this.analyticsLogDebug('send event: %j', data);
 
     return new Promise<void>((resolve, reject) => {
-      const request = https.request({
-        host: 'www.google-analytics.com',
-        method: 'POST',
-        path: data.length > 1 ? '/batch' : '/collect',
-      }, response => {
-        if (response.statusCode !== 200) {
-          reject(new Error(`Analytics reporting failed with status code: ${response.statusCode}.`));
-
-          return;
-        }
-      });
+      const request = https.request(
+        {
+          host: 'www.google-analytics.com',
+          method: 'POST',
+          path: data.length > 1 ? '/batch' : '/collect',
+        },
+        (response) => {
+          if (response.statusCode !== 200) {
+            reject(
+              new Error(`Analytics reporting failed with status code: ${response.statusCode}.`),
+            );
+
+            return;
+          }
+        },
+      );
 
       request.on('error', reject);
 
-      const queryParameters = data.map(p => querystring.stringify(p)).join('\n');
+      const queryParameters = data.map((p) => querystring.stringify(p)).join('\n');
       request.write(queryParameters);
       request.end(resolve);
     });
@@ -204,12 +218,14 @@ export class AnalyticsCollector implements analytics.Analytics {
    * Creates the dimension and metrics variables to add to the queue.
    * @private
    */
-  private customVariables(options: analytics.CustomDimensionsAndMetricsOptions): Record<string, string | number | boolean> {
+  private customVariables(
+    options: analytics.CustomDimensionsAndMetricsOptions,
+  ): Record<string, string | number | boolean> {
     const additionals: Record<string, string | number | boolean> = {};
 
     const { dimensions, metrics } = options;
-    dimensions?.forEach((v, i) => additionals[`cd${i}`] = v);
-    metrics?.forEach((v, i) => additionals[`cm${i}`] = v);
+    dimensions?.forEach((v, i) => (additionals[`cd${i}`] = v));
+    metrics?.forEach((v, i) => (additionals[`cm${i}`] = v));
 
     return additionals;
   }
@@ -282,7 +298,6 @@ function _buildUserAgentString() {
   }
 }
 
-
 /**
  * Get a language code.
  * @private
@@ -311,7 +326,7 @@ function _getWindowsLanguageCode(): string | undefined {
     // This is true on Windows XP, 7, 8 and 10 AFAIK. Would return empty string or fail if it
     // doesn't work.
     return execSync('wmic.exe os get locale').toString().trim();
-  } catch { }
+  } catch {}
 
   return undefined;
 }
diff --git a/packages/angular/cli/models/analytics.ts b/packages/angular/cli/models/analytics.ts
index 5883499f5ae2..1171e801dc49 100644
--- a/packages/angular/cli/models/analytics.ts
+++ b/packages/angular/cli/models/analytics.ts
@@ -1,20 +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 { json, tags } from '@angular-devkit/core';
-import * as debug from 'debug';
+import debug from 'debug';
 import * as inquirer from 'inquirer';
 import { v4 as uuidV4 } from 'uuid';
+import { VERSION } from '../models/version';
 import { colors } from '../utilities/color';
 import { getWorkspace, getWorkspaceRaw } from '../utilities/config';
 import { isTTY } from '../utilities/tty';
 import { AnalyticsCollector } from './analytics-collector';
 
-// tslint:disable: no-console
+/* eslint-disable no-console */
 const analyticsDebug = debug('ng:analytics'); // Generate analytics, including settings and users.
 
 let _defaultAngularCliPropertyCache: string;
@@ -26,7 +28,7 @@ export const AnalyticsProperties = {
       return _defaultAngularCliPropertyCache;
     }
 
-    const v = require('../package.json').version;
+    const v = VERSION.full;
 
     // The logic is if it's a full version then we should use the prod GA property.
     if (/^\d+\.\d+\.\d+$/.test(v) && v !== '0.0.0') {
@@ -50,7 +52,7 @@ export const analyticsPackageSafelist = [
 ];
 
 export function isPackageNameSafeForAnalytics(name: string): boolean {
-  return analyticsPackageSafelist.some(pattern => {
+  return analyticsPackageSafelist.some((pattern) => {
     if (typeof pattern == 'string') {
       return pattern === name;
     } else {
@@ -85,7 +87,6 @@ export function setAnalyticsConfig(level: 'global' | 'local', value: string | bo
   config.save();
 
   analyticsDebug('done');
-
 }
 
 /**
@@ -173,7 +174,7 @@ export async function promptProjectAnalytics(force = false): Promise<boolean> {
     if (answers.analytics) {
       console.log('');
       console.log(tags.stripIndent`
-        Thank you for sharing anonymous usage data. Would you change your mind, the following
+        Thank you for sharing anonymous usage data. Should you change your mind, the following
         command will disable this feature entirely:
 
             ${colors.yellow('ng analytics project off')}
@@ -206,7 +207,7 @@ export async function hasGlobalAnalyticsConfiguration(): Promise<boolean> {
     if (analyticsConfig !== null && analyticsConfig !== undefined) {
       return true;
     }
-  } catch { }
+  } catch {}
 
   return false;
 }
@@ -277,14 +278,13 @@ export async function getGlobalAnalytics(): Promise<AnalyticsCollector | undefin
 export async function hasWorkspaceAnalyticsConfiguration(): Promise<boolean> {
   try {
     const globalWorkspace = await getWorkspace('local');
-    const analyticsConfig: string | undefined | null | { uid?: string } = globalWorkspace
-      && globalWorkspace.getCli()
-      && globalWorkspace.getCli()['analytics'];
+    const analyticsConfig: string | undefined | null | { uid?: string } =
+      globalWorkspace && globalWorkspace.getCli() && globalWorkspace.getCli()['analytics'];
 
     if (analyticsConfig !== undefined) {
       return true;
     }
-  } catch { }
+  } catch {}
 
   return false;
 }
@@ -299,7 +299,8 @@ export async function getWorkspaceAnalytics(): Promise<AnalyticsCollector | unde
   analyticsDebug('getWorkspaceAnalytics');
   try {
     const globalWorkspace = await getWorkspace('local');
-    const analyticsConfig: string | undefined | null | { uid?: string } = globalWorkspace?.getCli()['analytics'];
+    const analyticsConfig: string | undefined | null | { uid?: string } =
+      globalWorkspace?.getCli()['analytics'];
     analyticsDebug('Workspace Analytics config found: %j', analyticsConfig);
 
     if (analyticsConfig === false) {
@@ -330,7 +331,6 @@ export async function getWorkspaceAnalytics(): Promise<AnalyticsCollector | unde
 
     return undefined;
   }
-
 }
 
 /**
diff --git a/packages/angular/cli/models/architect-command.ts b/packages/angular/cli/models/architect-command.ts
index 2277f1d07b61..fee7dfcf17f7 100644
--- a/packages/angular/cli/models/architect-command.ts
+++ b/packages/angular/cli/models/architect-command.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 { Architect, Target } from '@angular-devkit/architect';
 import { WorkspaceNodeModulesArchitectHost } from '@angular-devkit/architect/node';
 import { json, schema, tags } from '@angular-devkit/core';
@@ -22,12 +23,12 @@ export interface ArchitectCommandOptions extends BaseCommandOptions {
 }
 
 export abstract class ArchitectCommand<
-  T extends ArchitectCommandOptions = ArchitectCommandOptions
+  T extends ArchitectCommandOptions = ArchitectCommandOptions,
 > extends Command<T> {
   protected _architect!: Architect;
   protected _architectHost!: WorkspaceNodeModulesArchitectHost;
   protected _registry!: json.schema.SchemaRegistry;
-  protected readonly useReportAnalytics = false;
+  protected override readonly useReportAnalytics = false;
 
   // If this command supports running multiple targets.
   protected multiTarget = false;
@@ -35,10 +36,10 @@ export abstract class ArchitectCommand<
   target: string | undefined;
   missingTargetError: string | undefined;
 
-  public async initialize(options: T & Arguments): Promise<number | void> {
+  public override async initialize(options: T & Arguments): Promise<number | void> {
     this._registry = new json.schema.CoreSchemaRegistry();
     this._registry.addPostTransform(json.schema.transforms.addUndefinedDefaults);
-    this._registry.useXDeprecatedProvider(msg => this.logger.warn(msg));
+    this._registry.useXDeprecatedProvider((msg) => this.logger.warn(msg));
 
     if (!this.workspace) {
       this.logger.fatal('A workspace is required for this command.');
@@ -46,7 +47,10 @@ export abstract class ArchitectCommand<
       return 1;
     }
 
-    this._architectHost = new WorkspaceNodeModulesArchitectHost(this.workspace, this.workspace.basePath);
+    this._architectHost = new WorkspaceNodeModulesArchitectHost(
+      this.workspace,
+      this.workspace.basePath,
+    );
     this._architect = new Architect(this._architectHost, this._registry);
 
     if (!this.target) {
@@ -81,14 +85,18 @@ export abstract class ArchitectCommand<
     }
 
     if (targetProjectNames.length === 0) {
-      this.logger.fatal(this.missingTargetError || `No projects support the '${this.target}' target.`);
+      this.logger.fatal(
+        this.missingTargetError || `No projects support the '${this.target}' target.`,
+      );
 
       return 1;
     }
 
     if (projectName && !targetProjectNames.includes(projectName)) {
-      this.logger.fatal(this.missingTargetError ||
-        `Project '${projectName}' does not support the '${this.target}' target.`);
+      this.logger.fatal(
+        this.missingTargetError ||
+          `Project '${projectName}' does not support the '${this.target}' target.`,
+      );
 
       return 1;
     }
@@ -116,7 +124,9 @@ export abstract class ArchitectCommand<
         const builderLeftovers = parsedOptions['--'] || [];
         leftoverMap.set(name, { optionDefs, parsedOptions });
 
-        potentialProjectNames = new Set(builderLeftovers.filter(x => potentialProjectNames.has(x)));
+        potentialProjectNames = new Set(
+          builderLeftovers.filter((x) => potentialProjectNames.has(x)),
+        );
       }
 
       if (potentialProjectNames.size === 1) {
@@ -169,7 +179,9 @@ export abstract class ArchitectCommand<
         // This is a special case where we just return.
         return;
       } else {
-        this.logger.fatal(this.missingTargetError || 'Cannot determine project or target for command.');
+        this.logger.fatal(
+          this.missingTargetError || 'Cannot determine project or target for command.',
+        );
 
         return 1;
       }
@@ -202,10 +214,7 @@ export abstract class ArchitectCommand<
     return await this.runArchitectTarget(options);
   }
 
-  protected async runSingleTarget(
-    target: Target,
-    targetOptions: string[],
-  ) {
+  protected async runSingleTarget(target: Target, targetOptions: string[]) {
     // We need to build the builderSpec twice because architect does not understand
     // overrides separately (getting the configuration builds the whole project, including
     // overrides).
@@ -221,7 +230,7 @@ export abstract class ArchitectCommand<
       typeof builderDesc.optionSchema === 'object' && builderDesc.optionSchema.additionalProperties;
 
     if (overrides['--'] && !allowAdditionalProperties) {
-      (overrides['--'] || []).forEach(additional => {
+      (overrides['--'] || []).forEach((additional) => {
         this.logger.fatal(`Unknown option: '${additional.split(/=/)[0]}'`);
       });
 
@@ -229,7 +238,7 @@ export abstract class ArchitectCommand<
     }
 
     await this.reportAnalytics([this.description.name], {
-      ...await this._architectHost.getOptionsForTarget(target) as unknown as T,
+      ...((await this._architectHost.getOptionsForTarget(target)) as unknown as T),
       ...overrides,
     });
 
@@ -260,10 +269,7 @@ export abstract class ArchitectCommand<
         // Running them in parallel would jumble the log messages.
         let result = 0;
         for (const project of this.getProjectNamesByTarget(this.target)) {
-          result |= await this.runSingleTarget(
-            { ...targetSpec, project } as Target,
-            extra,
-          );
+          result |= await this.runSingleTarget({ ...targetSpec, project } as Target, extra);
         }
 
         return result;
@@ -275,7 +281,7 @@ export abstract class ArchitectCommand<
         const newErrors: schema.SchemaValidatorError[] = [];
         for (const schemaError of e.errors) {
           if (schemaError.keyword === 'additionalProperties') {
-            const unknownProperty = schemaError.params.additionalProperty;
+            const unknownProperty = schemaError.params?.additionalProperty;
             if (unknownProperty in options) {
               const dashes = unknownProperty.length === 1 ? '-' : '--';
               this.logger.fatal(`Unknown option: '${dashes}${unknownProperty}'`);
@@ -298,7 +304,7 @@ export abstract class ArchitectCommand<
 
   private getProjectNamesByTarget(targetName: string): string[] {
     const allProjectsForTargetName: string[] = [];
-    // tslint:disable-next-line: no-non-null-assertion
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     for (const [name, project] of this.workspace!.projects) {
       if (project.targets.has(targetName)) {
         allProjectsForTargetName.push(name);
@@ -311,7 +317,7 @@ export abstract class ArchitectCommand<
     } else {
       // For single target commands, we try the default project first,
       // then the full list if it has a single project, then error out.
-      // tslint:disable-next-line: no-non-null-assertion
+      // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
       const maybeDefaultProject = this.workspace!.extensions['defaultProject'] as string;
       if (maybeDefaultProject && allProjectsForTargetName.includes(maybeDefaultProject)) {
         return [maybeDefaultProject];
@@ -338,14 +344,24 @@ export abstract class ArchitectCommand<
       project = commandOptions.project;
       target = this.target;
       if (commandOptions.prod) {
+        const defaultConfig =
+          project &&
+          target &&
+          this.workspace?.projects.get(project)?.targets.get(target)?.defaultConfiguration;
+
+        this.logger.warn(
+          defaultConfig === 'production'
+            ? 'Option "--prod" is deprecated: No need to use this option as this builder defaults to configuration "production".'
+            : 'Option "--prod" is deprecated: Use "--configuration production" instead.',
+        );
         // The --prod flag will always be the first configuration, available to be overwritten
         // by following configurations.
-        this.logger.warn('Option "--prod" is deprecated: Use "--configuration production" instead.');
         configuration = 'production';
       }
       if (commandOptions.configuration) {
-        configuration =
-          `${configuration ? `${configuration},` : ''}${commandOptions.configuration}`;
+        configuration = `${configuration ? `${configuration},` : ''}${
+          commandOptions.configuration
+        }`;
       }
     }
 
diff --git a/packages/angular/cli/models/command-runner.ts b/packages/angular/cli/models/command-runner.ts
index c5b08db13867..0b8b01fe4baa 100644
--- a/packages/angular/cli/models/command-runner.ts
+++ b/packages/angular/cli/models/command-runner.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 {
   analytics,
   isJsonObject,
@@ -60,7 +61,10 @@ export interface CommandMapOptions {
  * Create the analytics instance.
  * @private
  */
-async function _createAnalytics(workspace: boolean, skipPrompt = false): Promise<analytics.Analytics> {
+async function _createAnalytics(
+  workspace: boolean,
+  skipPrompt = false,
+): Promise<analytics.Analytics> {
   let config = await getGlobalAnalytics();
   // If in workspace and global analytics is enabled, defer to workspace level
   if (workspace && config) {
@@ -118,7 +122,9 @@ export async function runCommand(
   logger: logging.Logger,
   workspace: AngularWorkspace | undefined,
   commands: CommandMapOptions = standardCommands,
-  options: { analytics?: analytics.Analytics; currentDirectory: string } = { currentDirectory: process.cwd() },
+  options: { analytics?: analytics.Analytics; currentDirectory: string } = {
+    currentDirectory: process.cwd(),
+  },
 ): Promise<number | void> {
   // This registry is exclusively used for flattening schemas, and not for validating.
   const registry = new schema.CoreSchemaRegistry([]);
@@ -188,7 +194,7 @@ export async function runCommand(
       const aliasDesc = await loadCommandDescription(name, commands[name], registry);
       const aliases = aliasDesc.aliases;
 
-      if (aliases && aliases.some(alias => alias === commandName)) {
+      if (aliases && aliases.some((alias) => alias === commandName)) {
         commandName = name;
         description = aliasDesc;
         break;
@@ -232,8 +238,7 @@ export async function runCommand(
     });
 
     const analytics =
-      options.analytics ||
-      (await _createAnalytics(!!workspace, description.name === 'update'));
+      options.analytics || (await _createAnalytics(!!workspace, description.name === 'update'));
     const context = {
       workspace,
       analytics,
diff --git a/packages/angular/cli/models/command.ts b/packages/angular/cli/models/command.ts
index cbea60d17478..d40b21620d98 100644
--- a/packages/angular/cli/models/command.ts
+++ b/packages/angular/cli/models/command.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 { analytics, logging, strings, tags } from '@angular-devkit/core';
 import { colors } from '../utilities/color';
 import { AngularWorkspace } from '../utilities/config';
@@ -15,7 +16,6 @@ import {
   CommandDescriptionMap,
   CommandScope,
   Option,
-  SubCommandDescription,
 } from './interface';
 
 export interface BaseCommandOptions {
@@ -51,10 +51,9 @@ export abstract class Command<T extends BaseCommandOptions = BaseCommandOptions>
     return 0;
   }
 
-  async printJsonHelp(_options: T & Arguments): Promise<number> {
-    const replacer = (key: string, value: string) => key === 'name'
-      ? strings.dasherize(value)
-      : value;
+  async printJsonHelp(): Promise<number> {
+    const replacer = (key: string, value: string) =>
+      key === 'name' ? strings.dasherize(value) : value;
     this.logger.info(JSON.stringify(this.description, replacer, 2));
 
     return 0;
@@ -64,32 +63,27 @@ export abstract class Command<T extends BaseCommandOptions = BaseCommandOptions>
     this.logger.info(this.description.description);
 
     const name = this.description.name;
-    const args = this.description.options.filter(x => x.positional !== undefined);
-    const opts = this.description.options.filter(x => x.positional === undefined);
+    const args = this.description.options.filter((x) => x.positional !== undefined);
+    const opts = this.description.options.filter((x) => x.positional === undefined);
 
-    const argDisplay = args && args.length > 0 ? ' ' + args.map(a => `<${a.name}>`).join(' ') : '';
+    const argDisplay =
+      args && args.length > 0 ? ' ' + args.map((a) => `<${a.name}>`).join(' ') : '';
     const optionsDisplay = opts && opts.length > 0 ? ` [options]` : ``;
 
     this.logger.info(`usage: ng ${name}${argDisplay}${optionsDisplay}`);
     this.logger.info('');
   }
 
-  protected async printHelpSubcommand(subcommand: SubCommandDescription) {
-    this.logger.info(subcommand.description);
-
-    await this.printHelpOptions(subcommand.options);
-  }
-
   protected async printHelpOptions(options: Option[] = this.description.options) {
-    const args = options.filter(opt => opt.positional !== undefined);
-    const opts = options.filter(opt => opt.positional === undefined);
+    const args = options.filter((opt) => opt.positional !== undefined);
+    const opts = options.filter((opt) => opt.positional === undefined);
 
     const formatDescription = (description: string) =>
       `    ${description.replace(/\n/g, '\n    ')}`;
 
     if (args.length > 0) {
       this.logger.info(`arguments:`);
-      args.forEach(o => {
+      args.forEach((o) => {
         this.logger.info(`  ${colors.cyan(o.name)}`);
         if (o.description) {
           this.logger.info(formatDescription(o.description));
@@ -102,12 +96,12 @@ export abstract class Command<T extends BaseCommandOptions = BaseCommandOptions>
       }
       this.logger.info(`options:`);
       opts
-        .filter(o => !o.hidden)
+        .filter((o) => !o.hidden)
         .sort((a, b) => a.name.localeCompare(b.name))
-        .forEach(o => {
+        .forEach((o) => {
           const aliases =
             o.aliases && o.aliases.length > 0
-              ? '(' + o.aliases.map(a => `-${a}`).join(' ') + ')'
+              ? '(' + o.aliases.map((a) => `-${a}`).join(' ') + ')'
               : '';
           this.logger.info(`  ${colors.cyan('--' + strings.dasherize(o.name))} ${aliases}`);
           if (o.description) {
@@ -125,6 +119,7 @@ export abstract class Command<T extends BaseCommandOptions = BaseCommandOptions>
             The ${this.description.name} command requires to be run outside of a project, but a
             project definition was found at "${this.workspace.filePath}".
           `);
+          // eslint-disable-next-line no-throw-literal
           throw 1;
         }
         break;
@@ -134,6 +129,7 @@ export abstract class Command<T extends BaseCommandOptions = BaseCommandOptions>
             The ${this.description.name} command requires to be run in an Angular project, but a
             project definition could not be found.
           `);
+          // eslint-disable-next-line no-throw-literal
           throw 1;
         }
         break;
@@ -175,7 +171,7 @@ export abstract class Command<T extends BaseCommandOptions = BaseCommandOptions>
     if (options.help === true) {
       return this.printHelp();
     } else if (options.help === 'json' || options.help === 'JSON') {
-      return this.printJsonHelp(options);
+      return this.printJsonHelp();
     } else {
       const startTime = +new Date();
       if (this.useReportAnalytics) {
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 e5374e0f5e0d..9c908d913247 100644
--- a/packages/angular/cli/models/interface.ts
+++ b/packages/angular/cli/models/interface.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 { analytics, json, logging } from '@angular-devkit/core';
 import { AngularWorkspace } from '../utilities/config';
 
@@ -38,7 +39,7 @@ export interface CommandInterface<T extends Arguments = Arguments> {
  * Command constructor.
  */
 export interface CommandConstructor {
-  new(
+  new (
     context: CommandContext,
     description: CommandDescription,
     logger: logging.Logger,
@@ -157,7 +158,7 @@ export interface Option {
   /**
    * 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 54bb8ebad85b..b1e98d0b3f2a 100644
--- a/packages/angular/cli/models/parser.ts
+++ b/packages/angular/cli/models/parser.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 { BaseException, logging, strings } from '@angular-devkit/core';
 import { Arguments, Option, OptionType, Value } from './interface';
 
-
 export class ParseArgumentException extends BaseException {
   constructor(
     public readonly comments: string[],
@@ -20,7 +19,6 @@ export class ParseArgumentException extends BaseException {
   }
 }
 
-
 function _coerceType(str: string | undefined, type: OptionType, v?: Value): Value | undefined {
   switch (type) {
     case OptionType.Any:
@@ -31,8 +29,8 @@ function _coerceType(str: string | undefined, type: OptionType, v?: Value): Valu
       return _coerceType(str, OptionType.Boolean, v) !== undefined
         ? _coerceType(str, OptionType.Boolean, v)
         : _coerceType(str, OptionType.Number, v) !== undefined
-          ? _coerceType(str, OptionType.Number, v)
-          : _coerceType(str, OptionType.String, v);
+        ? _coerceType(str, OptionType.Number, v)
+        : _coerceType(str, OptionType.String, v);
 
     case OptionType.String:
       return str || '';
@@ -66,8 +64,8 @@ function _coerceType(str: string | undefined, type: OptionType, v?: Value): Valu
       return Array.isArray(v)
         ? v.concat(str || '')
         : v === undefined
-          ? [str || '']
-          : [v + '', str || ''];
+        ? [str || '']
+        : [v + '', str || ''];
 
     default:
       return undefined;
@@ -93,18 +91,15 @@ function _coerce(str: string | undefined, o: Option | null, v?: Value): Value |
   }
 }
 
-
 function _getOptionFromName(name: string, options: Option[]): Option | undefined {
-  const camelName = /(-|_)/.test(name)
-    ? strings.camelize(name)
-    : name;
+  const camelName = /(-|_)/.test(name) ? strings.camelize(name) : name;
 
   for (const option of options) {
     if (option.name === name || option.name === camelName) {
       return option;
     }
 
-    if (option.aliases.some(x => x === name || x === camelName)) {
+    if (option.aliases.some((x) => x === name || x === camelName)) {
       return option;
     }
   }
@@ -121,14 +116,21 @@ function _removeLeadingDashes(key: string): string {
 function _assignOption(
   arg: string,
   nextArg: string | undefined,
-  { options, parsedOptions, leftovers, ignored, errors, warnings }: {
-    options: Option[],
-    parsedOptions: Arguments,
-    positionals: string[],
-    leftovers: string[],
-    ignored: string[],
-    errors: string[],
-    warnings: string[],
+  {
+    options,
+    parsedOptions,
+    leftovers,
+    ignored,
+    errors,
+    warnings,
+  }: {
+    options: Option[];
+    parsedOptions: Arguments;
+    positionals: string[];
+    leftovers: string[];
+    ignored: string[];
+    errors: string[];
+    warnings: string[];
   },
 ) {
   const from = arg.startsWith('--') ? 2 : 1;
@@ -192,9 +194,9 @@ function _assignOption(
       if (parsedOptions[option.name] !== v) {
         if (parsedOptions[option.name] !== undefined && option.type !== OptionType.Array) {
           warnings.push(
-            `Option ${JSON.stringify(option.name)} was already specified with value `
-            + `${JSON.stringify(parsedOptions[option.name])}. The new value ${JSON.stringify(v)} `
-            + `will override it.`,
+            `Option ${JSON.stringify(option.name)} was already specified with value ` +
+              `${JSON.stringify(parsedOptions[option.name])}. The new value ${JSON.stringify(v)} ` +
+              `will override it.`,
           );
         }
 
@@ -203,7 +205,7 @@ function _assignOption(
     } else {
       let error = `Argument ${key} could not be parsed using value ${JSON.stringify(value)}.`;
       if (option.enum) {
-        error += ` Valid values are: ${option.enum.map(x => JSON.stringify(x)).join(', ')}.`;
+        error += ` Valid values are: ${option.enum.map((x) => JSON.stringify(x)).join(', ')}.`;
       } else {
         error += `Valid type(s) is: ${(option.types || [option.type]).join(', ')}`;
       }
@@ -215,7 +217,7 @@ function _assignOption(
     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}'.`,
+          `Use '--${strings.dasherize(key)}' instead of '--${key}'.`,
       );
     }
   }
@@ -223,7 +225,6 @@ function _assignOption(
   return consumedNextArg;
 }
 
-
 /**
  * Parse the arguments in a consistent way, but without having any option definition. This tries
  * to assess what the user wants in a free form. For example, using `--name=false` will set the
@@ -261,7 +262,7 @@ export function parseFreeFormArguments(args: string[]): Arguments {
         parsedOptions[name] = v;
       }
     } else if (arg.startsWith('-')) {
-      arg.split('').forEach(x => parsedOptions[x] = true);
+      arg.split('').forEach((x) => (parsedOptions[x] = true));
     } else {
       leftovers.push(arg);
     }
@@ -274,7 +275,6 @@ export function parseFreeFormArguments(args: string[]): Arguments {
   return parsedOptions;
 }
 
-
 /**
  * Parse the arguments in a consistent way, from a list of standardized options.
  * The result object will have a key per option name, with the `_` key reserved for positional
@@ -357,7 +357,7 @@ export function parseArguments(
   //   simpler.
   if (positionals.length > 0) {
     let pos = 0;
-    for (let i = 0; i < positionals.length;) {
+    for (let i = 0; i < positionals.length; ) {
       let found = false;
       let incrementPos = false;
       let incrementI = true;
@@ -394,7 +394,7 @@ export function parseArguments(
   }
 
   if (warnings.length > 0 && logger) {
-    warnings.forEach(message => logger.warn(message));
+    warnings.forEach((message) => logger.warn(message));
   }
 
   if (errors.length > 0) {
diff --git a/packages/angular/cli/models/parser_spec.ts b/packages/angular/cli/models/parser_spec.ts
index cd6b3c09e801..1f543d8d560e 100644
--- a/packages/angular/cli/models/parser_spec.ts
+++ b/packages/angular/cli/models/parser_spec.ts
@@ -1,39 +1,58 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use 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';
 import { Arguments, Option, OptionType } from './interface';
 import { ParseArgumentException, parseArguments } from './parser';
 
 describe('parseArguments', () => {
   const options: Option[] = [
-    { name: 'bool', aliases: [ 'b' ], type: OptionType.Boolean, description: '' },
-    { name: 'num', aliases: [ 'n' ], type: OptionType.Number, description: '' },
-    { name: 'str', aliases: [ 's' ], type: OptionType.String, description: '' },
-    { name: 'strUpper', aliases: [ 'S' ], type: OptionType.String, description: '' },
+    { name: 'bool', aliases: ['b'], type: OptionType.Boolean, description: '' },
+    { name: 'num', aliases: ['n'], type: OptionType.Number, description: '' },
+    { name: 'str', aliases: ['s'], type: OptionType.String, description: '' },
+    { name: 'strUpper', aliases: ['S'], type: OptionType.String, description: '' },
     { name: 'helloWorld', aliases: [], type: OptionType.String, description: '' },
     { name: 'helloBool', aliases: [], type: OptionType.Boolean, description: '' },
-    { name: 'arr', aliases: [ 'a' ], type: OptionType.Array, description: '' },
+    { name: 'arr', aliases: ['a'], type: OptionType.Array, description: '' },
     { name: 'p1', positional: 0, aliases: [], type: OptionType.String, description: '' },
     { name: 'p2', positional: 1, aliases: [], type: OptionType.String, description: '' },
     { name: 'p3', positional: 2, aliases: [], type: OptionType.Number, description: '' },
-    { name: 't1', aliases: [], type: OptionType.Boolean,
-      types: [OptionType.Boolean, OptionType.String], description: '' },
-    { name: 't2', aliases: [], type: OptionType.Boolean,
-      types: [OptionType.Boolean, OptionType.Number], description: '' },
-    { name: 't3', aliases: [], type: OptionType.Number,
-      types: [OptionType.Number, OptionType.Any], description: '' },
+    {
+      name: 't1',
+      aliases: [],
+      type: OptionType.Boolean,
+      types: [OptionType.Boolean, OptionType.String],
+      description: '',
+    },
+    {
+      name: 't2',
+      aliases: [],
+      type: OptionType.Boolean,
+      types: [OptionType.Boolean, OptionType.Number],
+      description: '',
+    },
+    {
+      name: 't3',
+      aliases: [],
+      type: OptionType.Number,
+      types: [OptionType.Number, OptionType.Any],
+      description: '',
+    },
     { name: 'e1', aliases: [], type: OptionType.String, enum: ['hello', 'world'], description: '' },
     { name: 'e2', aliases: [], type: OptionType.String, enum: ['hello', ''], description: '' },
-    { name: 'e3', aliases: [], type: OptionType.Boolean,
-      types: [OptionType.Boolean, OptionType.String], enum: ['json', true, false],
-      description: '' },
+    {
+      name: 'e3',
+      aliases: [],
+      type: OptionType.Boolean,
+      types: [OptionType.Boolean, OptionType.String],
+      enum: ['json', true, false],
+      description: '',
+    },
   ];
 
   const tests: { [test: string]: Partial<Arguments> | ['!!!', Partial<Arguments>, string[]] } = {
@@ -75,10 +94,15 @@ describe('parseArguments', () => {
     '--bool val1 --etc --num val2 --v': [
       '!!!',
       { bool: true, p1: 'val1', p2: 'val2', '--': ['--etc', '--v'] },
-      ['--num' ],
+      ['--num'],
     ],
-    '--bool val1 --etc --num=1 val2 --v': { bool: true, num: 1, p1: 'val1', p2: 'val2',
-                                            '--': ['--etc', '--v'] },
+    '--bool val1 --etc --num=1 val2 --v': {
+      bool: true,
+      num: 1,
+      p1: 'val1',
+      p2: 'val2',
+      '--': ['--etc', '--v'],
+    },
     '--arr=a d': { arr: ['a'], p1: 'd' },
     '--arr=a --arr=b --arr c d': { arr: ['a', 'b', 'c'], p1: 'd' },
     '--arr=1 --arr --arr c d': { arr: ['1', '', 'c'], p1: 'd' },
@@ -121,7 +145,7 @@ describe('parseArguments', () => {
     '--e1=yellow': ['!!!', {}, ['--e1=yellow']],
     '--e1': ['!!!', {}, ['--e1']],
     '--e1 true': ['!!!', { p1: 'true' }, ['--e1']],
-    '--e1=true': ['!!!', {},  ['--e1=true']],
+    '--e1=true': ['!!!', {}, ['--e1=true']],
     '--e2 hello': { e2: 'hello' },
     '--e2=hello': { e2: 'hello' },
     '--e2 yellow': { p1: 'yellow', e2: '' },
@@ -138,13 +162,13 @@ describe('parseArguments', () => {
     '--e3=true': { e3: true },
     'a b c 1': { p1: 'a', p2: 'b', '--': ['c', '1'] },
 
-    '-p=1 -c=prod': {'--': ['-p=1', '-c=prod'] },
-    '--p --c': {'--': ['--p', '--c'] },
-    '--p=123': {'--': ['--p=123'] },
-    '--p -c': {'--': ['--p', '-c'] },
-    '-p --c': {'--': ['-p', '--c'] },
-    '-p --c 123': {'--': ['-p', '--c', '123'] },
-    '--c 123 -p': {'--': ['--c', '123', '-p'] },
+    '-p=1 -c=prod': { '--': ['-p=1', '-c=prod'] },
+    '--p --c': { '--': ['--p', '--c'] },
+    '--p=123': { '--': ['--p=123'] },
+    '--p -c': { '--': ['--p', '-c'] },
+    '-p --c': { '--': ['-p', '--c'] },
+    '-p --c 123': { '--': ['-p', '--c', '123'] },
+    '--c 123 -p': { '--': ['--c', '123', '-p'] },
   };
 
   Object.entries(tests).forEach(([str, expected]) => {
@@ -172,14 +196,12 @@ describe('parseArguments', () => {
   });
 
   it('handles a flag being added multiple times', () => {
-    const options = [
-      { name: 'bool', aliases: [], type: OptionType.Boolean, description: '' },
-    ];
+    const options = [{ name: 'bool', aliases: [], type: OptionType.Boolean, description: '' }];
 
     const logger = new logging.Logger('');
     const messages: string[] = [];
 
-    logger.subscribe(entry => messages.push(entry.message));
+    logger.subscribe((entry) => messages.push(entry.message));
 
     let result = parseArguments(['--bool'], options, logger);
     expect(result).toEqual({ bool: true });
diff --git a/packages/angular/cli/models/schematic-command.ts b/packages/angular/cli/models/schematic-command.ts
index fa73b260487c..884ba71f7d9d 100644
--- a/packages/angular/cli/models/schematic-command.ts
+++ b/packages/angular/cli/models/schematic-command.ts
@@ -1,18 +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 {
-  logging,
-  normalize,
-  schema,
-  strings,
-  tags,
-  workspaces,
-} from '@angular-devkit/core';
+
+import { logging, normalize, schema, strings, tags, workspaces } from '@angular-devkit/core';
 import {
   DryRunEvent,
   UnsuccessfulWorkflowExecution,
@@ -62,10 +56,10 @@ export class UnknownCollectionError extends Error {
 }
 
 export abstract class SchematicCommand<
-  T extends BaseSchematicSchema & BaseCommandOptions
+  T extends BaseSchematicSchema & BaseCommandOptions,
 > extends Command<T> {
   protected readonly allowPrivateSchematics: boolean = false;
-  protected readonly useReportAnalytics = false;
+  protected override readonly useReportAnalytics = false;
   protected _workflow!: NodeWorkflow;
 
   protected defaultCollectionName = '@schematics/angular';
@@ -76,7 +70,7 @@ export abstract class SchematicCommand<
     super(context, description, logger);
   }
 
-  public async initialize(options: T & Arguments) {
+  public override async initialize(options: T & Arguments) {
     await this.createWorkflow(options);
 
     if (this.schematicName) {
@@ -88,7 +82,8 @@ export abstract class SchematicCommand<
         schematic.description.schemaJson || {},
       );
 
-      this.description.options.push(...options.filter(x => !x.hidden));
+      this.description.description = schematic.description.description;
+      this.description.options.push(...options.filter((x) => !x.hidden));
 
       // Remove any user analytics from schematics that are NOT part of our safelist.
       for (const o of this.description.options) {
@@ -99,11 +94,11 @@ export abstract class SchematicCommand<
     }
   }
 
-  public async printHelp() {
+  public override async printHelp() {
     await super.printHelp();
     this.logger.info('');
 
-    const subCommandOption = this.description.options.filter(x => x.subcommands)[0];
+    const subCommandOption = this.description.options.filter((x) => x.subcommands)[0];
 
     if (!subCommandOption || !subCommandOption.subcommands) {
       return 0;
@@ -115,7 +110,7 @@ export abstract class SchematicCommand<
       this.logger.info('Available Schematics:');
 
       const namesPerCollection: { [c: string]: string[] } = {};
-      schematicNames.forEach(name => {
+      schematicNames.forEach((name) => {
         let [collectionName, schematicName] = name.split(/:/, 2);
         if (!schematicName) {
           schematicName = collectionName;
@@ -130,24 +125,21 @@ export abstract class SchematicCommand<
       });
 
       const defaultCollection = await this.getDefaultSchematicCollection();
-      Object.keys(namesPerCollection).forEach(collectionName => {
+      Object.keys(namesPerCollection).forEach((collectionName) => {
         const isDefault = defaultCollection == collectionName;
         this.logger.info(`  Collection "${collectionName}"${isDefault ? ' (default)' : ''}:`);
 
-        namesPerCollection[collectionName].forEach(schematicName => {
+        namesPerCollection[collectionName].forEach((schematicName) => {
           this.logger.info(`    ${schematicName}`);
         });
       });
-    } else if (schematicNames.length == 1) {
-      this.logger.info('Help for schematic ' + schematicNames[0]);
-      await this.printHelpSubcommand(subCommandOption.subcommands[schematicNames[0]]);
     }
 
     return 0;
   }
 
-  async printHelpUsage() {
-    const subCommandOption = this.description.options.filter(x => x.subcommands)[0];
+  override async printHelpUsage() {
+    const subCommandOption = this.description.options.filter((x) => x.subcommands)[0];
 
     if (!subCommandOption || !subCommandOption.subcommands) {
       return;
@@ -157,7 +149,7 @@ export abstract class SchematicCommand<
     if (schematicNames.length == 1) {
       this.logger.info(this.description.description);
 
-      const opts = this.description.options.filter(x => x.positional === undefined);
+      const opts = this.description.options.filter((x) => x.positional === undefined);
       const [collectionName, schematicName] = schematicNames[0].split(/:/)[0];
 
       // Display <collectionName:schematicName> if this is not the default collectionName,
@@ -168,10 +160,10 @@ export abstract class SchematicCommand<
           : schematicNames[0];
 
       const schematicOptions = subCommandOption.subcommands[schematicNames[0]].options;
-      const schematicArgs = schematicOptions.filter(x => x.positional !== undefined);
+      const schematicArgs = schematicOptions.filter((x) => x.positional !== undefined);
       const argDisplay =
         schematicArgs.length > 0
-          ? ' ' + schematicArgs.map(a => `<${strings.dasherize(a.name)}>`).join(' ')
+          ? ' ' + schematicArgs.map((a) => `<${strings.dasherize(a.name)}>`).join(' ')
           : '';
 
       this.logger.info(tags.oneLine`
@@ -213,16 +205,13 @@ export abstract class SchematicCommand<
     }
 
     return options
-      .filter(o => o.format === 'path')
-      .map(o => o.name)
-      .reduce(
-        (acc, curr) => {
-          acc[curr] = workingDir;
+      .filter((o) => o.format === 'path')
+      .map((o) => o.name)
+      .reduce((acc, curr) => {
+        acc[curr] = workingDir;
 
-          return acc;
-        },
-        {} as { [name: string]: string },
-      );
+        return acc;
+      }, {} as { [name: string]: string });
   }
 
   /*
@@ -242,28 +231,39 @@ export abstract class SchematicCommand<
       packageRegistry: options.packageRegistry,
       // A schema registry is required to allow customizing addUndefinedDefaults
       registry: new schema.CoreSchemaRegistry(formats.standardFormats),
-      resolvePaths: !!this.workspace
-        // Workspace
-        ? this.collectionName === this.defaultCollectionName
-          // Favor __dirname for @schematics/angular to use the build-in version
-          ? [__dirname, process.cwd(), root]
+      resolvePaths: this.workspace
+        ? // Workspace
+          this.collectionName === this.defaultCollectionName
+          ? // Favor __dirname for @schematics/angular to use the build-in version
+            [__dirname, process.cwd(), root]
           : [process.cwd(), root, __dirname]
-        // Global
-        : [__dirname, process.cwd()],
+        : // Global
+          [__dirname, process.cwd()],
       schemaValidation: true,
       optionTransforms: [
         // Add configuration file defaults
-        async (schematic, current) => ({
-          ...(await getSchematicDefaults(schematic.collection.name, schematic.name, getProjectName())),
-          ...current,
-        }),
+        async (schematic, current) => {
+          const projectName =
+            typeof (current as Record<string, unknown>).project === 'string'
+              ? ((current as Record<string, unknown>).project as string)
+              : getProjectName();
+
+          return {
+            ...(await getSchematicDefaults(schematic.collection.name, schematic.name, projectName)),
+            ...current,
+          };
+        },
       ],
       engineHostCreator: (options) => new SchematicEngineHost(options.resolvePaths),
     });
 
     const getProjectName = () => {
       if (this.workspace) {
-        const projectNames = getProjectsByPath(this.workspace, process.cwd(), this.workspace.basePath);
+        const projectNames = getProjectsByPath(
+          this.workspace,
+          process.cwd(),
+          this.workspace.basePath,
+        );
 
         if (projectNames.length === 1) {
           return projectNames[0];
@@ -288,7 +288,7 @@ export abstract class SchematicCommand<
 
     workflow.registry.addPostTransform(schema.transforms.addUndefinedDefaults);
     workflow.registry.addSmartDefaultProvider('projectName', getProjectName);
-    workflow.registry.useXDeprecatedProvider(msg => this.logger.warn(msg));
+    workflow.registry.useXDeprecatedProvider((msg) => this.logger.warn(msg));
 
     let shouldReportAnalytics = true;
     workflow.engineHost.registerOptionsTransform(async (_, options) => {
@@ -303,8 +303,8 @@ export abstract class SchematicCommand<
     if (options.interactive !== false && isTTY()) {
       workflow.registry.usePromptProvider((definitions: Array<schema.PromptDefinition>) => {
         const questions: inquirer.QuestionCollection = definitions
-          .filter(definition => !options.defaults || definition.default === undefined)
-          .map(definition => {
+          .filter((definition) => !options.defaults || definition.default === undefined)
+          .map((definition) => {
             const question: inquirer.Question = {
               name: definition.id,
               message: definition.message,
@@ -313,7 +313,7 @@ export abstract class SchematicCommand<
 
             const validator = definition.validator;
             if (validator) {
-              question.validate = input => validator(input);
+              question.validate = (input) => validator(input);
 
               // Filter allows transformation of the value prior to validation
               question.filter = async (input) => {
@@ -348,13 +348,13 @@ export abstract class SchematicCommand<
                 break;
               case 'list':
                 question.type = definition.multiselect ? 'checkbox' : 'list';
-                (question as inquirer.CheckboxQuestion).choices = definition.items?.map(item => {
+                (question as inquirer.CheckboxQuestion).choices = definition.items?.map((item) => {
                   return typeof item == 'string'
                     ? item
                     : {
-                      name: item.label,
-                      value: item.value,
-                    };
+                        name: item.label,
+                        value: item.value,
+                      };
                 });
                 break;
               default:
@@ -437,10 +437,11 @@ export abstract class SchematicCommand<
     }
 
     const allowAdditionalProperties =
-      typeof schematic.description.schemaJson === 'object' && schematic.description.schemaJson.additionalProperties;
+      typeof schematic.description.schemaJson === 'object' &&
+      schematic.description.schemaJson.additionalProperties;
 
     if (args['--'] && !allowAdditionalProperties) {
-      args['--'].forEach(additional => {
+      args['--'].forEach((additional) => {
         this.logger.fatal(`Unknown option: '${additional.split(/=/)[0]}'`);
       });
 
@@ -448,14 +449,9 @@ export abstract class SchematicCommand<
     }
 
     const pathOptions = o ? this.setPathOptions(o, workingDir) : {};
-    let input = { ...pathOptions, ...args };
-
-    // Read the default values from the workspace.
-    const projectName = input.project !== undefined ? '' + input.project : null;
-    const defaults = await getSchematicDefaults(collectionName, schematicName, projectName);
-    input = {
-      ...defaults,
-      ...input,
+    const input = {
+      ...pathOptions,
+      ...args,
       ...options.additionalOptions,
     };
 
@@ -491,11 +487,11 @@ export abstract class SchematicCommand<
       }
     });
 
-    workflow.lifeCycle.subscribe(event => {
+    workflow.lifeCycle.subscribe((event) => {
       if (event.kind == 'end' || event.kind == 'post-tasks-start') {
         if (!error) {
           // Output the logging queue, no error happened.
-          loggingQueue.forEach(log => this.logger.info(log));
+          loggingQueue.forEach((log) => this.logger.info(log));
         }
 
         loggingQueue = [];
@@ -513,7 +509,7 @@ export abstract class SchematicCommand<
       }
     }
 
-    return new Promise<number | void>(resolve => {
+    return new Promise<number | void>((resolve) => {
       workflow
         .execute({
           collection: collectionName,
@@ -585,7 +581,7 @@ function getProjectsByPath(
 
   const projects = Array.from(workspace.projects.entries())
     .map(([name, project]) => [systemPath.resolve(root, project.root), name] as [string, string])
-    .filter(tuple => isInside(tuple[0], path))
+    .filter((tuple) => isInside(tuple[0], path))
     // Sort tuples by depth, with the deeper ones first. Since the first member is a path and
     // we filtered all invalid paths, the longest will be the deepest (and in case of equality
     // the sort is stable and the first declared project will win).
@@ -596,7 +592,7 @@ function getProjectsByPath(
   } else if (projects.length > 1) {
     const firstPath = projects[0][0];
 
-    return projects.filter(v => v[0] === firstPath).map(v => v[1]);
+    return projects.filter((v) => v[0] === firstPath).map((v) => v[1]);
   }
 
   return [];
diff --git a/packages/angular/cli/models/schematic-engine-host.ts b/packages/angular/cli/models/schematic-engine-host.ts
index 478973f78a54..208ff61f0ebf 100644
--- a/packages/angular/cli/models/schematic-engine-host.ts
+++ b/packages/angular/cli/models/schematic-engine-host.ts
@@ -1,14 +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 { 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 nodeModule from 'module';
 import { dirname, resolve } from 'path';
 import { Script } from 'vm';
 
@@ -32,19 +34,24 @@ function shouldWrapSchematic(schematicFile: string): boolean {
     }
   }
 
+  const normalizedSchematicFile = schematicFile.replace(/\\/g, '/');
   // Never wrap the internal update schematic when executed directly
   // It communicates with the update command via `global`
-  if (/[\/\\]node_modules[\/\\]@angular[\/\\]cli[\/\\]/.test(schematicFile)) {
+  // But we still want to redirect schematics located in `@angular/cli/node_modules`.
+  if (
+    normalizedSchematicFile.includes('node_modules/@angular/cli/') &&
+    !normalizedSchematicFile.includes('node_modules/@angular/cli/node_modules/')
+  ) {
     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);
+  return /\/node_modules\/@(?:angular|schematics|nguniversal)\//.test(normalizedSchematicFile);
 }
 
 export class SchematicEngineHost extends NodeModulesEngineHost {
-  protected _resolveReferenceString(refString: string, parentPath: string) {
+  protected override _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;
@@ -114,10 +121,7 @@ function wrap(
   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 scopedRequire = nodeModule.createRequire(schematicFile);
 
   const customRequire = function (id: string) {
     if (legacyModules[id]) {
diff --git a/packages/angular/cli/models/version.ts b/packages/angular/cli/models/version.ts
index 1c8003543d21..0ee4e0c8c828 100644
--- a/packages/angular/cli/models/version.ts
+++ b/packages/angular/cli/models/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/cli/package.json b/packages/angular/cli/package.json
index d8e9d6c02cfc..c24e66384029 100644
--- a/packages/angular/cli/package.json
+++ b/packages/angular/cli/package.json
@@ -31,21 +31,23 @@
     "@schematics/angular": "0.0.0",
     "@yarnpkg/lockfile": "1.1.0",
     "ansi-colors": "4.1.1",
-    "debug": "4.3.1",
+    "debug": "4.3.2",
     "ini": "2.0.0",
-    "inquirer": "8.0.0",
+    "inquirer": "8.1.2",
     "jsonc-parser": "3.0.0",
-    "npm-package-arg": "8.1.2",
+    "npm-package-arg": "8.1.5",
     "npm-pick-manifest": "6.1.1",
-    "open": "8.0.5",
-    "ora": "5.4.0",
-    "pacote": "11.3.1",
+    "open": "8.2.1",
+    "ora": "5.4.1",
+    "pacote": "12.0.2",
     "resolve": "1.20.0",
-    "rimraf": "3.0.2",
     "semver": "7.3.5",
-    "symbol-observable": "3.0.0",
+    "symbol-observable": "4.0.0",
     "uuid": "8.3.2"
   },
+  "devDependencies": {
+    "rxjs": "6.6.7"
+  },
   "ng-update": {
     "migrations": "@schematics/angular/migrations/migration-collection.json",
     "packageGroup": {
diff --git a/packages/angular/cli/src/commands/update/schematic/index.ts b/packages/angular/cli/src/commands/update/schematic/index.ts
index d7995edca3eb..39eee7e4fd41 100644
--- a/packages/angular/cli/src/commands/update/schematic/index.ts
+++ b/packages/angular/cli/src/commands/update/schematic/index.ts
@@ -1,30 +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
  */
+
 import { logging, tags } from '@angular-devkit/core';
-import {
-  Rule,
-  SchematicContext,
-  SchematicsException,
-  TaskId,
-  Tree,
-} from '@angular-devkit/schematics';
-import { NodePackageInstallTask, RunSchematicTask } from '@angular-devkit/schematics/tasks';
+import { Rule, SchematicContext, SchematicsException, Tree } from '@angular-devkit/schematics';
 import * as npa from 'npm-package-arg';
 import * as semver from 'semver';
-import { getNpmPackageJson } from './npm';
-import { NpmRepositoryPackageJson } from './npm-package-json';
-import { Dependency, JsonSchemaForNpmPackageJsonFiles } from './package-json';
+import { Dependency, JsonSchemaForNpmPackageJsonFiles } from '../../../../utilities/package-json';
+import {
+  NpmRepositoryPackageJson,
+  getNpmPackageJson,
+} from '../../../../utilities/package-metadata';
 import { Schema as UpdateSchema } from './schema';
 
-type VersionRange = string & { __VERSION_RANGE: void; };
+type VersionRange = string & { __VERSION_RANGE: void };
 type PeerVersionTransform = string | ((range: string) => string);
 
-
 // Angular guarantees that a major is compatible with its following major (so packages that depend
 // on Angular 5 are also compatible with Angular 6). This is, in code, represented by verifying
 // that all other packages that have a peer dependency of `"@angular/core": "^5.0.0"` actually
@@ -56,7 +51,6 @@ export function angularMajorCompatGuarantee(range: string) {
   return semver.validRange(newRange) || range;
 }
 
-
 // This is a map of packageGroupName to range extending function. If it isn't found, the range is
 // kept the same.
 const knownPeerCompatibleList: { [name: string]: PeerVersionTransform } = {
@@ -79,7 +73,7 @@ interface PackageInfo {
 
 interface UpdateMetadata {
   packageGroupName?: string;
-  packageGroup: { [ packageName: string ]: string };
+  packageGroup: { [packageName: string]: string };
   requirements: { [packageName: string]: string };
   migrations?: string;
 }
@@ -111,8 +105,8 @@ function _updatePeerVersion(infoMap: Map<string, PackageInfo>, name: string, ran
 function _validateForwardPeerDependencies(
   name: string,
   infoMap: Map<string, PackageInfo>,
-  peers: {[name: string]: string},
-  peersMeta: { [name: string]: { optional?: boolean }},
+  peers: { [name: string]: string },
+  peersMeta: { [name: string]: { optional?: boolean } },
   logger: logging.LoggerApi,
   next: boolean,
 ): boolean {
@@ -123,26 +117,31 @@ function _validateForwardPeerDependencies(
     const isOptional = peersMeta[peer] && !!peersMeta[peer].optional;
     if (!maybePeerInfo) {
       if (!isOptional) {
-        logger.warn([
-          `Package ${JSON.stringify(name)} has a missing peer dependency of`,
-          `${JSON.stringify(peer)} @ ${JSON.stringify(range)}.`,
-        ].join(' '));
+        logger.warn(
+          [
+            `Package ${JSON.stringify(name)} has a missing peer dependency of`,
+            `${JSON.stringify(peer)} @ ${JSON.stringify(range)}.`,
+          ].join(' '),
+        );
       }
 
       continue;
     }
 
-    const peerVersion = maybePeerInfo.target && maybePeerInfo.target.packageJson.version
-      ? maybePeerInfo.target.packageJson.version
-      : maybePeerInfo.installed.version;
+    const peerVersion =
+      maybePeerInfo.target && maybePeerInfo.target.packageJson.version
+        ? maybePeerInfo.target.packageJson.version
+        : maybePeerInfo.installed.version;
 
     logger.debug(`  Range intersects(${range}, ${peerVersion})...`);
     if (!semver.satisfies(peerVersion, range, { includePrerelease: next || undefined })) {
-      logger.error([
-        `Package ${JSON.stringify(name)} has an incompatible peer dependency to`,
-        `${JSON.stringify(peer)} (requires ${JSON.stringify(range)},`,
-        `would install ${JSON.stringify(peerVersion)})`,
-      ].join(' '));
+      logger.error(
+        [
+          `Package ${JSON.stringify(name)} has an incompatible peer dependency to`,
+          `${JSON.stringify(peer)} (requires ${JSON.stringify(range)},`,
+          `would install ${JSON.stringify(peerVersion)})`,
+        ].join(' '),
+      );
 
       validationFailed = true;
       continue;
@@ -152,7 +151,6 @@ function _validateForwardPeerDependencies(
   return validationFailed;
 }
 
-
 function _validateReversePeerDependencies(
   name: string,
   version: string,
@@ -178,6 +176,7 @@ function _validateReversePeerDependencies(
         'codelyzer',
         '@schematics/update',
         '@angular-devkit/build-ng-packagr',
+        'tsickle',
       ];
       if (ignoredPackages.includes(installed)) {
         continue;
@@ -187,12 +186,14 @@ function _validateReversePeerDependencies(
       const extendedRange = _updatePeerVersion(infoMap, peer, range);
 
       if (!semver.satisfies(version, extendedRange, { includePrerelease: next || undefined })) {
-        logger.error([
-          `Package ${JSON.stringify(installed)} has an incompatible peer dependency to`,
-          `${JSON.stringify(name)} (requires`,
-          `${JSON.stringify(range)}${extendedRange == range ? '' : ' (extended)'},`,
-          `would install ${JSON.stringify(version)}).`,
-        ].join(' '));
+        logger.error(
+          [
+            `Package ${JSON.stringify(installed)} has an incompatible peer dependency to`,
+            `${JSON.stringify(name)} (requires`,
+            `${JSON.stringify(range)}${extendedRange == range ? '' : ' (extended)'},`,
+            `would install ${JSON.stringify(version)}).`,
+          ].join(' '),
+        );
 
         return true;
       }
@@ -209,15 +210,15 @@ function _validateUpdatePackages(
   logger: logging.LoggerApi,
 ): void {
   logger.debug('Updating the following packages:');
-  infoMap.forEach(info => {
+  infoMap.forEach((info) => {
     if (info.target) {
       logger.debug(`  ${info.name} => ${info.target.version}`);
     }
   });
 
   let peerErrors = false;
-  infoMap.forEach(info => {
-    const {name, target} = info;
+  infoMap.forEach((info) => {
+    const { name, target } = info;
     if (!target) {
       return;
     }
@@ -226,29 +227,33 @@ function _validateUpdatePackages(
     logger.debug(`${name}...`);
 
     const { peerDependencies = {}, peerDependenciesMeta = {} } = target.packageJson;
-    peerErrors = _validateForwardPeerDependencies(name, infoMap, peerDependencies,
-      peerDependenciesMeta, pkgLogger, next) || peerErrors;
-    peerErrors
-      = _validateReversePeerDependencies(name, target.version, infoMap, pkgLogger, next)
-      || peerErrors;
+    peerErrors =
+      _validateForwardPeerDependencies(
+        name,
+        infoMap,
+        peerDependencies,
+        peerDependenciesMeta,
+        pkgLogger,
+        next,
+      ) || peerErrors;
+    peerErrors =
+      _validateReversePeerDependencies(name, target.version, infoMap, pkgLogger, next) ||
+      peerErrors;
   });
 
   if (!force && peerErrors) {
-    throw new SchematicsException(tags.stripIndents
-      `Incompatible peer dependencies found.
+    throw new SchematicsException(tags.stripIndents`Incompatible peer dependencies found.
       Peer dependency warnings when installing dependencies means that those dependencies might not work correctly together.
       You can use the '--force' option to ignore incompatible peer dependencies and instead address these warnings later.`);
   }
 }
 
-
 function _performUpdate(
   tree: Tree,
   context: SchematicContext,
   infoMap: Map<string, PackageInfo>,
   logger: logging.LoggerApi,
   migrateOnly: boolean,
-  migrateExternal: boolean,
 ): void {
   const packageJsonContent = tree.read('/package.json');
   if (!packageJsonContent) {
@@ -270,16 +275,15 @@ function _performUpdate(
   };
 
   const toInstall = [...infoMap.values()]
-      .map(x => [x.name, x.target, x.installed])
-      // tslint:disable-next-line:no-non-null-assertion
-      .filter(([name, target, installed]) => {
-        return !!name && !!target && !!installed;
-      }) as [string, PackageVersionInfo, PackageVersionInfo][];
+    .map((x) => [x.name, x.target, x.installed])
+    .filter(([name, target, installed]) => {
+      return !!name && !!target && !!installed;
+    }) as [string, PackageVersionInfo, PackageVersionInfo][];
 
   toInstall.forEach(([name, target, installed]) => {
     logger.info(
-      `Updating package.json with dependency ${name} `
-      + `@ ${JSON.stringify(target.version)} (was ${JSON.stringify(installed.version)})...`,
+      `Updating package.json with dependency ${name} ` +
+        `@ ${JSON.stringify(target.version)} (was ${JSON.stringify(installed.version)})...`,
     );
 
     if (packageJson.dependencies && packageJson.dependencies[name]) {
@@ -306,11 +310,8 @@ function _performUpdate(
 
   const newContent = JSON.stringify(packageJson, null, 2);
   if (packageJsonContent.toString() != newContent || migrateOnly) {
-    let installTask: TaskId[] = [];
     if (!migrateOnly) {
-      // If something changed, also hook up the task.
       tree.overwrite('/package.json', JSON.stringify(packageJson, null, 2));
-      installTask = [context.addTask(new NodePackageInstallTask())];
     }
 
     const externalMigrations: {}[] = [];
@@ -324,70 +325,27 @@ function _performUpdate(
         return;
       }
 
-      const collection = (
-        target.updateMetadata.migrations.match(/^[./]/)
-        ? name + '/'
-        : ''
-      ) + target.updateMetadata.migrations;
-
-      if (migrateExternal) {
-        externalMigrations.push({
-          package: name,
-          collection,
-          from: installed.version,
-          to: target.version,
-        });
+      const collection =
+        (target.updateMetadata.migrations.match(/^[./]/) ? name + '/' : '') +
+        target.updateMetadata.migrations;
 
-        return;
-      }
+      externalMigrations.push({
+        package: name,
+        collection,
+        from: installed.version,
+        to: target.version,
+      });
 
-      context.addTask(new RunSchematicTask('@schematics/update', 'migrate', {
-          package: name,
-          collection,
-          from: installed.version,
-          to: target.version,
-        }),
-        installTask,
-      );
+      return;
     });
 
     if (externalMigrations.length > 0) {
-      // tslint:disable-next-line: no-any
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       (global as any).externalMigrations = externalMigrations;
     }
   }
 }
 
-function _migrateOnly(
-  info: PackageInfo | undefined,
-  context: SchematicContext,
-  from: string,
-  to?: string,
-) {
-  if (!info) {
-    return;
-  }
-
-  const target = info.installed;
-  if (!target || !target.updateMetadata.migrations) {
-    return;
-  }
-
-  const collection = (
-    target.updateMetadata.migrations.match(/^[./]/)
-      ? info.name + '/'
-      : ''
-  ) + target.updateMetadata.migrations;
-
-  context.addTask(new RunSchematicTask('@schematics/update', 'migrate', {
-      package: info.name,
-      collection,
-      from: from,
-      to: to || target.version,
-    }),
-  );
-}
-
 function _getUpdateMetadata(
   packageJson: JsonSchemaForNpmPackageJsonFiles,
   logger: logging.LoggerApi,
@@ -407,19 +365,20 @@ function _getUpdateMetadata(
     const packageGroup = metadata['packageGroup'];
     // Verify that packageGroup is an array of strings or an map of versions. This is not an error
     // but we still warn the user and ignore the packageGroup keys.
-    if (Array.isArray(packageGroup) && packageGroup.every(x => typeof x == 'string')) {
+    if (Array.isArray(packageGroup) && packageGroup.every((x) => typeof x == 'string')) {
       result.packageGroup = packageGroup.reduce((group, name) => {
         group[name] = packageJson.version;
 
         return group;
       }, result.packageGroup);
-    } else if (typeof packageGroup == 'object' && packageGroup
-               && Object.values(packageGroup).every(x => typeof x == 'string')) {
+    } else if (
+      typeof packageGroup == 'object' &&
+      packageGroup &&
+      Object.values(packageGroup).every((x) => typeof x == 'string')
+    ) {
       result.packageGroup = packageGroup;
     } else {
-      logger.warn(
-        `packageGroup metadata of package ${packageJson.name} is malformed. Ignoring.`,
-      );
+      logger.warn(`packageGroup metadata of package ${packageJson.name} is malformed. Ignoring.`);
     }
 
     result.packageGroupName = Object.keys(result.packageGroup)[0];
@@ -432,12 +391,12 @@ function _getUpdateMetadata(
   if (metadata['requirements']) {
     const requirements = metadata['requirements'];
     // Verify that requirements are
-    if (typeof requirements != 'object'
-        || Array.isArray(requirements)
-        || Object.keys(requirements).some(name => typeof requirements[name] != 'string')) {
-      logger.warn(
-        `requirements metadata of package ${packageJson.name} is malformed. Ignoring.`,
-      );
+    if (
+      typeof requirements != 'object' ||
+      Array.isArray(requirements) ||
+      Object.keys(requirements).some((name) => typeof requirements[name] != 'string')
+    ) {
+      logger.warn(`requirements metadata of package ${packageJson.name} is malformed. Ignoring.`);
     } else {
       result.requirements = requirements;
     }
@@ -455,7 +414,6 @@ function _getUpdateMetadata(
   return result;
 }
 
-
 function _usageMessage(
   options: UpdateSchema,
   infoMap: Map<string, PackageInfo>,
@@ -464,10 +422,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,
@@ -477,8 +464,8 @@ function _usageMessage(
         target,
       };
     })
-    .filter(({ name, info, version, target }) => {
-      return (target && semver.compare(info.installed.version, version) < 0);
+    .filter(({ info, version, target }) => {
+      return target && semver.compare(info.installed.version, version) < 0;
     })
     .filter(({ target }) => {
       return target['ng-update'];
@@ -487,8 +474,8 @@ function _usageMessage(
       // Look for packageGroup.
       if (target['ng-update'] && target['ng-update']['packageGroup']) {
         const packageGroup = target['ng-update']['packageGroup'];
-        const packageGroupName = target['ng-update']['packageGroupName']
-                              || target['ng-update']['packageGroup'][0];
+        const packageGroupName =
+          target['ng-update']['packageGroupName'] || target['ng-update']['packageGroup'][0];
         if (packageGroupName) {
           if (packageGroups.has(name)) {
             return null;
@@ -501,14 +488,16 @@ function _usageMessage(
       }
 
       let command = `ng update ${name}`;
-      if (tag == 'next') {
+      if (!tag) {
+        command += `@${semver.parse(version)?.major || version}`;
+      } else if (tag == 'next') {
         command += ' --next';
       }
 
       return [name, `${info.installed.version} -> ${version} `, command];
     })
-    .filter(x => x !== null)
-    .sort((a, b) => a && b ? a[0].localeCompare(b[0]) : 0);
+    .filter((x) => x !== null)
+    .sort((a, b) => (a && b ? a[0].localeCompare(b[0]) : 0));
 
   if (packagesToUpdate.length == 0) {
     logger.info('We analyzed your package.json and everything seems to be in order. Good work!');
@@ -516,24 +505,21 @@ function _usageMessage(
     return;
   }
 
-  logger.info(
-    'We analyzed your package.json, there are some packages to update:\n',
-  );
+  logger.info('We analyzed your package.json, there are some packages to update:\n');
 
   // Find the largest name to know the padding needed.
-  let namePad = Math.max(...[...infoMap.keys()].map(x => x.length)) + 2;
+  let namePad = Math.max(...[...infoMap.keys()].map((x) => x.length)) + 2;
   if (!Number.isFinite(namePad)) {
     namePad = 30;
   }
   const pads = [namePad, 25, 0];
 
   logger.info(
-    '  '
-    + ['Name', 'Version', 'Command to update'].map((x, i) => x.padEnd(pads[i])).join(''),
+    '  ' + ['Name', 'Version', 'Command to update'].map((x, i) => x.padEnd(pads[i])).join(''),
   );
-  logger.info(' ' + '-'.repeat(pads.reduce((s, x) => s += x, 0) + 20));
+  logger.info(' ' + '-'.repeat(pads.reduce((s, x) => (s += x), 0) + 20));
 
-  packagesToUpdate.forEach(fields => {
+  packagesToUpdate.forEach((fields) => {
     if (!fields) {
       return;
     }
@@ -542,14 +528,13 @@ function _usageMessage(
   });
 
   logger.info(
-    `\nThere might be additional packages which don't provide 'ng update' capabilities that are outdated.\n`
-    + `You can update the additional packages by running the update command of your package manager.`,
+    `\nThere might be additional packages which don't provide 'ng update' capabilities that are outdated.\n` +
+      `You can update the additional packages by running the update command of your package manager.`,
   );
 
   return;
 }
 
-
 function _buildPackageInfo(
   tree: Tree,
   packages: Map<string, VersionRange>,
@@ -560,9 +545,7 @@ function _buildPackageInfo(
   const name = npmPackageJson.name;
   const packageJsonRange = allDependencies.get(name);
   if (!packageJsonRange) {
-    throw new SchematicsException(
-      `Package ${JSON.stringify(name)} was not found in package.json.`,
-    );
+    throw new SchematicsException(`Package ${JSON.stringify(name)} was not found in package.json.`);
   }
 
   // Find out the currently installed version. Either from the package.json or the node_modules/
@@ -575,10 +558,7 @@ function _buildPackageInfo(
   }
   if (!installedVersion) {
     // Find the version from NPM that fits the range to max.
-    installedVersion = semver.maxSatisfying(
-      Object.keys(npmPackageJson.versions),
-      packageJsonRange,
-    );
+    installedVersion = semver.maxSatisfying(Object.keys(npmPackageJson.versions), packageJsonRange);
   }
 
   if (!installedVersion) {
@@ -615,10 +595,10 @@ function _buildPackageInfo(
 
   const target: PackageVersionInfo | undefined = targetVersion
     ? {
-      version: targetVersion,
-      packageJson: npmPackageJson.versions[targetVersion],
-      updateMetadata: _getUpdateMetadata(npmPackageJson.versions[targetVersion], logger),
-    }
+        version: targetVersion,
+        packageJson: npmPackageJson.versions[targetVersion],
+        updateMetadata: _getUpdateMetadata(npmPackageJson.versions[targetVersion], logger),
+      }
     : undefined;
 
   // Check if there's an installed version.
@@ -635,7 +615,6 @@ function _buildPackageInfo(
   };
 }
 
-
 function _buildPackageList(
   options: UpdateSchema,
   projectDeps: Map<string, VersionRange>,
@@ -644,9 +623,7 @@ function _buildPackageList(
   // Parse the packages options to set the targeted version.
   const packages = new Map<string, VersionRange>();
   const commandLinePackages =
-    (options.packages && options.packages.length > 0)
-    ? options.packages
-    : [];
+    options.packages && options.packages.length > 0 ? options.packages : [];
 
   for (const pkg of commandLinePackages) {
     // Split the version asked on command line.
@@ -670,7 +647,6 @@ function _buildPackageList(
   return packages;
 }
 
-
 function _addPackageGroup(
   tree: Tree,
   packages: Map<string, VersionRange>,
@@ -685,9 +661,10 @@ function _addPackageGroup(
 
   const info = _buildPackageInfo(tree, packages, allDependencies, npmPackageJson, logger);
 
-  const version = (info.target && info.target.version)
-               || npmPackageJson['dist-tags'][maybePackage]
-               || maybePackage;
+  const version =
+    (info.target && info.target.version) ||
+    npmPackageJson['dist-tags'][maybePackage] ||
+    maybePackage;
   if (!npmPackageJson.versions[version]) {
     return;
   }
@@ -700,7 +677,7 @@ function _addPackageGroup(
   if (!packageGroup) {
     return;
   }
-  if (Array.isArray(packageGroup) && !packageGroup.some(x => typeof x != 'string')) {
+  if (Array.isArray(packageGroup) && !packageGroup.some((x) => typeof x != 'string')) {
     packageGroup = packageGroup.reduce((acc, curr) => {
       acc[curr] = maybePackage;
 
@@ -709,9 +686,10 @@ function _addPackageGroup(
   }
 
   // Only need to check if it's an object because we set it right the time before.
-  if (typeof packageGroup != 'object'
-      || packageGroup === null
-      || Object.values(packageGroup).some(v => typeof v != 'string')
+  if (
+    typeof packageGroup != 'object' ||
+    packageGroup === null ||
+    Object.values(packageGroup).some((v) => typeof v != 'string')
   ) {
     logger.warn(`packageGroup metadata of package ${npmPackageJson.name} is malformed.`);
 
@@ -719,9 +697,9 @@ function _addPackageGroup(
   }
 
   Object.keys(packageGroup)
-    .filter(name => !packages.has(name))  // Don't override names from the command line.
-    .filter(name => allDependencies.has(name))  // Remove packages that aren't installed.
-    .forEach(name => {
+    .filter((name) => !packages.has(name)) // Don't override names from the command line.
+    .filter((name) => allDependencies.has(name)) // Remove packages that aren't installed.
+    .forEach((name) => {
       packages.set(name, packageGroup[name]);
     });
 }
@@ -747,9 +725,10 @@ function _addPeerDependencies(
 
   const info = _buildPackageInfo(tree, packages, allDependencies, npmPackageJson, logger);
 
-  const version = (info.target && info.target.version)
-               || npmPackageJson['dist-tags'][maybePackage]
-               || maybePackage;
+  const version =
+    (info.target && info.target.version) ||
+    npmPackageJson['dist-tags'][maybePackage] ||
+    maybePackage;
   if (!npmPackageJson.versions[version]) {
     return;
   }
@@ -778,7 +757,6 @@ function _addPeerDependencies(
   }
 }
 
-
 function _getAllDependencies(tree: Tree): Array<readonly [string, VersionRange]> {
   const packageJsonContent = tree.read('/package.json');
   if (!packageJsonContent) {
@@ -793,9 +771,9 @@ function _getAllDependencies(tree: Tree): Array<readonly [string, VersionRange]>
   }
 
   return [
-    ...Object.entries(packageJson.peerDependencies || {}) as Array<[string, VersionRange]>,
-    ...Object.entries(packageJson.devDependencies || {}) as Array<[string, VersionRange]>,
-    ...Object.entries(packageJson.dependencies || {}) as Array<[string, VersionRange]>,
+    ...(Object.entries(packageJson.peerDependencies || {}) as Array<[string, VersionRange]>),
+    ...(Object.entries(packageJson.devDependencies || {}) as Array<[string, VersionRange]>),
+    ...(Object.entries(packageJson.dependencies || {}) as Array<[string, VersionRange]>),
   ];
 }
 
@@ -828,7 +806,7 @@ function isPkgFromRegistry(name: string, specifier: string): boolean {
   return !!result.registry;
 }
 
-export default function(options: UpdateSchema): Rule {
+export default function (options: UpdateSchema): Rule {
   if (!options.packages) {
     // We cannot just return this because we need to fetch the packages from NPM still for the
     // help/guide to show.
@@ -852,48 +830,52 @@ export default function(options: UpdateSchema): Rule {
 
   return async (tree: Tree, context: SchematicContext) => {
     const logger = context.logger;
-    const npmDeps = new Map(_getAllDependencies(tree).filter(([name, specifier]) => {
-      try {
-        return isPkgFromRegistry(name, specifier);
-      } catch {
-        logger.warn(`Package ${name} was not found on the registry. Skipping.`);
-
-        return false;
-      }
-    }));
+    const npmDeps = new Map(
+      _getAllDependencies(tree).filter(([name, specifier]) => {
+        try {
+          return isPkgFromRegistry(name, specifier);
+        } catch {
+          logger.warn(`Package ${name} was not found on the registry. Skipping.`);
+
+          return false;
+        }
+      }),
+    );
     const packages = _buildPackageList(options, npmDeps, logger);
 
     // Grab all package.json from the npm repository. This requires a lot of HTTP calls so we
     // try to parallelize as many as possible.
-    const allPackageMetadata = await Promise.all(Array.from(npmDeps.keys()).map(depName => getNpmPackageJson(
-      depName,
-      logger,
-      { registryUrl: options.registry, usingYarn, verbose: options.verbose },
-    )));
+    const allPackageMetadata = await Promise.all(
+      Array.from(npmDeps.keys()).map((depName) =>
+        getNpmPackageJson(depName, logger, {
+          registry: options.registry,
+          usingYarn,
+          verbose: options.verbose,
+        }),
+      ),
+    );
 
     // Build a map of all dependencies and their packageJson.
-    const npmPackageJsonMap = allPackageMetadata.reduce(
-      (acc, npmPackageJson) => {
-        // If the package was not found on the registry. It could be private, so we will just
-        // ignore. If the package was part of the list, we will error out, but will simply ignore
-        // if it's either not requested (so just part of package.json. silently) or if it's a
-        // `--all` situation. There is an edge case here where a public package peer depends on a
-        // private one, but it's rare enough.
-        if (!npmPackageJson.name) {
-          if (npmPackageJson.requestedName && packages.has(npmPackageJson.requestedName)) {
-            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
-          acc.set(npmPackageJson.name, npmPackageJson as NpmRepositoryPackageJson);
+    const npmPackageJsonMap = allPackageMetadata.reduce((acc, npmPackageJson) => {
+      // If the package was not found on the registry. It could be private, so we will just
+      // ignore. If the package was part of the list, we will error out, but will simply ignore
+      // if it's either not requested (so just part of package.json. silently) or if it's a
+      // `--all` situation. There is an edge case here where a public package peer depends on a
+      // private one, but it's rare enough.
+      if (!npmPackageJson.name) {
+        if (npmPackageJson.requestedName && packages.has(npmPackageJson.requestedName)) {
+          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
+        acc.set(npmPackageJson.name, npmPackageJson as NpmRepositoryPackageJson);
+      }
 
-        return acc;
-      },
-      new Map<string, NpmRepositoryPackageJson>(),
-    );
+      return acc;
+    }, new Map<string, NpmRepositoryPackageJson>());
 
     // Augment the command line package list with packageGroups and forward peer dependencies.
     // Each added package may uncover new package groups and peer dependencies, so we must
@@ -919,24 +901,13 @@ export default function(options: UpdateSchema): Rule {
     // Now that we have all the information, check the flags.
     if (packages.size > 0) {
       if (options.migrateOnly && options.from && options.packages) {
-        _migrateOnly(
-          packageInfoMap.get(options.packages[0]),
-          context,
-          options.from,
-          options.to,
-        );
-
         return;
       }
 
-      const sublog = new logging.LevelCapLogger(
-        'validation',
-        logger.createChild(''),
-        'warn',
-      );
+      const sublog = new logging.LevelCapLogger('validation', logger.createChild(''), 'warn');
       _validateUpdatePackages(packageInfoMap, !!options.force, !!options.next, sublog);
 
-      _performUpdate(tree, context, packageInfoMap, logger, !!options.migrateOnly, !!options.migrateExternal);
+      _performUpdate(tree, context, packageInfoMap, logger, !!options.migrateOnly);
     } else {
       _usageMessage(options, packageInfoMap, logger);
     }
diff --git a/packages/angular/cli/src/commands/update/schematic/index_spec.ts b/packages/angular/cli/src/commands/update/schematic/index_spec.ts
index dfa1dd51695d..c133647bb2a3 100644
--- a/packages/angular/cli/src/commands/update/schematic/index_spec.ts
+++ b/packages/angular/cli/src/commands/update/schematic/index_spec.ts
@@ -1,20 +1,18 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use 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 { normalize, virtualFs } from '@angular-devkit/core';
 import { HostTree } from '@angular-devkit/schematics';
 import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
-import { map } from 'rxjs/operators'; // tslint:disable-line: no-implicit-dependencies
+import { map } from 'rxjs/operators';
 import * as semver from 'semver';
 import { angularMajorCompatGuarantee } from './index';
 
-
 describe('angularMajorCompatGuarantee', () => {
   [
     '5.0.0',
@@ -26,7 +24,7 @@ describe('angularMajorCompatGuarantee', () => {
     '6.1.0-beta.0',
     '6.1.0-rc.0',
     '6.10.11',
-  ].forEach(golden => {
+  ].forEach((golden) => {
     it('works with ' + JSON.stringify(golden), () => {
       expect(semver.satisfies(golden, angularMajorCompatGuarantee('^5.0.0'))).toBeTruthy();
     });
@@ -36,7 +34,7 @@ describe('angularMajorCompatGuarantee', () => {
 describe('@schematics/update', () => {
   const schematicRunner = new SchematicTestRunner(
     '@schematics/update',
-    require.resolve('../collection.json'),
+    require.resolve('./collection.json'),
   );
   let host: virtualFs.test.TestHost;
   let appTree: UnitTestTree = new UnitTestTree(new HostTree());
@@ -53,44 +51,63 @@ describe('@schematics/update', () => {
     appTree = new UnitTestTree(new HostTree(host));
   });
 
-  it('ignores dependencies not hosted on the NPM registry', done => {
-    const tree = new UnitTestTree(new HostTree(new virtualFs.test.TestHost({
-      '/package.json': `{
+  it('ignores dependencies not hosted on the NPM registry', (done) => {
+    const tree = new UnitTestTree(
+      new HostTree(
+        new virtualFs.test.TestHost({
+          '/package.json': `{
         "name": "blah",
         "dependencies": {
           "@angular-devkit-tests/update-base": "file:update-base-1.0.0.tgz"
         }
       }`,
-    })));
+        }),
+      ),
+    );
 
-    schematicRunner.runSchematicAsync('update', undefined, tree).pipe(
-      map(t => {
-        const packageJson = JSON.parse(t.readContent('/package.json'));
-        expect(packageJson['dependencies']['@angular-devkit-tests/update-base'])
-            .toBe('file:update-base-1.0.0.tgz');
-      }),
-    ).toPromise().then(done, done.fail);
+    schematicRunner
+      .runSchematicAsync('update', undefined, tree)
+      .pipe(
+        map((t) => {
+          const packageJson = JSON.parse(t.readContent('/package.json'));
+          expect(packageJson['dependencies']['@angular-devkit-tests/update-base']).toBe(
+            'file:update-base-1.0.0.tgz',
+          );
+        }),
+      )
+      .toPromise()
+      .then(done, done.fail);
   }, 45000);
 
   it('should not error with yarn 2.0 protocols', async () => {
-    const tree = new UnitTestTree(new HostTree(new virtualFs.test.TestHost({
-      '/package.json': `{
+    const tree = new UnitTestTree(
+      new HostTree(
+        new virtualFs.test.TestHost({
+          '/package.json': `{
         "name": "blah",
         "dependencies": {
           "src": "src@link:./src",
           "@angular-devkit-tests/update-base": "1.0.0"
         }
       }`,
-    })));
+        }),
+      ),
+    );
 
-    const newTree = await schematicRunner.runSchematicAsync('update', {
-      packages: ['@angular-devkit-tests/update-base'],
-    }, tree).toPromise();
+    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('updates Angular as compatible with Angular N-1', done => {
+  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')));
     const packageJson = JSON.parse(content);
@@ -104,33 +121,25 @@ describe('@schematics/update', () => {
       virtualFs.stringToFileBuffer(JSON.stringify(packageJson)),
     );
 
-    schematicRunner.runSchematicAsync('update', {
-      packages: ['@angular/core@^6.0.0'],
-    }, appTree).pipe(
-      map(tree => {
-        const packageJson = JSON.parse(tree.readContent('/package.json'));
-        expect(packageJson['dependencies']['@angular/core'][0]).toBe('6');
-
-        // 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);
+    schematicRunner
+      .runSchematicAsync(
+        'update',
+        {
+          packages: ['@angular/core@^6.0.0'],
+        },
+        appTree,
+      )
+      .pipe(
+        map((tree) => {
+          const packageJson = JSON.parse(tree.readContent('/package.json'));
+          expect(packageJson['dependencies']['@angular/core'][0]).toBe('6');
+        }),
+      )
+      .toPromise()
+      .then(done, done.fail);
   }, 45000);
 
-  it('updates Angular as compatible with Angular N-1 (2)', done => {
+  it('updates Angular as compatible with Angular N-1 (2)', (done) => {
     // Add the basic migration package.
     const content = virtualFs.fileBufferToString(host.sync.read(normalize('/package.json')));
     const packageJson = JSON.parse(content);
@@ -150,33 +159,25 @@ describe('@schematics/update', () => {
       virtualFs.stringToFileBuffer(JSON.stringify(packageJson)),
     );
 
-    schematicRunner.runSchematicAsync('update', {
-      packages: ['@angular/core@^6.0.0'],
-    }, appTree).pipe(
-      map(tree => {
-        const packageJson = JSON.parse(tree.readContent('/package.json'));
-        expect(packageJson['dependencies']['@angular/core'][0]).toBe('6');
-        expect(packageJson['dependencies']['rxjs'][0]).toBe('6');
-        expect(packageJson['dependencies']['typescript'][0]).toBe('2');
-        expect(packageJson['dependencies']['typescript'][2]).not.toBe('4');
-
-        // 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);
+    schematicRunner
+      .runSchematicAsync(
+        'update',
+        {
+          packages: ['@angular/core@^6.0.0'],
+        },
+        appTree,
+      )
+      .pipe(
+        map((tree) => {
+          const packageJson = JSON.parse(tree.readContent('/package.json'));
+          expect(packageJson['dependencies']['@angular/core'][0]).toBe('6');
+          expect(packageJson['dependencies']['rxjs'][0]).toBe('6');
+          expect(packageJson['dependencies']['typescript'][0]).toBe('2');
+          expect(packageJson['dependencies']['typescript'][2]).not.toBe('4');
+        }),
+      )
+      .toPromise()
+      .then(done, done.fail);
   }, 45000);
 
   it('uses packageGroup for versioning', async () => {
@@ -191,29 +192,26 @@ describe('@schematics/update', () => {
       virtualFs.stringToFileBuffer(JSON.stringify(packageJson)),
     );
 
-    await schematicRunner.runSchematicAsync('update', {
-      packages: ['@angular-devkit-tests/update-package-group-1'],
-    }, appTree).pipe(
-      map(tree => {
-        const packageJson = JSON.parse(tree.readContent('/package.json'));
-        const deps = packageJson['dependencies'];
-        expect(deps['@angular-devkit-tests/update-package-group-1']).toBe('1.2.0');
-        expect(deps['@angular-devkit-tests/update-package-group-2']).toBe('2.0.0');
-
-        // Check install task.
-        expect(schematicRunner.tasks).toEqual([
-          {
-            name: 'node-package',
-            options: jasmine.objectContaining({
-              command: 'install',
-            }),
-          },
-        ]);
-      }),
-    ).toPromise();
+    await schematicRunner
+      .runSchematicAsync(
+        'update',
+        {
+          packages: ['@angular-devkit-tests/update-package-group-1'],
+        },
+        appTree,
+      )
+      .pipe(
+        map((tree) => {
+          const packageJson = JSON.parse(tree.readContent('/package.json'));
+          const deps = packageJson['dependencies'];
+          expect(deps['@angular-devkit-tests/update-package-group-1']).toBe('1.2.0');
+          expect(deps['@angular-devkit-tests/update-package-group-2']).toBe('2.0.0');
+        }),
+      )
+      .toPromise();
   }, 45000);
 
-  it('can migrate only', done => {
+  it('can migrate only', (done) => {
     // Add the basic migration package.
     const content = virtualFs.fileBufferToString(host.sync.read(normalize('/package.json')));
     const packageJson = JSON.parse(content);
@@ -223,30 +221,29 @@ describe('@schematics/update', () => {
       virtualFs.stringToFileBuffer(JSON.stringify(packageJson)),
     );
 
-    schematicRunner.runSchematicAsync('update', {
-      packages: ['@angular-devkit-tests/update-migrations'],
-      migrateOnly: true,
-    }, appTree).pipe(
-      map(tree => {
-        const packageJson = JSON.parse(tree.readContent('/package.json'));
-        expect(packageJson['dependencies']['@angular-devkit-tests/update-base']).toBe('1.0.0');
-        expect(packageJson['dependencies']['@angular-devkit-tests/update-migrations'])
-          .toBe('1.0.0');
-
-        // Check install task.
-        expect(schematicRunner.tasks).toEqual([
-          {
-            name: 'run-schematic',
-            options: jasmine.objectContaining({
-              name: 'migrate',
-            }),
-          },
-        ]);
-      }),
-    ).toPromise().then(done, done.fail);
+    schematicRunner
+      .runSchematicAsync(
+        'update',
+        {
+          packages: ['@angular-devkit-tests/update-migrations'],
+          migrateOnly: true,
+        },
+        appTree,
+      )
+      .pipe(
+        map((tree) => {
+          const packageJson = JSON.parse(tree.readContent('/package.json'));
+          expect(packageJson['dependencies']['@angular-devkit-tests/update-base']).toBe('1.0.0');
+          expect(packageJson['dependencies']['@angular-devkit-tests/update-migrations']).toBe(
+            '1.0.0',
+          );
+        }),
+      )
+      .toPromise()
+      .then(done, done.fail);
   }, 45000);
 
-  it('can migrate from only', done => {
+  it('can migrate from only', (done) => {
     // Add the basic migration package.
     const content = virtualFs.fileBufferToString(host.sync.read(normalize('/package.json')));
     const packageJson = JSON.parse(content);
@@ -256,34 +253,29 @@ describe('@schematics/update', () => {
       virtualFs.stringToFileBuffer(JSON.stringify(packageJson)),
     );
 
-    schematicRunner.runSchematicAsync('update', {
-      packages: ['@angular-devkit-tests/update-migrations'],
-      migrateOnly: true,
-      from: '0.1.2',
-    }, appTree).pipe(
-      map(tree => {
-        const packageJson = JSON.parse(tree.readContent('/package.json'));
-        expect(packageJson['dependencies']['@angular-devkit-tests/update-migrations'])
-          .toBe('1.6.0');
-
-        // Check install task.
-        expect(schematicRunner.tasks).toEqual([
-          {
-            name: 'run-schematic',
-            options: jasmine.objectContaining({
-              name: 'migrate',
-              options: jasmine.objectContaining({
-                from: '0.1.2',
-                to: '1.6.0',
-              }),
-            }),
-          },
-        ]);
-      }),
-    ).toPromise().then(done, done.fail);
+    schematicRunner
+      .runSchematicAsync(
+        'update',
+        {
+          packages: ['@angular-devkit-tests/update-migrations'],
+          migrateOnly: true,
+          from: '0.1.2',
+        },
+        appTree,
+      )
+      .pipe(
+        map((tree) => {
+          const packageJson = JSON.parse(tree.readContent('/package.json'));
+          expect(packageJson['dependencies']['@angular-devkit-tests/update-migrations']).toBe(
+            '1.6.0',
+          );
+        }),
+      )
+      .toPromise()
+      .then(done, done.fail);
   }, 45000);
 
-  it('can install and migrate with --from (short version number)', done => {
+  it('can install and migrate with --from (short version number)', (done) => {
     // Add the basic migration package.
     const content = virtualFs.fileBufferToString(host.sync.read(normalize('/package.json')));
     const packageJson = JSON.parse(content);
@@ -293,34 +285,29 @@ describe('@schematics/update', () => {
       virtualFs.stringToFileBuffer(JSON.stringify(packageJson)),
     );
 
-    schematicRunner.runSchematicAsync('update', {
-      packages: ['@angular-devkit-tests/update-migrations'],
-      migrateOnly: true,
-      from: '0',
-    }, appTree).pipe(
-      map(tree => {
-        const packageJson = JSON.parse(tree.readContent('/package.json'));
-        expect(packageJson['dependencies']['@angular-devkit-tests/update-migrations'])
-          .toBe('1.6.0');
-
-        // Check install task.
-        expect(schematicRunner.tasks).toEqual([
-          {
-            name: 'run-schematic',
-            options: jasmine.objectContaining({
-              name: 'migrate',
-              options: jasmine.objectContaining({
-                from: '0.0.0',
-                to: '1.6.0',
-              }),
-            }),
-          },
-        ]);
-      }),
-    ).toPromise().then(done, done.fail);
+    schematicRunner
+      .runSchematicAsync(
+        'update',
+        {
+          packages: ['@angular-devkit-tests/update-migrations'],
+          migrateOnly: true,
+          from: '0',
+        },
+        appTree,
+      )
+      .pipe(
+        map((tree) => {
+          const packageJson = JSON.parse(tree.readContent('/package.json'));
+          expect(packageJson['dependencies']['@angular-devkit-tests/update-migrations']).toBe(
+            '1.6.0',
+          );
+        }),
+      )
+      .toPromise()
+      .then(done, done.fail);
   }, 45000);
 
-  it('validates peer dependencies', done => {
+  it('validates peer dependencies', (done) => {
     const content = virtualFs.fileBufferToString(host.sync.read(normalize('/package.json')));
     const packageJson = JSON.parse(content);
     const dependencies = packageJson['dependencies'];
@@ -335,21 +322,31 @@ describe('@schematics/update', () => {
     );
 
     const messages: string[] = [];
-    schematicRunner.logger.subscribe(x => messages.push(x.message));
+    schematicRunner.logger.subscribe((x) => messages.push(x.message));
     const hasPeerdepMsg = (dep: string) =>
-      messages.some(str => str.includes(`missing peer dependency of "${dep}"`));
+      messages.some((str) => str.includes(`missing peer dependency of "${dep}"`));
 
-    schematicRunner.runSchematicAsync('update', {
-      packages: ['@angular-devkit/build-angular'],
-      next: true,
-    }, appTree).pipe(
-      map(() => {
-        expect(hasPeerdepMsg('@angular/compiler-cli'))
-          .toBeTruthy(`Should show @angular/compiler-cli message.`);
-        expect(hasPeerdepMsg('typescript')).toBeTruthy(`Should show typescript message.`);
-        expect(hasPeerdepMsg('@angular/localize'))
-          .toBeFalsy(`Should not show @angular/localize message.`);
-      }),
-    ).toPromise().then(done, done.fail);
+    schematicRunner
+      .runSchematicAsync(
+        'update',
+        {
+          packages: ['@angular-devkit/build-angular'],
+          next: true,
+        },
+        appTree,
+      )
+      .pipe(
+        map(() => {
+          expect(hasPeerdepMsg('@angular/compiler-cli')).toBeTruthy(
+            `Should show @angular/compiler-cli message.`,
+          );
+          expect(hasPeerdepMsg('typescript')).toBeTruthy(`Should show typescript message.`);
+          expect(hasPeerdepMsg('@angular/localize')).toBeFalsy(
+            `Should not show @angular/localize message.`,
+          );
+        }),
+      )
+      .toPromise()
+      .then(done, done.fail);
   }, 45000);
 });
diff --git a/packages/angular/cli/src/commands/update/schematic/npm-package-json.ts b/packages/angular/cli/src/commands/update/schematic/npm-package-json.ts
deleted file mode 100644
index 675c45c0fffb..000000000000
--- a/packages/angular/cli/src/commands/update/schematic/npm-package-json.ts
+++ /dev/null
@@ -1,27 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-import { JsonSchemaForNpmPackageJsonFiles } from './package-json';
-
-export interface NpmRepositoryPackageJson {
-  name: string;
-  requestedName: string;
-  description: string;
-
-  'dist-tags': {
-    [name: string]: string;
-  };
-  versions: {
-    [version: string]: JsonSchemaForNpmPackageJsonFiles;
-  };
-  time: {
-    modified: string;
-    created: string;
-
-    [version: string]: string;
-  };
-}
diff --git a/packages/angular/cli/src/commands/update/schematic/npm.ts b/packages/angular/cli/src/commands/update/schematic/npm.ts
deleted file mode 100644
index d7e48ab7737d..000000000000
--- a/packages/angular/cli/src/commands/update/schematic/npm.ts
+++ /dev/null
@@ -1,170 +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 { logging } from '@angular-devkit/core';
-import { existsSync, readFileSync } from 'fs';
-import { homedir } from 'os';
-import * as path from 'path';
-import { NpmRepositoryPackageJson } from './npm-package-json';
-
-const ini = require('ini');
-const lockfile = require('@yarnpkg/lockfile');
-const pacote = require('pacote');
-
-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,
-): PackageManagerOptions {
-  const cwd = process.cwd();
-  const baseFilename = yarn ? 'yarnrc' : 'npmrc';
-  const dotFilename = '.' + baseFilename;
-
-  let globalPrefix: string;
-  if (process.env.PREFIX) {
-    globalPrefix = process.env.PREFIX;
-  } else {
-    globalPrefix = path.dirname(process.execPath);
-    if (process.platform !== 'win32') {
-      globalPrefix = path.dirname(globalPrefix);
-    }
-  }
-
-  const defaultConfigLocations = [
-    path.join(globalPrefix, 'etc', baseFilename),
-    path.join(homedir(), dotFilename),
-  ];
-
-  const projectConfigLocations: string[] = [
-    path.join(cwd, dotFilename),
-  ];
-  const root = path.parse(cwd).root;
-  for (let curDir = path.dirname(cwd); curDir && curDir !== root; curDir = path.dirname(curDir)) {
-    projectConfigLocations.unshift(path.join(curDir, dotFilename));
-  }
-
-  if (showPotentials) {
-    logger.info(`Locating potential ${baseFilename} files:`);
-  }
-
-  const options: PackageManagerOptions = {};
-  for (const location of [...defaultConfigLocations, ...projectConfigLocations]) {
-    if (existsSync(location)) {
-      if (showPotentials) {
-        logger.info(`Trying '${location}'...found.`);
-      }
-
-      const data = readFileSync(location, 'utf8');
-      // 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.`);
-    }
-  }
-
-  // Substitute any environment variable references
-  for (const key in options) {
-    const value = options[key];
-    if (typeof value === 'string') {
-      options[key] = value.replace(/\$\{([^\}]+)\}/, (_, name) => process.env[name] || '');
-    }
-  }
-
-  return options;
-}
-
-/**
- * Get the NPM repository's package.json for a package. This is p
- * @param {string} packageName The package name to fetch.
- * @param {string} registryUrl The NPM Registry URL to use.
- * @param {LoggerApi} logger A logger instance to log debug information.
- * @returns An observable that will put the pacakge.json content.
- * @private
- */
-export function getNpmPackageJson(
-  packageName: string,
-  logger: logging.LoggerApi,
-  options?: {
-    registryUrl?: string;
-    usingYarn?: boolean;
-    verbose?: boolean;
-  },
-): Promise<Partial<NpmRepositoryPackageJson>> {
-  const cachedResponse = npmPackageJsonCache.get(packageName);
-  if (cachedResponse) {
-    return cachedResponse;
-  }
-
-  if (!npmrc) {
-    try {
-      npmrc = readOptions(logger, false, options && options.verbose);
-    } catch { }
-
-    if (options && options.usingYarn) {
-      try {
-        npmrc = { ...npmrc, ...readOptions(logger, true, options && options.verbose) };
-      } catch { }
-    }
-  }
-
-  const resultPromise: Promise<NpmRepositoryPackageJson> = pacote.packument(
-    packageName,
-    {
-      fullMetadata: true,
-      ...npmrc,
-      ...(options && options.registryUrl ? { registry: options.registryUrl } : {}),
-    },
-  );
-
-  // TODO: find some way to test this
-  const response = resultPromise.catch((err) => {
-    logger.warn(err.message || err);
-
-    return { requestedName: packageName };
-  });
-  npmPackageJsonCache.set(packageName, response);
-
-  return response;
-}
diff --git a/packages/angular/cli/src/commands/update/schematic/schema.json b/packages/angular/cli/src/commands/update/schematic/schema.json
index 1a6378de6485..9811d1a3fe9a 100644
--- a/packages/angular/cli/src/commands/update/schematic/schema.json
+++ b/packages/angular/cli/src/commands/update/schematic/schema.json
@@ -57,19 +57,8 @@
       "description": "The preferred package manager configuration files to use for registry settings.",
       "type": "string",
       "default": "npm",
-      "enum": [
-        "npm",
-        "yarn",
-        "cnpm",
-        "pnpm"
-      ]
-    },
-    "migrateExternal": {
-      "type": "boolean",
-      "default": false,
-      "hidden": true
+      "enum": ["npm", "yarn", "cnpm", "pnpm"]
     }
   },
-  "required": [
-  ]
+  "required": []
 }
diff --git a/packages/angular/cli/utilities/color.ts b/packages/angular/cli/utilities/color.ts
index ad77d8230fc7..8ddcadf3d1eb 100644
--- a/packages/angular/cli/utilities/color.ts
+++ b/packages/angular/cli/utilities/color.ts
@@ -1,15 +1,42 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of 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 ansiColors from 'ansi-colors';
 import { WriteStream } from 'tty';
 
 type AnsiColors = typeof ansiColors;
-const supportsColor = process.stdout instanceof WriteStream && process.stdout.getColorDepth() > 1;
+
+function supportColor(): boolean {
+  if (process.env.FORCE_COLOR !== undefined) {
+    // 2 colors: FORCE_COLOR = 0 (Disables colors), depth 1
+    // 16 colors: FORCE_COLOR = 1, depth 4
+    // 256 colors: FORCE_COLOR = 2, depth 8
+    // 16,777,216 colors: FORCE_COLOR = 3, depth 16
+    // See: https://nodejs.org/dist/latest-v12.x/docs/api/tty.html#tty_writestream_getcolordepth_env
+    // and https://github.com/nodejs/node/blob/b9f36062d7b5c5039498e98d2f2c180dca2a7065/lib/internal/tty.js#L106;
+    switch (process.env.FORCE_COLOR) {
+      case '':
+      case 'true':
+      case '1':
+      case '2':
+      case '3':
+        return true;
+      default:
+        return false;
+    }
+  }
+
+  if (process.stdout instanceof WriteStream) {
+    return process.stdout.getColorDepth() > 1;
+  }
+
+  return false;
+}
 
 export function removeColor(text: string): string {
   // This has been created because when colors.enabled is false unstyle doesn't work
@@ -20,6 +47,6 @@ export function removeColor(text: string): string {
 // Create a separate instance to prevent unintended global changes to the color configuration
 // Create function is not defined in the typings. See: https://github.com/doowb/ansi-colors/pull/44
 const colors = (ansiColors as AnsiColors & { create: () => AnsiColors }).create();
-colors.enabled = supportsColor;
+colors.enabled = supportColor();
 
 export { colors };
diff --git a/packages/angular/cli/utilities/config.ts b/packages/angular/cli/utilities/config.ts
index 2042e9d903bf..d5ce06a835d4 100644
--- a/packages/angular/cli/utilities/config.ts
+++ b/packages/angular/cli/utilities/config.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 { json, workspaces } from '@angular-devkit/core';
 import { existsSync, readFileSync, statSync, writeFileSync } from 'fs';
 import * as os from 'os';
@@ -47,14 +48,24 @@ function getSchemaLocation(): string {
 
 export const workspaceSchemaPath = getSchemaLocation();
 
-const configNames = [ 'angular.json', '.angular.json' ];
+const configNames = ['angular.json', '.angular.json'];
 const globalFileName = '.angular-config.json';
 
 function xdgConfigHome(home: string, configFile?: string): string {
   // https://specifications.freedesktop.org/basedir-spec/basedir-spec-latest.html
+  const xdgConfigHome = process.env['XDG_CONFIG_HOME'] || path.join(home, '.config');
+  const xdgAngularHome = path.join(xdgConfigHome, 'angular');
+
+  return configFile ? path.join(xdgAngularHome, configFile) : xdgAngularHome;
+}
+
+function xdgConfigHomeOld(home: string): string {
+  // Check the configuration files in the old location that should be:
+  // - $XDG_CONFIG_HOME/.angular-config.json (if XDG_CONFIG_HOME is set)
+  // - $HOME/.config/angular/.angular-config.json (otherwise)
   const p = process.env['XDG_CONFIG_HOME'] || path.join(home, '.config', 'angular');
 
-  return configFile ? path.join(p, configFile) : p;
+  return path.join(p, '.angular-config.json');
 }
 
 function projectFilePath(projectPath?: string): string | null {
@@ -77,10 +88,22 @@ function globalFilePath(): string | null {
   // note that createGlobalSettings() will continue creating
   // global file in home directory, with this user will have
   // choice to move change its location to meet XDG convention
-  const xdgConfig = xdgConfigHome(home, globalFileName);
+  const xdgConfig = xdgConfigHome(home, 'config.json');
   if (existsSync(xdgConfig)) {
     return xdgConfig;
   }
+  // NOTE: This check is for the old configuration location, for more
+  // information see https://github.com/angular/angular-cli/pull/20556
+  const xdgConfigOld = xdgConfigHomeOld(home);
+  if (existsSync(xdgConfigOld)) {
+    /* eslint-disable no-console */
+    console.warn(
+      `Old configuration location detected: ${xdgConfigOld}\n` +
+        `Please move the file to the new location ~/.config/angular/config.json`,
+    );
+
+    return xdgConfigOld;
+  }
 
   const p = path.join(home, globalFileName);
   if (existsSync(p)) {
@@ -107,12 +130,12 @@ export class AngularWorkspace {
 
   // Temporary helper functions to support refactoring
 
-  // tslint:disable-next-line: no-any
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   getCli(): Record<string, any> {
     return (this.workspace.extensions['cli'] as Record<string, unknown>) || {};
   }
 
-  // tslint:disable-next-line: no-any
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   getProjectCli(projectName: string): Record<string, any> {
     const project = this.workspace.projects.get(projectName);
 
@@ -200,7 +223,9 @@ export function getWorkspaceRaw(
 }
 
 export async function validateWorkspace(data: json.JsonObject): Promise<void> {
-  const schema = readAndParseJson(path.join(__dirname, '../lib/config/schema.json')) as json.schema.JsonSchema;
+  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();
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/utilities/install-package.ts b/packages/angular/cli/utilities/install-package.ts
index ac79d26ceb73..8142135915a5 100644
--- a/packages/angular/cli/utilities/install-package.ts
+++ b/packages/angular/cli/utilities/install-package.ts
@@ -1,37 +1,79 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of 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 { spawnSync } from 'child_process';
-import { existsSync, mkdtempSync, readFileSync, realpathSync, writeFileSync } from 'fs';
+import { spawn, spawnSync } from 'child_process';
+import { existsSync, mkdtempSync, readFileSync, realpathSync, rmdirSync, writeFileSync } from 'fs';
 import { tmpdir } from 'os';
 import { join, resolve } from 'path';
-import * as rimraf from 'rimraf';
 import { PackageManager } from '../lib/config/workspace-schema';
-import { colors } from '../utilities/color';
 import { NgAddSaveDepedency } from '../utilities/package-metadata';
+import { Spinner } from './spinner';
 
 interface PackageManagerOptions {
   silent: string;
   saveDev: string;
   install: string;
+  installAll?: string;
   prefix: string;
   noLockfile: string;
 }
 
-export function installPackage(
+export async function installAllPackages(
+  packageManager: PackageManager = PackageManager.Npm,
+  extraArgs: string[] = [],
+  cwd = process.cwd(),
+): Promise<1 | 0> {
+  const packageManagerArgs = getPackageManagerArguments(packageManager);
+
+  const installArgs: string[] = [];
+  if (packageManagerArgs.installAll) {
+    installArgs.push(packageManagerArgs.installAll);
+  }
+  installArgs.push(packageManagerArgs.silent);
+
+  const spinner = new Spinner();
+  spinner.start('Installing packages...');
+
+  const bufferedOutput: { stream: NodeJS.WriteStream; data: Buffer }[] = [];
+
+  return new Promise((resolve, reject) => {
+    const childProcess = spawn(packageManager, [...installArgs, ...extraArgs], {
+      stdio: 'pipe',
+      shell: true,
+      cwd,
+    }).on('close', (code: number) => {
+      if (code === 0) {
+        spinner.succeed('Packages successfully installed.');
+        resolve(0);
+      } else {
+        spinner.stop();
+        bufferedOutput.forEach(({ stream, data }) => stream.write(data));
+        spinner.fail('Package install failed, see above.');
+        reject(1);
+      }
+    });
+
+    childProcess.stdout?.on('data', (data: Buffer) =>
+      bufferedOutput.push({ stream: process.stdout, data: data }),
+    );
+    childProcess.stderr?.on('data', (data: Buffer) =>
+      bufferedOutput.push({ stream: process.stderr, data: data }),
+    );
+  });
+}
+
+export async function installPackage(
   packageName: string,
-  logger: logging.Logger | undefined,
   packageManager: PackageManager = PackageManager.Npm,
   save: Exclude<NgAddSaveDepedency, false> = true,
   extraArgs: string[] = [],
   cwd = process.cwd(),
-) {
+): Promise<1 | 0> {
   const packageManagerArgs = getPackageManagerArguments(packageManager);
 
   const installArgs: string[] = [
@@ -40,43 +82,55 @@ export function installPackage(
     packageManagerArgs.silent,
   ];
 
-  logger?.info(colors.green(`Installing packages for tooling via ${packageManager}.`));
+  const spinner = new Spinner();
+  spinner.start('Installing package...');
 
   if (save === 'devDependencies') {
     installArgs.push(packageManagerArgs.saveDev);
   }
-
-  const { status, stderr, stdout, error } = spawnSync(packageManager, [...installArgs, ...extraArgs], {
-    stdio: 'pipe',
-    shell: true,
-    encoding: 'utf8',
-    cwd,
+  const bufferedOutput: { stream: NodeJS.WriteStream; data: Buffer }[] = [];
+
+  return new Promise((resolve, reject) => {
+    const childProcess = spawn(packageManager, [...installArgs, ...extraArgs], {
+      stdio: 'pipe',
+      shell: true,
+      cwd,
+    }).on('close', (code: number) => {
+      if (code === 0) {
+        spinner.succeed('Package successfully installed.');
+        resolve(0);
+      } else {
+        spinner.stop();
+        bufferedOutput.forEach(({ stream, data }) => stream.write(data));
+        spinner.fail('Package install failed, see above.');
+        reject(1);
+      }
+    });
+
+    childProcess.stdout?.on('data', (data: Buffer) =>
+      bufferedOutput.push({ stream: process.stdout, data: data }),
+    );
+    childProcess.stderr?.on('data', (data: Buffer) =>
+      bufferedOutput.push({ stream: process.stderr, data: data }),
+    );
   });
-
-  if (status !== 0) {
-    let errorMessage = ((error && error.message) || stderr || stdout || '').trim();
-    if (errorMessage) {
-      errorMessage += '\n';
-    }
-    throw new Error(errorMessage + `Package install failed${errorMessage ? ', see above' : ''}.`);
-  }
-
-  logger?.info(colors.green(`Installed packages for tooling via ${packageManager}.`));
 }
 
-export function installTempPackage(
+export async function installTempPackage(
   packageName: string,
-  logger: logging.Logger | undefined,
   packageManager: PackageManager = PackageManager.Npm,
   extraArgs?: string[],
-): string {
+): Promise<{
+  status: 1 | 0;
+  tempNodeModules: string;
+}> {
   const tempPath = mkdtempSync(join(realpathSync(tmpdir()), 'angular-cli-packages-'));
 
   // clean up temp directory on process exit
   process.on('exit', () => {
     try {
-      rimraf.sync(tempPath);
-    } catch { }
+      rmdirSync(tempPath, { recursive: true, maxRetries: 3 });
+    } catch {}
   });
 
   // NPM will warn when a `package.json` is not found in the install directory
@@ -88,12 +142,15 @@ export function installTempPackage(
 
   // While we can use `npm init -y` we will end up needing to update the 'package.json' anyways
   // because of missing fields.
-  writeFileSync(join(tempPath, 'package.json'), JSON.stringify({
-    name: 'temp-cli-install',
-    description: 'temp-cli-install',
-    repository: 'temp-cli-install',
-    license: 'MIT',
-  }));
+  writeFileSync(
+    join(tempPath, 'package.json'),
+    JSON.stringify({
+      name: 'temp-cli-install',
+      description: 'temp-cli-install',
+      repository: 'temp-cli-install',
+      license: 'MIT',
+    }),
+  );
 
   // setup prefix/global modules path
   const packageManagerArgs = getPackageManagerArguments(packageManager);
@@ -106,23 +163,26 @@ export function installTempPackage(
     packageManagerArgs.noLockfile,
   ];
 
-  installPackage(packageName, logger, packageManager, true, installArgs, tempPath);
-
-  return tempNodeModules;
+  return {
+    status: await installPackage(packageName, packageManager, true, installArgs, tempPath),
+    tempNodeModules,
+  };
 }
 
-export function runTempPackageBin(
+export async function runTempPackageBin(
   packageName: string,
-  logger: logging.Logger,
   packageManager: PackageManager = PackageManager.Npm,
   args: string[] = [],
-): number {
-  const tempNodeModulesPath = installTempPackage(packageName, logger, packageManager);
+): Promise<number> {
+  const { status: code, tempNodeModules } = await installTempPackage(packageName, packageManager);
+  if (code !== 0) {
+    return code;
+  }
 
   // Remove version/tag etc... from package name
   // Ex: @angular/cli@latest -> @angular/cli
   const packageNameNoVersion = packageName.substring(0, packageName.lastIndexOf('@'));
-  const pkgLocation = join(tempNodeModulesPath, packageNameNoVersion);
+  const pkgLocation = join(tempNodeModules, packageNameNoVersion);
   const packageJsonPath = join(pkgLocation, 'package.json');
 
   // Get a binary location for this package
@@ -143,11 +203,8 @@ export function runTempPackageBin(
     throw new Error(`Cannot locate bin for temporary package: ${packageNameNoVersion}.`);
   }
 
-  const argv = [binPath, ...args];
-
-  const { status, error } = spawnSync('node', argv, {
+  const { status, error } = spawnSync(process.execPath, [binPath, ...args], {
     stdio: 'inherit',
-    shell: true,
     env: {
       ...process.env,
       NG_DISABLE_VERSION_CHECK: 'true',
@@ -177,6 +234,7 @@ function getPackageManagerArguments(packageManager: PackageManager): PackageMana
         silent: '--silent',
         saveDev: '--save-dev',
         install: 'add',
+        installAll: 'install',
         prefix: '--prefix',
         noLockfile: '--no-lockfile',
       };
@@ -185,6 +243,7 @@ function getPackageManagerArguments(packageManager: PackageManager): PackageMana
         silent: '--quiet',
         saveDev: '--save-dev',
         install: 'install',
+        installAll: 'install',
         prefix: '--prefix',
         noLockfile: '--no-package-lock',
       };
diff --git a/packages/angular/cli/utilities/json-file.ts b/packages/angular/cli/utilities/json-file.ts
index d076e73c542f..1afa0b3f7041 100644
--- a/packages/angular/cli/utilities/json-file.ts
+++ b/packages/angular/cli/utilities/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
@@ -9,8 +9,15 @@
 import { JsonValue } from '@angular-devkit/core';
 import { readFileSync, writeFileSync } from 'fs';
 import {
-  Node, ParseError, applyEdits, findNodeAtLocation,
-  getNodeValue, modify, parse, parseTree, printParseErrorCode,
+  Node,
+  ParseError,
+  applyEdits,
+  findNodeAtLocation,
+  getNodeValue,
+  modify,
+  parse,
+  parseTree,
+  printParseErrorCode,
 } from 'jsonc-parser';
 
 export type InsertionIndex = (properties: string[]) => number;
@@ -20,9 +27,7 @@ export type JSONPath = (string | number)[];
 export class JSONFile {
   content: string;
 
-  constructor(
-    private readonly path: string,
-  ) {
+  constructor(private readonly path: string) {
     const buffer = readFileSync(this.path);
     if (buffer) {
       this.content = buffer.toString();
@@ -61,7 +66,11 @@ export class JSONFile {
     return node === undefined ? undefined : getNodeValue(node);
   }
 
-  modify(jsonPath: JSONPath, value: JsonValue | undefined, insertInOrder?: InsertionIndex | false): boolean {
+  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;
@@ -70,23 +79,19 @@ export class JSONFile {
     let getInsertionIndex: InsertionIndex | undefined;
     if (insertInOrder === undefined) {
       const property = jsonPath.slice(-1)[0];
-      getInsertionIndex = properties => [...properties, property].sort().findIndex(p => p === property);
+      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,
-        },
+    const edits = modify(this.content, jsonPath, value, {
+      getInsertionIndex,
+      formattingOptions: {
+        insertSpaces: true,
+        tabSize: 2,
       },
-    );
+    });
 
     if (edits.length === 0) {
       return false;
@@ -103,7 +108,7 @@ export class JSONFile {
   }
 }
 
-// tslint:disable-next-line: no-any
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function readAndParseJson(path: string): any {
   const errors: ParseError[] = [];
   const content = parse(readFileSync(path, 'utf-8'), errors, { allowTrailingComma: true });
@@ -116,10 +121,14 @@ export function readAndParseJson(path: string): any {
 
 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}.`);
+  throw new Error(
+    `Failed to parse "${path}" as JSON AST Object. ${printParseErrorCode(
+      error,
+    )} at location: ${offset}.`,
+  );
 }
 
-// tslint:disable-next-line: no-any
+// eslint-disable-next-line @typescript-eslint/no-explicit-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 e2974080318a..f396d4a063d9 100644
--- a/packages/angular/cli/utilities/json-schema.ts
+++ b/packages/angular/cli/utilities/json-schema.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 { BaseException, json } from '@angular-devkit/core';
 import { ExportStringRef } from '@angular-devkit/schematics/tools';
 import { readFileSync } from 'fs';
@@ -19,9 +20,8 @@ import {
   Value,
 } from '../models/interface';
 
-
 export class CommandJsonPathException extends BaseException {
-  constructor(public readonly path: string, public readonly name: string) {
+  constructor(public readonly path: string, public override readonly name: string) {
     super(`File ${path} was not found while constructing the subcommand ${name}.`);
   }
 }
@@ -52,14 +52,14 @@ export async function parseJsonSchemaToSubCommandDescription(
 
   const aliases: string[] = [];
   if (json.isJsonArray(schema.$aliases)) {
-    schema.$aliases.forEach(value => {
+    schema.$aliases.forEach((value) => {
       if (typeof value == 'string') {
         aliases.push(value);
       }
     });
   }
   if (json.isJsonArray(schema.aliases)) {
-    schema.aliases.forEach(value => {
+    schema.aliases.forEach((value) => {
       if (typeof value == 'string') {
         aliases.push(value);
       }
@@ -106,8 +106,7 @@ export async function parseJsonSchemaToCommandDescription(
   registry: json.schema.SchemaRegistry,
   schema: json.JsonObject,
 ): Promise<CommandDescription> {
-  const subcommand =
-    await parseJsonSchemaToSubCommandDescription(name, jsonPath, registry, schema);
+  const subcommand = await parseJsonSchemaToSubCommandDescription(name, jsonPath, registry, schema);
 
   // Before doing any work, let's validate the implementation.
   if (typeof schema.$impl != 'string') {
@@ -172,27 +171,31 @@ export async function parseJsonSchemaToOptions(
     }
 
     // We only support number, string or boolean (or array of those), so remove everything else.
-    const types = [...typeSet].filter(x => {
-      switch (x) {
-        case 'boolean':
-        case 'number':
-        case 'string':
-          return true;
-
-        case 'array':
-          // Only include arrays if they're boolean, string or number.
-          if (json.isJsonObject(current.items)
-              && typeof current.items.type == 'string'
-              && ['boolean', 'number', 'string'].includes(current.items.type)) {
+    const types = [...typeSet]
+      .filter((x) => {
+        switch (x) {
+          case 'boolean':
+          case 'number':
+          case 'string':
             return true;
-          }
 
-          return false;
+          case 'array':
+            // Only include arrays if they're boolean, string or number.
+            if (
+              json.isJsonObject(current.items) &&
+              typeof current.items.type == 'string' &&
+              ['boolean', 'number', 'string'].includes(current.items.type)
+            ) {
+              return true;
+            }
 
-        default:
-          return false;
-      }
-    }).map(x => _getEnumFromValue(x, OptionType, OptionType.String));
+            return false;
+
+          default:
+            return false;
+        }
+      })
+      .map((x) => _getEnumFromValue(x, OptionType, OptionType.String));
 
     if (types.length == 0) {
       // This means it's not usable on the command line. e.g. an Object.
@@ -200,7 +203,7 @@ export async function parseJsonSchemaToOptions(
     }
 
     // Only keep enum values we support (booleans, numbers and strings).
-    const enumValues = (json.isJsonArray(current.enum) && current.enum || []).filter(x => {
+    const enumValues = ((json.isJsonArray(current.enum) && current.enum) || []).filter((x) => {
       switch (typeof x) {
         case 'boolean':
         case 'number':
@@ -235,15 +238,19 @@ export async function parseJsonSchemaToOptions(
 
     const type = types[0];
     const $default = current.$default;
-    const $defaultIndex = (json.isJsonObject($default) && $default['$source'] == 'argv')
-      ? $default['index'] : undefined;
-    const positional: number | undefined = typeof $defaultIndex == 'number'
-      ? $defaultIndex : undefined;
+    const $defaultIndex =
+      json.isJsonObject($default) && $default['$source'] == 'argv' ? $default['index'] : undefined;
+    const positional: number | undefined =
+      typeof $defaultIndex == 'number' ? $defaultIndex : undefined;
 
     const required = json.isJsonArray(current.required)
-      ? current.required.indexOf(name) != -1 : false;
-    const aliases = json.isJsonArray(current.aliases) ? [...current.aliases].map(x => '' + x)
-      : current.alias ? ['' + current.alias] : [];
+      ? current.required.indexOf(name) != -1
+      : false;
+    const aliases = json.isJsonArray(current.aliases)
+      ? [...current.aliases].map((x) => '' + x)
+      : current.alias
+      ? ['' + current.alias]
+      : [];
     const format = typeof current.format == 'string' ? current.format : undefined;
     const visible = current.visible === undefined || current.visible === true;
     const hidden = !!current.hidden || !visible;
@@ -253,22 +260,22 @@ export async function parseJsonSchemaToOptions(
 
     // 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 deprecated =
+      xDeprecated === true || typeof xDeprecated === 'string' ? xDeprecated : undefined;
 
     const option: Option = {
       name,
       description: '' + (current.description === undefined ? '' : current.description),
-      ...types.length == 1 ? { type } : { type, types },
-      ...defaultValue !== undefined ? { default: defaultValue } : {},
-      ...enumValues && enumValues.length > 0 ? { enum: enumValues } : {},
+      ...(types.length == 1 ? { type } : { type, types }),
+      ...(defaultValue !== undefined ? { default: defaultValue } : {}),
+      ...(enumValues && enumValues.length > 0 ? { enum: enumValues } : {}),
       required,
       aliases,
-      ...format !== undefined ? { format } : {},
+      ...(format !== undefined ? { format } : {}),
       hidden,
-      ...userAnalytics ? { userAnalytics } : {},
-      ...deprecated !== undefined ? { deprecated } : {},
-      ...positional !== undefined ? { positional } : {},
+      ...(userAnalytics ? { userAnalytics } : {}),
+      ...(deprecated !== undefined ? { deprecated } : {}),
+      ...(positional !== undefined ? { positional } : {}),
     };
 
     options.push(option);
diff --git a/packages/angular/cli/utilities/json-schema_spec.ts b/packages/angular/cli/utilities/json-schema_spec.ts
index 09822cef7730..f300cc4bc077 100644
--- a/packages/angular/cli/utilities/json-schema_spec.ts
+++ b/packages/angular/cli/utilities/json-schema_spec.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 { schema } from '@angular-devkit/core';
 import { readFileSync } from 'fs';
 import { join } from 'path';
@@ -24,9 +24,7 @@ describe('parseJsonSchemaToCommandDescription', () => {
     '$impl': './version-impl#VersionCommand',
 
     'type': 'object',
-    'allOf': [
-      { '$ref': './definitions.json#/definitions/base' },
-    ],
+    'allOf': [{ '$ref': './definitions.json#/definitions/base' }],
   };
 
   beforeEach(() => {
@@ -34,7 +32,9 @@ describe('parseJsonSchemaToCommandDescription', () => {
     registry.registerUriHandler((uri: string) => {
       if (uri.startsWith('ng-cli://')) {
         const content = readFileSync(
-          join(__dirname, '..', uri.substr('ng-cli://'.length)), 'utf-8');
+          join(__dirname, '..', uri.substr('ng-cli://'.length)),
+          'utf-8',
+        );
 
         return Promise.resolve(JSON.parse(content));
       } else {
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/src/commands/update/schematic/package-json.ts b/packages/angular/cli/utilities/package-json.ts
similarity index 98%
rename from packages/angular/cli/src/commands/update/schematic/package-json.ts
rename to packages/angular/cli/utilities/package-json.ts
index b4162f6fd232..359f451ff9b7 100644
--- a/packages/angular/cli/src/commands/update/schematic/package-json.ts
+++ b/packages/angular/cli/utilities/package-json.ts
@@ -1,16 +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
  */
+
 /**
  * This file was automatically generated by json-schema-to-typescript.
  * DO NOT MODIFY IT BY HAND. Instead, modify the source JSONSchema file,
  * and run json-schema-to-typescript to regenerate this file.
  */
-// tslint:disable
+/* eslint-disable */
 
 export type JsonSchemaForNpmPackageJsonFiles = CoreProperties &
   JspmDefinition &
@@ -22,7 +23,8 @@ export type JsonSchemaForNpmPackageJsonFiles = CoreProperties &
     | {
         bundledDependencies?: BundledDependency;
         [k: string]: any;
-      }) & {
+      }
+  ) & {
     [k: string]: any;
   };
 /**
diff --git a/packages/angular/cli/utilities/package-manager.ts b/packages/angular/cli/utilities/package-manager.ts
index 911e445dc04a..2cb64781d854 100644
--- a/packages/angular/cli/utilities/package-manager.ts
+++ b/packages/angular/cli/utilities/package-manager.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 { execSync } from 'child_process';
 import { existsSync } from 'fs';
 import { join } from 'path';
@@ -31,7 +32,7 @@ export function supportsNpm(): boolean {
 }
 
 export async function getPackageManager(root: string): Promise<PackageManager> {
-  let packageManager = await getConfiguredPackageManager() as PackageManager | null;
+  let packageManager = (await getConfiguredPackageManager()) as PackageManager | null;
   if (packageManager) {
     return packageManager;
   }
@@ -65,14 +66,14 @@ export async function ensureCompatibleNpm(root: string): Promise<void> {
   }
 
   try {
-    const versionText = execSync('npm --version', {encoding: 'utf8', stdio: 'pipe'}).trim();
+    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
+      // eslint-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.',
diff --git a/packages/angular/cli/utilities/package-metadata.ts b/packages/angular/cli/utilities/package-metadata.ts
index 2a528ca06b89..eb658f632c7d 100644
--- a/packages/angular/cli/utilities/package-metadata.ts
+++ b/packages/angular/cli/utilities/package-metadata.ts
@@ -1,21 +1,40 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+
 import { logging } from '@angular-devkit/core';
 import { existsSync, readFileSync } from 'fs';
 import { homedir } from 'os';
 import * as path from 'path';
+import { JsonSchemaForNpmPackageJsonFiles } from './package-json';
 
-const ini = require('ini');
 const lockfile = require('@yarnpkg/lockfile');
+const ini = require('ini');
 const pacote = require('pacote');
 
-export interface PackageDependencies {
-  [dependency: string]: string;
+const npmPackageJsonCache = new Map<string, Promise<Partial<NpmRepositoryPackageJson>>>();
+
+export interface NpmRepositoryPackageJson {
+  name: string;
+  requestedName: string;
+  description: string;
+
+  'dist-tags': {
+    [name: string]: string;
+  };
+  versions: {
+    [version: string]: JsonSchemaForNpmPackageJsonFiles;
+  };
+  time: {
+    modified: string;
+    created: string;
+
+    [version: string]: string;
+  };
 }
 
 export type NgAddSaveDepedency = 'dependencies' | 'devDependencies' | boolean;
@@ -36,17 +55,16 @@ export interface PackageManifest {
   license?: string;
   private?: boolean;
   deprecated?: boolean;
-
-  dependencies: PackageDependencies;
-  devDependencies: PackageDependencies;
-  peerDependencies: PackageDependencies;
-  optionalDependencies: PackageDependencies;
+  dependencies: Record<string, string>;
+  devDependencies: Record<string, string>;
+  peerDependencies: Record<string, string>;
+  optionalDependencies: Record<string, string>;
   'ng-add'?: {
     save?: NgAddSaveDepedency;
   };
   'ng-update'?: {
     migrations: string;
-    packageGroup: { [name: string]: string };
+    packageGroup: Record<string, string>;
   };
 }
 
@@ -57,7 +75,9 @@ export interface PackageMetadata {
   'dist-tags'?: unknown;
 }
 
-type PackageManagerOptions = Record<string, unknown>;
+interface PackageManagerOptions extends Record<string, unknown> {
+  forceAuth?: Record<string, unknown>;
+}
 
 let npmrc: PackageManagerOptions;
 
@@ -65,12 +85,12 @@ function ensureNpmrc(logger: logging.LoggerApi, usingYarn: boolean, verbose: boo
   if (!npmrc) {
     try {
       npmrc = readOptions(logger, false, verbose);
-    } catch { }
+    } catch {}
 
     if (usingYarn) {
       try {
         npmrc = { ...npmrc, ...readOptions(logger, true, verbose) };
-      } catch { }
+      } catch {}
     }
   }
 }
@@ -100,16 +120,18 @@ function readOptions(
   ];
 
   const projectConfigLocations: string[] = [path.join(cwd, dotFilename)];
-  const root = path.parse(cwd).root;
-  for (let curDir = path.dirname(cwd); curDir && curDir !== root; curDir = path.dirname(curDir)) {
-    projectConfigLocations.unshift(path.join(curDir, dotFilename));
+  if (yarn) {
+    const root = path.parse(cwd).root;
+    for (let curDir = path.dirname(cwd); curDir && curDir !== root; curDir = path.dirname(curDir)) {
+      projectConfigLocations.unshift(path.join(curDir, dotFilename));
+    }
   }
 
   if (showPotentials) {
     logger.info(`Locating potential ${baseFilename} files:`);
   }
 
-  const options: PackageManagerOptions = {};
+  let rcOptions: PackageManagerOptions = {};
   for (const location of [...defaultConfigLocations, ...projectConfigLocations]) {
     if (existsSync(location)) {
       if (showPotentials) {
@@ -120,48 +142,90 @@ function readOptions(
       // 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.`);
+
+      rcOptions = normalizeOptions(rcConfig, location, rcOptions);
+    }
+  }
+
+  const envVariablesOptions: PackageManagerOptions = {};
+  for (const [key, value] of Object.entries(process.env)) {
+    if (!value) {
+      continue;
     }
+
+    let normalizedName = key.toLowerCase();
+    if (normalizedName.startsWith('npm_config_')) {
+      normalizedName = normalizedName.substring(11);
+    } else if (yarn && normalizedName.startsWith('yarn_')) {
+      normalizedName = normalizedName.substring(5);
+    } else {
+      continue;
+    }
+
+    normalizedName = normalizedName.replace(/(?!^)_/g, '-'); // don't replace _ at the start of the key.s
+    envVariablesOptions[normalizedName] = value;
   }
 
-  // Substitute any environment variable references
-  for (const key in options) {
-    const value = options[key];
+  return normalizeOptions(envVariablesOptions, undefined, rcOptions);
+}
+
+function normalizeOptions(
+  rawOptions: PackageManagerOptions,
+  location = process.cwd(),
+  existingNormalizedOptions: PackageManagerOptions = {},
+): PackageManagerOptions {
+  const options = { ...existingNormalizedOptions };
+
+  for (const [key, value] of Object.entries(rawOptions)) {
+    let substitutedValue = value;
+
+    // Substitute any environment variable references.
     if (typeof value === 'string') {
-      options[key] = value.replace(/\$\{([^\}]+)\}/, (_, name) => process.env[name] || '');
+      substitutedValue = value.replace(/\$\{([^\}]+)\}/, (_, name) => process.env[name] || '');
+    }
+
+    switch (key) {
+      // Unless auth options are scope with the registry url it appears that npm-registry-fetch ignores them,
+      // even though they are documented.
+      // https://github.com/npm/npm-registry-fetch/blob/8954f61d8d703e5eb7f3d93c9b40488f8b1b62ac/README.md
+      // https://github.com/npm/npm-registry-fetch/blob/8954f61d8d703e5eb7f3d93c9b40488f8b1b62ac/auth.js#L45-L91
+      case '_authToken':
+      case 'token':
+      case 'username':
+      case 'password':
+      case '_auth':
+      case 'auth':
+        options['forceAuth'] ??= {};
+        options['forceAuth'][key] = substitutedValue;
+        break;
+      case 'noproxy':
+      case 'no-proxy':
+        options['noProxy'] = substitutedValue;
+        break;
+      case 'maxsockets':
+        options['maxSockets'] = substitutedValue;
+        break;
+      case 'https-proxy':
+      case 'proxy':
+        options['proxy'] = substitutedValue;
+        break;
+      case 'strict-ssl':
+        options['strictSSL'] = substitutedValue;
+        break;
+      case 'local-address':
+        options['localAddress'] = substitutedValue;
+        break;
+      case 'cafile':
+        if (typeof substitutedValue === 'string') {
+          const cafile = path.resolve(path.dirname(location), substitutedValue);
+          try {
+            options['ca'] = readFileSync(cafile, 'utf8').replace(/\r?\n/g, '\n');
+          } catch {}
+        }
+        break;
+      default:
+        options[key] = substitutedValue;
+        break;
     }
   }
 
@@ -237,19 +301,13 @@ export async function fetchPackageMetadata(
 export async function fetchPackageManifest(
   name: string,
   logger: logging.LoggerApi,
-  options?: {
+  options: {
     registry?: string;
     usingYarn?: boolean;
     verbose?: boolean;
-  },
+  } = {},
 ): Promise<PackageManifest> {
-  const { usingYarn, verbose, registry } = {
-    registry: undefined,
-    usingYarn: false,
-    verbose: false,
-    ...options,
-  };
-
+  const { usingYarn = false, verbose = false, registry } = options;
   ensureNpmrc(logger, usingYarn, verbose);
 
   const response = await pacote.manifest(name, {
@@ -260,3 +318,38 @@ export async function fetchPackageManifest(
 
   return normalizeManifest(response);
 }
+
+export function getNpmPackageJson(
+  packageName: string,
+  logger: logging.LoggerApi,
+  options: {
+    registry?: string;
+    usingYarn?: boolean;
+    verbose?: boolean;
+  } = {},
+): Promise<Partial<NpmRepositoryPackageJson>> {
+  const cachedResponse = npmPackageJsonCache.get(packageName);
+  if (cachedResponse) {
+    return cachedResponse;
+  }
+
+  const { usingYarn = false, verbose = false, registry } = options;
+  ensureNpmrc(logger, usingYarn, verbose);
+
+  const resultPromise: Promise<NpmRepositoryPackageJson> = pacote.packument(packageName, {
+    fullMetadata: true,
+    ...npmrc,
+    ...(registry ? { registry } : {}),
+  });
+
+  // TODO: find some way to test this
+  const response = resultPromise.catch((err) => {
+    logger.warn(err.message || err);
+
+    return { requestedName: packageName };
+  });
+
+  npmPackageJsonCache.set(packageName, response);
+
+  return response;
+}
diff --git a/packages/angular/cli/utilities/package-tree.ts b/packages/angular/cli/utilities/package-tree.ts
index d3e617fe5f69..9be8740a414b 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
@@ -67,7 +67,7 @@ export async function getProjectDependencies(dir: string): Promise<Map<string, P
     throw new Error('Could not find package.json');
   }
 
-  const results = new Map<string, PackageTreeNode> ();
+  const results = new Map<string, PackageTreeNode>();
   for (const [name, version] of getAllDependencies(pkg)) {
     const packageJsonPath = findPackageJson(dir, name);
     if (!packageJsonPath) {
diff --git a/packages/angular/cli/utilities/project.ts b/packages/angular/cli/utilities/project.ts
index cd133cd0323a..db119818e723 100644
--- a/packages/angular/cli/utilities/project.ts
+++ b/packages/angular/cli/utilities/project.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 { normalize } from '@angular-devkit/core';
 import * as fs from 'fs';
 import * as os from 'os';
diff --git a/packages/angular/cli/utilities/prompt.ts b/packages/angular/cli/utilities/prompt.ts
index fcbd0c2ea572..97be8988662a 100644
--- a/packages/angular/cli/utilities/prompt.ts
+++ b/packages/angular/cli/utilities/prompt.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 * as inquirer from 'inquirer';
 import { isTTY } from './tty';
 
diff --git a/packages/angular/cli/utilities/spinner.ts b/packages/angular/cli/utilities/spinner.ts
index f7b8d8550662..e641815eedca 100644
--- a/packages/angular/cli/utilities/spinner.ts
+++ b/packages/angular/cli/utilities/spinner.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 ora from 'ora';
+import ora from 'ora';
 import { colors } from './color';
 
 export class Spinner {
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/pwa/index.ts b/packages/angular/pwa/pwa/index.ts
index e6cabae37856..0e6731adedc8 100644
--- a/packages/angular/pwa/pwa/index.ts
+++ b/packages/angular/pwa/pwa/index.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 {
   Rule,
   SchematicsException,
@@ -29,9 +30,9 @@ function updateIndexFile(path: string): Rule {
       throw new SchematicsException(`Could not read index file: ${path}`);
     }
 
-    const rewriter = new (await import('parse5-html-rewriting-stream'))();
+    const rewriter = new (await import('parse5-html-rewriting-stream')).default();
     let needsNoScript = true;
-    rewriter.on('startTag', startTag => {
+    rewriter.on('startTag', (startTag) => {
       if (startTag.tagName === 'noscript') {
         needsNoScript = false;
       }
@@ -39,7 +40,7 @@ function updateIndexFile(path: string): Rule {
       rewriter.emitStartTag(startTag);
     });
 
-    rewriter.on('endTag', endTag => {
+    rewriter.on('endTag', (endTag) => {
       if (endTag.tagName === 'head') {
         rewriter.emitRaw('  <link rel="manifest" href="manifest.webmanifest">\n');
         rewriter.emitRaw('  <meta name="theme-color" content="#1976d2">\n');
@@ -52,7 +53,7 @@ function updateIndexFile(path: string): Rule {
       rewriter.emitEndTag(endTag);
     });
 
-    return new Promise<void>(resolve => {
+    return new Promise<void>((resolve) => {
       const input = new Readable({
         encoding: 'utf8',
         read(): void {
@@ -80,8 +81,8 @@ function updateIndexFile(path: string): Rule {
   };
 }
 
-export default function(options: PwaOptions): Rule {
-  return async host => {
+export default function (options: PwaOptions): Rule {
+  return async (host) => {
     if (!options.title) {
       options.title = options.project;
     }
@@ -160,15 +161,14 @@ export default function(options: PwaOptions): Rule {
     return chain([
       updateWorkspace(workspace),
       externalSchematic('@schematics/angular', 'service-worker', swOptions),
-      mergeWith(apply(url('./files/root'), [
-        template({ ...options }),
-        move(sourcePath),
-      ])),
-      mergeWith(apply(url('./files/assets'), [
-        template({ ...options }),
-        move(posix.join(sourcePath, 'assets')),
-      ])),
-      ...[...indexFiles].map(path => updateIndexFile(path)),
+      mergeWith(apply(url('./files/root'), [template({ ...options }), move(sourcePath)])),
+      mergeWith(
+        apply(url('./files/assets'), [
+          template({ ...options }),
+          move(posix.join(sourcePath, 'assets')),
+        ]),
+      ),
+      ...[...indexFiles].map((path) => updateIndexFile(path)),
     ]);
   };
 }
diff --git a/packages/angular/pwa/pwa/index_spec.ts b/packages/angular/pwa/pwa/index_spec.ts
index ea8dd9f5e461..a5cc155950f7 100644
--- a/packages/angular/pwa/pwa/index_spec.ts
+++ b/packages/angular/pwa/pwa/index_spec.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 { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
 import * as path from 'path';
 import { Schema as PwaOptions } from './schema';
@@ -39,105 +40,130 @@ describe('PWA Schematic', () => {
   };
 
   beforeEach(async () => {
-    appTree = await schematicRunner.runExternalSchematicAsync('@schematics/angular', 'workspace', workspaceOptions).toPromise();
-    appTree = await schematicRunner.runExternalSchematicAsync(
-      '@schematics/angular',
-      'application',
-      appOptions,
-      appTree,
-    ).toPromise();
+    appTree = await schematicRunner
+      .runExternalSchematicAsync('@schematics/angular', 'workspace', workspaceOptions)
+      .toPromise();
+    appTree = await schematicRunner
+      .runExternalSchematicAsync('@schematics/angular', 'application', appOptions, appTree)
+      .toPromise();
   });
 
   it('should run the service worker schematic', (done) => {
-    schematicRunner.runSchematicAsync('ng-add', defaultOptions, appTree).toPromise().then(tree => {
-      const configText = tree.readContent('/angular.json');
-      const config = JSON.parse(configText);
-      const swFlag = config.projects.bar.architect.build.options.serviceWorker;
-      expect(swFlag).toEqual(true);
-      done();
-    }, done.fail);
+    schematicRunner
+      .runSchematicAsync('ng-add', defaultOptions, appTree)
+      .toPromise()
+      .then((tree) => {
+        const configText = tree.readContent('/angular.json');
+        const config = JSON.parse(configText);
+        const swFlag = config.projects.bar.architect.build.options.serviceWorker;
+        expect(swFlag).toEqual(true);
+        done();
+      }, done.fail);
   });
 
   it('should create icon files', (done) => {
     const dimensions = [72, 96, 128, 144, 152, 192, 384, 512];
     const iconPath = '/projects/bar/src/assets/icons/icon-';
-    schematicRunner.runSchematicAsync('ng-add', defaultOptions, appTree).toPromise().then(tree => {
-      dimensions.forEach(d => {
-        const path = `${iconPath}${d}x${d}.png`;
-        expect(tree.exists(path)).toEqual(true);
-      });
-      done();
-    }, done.fail);
+    schematicRunner
+      .runSchematicAsync('ng-add', defaultOptions, appTree)
+      .toPromise()
+      .then((tree) => {
+        dimensions.forEach((d) => {
+          const path = `${iconPath}${d}x${d}.png`;
+          expect(tree.exists(path)).toEqual(true);
+        });
+        done();
+      }, done.fail);
   });
 
   it('should create a manifest file', (done) => {
-    schematicRunner.runSchematicAsync('ng-add', defaultOptions, appTree).toPromise().then(tree => {
-      expect(tree.exists('/projects/bar/src/manifest.webmanifest')).toEqual(true);
-      done();
-    }, done.fail);
+    schematicRunner
+      .runSchematicAsync('ng-add', defaultOptions, appTree)
+      .toPromise()
+      .then((tree) => {
+        expect(tree.exists('/projects/bar/src/manifest.webmanifest')).toEqual(true);
+        done();
+      }, done.fail);
   });
 
   it('should set the name & short_name in the manifest file', (done) => {
-    schematicRunner.runSchematicAsync('ng-add', defaultOptions, appTree).toPromise().then(tree => {
-      const manifestText = tree.readContent('/projects/bar/src/manifest.webmanifest');
-      const manifest = JSON.parse(manifestText);
-
-      expect(manifest.name).toEqual(defaultOptions.title);
-      expect(manifest.short_name).toEqual(defaultOptions.title);
-      done();
-    }, done.fail);
+    schematicRunner
+      .runSchematicAsync('ng-add', defaultOptions, appTree)
+      .toPromise()
+      .then((tree) => {
+        const manifestText = tree.readContent('/projects/bar/src/manifest.webmanifest');
+        const manifest = JSON.parse(manifestText);
+
+        expect(manifest.name).toEqual(defaultOptions.title);
+        expect(manifest.short_name).toEqual(defaultOptions.title);
+        done();
+      }, done.fail);
   });
 
   it('should set the name & short_name in the manifest file when no title provided', (done) => {
-    const options = {...defaultOptions, title: undefined};
-    schematicRunner.runSchematicAsync('ng-add', options, appTree).toPromise().then(tree => {
-      const manifestText = tree.readContent('/projects/bar/src/manifest.webmanifest');
-      const manifest = JSON.parse(manifestText);
-
-      expect(manifest.name).toEqual(defaultOptions.project);
-      expect(manifest.short_name).toEqual(defaultOptions.project);
-      done();
-    }, done.fail);
+    const options = { ...defaultOptions, title: undefined };
+    schematicRunner
+      .runSchematicAsync('ng-add', options, appTree)
+      .toPromise()
+      .then((tree) => {
+        const manifestText = tree.readContent('/projects/bar/src/manifest.webmanifest');
+        const manifest = JSON.parse(manifestText);
+
+        expect(manifest.name).toEqual(defaultOptions.project);
+        expect(manifest.short_name).toEqual(defaultOptions.project);
+        done();
+      }, done.fail);
   });
 
   it('should update the index file', (done) => {
-    schematicRunner.runSchematicAsync('ng-add', defaultOptions, appTree).toPromise().then(tree => {
-      const content = tree.readContent('projects/bar/src/index.html');
-
-      expect(content).toMatch(/<link rel="manifest" href="manifest.webmanifest">/);
-      expect(content).toMatch(/<meta name="theme-color" content="#1976d2">/);
-      expect(content)
-        .toMatch(/<noscript>Please enable JavaScript to continue using this application.<\/noscript>/);
-      done();
-    }, done.fail);
+    schematicRunner
+      .runSchematicAsync('ng-add', defaultOptions, appTree)
+      .toPromise()
+      .then((tree) => {
+        const content = tree.readContent('projects/bar/src/index.html');
+
+        expect(content).toMatch(/<link rel="manifest" href="manifest.webmanifest">/);
+        expect(content).toMatch(/<meta name="theme-color" content="#1976d2">/);
+        expect(content).toMatch(
+          /<noscript>Please enable JavaScript to continue using this application.<\/noscript>/,
+        );
+        done();
+      }, done.fail);
   });
 
   it('should not add noscript element to the index file if already present', (done) => {
     let index = appTree.readContent('projects/bar/src/index.html');
     index = index.replace('</body>', '<noscript>NO JAVASCRIPT</noscript></body>');
     appTree.overwrite('projects/bar/src/index.html', index);
-    schematicRunner.runSchematicAsync('ng-add', defaultOptions, appTree).toPromise().then(tree => {
-      const content = tree.readContent('projects/bar/src/index.html');
-
-      expect(content).toMatch(/<link rel="manifest" href="manifest.webmanifest">/);
-      expect(content).toMatch(/<meta name="theme-color" content="#1976d2">/);
-      expect(content).not
-        .toMatch(/<noscript>Please enable JavaScript to continue using this application.<\/noscript>/);
-      expect(content).toMatch(/<noscript>NO JAVASCRIPT<\/noscript>/);
-      done();
-    }, done.fail);
+    schematicRunner
+      .runSchematicAsync('ng-add', defaultOptions, appTree)
+      .toPromise()
+      .then((tree) => {
+        const content = tree.readContent('projects/bar/src/index.html');
+
+        expect(content).toMatch(/<link rel="manifest" href="manifest.webmanifest">/);
+        expect(content).toMatch(/<meta name="theme-color" content="#1976d2">/);
+        expect(content).not.toMatch(
+          /<noscript>Please enable JavaScript to continue using this application.<\/noscript>/,
+        );
+        expect(content).toMatch(/<noscript>NO JAVASCRIPT<\/noscript>/);
+        done();
+      }, done.fail);
   });
 
   it('should update the build and test assets configuration', (done) => {
-    schematicRunner.runSchematicAsync('ng-add', defaultOptions, appTree).toPromise().then(tree => {
-      const configText = tree.readContent('/angular.json');
-      const config = JSON.parse(configText);
-      const targets = config.projects.bar.architect;
-
-      ['build', 'test'].forEach((target) => {
-        expect(targets[target].options.assets).toContain('projects/bar/src/manifest.webmanifest');
-      });
-      done();
-    }, done.fail);
+    schematicRunner
+      .runSchematicAsync('ng-add', defaultOptions, appTree)
+      .toPromise()
+      .then((tree) => {
+        const configText = tree.readContent('/angular.json');
+        const config = JSON.parse(configText);
+        const targets = config.projects.bar.architect;
+
+        ['build', 'test'].forEach((target) => {
+          expect(targets[target].options.assets).toContain('projects/bar/src/manifest.webmanifest');
+        });
+        done();
+      }, done.fail);
   });
 });
diff --git a/packages/angular/pwa/pwa/schema.json b/packages/angular/pwa/pwa/schema.json
index 25e106eecdf3..9f37b9dfb7ea 100644
--- a/packages/angular/pwa/pwa/schema.json
+++ b/packages/angular/pwa/pwa/schema.json
@@ -27,4 +27,4 @@
     }
   },
   "required": []
-}
\ No newline at end of file
+}
diff --git a/packages/angular_devkit/architect/BUILD.bazel b/packages/angular_devkit/architect/BUILD.bazel
index d93b7485bbfa..595c478fa478 100644
--- a/packages/angular_devkit/architect/BUILD.bazel
+++ b/packages/angular_devkit/architect/BUILD.bazel
@@ -10,6 +10,7 @@ load("//tools:ts_json_schema.bzl", "ts_json_schema")
 # @external_begin
 load("@bazel_tools//tools/build_defs/pkg:pkg.bzl", "pkg_tar")
 load("@build_bazel_rules_nodejs//:index.bzl", "pkg_npm")
+load("@npm//@angular/dev-infra-private/bazel/api-golden:index.bzl", "api_golden_test_npm_package")
 # @external_end
 
 licenses(["notice"])  # MIT
@@ -103,4 +104,14 @@ pkg_tar(
     strip_prefix = "./npm_package",
     tags = ["manual"],
 )
+
+api_golden_test_npm_package(
+    name = "architect_api",
+    data = [
+        ":npm_package",
+        "//goldens:public-api",
+    ],
+    golden_dir = "angular_cli/goldens/public-api/angular_devkit/architect",
+    npm_package = "angular_cli/packages/angular_devkit/architect/npm_package",
+)
 # @external_end
diff --git a/packages/angular_devkit/architect/builders/all-of.ts b/packages/angular_devkit/architect/builders/all-of.ts
index 0b9d958b1f7c..a9a797ddd525 100644
--- a/packages/angular_devkit/architect/builders/all-of.ts
+++ b/packages/angular_devkit/architect/builders/all-of.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 { json } from '@angular-devkit/core';
 import { EMPTY, from, of } from 'rxjs';
 import { map, mergeMap } from 'rxjs/operators';
@@ -14,25 +15,32 @@ import { Schema as OperatorSchema } from './operator-schema';
 export default createBuilder<json.JsonObject & OperatorSchema>((options, context) => {
   const allRuns: Promise<[number, BuilderRun]>[] = [];
 
-  context.reportProgress(0,
-    (options.targets ? options.targets.length : 0)
-    + (options.builders ? options.builders.length : 0),
+  context.reportProgress(
+    0,
+    (options.targets ? options.targets.length : 0) +
+      (options.builders ? options.builders.length : 0),
   );
 
   if (options.targets) {
-    allRuns.push(...options.targets.map(({ target: targetStr, overrides }, i) => {
-      const [project, target, configuration] = targetStr.split(/:/g, 3);
+    allRuns.push(
+      ...options.targets.map(({ target: targetStr, overrides }, i) => {
+        const [project, target, configuration] = targetStr.split(/:/g, 3);
 
-      return context.scheduleTarget({ project, target, configuration }, overrides || {})
-        .then(run => [i, run] as [number, BuilderRun]);
-    }));
+        return context
+          .scheduleTarget({ project, target, configuration }, overrides || {})
+          .then((run) => [i, run] as [number, BuilderRun]);
+      }),
+    );
   }
 
   if (options.builders) {
-    allRuns.push(...options.builders.map(({ builder, options }, i) => {
-      return context.scheduleBuilder(builder, options || {})
-        .then(run => [i, run] as [number, BuilderRun]);
-    }));
+    allRuns.push(
+      ...options.builders.map(({ builder, options }, i) => {
+        return context
+          .scheduleBuilder(builder, options || {})
+          .then((run) => [i, run] as [number, BuilderRun]);
+      }),
+    );
   }
 
   const allResults: (BuilderOutput | null)[] = allRuns.map(() => null);
@@ -40,18 +48,20 @@ export default createBuilder<json.JsonObject & OperatorSchema>((options, context
   context.reportProgress(n++, allRuns.length);
 
   return from(allRuns).pipe(
-    mergeMap(runPromise => from(runPromise)),
-    mergeMap(([i, run]) => run.output.pipe(map(output => [i, output] as [number, BuilderOutput]))),
+    mergeMap((runPromise) => from(runPromise)),
+    mergeMap(([i, run]) =>
+      run.output.pipe(map((output) => [i, output] as [number, BuilderOutput])),
+    ),
     mergeMap(([i, output]) => {
       allResults[i] = output;
       context.reportProgress(n++, allRuns.length);
 
-      if (allResults.some(x => x === null)) {
+      if (allResults.some((x) => x === null)) {
         // Some builders aren't done running yet.
         return EMPTY;
       } else {
         return of({
-          success: allResults.every(x => x ? x.success : false),
+          success: allResults.every((x) => (x ? x.success : false)),
         });
       }
     }),
diff --git a/packages/angular_devkit/architect/builders/concat.ts b/packages/angular_devkit/architect/builders/concat.ts
index 816cb2028091..55deb965fb1b 100644
--- a/packages/angular_devkit/architect/builders/concat.ts
+++ b/packages/angular_devkit/architect/builders/concat.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 { json } from '@angular-devkit/core';
 import { from, of } from 'rxjs';
 import { concatMap, first, last, map, switchMap } from 'rxjs/operators';
@@ -14,23 +15,28 @@ import { Schema as OperatorSchema } from './operator-schema';
 export default createBuilder<json.JsonObject & OperatorSchema>((options, context) => {
   const allRuns: (() => Promise<BuilderRun>)[] = [];
 
-  context.reportProgress(0,
-    (options.targets ? options.targets.length : 0)
-    + (options.builders ? options.builders.length : 0),
+  context.reportProgress(
+    0,
+    (options.targets ? options.targets.length : 0) +
+      (options.builders ? options.builders.length : 0),
   );
 
   if (options.targets) {
-    allRuns.push(...options.targets.map(({ target: targetStr, overrides }) => {
-      const [project, target, configuration] = targetStr.split(/:/g, 3);
+    allRuns.push(
+      ...options.targets.map(({ target: targetStr, overrides }) => {
+        const [project, target, configuration] = targetStr.split(/:/g, 3);
 
-      return () => context.scheduleTarget({ project, target, configuration }, overrides || {});
-    }));
+        return () => context.scheduleTarget({ project, target, configuration }, overrides || {});
+      }),
+    );
   }
 
   if (options.builders) {
-    allRuns.push(...options.builders.map(({ builder, options }) => {
-      return () => context.scheduleBuilder(builder, options || {});
-    }));
+    allRuns.push(
+      ...options.builders.map(({ builder, options }) => {
+        return () => context.scheduleBuilder(builder, options || {});
+      }),
+    );
   }
 
   let stop: BuilderOutput | null = null;
@@ -38,15 +44,17 @@ export default createBuilder<json.JsonObject & OperatorSchema>((options, context
   context.reportProgress(i++, allRuns.length);
 
   return from(allRuns).pipe(
-    concatMap(fn => stop ? of(null) : from(fn()).pipe(
-      switchMap(run => run === null ? of(null) : run.output.pipe(first())),
-    )),
-    map(output => {
+    concatMap((fn) =>
+      stop
+        ? of(null)
+        : from(fn()).pipe(switchMap((run) => (run === null ? of(null) : run.output.pipe(first())))),
+    ),
+    map((output) => {
       context.reportProgress(i++, allRuns.length);
       if (output === null || stop !== null) {
         return stop || { success: false };
       } else if (output.success === false) {
-        return stop = output;
+        return (stop = output);
       } else {
         return output;
       }
diff --git a/packages/angular_devkit/architect/builders/false.ts b/packages/angular_devkit/architect/builders/false.ts
index 3ae22b054e59..12f8c9757813 100644
--- a/packages/angular_devkit/architect/builders/false.ts
+++ b/packages/angular_devkit/architect/builders/false.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 { createBuilder } from '../src';
 
 export default createBuilder(() => ({
diff --git a/packages/angular_devkit/architect/builders/noop-schema.json b/packages/angular_devkit/architect/builders/noop-schema.json
index 6e7b7b42754f..77dd56a32ba4 100644
--- a/packages/angular_devkit/architect/builders/noop-schema.json
+++ b/packages/angular_devkit/architect/builders/noop-schema.json
@@ -1,4 +1,4 @@
 {
   "$schema": "http://json-schema.org/draft-07/schema",
   "type": "object"
-}
\ No newline at end of file
+}
diff --git a/packages/angular_devkit/architect/builders/operator-schema.json b/packages/angular_devkit/architect/builders/operator-schema.json
index d6e1f8977524..1de86018e0da 100644
--- a/packages/angular_devkit/architect/builders/operator-schema.json
+++ b/packages/angular_devkit/architect/builders/operator-schema.json
@@ -16,9 +16,7 @@
             "type": "object"
           }
         },
-        "required": [
-          "builder"
-        ]
+        "required": ["builder"]
       },
       "minItems": 1
     },
@@ -35,9 +33,7 @@
             "type": "object"
           }
         },
-        "required": [
-          "target"
-        ]
+        "required": ["target"]
       },
       "minItems": 1
     }
diff --git a/packages/angular_devkit/architect/builders/true.ts b/packages/angular_devkit/architect/builders/true.ts
index ea617c33fd2b..e325373b269b 100644
--- a/packages/angular_devkit/architect/builders/true.ts
+++ b/packages/angular_devkit/architect/builders/true.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 { createBuilder } from '../src';
 
 export default createBuilder(() => ({ success: true }));
diff --git a/packages/angular_devkit/architect/node/index.ts b/packages/angular_devkit/architect/node/index.ts
index 721047f44093..81709330752e 100644
--- a/packages/angular_devkit/architect/node/index.ts
+++ b/packages/angular_devkit/architect/node/index.ts
@@ -1,8 +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
  */
+
 export * from './node-modules-architect-host';
diff --git a/packages/angular_devkit/architect/node/node-modules-architect-host.ts b/packages/angular_devkit/architect/node/node-modules-architect-host.ts
index b41059280b0d..40ec3c4a9f3f 100644
--- a/packages/angular_devkit/architect/node/node-modules-architect-host.ts
+++ b/packages/angular_devkit/architect/node/node-modules-architect-host.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 { json, workspaces } from '@angular-devkit/core';
 import * as path from 'path';
 import { deserialize, serialize } from 'v8';
@@ -90,12 +91,12 @@ export class WorkspaceNodeModulesArchitectHost implements ArchitectHost<NodeModu
             throw new Error(`Project "${project}" does not exist.`);
           }
 
-          return ({
+          return {
             root: projectDefinition.root,
             sourceRoot: projectDefinition.sourceRoot,
             prefix: projectDefinition.prefix,
             ...(clone(projectDefinition.extensions) as {}),
-          } as unknown) as json.JsonObject;
+          } as unknown as json.JsonObject;
         },
         async hasTarget(project, target) {
           return !!workspaceOrHost.projects.get(project)?.targets.has(target);
@@ -171,14 +172,15 @@ export class WorkspaceNodeModulesArchitectHost implements ArchitectHost<NodeModu
 
     let options = await this.workspaceHost.getOptions(target.project, target.target);
     const targetConfiguration =
-      target.configuration || await this.workspaceHost.getDefaultConfigurationName(target.project, target.target);
+      target.configuration ||
+      (await this.workspaceHost.getDefaultConfigurationName(target.project, target.target));
 
     if (targetConfiguration) {
       const configurations = targetConfiguration.split(',').map((c) => c.trim());
       for (const configuration of configurations) {
         options = {
           ...options,
-          ...await this.workspaceHost.getOptions(target.project, target.target, configuration),
+          ...(await this.workspaceHost.getOptions(target.project, target.target, configuration)),
         };
       }
     }
@@ -199,6 +201,11 @@ export class WorkspaceNodeModulesArchitectHost implements ArchitectHost<NodeModu
       return builder;
     }
 
+    // Default handling code is for old builders that incorrectly export `default` with non-ESM module
+    if (builder?.default[BuilderSymbol]) {
+      return builder.default;
+    }
+
     throw new Error('Builder is not a builder');
   }
 }
diff --git a/packages/angular_devkit/architect/src/api.ts b/packages/angular_devkit/architect/src/api.ts
index 70a027433289..415666892435 100644
--- a/packages/angular_devkit/architect/src/api.ts
+++ b/packages/angular_devkit/architect/src/api.ts
@@ -1,38 +1,38 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+
 import { analytics, experimental, json, logging } from '@angular-devkit/core';
 import { Observable, SubscribableOrPromise, Subscriber, from } from 'rxjs';
 import { switchMap } from 'rxjs/operators';
 import { Schema as RealBuilderInput, Target as RealTarget } from './input-schema';
 import { Schema as RealBuilderOutput } from './output-schema';
-import { Schema as RealBuilderProgress, State as BuilderProgressState } from './progress-schema';
+import { State as BuilderProgressState, Schema as RealBuilderProgress } from './progress-schema';
 
 export type Target = json.JsonObject & RealTarget;
-export {
-  BuilderProgressState,
-};
+export { BuilderProgressState };
 
 // Type short hands.
-export type BuilderRegistry =
-  experimental.jobs.Registry<json.JsonObject, BuilderInput, BuilderOutput>;
-
+export type BuilderRegistry = experimental.jobs.Registry<
+  json.JsonObject,
+  BuilderInput,
+  BuilderOutput
+>;
 
 /**
  * An API typed BuilderProgress. The interface generated from the schema is too permissive,
  * so this API is the one we show in our API. Please note that not all fields are in there; this
  * is in addition to fields in the schema.
  */
-export type TypedBuilderProgress = (
-    { state: BuilderProgressState.Stopped; }
-  | { state: BuilderProgressState.Error; error: json.JsonValue; }
-  | { state: BuilderProgressState.Waiting; status?: string; }
-  | { state: BuilderProgressState.Running; status?: string; current: number; total?: number; }
-);
+export type TypedBuilderProgress =
+  | { state: BuilderProgressState.Stopped }
+  | { state: BuilderProgressState.Error; error: json.JsonValue }
+  | { state: BuilderProgressState.Waiting; status?: string }
+  | { state: BuilderProgressState.Running; status?: string; current: number; total?: number };
 
 /**
  * Declaration of those types as JsonObject compatible. JsonObject is not compatible with
@@ -51,10 +51,10 @@ export type BuilderProgress = json.JsonObject & RealBuilderProgress & TypedBuild
  * builder interface. The watch dog sends BuilderProgress and the Builder has a set of functions
  * to manage the state.
  */
-export type BuilderProgressReport = BuilderProgress & ({
+export type BuilderProgressReport = BuilderProgress & {
   target?: Target;
   builder: BuilderInfo;
-});
+};
 
 /**
  * A Run, which is what is returned by scheduleBuilder or scheduleTarget functions. This should
@@ -251,16 +251,18 @@ export interface BuilderContext {
   /**
    * Add teardown logic to this Context, so that when it's being stopped it will execute teardown.
    */
-  addTeardown(teardown: () => (Promise<void> | void)): void;
+  addTeardown(teardown: () => Promise<void> | void): void;
 }
 
-
 /**
  * An accepted return value from a builder. Can be either an Observable, a Promise or a vector.
  */
-export type BuilderOutputLike = AsyncIterable<BuilderOutput> | SubscribableOrPromise<BuilderOutput> | BuilderOutput;
+export type BuilderOutputLike =
+  | AsyncIterable<BuilderOutput>
+  | SubscribableOrPromise<BuilderOutput>
+  | BuilderOutput;
 
-// tslint:disable-next-line:no-any
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function isBuilderOutput(obj: any): obj is BuilderOutput {
   if (!obj || typeof obj.then === 'function' || typeof obj.subscribe === 'function') {
     return false;
@@ -327,11 +329,10 @@ export type BuilderInfo = json.JsonObject & {
   optionSchema: json.schema.JsonSchema;
 };
 
-
 /**
  * Returns a string of "project:target[:configuration]" for the target object.
  */
-export function targetStringFromTarget({project, target, configuration}: Target) {
+export function targetStringFromTarget({ project, target, configuration }: Target) {
   return `${project}:${target}${configuration !== undefined ? ':' + configuration : ''}`;
 }
 
@@ -347,7 +348,7 @@ export function targetFromTargetString(str: string): Target {
   return {
     project: tuple[0],
     target: tuple[1],
-    ...(tuple[2] !== undefined) && { configuration: tuple[2] },
+    ...(tuple[2] !== undefined && { configuration: tuple[2] }),
   };
 }
 
@@ -371,20 +372,23 @@ export function scheduleTargetAndForget(
   scheduleOptions?: ScheduleOptions,
 ): Observable<BuilderOutput> {
   let resolve: (() => void) | null = null;
-  const promise = new Promise<void>(r => resolve = r);
+  const promise = new Promise<void>((r) => (resolve = r));
   context.addTeardown(() => promise);
 
   return from(context.scheduleTarget(target, overrides, scheduleOptions)).pipe(
-    switchMap(run => new Observable<BuilderOutput>(observer => {
-      const subscription = run.output.subscribe(observer);
-
-      return () => {
-        subscription.unsubscribe();
-        // We can properly ignore the floating promise as it's a "reverse" promise; the teardown
-        // is waiting for the resolve.
-        // tslint:disable-next-line:no-floating-promises
-        run.stop().then(resolve);
-      };
-    })),
+    switchMap(
+      (run) =>
+        new Observable<BuilderOutput>((observer) => {
+          const subscription = run.output.subscribe(observer);
+
+          return () => {
+            subscription.unsubscribe();
+            // We can properly ignore the floating promise as it's a "reverse" promise; the teardown
+            // is waiting for the resolve.
+            // eslint-disable-next-line @typescript-eslint/no-floating-promises
+            run.stop().then(resolve);
+          };
+        }),
+    ),
   );
 }
diff --git a/packages/angular_devkit/architect/src/api_spec.ts b/packages/angular_devkit/architect/src/api_spec.ts
index 73bc6288a274..932c135b1491 100644
--- a/packages/angular_devkit/architect/src/api_spec.ts
+++ b/packages/angular_devkit/architect/src/api_spec.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 { Target, targetFromTargetString, targetStringFromTarget } from './api';
 
 describe('Architect API', () => {
diff --git a/packages/angular_devkit/architect/src/architect.ts b/packages/angular_devkit/architect/src/architect.ts
index 7e8c18fd0d59..dff023ea53c5 100644
--- a/packages/angular_devkit/architect/src/architect.ts
+++ b/packages/angular_devkit/architect/src/architect.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 { analytics, experimental, json, logging } from '@angular-devkit/core';
 import { Observable, from, merge, of, onErrorResumeNext } from 'rxjs';
 import {
@@ -50,7 +51,7 @@ function _createJobHandlerFromBuilderInfo(
   function handler(argument: json.JsonObject, context: experimental.jobs.JobHandlerContext) {
     // Add input validation to the inbound bus.
     const inboundBusWithInputValidation = context.inboundBus.pipe(
-      concatMap(message => {
+      concatMap((message) => {
         if (message.kind === experimental.jobs.JobInboundMessageKind.Input) {
           const v = message.value as BuilderInput;
           const options = {
@@ -60,7 +61,7 @@ function _createJobHandlerFromBuilderInfo(
 
           // Validate v against the options schema.
           return registry.compile(info.optionSchema).pipe(
-            concatMap(validation => validation(options)),
+            concatMap((validation) => validation(options)),
             map((validationResult: json.schema.SchemaValidatorResult) => {
               const { data, success, errors } = validationResult;
               if (success) {
@@ -69,7 +70,7 @@ function _createJobHandlerFromBuilderInfo(
 
               throw new json.schema.SchemaValidationException(errors);
             }),
-            map(value => ({ ...message, value })),
+            map((value) => ({ ...message, value })),
           );
         } else {
           return of(message as experimental.jobs.JobInboundMessage<BuilderInput>);
@@ -85,20 +86,20 @@ function _createJobHandlerFromBuilderInfo(
     const inboundBus = onErrorResumeNext(inboundBusWithInputValidation);
 
     const output = from(host.loadBuilder(info)).pipe(
-      concatMap(builder => {
+      concatMap((builder) => {
         if (builder === null) {
           throw new Error(`Cannot load builder for builderInfo ${JSON.stringify(info, null, 2)}`);
         }
 
         return builder.handler(argument, { ...context, inboundBus }).pipe(
-          map(output => {
+          map((output) => {
             if (output.kind === experimental.jobs.JobOutboundMessageKind.Output) {
               // Add target to it.
               return {
                 ...output,
                 value: {
                   ...output.value,
-                  ...target ? { target } : 0,
+                  ...(target ? { target } : 0),
                 } as json.JsonObject,
               };
             } else {
@@ -130,7 +131,6 @@ export interface ScheduleOptions {
   analytics?: analytics.Analytics;
 }
 
-
 /**
  * A JobRegistry that resolves builder targets from the host.
  */
@@ -150,9 +150,7 @@ class ArchitectBuilderJobRegistry implements BuilderRegistry {
         return maybeCache;
       }
 
-      const info = from(this._host.resolveBuilder(name)).pipe(
-        shareReplay(1),
-      );
+      const info = from(this._host.resolveBuilder(name)).pipe(shareReplay(1));
       cache.set(name, info);
 
       return info;
@@ -207,7 +205,7 @@ class ArchitectBuilderJobRegistry implements BuilderRegistry {
     }
 
     return from(this._resolveBuilder(name)).pipe(
-      concatMap(builderInfo => (builderInfo ? this._createBuilder(builderInfo) : of(null))),
+      concatMap((builderInfo) => (builderInfo ? this._createBuilder(builderInfo) : of(null))),
       first(null, null),
     ) as Observable<experimental.jobs.JobHandler<A, I, O> | null>;
   }
@@ -217,7 +215,7 @@ class ArchitectBuilderJobRegistry implements BuilderRegistry {
  * A JobRegistry that resolves targets from the host.
  */
 class ArchitectTargetJobRegistry extends ArchitectBuilderJobRegistry {
-  get<A extends json.JsonObject, I extends BuilderInput, O extends BuilderOutput>(
+  override get<A extends json.JsonObject, I extends BuilderInput, O extends BuilderOutput>(
     name: string,
   ): Observable<experimental.jobs.JobHandler<A, I, O> | null> {
     const m = name.match(/^{([^:]+):([^:]+)(?::([^:]*))?}$/i);
@@ -243,7 +241,7 @@ class ArchitectTargetJobRegistry extends ArchitectBuilderJobRegistry {
         }
 
         return this._resolveBuilder(builderStr).pipe(
-          concatMap(builderInfo => {
+          concatMap((builderInfo) => {
             if (builderInfo === null) {
               return of(null);
             }
@@ -257,11 +255,10 @@ class ArchitectTargetJobRegistry extends ArchitectBuilderJobRegistry {
   }
 }
 
-
 function _getTargetOptionsFactory(host: ArchitectHost) {
   return experimental.jobs.createJobHandler<Target, json.JsonValue, json.JsonObject>(
-    target => {
-      return host.getOptionsForTarget(target).then(options => {
+    (target) => {
+      return host.getOptionsForTarget(target).then((options) => {
         if (options === null) {
           throw new Error(`Invalid target: ${JSON.stringify(target)}.`);
         }
@@ -279,8 +276,8 @@ function _getTargetOptionsFactory(host: ArchitectHost) {
 
 function _getProjectMetadataFactory(host: ArchitectHost) {
   return experimental.jobs.createJobHandler<Target, json.JsonValue, json.JsonObject>(
-    target => {
-      return host.getProjectMetadata(target).then(options => {
+    (target) => {
+      return host.getProjectMetadata(target).then((options) => {
         if (options === null) {
           throw new Error(`Invalid target: ${JSON.stringify(target)}.`);
         }
@@ -292,28 +289,28 @@ function _getProjectMetadataFactory(host: ArchitectHost) {
       name: '..getProjectMetadata',
       output: { type: 'object' },
       argument: {
-        oneOf: [
-          { type: 'string' },
-          inputSchema.properties.target,
-        ],
+        oneOf: [{ type: 'string' }, inputSchema.properties.target],
       },
     },
   );
 }
 
 function _getBuilderNameForTargetFactory(host: ArchitectHost) {
-  return experimental.jobs.createJobHandler<Target, never, string>(async target => {
-    const builderName = await host.getBuilderNameForTarget(target);
-    if (!builderName) {
-      throw new Error(`No builder were found for target ${targetStringFromTarget(target)}.`);
-    }
+  return experimental.jobs.createJobHandler<Target, never, string>(
+    async (target) => {
+      const builderName = await host.getBuilderNameForTarget(target);
+      if (!builderName) {
+        throw new Error(`No builder were found for target ${targetStringFromTarget(target)}.`);
+      }
 
-    return builderName;
-  }, {
-    name: '..getBuilderNameForTarget',
-    output: { type: 'string' },
-    argument: inputSchema.properties.target,
-  });
+      return builderName;
+    },
+    {
+      name: '..getBuilderNameForTarget',
+      output: { type: 'string' },
+      argument: inputSchema.properties.target,
+    },
+  );
 }
 
 function _validateOptionsFactory(host: ArchitectHost, registry: json.schema.SchemaRegistry) {
@@ -325,32 +322,31 @@ function _validateOptionsFactory(host: ArchitectHost, registry: json.schema.Sche
         throw new Error(`No builder info were found for builder ${JSON.stringify(builderName)}.`);
       }
 
-      return registry.compile(builderInfo.optionSchema).pipe(
-        concatMap(validation => validation(options)),
-        switchMap(({ data, success, errors }) => {
-          if (success) {
-            return of(data as json.JsonObject);
-          }
+      return registry
+        .compile(builderInfo.optionSchema)
+        .pipe(
+          concatMap((validation) => validation(options)),
+          switchMap(({ data, success, errors }) => {
+            if (success) {
+              return of(data as json.JsonObject);
+            }
 
-          throw new json.schema.SchemaValidationException(errors);
-        }),
-      ).toPromise();
+            throw new json.schema.SchemaValidationException(errors);
+          }),
+        )
+        .toPromise();
     },
     {
       name: '..validateOptions',
       output: { type: 'object' },
       argument: {
         type: 'array',
-        items: [
-          { type: 'string' },
-          { type: 'object' },
-        ],
+        items: [{ type: 'string' }, { type: 'object' }],
       },
     },
   );
 }
 
-
 export class Architect {
   private readonly _scheduler: experimental.jobs.Scheduler;
   private readonly _jobCache = new Map<string, Observable<BuilderJobHandler>>();
diff --git a/packages/angular_devkit/architect/src/builders-schema.json b/packages/angular_devkit/architect/src/builders-schema.json
index c2d8ee778587..c71ef86e3984 100644
--- a/packages/angular_devkit/architect/src/builders-schema.json
+++ b/packages/angular_devkit/architect/src/builders-schema.json
@@ -15,9 +15,7 @@
       }
     }
   },
-  "required": [
-    "builders"
-  ],
+  "required": ["builders"],
   "definitions": {
     "builder": {
       "type": "object",
@@ -34,10 +32,7 @@
               "description": "Builder description."
             }
           },
-          "required": [
-            "schema",
-            "description"
-          ]
+          "required": ["schema", "description"]
         },
         {
           "anyOf": [
@@ -48,9 +43,7 @@
                   "description": "The next generation builder module."
                 }
               },
-              "required": [
-                "implementation"
-              ]
+              "required": ["implementation"]
             },
             {
               "properties": {
@@ -59,9 +52,7 @@
                   "description": "The builder class module."
                 }
               },
-              "required": [
-                "class"
-              ]
+              "required": ["class"]
             }
           ]
         }
diff --git a/packages/angular_devkit/architect/src/create-builder.ts b/packages/angular_devkit/architect/src/create-builder.ts
index c4614ba219d6..8a49d2f924b9 100644
--- a/packages/angular_devkit/architect/src/create-builder.ts
+++ b/packages/angular_devkit/architect/src/create-builder.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 { analytics, experimental, json, logging } from '@angular-devkit/core';
 import { Observable, Subscription, from, isObservable, of, throwError } from 'rxjs';
 import { tap } from 'rxjs/operators';
@@ -25,22 +26,19 @@ import {
 import { Builder, BuilderSymbol, BuilderVersionSymbol } from './internal';
 import { scheduleByName, scheduleByTarget } from './schedule-by-name';
 
-
-// tslint:disable-next-line: no-big-function
-export function createBuilder<
-  OptT = json.JsonObject,
-  OutT extends BuilderOutput = BuilderOutput,
->(
+// eslint-disable-next-line max-lines-per-function
+export function createBuilder<OptT = json.JsonObject, OutT extends BuilderOutput = BuilderOutput>(
   fn: BuilderHandlerFn<OptT>,
 ): Builder<OptT & json.JsonObject> {
   const cjh = experimental.jobs.createJobHandler;
+  // eslint-disable-next-line max-lines-per-function
   const handler = cjh<json.JsonObject, BuilderInput, OutT>((options, context) => {
     const scheduler = context.scheduler;
     const progressChannel = context.createChannel('progress');
     const logChannel = context.createChannel('log');
     const analyticsChannel = context.createChannel('analytics');
     let currentState: BuilderProgressState = BuilderProgressState.Stopped;
-    const teardownLogics: Array<() => (PromiseLike<void> | void)> = [];
+    const teardownLogics: Array<() => PromiseLike<void> | void> = [];
     let tearingDown = false;
     let current = 0;
     let status = '';
@@ -63,33 +61,33 @@ export function createBuilder<
       }
 
       progressChannel.next({
-        ...progress as json.JsonObject,
+        ...(progress as json.JsonObject),
         ...(context.target && { target: context.target }),
         ...(context.builder && { builder: context.builder }),
         id: context.id,
       });
     }
 
-    return new Observable<OutT>(observer => {
+    return new Observable<OutT>((observer) => {
       const subscriptions: Subscription[] = [];
 
-      const inputSubscription = context.inboundBus.subscribe(
-        i => {
-          switch (i.kind) {
-            case experimental.jobs.JobInboundMessageKind.Stop:
-              // Run teardown logic then complete.
-              tearingDown = true;
-              Promise.all(teardownLogics.map(fn => fn() || Promise.resolve()))
-                .then(() => observer.complete(), err => observer.error(err));
-              break;
-            case experimental.jobs.JobInboundMessageKind.Input:
-              if (!tearingDown) {
-                onInput(i.value);
-              }
-              break;
-          }
-        },
-      );
+      const inputSubscription = context.inboundBus.subscribe((i) => {
+        switch (i.kind) {
+          case experimental.jobs.JobInboundMessageKind.Stop:
+            // Run teardown logic then complete.
+            tearingDown = true;
+            Promise.all(teardownLogics.map((fn) => fn() || Promise.resolve())).then(
+              () => observer.complete(),
+              (err) => observer.error(err),
+            );
+            break;
+          case experimental.jobs.JobInboundMessageKind.Input:
+            if (!tearingDown) {
+              onInput(i.value);
+            }
+            break;
+        }
+      });
 
       function onInput(i: BuilderInput) {
         const builder = i.info as BuilderInfo;
@@ -98,7 +96,7 @@ export function createBuilder<
           : builder.builderName;
         const logger = new logging.Logger(loggerName);
 
-        subscriptions.push(logger.subscribe(entry => log(entry)));
+        subscriptions.push(logger.subscribe((entry) => log(entry)));
 
         const context: BuilderContext = {
           builder,
@@ -120,7 +118,7 @@ export function createBuilder<
             });
 
             // We don't want to subscribe errors and complete.
-            subscriptions.push(run.progress.subscribe(event => progressChannel.next(event)));
+            subscriptions.push(run.progress.subscribe((event) => progressChannel.next(event)));
 
             return run;
           },
@@ -138,45 +136,51 @@ export function createBuilder<
             });
 
             // We don't want to subscribe errors and complete.
-            subscriptions.push(run.progress.subscribe(event => progressChannel.next(event)));
+            subscriptions.push(run.progress.subscribe((event) => progressChannel.next(event)));
 
             return run;
           },
           async getTargetOptions(target: Target) {
-            return scheduler.schedule<Target, json.JsonValue, json.JsonObject>(
-                    '..getTargetOptions', target).output.toPromise();
+            return scheduler
+              .schedule<Target, json.JsonValue, json.JsonObject>('..getTargetOptions', target)
+              .output.toPromise();
           },
           async getProjectMetadata(target: Target | string) {
-            return scheduler.schedule<Target | string, json.JsonValue, json.JsonObject>(
-                    '..getProjectMetadata', target).output.toPromise();
+            return scheduler
+              .schedule<Target | string, json.JsonValue, json.JsonObject>(
+                '..getProjectMetadata',
+                target,
+              )
+              .output.toPromise();
           },
           async getBuilderNameForTarget(target: Target) {
-            return scheduler.schedule<Target, json.JsonValue, string>(
-              '..getBuilderNameForTarget',
-              target,
-            ).output.toPromise();
+            return scheduler
+              .schedule<Target, json.JsonValue, string>('..getBuilderNameForTarget', target)
+              .output.toPromise();
           },
           async validateOptions<T extends json.JsonObject = json.JsonObject>(
             options: json.JsonObject,
             builderName: string,
           ) {
-            return scheduler.schedule<[string, json.JsonObject], json.JsonValue, T>(
-              '..validateOptions',
-              [builderName, options],
-            ).output.toPromise();
+            return scheduler
+              .schedule<[string, json.JsonObject], json.JsonValue, T>('..validateOptions', [
+                builderName,
+                options,
+              ])
+              .output.toPromise();
           },
           reportRunning() {
             switch (currentState) {
               case BuilderProgressState.Waiting:
               case BuilderProgressState.Stopped:
-                progress({ state: BuilderProgressState.Running, current: 0, total  }, context);
+                progress({ state: BuilderProgressState.Running, current: 0, total }, context);
                 break;
             }
           },
           reportStatus(status: string) {
             switch (currentState) {
               case BuilderProgressState.Running:
-                progress({ state: currentState, status, current, total  }, context);
+                progress({ state: currentState, status, current, total }, context);
                 break;
               case BuilderProgressState.Waiting:
                 progress({ state: currentState, status }, context);
@@ -189,8 +193,8 @@ export function createBuilder<
                 progress({ state: currentState, current, total, status }, context);
             }
           },
-          analytics: new analytics.ForwardingAnalytics(report => analyticsChannel.next(report)),
-          addTeardown(teardown: () => (Promise<void> | void)): void {
+          analytics: new analytics.ForwardingAnalytics((report) => analyticsChannel.next(report)),
+          addTeardown(teardown: () => Promise<void> | void): void {
             teardownLogics.push(teardown);
           },
         };
@@ -212,20 +216,24 @@ export function createBuilder<
 
         // Manage some state automatically.
         progress({ state: BuilderProgressState.Running, current: 0, total: 1 }, context);
-        subscriptions.push(result.pipe(
-          tap(() => {
-            progress({ state: BuilderProgressState.Running, current: total }, context);
-            progress({ state: BuilderProgressState.Stopped }, context);
-          }),
-        ).subscribe(
-          message => observer.next(message as OutT),
-          error => observer.error(error),
-          () => observer.complete(),
-        ));
+        subscriptions.push(
+          result
+            .pipe(
+              tap(() => {
+                progress({ state: BuilderProgressState.Running, current: total }, context);
+                progress({ state: BuilderProgressState.Stopped }, context);
+              }),
+            )
+            .subscribe(
+              (message) => observer.next(message as OutT),
+              (error) => observer.error(error),
+              () => observer.complete(),
+            ),
+        );
       }
 
       return () => {
-        subscriptions.forEach(x => x.unsubscribe());
+        subscriptions.forEach((x) => x.unsubscribe());
         inputSubscription.unsubscribe();
       };
     });
diff --git a/packages/angular_devkit/architect/src/index.ts b/packages/angular_devkit/architect/src/index.ts
index a21d4ff324b2..210a7b794a28 100644
--- a/packages/angular_devkit/architect/src/index.ts
+++ b/packages/angular_devkit/architect/src/index.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
  */
+
 export * from './api';
 export { Architect, ScheduleOptions } from './architect';
 export { createBuilder } from './create-builder';
diff --git a/packages/angular_devkit/architect/src/index_spec.ts b/packages/angular_devkit/architect/src/index_spec.ts
index 7e4f2bd8cbe9..8edc4b9ee650 100644
--- a/packages/angular_devkit/architect/src/index_spec.ts
+++ b/packages/angular_devkit/architect/src/index_spec.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 { json, schema } from '@angular-devkit/core';
 import { timer } from 'rxjs';
 import { map, take, tap, toArray } from 'rxjs/operators';
@@ -16,7 +17,6 @@ import { createBuilder } from './create-builder';
 
 const flush = promisify(setImmediate);
 
-// tslint:disable-next-line:no-big-function
 describe('architect', () => {
   let testArchitectHost: TestingArchitectHost;
   let architect: Architect;
@@ -39,26 +39,35 @@ describe('architect', () => {
 
     options = {};
     called = 0;
-    testArchitectHost.addBuilder('package:test', createBuilder(async o => {
-      called++;
-      options = o;
-
-      return new Promise<BuilderOutput>(resolve => {
-        setTimeout(() => resolve({ success: true }), 10);
-      });
-    }));
-    testArchitectHost.addBuilder('package:test-options', createBuilder(o => {
-      options = o;
-
-      return { success: true };
-    }));
+    testArchitectHost.addBuilder(
+      'package:test',
+      createBuilder(async (o) => {
+        called++;
+        options = o;
+
+        return new Promise<BuilderOutput>((resolve) => {
+          setTimeout(() => resolve({ success: true }), 10);
+        });
+      }),
+    );
+    testArchitectHost.addBuilder(
+      'package:test-options',
+      createBuilder((o) => {
+        options = o;
+
+        return { success: true };
+      }),
+    );
 
     testArchitectHost.addTarget(target1, 'package:test');
     testArchitectHost.addTarget(target2, 'package:test');
   });
 
   it('works', async () => {
-    testArchitectHost.addBuilder('package:test', createBuilder(() => ({ success: true })));
+    testArchitectHost.addBuilder(
+      'package:test',
+      createBuilder(() => ({ success: true })),
+    );
 
     const run = await architect.scheduleBuilder('package:test', {});
     expect(await run.result).toEqual(jasmine.objectContaining({ success: true }));
@@ -66,7 +75,10 @@ describe('architect', () => {
   });
 
   it('works with async builders', async () => {
-    testArchitectHost.addBuilder('package:test', createBuilder(async () => ({ success: true })));
+    testArchitectHost.addBuilder(
+      'package:test',
+      createBuilder(async () => ({ success: true })),
+    );
 
     const run = await architect.scheduleBuilder('package:test', {});
     expect(await run.result).toEqual(jasmine.objectContaining({ success: true }));
@@ -74,7 +86,12 @@ describe('architect', () => {
   });
 
   it('supports async generator builders', async () => {
-    testArchitectHost.addBuilder('package:test', createBuilder(async function*() { yield { success: true }; }));
+    testArchitectHost.addBuilder(
+      'package:test',
+      createBuilder(async function* () {
+        yield { success: true };
+      }),
+    );
 
     const run = await architect.scheduleBuilder('package:test', {});
     expect(await run.result).toEqual(jasmine.objectContaining({ success: true }));
@@ -132,25 +149,27 @@ describe('architect', () => {
     try {
       await architect.scheduleBuilder('non:existent', {});
       expect('to throw').not.toEqual('to throw');
-    } catch {
-    }
+    } catch {}
   });
 
   it('works with watching observable builders', async () => {
     let results = 0;
-    testArchitectHost.addBuilder('package:test-watch', createBuilder((_, context) => {
-      called++;
-
-      return timer(10, 10).pipe(
-        take(10),
-        map(() => {
-          context.reportRunning();
-
-          return { success: true };
-        }),
-        tap(() => results++),
-      );
-    }));
+    testArchitectHost.addBuilder(
+      'package:test-watch',
+      createBuilder((_, context) => {
+        called++;
+
+        return timer(10, 10).pipe(
+          take(10),
+          map(() => {
+            context.reportRunning();
+
+            return { success: true };
+          }),
+          tap(() => results++),
+        );
+      }),
+    );
 
     const run = await architect.scheduleBuilder('package:test-watch', {});
     await run.result;
@@ -165,16 +184,19 @@ describe('architect', () => {
 
   it('works with watching async generator builders', async () => {
     let results = 0;
-    testArchitectHost.addBuilder('package:test-watch-gen', createBuilder(async function*(_, context) {
-      called++;
+    testArchitectHost.addBuilder(
+      'package:test-watch-gen',
+      createBuilder(async function* (_, context) {
+        called++;
 
-      for (let x = 0; x < 10; x++) {
-        await new Promise(setImmediate);
-        context.reportRunning();
-        yield { success: true };
-        results++;
-      }
-    }));
+        for (let x = 0; x < 10; x++) {
+          await new Promise(setImmediate);
+          context.reportRunning();
+          yield { success: true };
+          results++;
+        }
+      }),
+    );
 
     const run = await architect.scheduleBuilder('package:test-watch-gen', {});
     await run.result;
@@ -188,9 +210,12 @@ describe('architect', () => {
   });
 
   it('reports errors in the builder', async () => {
-    testArchitectHost.addBuilder('package:error', createBuilder(() => {
-      throw new Error('Error in the builder.');
-    }));
+    testArchitectHost.addBuilder(
+      'package:error',
+      createBuilder(() => {
+        throw new Error('Error in the builder.');
+      }),
+    );
 
     let run: BuilderRun | undefined = undefined;
     try {
@@ -205,17 +230,19 @@ describe('architect', () => {
       // This should throw.
       await run.result;
       expect('to throw').not.toEqual('to throw');
-    } catch {
-    }
+    } catch {}
     if (run) {
       await run.stop();
     }
   });
 
   it('reports errors in the builder (async)', async () => {
-    testArchitectHost.addBuilder('package:error', createBuilder(() => {
-      return Promise.reject(new Error('Error async'));
-    }));
+    testArchitectHost.addBuilder(
+      'package:error',
+      createBuilder(() => {
+        return Promise.reject(new Error('Error async'));
+      }),
+    );
 
     let run: BuilderRun | undefined = undefined;
     try {
@@ -230,8 +257,7 @@ describe('architect', () => {
       // This should throw.
       await run.result;
       expect('to throw').not.toEqual('to throw');
-    } catch {
-    }
+    } catch {}
     if (run) {
       await run.stop();
     }
@@ -245,7 +271,8 @@ describe('architect', () => {
 
     const run = await architect.scheduleBuilder(builderName, { extraProp: true });
     await expectAsync(run.result).toBeRejectedWith(
-      jasmine.objectContaining({ message: jasmine.stringMatching('extraProp') }));
+      jasmine.objectContaining({ message: jasmine.stringMatching('extraProp') }),
+    );
     await run.stop();
   });
 
@@ -261,11 +288,14 @@ describe('architect', () => {
     };
     testArchitectHost.addTarget(target, 'package:target', goldenOptions);
 
-    testArchitectHost.addBuilder('package:getTargetOptions', createBuilder(async (_, context) => {
-      options = await context.getTargetOptions(target);
+    testArchitectHost.addBuilder(
+      'package:getTargetOptions',
+      createBuilder(async (_, context) => {
+        options = await context.getTargetOptions(target);
 
-      return { success: true };
-    }));
+        return { success: true };
+      }),
+    );
 
     const run = await architect.scheduleBuilder('package:getTargetOptions', {});
     const output = await run.output.toPromise();
@@ -290,7 +320,10 @@ describe('architect', () => {
 
   it('exposes getBuilderNameForTarget()', async () => {
     const builderName = 'ImBlue:DabadeeDabada';
-    testArchitectHost.addBuilder(builderName, createBuilder(() => ({ success: true })));
+    testArchitectHost.addBuilder(
+      builderName,
+      createBuilder(() => ({ success: true })),
+    );
 
     const target = {
       project: 'some-project',
@@ -299,11 +332,14 @@ describe('architect', () => {
     testArchitectHost.addTarget(target, builderName);
 
     let actualBuilderName = '';
-    testArchitectHost.addBuilder('package:do-it', createBuilder(async (_, context) => {
-      actualBuilderName = await context.getBuilderNameForTarget(target);
+    testArchitectHost.addBuilder(
+      'package:do-it',
+      createBuilder(async (_, context) => {
+        actualBuilderName = await context.getBuilderNameForTarget(target);
 
-      return { success: true };
-    }));
+        return { success: true };
+      }),
+    );
 
     const run = await architect.scheduleBuilder('package:do-it', {});
     const output = await run.output.toPromise();
@@ -328,23 +364,29 @@ describe('architect', () => {
 
   it('exposes validateOptions()', async () => {
     const builderName = 'Hello:World';
-    testArchitectHost.addBuilder(builderName, createBuilder(() => ({ success: true })), '', {
-      type: 'object',
-      properties: {
-        p0: { type: 'number', default: 123 },
-        p1: { type: 'string' },
+    testArchitectHost.addBuilder(
+      builderName,
+      createBuilder(() => ({ success: true })),
+      '',
+      {
+        type: 'object',
+        properties: {
+          p0: { type: 'number', default: 123 },
+          p1: { type: 'string' },
+        },
+        required: ['p1'],
       },
-      required: [
-        'p1',
-      ],
-    });
+    );
 
     let actualOptions: json.JsonObject = {};
-    testArchitectHost.addBuilder('package:do-it', createBuilder(async (options, context) => {
-      actualOptions = await context.validateOptions(options, builderName);
+    testArchitectHost.addBuilder(
+      'package:do-it',
+      createBuilder(async (options, context) => {
+        actualOptions = await context.validateOptions(options, builderName);
 
-      return { success: true };
-    }));
+        return { success: true };
+      }),
+    );
 
     const run = await architect.scheduleBuilder('package:do-it', { p1: 'hello' });
     const output = await run.output.toPromise();
@@ -358,8 +400,9 @@ describe('architect', () => {
     // Should also error.
     const run2 = await architect.scheduleBuilder('package:do-it', {});
 
-    await expectAsync(run2.output.toPromise())
-      .toBeRejectedWith(jasmine.objectContaining({ message: jasmine.stringMatching('p1')}));
+    await expectAsync(run2.output.toPromise()).toBeRejectedWith(
+      jasmine.objectContaining({ message: jasmine.stringMatching('p1') }),
+    );
 
     await run2.stop();
   });
diff --git a/packages/angular_devkit/architect/src/input-schema.json b/packages/angular_devkit/architect/src/input-schema.json
index 76a9536a777e..7559c09680e4 100644
--- a/packages/angular_devkit/architect/src/input-schema.json
+++ b/packages/angular_devkit/architect/src/input-schema.json
@@ -26,10 +26,7 @@
           "type": "string"
         }
       },
-      "required": [
-        "project",
-        "target"
-      ]
+      "required": ["project", "target"]
     },
     "info": {
       "type": "object"
@@ -38,10 +35,5 @@
       "type": "object"
     }
   },
-  "required": [
-    "currentDirectory",
-    "id",
-    "info",
-    "workspaceRoot"
-  ]
+  "required": ["currentDirectory", "id", "info", "workspaceRoot"]
 }
diff --git a/packages/angular_devkit/architect/src/internal.ts b/packages/angular_devkit/architect/src/internal.ts
index deaf25047160..0d4d972f1556 100644
--- a/packages/angular_devkit/architect/src/internal.ts
+++ b/packages/angular_devkit/architect/src/internal.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 { experimental, json } from '@angular-devkit/core';
 import { BuilderInfo, BuilderInput, BuilderOutput, Target } from './api';
 
@@ -34,7 +35,7 @@ export const BuilderVersionSymbol = Symbol.for('@angular-devkit/architect:versio
 export type BuilderJobHandler<
   A extends json.JsonObject = json.JsonObject,
   I extends BuilderInput = BuilderInput,
-  O extends BuilderOutput = BuilderOutput,
+  O extends BuilderOutput = BuilderOutput
 > = experimental.jobs.JobHandler<A, I, O> & { jobDescription: BuilderDescription };
 
 /**
diff --git a/packages/angular_devkit/architect/src/output-schema.json b/packages/angular_devkit/architect/src/output-schema.json
index 5e2d209ba9a5..5539068eb553 100644
--- a/packages/angular_devkit/architect/src/output-schema.json
+++ b/packages/angular_devkit/architect/src/output-schema.json
@@ -29,7 +29,5 @@
     }
   },
   "additionalProperties": true,
-  "required": [
-    "success"
-  ]
+  "required": ["success"]
 }
diff --git a/packages/angular_devkit/architect/src/progress-schema.json b/packages/angular_devkit/architect/src/progress-schema.json
index 2123de2a4a2b..e782f4ad0b6e 100644
--- a/packages/angular_devkit/architect/src/progress-schema.json
+++ b/packages/angular_devkit/architect/src/progress-schema.json
@@ -12,40 +12,30 @@
           "properties": {
             "state": {
               "type": "string",
-              "enum": [
-                "stopped"
-              ]
+              "enum": ["stopped"]
             }
           },
-          "required": [
-            "state"
-          ]
+          "required": ["state"]
         },
         {
           "type": "object",
           "properties": {
             "state": {
               "type": "string",
-              "enum": [
-                "waiting"
-              ]
+              "enum": ["waiting"]
             },
             "status": {
               "type": "string"
             }
           },
-          "required": [
-            "state"
-          ]
+          "required": ["state"]
         },
         {
           "type": "object",
           "properties": {
             "state": {
               "type": "string",
-              "enum": [
-                "running"
-              ]
+              "enum": ["running"]
             },
             "current": {
               "type": "number",
@@ -59,24 +49,18 @@
               "type": "string"
             }
           },
-          "required": [
-            "state"
-          ]
+          "required": ["state"]
         },
         {
           "type": "object",
           "properties": {
             "state": {
               "type": "string",
-              "enum": [
-                "error"
-              ]
+              "enum": ["error"]
             },
             "error": true
           },
-          "required": [
-            "state"
-          ]
+          "required": ["state"]
         }
       ]
     },
@@ -93,10 +77,7 @@
           "type": "number"
         }
       },
-      "required": [
-        "builder",
-        "id"
-      ]
+      "required": ["builder", "id"]
     }
   ]
 }
diff --git a/packages/angular_devkit/architect/src/schedule-by-name.ts b/packages/angular_devkit/architect/src/schedule-by-name.ts
index 40df0258bb10..d1f8da4b7bc0 100644
--- a/packages/angular_devkit/architect/src/schedule-by-name.ts
+++ b/packages/angular_devkit/architect/src/schedule-by-name.ts
@@ -1,17 +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 { analytics, experimental, json, logging } from '@angular-devkit/core';
 import { EMPTY, Subscription } from 'rxjs';
 import { catchError, first, ignoreElements, map, shareReplay } from 'rxjs/operators';
 import {
   BuilderInfo,
   BuilderInput,
-  BuilderOutput, BuilderProgressReport,
+  BuilderOutput,
+  BuilderProgressReport,
   BuilderRun,
   Target,
   targetStringFromTarget,
@@ -19,19 +21,18 @@ import {
 
 const progressSchema = require('./progress-schema.json');
 
-
 let _uniqueId = 0;
 
 export async function scheduleByName(
   name: string,
   buildOptions: json.JsonObject,
   options: {
-    target?: Target,
-    scheduler: experimental.jobs.Scheduler,
-    logger: logging.LoggerApi,
-    workspaceRoot: string | Promise<string>,
-    currentDirectory: string | Promise<string>,
-    analytics?: analytics.Analytics,
+    target?: Target;
+    scheduler: experimental.jobs.Scheduler;
+    logger: logging.LoggerApi;
+    workspaceRoot: string | Promise<string>;
+    currentDirectory: string | Promise<string>;
+    analytics?: analytics.Analytics;
   },
 ): Promise<BuilderRun> {
   const childLoggerName = options.target ? `{${targetStringFromTarget(options.target)}}` : name;
@@ -57,18 +58,24 @@ export async function scheduleByName(
 
   // Wait for the job to be ready.
   if (job.state !== experimental.jobs.JobState.Started) {
-    stateSubscription = job.outboundBus.subscribe(event => {
-      if (event.kind === experimental.jobs.JobOutboundMessageKind.Start) {
-        job.input.next(message);
-      }
-    }, () => {});
+    stateSubscription = job.outboundBus.subscribe(
+      (event) => {
+        if (event.kind === experimental.jobs.JobOutboundMessageKind.Start) {
+          job.input.next(message);
+        }
+      },
+      () => {},
+    );
   } else {
     job.input.next(message);
   }
 
-  const logChannelSub = job.getChannel<logging.LogEntry>('log').subscribe(entry => {
-    logger.next(entry);
-  }, () => {});
+  const logChannelSub = job.getChannel<logging.LogEntry>('log').subscribe(
+    (entry) => {
+      logger.next(entry);
+    },
+    () => {},
+  );
 
   const s = job.outboundBus.subscribe({
     error() {},
@@ -81,19 +88,23 @@ export async function scheduleByName(
     },
   });
   const output = job.output.pipe(
-    map(output => ({
-      ...output,
-      ...options.target ? { target: options.target } : 0,
-      info,
-    } as BuilderOutput)),
+    map(
+      (output) =>
+        ({
+          ...output,
+          ...(options.target ? { target: options.target } : 0),
+          info,
+        } as BuilderOutput),
+    ),
     shareReplay(),
   );
 
   // If there's an analytics object, take the job channel and report it to the analytics.
   if (options.analytics) {
     const reporter = new analytics.AnalyticsReporter(options.analytics);
-    job.getChannel<analytics.AnalyticsReport>('analytics')
-      .subscribe(report => reporter.report(report));
+    job
+      .getChannel<analytics.AnalyticsReport>('analytics')
+      .subscribe((report) => reporter.report(report));
   }
   // Start the builder.
   output.pipe(first()).subscribe({
@@ -104,18 +115,22 @@ export async function scheduleByName(
     id,
     info,
     // This is a getter so that it always returns the next output, and not the same one.
-    get result() { return output.pipe(first()).toPromise(); },
+    get result() {
+      return output.pipe(first()).toPromise();
+    },
     output,
-    progress: job.getChannel<BuilderProgressReport>('progress', progressSchema).pipe(
-      shareReplay(1),
-    ),
+    progress: job
+      .getChannel<BuilderProgressReport>('progress', progressSchema)
+      .pipe(shareReplay(1)),
     stop() {
       job.stop();
 
-      return job.outboundBus.pipe(
-        ignoreElements(),
-        catchError(() => EMPTY),
-      ).toPromise();
+      return job.outboundBus
+        .pipe(
+          ignoreElements(),
+          catchError(() => EMPTY),
+        )
+        .toPromise();
     },
   };
 }
@@ -124,11 +139,11 @@ export async function scheduleByTarget(
   target: Target,
   overrides: json.JsonObject,
   options: {
-    scheduler: experimental.jobs.Scheduler,
-    logger: logging.LoggerApi,
-    workspaceRoot: string | Promise<string>,
-    currentDirectory: string | Promise<string>,
-    analytics?: analytics.Analytics,
+    scheduler: experimental.jobs.Scheduler;
+    logger: logging.LoggerApi;
+    workspaceRoot: string | Promise<string>;
+    currentDirectory: string | Promise<string>;
+    analytics?: analytics.Analytics;
   },
 ): Promise<BuilderRun> {
   return scheduleByName(`{${targetStringFromTarget(target)}}`, overrides, {
diff --git a/packages/angular_devkit/architect/src/targets-schema.json b/packages/angular_devkit/architect/src/targets-schema.json
index 01d5eb5b5923..912c20ff1cd1 100644
--- a/packages/angular_devkit/architect/src/targets-schema.json
+++ b/packages/angular_devkit/architect/src/targets-schema.json
@@ -29,14 +29,11 @@
         }
       },
       "additionalProperties": false,
-      "required": [
-        "builder",
-        "options"
-      ]
+      "required": ["builder", "options"]
     },
     "options": {
       "type": "object",
       "description": "Target options."
     }
   }
-}
\ No newline at end of file
+}
diff --git a/packages/angular_devkit/architect/testing/index.ts b/packages/angular_devkit/architect/testing/index.ts
index 7fa6e21ba74d..e63960f39db2 100644
--- a/packages/angular_devkit/architect/testing/index.ts
+++ b/packages/angular_devkit/architect/testing/index.ts
@@ -1,9 +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
  */
+
 export * from './testing-architect-host';
 export * from './test-project-host';
diff --git a/packages/angular_devkit/architect/testing/test-project-host.ts b/packages/angular_devkit/architect/testing/test-project-host.ts
index f8766c3a8260..b6bebbc6cfbd 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
@@ -21,7 +21,6 @@ import { Stats } from 'fs';
 import { EMPTY, Observable, from, of } from 'rxjs';
 import { concatMap, delay, finalize, map, mergeMap, retry, tap } from 'rxjs/operators';
 
-
 /**
  * @deprecated
  */
@@ -50,36 +49,38 @@ export class TestProjectHost extends NodeJsSyncHost {
   }
 
   initialize(): Observable<void> {
-    const recursiveList = (path: Path): Observable<Path> => this.list(path).pipe(
-      // Emit each fragment individually.
-      concatMap(fragments => from(fragments)),
-      // Join the path with fragment.
-      map(fragment => join(path, fragment)),
-      // Emit directory content paths instead of the directory path.
-      mergeMap(path => this.isDirectory(path).pipe(
-        concatMap(isDir => isDir ? recursiveList(path) : of(path)),
-      )),
-    );
+    const recursiveList = (path: Path): Observable<Path> =>
+      this.list(path).pipe(
+        // Emit each fragment individually.
+        concatMap((fragments) => from(fragments)),
+        // Join the path with fragment.
+        map((fragment) => join(path, fragment)),
+        // Emit directory content paths instead of the directory path.
+        mergeMap((path) =>
+          this.isDirectory(path).pipe(
+            concatMap((isDir) => (isDir ? recursiveList(path) : of(path))),
+          ),
+        ),
+      );
 
     // Find a unique folder that we can write to to use as current root.
     return this.findUniqueFolderPath().pipe(
       // Save the path and create a scoped host for it.
-      tap(newFolderPath => {
+      tap((newFolderPath) => {
         this._currentRoot = newFolderPath;
         this._scopedSyncHost = new virtualFs.SyncDelegateHost(
-          new virtualFs.ScopedHost(this, this.root()));
+          new virtualFs.ScopedHost(this, this.root()),
+        );
       }),
       // List all files in root.
       concatMap(() => recursiveList(this._templateRoot)),
       // Copy them over to the current root.
-      concatMap(from => {
+      concatMap((from) => {
         const to = join(this.root(), relative(this._templateRoot, from));
 
-        return this.read(from).pipe(
-          concatMap(buffer => this.write(to, buffer)),
-        );
+        return this.read(from).pipe(concatMap((buffer) => this.write(to, buffer)));
       }),
-      map(() => { }),
+      map(() => {}),
     );
   }
 
@@ -92,7 +93,7 @@ export class TestProjectHost extends NodeJsSyncHost {
     // Wait 50ms and retry up to 10 times, to give time for file locks to clear.
     return this.exists(this.root()).pipe(
       delay(50),
-      concatMap(exists => exists ? this.delete(this.root()) : EMPTY),
+      concatMap((exists) => (exists ? this.delete(this.root()) : EMPTY)),
       retry(10),
       finalize(() => {
         this._currentRoot = null;
@@ -102,38 +103,35 @@ export class TestProjectHost extends NodeJsSyncHost {
   }
 
   writeMultipleFiles(files: { [path: string]: string | ArrayBufferLike | Buffer }): void {
-    Object.keys(files).forEach(fileName => {
+    Object.keys(files).forEach((fileName) => {
       let content = files[fileName];
       if (typeof content == 'string') {
         content = virtualFs.stringToFileBuffer(content);
       } else if (content instanceof Buffer) {
-        content = content.buffer.slice(
-          content.byteOffset,
-          content.byteOffset + content.byteLength,
-        );
+        content = content.buffer.slice(content.byteOffset, content.byteOffset + content.byteLength);
       }
 
-      this.scopedSync().write(
-        normalize(fileName),
-        content,
-      );
+      this.scopedSync().write(normalize(fileName), content);
     });
   }
 
   replaceInFile(path: string, match: RegExp | string, replacement: string) {
     const content = virtualFs.fileBufferToString(this.scopedSync().read(normalize(path)));
-    this.scopedSync().write(normalize(path),
-      virtualFs.stringToFileBuffer(content.replace(match, replacement)));
+    this.scopedSync().write(
+      normalize(path),
+      virtualFs.stringToFileBuffer(content.replace(match, replacement)),
+    );
   }
 
   appendToFile(path: string, str: string) {
     const content = virtualFs.fileBufferToString(this.scopedSync().read(normalize(path)));
-    this.scopedSync().write(normalize(path),
-      virtualFs.stringToFileBuffer(content.concat(str)));
+    this.scopedSync().write(normalize(path), virtualFs.stringToFileBuffer(content.concat(str)));
   }
 
   fileMatchExists(dir: string, regex: RegExp): PathFragment | undefined {
-    const [fileName] = this.scopedSync().list(normalize(dir)).filter(name => name.match(regex));
+    const [fileName] = this.scopedSync()
+      .list(normalize(dir))
+      .filter((name) => name.match(regex));
 
     return fileName || undefined;
   }
@@ -150,7 +148,7 @@ export class TestProjectHost extends NodeJsSyncHost {
     const newFolderPath = join(dirname(this._templateRoot), newFolderName);
 
     return this.exists(newFolderPath).pipe(
-      concatMap(exists => exists ? this.findUniqueFolderPath() : of(newFolderPath)),
+      concatMap((exists) => (exists ? this.findUniqueFolderPath() : of(newFolderPath))),
     );
   }
 }
diff --git a/packages/angular_devkit/architect/testing/testing-architect-host.ts b/packages/angular_devkit/architect/testing/testing-architect-host.ts
index c7d901f3906b..f9eb29d14286 100644
--- a/packages/angular_devkit/architect/testing/testing-architect-host.ts
+++ b/packages/angular_devkit/architect/testing/testing-architect-host.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 { json } from '@angular-devkit/core';
 import { BuilderInfo, Target, targetStringFromTarget } from '../src';
 import { ArchitectHost, Builder } from '../src/internal';
@@ -12,7 +13,7 @@ import { ArchitectHost, Builder } from '../src/internal';
 export class TestingArchitectHost implements ArchitectHost {
   private _builderImportMap = new Map<string, Builder>();
   private _builderMap = new Map<string, BuilderInfo>();
-  private _targetMap = new Map<string, { builderName: string, options: json.JsonObject }>();
+  private _targetMap = new Map<string, { builderName: string; options: json.JsonObject }>();
 
   /**
    * Can provide a backend host, in case of integration tests.
@@ -55,7 +56,9 @@ export class TestingArchitectHost implements ArchitectHost {
     for (const builderName of Object.keys(builders)) {
       const b = builders[builderName];
       // TODO: remove this check as v1 is not supported anymore.
-      if (!b.implementation) { continue; }
+      if (!b.implementation) {
+        continue;
+      }
       const handler = (await import(builderJsonPath + '/../' + b.implementation)).default;
       const optionsSchema = await import(builderJsonPath + '/../' + b.schema);
       this.addBuilder(`${packageJson.name}:${builderName}`, handler, b.description, optionsSchema);
@@ -83,8 +86,10 @@ export class TestingArchitectHost implements ArchitectHost {
    * @returns All the info needed for the builder itself.
    */
   async resolveBuilder(builderName: string): Promise<BuilderInfo | null> {
-    return this._builderMap.get(builderName)
-        || (this._backendHost && this._backendHost.resolveBuilder(builderName));
+    return (
+      this._builderMap.get(builderName) ||
+      (this._backendHost && this._backendHost.resolveBuilder(builderName))
+    );
   }
 
   async getCurrentDirectory(): Promise<string> {
@@ -109,8 +114,9 @@ export class TestingArchitectHost implements ArchitectHost {
   }
 
   async loadBuilder(info: BuilderInfo): Promise<Builder | null> {
-    return this._builderImportMap.get(info.builderName)
-        || (this._backendHost && this._backendHost.loadBuilder(info));
+    return (
+      this._builderImportMap.get(info.builderName) ||
+      (this._backendHost && this._backendHost.loadBuilder(info))
+    );
   }
-
 }
diff --git a/packages/angular_devkit/architect_cli/bin/architect.ts b/packages/angular_devkit/architect_cli/bin/architect.ts
index cbc3983702dc..be437760b475 100644
--- a/packages/angular_devkit/architect_cli/bin/architect.ts
+++ b/packages/angular_devkit/architect_cli/bin/architect.ts
@@ -1,18 +1,19 @@
 #!/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
  */
+
 import { Architect, BuilderInfo, BuilderProgressState, Target } from '@angular-devkit/architect';
 import { WorkspaceNodeModulesArchitectHost } from '@angular-devkit/architect/node';
 import { logging, schema, tags, workspaces } from '@angular-devkit/core';
 import { NodeJsSyncHost, createConsoleLogger } from '@angular-devkit/core/node';
 import * as ansiColors from 'ansi-colors';
 import { existsSync } from 'fs';
-import * as minimist from 'minimist';
+import minimist from 'minimist';
 import * as path from 'path';
 import { tap } from 'rxjs/operators';
 import { MultiProgressBar } from '../src/progress';
@@ -91,13 +92,13 @@ async function _executeTarget(
   delete argv['help'];
   const logger = new logging.Logger('jobs');
   const logs: logging.LogEntry[] = [];
-  logger.subscribe(entry => logs.push({ ...entry, message: `${entry.name}: ` + entry.message }));
+  logger.subscribe((entry) => logs.push({ ...entry, message: `${entry.name}: ` + entry.message }));
 
   const { _, ...options } = argv;
   const run = await architect.scheduleTarget(targetSpec, options, { logger });
   const bars = new MultiProgressBar<number, BarInfo>(':name :bar (:current/:total) :status');
 
-  run.progress.subscribe(update => {
+  run.progress.subscribe((update) => {
     const data = bars.get(update.id) || {
       id: update.id,
       builder: update.builder,
@@ -141,7 +142,7 @@ async function _executeTarget(
   try {
     const { success } = await run.output
       .pipe(
-        tap(result => {
+        tap((result) => {
           if (result.success) {
             parentLogger.info(colors.green('SUCCESS'));
           } else {
@@ -150,7 +151,7 @@ async function _executeTarget(
           parentLogger.info('Result: ' + JSON.stringify({ ...result, info: undefined }, null, 4));
 
           parentLogger.info('\nLogs:');
-          logs.forEach(l => parentLogger.next(l));
+          logs.forEach((l) => parentLogger.next(l));
           logs.splice(0);
         }),
       )
@@ -163,7 +164,7 @@ async function _executeTarget(
   } catch (err) {
     parentLogger.info(colors.red('ERROR'));
     parentLogger.info('\nLogs:');
-    logs.forEach(l => parentLogger.next(l));
+    logs.forEach((l) => parentLogger.next(l));
 
     parentLogger.fatal('Exception:');
     parentLogger.fatal(err.stack);
@@ -178,11 +179,11 @@ async function main(args: string[]): Promise<number> {
 
   /** Create the DevKit Logger used through the CLI. */
   const logger = createConsoleLogger(argv['verbose'], process.stdout, process.stderr, {
-    info: s => s,
-    debug: s => s,
-    warn: s => colors.bold.yellow(s),
-    error: s => colors.bold.red(s),
-    fatal: s => colors.bold.red(s),
+    info: (s) => s,
+    debug: (s) => s,
+    warn: (s) => colors.bold.yellow(s),
+    error: (s) => colors.bold.red(s),
+    fatal: (s) => colors.bold.red(s),
   });
 
   // Check the target.
@@ -213,7 +214,7 @@ async function main(args: string[]): Promise<number> {
   registry.addPostTransform(schema.transforms.addUndefinedDefaults);
 
   // Show usage of deprecated options
-  registry.useXDeprecatedProvider(msg => logger.warn(msg));
+  registry.useXDeprecatedProvider((msg) => logger.warn(msg));
 
   const { workspace } = await workspaces.readWorkspace(
     configFilePath,
@@ -227,11 +228,11 @@ async function main(args: string[]): Promise<number> {
 }
 
 main(process.argv.slice(2)).then(
-  code => {
+  (code) => {
     process.exit(code);
   },
-  err => {
-    // tslint:disable-next-line: no-console
+  (err) => {
+    // eslint-disable-next-line no-console
     console.error('Error: ' + err.stack || err.message || err);
     process.exit(-1);
   },
diff --git a/packages/angular_devkit/architect_cli/package.json b/packages/angular_devkit/architect_cli/package.json
index e89f499857cd..8a81fe2b4bca 100644
--- a/packages/angular_devkit/architect_cli/package.json
+++ b/packages/angular_devkit/architect_cli/package.json
@@ -17,12 +17,12 @@
     "@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.7",
-    "symbol-observable": "3.0.0"
+    "symbol-observable": "4.0.0"
   },
   "devDependencies": {
-    "@types/progress": "2.0.3"
+    "@types/progress": "2.0.4"
   }
 }
diff --git a/packages/angular_devkit/architect_cli/src/progress.ts b/packages/angular_devkit/architect_cli/src/progress.ts
index f326b3571731..37329a10e22c 100644
--- a/packages/angular_devkit/architect_cli/src/progress.ts
+++ b/packages/angular_devkit/architect_cli/src/progress.ts
@@ -1,18 +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 * as ProgressBar from 'progress';
+
+import ProgressBar from 'progress';
 import * as readline from 'readline';
 
 export class MultiProgressBar<Key, T> {
-  private _bars = new Map<Key, { data: T, bar: ProgressBar }>();
+  private _bars = new Map<Key, { data: T; bar: ProgressBar }>();
 
   constructor(private _status: string, private _stream = process.stderr) {}
-  private _add(id: Key, data: T): { data: T, bar: ProgressBar } {
+  private _add(id: Key, data: T): { data: T; bar: ProgressBar } {
     const width = Math.min(80, this._stream.columns || 80);
     const value = {
       data,
@@ -73,7 +74,7 @@ export class MultiProgressBar<Key, T> {
     readline.moveCursor(stream, 0, -this._bars.size);
     readline.cursorTo(stream, 0);
 
-    let values: Iterable<{ data: T, bar: ProgressBar }> = this._bars.values();
+    let values: Iterable<{ data: T; bar: ProgressBar }> = this._bars.values();
     if (sort) {
       values = [...values].sort((a, b) => sort(a.data, b.data));
     }
diff --git a/packages/angular_devkit/benchmark/README.md b/packages/angular_devkit/benchmark/README.md
index 2b3bc8e2c20f..cf5e2cf34980 100644
--- a/packages/angular_devkit/benchmark/README.md
+++ b/packages/angular_devkit/benchmark/README.md
@@ -14,7 +14,6 @@ constant while varying the third should allow for meaningful benchmarks over tim
 In the context of the DevKit, we publish many CLI tools and have access to their source code.
 By tracking tool resource usage we can catch performance regressions or improvements on our CI.
 
-
 ## STABILITY AND SUPPORT DISCLAIMER
 
 This package is not currently stable. Usage, output and API may change at any time.
@@ -26,12 +25,12 @@ You can install the benchmark tool via `npm install -g benchmark` for a global i
 `-g` for a local install.
 Installing globally gives you access to the `benchmark` binary in your `PATH`.
 
-
 ## CLI Usage
 
 Call the `benchmark` binary, followed by options, then double dash, then the command to benchmark.
 
 For more information on the available options, run `benchmark --help`:
+
 ```
 $ benchmark --help
 [benchmark] benchmark [options] -- [command to benchmark]
@@ -46,10 +45,10 @@ Example:
     benchmark --iterations=3 -- node my-script.js
 ```
 
-
 ## Example
 
 Given the naive implementation of a fibonacci number calculator below:
+
 ```
 // fibonacci.js
 const fib = (n) => n > 1 ? fib(n - 1) + fib(n - 2) : n;
@@ -74,7 +73,7 @@ $ benchmark -- node fibonacci.js 40
 
 ## Example in watch mode
 
-`watch-script` accepts a node script when using the CLI. When using the API you can provide a `Command` instance. 
+`watch-script` accepts a node script when using the CLI. When using the API you can provide a `Command` instance.
 
 ```
 benchmark --verbose --watch-timeout 10000 --watch-matcher "Compiled successfully" --watch-script watch-script.js -- ng serve
@@ -130,4 +129,4 @@ runBenchmark({ command, command }).subscribe(results => {
 ```
 
 A good example of API usage is the `main` binary itself, found in `./src/main.ts`.
-We recommend using TypeScript to get full access to the interfaces included.
\ No newline at end of file
+We recommend using TypeScript to get full access to the interfaces included.
diff --git a/packages/angular_devkit/benchmark/package.json b/packages/angular_devkit/benchmark/package.json
index 61b77823f5ad..2cea94042a37 100644
--- a/packages/angular_devkit/benchmark/package.json
+++ b/packages/angular_devkit/benchmark/package.json
@@ -12,10 +12,10 @@
   "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.7",
     "tree-kill": "^1.2.0"
   }
-}
\ No newline at end of file
+}
diff --git a/packages/angular_devkit/benchmark/src/command.ts b/packages/angular_devkit/benchmark/src/command.ts
index 03003a0f11b1..e9d8e861080b 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
@@ -12,7 +12,7 @@ export class Command {
     public args: string[] = [],
     public cwd: string = process.cwd(),
     public expectedExitCode = 0,
-  ) { }
+  ) {}
 
   toString() {
     const { cmd, args, cwd } = this;
diff --git a/packages/angular_devkit/benchmark/src/default-reporter.ts b/packages/angular_devkit/benchmark/src/default-reporter.ts
index 9224cbe8c057..4853109f8c3c 100644
--- a/packages/angular_devkit/benchmark/src/default-reporter.ts
+++ b/packages/angular_devkit/benchmark/src/default-reporter.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 { logging, tags } from '@angular-devkit/core';
 import { AggregatedMetric, BenchmarkReporter, Metric } from './interfaces';
 
@@ -14,11 +15,15 @@ export const defaultReporter = (logger: logging.Logger): BenchmarkReporter => (p
 
   const formatMetric = (metric: Metric | AggregatedMetric) => tags.oneLine`
     ${metric.name}: ${metric.value.toFixed(2)} ${metric.unit}
-    ${metric.componentValues ? `(${metric.componentValues.map(v => v.toFixed(2)).join(', ')})` : ''}
+    ${
+      metric.componentValues
+        ? `(${metric.componentValues.map((v) => v.toFixed(2)).join(', ')})`
+        : ''
+    }
   `;
 
-  groups.forEach(group => {
+  groups.forEach((group) => {
     toplevelLogger.info(`${group.name}`);
-    group.metrics.forEach(metric => indentLogger.info(formatMetric(metric)));
+    group.metrics.forEach((metric) => indentLogger.info(formatMetric(metric)));
   });
 };
diff --git a/packages/angular_devkit/benchmark/src/default-stats-capture.ts b/packages/angular_devkit/benchmark/src/default-stats-capture.ts
index 8a733ca3d194..f4088255701a 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
@@ -11,18 +11,17 @@ import { map, reduce } from 'rxjs/operators';
 import { AggregatedProcessStats, Capture, MetricGroup } from './interfaces';
 import { cumulativeMovingAverage, max } from './utils';
 
-
 export const defaultStatsCapture: Capture = (
   stats: Observable<AggregatedProcessStats>,
 ): Observable<MetricGroup> => {
   type Accumulator = {
-    elapsed: number,
-    avgProcesses: number,
-    peakProcesses: number,
-    avgCpu: number,
-    peakCpu: number,
-    avgMemory: number,
-    peakMemory: number,
+    elapsed: number;
+    avgProcesses: number;
+    peakProcesses: number;
+    avgCpu: number;
+    peakCpu: number;
+    avgMemory: number;
+    peakMemory: number;
   };
   const seed: Accumulator = {
     elapsed: 0,
@@ -35,16 +34,19 @@ export const defaultStatsCapture: Capture = (
   };
 
   return stats.pipe(
-    reduce<AggregatedProcessStats, Accumulator>((acc, val, idx) => ({
-      elapsed: val.elapsed,
-      avgProcesses: cumulativeMovingAverage(acc.avgProcesses, val.processes, idx),
-      peakProcesses: max(acc.peakProcesses, val.processes),
-      avgCpu: cumulativeMovingAverage(acc.avgCpu, val.cpu, idx),
-      peakCpu: max(acc.peakCpu, val.cpu),
-      avgMemory: cumulativeMovingAverage(acc.avgMemory, val.memory, idx),
-      peakMemory: max(acc.peakMemory, val.memory),
-    }), seed),
-    map(metrics => ({
+    reduce<AggregatedProcessStats, Accumulator>(
+      (acc, val, idx) => ({
+        elapsed: val.elapsed,
+        avgProcesses: cumulativeMovingAverage(acc.avgProcesses, val.processes, idx),
+        peakProcesses: max(acc.peakProcesses, val.processes),
+        avgCpu: cumulativeMovingAverage(acc.avgCpu, val.cpu, idx),
+        peakCpu: max(acc.peakCpu, val.cpu),
+        avgMemory: cumulativeMovingAverage(acc.avgMemory, val.memory, idx),
+        peakMemory: max(acc.peakMemory, val.memory),
+      }),
+      seed,
+    ),
+    map((metrics) => ({
       name: 'Process Stats',
       metrics: [
         { name: 'Elapsed Time', unit: 'ms', value: metrics.elapsed },
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..baeae8e8e69f 100644
--- a/packages/angular_devkit/benchmark/src/default-stats-capture_spec.ts
+++ b/packages/angular_devkit/benchmark/src/default-stats-capture_spec.ts
@@ -1,47 +1,58 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+
 import { Observable } from 'rxjs';
 import { toArray } from 'rxjs/operators';
 import { defaultStatsCapture } from './default-stats-capture';
 import { AggregatedProcessStats } from './interfaces';
 
-
 describe('defaultStatsCapture', () => {
   it('works', async () => {
-    const stats$ = new Observable<AggregatedProcessStats>(obs => {
+    const stats$ = new Observable<AggregatedProcessStats>((obs) => {
       const ignoredStats = { ppid: 1, pid: 1, ctime: 1, timestamp: 1 };
       obs.next({
-        processes: 1, cpu: 0, memory: 10 * 1e6, elapsed: 1000,
+        processes: 1,
+        cpu: 0,
+        memory: 10 * 1e6,
+        elapsed: 1000,
         ...ignoredStats,
       });
       obs.next({
-        processes: 3, cpu: 40, memory: 2 * 1e6, elapsed: 2000,
+        processes: 3,
+        cpu: 40,
+        memory: 2 * 1e6,
+        elapsed: 2000,
         ...ignoredStats,
       });
       obs.next({
-        processes: 5, cpu: 20, memory: 3 * 1e6, elapsed: 3000,
+        processes: 5,
+        cpu: 20,
+        memory: 3 * 1e6,
+        elapsed: 3000,
         ...ignoredStats,
       });
       obs.complete();
     });
 
     const res = await defaultStatsCapture(stats$).pipe(toArray()).toPromise();
-    expect(res).toEqual([{
-      name: 'Process Stats',
-      metrics: [
-        { name: 'Elapsed Time', unit: 'ms', value: 3000 },
-        { name: 'Average Process usage', unit: 'process(es)', value: 3 },
-        { name: 'Peak Process usage', unit: 'process(es)', value: 5 },
-        { name: 'Average CPU usage', unit: '%', value: 20 },
-        { name: 'Peak CPU usage', unit: '%', value: 40 },
-        { name: 'Average Memory usage', unit: 'MB', value: 5 },
-        { name: 'Peak Memory usage', unit: 'MB', value: 10 },
-      ],
-    }]);
+    expect(res).toEqual([
+      {
+        name: 'Process Stats',
+        metrics: [
+          { name: 'Elapsed Time', unit: 'ms', value: 3000 },
+          { name: 'Average Process usage', unit: 'process(es)', value: 3 },
+          { name: 'Peak Process usage', unit: 'process(es)', value: 5 },
+          { name: 'Average CPU usage', unit: '%', value: 20 },
+          { name: 'Peak CPU usage', unit: '%', value: 40 },
+          { name: 'Average Memory usage', unit: 'MB', value: 5 },
+          { name: 'Peak Memory usage', unit: 'MB', value: 10 },
+        ],
+      },
+    ]);
   });
 });
diff --git a/packages/angular_devkit/benchmark/src/index.ts b/packages/angular_devkit/benchmark/src/index.ts
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..1908e3f22c94 100644
--- a/packages/angular_devkit/benchmark/src/interfaces.ts
+++ b/packages/angular_devkit/benchmark/src/interfaces.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 { Observable } from 'rxjs';
 import { Command } from './command';
 
@@ -53,6 +54,5 @@ export interface MetricGroup {
 
 export type Capture = (stats: Observable<AggregatedProcessStats>) => Observable<MetricGroup>;
 
-
 // TODO: might need to allow reporters to say they are finished.
 export type BenchmarkReporter = (command: Command, groups: MetricGroup[]) => void;
diff --git a/packages/angular_devkit/benchmark/src/main.ts b/packages/angular_devkit/benchmark/src/main.ts
index 96396c9bc544..25cf40ae71ec 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
@@ -11,7 +11,7 @@ import { logging, tags } from '@angular-devkit/core';
 import { ProcessOutput } from '@angular-devkit/core/node';
 import * as ansiColors from 'ansi-colors';
 import { appendFileSync, writeFileSync } from 'fs';
-import * as minimist from 'minimist';
+import minimist from 'minimist';
 import { filter, map, toArray } from 'rxjs/operators';
 import { Command } from '../src/command';
 import { defaultReporter } from '../src/default-reporter';
@@ -19,7 +19,6 @@ import { defaultStatsCapture } from '../src/default-stats-capture';
 import { runBenchmark } from '../src/run-benchmark';
 import { runBenchmarkWatch } from './run-benchmark-watch';
 
-
 export interface MainOptions {
   args: string[];
   stdout?: ProcessOutput;
@@ -31,7 +30,6 @@ export async function main({
   stdout = process.stdout,
   stderr = process.stderr,
 }: MainOptions): Promise<0 | 1> {
-
   // Show usage of the CLI tool, and exit the process.
   function usage(logger: logging.Logger) {
     logger.info(tags.stripIndent`
@@ -77,10 +75,7 @@ export async function main({
   // Parse the command line.
   const argv = minimist(args, {
     boolean: ['help', 'verbose', 'overwrite-output-file'],
-    string: [
-      'watch-matcher',
-      'watch-script',
-    ],
+    string: ['watch-matcher', 'watch-script'],
     default: {
       'exit-code': 0,
       'iterations': 5,
@@ -94,13 +89,16 @@ export async function main({
   }) as {} as BenchmarkCliArgv;
 
   // Create the DevKit Logger used through the CLI.
-  const logger = new logging.TransformLogger(
-    'benchmark-prefix-logger',
-    stream => stream.pipe(map(entry => {
-      if (argv['prefix']) { entry.message = `${argv['prefix']} ${entry.message}`; }
-
-      return entry;
-    })),
+  const logger = new logging.TransformLogger('benchmark-prefix-logger', (stream) =>
+    stream.pipe(
+      map((entry) => {
+        if (argv['prefix']) {
+          entry.message = `${argv['prefix']} ${entry.message}`;
+        }
+
+        return entry;
+      }),
+    ),
   );
 
   // Create a separate instance to prevent unintended global changes to the color configuration
@@ -108,32 +106,29 @@ export async function main({
   const colors = (ansiColors as typeof ansiColors & { create: () => typeof ansiColors }).create();
 
   // Log to console.
-  logger
-    .pipe(filter(entry => (entry.level != 'debug' || argv['verbose'])))
-    .subscribe(entry => {
-      let color: (s: string) => string = x => colors.dim.white(x);
-      let output = stdout;
-      switch (entry.level) {
-        case 'info':
-          color = s => s;
-          break;
-        case 'warn':
-          color = colors.yellow;
-          output = stderr;
-          break;
-        case 'error':
-          color = colors.red;
-          output = stderr;
-          break;
-        case 'fatal':
-          color = (x: string) => colors.bold.red(x);
-          output = stderr;
-          break;
-      }
-
-      output.write(color(entry.message) + '\n');
-    });
+  logger.pipe(filter((entry) => entry.level != 'debug' || argv['verbose'])).subscribe((entry) => {
+    let color: (s: string) => string = (x) => colors.dim.white(x);
+    let output = stdout;
+    switch (entry.level) {
+      case 'info':
+        color = (s) => s;
+        break;
+      case 'warn':
+        color = colors.yellow;
+        output = stderr;
+        break;
+      case 'error':
+        color = colors.red;
+        output = stderr;
+        break;
+      case 'fatal':
+        color = (x: string) => colors.bold.red(x);
+        output = stderr;
+        break;
+    }
 
+    output.write(color(entry.message) + '\n');
+  });
 
   // Print help.
   if (argv['help']) {
@@ -152,7 +147,7 @@ export async function main({
     'output-file': outFile,
     iterations,
     retries,
-   } = argv;
+  } = argv;
 
   // Exit early if we can't find the command to benchmark.
   if (watchMatcher && !watchScript) {
@@ -179,8 +174,9 @@ export async function main({
     if (argv['overwrite-output-file']) {
       writeFileSync(outFile, '');
     }
-    logger.pipe(filter(entry => (entry.level != 'debug' || argv['verbose'])))
-      .subscribe(entry => appendFileSync(outFile, `${entry.message}\n`));
+    logger
+      .pipe(filter((entry) => entry.level != 'debug' || argv['verbose']))
+      .subscribe((entry) => appendFileSync(outFile, `${entry.message}\n`));
   }
 
   // Run benchmark on given command, capturing stats and reporting them.
@@ -197,20 +193,24 @@ export async function main({
     let res$;
     if (watchMatcher && watchScript) {
       res$ = runBenchmarkWatch({
-        command, captures, reporters, iterations, retries, logger,
-        watchCommand: new Command('node', [watchScript]), watchMatcher, watchTimeout,
+        command,
+        captures,
+        reporters,
+        iterations,
+        retries,
+        logger,
+        watchCommand: new Command('node', [watchScript]),
+        watchMatcher,
+        watchTimeout,
       });
     } else {
-      res$ = runBenchmark(
-        { command, captures, reporters, iterations, retries, logger },
-      );
+      res$ = runBenchmark({ command, captures, reporters, iterations, retries, logger });
     }
 
     const res = await res$.pipe(toArray()).toPromise();
     if (res.length === 0) {
       return 1;
     }
-
   } catch (error) {
     if (error.message) {
       logger.fatal(error.message);
@@ -227,6 +227,8 @@ export async function main({
 if (require.main === module) {
   const args = process.argv.slice(2);
   main({ args })
-    .then(exitCode => process.exitCode = exitCode)
-    .catch(e => { throw (e); });
+    .then((exitCode) => (process.exitCode = exitCode))
+    .catch((e) => {
+      throw e;
+    });
 }
diff --git a/packages/angular_devkit/benchmark/src/main_spec.ts b/packages/angular_devkit/benchmark/src/main_spec.ts
index 61d69802f61a..3beaf32a2c15 100644
--- a/packages/angular_devkit/benchmark/src/main_spec.ts
+++ b/packages/angular_devkit/benchmark/src/main_spec.ts
@@ -1,18 +1,18 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+
 import { existsSync, readFileSync, unlinkSync, writeFileSync } from 'fs';
 import { basename, dirname, join } from 'path';
 import { main } from './main';
 
-// tslint:disable-next-line:no-implicit-dependencies
+// eslint-disable-next-line import/no-extraneous-dependencies
 const temp = require('temp');
 
-
 // We only care about the write method in these mocks of NodeJS.WriteStream.
 class MockWriteStream {
   lines: string[] = [];
@@ -39,7 +39,9 @@ describe('benchmark binary', () => {
   });
 
   afterEach(() => {
-    if (existsSync(outputFile)) { unlinkSync(outputFile); }
+    if (existsSync(outputFile)) {
+      unlinkSync(outputFile);
+    }
   });
 
   it('works', async () => {
@@ -52,8 +54,7 @@ describe('benchmark binary', () => {
   it('fails with no command', async () => {
     const args: string[] = [];
     const res = await main({ args, stdout, stderr });
-    expect(stderr.lines).toContain(
-      '[benchmark] Missing command, see benchmark --help for help.\n');
+    expect(stderr.lines).toContain('[benchmark] Missing command, see benchmark --help for help.\n');
     expect(res).toEqual(1);
   });
 
@@ -61,7 +62,8 @@ describe('benchmark binary', () => {
     const args: string[] = ['--', 'node', exitCodeOneScript];
     const res = await main({ args, stdout, stderr });
     expect(stderr.lines).toContain(
-      '[benchmark] Maximum number of retries (5) for command was exceeded.\n');
+      '[benchmark] Maximum number of retries (5) for command was exceeded.\n',
+    );
     expect(res).toEqual(1);
   });
 
@@ -91,7 +93,8 @@ describe('benchmark binary', () => {
     const args = ['--iterations', '3', '--', 'node', benchmarkScript, '30'];
     const res = await main({ args, stdout, stderr });
     expect(stdout.lines).toContain(
-      '[benchmark] Benchmarking process over 3 iterations, with up to 5 retries.\n');
+      '[benchmark] Benchmarking process over 3 iterations, with up to 5 retries.\n',
+    );
     expect(res).toEqual(0);
   });
 
@@ -99,7 +102,8 @@ describe('benchmark binary', () => {
     const args = ['--retries', '3', '--', 'node', benchmarkScript, '30'];
     const res = await main({ args, stdout, stderr });
     expect(stdout.lines).toContain(
-      '[benchmark] Benchmarking process over 5 iterations, with up to 3 retries.\n');
+      '[benchmark] Benchmarking process over 5 iterations, with up to 3 retries.\n',
+    );
     expect(res).toEqual(0);
   });
 
@@ -130,8 +134,13 @@ describe('benchmark binary', () => {
   it('overwrites output-file', async () => {
     writeFileSync(outputFile, 'existing line');
     const args = [
-      '--output-file', outputFile, '--overwrite-output-file',
-      '--', 'node', benchmarkScript, '30',
+      '--output-file',
+      outputFile,
+      '--overwrite-output-file',
+      '--',
+      'node',
+      benchmarkScript,
+      '30',
     ];
     const res = await main({ args, stdout, stderr });
     expect(res).toEqual(0);
@@ -142,7 +151,7 @@ describe('benchmark binary', () => {
   it('uses prefix', async () => {
     const args = ['--prefix', '[abc]', '--', 'node', benchmarkScript, '30'];
     const res = await main({ args, stdout, stderr });
-    stdout.lines.forEach(line => expect(line).toMatch(/^\[abc\]/));
+    stdout.lines.forEach((line) => expect(line).toMatch(/^\[abc\]/));
     expect(res).toEqual(0);
   });
 
@@ -172,7 +181,9 @@ describe('benchmark binary', () => {
       exitCodeOneScript,
     ];
     const res = await main({ args, stdout, stderr });
-    expect(stderr.lines).toContain('[benchmark] Maximum number of retries (5) for command was exceeded.\n');
+    expect(stderr.lines).toContain(
+      '[benchmark] Maximum number of retries (5) for command was exceeded.\n',
+    );
     expect(res).toEqual(1);
   });
 
diff --git a/packages/angular_devkit/benchmark/src/monitored-process.ts b/packages/angular_devkit/benchmark/src/monitored-process.ts
index a43f52dd5ea9..7a303b541e7f 100644
--- a/packages/angular_devkit/benchmark/src/monitored-process.ts
+++ b/packages/angular_devkit/benchmark/src/monitored-process.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 { SpawnOptions, spawn } from 'child_process';
-import * as pidusage from 'pidusage';
+import pidusage from 'pidusage';
 import { Observable, Subject, from, timer } from 'rxjs';
 import { concatMap, map, onErrorResumeNext, tap } from 'rxjs/operators';
 import { Command } from './command';
@@ -16,7 +17,7 @@ const pidtree = require('pidtree');
 const treeKill = require('tree-kill');
 
 // Cleanup when the parent process exits.
-const defaultProcessExitCb = () => { };
+const defaultProcessExitCb = () => {};
 let processExitCb = defaultProcessExitCb;
 process.on('exit', () => {
   processExitCb();
@@ -34,13 +35,10 @@ export class LocalMonitoredProcess implements MonitoredProcess {
   stdout$: Observable<Buffer> = this.stdout.asObservable();
   stderr$: Observable<Buffer> = this.stderr.asObservable();
 
-  constructor(
-    private command: Command,
-    private useProcessTime = true,
-  ) { }
+  constructor(private command: Command, private useProcessTime = true) {}
 
   run(): Observable<number> {
-    return new Observable(obs => {
+    return new Observable((obs) => {
       const { cmd, cwd, args } = this.command;
       const spawnOptions: SpawnOptions = { cwd, shell: true };
 
@@ -54,41 +52,44 @@ export class LocalMonitoredProcess implements MonitoredProcess {
       childProcess.stdout?.on('data', (data: Buffer) => this.stdout.next(data));
       childProcess.stderr?.on('data', (data: Buffer) => this.stderr.next(data));
 
-      const statsSubs = timer(0, this.pollingRate).pipe(
-        concatMap(() => from(pidtree(childProcess.pid, { root: true }) as Promise<number[]>)),
-        concatMap((pids: number[]) => from(pidusage(pids, { maxage: 5 * this.pollingRate }))),
-        map(statsByProcess => {
-          // Ignore the spawned shell in the total process number.
-          const pids = Object.keys(statsByProcess)
-            .filter(pid => pid != childProcess.pid.toString());
-          const processes = pids.length;
-          // We want most stats from the parent process.
-          const { pid, ppid, ctime, elapsed, timestamp } = statsByProcess[childProcess.pid];
-
-          // CPU and memory should be agreggated.
-          let cpu = 0;
-          let memory = 0;
-          for (const pid of pids) {
-            cpu += statsByProcess[pid].cpu;
-            memory += statsByProcess[pid].memory;
-          }
-
-          const stats: AggregatedProcessStats = {
-            processes,
-            cpu,
-            memory,
-            pid,
-            ppid,
-            ctime,
-            elapsed: this.useProcessTime ? elapsed : (Date.now() - this.elapsedTimer),
-            timestamp,
-          };
-
-          return stats;
-        }),
-        tap(stats => this.stats.next(stats)),
-        onErrorResumeNext(),
-      ).subscribe();
+      const statsSubs = timer(0, this.pollingRate)
+        .pipe(
+          concatMap(() => from(pidtree(childProcess.pid, { root: true }) as Promise<number[]>)),
+          concatMap((pids: number[]) => from(pidusage(pids, { maxage: 5 * this.pollingRate }))),
+          map((statsByProcess) => {
+            // Ignore the spawned shell in the total process number.
+            const pids = Object.keys(statsByProcess).filter(
+              (pid) => pid != childProcess.pid.toString(),
+            );
+            const processes = pids.length;
+            // We want most stats from the parent process.
+            const { pid, ppid, ctime, elapsed, timestamp } = statsByProcess[childProcess.pid];
+
+            // CPU and memory should be agreggated.
+            let cpu = 0;
+            let memory = 0;
+            for (const pid of pids) {
+              cpu += statsByProcess[pid].cpu;
+              memory += statsByProcess[pid].memory;
+            }
+
+            const stats: AggregatedProcessStats = {
+              processes,
+              cpu,
+              memory,
+              pid,
+              ppid,
+              ctime,
+              elapsed: this.useProcessTime ? elapsed : Date.now() - this.elapsedTimer,
+              timestamp,
+            };
+
+            return stats;
+          }),
+          tap((stats) => this.stats.next(stats)),
+          onErrorResumeNext(),
+        )
+        .subscribe();
 
       // Process event handling.
 
@@ -126,7 +127,9 @@ export class LocalMonitoredProcess implements MonitoredProcess {
 
   resetElapsedTimer() {
     if (this.useProcessTime) {
-      throw new Error(`Cannot reset elapsed timer when using process time. Set 'useProcessTime' to false.`);
+      throw new Error(
+        `Cannot reset elapsed timer when using process time. Set 'useProcessTime' to false.`,
+      );
     }
 
     this.elapsedTimer = Date.now();
diff --git a/packages/angular_devkit/benchmark/src/monitored-process_spec.ts b/packages/angular_devkit/benchmark/src/monitored-process_spec.ts
index 12757d6e8dac..ec8a1c9466e9 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
@@ -27,7 +27,7 @@ describe('LocalMonitoredProcess', () => {
   it('captures stdout', async () => {
     const process = new LocalMonitoredProcess(cmd);
     const stdoutOutput: string[] = [];
-    process.stdout$.subscribe(data => stdoutOutput.push(data.toString()));
+    process.stdout$.subscribe((data) => stdoutOutput.push(data.toString()));
     await process.run().pipe().toPromise();
     expect(stdoutOutput).toEqual(['stdout start\n', 'stdout end\n']);
   });
@@ -35,7 +35,7 @@ describe('LocalMonitoredProcess', () => {
   it('captures stderr', async () => {
     const process = new LocalMonitoredProcess(cmd);
     const stdoutOutput: string[] = [];
-    process.stderr$.subscribe(data => stdoutOutput.push(data.toString()));
+    process.stderr$.subscribe((data) => stdoutOutput.push(data.toString()));
     await process.run().pipe().toPromise();
     expect(stdoutOutput).toEqual(['stderr start\n', 'stderr end\n']);
   });
@@ -43,7 +43,7 @@ describe('LocalMonitoredProcess', () => {
   it('captures stats', async () => {
     const process = new LocalMonitoredProcess(cmd);
     const statsOutput: string[] = [];
-    process.stderr$.subscribe(data => statsOutput.push(data.toString()));
+    process.stderr$.subscribe((data) => statsOutput.push(data.toString()));
     await process.run().pipe().toPromise();
     expect(statsOutput.length).toBeGreaterThan(0);
   });
diff --git a/packages/angular_devkit/benchmark/src/run-benchmark-watch.ts b/packages/angular_devkit/benchmark/src/run-benchmark-watch.ts
index 7bd6754bea84..58c36eed0b6c 100644
--- a/packages/angular_devkit/benchmark/src/run-benchmark-watch.ts
+++ b/packages/angular_devkit/benchmark/src/run-benchmark-watch.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 { BaseException, logging } from '@angular-devkit/core';
 import { spawnSync } from 'child_process';
 import { Observable, combineLatest, forkJoin, of, throwError } from 'rxjs';
@@ -35,10 +36,16 @@ export interface RunBenchmarkWatchOptions extends RunBenchmarkOptions {
 }
 
 export function runBenchmarkWatch({
-  command, captures, reporters = [], iterations = 5, retries = 5, logger = new logging.NullLogger(),
-  watchMatcher, watchTimeout = 10000, watchCommand,
+  command,
+  captures,
+  reporters = [],
+  iterations = 5,
+  retries = 5,
+  logger = new logging.NullLogger(),
+  watchMatcher,
+  watchTimeout = 10000,
+  watchCommand,
 }: RunBenchmarkWatchOptions): Observable<MetricGroup[]> {
-
   let successfulRuns = 0;
   let failedRuns = 0;
   const debugPrefix = () => `Run #${successfulRuns + 1}:`;
@@ -49,26 +56,30 @@ export function runBenchmarkWatch({
 
   // Gather stats until the stdout contains the matched text.
   const stats$ = monitoredProcess.stats$.pipe(
-    takeUntil(monitoredProcess.stdout$.pipe(
-      first(stdout => stdout.toString().includes(watchMatcher)),
-      timeout(watchTimeout),
-    )),
+    takeUntil(
+      monitoredProcess.stdout$.pipe(
+        first((stdout) => stdout.toString().includes(watchMatcher)),
+        timeout(watchTimeout),
+      ),
+    ),
   );
 
   return combineLatest([
     monitoredProcess.run().pipe(
       startWith(undefined),
-      tap(processExitCode => {
+      tap((processExitCode) => {
         if (processExitCode !== undefined && processExitCode != command.expectedExitCode) {
-          logger.debug(`${debugPrefix()} exited with ${processExitCode} but `
-            + `${command.expectedExitCode} was expected`);
+          logger.debug(
+            `${debugPrefix()} exited with ${processExitCode} but ` +
+              `${command.expectedExitCode} was expected`,
+          );
 
           throw processFailed;
         }
       }),
     ),
     monitoredProcess.stdout$.pipe(
-      filter(stdout => stdout.toString().includes(watchMatcher)),
+      filter((stdout) => stdout.toString().includes(watchMatcher)),
       take(1),
     ),
   ]).pipe(
@@ -77,54 +88,53 @@ export function runBenchmarkWatch({
       const { cmd, cwd, args } = watchCommand;
       failedRuns = 0;
 
-      return of(null)
-        .pipe(
-          tap(() => {
-            const { status, error } = spawnSync(cmd, args, { cwd });
-            monitoredProcess.resetElapsedTimer();
+      return of(null).pipe(
+        tap(() => {
+          const { status, error } = spawnSync(cmd, args, { cwd });
+          monitoredProcess.resetElapsedTimer();
 
-            if (status != command.expectedExitCode) {
-              logger.debug(`${debugPrefix()} exited with ${status}\n${error?.message}`);
-              throw processFailed;
-            }
+          if (status != command.expectedExitCode) {
+            logger.debug(`${debugPrefix()} exited with ${status}\n${error?.message}`);
+            throw processFailed;
+          }
 
-            // Reset fail counter for this iteration.
-            failedRuns = 0;
-          }),
-          tap(() => logger.debug(`${debugPrefix()} starting`)),
-          concatMap(() => forkJoin(captures.map(capture => capture(stats$)))),
-          throwIfEmpty(() => new Error('Nothing was captured')),
-          tap(() => logger.debug(`${debugPrefix()} finished successfully`)),
-          tap(() => successfulRuns++),
-          repeat(iterations),
-          retryWhen(errors => errors
-            .pipe(concatMap(val => {
+          // Reset fail counter for this iteration.
+          failedRuns = 0;
+        }),
+        tap(() => logger.debug(`${debugPrefix()} starting`)),
+        concatMap(() => forkJoin(captures.map((capture) => capture(stats$)))),
+        throwIfEmpty(() => new Error('Nothing was captured')),
+        tap(() => logger.debug(`${debugPrefix()} finished successfully`)),
+        tap(() => successfulRuns++),
+        repeat(iterations),
+        retryWhen((errors) =>
+          errors.pipe(
+            concatMap((val) => {
               // Check if we're still within the retry threshold.
               failedRuns++;
 
               return failedRuns < retries ? of(val) : throwError(val);
-            })),
+            }),
           ),
-        );
+        ),
+      );
     }),
-    retryWhen(errors => errors
-      .pipe(concatMap(val => {
-        // Check if we're still within the retry threshold.
-        failedRuns++;
+    retryWhen((errors) =>
+      errors.pipe(
+        concatMap((val) => {
+          // Check if we're still within the retry threshold.
+          failedRuns++;
 
-        if (failedRuns < retries) {
-          return of(val);
-        }
+          if (failedRuns < retries) {
+            return of(val);
+          }
 
-        return throwError(
-          val === processFailed ?
-            new MaximumRetriesExceeded(retries) :
-            val,
-        );
-      })),
+          return throwError(val === processFailed ? new MaximumRetriesExceeded(retries) : val);
+        }),
+      ),
     ),
     take(iterations),
     reduce((acc, val) => acc.map((_, idx) => aggregateMetricGroups(acc[idx], val[idx]))),
-    tap(groups => reporters.forEach(reporter => reporter(command, groups))),
+    tap((groups) => reporters.forEach((reporter) => reporter(command, groups))),
   );
 }
diff --git a/packages/angular_devkit/benchmark/src/run-benchmark.ts b/packages/angular_devkit/benchmark/src/run-benchmark.ts
index bd551090dbd0..c15ad5e0ca0c 100644
--- a/packages/angular_devkit/benchmark/src/run-benchmark.ts
+++ b/packages/angular_devkit/benchmark/src/run-benchmark.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 { BaseException, logging } from '@angular-devkit/core';
 import { Observable, forkJoin, of, throwError } from 'rxjs';
 import { concatMap, map, retryWhen, take, tap, throwIfEmpty } from 'rxjs/operators';
@@ -30,9 +31,13 @@ export class MaximumRetriesExceeded extends BaseException {
 }
 
 export function runBenchmark({
-  command, captures, reporters = [], iterations = 5, retries = 5, logger = new logging.NullLogger(),
+  command,
+  captures,
+  reporters = [],
+  iterations = 5,
+  retries = 5,
+  logger = new logging.NullLogger(),
 }: RunBenchmarkOptions): Observable<MetricGroup[]> {
-
   let successfulRuns = 0;
   let failedRuns = 0;
   const notDoneYet = new BaseException('Not done yet.');
@@ -41,20 +46,22 @@ export function runBenchmark({
   let aggregatedMetricGroups: MetricGroup[] = [];
 
   // Run the process and captures, wait for both to finish, and average out the metrics.
-  return new Observable<[LocalMonitoredProcess, ...Observable<MetricGroup>[]]>(obs => {
+  return new Observable<[LocalMonitoredProcess, ...Observable<MetricGroup>[]]>((obs) => {
     const monitoredProcess = new LocalMonitoredProcess(command);
-    const metric$ = captures.map(capture => capture(monitoredProcess.stats$));
+    const metric$ = captures.map((capture) => capture(monitoredProcess.stats$));
     obs.next([monitoredProcess, ...metric$]);
   }).pipe(
     tap(() => logger.debug(`${debugPrefix()} starting`)),
     concatMap(([monitoredProcess, ...metric$]) => forkJoin(monitoredProcess.run(), ...metric$)),
     throwIfEmpty(() => new Error('Nothing was captured')),
-    concatMap(results => {
+    concatMap((results) => {
       const [processExitCode, ...metrics] = results;
 
       if ((processExitCode as number) != command.expectedExitCode) {
-        logger.debug(`${debugPrefix()} exited with ${processExitCode} but `
-          + `${command.expectedExitCode} was expected`);
+        logger.debug(
+          `${debugPrefix()} exited with ${processExitCode} but ` +
+            `${command.expectedExitCode} was expected`,
+        );
 
         return throwError(processFailed);
       }
@@ -63,7 +70,7 @@ export function runBenchmark({
 
       return of(metrics as MetricGroup[]);
     }),
-    map(newMetricGroups => {
+    map((newMetricGroups) => {
       // Aggregate metric groups into a single one.
       if (aggregatedMetricGroups.length === 0) {
         aggregatedMetricGroups = newMetricGroups;
@@ -77,22 +84,32 @@ export function runBenchmark({
 
       return aggregatedMetricGroups;
     }),
-    concatMap(val => successfulRuns < iterations ? throwError(notDoneYet) : of(val)),
+    concatMap((val) => (successfulRuns < iterations ? throwError(notDoneYet) : of(val))),
     // This is where we control when the process should be run again.
-    retryWhen(errors => errors.pipe(concatMap(val => {
-      // Always run again while we are not done yet.
-      if (val === notDoneYet) { return of(val); }
+    retryWhen((errors) =>
+      errors.pipe(
+        concatMap((val) => {
+          // Always run again while we are not done yet.
+          if (val === notDoneYet) {
+            return of(val);
+          }
 
-      // Otherwise check if we're still within the retry threshold.
-      failedRuns += 1;
-      if (failedRuns < retries) { return of(val); }
+          // Otherwise check if we're still within the retry threshold.
+          failedRuns += 1;
+          if (failedRuns < retries) {
+            return of(val);
+          }
 
-      if (val === processFailed) { return throwError(new MaximumRetriesExceeded(retries)); }
+          if (val === processFailed) {
+            return throwError(new MaximumRetriesExceeded(retries));
+          }
 
-      // Not really sure what happened here, just re-throw it.
-      return throwError(val);
-    }))),
-    tap(groups => reporters.forEach(reporter => reporter(command, groups))),
+          // Not really sure what happened here, just re-throw it.
+          return throwError(val);
+        }),
+      ),
+    ),
+    tap((groups) => reporters.forEach((reporter) => reporter(command, groups))),
     take(1),
   );
 }
diff --git a/packages/angular_devkit/benchmark/src/test/exit-code-one.js b/packages/angular_devkit/benchmark/src/test/exit-code-one.js
index 7b777488a01b..6cee2e1e79a1 100644
--- a/packages/angular_devkit/benchmark/src/test/exit-code-one.js
+++ b/packages/angular_devkit/benchmark/src/test/exit-code-one.js
@@ -1 +1 @@
-process.exit(1);
\ No newline at end of file
+process.exit(1);
diff --git a/packages/angular_devkit/benchmark/src/test/fibonacci.js b/packages/angular_devkit/benchmark/src/test/fibonacci.js
index 58aafbc51023..26406414d78e 100644
--- a/packages/angular_devkit/benchmark/src/test/fibonacci.js
+++ b/packages/angular_devkit/benchmark/src/test/fibonacci.js
@@ -1,2 +1,2 @@
-const fib = (n) => n > 1 ? fib(n - 1) + fib(n - 2) : n;
-console.log(fib(parseInt(process.argv[2])));
\ No newline at end of file
+const fib = (n) => (n > 1 ? fib(n - 1) + fib(n - 2) : n);
+console.log(fib(parseInt(process.argv[2])));
diff --git a/packages/angular_devkit/benchmark/src/test/test-script.js b/packages/angular_devkit/benchmark/src/test/test-script.js
index a9ad5213158e..33de59adad6a 100644
--- a/packages/angular_devkit/benchmark/src/test/test-script.js
+++ b/packages/angular_devkit/benchmark/src/test/test-script.js
@@ -1,7 +1,7 @@
-console.log("stdout start");
-console.error("stderr start");
+console.log('stdout start');
+console.error('stderr start');
 
 setTimeout(() => {
-  console.log("stdout end");
-  console.error("stderr end");
+  console.log('stdout end');
+  console.error('stderr end');
 }, 1000);
diff --git a/packages/angular_devkit/benchmark/src/utils.ts b/packages/angular_devkit/benchmark/src/utils.ts
index ea8fc36205ee..6965af613ec0 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
@@ -9,7 +9,7 @@
 import { AggregatedMetric, Metric, MetricGroup } from './interfaces';
 
 // Prefers to keep v1 when both are equal.
-export const max = (v1: number, v2: number) => v2 > v1 ? v2 : v1;
+export const max = (v1: number, v2: number) => (v2 > v1 ? v2 : v1);
 
 export const cumulativeMovingAverage = (acc: number, val: number, accSize: number) =>
   (val + accSize * acc) / (accSize + 1);
@@ -18,7 +18,7 @@ export const aggregateMetrics = (
   m1: Metric | AggregatedMetric,
   m2: Metric | AggregatedMetric,
 ): AggregatedMetric => {
-  if ((m1.name != m2.name) || (m1.unit != m2.unit)) {
+  if (m1.name != m2.name || m1.unit != m2.unit) {
     throw new Error('Cannot aggregate metrics with different names or units:');
   }
 
diff --git a/packages/angular_devkit/build_angular/BUILD.bazel b/packages/angular_devkit/build_angular/BUILD.bazel
index 2274d3635272..7f6ba8e7b34c 100644
--- a/packages/angular_devkit/build_angular/BUILD.bazel
+++ b/packages/angular_devkit/build_angular/BUILD.bazel
@@ -10,6 +10,7 @@ load("//tools:ts_json_schema.bzl", "ts_json_schema")
 # @external_begin
 load("@bazel_tools//tools/build_defs/pkg:pkg.bzl", "pkg_tar")
 load("@build_bazel_rules_nodejs//:index.bzl", "pkg_npm")
+load("@npm//@angular/dev-infra-private/bazel/api-golden:index.bzl", "api_golden_test_npm_package")
 # @external_end
 
 licenses(["notice"])  # MIT
@@ -90,6 +91,7 @@ ts_library(
         include = [
             "package.json",
             "builders.json",
+            "esbuild-check.js",
             "src/**/schema.json",
             "src/**/*.js",
             "src/**/*.html",
@@ -104,11 +106,13 @@ ts_library(
         "//packages/angular_devkit/core",
         "//packages/angular_devkit/core/node",
         "//packages/ngtools/webpack",
+        "@npm//@ampproject/remapping",
         "@npm//@angular/compiler-cli",
         "@npm//@angular/core",
         "@npm//@angular/localize",
         "@npm//@angular/service-worker",
         "@npm//@babel/core",
+        "@npm//@babel/helper-annotate-as-pure",
         "@npm//@babel/plugin-transform-runtime",
         "@npm//@babel/preset-env",
         "@npm//@babel/runtime",
@@ -121,7 +125,6 @@ ts_library(
         "@npm//@types/cacache",
         "@npm//@types/caniuse-lite",
         "@npm//@types/copy-webpack-plugin",
-        "@npm//@types/cssnano",
         "@npm//@types/find-cache-dir",
         "@npm//@types/glob",
         "@npm//@types/inquirer",
@@ -131,7 +134,7 @@ ts_library(
         "@npm//@types/node",
         "@npm//@types/parse5-html-rewriting-stream",
         "@npm//@types/postcss-preset-env",
-        "@npm//@types/rimraf",
+        "@npm//@types/sass",
         "@npm//@types/semver",
         "@npm//@types/text-table",
         "@npm//@types/webpack-dev-server",
@@ -146,12 +149,13 @@ ts_library(
         "@npm//core-js",
         "@npm//critters",
         "@npm//css-loader",
-        "@npm//cssnano",
+        "@npm//css-minimizer-webpack-plugin",
+        "@npm//esbuild",
+        "@npm//esbuild-wasm",
         "@npm//find-cache-dir",
         "@npm//glob",
         "@npm//https-proxy-agent",
         "@npm//inquirer",
-        "@npm//jest-worker",
         "@npm//karma",
         "@npm//karma-source-map-support",
         "@npm//less",
@@ -164,19 +168,17 @@ ts_library(
         "@npm//open",
         "@npm//ora",
         "@npm//parse5-html-rewriting-stream",
+        "@npm//piscina",
         "@npm//postcss",
         "@npm//postcss-import",
         "@npm//postcss-loader",
         "@npm//postcss-preset-env",
-        "@npm//raw-loader",
         "@npm//regenerator-runtime",
         "@npm//resolve-url-loader",
-        "@npm//rimraf",
         "@npm//rxjs",
         "@npm//sass",
         "@npm//sass-loader",
         "@npm//semver",
-        "@npm//source-map",
         "@npm//source-map-loader",
         "@npm//source-map-support",
         "@npm//style-loader",
@@ -186,6 +188,7 @@ ts_library(
         "@npm//terser-webpack-plugin",
         "@npm//text-table",
         "@npm//tree-kill",
+        "@npm//tslib",
         "@npm//tslint",
         "@npm//typescript",
         "@npm//webpack",
@@ -203,6 +206,7 @@ ts_library(
         include = [
             "plugins/**/*_spec.ts",
             "src/utils/**/*_spec.ts",
+            "src/babel/**/*_spec.ts",
             "src/angular-cli-files/**/*_spec.ts",
         ],
     ),
@@ -212,6 +216,7 @@ ts_library(
         ":build_angular",
         "//packages/angular_devkit/architect/testing",
         "//packages/angular_devkit/core",
+        "@npm//prettier",
         "@npm//typescript",
         "@npm//webpack",
     ],
@@ -237,6 +242,16 @@ pkg_tar(
     strip_prefix = "./npm_package",
     tags = ["manual"],
 )
+
+api_golden_test_npm_package(
+    name = "build_angular_api",
+    data = [
+        ":npm_package",
+        "//goldens:public-api",
+    ],
+    golden_dir = "angular_cli/goldens/public-api/angular_devkit/build_angular",
+    npm_package = "angular_cli/packages/angular_devkit/build_angular/npm_package",
+)
 # @external_end
 # Large build_angular specs
 
@@ -292,6 +307,8 @@ LARGE_SPECS = {
     },
     "extract-i18n": {},
     "karma": {
+        "shards": 3,
+        "size": "large",
         "extra_deps": [
             "@npm//karma",
             "@npm//karma-chrome-launcher",
@@ -337,6 +354,7 @@ LARGE_SPECS = {
             "@npm//font-awesome",
             "@npm//jquery",
             "@npm//popper.js",
+            "@npm//rxjs-7",
         ],
     },
 }
diff --git a/packages/angular_devkit/build_angular/README.md b/packages/angular_devkit/build_angular/README.md
index 1cf05e9dcc5f..43b0c9c89ac6 100644
--- a/packages/angular_devkit/build_angular/README.md
+++ b/packages/angular_devkit/build_angular/README.md
@@ -2,19 +2,20 @@
 
 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/). 
+## 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   | **Deprecated** - 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
+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.
diff --git a/packages/angular_devkit/build_angular/esbuild-check.js b/packages/angular_devkit/build_angular/esbuild-check.js
new file mode 100644
index 000000000000..10295ea96ba9
--- /dev/null
+++ b/packages/angular_devkit/build_angular/esbuild-check.js
@@ -0,0 +1,16 @@
+/**
+ * @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
+ */
+
+// If the platform does not support the native variant of esbuild, this will crash.
+// This script can then be spawned by the CLI to determine if native usage is supported.
+require('esbuild')
+  .formatMessages([], { kind: 'error ' })
+  .then(
+    () => {},
+    () => {},
+  );
diff --git a/packages/angular_devkit/build_angular/package.json b/packages/angular_devkit/build_angular/package.json
index 23d79a9b53e1..943610dec406 100644
--- a/packages/angular_devkit/build_angular/package.json
+++ b/packages/angular_devkit/build_angular/package.json
@@ -6,84 +6,89 @@
   "typings": "src/index.d.ts",
   "builders": "builders.json",
   "dependencies": {
+    "@ampproject/remapping": "1.0.1",
     "@angular-devkit/architect": "0.0.0",
     "@angular-devkit/build-optimizer": "0.0.0",
     "@angular-devkit/build-webpack": "0.0.0",
     "@angular-devkit/core": "0.0.0",
-    "@babel/core": "7.13.13",
-    "@babel/generator": "7.13.9",
-    "@babel/plugin-transform-async-to-generator": "7.13.0",
-    "@babel/plugin-transform-runtime": "7.13.10",
-    "@babel/preset-env": "7.13.12",
-    "@babel/runtime": "7.13.10",
-    "@babel/template": "7.12.13",
-    "@discoveryjs/json-ext": "0.5.2",
+    "@babel/core": "7.14.8",
+    "@babel/generator": "7.14.8",
+    "@babel/helper-annotate-as-pure": "7.14.5",
+    "@babel/plugin-proposal-async-generator-functions": "7.14.7",
+    "@babel/plugin-transform-async-to-generator": "7.14.5",
+    "@babel/plugin-transform-runtime": "7.14.5",
+    "@babel/preset-env": "7.14.8",
+    "@babel/runtime": "7.14.8",
+    "@babel/template": "7.14.5",
+    "@discoveryjs/json-ext": "0.5.3",
     "@jsdevtools/coverage-istanbul-loader": "3.0.5",
     "@ngtools/webpack": "0.0.0",
     "ansi-colors": "4.1.1",
     "babel-loader": "8.2.2",
     "browserslist": "^4.9.1",
-    "cacache": "15.0.6",
+    "cacache": "15.2.0",
     "caniuse-lite": "^1.0.30001032",
     "circular-dependency-plugin": "5.2.2",
-    "copy-webpack-plugin": "8.1.1",
-    "core-js": "3.10.1",
-    "critters": "0.0.10",
-    "css-loader": "5.2.1",
-    "cssnano": "5.0.1",
+    "copy-webpack-plugin": "9.0.1",
+    "core-js": "3.16.0",
+    "critters": "0.0.12",
+    "css-loader": "6.2.0",
+    "css-minimizer-webpack-plugin": "3.0.2",
+    "esbuild-wasm": "0.13.8",
     "find-cache-dir": "3.3.1",
-    "glob": "7.1.6",
+    "glob": "7.1.7",
     "https-proxy-agent": "5.0.0",
-    "inquirer": "8.0.0",
-    "jest-worker": "26.6.2",
+    "inquirer": "8.1.2",
     "karma-source-map-support": "1.4.0",
     "less": "4.1.1",
-    "less-loader": "8.1.0",
-    "license-webpack-plugin": "2.3.17",
+    "less-loader": "10.0.1",
+    "license-webpack-plugin": "2.3.20",
     "loader-utils": "2.0.0",
-    "mini-css-extract-plugin": "1.4.1",
+    "mini-css-extract-plugin": "2.4.2",
     "minimatch": "3.0.4",
-    "open": "8.0.5",
-    "ora": "5.4.0",
+    "open": "8.2.1",
+    "ora": "5.4.1",
     "parse5-html-rewriting-stream": "6.0.1",
-    "postcss": "8.2.10",
-    "postcss-import": "14.0.1",
-    "postcss-loader": "5.2.0",
+    "piscina": "3.1.0",
+    "postcss": "8.3.6",
+    "postcss-import": "14.0.2",
+    "postcss-loader": "6.1.1",
     "postcss-preset-env": "6.7.0",
-    "raw-loader": "4.0.2",
-    "regenerator-runtime": "0.13.7",
-    "resolve-url-loader": "3.1.2",
-    "rimraf": "3.0.2",
+    "regenerator-runtime": "0.13.9",
+    "resolve-url-loader": "4.0.0",
     "rxjs": "6.6.7",
-    "sass": "1.32.8",
-    "sass-loader": "11.0.1",
+    "sass": "1.36.0",
+    "sass-loader": "12.1.0",
     "semver": "7.3.5",
-    "source-map": "0.7.3",
-    "source-map-loader": "1.1.3",
+    "source-map-loader": "3.0.0",
     "source-map-support": "0.5.19",
-    "style-loader": "2.0.0",
+    "style-loader": "3.2.1",
     "stylus": "0.54.8",
-    "stylus-loader": "4.3.3",
-    "terser": "5.6.1",
-    "terser-webpack-plugin": "4.2.3",
+    "stylus-loader": "6.1.0",
+    "terser": "5.14.2",
+    "terser-webpack-plugin": "5.1.4",
     "text-table": "0.2.0",
     "tree-kill": "1.2.2",
-    "webpack": "5.32.0",
-    "webpack-dev-middleware": "4.1.0",
-    "webpack-dev-server": "3.11.2",
-    "webpack-merge": "5.7.3",
+    "tslib": "2.3.0",
+    "webpack": "5.50.0",
+    "webpack-dev-middleware": "5.0.0",
+    "webpack-dev-server": "3.11.3",
+    "webpack-merge": "5.8.0",
     "webpack-subresource-integrity": "1.5.2"
   },
+  "optionalDependencies": {
+    "esbuild": "0.13.8"
+  },
   "peerDependencies": {
-    "@angular/compiler-cli": "^12.0.0-next",
-    "@angular/localize": "^12.0.0-next",
-    "@angular/service-worker": "^12.0.0-next",
+    "@angular/compiler-cli": "^12.0.0",
+    "@angular/localize": "^12.0.0",
+    "@angular/service-worker": "^12.0.0",
     "karma": "^6.3.0",
-    "ng-packagr": "^12.0.0-next",
+    "ng-packagr": "^12.0.0",
     "protractor": "^7.0.0",
     "tailwindcss": "^2.0.0",
     "tslint": "^6.1.0",
-    "typescript": "~4.2.3"
+    "typescript": "~4.2.3 || ~4.3.2"
   },
   "peerDependenciesMeta": {
     "@angular/localize": {
diff --git a/packages/angular_devkit/build_angular/plugins/karma.ts b/packages/angular_devkit/build_angular/plugins/karma.ts
index 0ba9afada7de..18409cffe9a9 100644
--- a/packages/angular_devkit/build_angular/plugins/karma.ts
+++ b/packages/angular_devkit/build_angular/plugins/karma.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed 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/app-shell/app-shell_spec.ts b/packages/angular_devkit/build_angular/src/app-shell/app-shell_spec.ts
index 0028a0c25318..9cb4ba83c76c 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,14 +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
  */
-// tslint:disable:no-big-function
+
 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 express from 'express'; // eslint-disable-line import/no-extraneous-dependencies
 import * as http from 'http';
 import { AddressInfo } from 'net';
 import { createArchitect, host } from '../test-utils';
@@ -127,9 +127,13 @@ describe('AppShell Builder', () => {
   };
 
   it('works (basic)', async () => {
-    host.replaceInFile('src/app/app.module.ts', /    BrowserModule/, `
+    host.replaceInFile(
+      'src/app/app.module.ts',
+      / {4}BrowserModule/,
+      `
       BrowserModule.withServerTransition({ appId: 'some-app' })
-    `);
+    `,
+    );
 
     const run = await architect.scheduleTarget(target);
     const output = await run.result;
@@ -290,7 +294,9 @@ describe('AppShell Builder', () => {
     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'">/);
+    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 408e3018d22e..71dc853fec82 100644
--- a/packages/angular_devkit/build_angular/src/app-shell/index.ts
+++ b/packages/angular_devkit/build_angular/src/app-shell/index.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 {
   BuilderContext,
   BuilderOutput,
@@ -32,14 +33,14 @@ async function _renderUniversal(
 ): Promise<BrowserBuilderOutput> {
   // Get browser target options.
   const browserTarget = targetFromTargetString(options.browserTarget);
-  const rawBrowserOptions = (await context.getTargetOptions(browserTarget)) as JsonObject & BrowserBuilderSchema;
+  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] });
@@ -51,34 +52,36 @@ async function _renderUniversal(
   }
 
   const projectMetadata = await context.getProjectMetadata(projectName);
-  const projectRoot = resolve(
-    normalize(root),
-    normalize((projectMetadata.root as string) || ''),
-  );
+  const projectRoot = resolve(normalize(root), normalize((projectMetadata.root as string) || ''));
 
   const { styles } = normalizeOptimization(browserOptions.optimization);
   const inlineCriticalCssProcessor = styles.inlineCritical
     ? new InlineCriticalCssProcessor({
-      minify: styles.minify,
-      deployUrl: browserOptions.deployUrl,
-    })
+        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 = await fs.promises.readFile(browserIndexOutputPath, 'utf8');
-    const serverBundlePath = await _getServerModuleBundlePath(options, context, serverResult, localeDirectory);
+    const serverBundlePath = await _getServerModuleBundlePath(
+      options,
+      context,
+      serverResult,
+      localeDirectory,
+    );
 
-    const {
-      AppServerModule,
-      renderModule,
-    } = await import(serverBundlePath);
+    const { AppServerModule, renderModule } = await import(serverBundlePath);
 
-    const renderModuleFn: ((module: unknown, options: {}) => Promise<string>) | undefined = renderModule;
+    const renderModuleFn: ((module: unknown, options: {}) => Promise<string>) | undefined =
+      renderModule;
 
     if (!(renderModuleFn && AppServerModule)) {
-      throw new Error(`renderModule method and/or AppServerModule were not exported from: ${serverBundlePath}.`);
+      throw new Error(
+        `renderModule method and/or AppServerModule were not exported from: ${serverBundlePath}.`,
+      );
     }
 
     // Load platform server module renderer
@@ -94,13 +97,15 @@ async function _renderUniversal(
       : browserIndexOutputPath;
 
     if (inlineCriticalCssProcessor) {
-      const { content, warnings, errors } = await inlineCriticalCssProcessor.process(html, { outputPath });
+      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));
+        warnings.forEach((m) => context.logger.warn(m));
+        errors.forEach((m) => context.logger.error(m));
         spinner.start();
       }
     }
@@ -139,7 +144,7 @@ async function _getServerModuleBundlePath(
   }
 
   const re = /^main\.(?:[a-zA-Z0-9]{20}\.)?js$/;
-  const maybeMain = fs.readdirSync(outputPath).find(x => re.test(x));
+  const maybeMain = fs.readdirSync(outputPath).find((x) => re.test(x));
 
   if (!maybeMain) {
     throw new Error('Could not find the main bundle.');
@@ -157,7 +162,8 @@ 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 browserOptions = (await context.getTargetOptions(browserTarget)) as JsonObject &
+    BrowserBuilderSchema;
 
   const optimization = normalizeOptimization(browserOptions.optimization);
   optimization.styles.inlineCritical = false;
@@ -165,7 +171,7 @@ async function _appShellBuilder(
   const browserTargetRun = await context.scheduleTarget(browserTarget, {
     watch: false,
     serviceWorker: false,
-    optimization: (optimization as unknown as JsonObject),
+    optimization: optimization as unknown as JsonObject,
   });
   const serverTargetRun = await context.scheduleTarget(serverTarget, {
     watch: false,
@@ -175,8 +181,8 @@ async function _appShellBuilder(
 
   try {
     const [browserResult, serverResult] = await Promise.all([
-      browserTargetRun.result as unknown as BrowserBuilderOutput,
-      serverTargetRun.result as unknown as ServerBuilderOutput,
+      browserTargetRun.result as Promise<BrowserBuilderOutput>,
+      serverTargetRun.result as Promise<ServerBuilderOutput>,
     ]);
 
     if (browserResult.success === false || browserResult.baseOutputPath === undefined) {
@@ -196,7 +202,6 @@ async function _appShellBuilder(
 
     return { success: false, error: err.message };
   } finally {
-    // Just be good citizens and stop those jobs.
     await Promise.all([browserTargetRun.stop(), serverTargetRun.stop()]);
   }
 }
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 3adcc32a7521..9ea17e4f5120 100644
--- a/packages/angular_devkit/build_angular/src/app-shell/schema.json
+++ b/packages/angular_devkit/build_angular/src/app-shell/schema.json
@@ -33,8 +33,5 @@
     }
   },
   "additionalProperties": false,
-  "required": [
-    "browserTarget",
-    "serverTarget"
-  ]
+  "required": ["browserTarget", "serverTarget"]
 }
diff --git a/packages/angular_devkit/build_angular/src/babel-bazel.d.ts b/packages/angular_devkit/build_angular/src/babel-bazel.d.ts
index 9a5d06cfa771..f52defff2b1e 100644
--- a/packages/angular_devkit/build_angular/src/babel-bazel.d.ts
+++ b/packages/angular_devkit/build_angular/src/babel-bazel.d.ts
@@ -1,11 +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
  */
 
+/* eslint-disable import/no-extraneous-dependencies */
 // 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' {
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
index 5a408783788d..49fbff8b8344 100644
--- a/packages/angular_devkit/build_angular/src/babel/babel-loader.d.ts
+++ b/packages/angular_devkit/build_angular/src/babel/babel-loader.d.ts
@@ -1,14 +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
  */
+
 declare module 'babel-loader' {
-  type BabelLoaderCustomizer<T> = (
-    babel: typeof import('@babel/core'),
-  ) => {
+  type BabelLoaderCustomizer<T> = (babel: typeof import('@babel/core')) => {
     customOptions?(
       this: import('webpack').loader.LoaderContext,
       loaderOptions: Record<string, unknown>,
@@ -19,6 +18,17 @@ declare module 'babel-loader' {
       configuration: import('@babel/core').PartialConfig,
       loaderArguments: { source: string; map?: unknown; customOptions: T },
     ): import('@babel/core').TransformOptions;
+    result?(
+      this: import('webpack').loader.LoaderContext,
+      result: import('@babel/core').BabelFileResult,
+      context: {
+        source: string;
+        map?: unknown;
+        customOptions: T;
+        configuration: import('@babel/core').PartialConfig;
+        options: import('@babel/core').TransformOptions;
+      },
+    ): import('@babel/core').BabelFileResult;
   };
   function custom<T>(customizer: BabelLoaderCustomizer<T>): import('webpack').loader.Loader;
 }
diff --git a/packages/angular_devkit/build_angular/src/babel/plugins/adjust-static-class-members.ts b/packages/angular_devkit/build_angular/src/babel/plugins/adjust-static-class-members.ts
new file mode 100644
index 000000000000..5c451970c655
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/babel/plugins/adjust-static-class-members.ts
@@ -0,0 +1,330 @@
+/**
+ * @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 { NodePath, PluginObj, PluginPass, types } from '@babel/core';
+import annotateAsPure from '@babel/helper-annotate-as-pure';
+
+/**
+ * The name of the Typescript decorator helper function created by the TypeScript compiler.
+ */
+const TSLIB_DECORATE_HELPER_NAME = '__decorate';
+
+/**
+ * The set of Angular static fields that should always be wrapped.
+ * These fields may appear to have side effects but are safe to remove if the associated class
+ * is otherwise unused within the output.
+ */
+const angularStaticsToWrap = new Set([
+  'ɵcmp',
+  'ɵdir',
+  'ɵfac',
+  'ɵinj',
+  'ɵmod',
+  'ɵpipe',
+  'ɵprov',
+  'INJECTOR_KEY',
+]);
+
+/**
+ * An object map of static fields and related value checks for discovery of Angular generated
+ * JIT related static fields.
+ */
+const angularStaticsToElide: Record<string, (path: NodePath<types.Expression>) => boolean> = {
+  'ctorParameters'(path) {
+    return path.isFunctionExpression() || path.isArrowFunctionExpression();
+  },
+  'decorators'(path) {
+    return path.isArrayExpression();
+  },
+  'propDecorators'(path) {
+    return path.isObjectExpression();
+  },
+};
+
+/**
+ * Provides one or more keywords that if found within the content of a source file indicate
+ * that this plugin should be used with a source file.
+ *
+ * @returns An a string iterable containing one or more keywords.
+ */
+export function getKeywords(): Iterable<string> {
+  return ['class'];
+}
+
+/**
+ * Determines whether a property and its initializer value can be safely wrapped in a pure
+ * annotated IIFE. Values that may cause side effects are not considered safe to wrap.
+ * Wrapping such values may cause runtime errors and/or incorrect runtime behavior.
+ *
+ * @param propertyName The name of the property to analyze.
+ * @param assignmentValue The initializer value that will be assigned to the property.
+ * @returns If the property can be safely wrapped, then true; otherwise, false.
+ */
+function canWrapProperty(propertyName: string, assignmentValue: NodePath): boolean {
+  if (angularStaticsToWrap.has(propertyName)) {
+    return true;
+  }
+
+  const { leadingComments } = assignmentValue.node as { leadingComments?: { value: string }[] };
+  if (
+    leadingComments?.some(
+      // `@pureOrBreakMyCode` is used by closure and is present in Angular code
+      ({ value }) =>
+        value.includes('@__PURE__') ||
+        value.includes('#__PURE__') ||
+        value.includes('@pureOrBreakMyCode'),
+    )
+  ) {
+    return true;
+  }
+
+  return assignmentValue.isPure();
+}
+
+/**
+ * Analyze the sibling nodes of a class to determine if any downlevel elements should be
+ * wrapped in a pure annotated IIFE. Also determines if any elements have potential side
+ * effects.
+ *
+ * @param origin The starting NodePath location for analyzing siblings.
+ * @param classIdentifier The identifier node that represents the name of the class.
+ * @param allowWrappingDecorators Whether to allow decorators to be wrapped.
+ * @returns An object containing the results of the analysis.
+ */
+function analyzeClassSiblings(
+  origin: NodePath,
+  classIdentifier: types.Identifier,
+  allowWrappingDecorators: boolean,
+): { hasPotentialSideEffects: boolean; wrapStatementPaths: NodePath<types.Statement>[] } {
+  const wrapStatementPaths: NodePath<types.Statement>[] = [];
+  let hasPotentialSideEffects = false;
+  for (let i = 1; ; ++i) {
+    const nextStatement = origin.getSibling(+origin.key + i);
+    if (!nextStatement.isExpressionStatement()) {
+      break;
+    }
+
+    // Valid sibling statements for class declarations are only assignment expressions
+    // and TypeScript decorator helper call expressions
+    const nextExpression = nextStatement.get('expression');
+    if (nextExpression.isCallExpression()) {
+      if (
+        !types.isIdentifier(nextExpression.node.callee) ||
+        nextExpression.node.callee.name !== TSLIB_DECORATE_HELPER_NAME
+      ) {
+        break;
+      }
+
+      if (allowWrappingDecorators) {
+        wrapStatementPaths.push(nextStatement);
+      } else {
+        // Statement cannot be safely wrapped which makes wrapping the class unneeded.
+        // The statement will prevent even a wrapped class from being optimized away.
+        hasPotentialSideEffects = true;
+      }
+
+      continue;
+    } else if (!nextExpression.isAssignmentExpression()) {
+      break;
+    }
+
+    // Valid assignment expressions should be member access expressions using the class
+    // name as the object and an identifier as the property for static fields or only
+    // the class name for decorators.
+    const left = nextExpression.get('left');
+    if (left.isIdentifier()) {
+      if (
+        !left.scope.bindingIdentifierEquals(left.node.name, classIdentifier) ||
+        !types.isCallExpression(nextExpression.node.right) ||
+        !types.isIdentifier(nextExpression.node.right.callee) ||
+        nextExpression.node.right.callee.name !== TSLIB_DECORATE_HELPER_NAME
+      ) {
+        break;
+      }
+
+      if (allowWrappingDecorators) {
+        wrapStatementPaths.push(nextStatement);
+      } else {
+        // Statement cannot be safely wrapped which makes wrapping the class unneeded.
+        // The statement will prevent even a wrapped class from being optimized away.
+        hasPotentialSideEffects = true;
+      }
+
+      continue;
+    } else if (
+      !left.isMemberExpression() ||
+      !types.isIdentifier(left.node.object) ||
+      !left.scope.bindingIdentifierEquals(left.node.object.name, classIdentifier) ||
+      !types.isIdentifier(left.node.property)
+    ) {
+      break;
+    }
+
+    const propertyName = left.node.property.name;
+    const assignmentValue = nextExpression.get('right');
+    if (angularStaticsToElide[propertyName]?.(assignmentValue)) {
+      nextStatement.remove();
+      --i;
+    } else if (canWrapProperty(propertyName, assignmentValue)) {
+      wrapStatementPaths.push(nextStatement);
+    } else {
+      // Statement cannot be safely wrapped which makes wrapping the class unneeded.
+      // The statement will prevent even a wrapped class from being optimized away.
+      hasPotentialSideEffects = true;
+    }
+  }
+
+  return { hasPotentialSideEffects, wrapStatementPaths };
+}
+
+/**
+ * The set of classed already visited and analyzed during the plugin's execution.
+ * This is used to prevent adjusted classes from being repeatedly analyzed which can lead
+ * to an infinite loop.
+ */
+const visitedClasses = new WeakSet<types.Class>();
+
+/**
+ * A babel plugin factory function for adjusting classes; primarily with Angular metadata.
+ * The adjustments include wrapping classes with known safe or no side effects with pure
+ * annotations to support dead code removal of unused classes. Angular compiler generated
+ * metadata static fields not required in AOT mode are also elided to better support bundler-
+ * level treeshaking.
+ *
+ * @returns A babel plugin object instance.
+ */
+export default function (): PluginObj {
+  return {
+    visitor: {
+      ClassDeclaration(path: NodePath<types.ClassDeclaration>, state: PluginPass) {
+        const { node: classNode, parentPath } = path;
+        const { wrapDecorators } = state.opts as { wrapDecorators: boolean };
+
+        if (visitedClasses.has(classNode)) {
+          return;
+        }
+
+        // Analyze sibling statements for elements of the class that were downleveled
+        const hasExport =
+          parentPath.isExportNamedDeclaration() || parentPath.isExportDefaultDeclaration();
+        const origin = hasExport ? parentPath : path;
+        const { wrapStatementPaths, hasPotentialSideEffects } = analyzeClassSiblings(
+          origin,
+          classNode.id,
+          wrapDecorators,
+        );
+
+        visitedClasses.add(classNode);
+
+        if (hasPotentialSideEffects || wrapStatementPaths.length === 0) {
+          return;
+        }
+
+        const wrapStatementNodes: types.Statement[] = [];
+        for (const statementPath of wrapStatementPaths) {
+          wrapStatementNodes.push(statementPath.node);
+          statementPath.remove();
+        }
+
+        // Wrap class and safe static assignments in a pure annotated IIFE
+        const container = types.arrowFunctionExpression(
+          [],
+          types.blockStatement([
+            classNode,
+            ...wrapStatementNodes,
+            types.returnStatement(types.cloneNode(classNode.id)),
+          ]),
+        );
+        const replacementInitializer = types.callExpression(
+          types.parenthesizedExpression(container),
+          [],
+        );
+        annotateAsPure(replacementInitializer);
+
+        // Replace class with IIFE wrapped class
+        const declaration = types.variableDeclaration('let', [
+          types.variableDeclarator(types.cloneNode(classNode.id), replacementInitializer),
+        ]);
+        if (parentPath.isExportDefaultDeclaration()) {
+          // When converted to a variable declaration, the default export must be moved
+          // to a subsequent statement to prevent a JavaScript syntax error.
+          parentPath.replaceWithMultiple([
+            declaration,
+            types.exportNamedDeclaration(undefined, [
+              types.exportSpecifier(types.cloneNode(classNode.id), types.identifier('default')),
+            ]),
+          ]);
+        } else {
+          path.replaceWith(declaration);
+        }
+      },
+      ClassExpression(path: NodePath<types.ClassExpression>, state: PluginPass) {
+        const { node: classNode, parentPath } = path;
+        const { wrapDecorators } = state.opts as { wrapDecorators: boolean };
+
+        // Class expressions are used by TypeScript to represent downlevel class/constructor decorators.
+        // If not wrapping decorators, they do not need to be processed.
+        if (!wrapDecorators || visitedClasses.has(classNode)) {
+          return;
+        }
+
+        if (
+          !classNode.id ||
+          !parentPath.isVariableDeclarator() ||
+          !types.isIdentifier(parentPath.node.id) ||
+          parentPath.node.id.name !== classNode.id.name
+        ) {
+          return;
+        }
+
+        const origin = parentPath.parentPath;
+        if (!origin.isVariableDeclaration() || origin.node.declarations.length !== 1) {
+          return;
+        }
+
+        const { wrapStatementPaths, hasPotentialSideEffects } = analyzeClassSiblings(
+          origin,
+          parentPath.node.id,
+          wrapDecorators,
+        );
+
+        visitedClasses.add(classNode);
+
+        if (hasPotentialSideEffects || wrapStatementPaths.length === 0) {
+          return;
+        }
+
+        const wrapStatementNodes: types.Statement[] = [];
+        for (const statementPath of wrapStatementPaths) {
+          wrapStatementNodes.push(statementPath.node);
+          statementPath.remove();
+        }
+
+        // Wrap class and safe static assignments in a pure annotated IIFE
+        const container = types.arrowFunctionExpression(
+          [],
+          types.blockStatement([
+            types.variableDeclaration('let', [
+              types.variableDeclarator(types.cloneNode(classNode.id), classNode),
+            ]),
+            ...wrapStatementNodes,
+            types.returnStatement(types.cloneNode(classNode.id)),
+          ]),
+        );
+        const replacementInitializer = types.callExpression(
+          types.parenthesizedExpression(container),
+          [],
+        );
+        annotateAsPure(replacementInitializer);
+
+        // Add the wrapped class directly to the variable declaration
+        parentPath.get('init').replaceWith(replacementInitializer);
+      },
+    },
+  };
+}
diff --git a/packages/angular_devkit/build_angular/src/babel/plugins/adjust-static-class-members_spec.ts b/packages/angular_devkit/build_angular/src/babel/plugins/adjust-static-class-members_spec.ts
new file mode 100644
index 000000000000..e58c1818fbec
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/babel/plugins/adjust-static-class-members_spec.ts
@@ -0,0 +1,680 @@
+/**
+ * @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 { transform } from '@babel/core';
+import { default as adjustStaticClassMembers } from './adjust-static-class-members';
+
+// eslint-disable-next-line import/no-extraneous-dependencies
+const prettier = require('prettier');
+
+function testCase({
+  input,
+  expected,
+  options,
+}: {
+  input: string;
+  expected: string;
+  options?: { wrapDecorators?: boolean };
+}): void {
+  const result = transform(input, {
+    configFile: false,
+    babelrc: false,
+    plugins: [[adjustStaticClassMembers, options]],
+  });
+  if (!result) {
+    fail('Expected babel to return a transform result.');
+  } else {
+    expect(prettier.format(result.code, { parser: 'babel' })).toEqual(
+      prettier.format(expected, { parser: 'babel' }),
+    );
+  }
+}
+
+function testCaseNoChange(input: string, options?: { wrapDecorators?: boolean }): void {
+  testCase({ input, expected: input, options });
+}
+
+describe('adjust-static-class-members Babel plugin', () => {
+  it('elides empty ctorParameters function expression static field', () => {
+    testCase({
+      input: `
+        export class SomeClass {}
+        SomeClass.ctorParameters = function () { return []; };
+      `,
+      expected: 'export class SomeClass {}',
+    });
+  });
+
+  it('elides non-empty ctorParameters function expression static field', () => {
+    testCase({
+      input: `
+        export class SomeClass {}
+        SomeClass.ctorParameters = function () { return [{type: Injector}]; };
+      `,
+      expected: 'export class SomeClass {}',
+    });
+  });
+
+  it('elides empty ctorParameters arrow expression static field', () => {
+    testCase({
+      input: `
+        export class SomeClass {}
+        SomeClass.ctorParameters = () => [];
+      `,
+      expected: 'export class SomeClass {}',
+    });
+  });
+
+  it('elides non-empty ctorParameters arrow expression static field', () => {
+    testCase({
+      input: `
+        export class SomeClass {}
+        SomeClass.ctorParameters = () => [{type: Injector}];
+      `,
+      expected: 'export class SomeClass {}',
+    });
+  });
+
+  it('keeps ctorParameters static field without arrow/function expression', () => {
+    testCase({
+      input: `
+        export class SomeClass {}
+        SomeClass.ctorParameters = 42;
+      `,
+      expected: `
+        export let SomeClass = /*#__PURE__*/ (() => {
+          class SomeClass {}
+
+          SomeClass.ctorParameters = 42;
+          return SomeClass;
+        })();
+      `,
+    });
+  });
+
+  it('elides empty decorators static field with array literal', () => {
+    testCase({
+      input: `
+        export class SomeClass {}
+        SomeClass.decorators = [];
+      `,
+      expected: 'export class SomeClass {}',
+    });
+  });
+
+  it('elides non-empty decorators static field with array literal', () => {
+    testCase({
+      input: `
+        export class SomeClass {}
+        SomeClass.decorators = [{ type: Injectable }];
+      `,
+      expected: 'export class SomeClass {}',
+    });
+  });
+
+  it('keeps decorators static field without array literal', () => {
+    testCase({
+      input: `
+        export class SomeClass {}
+        SomeClass.decorators = 42;
+      `,
+      expected: `
+        export let SomeClass = /*#__PURE__*/ (() => {
+          class SomeClass {}
+
+          SomeClass.decorators = 42;
+          return SomeClass;
+        })();
+      `,
+    });
+  });
+
+  it('elides empty propDecorators static field with object literal', () => {
+    testCase({
+      input: `
+        export class SomeClass {}
+        SomeClass.propDecorators = {};
+      `,
+      expected: 'export class SomeClass {}',
+    });
+  });
+
+  it('elides non-empty propDecorators static field with object literal', () => {
+    testCase({
+      input: `
+        export class SomeClass {}
+        SomeClass.propDecorators = { 'ngIf': [{ type: Input }] };
+      `,
+      expected: 'export class SomeClass {}',
+    });
+  });
+
+  it('keeps propDecorators static field without object literal', () => {
+    testCase({
+      input: `
+        export class SomeClass {}
+        SomeClass.propDecorators = 42;
+      `,
+      expected: `
+        export let SomeClass = /*#__PURE__*/ (() => {
+          class SomeClass {}
+
+          SomeClass.propDecorators = 42;
+          return SomeClass;
+        })();
+      `,
+    });
+  });
+
+  it('does not wrap default exported class with no connected siblings', () => {
+    testCaseNoChange(`
+      export default class CustomComponentEffects {
+        constructor(_actions) {
+          this._actions = _actions;
+          this.doThis = this._actions;
+        }
+      }
+    `);
+  });
+
+  it('does wrap not default exported class with only side effect fields', () => {
+    testCaseNoChange(`
+      export default class CustomComponentEffects {
+        constructor(_actions) {
+          this._actions = _actions;
+          this.doThis = this._actions;
+        }
+      }
+      CustomComponentEffects.someFieldWithSideEffects = console.log('foo');
+    `);
+  });
+
+  it('does wrap not class with only side effect fields', () => {
+    testCaseNoChange(`
+      class CustomComponentEffects {
+        constructor(_actions) {
+          this._actions = _actions;
+          this.doThis = this._actions;
+        }
+      }
+
+      CustomComponentEffects.someFieldWithSideEffects = console.log('foo');
+    `);
+  });
+
+  it('wraps class with pure annotated side effect fields (#__PURE__)', () => {
+    testCase({
+      input: `
+        class CustomComponentEffects {
+          constructor(_actions) {
+            this._actions = _actions;
+            this.doThis = this._actions;
+          }
+        }
+        CustomComponentEffects.someFieldWithSideEffects = /*#__PURE__*/ console.log('foo');
+      `,
+      expected: `
+        let CustomComponentEffects = /*#__PURE__*/ (() => {
+          class CustomComponentEffects {
+            constructor(_actions) {
+              this._actions = _actions;
+              this.doThis = this._actions;
+            }
+          }
+
+          CustomComponentEffects.someFieldWithSideEffects = /*#__PURE__*/ console.log('foo');
+          return CustomComponentEffects;
+        })();
+      `,
+    });
+  });
+
+  it('wraps class with pure annotated side effect fields (@__PURE__)', () => {
+    testCase({
+      input: `
+        class CustomComponentEffects {
+          constructor(_actions) {
+            this._actions = _actions;
+            this.doThis = this._actions;
+          }
+        }
+        CustomComponentEffects.someFieldWithSideEffects = /*@__PURE__*/ console.log('foo');
+      `,
+      expected: `
+        let CustomComponentEffects = /*#__PURE__*/ (() => {
+          class CustomComponentEffects {
+            constructor(_actions) {
+              this._actions = _actions;
+              this.doThis = this._actions;
+            }
+          }
+
+          CustomComponentEffects.someFieldWithSideEffects = /*@__PURE__*/ console.log('foo');
+          return CustomComponentEffects;
+        })();
+      `,
+    });
+  });
+
+  it('wraps class with pure annotated side effect fields (@pureOrBreakMyCode)', () => {
+    testCase({
+      input: `
+        class CustomComponentEffects {
+          constructor(_actions) {
+            this._actions = _actions;
+            this.doThis = this._actions;
+          }
+        }
+        CustomComponentEffects.someFieldWithSideEffects = /**@pureOrBreakMyCode*/ console.log('foo');
+      `,
+      expected: `
+        let CustomComponentEffects = /*#__PURE__*/ (() => {
+          class CustomComponentEffects {
+            constructor(_actions) {
+              this._actions = _actions;
+              this.doThis = this._actions;
+            }
+          }
+
+          CustomComponentEffects.someFieldWithSideEffects =
+            /**@pureOrBreakMyCode*/
+            console.log('foo');
+          return CustomComponentEffects;
+        })();
+      `,
+    });
+  });
+
+  it('wraps class with closure pure annotated side effect fields', () => {
+    testCase({
+      input: `
+        class CustomComponentEffects {
+          constructor(_actions) {
+            this._actions = _actions;
+            this.doThis = this._actions;
+          }
+        }
+        CustomComponentEffects.someFieldWithSideEffects = /* @pureOrBreakMyCode */ console.log('foo');
+      `,
+      expected: `
+        let CustomComponentEffects = /*#__PURE__*/ (() => {
+          class CustomComponentEffects {
+            constructor(_actions) {
+              this._actions = _actions;
+              this.doThis = this._actions;
+            }
+          }
+
+          CustomComponentEffects.someFieldWithSideEffects =
+            /* @pureOrBreakMyCode */
+            console.log('foo');
+          return CustomComponentEffects;
+        })();
+      `,
+    });
+  });
+
+  it('wraps exported class with a pure static field', () => {
+    testCase({
+      input: `
+        export class CustomComponentEffects {
+          constructor(_actions) {
+            this._actions = _actions;
+            this.doThis = this._actions;
+          }
+        }
+        CustomComponentEffects.someField = 42;
+      `,
+      expected: `
+        export let CustomComponentEffects = /*#__PURE__*/ (() => {
+          class CustomComponentEffects {
+            constructor(_actions) {
+              this._actions = _actions;
+              this.doThis = this._actions;
+            }
+          }
+
+          CustomComponentEffects.someField = 42;
+          return CustomComponentEffects;
+        })();
+      `,
+    });
+  });
+
+  it('wraps class with a basic literal static field', () => {
+    testCase({
+      input: `
+        class CustomComponentEffects {
+          constructor(_actions) {
+            this._actions = _actions;
+            this.doThis = this._actions;
+          }
+        }
+        CustomComponentEffects.someField = 42;
+      `,
+      expected: `
+        let CustomComponentEffects = /*#__PURE__*/ (() => {
+          class CustomComponentEffects {
+            constructor(_actions) {
+              this._actions = _actions;
+              this.doThis = this._actions;
+            }
+          }
+
+          CustomComponentEffects.someField = 42;
+          return CustomComponentEffects;
+        })();
+      `,
+    });
+  });
+
+  it('wraps class with a pure static field', () => {
+    testCase({
+      input: `
+        const SWITCH_TEMPLATE_REF_FACTORY__POST_R3__ = injectTemplateRef;
+        const SWITCH_TEMPLATE_REF_FACTORY = SWITCH_TEMPLATE_REF_FACTORY__POST_R3__;
+        class TemplateRef {}
+        TemplateRef.__NG_ELEMENT_ID__ = SWITCH_TEMPLATE_REF_FACTORY;
+      `,
+      expected: `
+        const SWITCH_TEMPLATE_REF_FACTORY__POST_R3__ = injectTemplateRef;
+        const SWITCH_TEMPLATE_REF_FACTORY = SWITCH_TEMPLATE_REF_FACTORY__POST_R3__;
+        let TemplateRef = /*#__PURE__*/ (() => {
+          class TemplateRef {}
+
+          TemplateRef.__NG_ELEMENT_ID__ = SWITCH_TEMPLATE_REF_FACTORY;
+          return TemplateRef;
+        })();
+      `,
+    });
+  });
+
+  it('wraps class with multiple pure static field', () => {
+    testCase({
+      input: `
+        const SWITCH_TEMPLATE_REF_FACTORY__POST_R3__ = injectTemplateRef;
+        const SWITCH_TEMPLATE_REF_FACTORY = SWITCH_TEMPLATE_REF_FACTORY__POST_R3__;
+        class TemplateRef {}
+        TemplateRef.__NG_ELEMENT_ID__ = SWITCH_TEMPLATE_REF_FACTORY;
+        TemplateRef.someField = 42;
+      `,
+      expected: `
+        const SWITCH_TEMPLATE_REF_FACTORY__POST_R3__ = injectTemplateRef;
+        const SWITCH_TEMPLATE_REF_FACTORY = SWITCH_TEMPLATE_REF_FACTORY__POST_R3__;
+        let TemplateRef = /*#__PURE__*/ (() => {
+          class TemplateRef {}
+
+          TemplateRef.__NG_ELEMENT_ID__ = SWITCH_TEMPLATE_REF_FACTORY;
+          TemplateRef.someField = 42;
+          return TemplateRef;
+        })();
+      `,
+    });
+  });
+
+  it('does not wrap class with only some pure static fields', () => {
+    testCaseNoChange(`
+      class CustomComponentEffects {
+        constructor(_actions) {
+          this._actions = _actions;
+          this.doThis = this._actions;
+        }
+      }
+
+      CustomComponentEffects.someField = 42;
+      CustomComponentEffects.someFieldWithSideEffects = console.log('foo');
+    `);
+  });
+
+  it('does not wrap class with class decorators when wrapDecorators is false', () => {
+    testCaseNoChange(
+      `
+        let SomeClass = class SomeClass {
+        };
+        SomeClass = __decorate([
+            Dec()
+        ], SomeClass);
+      `,
+      { wrapDecorators: false },
+    );
+  });
+
+  it('wraps class with class decorators when wrapDecorators is true', () => {
+    testCase({
+      input: `
+        let SomeClass = class SomeClass {
+        };
+        SomeClass = __decorate([
+            SomeDecorator()
+        ], SomeClass);
+      `,
+      expected: `
+        let SomeClass = /*#__PURE__*/ (() => {
+          let SomeClass = class SomeClass {
+          };
+          SomeClass = __decorate([
+              SomeDecorator()
+          ], SomeClass);
+          return SomeClass;
+        })();
+      `,
+      options: { wrapDecorators: true },
+    });
+  });
+
+  it('does not wrap class with constructor decorators when wrapDecorators is false', () => {
+    testCaseNoChange(
+      `
+        let SomeClass = class SomeClass {
+          constructor(foo) { }
+        };
+        SomeClass = __decorate([
+            __param(0, SomeDecorator)
+        ], SomeClass);
+      `,
+      { wrapDecorators: false },
+    );
+  });
+
+  it('wraps class with constructor decorators when wrapDecorators is true', () => {
+    testCase({
+      input: `
+        let SomeClass = class SomeClass {
+          constructor(foo) { }
+        };
+        SomeClass = __decorate([
+            __param(0, SomeDecorator)
+        ], SomeClass);
+      `,
+      expected: `
+        let SomeClass = /*#__PURE__*/ (() => {
+          let SomeClass = class SomeClass {
+            constructor(foo) { }
+          };
+          SomeClass = __decorate([
+              __param(0, SomeDecorator)
+          ], SomeClass);
+          return SomeClass;
+        })();
+      `,
+      options: { wrapDecorators: true },
+    });
+  });
+
+  it('does not wrap class with field decorators when wrapDecorators is false', () => {
+    testCaseNoChange(
+      `
+        class SomeClass {
+          constructor() {
+              this.foo = 42;
+          }
+        }
+
+        __decorate([
+            SomeDecorator
+        ], SomeClass.prototype, "foo", void 0);
+      `,
+      { wrapDecorators: false },
+    );
+  });
+
+  it('wraps class with field decorators when wrapDecorators is true', () => {
+    testCase({
+      input: `
+        class SomeClass {
+          constructor() {
+              this.foo = 42;
+          }
+        }
+        __decorate([
+            SomeDecorator
+        ], SomeClass.prototype, "foo", void 0);
+      `,
+      expected: `
+        let SomeClass = /*#__PURE__*/ (() => {
+          class SomeClass {
+            constructor() {
+                this.foo = 42;
+            }
+          }
+
+          __decorate([
+              SomeDecorator
+          ], SomeClass.prototype, "foo", void 0);
+
+          return SomeClass;
+        })();
+      `,
+      options: { wrapDecorators: true },
+    });
+  });
+
+  it('wraps class with Angular ɵfac static field', () => {
+    testCase({
+      input: `
+        class CommonModule {
+        }
+        CommonModule.ɵfac = function CommonModule_Factory(t) { return new (t || CommonModule)(); };
+      `,
+      expected: `
+        let CommonModule = /*#__PURE__*/ (() => {
+          class CommonModule {
+          }
+
+          CommonModule.ɵfac = function CommonModule_Factory(t) { return new (t || CommonModule)(); };
+
+          return CommonModule;
+        })();
+      `,
+    });
+  });
+
+  it('wraps class with Angular ɵmod static field', () => {
+    testCase({
+      input: `
+        class CommonModule {
+        }
+        CommonModule.ɵmod = /*@__PURE__*/ ɵngcc0.ɵɵdefineNgModule({ type: CommonModule });
+      `,
+      expected: `
+        let CommonModule = /*#__PURE__*/ (() => {
+          class CommonModule {
+          }
+
+          CommonModule.ɵmod = /*@__PURE__*/ ɵngcc0.ɵɵdefineNgModule({ type: CommonModule });
+          return CommonModule;
+        })();
+      `,
+    });
+  });
+
+  it('wraps class with Angular ɵinj static field', () => {
+    testCase({
+      input: `
+        class CommonModule {
+        }
+        CommonModule.ɵinj = /*@__PURE__*/ ɵngcc0.ɵɵdefineInjector({ providers: [
+              { provide: NgLocalization, useClass: NgLocaleLocalization },
+          ] });
+      `,
+      expected: `
+        let CommonModule = /*#__PURE__*/ (() => {
+          class CommonModule {
+          }
+
+          CommonModule.ɵinj = /*@__PURE__*/ ɵngcc0.ɵɵdefineInjector({ providers: [
+              {
+                provide: NgLocalization,
+                useClass: NgLocaleLocalization
+              },
+          ] });
+          return CommonModule;
+        })();
+      `,
+    });
+  });
+
+  it('wraps class with multiple Angular static field', () => {
+    testCase({
+      input: `
+        class CommonModule {
+        }
+        CommonModule.ɵfac = function CommonModule_Factory(t) { return new (t || CommonModule)(); };
+        CommonModule.ɵmod = /*@__PURE__*/ ɵngcc0.ɵɵdefineNgModule({ type: CommonModule });
+        CommonModule.ɵinj = /*@__PURE__*/ ɵngcc0.ɵɵdefineInjector({ providers: [
+                { provide: NgLocalization, useClass: NgLocaleLocalization },
+            ] });
+      `,
+      expected: `
+        let CommonModule = /*#__PURE__*/ (() => {
+          class CommonModule {
+          }
+
+          CommonModule.ɵfac = function CommonModule_Factory(t) { return new (t || CommonModule)(); };
+
+          CommonModule.ɵmod = /*@__PURE__*/ ɵngcc0.ɵɵdefineNgModule({ type: CommonModule });
+          CommonModule.ɵinj = /*@__PURE__*/ ɵngcc0.ɵɵdefineInjector({ providers: [
+                  {
+                    provide: NgLocalization,
+                    useClass: NgLocaleLocalization
+                  },
+              ] });
+          return CommonModule;
+        })();
+      `,
+    });
+  });
+
+  it('wraps default exported class with pure static fields', () => {
+    testCase({
+      input: `
+        export default class CustomComponentEffects {
+          constructor(_actions) {
+            this._actions = _actions;
+            this.doThis = this._actions;
+          }
+        }
+        CustomComponentEffects.someField = 42;
+      `,
+      expected: `
+        let CustomComponentEffects = /*#__PURE__*/ (() => {
+          class CustomComponentEffects {
+            constructor(_actions) {
+              this._actions = _actions;
+              this.doThis = this._actions;
+            }
+          }
+
+          CustomComponentEffects.someField = 42;
+          return CustomComponentEffects;
+        })();
+        export { CustomComponentEffects as default };
+      `,
+    });
+  });
+});
diff --git a/packages/angular_devkit/build_angular/src/babel/plugins/adjust-typescript-enums.ts b/packages/angular_devkit/build_angular/src/babel/plugins/adjust-typescript-enums.ts
new file mode 100644
index 000000000000..07412ed6632c
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/babel/plugins/adjust-typescript-enums.ts
@@ -0,0 +1,163 @@
+/**
+ * @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 { NodePath, PluginObj, PluginPass, types } from '@babel/core';
+import annotateAsPure from '@babel/helper-annotate-as-pure';
+
+/**
+ * Provides one or more keywords that if found within the content of a source file indicate
+ * that this plugin should be used with a source file.
+ *
+ * @returns An a string iterable containing one or more keywords.
+ */
+export function getKeywords(): Iterable<string> {
+  return ['var'];
+}
+
+/**
+ * A babel plugin factory function for adjusting TypeScript emitted enums.
+ *
+ * @returns A babel plugin object instance.
+ */
+export default function (): PluginObj {
+  return {
+    visitor: {
+      VariableDeclaration(path: NodePath<types.VariableDeclaration>, state: PluginPass) {
+        const { parentPath, node } = path;
+        const { loose } = state.opts as { loose: boolean };
+
+        if (node.kind !== 'var' || node.declarations.length !== 1) {
+          return;
+        }
+
+        const declaration = path.get('declarations')[0];
+        if (declaration.node.init) {
+          return;
+        }
+
+        const declarationId = declaration.node.id;
+        if (!types.isIdentifier(declarationId)) {
+          return;
+        }
+
+        const hasExport =
+          parentPath.isExportNamedDeclaration() || parentPath.isExportDefaultDeclaration();
+        const origin = hasExport ? parentPath : path;
+        const nextStatement = origin.getSibling(+origin.key + 1);
+        if (!nextStatement.isExpressionStatement()) {
+          return;
+        }
+
+        const nextExpression = nextStatement.get('expression');
+        if (!nextExpression.isCallExpression() || nextExpression.node.arguments.length !== 1) {
+          return;
+        }
+
+        const enumCallArgument = nextExpression.node.arguments[0];
+        if (!types.isLogicalExpression(enumCallArgument, { operator: '||' })) {
+          return;
+        }
+
+        // Check if identifiers match var declaration
+        if (
+          !types.isIdentifier(enumCallArgument.left) ||
+          !nextExpression.scope.bindingIdentifierEquals(enumCallArgument.left.name, declarationId)
+        ) {
+          return;
+        }
+
+        const enumCallee = nextExpression.get('callee');
+        if (!enumCallee.isFunctionExpression() || enumCallee.node.params.length !== 1) {
+          return;
+        }
+
+        const enumCalleeParam = enumCallee.node.params[0];
+        const isEnumCalleeMatching =
+          types.isIdentifier(enumCalleeParam) && enumCalleeParam.name === declarationId.name;
+
+        // Loose mode rewrites the enum to a shorter but less TypeScript-like form
+        // Note: We only can apply the `loose` mode transformation if the callee parameter matches
+        // with the declaration identifier name. This is necessary in case the the declaration id has
+        // been renamed to avoid collisions, as the loose transform would then break the enum assignments
+        // which rely on the differently-named callee identifier name.
+        let enumAssignments: types.ExpressionStatement[] | undefined;
+        if (loose && isEnumCalleeMatching) {
+          enumAssignments = [];
+        }
+
+        // Check if all enum member values are pure.
+        // If not, leave as-is due to potential side efects
+        let hasElements = false;
+        for (const enumStatement of enumCallee.get('body').get('body')) {
+          if (!enumStatement.isExpressionStatement()) {
+            return;
+          }
+
+          const enumValueAssignment = enumStatement.get('expression');
+          if (
+            !enumValueAssignment.isAssignmentExpression() ||
+            !enumValueAssignment.get('right').isPure()
+          ) {
+            return;
+          }
+
+          hasElements = true;
+          enumAssignments?.push(enumStatement.node);
+        }
+
+        // If there are no enum elements then there is nothing to wrap
+        if (!hasElements) {
+          return;
+        }
+
+        // Remove existing enum initializer
+        const enumInitializer = nextExpression.node;
+        nextExpression.remove();
+
+        // Create IIFE block contents
+        let blockContents;
+        if (enumAssignments) {
+          // Loose mode
+          blockContents = [
+            types.expressionStatement(
+              types.assignmentExpression(
+                '=',
+                types.cloneNode(declarationId),
+                types.logicalExpression(
+                  '||',
+                  types.cloneNode(declarationId),
+                  types.objectExpression([]),
+                ),
+              ),
+            ),
+            ...enumAssignments,
+          ];
+        } else {
+          blockContents = [types.expressionStatement(enumInitializer)];
+        }
+
+        // Wrap existing enum initializer in a pure annotated IIFE
+        const container = types.arrowFunctionExpression(
+          [],
+          types.blockStatement([
+            ...blockContents,
+            types.returnStatement(types.cloneNode(declarationId)),
+          ]),
+        );
+        const replacementInitializer = types.callExpression(
+          types.parenthesizedExpression(container),
+          [],
+        );
+        annotateAsPure(replacementInitializer);
+
+        // Add the wrapped enum initializer directly to the variable declaration
+        declaration.get('init').replaceWith(replacementInitializer);
+      },
+    },
+  };
+}
diff --git a/packages/angular_devkit/build_angular/src/babel/plugins/adjust-typescript-enums_spec.ts b/packages/angular_devkit/build_angular/src/babel/plugins/adjust-typescript-enums_spec.ts
new file mode 100644
index 000000000000..ef8f9d6a3013
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/babel/plugins/adjust-typescript-enums_spec.ts
@@ -0,0 +1,270 @@
+/**
+ * @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 { transform } from '@babel/core';
+import { default as adjustTypeScriptEnums } from './adjust-typescript-enums';
+
+// eslint-disable-next-line import/no-extraneous-dependencies
+const prettier = require('prettier');
+
+function testCase({
+  input,
+  expected,
+  options,
+}: {
+  input: string;
+  expected: string;
+  options?: { loose?: boolean };
+}): void {
+  const result = transform(input, {
+    configFile: false,
+    babelrc: false,
+    plugins: [[adjustTypeScriptEnums, options]],
+  });
+  if (!result) {
+    fail('Expected babel to return a transform result.');
+  } else {
+    expect(prettier.format(result.code, { parser: 'babel' })).toEqual(
+      prettier.format(expected, { parser: 'babel' }),
+    );
+  }
+}
+
+function testCaseNoChange(input: string): void {
+  testCase({ input, expected: input });
+}
+
+describe('adjust-typescript-enums Babel plugin', () => {
+  it('wraps unexported TypeScript enums', () => {
+    testCase({
+      input: `
+        var ChangeDetectionStrategy;
+        (function (ChangeDetectionStrategy) {
+            ChangeDetectionStrategy[ChangeDetectionStrategy["OnPush"] = 0] = "OnPush";
+            ChangeDetectionStrategy[ChangeDetectionStrategy["Default"] = 1] = "Default";
+        })(ChangeDetectionStrategy || (ChangeDetectionStrategy = {}));
+      `,
+      expected: `
+        var ChangeDetectionStrategy = /*#__PURE__*/ (() => {
+          (function (ChangeDetectionStrategy) {
+              ChangeDetectionStrategy[ChangeDetectionStrategy["OnPush"] = 0] = "OnPush";
+              ChangeDetectionStrategy[ChangeDetectionStrategy["Default"] = 1] = "Default";
+          })(ChangeDetectionStrategy || (ChangeDetectionStrategy = {}));
+
+          return ChangeDetectionStrategy;
+        })();
+      `,
+    });
+  });
+
+  it('wraps exported TypeScript enums', () => {
+    testCase({
+      input: `
+        export var ChangeDetectionStrategy;
+        (function (ChangeDetectionStrategy) {
+            ChangeDetectionStrategy[ChangeDetectionStrategy["OnPush"] = 0] = "OnPush";
+            ChangeDetectionStrategy[ChangeDetectionStrategy["Default"] = 1] = "Default";
+        })(ChangeDetectionStrategy || (ChangeDetectionStrategy = {}));
+      `,
+      expected: `
+        export var ChangeDetectionStrategy = /*#__PURE__*/ (() => {
+          (function (ChangeDetectionStrategy) {
+              ChangeDetectionStrategy[ChangeDetectionStrategy["OnPush"] = 0] = "OnPush";
+              ChangeDetectionStrategy[ChangeDetectionStrategy["Default"] = 1] = "Default";
+          })(ChangeDetectionStrategy || (ChangeDetectionStrategy = {}));
+
+          return ChangeDetectionStrategy;
+        })();
+      `,
+    });
+  });
+
+  it('wraps TypeScript enums with custom numbering', () => {
+    testCase({
+      input: `
+        export var ChangeDetectionStrategy;
+        (function (ChangeDetectionStrategy) {
+            ChangeDetectionStrategy[ChangeDetectionStrategy["OnPush"] = 5] = "OnPush";
+            ChangeDetectionStrategy[ChangeDetectionStrategy["Default"] = 8] = "Default";
+        })(ChangeDetectionStrategy || (ChangeDetectionStrategy = {}));
+      `,
+      expected: `
+        export var ChangeDetectionStrategy = /*#__PURE__*/ (() => {
+          (function (ChangeDetectionStrategy) {
+              ChangeDetectionStrategy[ChangeDetectionStrategy["OnPush"] = 5] = "OnPush";
+              ChangeDetectionStrategy[ChangeDetectionStrategy["Default"] = 8] = "Default";
+          })(ChangeDetectionStrategy || (ChangeDetectionStrategy = {}));
+
+          return ChangeDetectionStrategy;
+        })();
+      `,
+    });
+  });
+
+  it('wraps string-based TypeScript enums', () => {
+    testCase({
+      input: `
+        var NotificationKind;
+        (function (NotificationKind) {
+            NotificationKind["NEXT"] = "N";
+            NotificationKind["ERROR"] = "E";
+            NotificationKind["COMPLETE"] = "C";
+        })(NotificationKind || (NotificationKind = {}));
+      `,
+      expected: `
+        var NotificationKind = /*#__PURE__*/ (() => {
+          (function (NotificationKind) {
+              NotificationKind["NEXT"] = "N";
+              NotificationKind["ERROR"] = "E";
+              NotificationKind["COMPLETE"] = "C";
+          })(NotificationKind || (NotificationKind = {}));
+
+          return NotificationKind;
+        })();
+      `,
+    });
+  });
+
+  it('wraps enums that were renamed due to scope hoisting', () => {
+    testCase({
+      input: `
+        var NotificationKind$1;
+        (function (NotificationKind) {
+            NotificationKind["NEXT"] = "N";
+            NotificationKind["ERROR"] = "E";
+            NotificationKind["COMPLETE"] = "C";
+        })(NotificationKind$1 || (NotificationKind$1 = {}));
+      `,
+      expected: `
+        var NotificationKind$1 = /*#__PURE__*/ (() => {
+          (function (NotificationKind) {
+              NotificationKind["NEXT"] = "N";
+              NotificationKind["ERROR"] = "E";
+              NotificationKind["COMPLETE"] = "C";
+          })(NotificationKind$1 || (NotificationKind$1 = {}));
+
+          return NotificationKind$1;
+        })();
+      `,
+    });
+  });
+
+  it('maintains multi-line comments', () => {
+    testCase({
+      input: `
+        /**
+         * Supported http methods.
+         * @deprecated use @angular/common/http instead
+         */
+        var RequestMethod;
+        (function (RequestMethod) {
+            RequestMethod[RequestMethod["Get"] = 0] = "Get";
+            RequestMethod[RequestMethod["Post"] = 1] = "Post";
+            RequestMethod[RequestMethod["Put"] = 2] = "Put";
+            RequestMethod[RequestMethod["Delete"] = 3] = "Delete";
+            RequestMethod[RequestMethod["Options"] = 4] = "Options";
+            RequestMethod[RequestMethod["Head"] = 5] = "Head";
+            RequestMethod[RequestMethod["Patch"] = 6] = "Patch";
+        })(RequestMethod || (RequestMethod = {}));
+      `,
+      expected: `
+        /**
+         * Supported http methods.
+         * @deprecated use @angular/common/http instead
+         */
+        var RequestMethod = /*#__PURE__*/ (() => {
+          (function (RequestMethod) {
+              RequestMethod[RequestMethod["Get"] = 0] = "Get";
+              RequestMethod[RequestMethod["Post"] = 1] = "Post";
+              RequestMethod[RequestMethod["Put"] = 2] = "Put";
+              RequestMethod[RequestMethod["Delete"] = 3] = "Delete";
+              RequestMethod[RequestMethod["Options"] = 4] = "Options";
+              RequestMethod[RequestMethod["Head"] = 5] = "Head";
+              RequestMethod[RequestMethod["Patch"] = 6] = "Patch";
+          })(RequestMethod || (RequestMethod = {}));
+
+          return RequestMethod;
+        })();
+      `,
+    });
+  });
+
+  it('does not wrap TypeScript enums with side effect values', () => {
+    testCaseNoChange(`
+      export var ChangeDetectionStrategy;
+
+      (function (ChangeDetectionStrategy) {
+          ChangeDetectionStrategy[ChangeDetectionStrategy["OnPush"] = 0] = console.log('foo');
+          ChangeDetectionStrategy[ChangeDetectionStrategy["Default"] = 1] = "Default";
+      })(ChangeDetectionStrategy || (ChangeDetectionStrategy = {}));
+    `);
+  });
+
+  it('does not wrap object literals similar to TypeScript enums', () => {
+    testCaseNoChange(`
+      const RendererStyleFlags3 = {
+          Important: 1,
+          DashCase: 2,
+      };
+
+      if (typeof RendererStyleFlags3 === 'object') {
+        RendererStyleFlags3[RendererStyleFlags3.Important] = 'DashCase';
+      }
+
+      RendererStyleFlags3[RendererStyleFlags3.Important] = 'Important';
+    `);
+  });
+
+  it('wraps TypeScript enums in loose mode', () => {
+    testCase({
+      input: `
+        var ChangeDetectionStrategy;
+        (function (ChangeDetectionStrategy) {
+            ChangeDetectionStrategy[ChangeDetectionStrategy["OnPush"] = 0] = "OnPush";
+            ChangeDetectionStrategy[ChangeDetectionStrategy["Default"] = 1] = "Default";
+        })(ChangeDetectionStrategy || (ChangeDetectionStrategy = {}));
+      `,
+      expected: `
+        var ChangeDetectionStrategy = /*#__PURE__*/ (() => {
+          ChangeDetectionStrategy = ChangeDetectionStrategy || {};
+          ChangeDetectionStrategy[(ChangeDetectionStrategy["OnPush"] = 0)] = "OnPush";
+          ChangeDetectionStrategy[(ChangeDetectionStrategy["Default"] = 1)] = "Default";
+          return ChangeDetectionStrategy;
+        })();
+      `,
+      options: { loose: true },
+    });
+  });
+
+  it(
+    'should not wrap TypeScript enums in loose mode if the declaration identifier has been ' +
+      'renamed to avoid collisions',
+    () => {
+      testCase({
+        input: `
+        var ChangeDetectionStrategy$1;
+        (function (ChangeDetectionStrategy) {
+            ChangeDetectionStrategy[ChangeDetectionStrategy["OnPush"] = 0] = "OnPush";
+            ChangeDetectionStrategy[ChangeDetectionStrategy["Default"] = 1] = "Default";
+        })(ChangeDetectionStrategy$1 || (ChangeDetectionStrategy$1 = {}));
+      `,
+        expected: `
+        var ChangeDetectionStrategy$1 = /*#__PURE__*/ (() => {
+          (function (ChangeDetectionStrategy) {
+            ChangeDetectionStrategy[(ChangeDetectionStrategy["OnPush"] = 0)] = "OnPush";
+            ChangeDetectionStrategy[(ChangeDetectionStrategy["Default"] = 1)] = "Default";
+          })(ChangeDetectionStrategy$1 || (ChangeDetectionStrategy$1 = {}));
+
+          return ChangeDetectionStrategy$1;
+        })();
+      `,
+        options: { loose: true },
+      });
+    },
+  );
+});
diff --git a/packages/angular_devkit/build_angular/src/babel/plugins/elide-angular-metadata.ts b/packages/angular_devkit/build_angular/src/babel/plugins/elide-angular-metadata.ts
new file mode 100644
index 000000000000..a0f0e50f6a46
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/babel/plugins/elide-angular-metadata.ts
@@ -0,0 +1,71 @@
+/**
+ * @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 { NodePath, PluginObj, types } from '@babel/core';
+
+/**
+ * The name of the Angular class metadata function created by the Angular compiler.
+ */
+const SET_CLASS_METADATA_NAME = 'ɵsetClassMetadata';
+
+/**
+ * Provides one or more keywords that if found within the content of a source file indicate
+ * that this plugin should be used with a source file.
+ *
+ * @returns An a string iterable containing one or more keywords.
+ */
+export function getKeywords(): Iterable<string> {
+  return [SET_CLASS_METADATA_NAME];
+}
+
+/**
+ * A babel plugin factory function for eliding the Angular class metadata function (`ɵsetClassMetadata`).
+ *
+ * @returns A babel plugin object instance.
+ */
+export default function (): PluginObj {
+  return {
+    visitor: {
+      CallExpression(path: NodePath<types.CallExpression>) {
+        const callee = path.node.callee;
+
+        // The function being called must be the metadata function name
+        let calleeName;
+        if (types.isMemberExpression(callee) && types.isIdentifier(callee.property)) {
+          calleeName = callee.property.name;
+        } else if (types.isIdentifier(callee)) {
+          calleeName = callee.name;
+        }
+        if (calleeName !== SET_CLASS_METADATA_NAME) {
+          return;
+        }
+
+        // There must be four arguments that meet the following criteria:
+        // * First must be an identifier
+        // * Second must be an array literal
+        const callArguments = path.node.arguments;
+        if (
+          callArguments.length !== 4 ||
+          !types.isIdentifier(callArguments[0]) ||
+          !types.isArrayExpression(callArguments[1])
+        ) {
+          return;
+        }
+
+        // The metadata function is always emitted inside a function expression
+        if (!path.getFunctionParent()?.isFunctionExpression()) {
+          return;
+        }
+
+        // Replace the metadata function with `void 0` which is the equivalent return value
+        // of the metadata function.
+        path.replaceWith(path.scope.buildUndefinedNode());
+      },
+    },
+  };
+}
diff --git a/packages/angular_devkit/build_angular/src/babel/plugins/elide-angular-metadata_spec.ts b/packages/angular_devkit/build_angular/src/babel/plugins/elide-angular-metadata_spec.ts
new file mode 100644
index 000000000000..0de3bedb8499
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/babel/plugins/elide-angular-metadata_spec.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 { transform } from '@babel/core';
+import { default as elideAngularMetadata } from './elide-angular-metadata';
+
+// eslint-disable-next-line import/no-extraneous-dependencies
+const prettier = require('prettier');
+
+function testCase({ input, expected }: { input: string; expected: string }): void {
+  const result = transform(input, {
+    configFile: false,
+    babelrc: false,
+    compact: true,
+    plugins: [elideAngularMetadata],
+  });
+  if (!result) {
+    fail('Expected babel to return a transform result.');
+  } else {
+    expect(prettier.format(result.code, { parser: 'babel' })).toEqual(
+      prettier.format(expected, { parser: 'babel' }),
+    );
+  }
+}
+
+describe('elide-angular-metadata Babel plugin', () => {
+  it('elides pure annotated ɵsetClassMetadata', () => {
+    testCase({
+      input: `
+        import { Component } from '@angular/core';
+        export class SomeClass {}
+        /*@__PURE__*/ (function () { i0.ɵsetClassMetadata(Clazz, [{
+            type: Component,
+            args: [{
+                    selector: 'app-lazy',
+                    template: 'very lazy',
+                    styles: []
+                }]
+        }], null, null); })();
+      `,
+      expected: `
+        import { Component } from '@angular/core';
+        export class SomeClass {}
+        /*@__PURE__*/ (function () { void 0 })();
+      `,
+    });
+  });
+
+  it('elides JIT mode protected ɵsetClassMetadata', () => {
+    testCase({
+      input: `
+        import { Component } from '@angular/core';
+        export class SomeClass {}
+        (function () { (typeof ngJitMode === "undefined" || ngJitMode) && i0.ɵsetClassMetadata(SomeClass, [{
+            type: Component,
+            args: [{
+                    selector: 'app-lazy',
+                    template: 'very lazy',
+                    styles: []
+                }]
+        }], null, null); })();`,
+      expected: `
+        import { Component } from '@angular/core';
+        export class SomeClass {}
+        (function () { (typeof ngJitMode === "undefined" || ngJitMode) && void 0 })();`,
+    });
+  });
+});
diff --git a/packages/angular_devkit/build_angular/src/babel/plugins/pure-toplevel-functions.ts b/packages/angular_devkit/build_angular/src/babel/plugins/pure-toplevel-functions.ts
new file mode 100644
index 000000000000..e93f45c3ce90
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/babel/plugins/pure-toplevel-functions.ts
@@ -0,0 +1,69 @@
+/**
+ * @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 { NodePath, PluginObj, types } from '@babel/core';
+import annotateAsPure from '@babel/helper-annotate-as-pure';
+import * as tslib from 'tslib';
+
+/**
+ * A cached set of TypeScript helper function names used by the helper name matcher utility function.
+ */
+const tslibHelpers = new Set<string>(Object.keys(tslib).filter((h) => h.startsWith('__')));
+
+/**
+ * Determinates whether an identifier name matches one of the TypeScript helper function names.
+ *
+ * @param name The identifier name to check.
+ * @returns True, if the name matches a TypeScript helper name; otherwise, false.
+ */
+function isTslibHelperName(name: string): boolean {
+  const nameParts = name.split('$');
+  const originalName = nameParts[0];
+
+  if (nameParts.length > 2 || (nameParts.length === 2 && isNaN(+nameParts[1]))) {
+    return false;
+  }
+
+  return tslibHelpers.has(originalName);
+}
+
+/**
+ * A babel plugin factory function for adding the PURE annotation to top-level new and call expressions.
+ *
+ * @returns A babel plugin object instance.
+ */
+export default function (): PluginObj {
+  return {
+    visitor: {
+      CallExpression(path: NodePath<types.CallExpression>) {
+        // If the expression has a function parent, it is not top-level
+        if (path.getFunctionParent()) {
+          return;
+        }
+
+        const callee = path.node.callee;
+        if (types.isFunctionExpression(callee) && path.node.arguments.length !== 0) {
+          return;
+        }
+        // Do not annotate TypeScript helpers emitted by the TypeScript compiler.
+        // TypeScript helpers are intended to cause side effects.
+        if (types.isIdentifier(callee) && isTslibHelperName(callee.name)) {
+          return;
+        }
+
+        annotateAsPure(path);
+      },
+      NewExpression(path: NodePath<types.NewExpression>) {
+        // If the expression has a function parent, it is not top-level
+        if (!path.getFunctionParent()) {
+          annotateAsPure(path);
+        }
+      },
+    },
+  };
+}
diff --git a/packages/angular_devkit/build_angular/src/babel/plugins/pure-toplevel-functions_spec.ts b/packages/angular_devkit/build_angular/src/babel/plugins/pure-toplevel-functions_spec.ts
new file mode 100644
index 000000000000..503c83d5c476
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/babel/plugins/pure-toplevel-functions_spec.ts
@@ -0,0 +1,108 @@
+/**
+ * @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 { transform } from '@babel/core';
+import { default as pureTopLevelPlugin } from './pure-toplevel-functions';
+
+// eslint-disable-next-line import/no-extraneous-dependencies
+const prettier = require('prettier');
+
+function testCase({ input, expected }: { input: string; expected: string }): void {
+  const result = transform(input, {
+    configFile: false,
+    babelrc: false,
+    compact: true,
+    plugins: [pureTopLevelPlugin],
+  });
+  if (!result) {
+    fail('Expected babel to return a transform result.');
+  } else {
+    expect(prettier.format(result.code, { parser: 'babel' })).toEqual(
+      prettier.format(expected, { parser: 'babel' }),
+    );
+  }
+}
+
+function testCaseNoChange(input: string): void {
+  testCase({ input, expected: input });
+}
+
+describe('pure-toplevel-functions Babel plugin', () => {
+  it('annotates top-level new expressions', () => {
+    testCase({
+      input: 'var result = new SomeClass();',
+      expected: 'var result = /*#__PURE__*/ new SomeClass();',
+    });
+  });
+
+  it('annotates top-level function calls', () => {
+    testCase({
+      input: 'var result = someCall();',
+      expected: 'var result = /*#__PURE__*/ someCall();',
+    });
+  });
+
+  it('annotates top-level IIFE assignments with no arguments', () => {
+    testCase({
+      input: 'var SomeClass = (function () { function SomeClass() { } return SomeClass; })();',
+      expected:
+        'var SomeClass = /*#__PURE__*/(function () { function SomeClass() { } return SomeClass; })();',
+    });
+  });
+
+  it('does not annotate top-level IIFE assignments with arguments', () => {
+    testCaseNoChange(
+      'var SomeClass = (function () { function SomeClass() { } return SomeClass; })(abc);',
+    );
+  });
+
+  it('does not annotate call expressions inside function declarations', () => {
+    testCaseNoChange('function funcDecl() { const result = someFunction(); }');
+  });
+
+  it('does not annotate call expressions inside function expressions', () => {
+    testCaseNoChange('const foo = function funcDecl() { const result = someFunction(); }');
+  });
+
+  it('does not annotate call expressions inside function expressions', () => {
+    testCaseNoChange('const foo = () => { const result = someFunction(); }');
+  });
+
+  it('does not annotate new expressions inside function declarations', () => {
+    testCaseNoChange('function funcDecl() { const result = new SomeClass(); }');
+  });
+
+  it('does not annotate new expressions inside function expressions', () => {
+    testCaseNoChange('const foo = function funcDecl() { const result = new SomeClass(); }');
+  });
+
+  it('does not annotate new expressions inside function expressions', () => {
+    testCaseNoChange('const foo = () => { const result = new SomeClass(); }');
+  });
+
+  it('does not annotate TypeScript helper functions (tslib)', () => {
+    testCaseNoChange(`
+      class LanguageState {}
+      __decorate([
+          __metadata("design:type", Function),
+          __metadata("design:paramtypes", [Object]),
+          __metadata("design:returntype", void 0)
+      ], LanguageState.prototype, "checkLanguage", null);
+    `);
+  });
+
+  it('does not annotate object literal methods', () => {
+    testCaseNoChange(`
+      const literal = {
+        method() {
+          var newClazz = new Clazz();
+        }
+      };
+    `);
+  });
+});
diff --git a/packages/angular_devkit/build_angular/src/babel/presets/application.ts b/packages/angular_devkit/build_angular/src/babel/presets/application.ts
index a1cf286cda8b..fcc6b3bdd79f 100644
--- a/packages/angular_devkit/build_angular/src/babel/presets/application.ts
+++ b/packages/angular_devkit/build_angular/src/babel/presets/application.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 * as fs from 'fs';
 import * as path from 'path';
 
@@ -30,7 +31,8 @@ export interface ApplicationPresetOptions {
 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)();
+  const diagnostics: I18nDiagnostics =
+    new (require('@angular/localize/src/tools/src/diagnostics').Diagnostics)();
 
   if (!reporter) {
     return diagnostics;
@@ -129,23 +131,26 @@ export default function (api: unknown, options: ApplicationPresetOptions) {
 
   if (options.angularLinker?.shouldLink) {
     // Babel currently is synchronous so import cannot be used
-    const {
-      createEs2015LinkerPlugin,
-    } = require('@angular/compiler-cli/linker/babel') as typeof import('@angular/compiler-cli/linker/babel');
-
-    plugins.push(createEs2015LinkerPlugin({
-      linkerJitMode: options.angularLinker.jitMode,
-      logger: createNgtscLogger(options.diagnosticReporter),
-      fileSystem: {
-        resolve: path.resolve,
-        exists: fs.existsSync,
-        dirname: path.dirname,
-        relative: path.relative,
-        readFile: fs.readFileSync,
-      // Node.JS types don't overlap the Compiler types.
-      // tslint:disable-next-line: no-any
-      } as any,
-    }));
+    const { createEs2015LinkerPlugin } =
+      require('@angular/compiler-cli/linker/babel') as typeof import('@angular/compiler-cli/linker/babel');
+
+    plugins.push(
+      createEs2015LinkerPlugin({
+        linkerJitMode: options.angularLinker.jitMode,
+        // This is a workaround until https://github.com/angular/angular/issues/42769 is fixed.
+        sourceMapping: false,
+        logger: createNgtscLogger(options.diagnosticReporter),
+        fileSystem: {
+          resolve: path.resolve,
+          exists: fs.existsSync,
+          dirname: path.dirname,
+          relative: path.relative,
+          readFile: fs.readFileSync,
+          // Node.JS types don't overlap the Compiler types.
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        } as any,
+      }),
+    );
   }
 
   if (options.forceES5) {
@@ -176,7 +181,10 @@ export default function (api: unknown, options: ApplicationPresetOptions) {
 
   if (options.forceAsyncTransformation) {
     // Always transform async/await to support Zone.js
-    plugins.push(require('@babel/plugin-transform-async-to-generator').default);
+    plugins.push(
+      require('@babel/plugin-transform-async-to-generator').default,
+      require('@babel/plugin-proposal-async-generator-functions').default,
+    );
     needRuntimeTransform = true;
   }
 
diff --git a/packages/angular_devkit/build_angular/src/babel/webpack-loader.ts b/packages/angular_devkit/build_angular/src/babel/webpack-loader.ts
index 24624cf7cccd..2a14774f9af0 100644
--- a/packages/angular_devkit/build_angular/src/babel/webpack-loader.ts
+++ b/packages/angular_devkit/build_angular/src/babel/webpack-loader.ts
@@ -1,10 +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 remapping from '@ampproject/remapping';
 import { needsLinking } from '@angular/compiler-cli/linker';
 import { custom } from 'babel-loader';
 import { ScriptTarget } from 'typescript';
@@ -13,12 +15,17 @@ import { ApplicationPresetOptions } from './presets/application';
 interface AngularCustomOptions extends Pick<ApplicationPresetOptions, 'angularLinker' | 'i18n'> {
   forceAsyncTransformation: boolean;
   forceES5: boolean;
+  optimize?: {
+    looseEnums: boolean;
+    pureTopLevel: boolean;
+    wrapDecorators: boolean;
+  };
 }
 
-function requiresLinking(
-  path: string,
-  source: string,
-): boolean {
+// Extract Sourcemap input type from the remapping function since it is not currently exported
+type SourceMapInput = Exclude<Parameters<typeof remapping>[0], unknown[]>;
+
+function requiresLinking(path: string, source: string): boolean {
   // @angular/core and @angular/compiler will cause false positives
   // Also, TypeScript files do not require linking
   if (/[\\\/]@angular[\\\/](?:compiler|core)|\.tsx?$/.test(path)) {
@@ -39,7 +46,7 @@ export default custom<AngularCustomOptions>(() => {
   });
 
   return {
-    async customOptions({ i18n, scriptTarget, aot, ...rawOptions }, { source }) {
+    async customOptions({ i18n, scriptTarget, aot, optimize, ...rawOptions }, { source }) {
       // Must process file if plugins are added
       let shouldProcess = Array.isArray(rawOptions.plugins) && rawOptions.plugins.length > 0;
 
@@ -65,8 +72,13 @@ export default custom<AngularCustomOptions>(() => {
         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');
+        } else if (esTarget >= ScriptTarget.ES2017 || /\.[cm]?js$/.test(this.resourcePath)) {
+          // Application code (TS files) will only contain native async if target is ES2017+.
+          // However, third-party libraries can regardless of the target option.
+          // APF packages with code in [f]esm2015 directories is downlevelled to ES2015 and
+          // will not have native async.
+          customOptions.forceAsyncTransformation =
+            !/[\\\/][_f]?esm2015[\\\/]/.test(this.resourcePath) && source.includes('async');
         }
         shouldProcess ||= customOptions.forceAsyncTransformation || customOptions.forceES5;
       }
@@ -81,6 +93,21 @@ export default custom<AngularCustomOptions>(() => {
         shouldProcess = true;
       }
 
+      if (optimize) {
+        const angularPackage = /[\\\/]node_modules[\\\/]@angular[\\\/]/.test(this.resourcePath);
+        customOptions.optimize = {
+          // Angular packages provide additional tested side effects guarantees and can use
+          // otherwise unsafe optimizations.
+          looseEnums: angularPackage,
+          pureTopLevel: angularPackage,
+          // JavaScript modules that are marked as side effect free are considered to have
+          // no decorators that contain non-local effects.
+          wrapDecorators: !!this._module?.factoryMeta?.sideEffectFree,
+        };
+
+        shouldProcess = true;
+      }
+
       // Add provided loader options to default base options
       const loaderOptions: Record<string, unknown> = {
         ...baseOptions,
@@ -102,12 +129,32 @@ export default custom<AngularCustomOptions>(() => {
       return { custom: customOptions, loader: loaderOptions };
     },
     config(configuration, { customOptions }) {
+      const plugins = configuration.options.plugins ?? [];
+      if (customOptions.optimize) {
+        if (customOptions.optimize.pureTopLevel) {
+          plugins.push(require('./plugins/pure-toplevel-functions').default);
+        }
+
+        plugins.push(
+          require('./plugins/elide-angular-metadata').default,
+          [
+            require('./plugins/adjust-typescript-enums').default,
+            { loose: customOptions.optimize.looseEnums },
+          ],
+          [
+            require('./plugins/adjust-static-class-members').default,
+            { wrapDecorators: customOptions.optimize.wrapDecorators },
+          ],
+        );
+      }
+
       return {
         ...configuration.options,
-        // Workaround for https://github.com/babel/babel-loader/pull/896 is available
-        // Delete once the above PR is released
-        // tslint:disable-next-line: no-any
-        inputSourceMap: (configuration.options.inputSourceMap || false as any), // Typings are not correct
+        // Using `false` disables babel from attempting to locate sourcemaps or process any inline maps.
+        // The babel types do not include the false option even though it is valid
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        inputSourceMap: false as any,
+        plugins,
         presets: [
           ...(configuration.options.presets || []),
           [
@@ -131,5 +178,26 @@ export default custom<AngularCustomOptions>(() => {
         ],
       };
     },
+    result(result, { map: inputSourceMap }) {
+      if (result.map && inputSourceMap) {
+        // Merge the intermediate sourcemap generated by babel with the input source map.
+        // The casting is required due to slight differences in the types for babel and
+        // `@ampproject/remapping` source map objects but both are compatible with Webpack.
+        // This method for merging is used because it provides more accurate output
+        // and is faster while using less memory.
+        result.map = {
+          // Convert the SourceMap back to simple plain object.
+          // This is needed because otherwise code-coverage will fail with `don't know how to turn this value into a node`
+          // Which is throw by Babel when it is invoked again from `istanbul-lib-instrument`.
+          // https://github.com/babel/babel/blob/780aa48d2a34dc55f556843074b6aed45e7eabeb/packages/babel-types/src/converters/valueToNode.ts#L115-L130
+          ...(remapping(
+            [result.map as SourceMapInput, inputSourceMap as SourceMapInput],
+            () => null,
+          ) as typeof result.map),
+        };
+      }
+
+      return result;
+    },
   };
 });
diff --git a/packages/angular_devkit/build_angular/src/browser/index.ts b/packages/angular_devkit/build_angular/src/browser/index.ts
index 0de231bbcf4b..6e71328221e7 100644
--- a/packages/angular_devkit/build_angular/src/browser/index.ts
+++ b/packages/angular_devkit/build_angular/src/browser/index.ts
@@ -1,19 +1,20 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of 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, logging, normalize, resolve, tags } from '@angular-devkit/core';
+import { getSystemPath, json, logging, normalize, resolve } from '@angular-devkit/core';
 import * as fs from 'fs';
 import * as path from 'path';
 import { Observable, from } from 'rxjs';
 import { concatMap, map, switchMap } from 'rxjs/operators';
 import { ScriptTarget } from 'typescript';
-import * as webpack from 'webpack';
+import webpack from 'webpack';
 import { ExecutionTransformer } from '../transforms';
 import {
   BuildBrowserFeatures,
@@ -24,7 +25,6 @@ import {
   urlJoin,
 } from '../utils';
 import { BundleActionExecutor } from '../utils/action-executor';
-import { WebpackConfigOptions } from '../utils/build-options';
 import { ThresholdSeverity, checkBudgets } from '../utils/bundle-calculator';
 import { findCachePath } from '../utils/cache-path';
 import { colors } from '../utils/color';
@@ -52,22 +52,19 @@ import {
   getIndexOutputFile,
 } from '../utils/webpack-browser-config';
 import {
-  getAotConfig,
+  getAnalyticsConfig,
   getBrowserConfig,
   getCommonConfig,
-  getNonAotConfig,
   getStatsConfig,
   getStylesConfig,
+  getTypeScriptConfig,
   getWorkerConfig,
 } from '../webpack/configs';
-import { NgBuildAnalyticsPlugin } from '../webpack/plugins/analytics';
 import { markAsyncChunksNonInitial } from '../webpack/utils/async-chunks';
 import { normalizeExtraEntryPoints } from '../webpack/utils/helpers';
 import {
   BundleStats,
   ChunkType,
-  JsonChunkStats,
-  JsonCompilationStats,
   generateBundleStats,
   statsErrorsToString,
   statsHasErrors,
@@ -92,41 +89,6 @@ export type BrowserBuilderOutput = json.JsonObject &
     outputPath: string;
   };
 
-export function getAnalyticsConfig(
-  wco: WebpackConfigOptions,
-  context: BuilderContext,
-): webpack.Configuration {
-  if (context.analytics) {
-    // If there's analytics, add our plugin. Otherwise no need to slow down the build.
-    let category = 'build';
-    if (context.builder) {
-      // We already vetted that this is a "safe" package, otherwise the analytics would be noop.
-      category =
-        context.builder.builderName.split(':')[1] || context.builder.builderName || 'build';
-    }
-
-    // The category is the builder name if it's an angular builder.
-    return {
-      plugins: [new NgBuildAnalyticsPlugin(
-        wco.projectRoot,
-        context.analytics,
-        category,
-        !!wco.tsConfig.options.enableIvy,
-      )],
-    };
-  }
-
-  return {};
-}
-
-export function getCompilerConfig(wco: WebpackConfigOptions): webpack.Configuration {
-  if (wco.buildOptions.main || wco.buildOptions.polyfills) {
-    return wco.buildOptions.aot ? getAotConfig(wco) : getNonAotConfig(wco);
-  }
-
-  return {};
-}
-
 async function initialize(
   options: BrowserBuilderSchema,
   context: BuilderContext,
@@ -143,25 +105,21 @@ async function initialize(
   // Assets are processed directly by the builder except when watching
   const adjustedOptions = options.watch ? options : { ...options, assets: [] };
 
-  const {
-    config,
-    projectRoot,
-    projectSourceRoot,
-    i18n,
-  } = await generateI18nBrowserWebpackConfigFromContext(
-    adjustedOptions,
-    context,
-    wco => [
-      getCommonConfig(wco),
-      getBrowserConfig(wco),
-      getStylesConfig(wco),
-      getStatsConfig(wco),
-      getAnalyticsConfig(wco, context),
-      getCompilerConfig(wco),
-      wco.buildOptions.webWorkerTsConfig ? getWorkerConfig(wco) : {},
-    ],
-    { differentialLoadingNeeded },
-  );
+  const { config, projectRoot, projectSourceRoot, i18n } =
+    await generateI18nBrowserWebpackConfigFromContext(
+      adjustedOptions,
+      context,
+      (wco) => [
+        getCommonConfig(wco),
+        getBrowserConfig(wco),
+        getStylesConfig(wco),
+        getStatsConfig(wco),
+        getAnalyticsConfig(wco, context),
+        getTypeScriptConfig(wco),
+        wco.buildOptions.webWorkerTsConfig ? getWorkerConfig(wco) : {},
+      ],
+      { differentialLoadingNeeded },
+    );
 
   // Validate asset option values if processed directly
   if (options.assets?.length && !adjustedOptions.assets?.length) {
@@ -192,7 +150,7 @@ async function initialize(
 /**
  * @experimental Direct usage of this function is considered experimental.
  */
-// tslint:disable-next-line: no-big-function
+// eslint-disable-next-line max-lines-per-function
 export function buildWebpackBrowser(
   options: BrowserBuilderSchema,
   context: BuilderContext,
@@ -213,55 +171,66 @@ export function buildWebpackBrowser(
   let outputPaths: undefined | Map<string, string>;
 
   // Check Angular version.
-  assertCompatibleAngularVersion(context.workspaceRoot, context.logger);
-
-  return from(context.getProjectMetadata(projectName))
-    .pipe(
-      switchMap(async projectMetadata => {
-        const sysProjectRoot = getSystemPath(
-          resolve(normalize(context.workspaceRoot),
-            normalize((projectMetadata.root as string) ?? '')),
-        );
+  assertCompatibleAngularVersion(context.workspaceRoot);
+
+  return from(context.getProjectMetadata(projectName)).pipe(
+    switchMap(async (projectMetadata) => {
+      const sysProjectRoot = getSystemPath(
+        resolve(
+          normalize(context.workspaceRoot),
+          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 { options: compilerOptions } = readTsconfig(options.tsConfig, context.workspaceRoot);
+      const target = compilerOptions.target || ScriptTarget.ES5;
+      const buildBrowserFeatures = new BuildBrowserFeatures(sysProjectRoot);
+      const isDifferentialLoadingNeeded = buildBrowserFeatures.isDifferentialLoadingNeeded(target);
 
-        checkInternetExplorerSupport(buildBrowserFeatures.supportedBrowsers, context.logger);
+      checkInternetExplorerSupport(buildBrowserFeatures.supportedBrowsers, context.logger);
 
-        return {
-          ...(await initialize(options, context, isDifferentialLoadingNeeded, transforms.webpackConfiguration)),
-          buildBrowserFeatures,
+      return {
+        ...(await initialize(
+          options,
+          context,
           isDifferentialLoadingNeeded,
-          target,
-        };
-      }),
-      // tslint:disable-next-line: no-big-function
-      switchMap(({ config, projectRoot, projectSourceRoot, i18n, buildBrowserFeatures, isDifferentialLoadingNeeded, target }) => {
+          transforms.webpackConfiguration,
+        )),
+        buildBrowserFeatures,
+        isDifferentialLoadingNeeded,
+        target,
+      };
+    }),
+    switchMap(
+      // eslint-disable-next-line max-lines-per-function
+      ({
+        config,
+        projectRoot,
+        projectSourceRoot,
+        i18n,
+        buildBrowserFeatures,
+        isDifferentialLoadingNeeded,
+        target,
+      }) => {
         const normalizedOptimization = normalizeOptimization(options.optimization);
 
         return runWebpack(config, context, {
           webpackFactory: require('webpack') as typeof webpack,
-          logging: transforms.logging || (
-            (stats, config) => {
+          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 => {
+          // eslint-disable-next-line max-lines-per-function
+          concatMap(async (buildEvent) => {
             const spinner = new Spinner();
             spinner.enabled = options.progress !== false;
 
-            const {
-              success,
-              emittedFiles = [],
-              outputPath: webpackOutputPath,
-            } = buildEvent;
-            const webpackRawStats = buildEvent.webpackStats as JsonCompilationStats;
+            const { success, emittedFiles = [], outputPath: webpackOutputPath } = buildEvent;
+            const webpackRawStats = buildEvent.webpackStats;
             if (!webpackRawStats) {
               throw new Error('Webpack stats build result is required.');
             }
@@ -300,12 +269,13 @@ export function buildWebpackBrowser(
               const scriptsEntryPointName = normalizeExtraEntryPoints(
                 options.scripts || [],
                 'scripts',
-              ).map(x => x.bundleName);
+              ).map((x) => x.bundleName);
 
               if (isDifferentialLoadingNeeded && options.watch) {
                 moduleFiles = emittedFiles;
                 files = moduleFiles.filter(
-                  x => x.extension === '.css' || (x.name && scriptsEntryPointName.includes(x.name)),
+                  (x) =>
+                    x.extension === '.css' || (x.name && scriptsEntryPointName.includes(x.name)),
                 );
                 if (i18n.shouldInline) {
                   const success = await i18nInlineEmittedFiles(
@@ -377,7 +347,7 @@ export function buildWebpackBrowser(
                   seen.add(file.file);
 
                   if (file.name === 'vendor' || (!mainChunkId && file.name === 'main')) {
-                    // tslint:disable-next-line: no-non-null-assertion
+                    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
                     mainChunkId = file.id!.toString();
                   }
 
@@ -395,15 +365,19 @@ export function buildWebpackBrowser(
                   if (actionOptions.sourceMaps) {
                     try {
                       map = fs.readFileSync(filename + '.map', 'utf8');
-                      if (es5Polyfills) {
+                      if (es5Polyfills || i18n.shouldInline) {
                         fs.unlinkSync(filename + '.map');
                       }
-                    } catch { }
+                    } catch {}
                   }
 
                   if (es5Polyfills) {
                     fs.unlinkSync(filename);
                     filename = filename.replace(/\-es20\d{2}/, '');
+                  } else if (i18n.shouldInline) {
+                    // Original files must be deleted with i18n to avoid the original files from
+                    // being copied over the translated files when copying the project assets.
+                    fs.unlinkSync(filename);
                   }
 
                   const es2015Polyfills = file.file.startsWith('polyfills-es20');
@@ -416,11 +390,13 @@ export function buildWebpackBrowser(
                     code,
                     map,
                     // id is always present for non-assets
-                    // tslint:disable-next-line: no-non-null-assertion
+                    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
                     name: file.id!,
                     runtime: file.file.startsWith('runtime'),
                     ignoreOriginal: es5Polyfills,
                     optimizeOnly: es2015Polyfills,
+                    // When using i18n, file results are kept in memory for further processing
+                    memoryMode: i18n.shouldInline,
                   });
 
                   // ES2015 polyfills are only optimized; optimization check was performed above
@@ -438,6 +414,13 @@ export function buildWebpackBrowser(
                 const processActions: typeof actions = [];
                 let processRuntimeAction: ProcessBundleOptions | undefined;
                 for (const action of actions) {
+                  if (options.verbose) {
+                    context.logger.info(
+                      `[${new Date().toISOString()}] Differential loading file queued: ${
+                        action.filename
+                      }`,
+                    );
+                  }
                   // If SRI is enabled always process the runtime bundle
                   // Lazy route integrity values are stored in the runtime bundle
                   if (action.integrityAlgorithm && action.runtime) {
@@ -447,7 +430,7 @@ export function buildWebpackBrowser(
                   }
                 }
 
-                const executor = new BundleActionExecutor(
+                const differentialLoadingExecutor = new BundleActionExecutor(
                   { cachePath: cacheDownlevelPath, i18n },
                   options.subresourceIntegrity ? 'sha384' : undefined,
                 );
@@ -455,141 +438,184 @@ export function buildWebpackBrowser(
                 // Execute the bundle processing actions
                 try {
                   spinner.start('Generating ES5 bundles for differential loading...');
-                  for await (const result of executor.processAll(processActions)) {
+                  for await (const result of differentialLoadingExecutor.processAll(
+                    processActions,
+                  )) {
+                    if (options.verbose) {
+                      if (result.original) {
+                        context.logger.info(
+                          `[${new Date().toISOString()}] Differential loading file processed: ${
+                            result.original.filename
+                          }`,
+                        );
+                      }
+                      if (result.downlevel) {
+                        context.logger.info(
+                          `[${new Date().toISOString()}] Differential loading file processed: ${
+                            result.downlevel.filename
+                          }`,
+                        );
+                      }
+                    }
                     processResults.push(result);
                   }
+                } finally {
+                  differentialLoadingExecutor.stop();
+                }
 
-                  // Runtime must be processed after all other files
-                  if (processRuntimeAction) {
-                    const runtimeOptions = {
-                      ...processRuntimeAction,
-                      runtimeData: processResults,
-                      supportedBrowsers: buildBrowserFeatures.supportedBrowsers,
-                    };
-                    processResults.push(
-                      await import('../utils/process-bundle').then(m => m.process(runtimeOptions)),
-                    );
-                  }
+                // Runtime must be processed after all other files
+                if (processRuntimeAction) {
+                  const runtimeOptions = {
+                    ...processRuntimeAction,
+                    runtimeData: processResults,
+                    supportedBrowsers: buildBrowserFeatures.supportedBrowsers,
+                  };
+                  processResults.push(
+                    await import('../utils/process-bundle').then((m) => m.process(runtimeOptions)),
+                  );
+                }
 
-                  spinner.succeed('ES5 bundle generation complete.');
+                if (options.verbose) {
+                  context.logger.info(
+                    `[${new Date().toISOString()}] Differential loading processing complete.`,
+                  );
+                }
 
-                  if (i18n.shouldInline) {
-                    spinner.start('Generating localized bundles...');
-                    const inlineActions: InlineOptions[] = [];
-                    const processedFiles = new Set<string>();
-                    for (const result of processResults) {
-                      if (result.original) {
-                        inlineActions.push({
-                          filename: path.basename(result.original.filename),
-                          code: fs.readFileSync(result.original.filename, 'utf8'),
-                          map:
-                            result.original.map &&
-                            fs.readFileSync(result.original.map.filename, 'utf8'),
-                          outputPath: baseOutputPath,
-                          es5: false,
-                          missingTranslation: options.i18nMissingTranslation,
-                          setLocale: result.name === mainChunkId,
-                        });
-                        processedFiles.add(result.original.filename);
-                        if (result.original.map) {
-                          processedFiles.add(result.original.map.filename);
-                        }
+                spinner.succeed('ES5 bundle generation complete.');
+
+                if (i18n.shouldInline) {
+                  spinner.start('Generating localized bundles...');
+                  const inlineActions: InlineOptions[] = [];
+                  for (const result of processResults) {
+                    if (result.original) {
+                      if (options.verbose) {
+                        context.logger.info(
+                          `[${new Date().toISOString()}] i18n localize file queued: ${
+                            result.original.filename
+                          }`,
+                        );
                       }
-                      if (result.downlevel) {
-                        inlineActions.push({
-                          filename: path.basename(result.downlevel.filename),
-                          code: fs.readFileSync(result.downlevel.filename, 'utf8'),
-                          map:
-                            result.downlevel.map &&
-                            fs.readFileSync(result.downlevel.map.filename, 'utf8'),
-                          outputPath: baseOutputPath,
-                          es5: true,
-                          missingTranslation: options.i18nMissingTranslation,
-                          setLocale: result.name === mainChunkId,
-                        });
-                        processedFiles.add(result.downlevel.filename);
-                        if (result.downlevel.map) {
-                          processedFiles.add(result.downlevel.map.filename);
-                        }
+                      inlineActions.push({
+                        filename: path.basename(result.original.filename),
+                        // Memory mode is always enabled for i18n
+                        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                        code: result.original.content!,
+                        map: result.original.map?.content,
+                        outputPath: baseOutputPath,
+                        es5: false,
+                        missingTranslation: options.i18nMissingTranslation,
+                        setLocale: result.name === mainChunkId,
+                      });
+                    }
+                    if (result.downlevel) {
+                      if (options.verbose) {
+                        context.logger.info(
+                          `[${new Date().toISOString()}] i18n localize file queued: ${
+                            result.downlevel.filename
+                          }`,
+                        );
                       }
+                      inlineActions.push({
+                        filename: path.basename(result.downlevel.filename),
+                        // Memory mode is always enabled for i18n
+                        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+                        code: result.downlevel.content!,
+                        map: result.downlevel.map?.content,
+                        outputPath: baseOutputPath,
+                        es5: true,
+                        missingTranslation: options.i18nMissingTranslation,
+                        setLocale: result.name === mainChunkId,
+                      });
                     }
+                  }
 
-                    let hasErrors = false;
-                    try {
-                      for await (const result of executor.inlineAll(inlineActions)) {
-                        if (options.verbose) {
-                          context.logger.info(
-                            `Localized "${result.file}" [${result.count} translation(s)].`,
-                          );
-                        }
-                        for (const diagnostic of result.diagnostics) {
-                          spinner.stop();
-                          if (diagnostic.type === 'error') {
-                            hasErrors = true;
-                            context.logger.error(diagnostic.message);
-                          } else {
-                            context.logger.warn(diagnostic.message);
-                          }
-                          spinner.start();
+                  let hasErrors = false;
+                  const i18nExecutor = new BundleActionExecutor(
+                    { i18n },
+                    options.subresourceIntegrity ? 'sha384' : undefined,
+                  );
+                  try {
+                    let localizedCount = 0;
+                    for await (const result of i18nExecutor.inlineAll(inlineActions)) {
+                      localizedCount++;
+                      if (options.verbose) {
+                        context.logger.info(
+                          `[${new Date().toISOString()}] (${localizedCount}/${
+                            inlineActions.length
+                          }) Localized "${result.file}" [${result.count} translation(s)].`,
+                        );
+                      }
+                      for (const diagnostic of result.diagnostics) {
+                        spinner.stop();
+                        if (diagnostic.type === 'error') {
+                          hasErrors = true;
+                          context.logger.error(diagnostic.message);
+                        } else {
+                          context.logger.warn(diagnostic.message);
                         }
+                        spinner.start();
                       }
+                    }
 
-                      // Copy any non-processed files into the output locations
-                      await copyAssets(
-                        [
-                          {
-                            glob: '**/*',
-                            input: webpackOutputPath,
-                            output: '',
-                            ignore: [...processedFiles].map(f =>
-                              path.relative(webpackOutputPath, f),
-                            ),
-                          },
-                        ],
-                        Array.from(outputPaths.values()),
-                        '',
-                      );
-                    } catch (err) {
-                      spinner.fail('Localized bundle generation failed.');
+                    // Copy any non-processed files into the output locations
+                    await copyAssets(
+                      [
+                        {
+                          glob: '**/*',
+                          input: webpackOutputPath,
+                          output: '',
+                        },
+                      ],
+                      Array.from(outputPaths.values()),
+                      '',
+                    );
+                  } catch (err) {
+                    spinner.fail('Localized bundle generation failed.');
 
-                      return { success: false, error: mapErrorToMessage(err) };
-                    }
+                    return { success: false, error: mapErrorToMessage(err) };
+                  } finally {
+                    i18nExecutor.stop();
+                  }
 
-                    if (hasErrors) {
-                      spinner.fail('Localized bundle generation failed.');
-                    } else {
-                      spinner.succeed('Localized bundle generation complete.');
-                    }
+                  if (hasErrors) {
+                    spinner.fail('Localized bundle generation failed.');
+                  } else {
+                    spinner.succeed('Localized bundle generation complete.');
+                  }
 
-                    if (hasErrors) {
-                      return { success: false };
-                    }
+                  if (hasErrors) {
+                    return { success: false };
                   }
-                } finally {
-                  executor.stop();
                 }
+
                 for (const result of processResults) {
-                  const chunk = webpackStats.chunks?.find((chunk) => chunk.id.toString() === result.name);
+                  const chunk = webpackStats.chunks?.find(
+                    (chunk) => chunk.id?.toString() === result.name,
+                  );
 
                   if (result.original) {
                     bundleInfoStats.push(generateBundleInfoStats(result.original, chunk, 'modern'));
                   }
 
                   if (result.downlevel) {
-                    bundleInfoStats.push(generateBundleInfoStats(result.downlevel, chunk, 'legacy'));
+                    bundleInfoStats.push(
+                      generateBundleInfoStats(result.downlevel, chunk, 'legacy'),
+                    );
                   }
                 }
 
-                const unprocessedChunks = webpackStats.chunks?.filter((chunk) => !processResults
-                  .find((result) => chunk.id.toString() === result.name),
-                ) || [];
+                const unprocessedChunks =
+                  webpackStats.chunks?.filter(
+                    (chunk) =>
+                      !processResults.find((result) => chunk.id?.toString() === result.name),
+                  ) || [];
                 for (const chunk of unprocessedChunks) {
-                  const asset = webpackStats.assets?.find(a => a.name === chunk.files[0]);
+                  const asset = webpackStats.assets?.find((a) => a.name === chunk.files?.[0]);
                   bundleInfoStats.push(generateBundleStats({ ...chunk, size: asset?.size }));
                 }
               } else {
-                files = emittedFiles.filter(x => x.name !== 'polyfills-es5');
-                noModuleFiles = emittedFiles.filter(x => x.name === 'polyfills-es5');
+                files = emittedFiles.filter((x) => x.name !== 'polyfills-es5');
+                noModuleFiles = emittedFiles.filter((x) => x.name === 'polyfills-es5');
                 if (i18n.shouldInline) {
                   const success = await i18nInlineEmittedFiles(
                     context,
@@ -615,10 +641,10 @@ export function buildWebpackBrowser(
                 for (const { severity, message } of budgetFailures) {
                   switch (severity) {
                     case ThresholdSeverity.Warning:
-                      webpackStats.warnings?.push({message});
+                      webpackStats.warnings?.push({ message });
                       break;
                     case ThresholdSeverity.Error:
-                      webpackStats.errors?.push({message});
+                      webpackStats.errors?.push({ message });
                       break;
                     default:
                       assertNever(severity);
@@ -670,6 +696,7 @@ export function buildWebpackBrowser(
                     postTransform: transforms.indexHtml,
                   });
 
+                  let hasErrors = false;
                   for (const [locale, outputPath] of outputPaths.entries()) {
                     try {
                       const { content, warnings, errors } = await indexHtmlGenerator.process({
@@ -684,8 +711,11 @@ export function buildWebpackBrowser(
 
                       if (warnings.length || errors.length) {
                         spinner.stop();
-                        warnings.forEach(m => context.logger.warn(m));
-                        errors.forEach(m => context.logger.error(m));
+                        warnings.forEach((m) => context.logger.warn(m));
+                        errors.forEach((m) => {
+                          context.logger.error(m);
+                          hasErrors = true;
+                        });
                         spinner.start();
                       }
 
@@ -699,7 +729,13 @@ export function buildWebpackBrowser(
                     }
                   }
 
-                  spinner.succeed('Index html generation complete.');
+                  if (hasErrors) {
+                    spinner.fail('Index html generation failed.');
+
+                    return { success: false };
+                  } else {
+                    spinner.succeed('Index html generation complete.');
+                  }
                 }
 
                 if (options.serviceWorker) {
@@ -730,24 +766,22 @@ export function buildWebpackBrowser(
             }
           }),
           map(
-            event =>
+            (event) =>
               ({
                 ...event,
                 baseOutputPath,
                 outputPath: baseOutputPath,
-                outputPaths: outputPaths && Array.from(outputPaths.values()) || [baseOutputPath],
+                outputPaths: (outputPaths && Array.from(outputPaths.values())) || [baseOutputPath],
               } 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 urlJoin(options.baseHref || '', i18n.locales[locale].baseHref ?? `/${locale}/`);
     }
 
     return undefined;
@@ -767,25 +801,28 @@ 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 */,
+    )}`,
+  );
 }
 
 function generateBundleInfoStats(
   bundle: ProcessBundleFile,
-  chunk: JsonChunkStats | undefined,
+  chunk: webpack.StatsChunk | 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,
-    },
-  );
+  return generateBundleStats({
+    size: bundle.size,
+    files: bundle.map ? [bundle.filename, bundle.map.filename] : [bundle.filename],
+    names: chunk?.names,
+    initial: !!chunk?.initial,
+    rendered: true,
+    chunkType,
+  });
 }
 
 function mapEmittedFilesToFileInfo(files: EmittedFiles[] = []): FileInfo[] {
@@ -799,7 +836,10 @@ function mapEmittedFilesToFileInfo(files: EmittedFiles[] = []): FileInfo[] {
   return filteredFiles;
 }
 
-function checkInternetExplorerSupport(supportedBrowsers: string[], logger: logging.LoggerApi): void {
+function checkInternetExplorerSupport(
+  supportedBrowsers: string[],
+  logger: logging.LoggerApi,
+): void {
   const hasIE9 = supportedBrowsers.includes('ie 9');
   const hasIE10 = supportedBrowsers.includes('ie 10');
   const hasIE11 = supportedBrowsers.includes('ie 11');
@@ -808,17 +848,17 @@ function checkInternetExplorerSupport(supportedBrowsers: string[], logger: loggi
     const browsers = (hasIE9 ? 'IE 9' + (hasIE10 ? ' & ' : '') : '') + (hasIE10 ? 'IE 10' : '');
     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 more information, see 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 more information, see https://v10.angular.io/guide/deprecations#ie-9-10-and-mobile',
     );
   }
 
   if (hasIE11) {
     logger.warn(
       `Warning: Support was requested for IE 11 in the project's browserslist configuration. ` +
-      'IE 11 support is deprecated since Angular v12.' +
-      '\nFor more information, see https://angular.io/guide/browser-support',
+        'IE 11 support is deprecated since Angular v12.' +
+        '\nFor more information, see https://angular.io/guide/browser-support',
     );
   }
 }
diff --git a/packages/angular_devkit/build_angular/src/browser/schema.json b/packages/angular_devkit/build_angular/src/browser/schema.json
index b229e7b5627f..814eb83d473b 100644
--- a/packages/angular_devkit/build_angular/src/browser/schema.json
+++ b/packages/angular_devkit/build_angular/src/browser/schema.json
@@ -44,19 +44,14 @@
       "description": "The stylesheet language to use for the application's inline component styles.",
       "type": "string",
       "default": "css",
-      "enum": [
-        "css",
-        "less",
-        "sass",
-        "scss"
-      ]
+      "enum": ["css", "less", "sass", "scss"]
     },
     "stylePreprocessorOptions": {
       "description": "Options to pass to style preprocessors.",
       "type": "object",
       "properties": {
         "includePaths": {
-          "description": "Paths to include. Paths will be resolved to project root.",
+          "description": "Paths to include. Paths will be resolved to workspace root.",
           "type": "array",
           "items": {
             "type": "string"
@@ -69,7 +64,7 @@
     "optimization": {
       "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,
+      "default": true,
       "oneOf": [
         {
           "type": "object",
@@ -113,7 +108,7 @@
                   "properties": {
                     "inline": {
                       "type": "boolean",
-                      "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.",
+                      "description": "Reduce render blocking requests by inlining external Google Fonts and Adobe Fonts 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
                     }
                   },
@@ -153,11 +148,11 @@
       "type": "boolean",
       "description": "Build using Ahead of Time compilation.",
       "x-user-analytics": 13,
-      "default": false
+      "default": true
     },
     "sourceMap": {
       "description": "Output source maps for scripts and styles. For more information, see https://angular.io/guide/workspace-config#source-map-configuration.",
-      "default": true,
+      "default": false,
       "oneOf": [
         {
           "type": "object",
@@ -193,7 +188,7 @@
     "vendorChunk": {
       "type": "boolean",
       "description": "Generate a seperate bundle containing only vendor libraries. This option should only used for development.",
-      "default": true
+      "default": false
     },
     "commonChunk": {
       "type": "boolean",
@@ -257,12 +252,7 @@
       "type": "string",
       "description": "Define the output filename cache-busting hashing mode.",
       "default": "none",
-      "enum": [
-        "none",
-        "all",
-        "media",
-        "bundles"
-      ]
+      "enum": ["none", "all", "media", "bundles"]
     },
     "poll": {
       "type": "number",
@@ -280,23 +270,23 @@
     "extractLicenses": {
       "type": "boolean",
       "description": "Extract all licenses in a separate file.",
-      "default": false
+      "default": true
     },
     "showCircularDependencies": {
       "type": "boolean",
       "description": "Show circular dependency warnings on builds.",
       "default": false,
-      "x-deprecated": "The recommended method to detect circular dependencies in project code is to use a either a lint rule or other external tooling."
+      "x-deprecated": "The recommended method to detect circular dependencies in project code is to use either a lint rule or other external tooling."
     },
     "buildOptimizer": {
       "type": "boolean",
       "description": "Enables '@angular-devkit/build-optimizer' optimizations when using the 'aot' option.",
-      "default": false
+      "default": true
     },
     "namedChunks": {
       "type": "boolean",
       "description": "Use file name for lazy loaded chunks.",
-      "default": true
+      "default": false
     },
     "subresourceIntegrity": {
       "type": "boolean",
@@ -344,11 +334,6 @@
       "description": "Generates a 'stats.json' file which can be analyzed using tools such as 'webpack-bundle-analyzer'.",
       "default": false
     },
-    "forkTypeChecker": {
-      "type": "boolean",
-      "description": "Run the TypeScript type checker in a forked process.",
-      "default": true
-    },
     "budgets": {
       "description": "Budget thresholds to ensure parts of your application stay within boundaries which you set.",
       "type": "array",
@@ -365,11 +350,7 @@
       "type": "string",
       "description": "Define the crossorigin attribute setting of elements that provide CORS support.",
       "default": "none",
-      "enum": [
-        "none",
-        "anonymous",
-        "use-credentials"
-      ]
+      "enum": ["none", "anonymous", "use-credentials"]
     },
     "allowedCommonJsDependencies": {
       "description": "A list of CommonJS packages that are allowed to be used without a build time warning.",
@@ -381,12 +362,7 @@
     }
   },
   "additionalProperties": false,
-  "required": [
-    "outputPath",
-    "index",
-    "main",
-    "tsConfig"
-  ],
+  "required": ["outputPath", "index", "main", "tsConfig"],
   "definitions": {
     "assetPattern": {
       "oneOf": [
@@ -419,11 +395,7 @@
             }
           },
           "additionalProperties": false,
-          "required": [
-            "glob",
-            "input",
-            "output"
-          ]
+          "required": ["glob", "input", "output"]
         },
         {
           "type": "string"
@@ -445,10 +417,7 @@
             }
           },
           "additionalProperties": false,
-          "required": [
-            "src",
-            "replaceWith"
-          ]
+          "required": ["src", "replaceWith"]
         },
         {
           "type": "object",
@@ -463,10 +432,7 @@
             }
           },
           "additionalProperties": false,
-          "required": [
-            "replace",
-            "with"
-          ]
+          "required": ["replace", "with"]
         }
       ]
     },
@@ -491,9 +457,7 @@
             }
           },
           "additionalProperties": false,
-          "required": [
-            "input"
-          ]
+          "required": ["input"]
         },
         {
           "type": "string",
@@ -507,15 +471,7 @@
         "type": {
           "type": "string",
           "description": "The type of budget.",
-          "enum": [
-            "all",
-            "allScript",
-            "any",
-            "anyScript",
-            "anyComponentStyle",
-            "bundle",
-            "initial"
-          ]
+          "enum": ["all", "allScript", "any", "anyScript", "anyComponentStyle", "bundle", "initial"]
         },
         "name": {
           "type": "string",
@@ -551,9 +507,7 @@
         }
       },
       "additionalProperties": false,
-      "required": [
-        "type"
-      ]
+      "required": ["type"]
     }
   }
 }
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 683d08993c86..e3b557cadde6 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,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 { Architect } from '@angular-devkit/architect';
 import { BrowserBuilderOutput } from '@angular-devkit/build-angular';
 import { join, normalize, relative, virtualFs } from '@angular-devkit/core';
@@ -12,7 +13,6 @@ import { Observable } from 'rxjs';
 import { take, tap } from 'rxjs/operators';
 import { createArchitect, host } from '../../test-utils';
 
-
 describe('Browser Builder allow js', () => {
   const targetSpec = { project: 'app', target: 'build' };
   let architect: Architect;
@@ -29,14 +29,10 @@ describe('Browser Builder allow js', () => {
       'src/main.ts': `import { a } from './my-js-file'; console.log(a);`,
     });
 
-    host.replaceInFile(
-      'tsconfig.json',
-      '"target": "es2017"',
-      '"target": "es5", "allowJs": true',
-    );
+    host.replaceInFile('tsconfig.json', '"target": "es2017"', '"target": "es5", "allowJs": true');
 
     const run = await architect.scheduleTarget(targetSpec);
-    const output = await run.result as BrowserBuilderOutput;
+    const output = (await run.result) as BrowserBuilderOutput;
     expect(output.success).toBe(true);
 
     const content = virtualFs.fileBufferToString(
@@ -54,16 +50,12 @@ describe('Browser Builder allow js', () => {
       'src/main.ts': `import { a } from './my-js-file'; console.log(a);`,
     });
 
-    host.replaceInFile(
-      'tsconfig.json',
-      '"target": "es2017"',
-      '"target": "es5", "allowJs": true',
-    );
+    host.replaceInFile('tsconfig.json', '"target": "es2017"', '"target": "es5", "allowJs": true');
 
     const overrides = { aot: true };
 
     const run = await architect.scheduleTarget(targetSpec, overrides);
-    const output = await run.result as BrowserBuilderOutput;
+    const output = (await run.result) as BrowserBuilderOutput;
     expect(output.success).toBe(true);
 
     const content = virtualFs.fileBufferToString(
@@ -81,41 +73,37 @@ describe('Browser Builder allow js', () => {
       'src/main.ts': `import { a } from './my-js-file'; console.log(a);`,
     });
 
-    host.replaceInFile(
-      'tsconfig.json',
-      '"target": "es2017"',
-      '"target": "es5", "allowJs": true',
-    );
+    host.replaceInFile('tsconfig.json', '"target": "es2017"', '"target": "es5", "allowJs": true');
 
     const overrides = { watch: true };
 
     let buildCount = 1;
     const run = await architect.scheduleTarget(targetSpec, overrides);
 
-    await (run.output as Observable<BrowserBuilderOutput>).pipe(
-      tap(output => {
-        const path = relative(host.root(), join(normalize(output.outputPath), 'main.js'));
-        const content = virtualFs.fileBufferToString(
-          host.scopedSync().read(path),
-        );
-
-        switch (buildCount) {
-          case 1:
-            expect(content).toContain('var a = 2');
-            host.writeMultipleFiles({
-              'src/my-js-file.js': `console.log(1); export const a = 1;`,
-            });
-            break;
-          case 2:
-            expect(content).toContain('var a = 1');
-            break;
-        }
-
-        buildCount++;
-      }),
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      take(2),
-    ).toPromise();
+    await (run.output as Observable<BrowserBuilderOutput>)
+      .pipe(
+        tap((output) => {
+          const path = relative(host.root(), join(normalize(output.outputPath), 'main.js'));
+          const content = virtualFs.fileBufferToString(host.scopedSync().read(path));
+
+          switch (buildCount) {
+            case 1:
+              expect(content).toContain('var a = 2');
+              host.writeMultipleFiles({
+                'src/my-js-file.js': `console.log(1); export const a = 1;`,
+              });
+              break;
+            case 2:
+              expect(content).toContain('var a = 1');
+              break;
+          }
+
+          buildCount++;
+        }),
+        tap((buildEvent) => expect(buildEvent.success).toBe(true)),
+        take(2),
+      )
+      .toPromise();
 
     await run.stop();
   });
diff --git a/packages/angular_devkit/build_angular/src/browser/specs/aot_spec.ts b/packages/angular_devkit/build_angular/src/browser/specs/aot_spec.ts
index 39f955a82507..e42fb2809755 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
@@ -41,11 +41,7 @@ describe('Browser Builder AOT', () => {
       aot: true,
     };
 
-    host.replaceInFile(
-      'src/app/app.component.ts',
-      'app.component.css',
-      'app.component.scss',
-    );
+    host.replaceInFile('src/app/app.component.ts', 'app.component.css', 'app.component.scss');
 
     host.writeMultipleFiles({
       'src/app/app.component.scss': `
@@ -55,7 +51,7 @@ describe('Browser Builder AOT', () => {
 
     const logger = new logging.Logger('');
     const logs: string[] = [];
-    logger.subscribe(e => logs.push(e.message));
+    logger.subscribe((e) => logs.push(e.message));
 
     const run = await architect.scheduleTarget(targetSpec, overrides, { logger });
     const output = await run.result;
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..278bc3c2ed4a 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
@@ -11,7 +11,6 @@ import { BrowserBuilderOutput } from '@angular-devkit/build-angular';
 import { join, normalize, tags, virtualFs } from '@angular-devkit/core';
 import { createArchitect, host } from '../../test-utils';
 
-
 describe('Browser Builder base href', () => {
   const targetSpec = { project: 'app', target: 'build' };
   let architect: Architect;
@@ -30,7 +29,7 @@ describe('Browser Builder base href', () => {
 
     const overrides = { baseHref: '/myUrl' };
     const run = await architect.scheduleTarget(targetSpec, overrides);
-    const output = await run.result as BrowserBuilderOutput;
+    const output = (await run.result) as BrowserBuilderOutput;
 
     expect(output.success).toBe(true);
     const fileName = join(normalize(output.outputPath), 'index.html');
@@ -50,7 +49,7 @@ describe('Browser Builder base href', () => {
 
     const overrides = { baseHref: '/myUrl' };
     const run = await architect.scheduleTarget(targetSpec, overrides);
-    const output = await run.result as BrowserBuilderOutput;
+    const output = (await run.result) as BrowserBuilderOutput;
     expect(output.success).toBe(true);
     const fileName = join(normalize(output.outputPath), 'index.html');
     const content = virtualFs.fileBufferToString(await host.read(normalize(fileName)).toPromise());
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 f1b7c8cf72fb..beeacd8e5738 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,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 { Architect } from '@angular-devkit/architect';
 import { logging } from '@angular-devkit/core';
 import { createArchitect, host } from '../../test-utils';
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..301a0f32bdac 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,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
  */
+
 import { Architect } from '@angular-devkit/architect';
 import { BrowserBuilderOutput } from '@angular-devkit/build-angular';
 import { join, normalize } from '@angular-devkit/core';
 import { browserBuild, createArchitect, host } from '../../test-utils';
 
-
 describe('Browser Builder build optimizer', () => {
   const targetSpec = { project: 'app', target: 'build' };
   let architect: Architect;
@@ -42,7 +42,7 @@ describe('Browser Builder build optimizer', () => {
     const boOverrides = { ...noBoOverrides, buildOptimizer: true };
 
     const run = await architect.scheduleTarget(targetSpec, noBoOverrides);
-    const output = await run.result as BrowserBuilderOutput;
+    const output = (await run.result) as BrowserBuilderOutput;
 
     expect(output.success).toBe(true);
 
@@ -54,7 +54,7 @@ describe('Browser Builder build optimizer', () => {
     await run.stop();
 
     const boRun = await architect.scheduleTarget(targetSpec, boOverrides);
-    const boOutput = await run.result as BrowserBuilderOutput;
+    const boOutput = (await run.result) as BrowserBuilderOutput;
     expect(boOutput.success).toBe(true);
 
     const boStats = await host.stat(join(normalize(output.outputPath), 'main.js')).toPromise();
@@ -66,13 +66,16 @@ describe('Browser Builder build optimizer', () => {
 
     const sizeDiff = Math.round(((boSize - noBoSize) / noBoSize) * 10000) / 100;
     if (sizeDiff > -1 && sizeDiff < 0) {
-      throw new Error('Total size difference is too small, '
-        + 'build optimizer does not seem to have made any optimizations.');
+      throw new Error(
+        'Total size difference is too small, ' +
+          'build optimizer does not seem to have made any optimizations.',
+      );
     }
 
     if (sizeDiff > 1) {
-      throw new Error('Total size difference is positive, '
-        + 'build optimizer made the bundle bigger.');
+      throw new Error(
+        'Total size difference is positive, ' + 'build optimizer made the bundle bigger.',
+      );
     }
   });
 });
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 e8fbf1434282..dc59ff658318 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,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 } from '@angular-devkit/architect';
 import { logging } from '@angular-devkit/core';
 import { createArchitect, host } from '../../test-utils';
 
-
 describe('Browser Builder bundle budgets', () => {
   const cssExtensions = ['css', 'scss', 'less', 'styl'];
   const targetSpec = { project: 'app', target: 'build' };
@@ -28,7 +28,7 @@ describe('Browser Builder bundle budgets', () => {
     };
     const logger = new logging.Logger('');
     const logs: string[] = [];
-    logger.subscribe(e => logs.push(e.message));
+    logger.subscribe((e) => logs.push(e.message));
 
     const run = await architect.scheduleTarget(targetSpec, overrides, { logger });
     const output = await run.result;
@@ -56,7 +56,7 @@ describe('Browser Builder bundle budgets', () => {
     };
     const logger = new logging.Logger('');
     const logs: string[] = [];
-    logger.subscribe(e => logs.push(e.message));
+    logger.subscribe((e) => logs.push(e.message));
 
     const run = await architect.scheduleTarget(targetSpec, overrides, { logger });
     const output = await run.result;
@@ -65,7 +65,7 @@ describe('Browser Builder bundle budgets', () => {
     await run.stop();
   });
 
-  cssExtensions.forEach(ext => {
+  cssExtensions.forEach((ext) => {
     it(`shows warnings for large component ${ext} when using 'anyComponentStyle' when AOT`, async () => {
       const overrides = {
         aot: true,
@@ -94,7 +94,7 @@ describe('Browser Builder bundle budgets', () => {
 
       const logger = new logging.Logger('');
       const logs: string[] = [];
-      logger.subscribe(e => logs.push(e.message));
+      logger.subscribe((e) => logs.push(e.message));
 
       const run = await architect.scheduleTarget(targetSpec, overrides, { logger });
       const output = await run.result;
@@ -104,7 +104,7 @@ describe('Browser Builder bundle budgets', () => {
     });
   });
 
-  cssExtensions.forEach(ext => {
+  cssExtensions.forEach((ext) => {
     it(`shows error for large component ${ext} when using 'anyComponentStyle' when AOT`, async () => {
       const overrides = {
         aot: true,
@@ -133,7 +133,7 @@ describe('Browser Builder bundle budgets', () => {
 
       const logger = new logging.Logger('');
       const logs: string[] = [];
-      logger.subscribe(e => logs.push(e.message));
+      logger.subscribe((e) => logs.push(e.message));
 
       const run = await architect.scheduleTarget(targetSpec, overrides, { logger });
       const output = await run.result;
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..ac28868cc072 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
@@ -55,7 +55,7 @@ describe('Browser Builder crossOrigin', () => {
     const fileName = join(normalize(output.outputPath), 'index.html');
     const content = virtualFs.fileBufferToString(await host.read(normalize(fileName)).toPromise());
     expect(content).toBe(
-        `<html><head><base href="/">` +
+      `<html><head><base href="/">` +
         `<link rel="stylesheet" href="styles.css" crossorigin="anonymous"></head>` +
         `<body><app-root></app-root>` +
         `<script src="runtime.js" crossorigin="anonymous" defer></script>` +
@@ -74,7 +74,7 @@ describe('Browser Builder crossOrigin', () => {
     const fileName = join(normalize(output.outputPath), 'index.html');
     const content = virtualFs.fileBufferToString(await host.read(normalize(fileName)).toPromise());
     expect(content).toBe(
-        `<html><head><base href="/">` +
+      `<html><head><base href="/">` +
         `<link rel="stylesheet" href="styles.css"></head>` +
         `<body><app-root></app-root>` +
         `<script src="runtime.js" defer></script>` +
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 550dd8d3d8e1..a9cd616395a1 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,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
  */
+
 import { Architect } from '@angular-devkit/architect';
 import { BrowserBuilderOutput } from '@angular-devkit/build-angular';
 import { join, normalize, virtualFs } from '@angular-devkit/core';
 import { createArchitect, host } from '../../test-utils';
 
-
 describe('Browser Builder deploy url', () => {
   const targetSpec = { project: 'app', target: 'build' };
   let architect: Architect;
@@ -33,7 +33,7 @@ describe('Browser Builder deploy url', () => {
     });
 
     const run = await architect.scheduleTarget(targetSpec, overrides);
-    const output = await run.result as BrowserBuilderOutput;
+    const output = (await run.result) as BrowserBuilderOutput;
     expect(output.success).toBe(true);
     expect(output.outputPath).not.toBeUndefined();
     const outputPath = normalize(output.outputPath);
@@ -48,8 +48,8 @@ describe('Browser Builder deploy url', () => {
     expect(runtimeContent).toContain('deployUrl/');
 
     const run2 = await architect.scheduleTarget(targetSpec, overrides2);
-    const output2 = await run2.result as BrowserBuilderOutput;
-    expect(output2.outputPath).toEqual(outputPath);  // These should be the same.
+    const output2 = (await run2.result) as BrowserBuilderOutput;
+    expect(output2.outputPath).toEqual(outputPath); // These should be the same.
 
     const content2 = virtualFs.fileBufferToString(await host.read(normalize(fileName)).toPromise());
     expect(content2).toContain('http://example.com/some/path/main.js');
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 4908d4105b6c..d874ac80c43f 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
@@ -12,7 +12,6 @@ import { browserBuild, createArchitect, host } from '../../test-utils';
 
 const TEST_TIMEOUT = 8 * 60 * 1000;
 
-// tslint:disable-next-line: no-big-function
 describe('Browser Builder with differential loading', () => {
   const target = { project: 'app', target: 'build' };
   let architect: Architect;
@@ -29,143 +28,169 @@ describe('Browser Builder with differential loading', () => {
 
   afterEach(async () => host.restore().toPromise());
 
-  it('emits all the neccessary files for default configuration', async () => {
-    const { files } = await browserBuild(architect, host, target);
-
-    const expectedOutputs = [
-      'favicon.ico',
-      'index.html',
-
-      'main-es2017.js',
-      'main-es2017.js.map',
-      'main-es5.js',
-      'main-es5.js.map',
-
-      'polyfills-es2017.js',
-      'polyfills-es2017.js.map',
-      'polyfills-es5.js',
-      'polyfills-es5.js.map',
-
-      'runtime-es2017.js',
-      'runtime-es2017.js.map',
-      'runtime-es5.js',
-      'runtime-es5.js.map',
-
-      'vendor-es2017.js',
-      'vendor-es2017.js.map',
-      'vendor-es5.js',
-      'vendor-es5.js.map',
-
-      'styles.css',
-      'styles.css.map',
-    ] as PathFragment[];
-
-    expect(Object.keys(files)).toEqual(jasmine.arrayWithExactContents(expectedOutputs));
-  }, TEST_TIMEOUT);
-
-  it('emits all the neccessary files for target of ESNext', async () => {
-    host.replaceInFile(
-      'tsconfig.json',
-      '"target": "es2017",',
-      `"target": "esnext",`,
-    );
-
-    const { files } = await browserBuild(architect, host, target);
-
-    const expectedOutputs = [
-      'favicon.ico',
-      'index.html',
-
-      'main-esnext.js',
-      'main-esnext.js.map',
-      'main-es5.js',
-      'main-es5.js.map',
-
-      'polyfills-esnext.js',
-      'polyfills-esnext.js.map',
-      'polyfills-es5.js',
-      'polyfills-es5.js.map',
-
-      'runtime-esnext.js',
-      'runtime-esnext.js.map',
-      'runtime-es5.js',
-      'runtime-es5.js.map',
-
-      'vendor-esnext.js',
-      'vendor-esnext.js.map',
-      'vendor-es5.js',
-      'vendor-es5.js.map',
-
-      'styles.css',
-      'styles.css.map',
-    ] as PathFragment[];
-
-    expect(Object.keys(files)).toEqual(jasmine.arrayWithExactContents(expectedOutputs));
-  }, TEST_TIMEOUT);
-
-  it('deactivates differential loading for watch mode', async () => {
-    const { files } = await browserBuild(architect, host, target, { watch: true });
-
-    const expectedOutputs = [
-      'favicon.ico',
-      'index.html',
-
-      'main-es2017.js',
-      'main-es2017.js.map',
-
-      'polyfills-es2017.js',
-      'polyfills-es2017.js.map',
-
-      'runtime-es2017.js',
-      'runtime-es2017.js.map',
-
-      'vendor-es2017.js',
-      'vendor-es2017.js.map',
-
-      'styles.css',
-      'styles.css.map',
-    ] as PathFragment[];
-
-    expect(Object.keys(files)).toEqual(jasmine.arrayWithExactContents(expectedOutputs));
-  }, TEST_TIMEOUT);
-
-  it('emits the right ES formats', async () => {
-    const { files } = await browserBuild(architect, host, target, {
-      optimization: true,
-      vendorChunk: false,
-    });
-    expect(await files['main-es5.js']).not.toContain('const ');
-    expect(await files['main-es2017.js']).toContain('const ');
-  }, TEST_TIMEOUT);
-
-  it('wraps ES5 scripts in an IIFE', async () => {
-    const { files } = await browserBuild(architect, host, target, { optimization: false });
-    expect(await files['main-es5.js']).toMatch(/^\(function \(\) \{/);
-    expect(await files['main-es2017.js']).not.toMatch(/^\(function \(\) \{/);
-  }, TEST_TIMEOUT);
-
-  it('uses the right zone.js variant', async () => {
-    const { files } = await browserBuild(architect, host, target, { optimization: false });
-    expect(await files['polyfills-es5.js']).toContain('zone.js/plugins/zone-legacy');
-    expect(await files['polyfills-es5.js']).toContain('registerElementPatch');
-    expect(await files['polyfills-es2017.js']).not.toContain('zone.js/plugins/zone-legacy');
-    expect(await files['polyfills-es2017.js']).not.toContain('registerElementPatch');
-  }, TEST_TIMEOUT);
-
-  it('adds `type="module"` when differential loading is needed', async () => {
-    host.writeMultipleFiles({
-      '.browserslistrc': `
+  it(
+    'emits all the neccessary files for default configuration',
+    async () => {
+      const { files } = await browserBuild(architect, host, target, { sourceMap: true });
+
+      const expectedOutputs = [
+        'favicon.ico',
+        'index.html',
+
+        'main-es2017.js',
+        'main-es2017.js.map',
+        'main-es5.js',
+        'main-es5.js.map',
+
+        'polyfills-es2017.js',
+        'polyfills-es2017.js.map',
+        'polyfills-es5.js',
+        'polyfills-es5.js.map',
+
+        'runtime-es2017.js',
+        'runtime-es2017.js.map',
+        'runtime-es5.js',
+        'runtime-es5.js.map',
+
+        'vendor-es2017.js',
+        'vendor-es2017.js.map',
+        'vendor-es5.js',
+        'vendor-es5.js.map',
+
+        'styles.css',
+        'styles.css.map',
+      ] as PathFragment[];
+
+      expect(Object.keys(files)).toEqual(jasmine.arrayWithExactContents(expectedOutputs));
+    },
+    TEST_TIMEOUT,
+  );
+
+  it(
+    'emits all the neccessary files for target of ESNext',
+    async () => {
+      host.replaceInFile('tsconfig.json', '"target": "es2017",', `"target": "esnext",`);
+
+      const { files } = await browserBuild(architect, host, target, { sourceMap: true });
+      const expectedOutputs = [
+        'favicon.ico',
+        'index.html',
+
+        'main-esnext.js',
+        'main-esnext.js.map',
+        'main-es5.js',
+        'main-es5.js.map',
+
+        'polyfills-esnext.js',
+        'polyfills-esnext.js.map',
+        'polyfills-es5.js',
+        'polyfills-es5.js.map',
+
+        'runtime-esnext.js',
+        'runtime-esnext.js.map',
+        'runtime-es5.js',
+        'runtime-es5.js.map',
+
+        'vendor-esnext.js',
+        'vendor-esnext.js.map',
+        'vendor-es5.js',
+        'vendor-es5.js.map',
+
+        'styles.css',
+        'styles.css.map',
+      ] as PathFragment[];
+
+      expect(Object.keys(files)).toEqual(jasmine.arrayWithExactContents(expectedOutputs));
+    },
+    TEST_TIMEOUT,
+  );
+
+  it(
+    'deactivates differential loading for watch mode',
+    async () => {
+      const { files } = await browserBuild(architect, host, target, {
+        watch: true,
+        sourceMap: true,
+      });
+
+      const expectedOutputs = [
+        'favicon.ico',
+        'index.html',
+
+        'main-es2017.js',
+        'main-es2017.js.map',
+
+        'polyfills-es2017.js',
+        'polyfills-es2017.js.map',
+
+        'runtime-es2017.js',
+        'runtime-es2017.js.map',
+
+        'vendor-es2017.js',
+        'vendor-es2017.js.map',
+
+        'styles.css',
+        'styles.css.map',
+      ] as PathFragment[];
+
+      expect(Object.keys(files)).toEqual(jasmine.arrayWithExactContents(expectedOutputs));
+    },
+    TEST_TIMEOUT,
+  );
+
+  it(
+    'emits the right ES formats',
+    async () => {
+      const { files } = await browserBuild(architect, host, target, {
+        optimization: true,
+        vendorChunk: false,
+      });
+      expect(await files['main-es5.js']).not.toContain('const ');
+      expect(await files['main-es2017.js']).toContain('const ');
+    },
+    TEST_TIMEOUT,
+  );
+
+  it(
+    'wraps ES5 scripts in an IIFE',
+    async () => {
+      const { files } = await browserBuild(architect, host, target, { optimization: false });
+      expect(await files['main-es5.js']).toMatch(/^\(function \(\) \{/);
+      expect(await files['main-es2017.js']).not.toMatch(/^\(function \(\) \{/);
+    },
+    TEST_TIMEOUT,
+  );
+
+  it(
+    'uses the right zone.js variant',
+    async () => {
+      const { files } = await browserBuild(architect, host, target, { optimization: false });
+      expect(await files['polyfills-es5.js']).toContain('zone.js/plugins/zone-legacy');
+      expect(await files['polyfills-es5.js']).toContain('registerElementPatch');
+      expect(await files['polyfills-es2017.js']).not.toContain('zone.js/plugins/zone-legacy');
+      expect(await files['polyfills-es2017.js']).not.toContain('registerElementPatch');
+    },
+    TEST_TIMEOUT,
+  );
+
+  it(
+    'adds `type="module"` when differential loading is needed',
+    async () => {
+      host.writeMultipleFiles({
+        '.browserslistrc': `
         last 1 chrome version
         IE 9
       `,
-    });
-
-    const { files } = await browserBuild(architect, host, target, { watch: true });
-    expect(await files['index.html']).toContain(
-      '<script src="runtime-es2017.js" type="module"></script>' +
-      '<script src="polyfills-es2017.js" type="module"></script>' +
-      '<script src="vendor-es2017.js" type="module"></script>' +
-      '<script src="main-es2017.js" type="module"></script>',
-    );
-  }, TEST_TIMEOUT);
+      });
+
+      const { files } = await browserBuild(architect, host, target, { watch: true });
+      expect(await files['index.html']).toContain(
+        '<script src="runtime-es2017.js" type="module"></script>' +
+          '<script src="polyfills-es2017.js" type="module"></script>' +
+          '<script src="vendor-es2017.js" type="module"></script>' +
+          '<script src="main-es2017.js" type="module"></script>',
+      );
+    },
+    TEST_TIMEOUT,
+  );
 });
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 11d8306ea0c0..2f1021edee1b 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
@@ -21,19 +21,11 @@ describe('Browser Builder errors', () => {
   afterEach(async () => host.restore().toPromise());
 
   it('shows error when files are not part of the compilation', async () => {
-    host.replaceInFile(
-      'src/tsconfig.app.json',
-      /,\r?\n?\s*"polyfills\.ts"/,
-      '',
-    );
-    host.replaceInFile(
-      'src/tsconfig.app.json',
-      '"**/*.ts"',
-      '"**/*.d.ts"',
-    );
+    host.replaceInFile('src/tsconfig.app.json', /,\r?\n?\s*"polyfills\.ts"/, '');
+    host.replaceInFile('src/tsconfig.app.json', '"**/*.ts"', '"**/*.d.ts"');
     const logger = new logging.Logger('');
     const logs: string[] = [];
-    logger.subscribe(e => logs.push(e.message));
+    logger.subscribe((e) => logs.push(e.message));
 
     const run = await architect.scheduleTarget(targetSpec, {}, { logger });
     const output = await run.result;
@@ -46,7 +38,7 @@ describe('Browser Builder errors', () => {
     host.appendToFile('src/app/app.component.ts', ']]]');
     const logger = new logging.Logger('');
     const logs: string[] = [];
-    logger.subscribe(e => logs.push(e.message));
+    logger.subscribe((e) => logs.push(e.message));
 
     const run = await architect.scheduleTarget(targetSpec, {}, { logger });
     const output = await run.result;
@@ -59,7 +51,7 @@ describe('Browser Builder errors', () => {
     host.replaceInFile('src/app/app.component.ts', `'app-root'`, `(() => 'app-root')()`);
     const logger = new logging.Logger('');
     const logs: string[] = [];
-    logger.subscribe(e => logs.push(e.message));
+    logger.subscribe((e) => logs.push(e.message));
 
     const run = await architect.scheduleTarget(targetSpec, { aot: true }, { logger });
     const output = await run.result;
@@ -81,7 +73,7 @@ describe('Browser Builder errors', () => {
     const overrides = { main: 'src/not-main.js' };
     const logger = new logging.Logger('');
     const logs: string[] = [];
-    logger.subscribe(e => logs.push(e.message));
+    logger.subscribe((e) => logs.push(e.message));
 
     const run = await architect.scheduleTarget(targetSpec, overrides, { logger });
     const output = await run.result;
@@ -90,6 +82,8 @@ describe('Browser Builder errors', () => {
     // Wait for the builder to complete
     await run.stop();
 
-    expect(logs.join()).toContain(`export 'missingExport' (imported as 'missingExport') was not found in 'rxjs'`);
+    expect(logs.join()).toContain(
+      `export 'missingExport' (imported as 'missingExport') was not found in 'rxjs'`,
+    );
   });
 });
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..25007f98efaf 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,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 { Architect } from '@angular-devkit/architect';
 import { browserBuild, createArchitect, host } from '../../test-utils';
 
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..abd9144a3092 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,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
  */
+
 import { Architect } from '@angular-devkit/architect';
 import { BrowserBuilderOutput } from '@angular-devkit/build-angular';
 import { join, normalize, tags, virtualFs, workspaces } from '@angular-devkit/core';
 import { createArchitect, host } from '../../test-utils';
 
-// tslint:disable-next-line:no-big-function
 describe('Browser Builder index HTML processing', () => {
   const targetSpec = { project: 'app', target: 'build' };
   let architect: Architect;
@@ -25,19 +25,20 @@ describe('Browser Builder index HTML processing', () => {
     host.writeMultipleFiles({
       'src/index.html': Buffer.from(
         '\ufeff<html><head><base href="/"></head><body><app-root></app-root></body></html>',
-        'utf8'),
+        'utf8',
+      ),
     });
 
     const run = await architect.scheduleTarget(targetSpec);
-    const output = await run.result as BrowserBuilderOutput;
+    const output = (await run.result) as BrowserBuilderOutput;
     expect(output.success).toBe(true);
     const fileName = join(normalize(output.outputPath), 'index.html');
     const content = virtualFs.fileBufferToString(await host.read(normalize(fileName)).toPromise());
     expect(content).toBe(
-      `<html><head><base href="/"><link rel="stylesheet" href="styles.css"></head>`
-      + `<body><app-root></app-root><script src="runtime.js" defer></script>`
-      + `<script src="polyfills.js" defer></script>`
-      + `<script src="vendor.js" defer></script><script src="main.js" defer></script></body></html>`,
+      `<html><head><base href="/"><link rel="stylesheet" href="styles.css"></head>` +
+        `<body><app-root></app-root><script src="runtime.js" defer></script>` +
+        `<script src="polyfills.js" defer></script>` +
+        `<script src="vendor.js" defer></script><script src="main.js" defer></script></body></html>`,
     );
     await run.stop();
   });
@@ -47,20 +48,21 @@ describe('Browser Builder index HTML processing', () => {
     host.writeMultipleFiles({
       'src/index.html': Buffer.from(
         '\ufeff<html><head><base href="/"></head><body><app-root></app-root></body></html>',
-        'utf16le'),
+        'utf16le',
+      ),
     });
 
     const run = await architect.scheduleTarget(targetSpec);
-    const output = await run.result as BrowserBuilderOutput;
+    const output = (await run.result) as BrowserBuilderOutput;
     expect(output.success).toBe(true);
     const fileName = join(normalize(output.outputPath), 'index.html');
     const content = virtualFs.fileBufferToString(await host.read(normalize(fileName)).toPromise());
     expect(content).toBe(
-      `<html><head><base href="/"><link rel="stylesheet" href="styles.css"></head>`
-      + `<body><app-root></app-root>`
-      + `<script src="runtime.js" defer></script><script src="polyfills.js" defer></script>`
-      + `<script src="vendor.js" defer></script>`
-      + `<script src="main.js" defer></script></body></html>`,
+      `<html><head><base href="/"><link rel="stylesheet" href="styles.css"></head>` +
+        `<body><app-root></app-root>` +
+        `<script src="runtime.js" defer></script><script src="polyfills.js" defer></script>` +
+        `<script src="vendor.js" defer></script>` +
+        `<script src="main.js" defer></script></body></html>`,
     );
     await run.stop();
   });
@@ -74,15 +76,15 @@ describe('Browser Builder index HTML processing', () => {
     });
 
     const run = await architect.scheduleTarget(targetSpec);
-    const output = await run.result as BrowserBuilderOutput;
+    const output = (await run.result) as BrowserBuilderOutput;
     expect(output.success).toBe(true);
     const fileName = join(normalize(output.outputPath), 'index.html');
     const content = virtualFs.fileBufferToString(await host.read(normalize(fileName)).toPromise());
     expect(content).toBe(
-      `<html><head><title>&iacute;</title><base href="/"><link rel="stylesheet" href="styles.css"></head> `
-      + `<body><app-root></app-root><script src="runtime.js" defer></script>`
-      + `<script src="polyfills.js" defer></script>`
-      + `<script src="vendor.js" defer></script><script src="main.js" defer></script></body></html>`,
+      `<html><head><title>&iacute;</title><base href="/"><link rel="stylesheet" href="styles.css"></head> ` +
+        `<body><app-root></app-root><script src="runtime.js" defer></script>` +
+        `<script src="polyfills.js" defer></script>` +
+        `<script src="vendor.js" defer></script><script src="main.js" defer></script></body></html>`,
     );
     await run.stop();
   });
@@ -96,21 +98,24 @@ describe('Browser Builder index HTML processing', () => {
     });
 
     const run = await architect.scheduleTarget(targetSpec);
-    const output = await run.result as BrowserBuilderOutput;
+    const output = (await run.result) as BrowserBuilderOutput;
     expect(output.success).toBe(true);
     const fileName = join(normalize(output.outputPath), 'index.html');
     const content = virtualFs.fileBufferToString(await host.read(normalize(fileName)).toPromise());
     expect(content).toBe(
-      `<html><head><base href="/"><%= csrf_meta_tags %><link rel="stylesheet" href="styles.css"></head> `
-      + `<body><app-root></app-root><script src="runtime.js" defer></script>`
-      + `<script src="polyfills.js" defer></script>`
-      + `<script src="vendor.js" defer></script><script src="main.js" defer></script></body></html>`,
+      `<html><head><base href="/"><%= csrf_meta_tags %><link rel="stylesheet" href="styles.css"></head> ` +
+        `<body><app-root></app-root><script src="runtime.js" defer></script>` +
+        `<script src="polyfills.js" defer></script>` +
+        `<script src="vendor.js" defer></script><script src="main.js" defer></script></body></html>`,
     );
     await run.stop();
   });
 
   it('uses the input value from the index option longform', async () => {
-    const { workspace } = await workspaces.readWorkspace(host.root(), workspaces.createWorkspaceHost(host));
+    const { workspace } = await workspaces.readWorkspace(
+      host.root(),
+      workspaces.createWorkspaceHost(host),
+    );
     const app = workspace.projects.get('app');
     if (!app) {
       fail('Test application "app" not found.');
@@ -146,15 +151,18 @@ describe('Browser Builder index HTML processing', () => {
     const outputIndexPath = join(host.root(), 'dist', 'index.html');
     const content = await host.read(normalize(outputIndexPath)).toPromise();
     expect(virtualFs.fileBufferToString(content)).toBe(
-      `<html><head><base href="/"><%= csrf_meta_tags %><link rel="stylesheet" href="styles.css"></head> `
-      + `<body><app-root></app-root><script src="runtime.js" defer></script>`
-      + `<script src="polyfills.js" defer></script>`
-      + `<script src="vendor.js" defer></script><script src="main.js" defer></script></body></html>`,
+      `<html><head><base href="/"><%= csrf_meta_tags %><link rel="stylesheet" href="styles.css"></head> ` +
+        `<body><app-root></app-root><script src="runtime.js" defer></script>` +
+        `<script src="polyfills.js" defer></script>` +
+        `<script src="vendor.js" defer></script><script src="main.js" defer></script></body></html>`,
     );
   });
 
   it('uses the output value from the index option longform', async () => {
-    const { workspace } = await workspaces.readWorkspace(host.root(), workspaces.createWorkspaceHost(host));
+    const { workspace } = await workspaces.readWorkspace(
+      host.root(),
+      workspaces.createWorkspaceHost(host),
+    );
     const app = workspace.projects.get('app');
     if (!app) {
       fail('Test application "app" not found.');
@@ -189,15 +197,18 @@ describe('Browser Builder index HTML processing', () => {
     const outputIndexPath = join(host.root(), 'dist', 'main.html');
     const content = await host.read(normalize(outputIndexPath)).toPromise();
     expect(virtualFs.fileBufferToString(content)).toBe(
-      `<html><head><base href="/"><link rel="stylesheet" href="styles.css"></head> `
-      + `<body><app-root></app-root><script src="runtime.js" defer></script>`
-      + `<script src="polyfills.js" defer></script>`
-      + `<script src="vendor.js" defer></script><script src="main.js" defer></script></body></html>`,
+      `<html><head><base href="/"><link rel="stylesheet" href="styles.css"></head> ` +
+        `<body><app-root></app-root><script src="runtime.js" defer></script>` +
+        `<script src="polyfills.js" defer></script>` +
+        `<script src="vendor.js" defer></script><script src="main.js" defer></script></body></html>`,
     );
   });
 
   it('creates subdirectories for output value from the index option longform', async () => {
-    const { workspace } = await workspaces.readWorkspace(host.root(), workspaces.createWorkspaceHost(host));
+    const { workspace } = await workspaces.readWorkspace(
+      host.root(),
+      workspaces.createWorkspaceHost(host),
+    );
     const app = workspace.projects.get('app');
     if (!app) {
       fail('Test application "app" not found.');
@@ -232,10 +243,10 @@ describe('Browser Builder index HTML processing', () => {
     const outputIndexPath = join(host.root(), 'dist', 'extra', 'main.html');
     const content = await host.read(normalize(outputIndexPath)).toPromise();
     expect(virtualFs.fileBufferToString(content)).toBe(
-      `<html><head><base href="/"><link rel="stylesheet" href="styles.css"></head> `
-      + `<body><app-root></app-root><script src="runtime.js" defer></script>`
-      + `<script src="polyfills.js" defer></script>`
-      + `<script src="vendor.js" defer></script><script src="main.js" defer></script></body></html>`,
+      `<html><head><base href="/"><link rel="stylesheet" href="styles.css"></head> ` +
+        `<body><app-root></app-root><script src="runtime.js" defer></script>` +
+        `<script src="polyfills.js" defer></script>` +
+        `<script src="vendor.js" defer></script><script src="main.js" defer></script></body></html>`,
     );
   });
 });
diff --git a/packages/angular_devkit/build_angular/src/browser/specs/inline-critical-css-optimization_spec.ts b/packages/angular_devkit/build_angular/src/browser/specs/inline-critical-css-optimization_spec.ts
deleted file mode 100644
index a7d9d114559c..000000000000
--- a/packages/angular_devkit/build_angular/src/browser/specs/inline-critical-css-optimization_spec.ts
+++ /dev/null
@@ -1,58 +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 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 9a30f156e516..e030402b9552 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
@@ -18,7 +18,6 @@ import {
   lazyModuleFnImport,
 } from '../../test-utils';
 
-// tslint:disable-next-line:no-big-function
 describe('Browser Builder lazy modules', () => {
   const target = { project: 'app', target: 'build' };
   let architect: Architect;
@@ -29,27 +28,25 @@ describe('Browser Builder lazy modules', () => {
   });
   afterEach(async () => host.restore().toPromise());
 
-  function addLazyLoadedModulesInTsConfig(host: TestProjectHost, lazyModuleFiles: Record<string, string>) {
-    const files = [
-      ...Object.keys(lazyModuleFiles),
-      'main.ts',
-    ]
-    .map(f => '"' + f.replace('src/', '') + '"')
-    .join(', ');
-
-    host.replaceInFile(
-      'src/tsconfig.app.json',
-      '"main.ts"',
-      `${files}`,
-    );
+  function addLazyLoadedModulesInTsConfig(
+    host: TestProjectHost,
+    lazyModuleFiles: Record<string, string>,
+  ) {
+    const files = [...Object.keys(lazyModuleFiles), 'main.ts']
+      .map((f) => '"' + f.replace('src/', '') + '"')
+      .join(', ');
+
+    host.replaceInFile('src/tsconfig.app.json', '"main.ts"', `${files}`);
   }
 
   function hasMissingModuleError(logs: string): boolean {
     // TS type error when using import().
-    return logs.includes('Cannot find module') ||
+    return (
+      logs.includes('Cannot find module') ||
       // Webpack error when using import() on a rebuild.
       // There is no TS error because the type checker is forked on rebuilds.
-      logs.includes('Module not found');
+      logs.includes('Module not found')
+    );
   }
 
   describe(`Load children syntax`, () => {
@@ -83,7 +80,7 @@ describe('Browser Builder lazy modules', () => {
 
       const logger = new logging.Logger('');
       const logs: string[] = [];
-      logger.subscribe(e => logs.push(e.message));
+      logger.subscribe((e) => logs.push(e.message));
 
       const run = await architect.scheduleTarget(target, {}, { logger });
       const output = await run.result;
@@ -102,7 +99,7 @@ describe('Browser Builder lazy modules', () => {
       await run.output
         .pipe(
           debounceTime(3000),
-          tap(buildEvent => {
+          tap((buildEvent) => {
             buildNumber++;
             switch (buildNumber) {
               case 1:
@@ -139,11 +136,7 @@ describe('Browser Builder lazy modules', () => {
         import(/*webpackChunkName: '[request]'*/'./lazy-' + lazyFileName);
       `,
     });
-    host.replaceInFile(
-      'src/tsconfig.app.json',
-      '"main.ts"',
-      `"main.ts","lazy-module.ts"`,
-    );
+    host.replaceInFile('src/tsconfig.app.json', '"main.ts"', `"main.ts","lazy-module.ts"`);
 
     const { files } = await browserBuild(architect, host, target);
     expect(files['lazy-module.js']).not.toBeUndefined();
@@ -159,7 +152,9 @@ describe('Browser Builder lazy modules', () => {
     const { files } = await browserBuild(architect, host, target);
     expect(files['src_one_ts.js']).not.toBeUndefined();
     expect(files['src_two_ts.js']).not.toBeUndefined();
-    expect(files['default-node_modules_angular_common___ivy_ngcc___fesm2015_http_js.js']).toBeDefined();
+    expect(
+      files['default-node_modules_angular_common___ivy_ngcc___fesm2015_http_js.js'],
+    ).toBeDefined();
   });
 
   it(`supports disabling the common bundle`, async () => {
@@ -172,6 +167,8 @@ describe('Browser Builder lazy modules', () => {
     const { files } = await browserBuild(architect, host, target, { commonChunk: false });
     expect(files['src_one_ts.js']).not.toBeUndefined();
     expect(files['src_two_ts.js']).not.toBeUndefined();
-    expect(files['default-node_modules_angular_common___ivy_ngcc___fesm2015_http_js.js']).toBeUndefined();
+    expect(
+      files['default-node_modules_angular_common___ivy_ngcc___fesm2015_http_js.js'],
+    ).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 50120ecdbd1a..de47ed9f50c8 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 8936edee2329..431cae74746d 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,14 +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 { Architect } from '@angular-devkit/architect';
 import { browserBuild, createArchitect, host } from '../../test-utils';
 
-
 describe('Browser Builder optimization level', () => {
   const target = { project: 'app', target: 'build' };
   let architect: Architect;
@@ -31,7 +31,7 @@ describe('Browser Builder optimization level', () => {
 
     const overrides = { optimization: true };
     const { files } = await browserBuild(architect, host, target, overrides);
-    expect(await files['vendor.js']).toMatch(/class \w{constructor\(\){/);
+    expect(await files['vendor.js']).toMatch(/class \w{1,3}{constructor\(\){/);
   });
 
   it('supports styles only optimizations', async () => {
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..bf487fbeedf6 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
@@ -11,7 +11,6 @@ import { getSystemPath, join, virtualFs } from '@angular-devkit/core';
 import * as fs from 'fs';
 import { browserBuild, createArchitect, host } from '../../test-utils';
 
-
 describe('Browser Builder output path', () => {
   const target = { project: 'app', target: 'build' };
   let architect: Architect;
@@ -24,10 +23,9 @@ describe('Browser Builder output path', () => {
 
   it('deletes output path', async () => {
     // Write a file to the output path to later verify it was deleted.
-    await host.write(
-      join(host.root(), 'dist/file.txt'),
-      virtualFs.stringToFileBuffer('file'),
-    ).toPromise();
+    await host
+      .write(join(host.root(), 'dist/file.txt'), virtualFs.stringToFileBuffer('file'))
+      .toPromise();
 
     // Delete an app file to force a failed compilation.
     // Failed compilations still delete files, but don't output any.
@@ -75,7 +73,7 @@ describe('Browser Builder output path', () => {
     try {
       await run.result;
       expect('THE ABOVE LINE SHOULD THROW').toBe('');
-    } catch { }
+    } catch {}
     await run.stop();
   });
 
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..e806e1621a77 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
@@ -10,7 +10,6 @@ import { Architect } from '@angular-devkit/architect';
 import { debounceTime, take, tap } from 'rxjs/operators';
 import { createArchitect, host } from '../../test-utils';
 
-
 describe('Browser Builder poll', () => {
   const target = { project: 'app', target: 'build' };
   let architect: Architect;
@@ -27,19 +26,21 @@ describe('Browser Builder poll', () => {
     let startTime: number | undefined;
 
     const run = await architect.scheduleTarget(target, overrides);
-    await run.output.pipe(
-      // Debounce 1s, otherwise changes are too close together and polling doesn't work.
-      debounceTime(1000),
-      tap((buildEvent) => {
-        expect(buildEvent.success).toBe(true);
-        if (startTime != undefined) {
-          intervals.push(Date.now() - startTime - 1000);
-        }
-        startTime = Date.now();
-        host.appendToFile('src/main.ts', 'console.log(1);');
-      }),
-      take(4),
-    ).toPromise();
+    await run.output
+      .pipe(
+        // Debounce 1s, otherwise changes are too close together and polling doesn't work.
+        debounceTime(1000),
+        tap((buildEvent) => {
+          expect(buildEvent.success).toBe(true);
+          if (startTime != undefined) {
+            intervals.push(Date.now() - startTime - 1000);
+          }
+          startTime = Date.now();
+          host.appendToFile('src/main.ts', 'console.log(1);');
+        }),
+        take(4),
+      )
+      .toPromise();
 
     intervals.sort();
     const median = intervals[Math.trunc(intervals.length / 2)];
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 e597807133c7..5cf462b5535f 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,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
  */
-// tslint:disable:no-big-function
+
 import { Architect } from '@angular-devkit/architect';
 import { join, logging, normalize, virtualFs } from '@angular-devkit/core';
 import { debounceTime, take, takeWhile, tap } from 'rxjs/operators';
@@ -79,9 +79,11 @@ describe('Browser Builder rebuilds', () => {
     await run.output
       .pipe(
         debounceTime(rebuildDebounceTime),
-        tap(result => {
+        tap((result) => {
           expect(result.success).toBe(true, 'build should succeed');
-          const hasLazyChunk = host.scopedSync().exists(normalize('dist/src_app_lazy_lazy_module_ts.js'));
+          const hasLazyChunk = host
+            .scopedSync()
+            .exists(normalize('dist/src_app_lazy_lazy_module_ts.js'));
           switch (phase) {
             case 1:
               // No lazy chunk should exist.
@@ -130,7 +132,7 @@ describe('Browser Builder rebuilds', () => {
     await run.output
       .pipe(
         debounceTime(rebuildDebounceTime),
-        tap(buildEvent => expect(buildEvent.success).toBe(true)),
+        tap((buildEvent) => expect(buildEvent.success).toBe(true)),
         tap(() => host.appendToFile('src/app/app.component.css', ':host { color: blue; }')),
         take(2),
       )
@@ -151,10 +153,10 @@ describe('Browser Builder rebuilds', () => {
     `,
     );
 
-    const overrides = { watch: true, forkTypeChecker: false };
+    const overrides = { watch: true };
     const logger = new logging.Logger('');
     let logs: string[] = [];
-    logger.subscribe(e => logs.push(e.message));
+    logger.subscribe((e) => logs.push(e.message));
 
     const typeError = `is not assignable to parameter of type 'number'`;
     let buildNumber = 0;
@@ -163,7 +165,7 @@ describe('Browser Builder rebuilds', () => {
     await run.output
       .pipe(
         debounceTime(rebuildDebounceTime),
-        tap(buildEvent => {
+        tap((buildEvent) => {
           buildNumber += 1;
           switch (buildNumber) {
             case 1:
@@ -216,7 +218,7 @@ describe('Browser Builder rebuilds', () => {
     await run.output
       .pipe(
         debounceTime(rebuildDebounceTime),
-        tap(buildEvent => expect(buildEvent.success).toBe(true)),
+        tap((buildEvent) => expect(buildEvent.success).toBe(true)),
         tap(() => host.writeMultipleFiles({ 'src/type.ts': `export type MyType = string;` })),
         take(2),
       )
@@ -235,10 +237,13 @@ describe('Browser Builder rebuilds', () => {
       `,
       'src/interface3.ts': `export interface Interface3 { nbr: number; }`,
     });
-    host.appendToFile('src/main.ts', `
+    host.appendToFile(
+      'src/main.ts',
+      `
       import { Interface1 } from './interface1';
       const something: Interface1 = { nbr: 43 };
-    `);
+    `,
+    );
 
     const overrides = { watch: true };
     const run = await architect.scheduleTarget(target, overrides);
@@ -246,7 +251,7 @@ describe('Browser Builder rebuilds', () => {
     await run.output
       .pipe(
         debounceTime(rebuildDebounceTime),
-        tap(buildEvent => expect(buildEvent.success).toBe(true)),
+        tap((buildEvent) => expect(buildEvent.success).toBe(true)),
         tap(() => {
           // NOTE: this only works for transitive type deps after the first build, and only if the
           // typedep file was there on the previous build.
@@ -275,10 +280,13 @@ describe('Browser Builder rebuilds', () => {
       `,
       'src/interface3.d.ts': `export interface Interface3 { nbr: number; }`,
     });
-    host.appendToFile('src/main.ts', `
+    host.appendToFile(
+      'src/main.ts',
+      `
       import { Interface1 } from './interface1';
       const something: Interface1 = { nbr: 43 };
-    `);
+    `,
+    );
 
     const overrides = { watch: true };
     const run = await architect.scheduleTarget(target, overrides);
@@ -286,7 +294,7 @@ describe('Browser Builder rebuilds', () => {
     await run.output
       .pipe(
         debounceTime(rebuildDebounceTime),
-        tap(buildEvent => expect(buildEvent.success).toBe(true)),
+        tap((buildEvent) => expect(buildEvent.success).toBe(true)),
         tap(() => {
           buildNumber++;
           if (buildNumber === 1) {
@@ -311,14 +319,14 @@ describe('Browser Builder rebuilds', () => {
     await run.output
       .pipe(
         debounceTime(rebuildDebounceTime),
-        tap(buildEvent => {
+        tap((buildEvent) => {
           buildNumber++;
           switch (buildNumber) {
             case 1:
               // The first build should fail.
               expect(buildEvent.success).toBe(false);
               // Fix the error.
-              host.writeMultipleFiles({'src/app/app.component.ts': origContent});
+              host.writeMultipleFiles({ 'src/app/app.component.ts': origContent });
               break;
 
             case 2:
@@ -344,10 +352,10 @@ describe('Browser Builder rebuilds', () => {
     // `selector must be a string` errors on VE are part of the emit result, but on Ivy they only
     // show up in getNgSemanticDiagnostics. Since getNgSemanticDiagnostics is only called on the
     // type checker, we must disable it to get a failing fourth build with Ivy.
-    const overrides = { watch: true, aot: true, forkTypeChecker: false };
+    const overrides = { watch: true, aot: true };
     const logger = new logging.Logger('');
     let logs: string[] = [];
-    logger.subscribe(e => logs.push(e.message));
+    logger.subscribe((e) => logs.push(e.message));
     const staticAnalysisError = 'selector must be a string';
     const syntaxError = 'Declaration or statement expected.';
     let buildNumber = 0;
@@ -356,14 +364,16 @@ describe('Browser Builder rebuilds', () => {
     await run.output
       .pipe(
         debounceTime(rebuildDebounceTime),
-        tap(buildEvent => {
+        tap((buildEvent) => {
           buildNumber += 1;
           switch (buildNumber) {
             case 1:
               // The first build should error out with a static analysis error.
               expect(buildEvent.success).toBe(false, 'First build should not succeed.');
-              expect(logs.join().includes(staticAnalysisError)).toBe(true,
-                'First build should have static analysis error.');
+              expect(logs.join().includes(staticAnalysisError)).toBe(
+                true,
+                'First build should have static analysis error.',
+              );
               logs = [];
               // Fix the static analysis error.
               host.writeMultipleFiles({ 'src/app/app.component.ts': origContent });
@@ -371,8 +381,10 @@ describe('Browser Builder rebuilds', () => {
 
             case 2:
               expect(buildEvent.success).toBe(true, 'Second build should succeed.');
-              expect(logs.join().includes(staticAnalysisError)).toBe(false,
-                'Second build should not have static analysis error.');
+              expect(logs.join().includes(staticAnalysisError)).toBe(
+                false,
+                'Second build should not have static analysis error.',
+              );
               logs = [];
               // Add an syntax error to a non-main file.
               host.appendToFile('src/app/app.component.ts', `]]]`);
@@ -381,10 +393,14 @@ describe('Browser Builder rebuilds', () => {
             case 3:
               // The third build should have TS syntax error.
               expect(buildEvent.success).toBe(false, 'Third build should not succeed.');
-              expect(logs.join().includes(syntaxError)).toBe(true,
-                'Third build should have syntax analysis error.');
-              expect(logs.join().includes(staticAnalysisError)).toBe(false,
-                'Third build should not have static analysis error.');
+              expect(logs.join().includes(syntaxError)).toBe(
+                true,
+                'Third build should have syntax analysis error.',
+              );
+              expect(logs.join().includes(staticAnalysisError)).toBe(
+                false,
+                'Third build should not have static analysis error.',
+              );
               logs = [];
               // Fix the syntax error, but add the static analysis error again.
               host.writeMultipleFiles({
@@ -397,10 +413,14 @@ describe('Browser Builder rebuilds', () => {
 
             case 4:
               expect(buildEvent.success).toBe(false, 'Fourth build should not succeed.');
-              expect(logs.join().includes(syntaxError)).toBe(false,
-                'Fourth build should not have syntax analysis error.');
-              expect(logs.join().includes(staticAnalysisError)).toBe(true,
-                'Fourth build should have static analysis error.');
+              expect(logs.join().includes(syntaxError)).toBe(
+                false,
+                'Fourth build should not have syntax analysis error.',
+              );
+              expect(logs.join().includes(staticAnalysisError)).toBe(
+                true,
+                'Fourth build should have static analysis error.',
+              );
               logs = [];
               // Restore the file to a error-less state.
               host.writeMultipleFiles({ 'src/app/app.component.ts': origContent });
@@ -409,10 +429,14 @@ describe('Browser Builder rebuilds', () => {
             case 5:
               // The fifth build should have everything fixed..
               expect(buildEvent.success).toBe(true, 'Fifth build should succeed.');
-              expect(logs.join().includes(syntaxError)).toBe(false,
-                'Fifth build should not have syntax analysis error.');
-              expect(logs.join().includes(staticAnalysisError)).toBe(false,
-                'Fifth build should not have static analysis error.');
+              expect(logs.join().includes(syntaxError)).toBe(
+                false,
+                'Fifth build should not have syntax analysis error.',
+              );
+              expect(logs.join().includes(staticAnalysisError)).toBe(
+                false,
+                'Fifth build should not have static analysis error.',
+              );
               break;
           }
         }),
@@ -438,7 +462,7 @@ describe('Browser Builder rebuilds', () => {
     await run.output
       .pipe(
         debounceTime(rebuildDebounceTime),
-        tap(buildEvent => {
+        tap((buildEvent) => {
           buildNumber += 1;
           const fileName = './dist/main.js';
           let content;
@@ -528,7 +552,7 @@ describe('Browser Builder rebuilds', () => {
     await run.output
       .pipe(
         debounceTime(rebuildDebounceTime),
-        tap(buildEvent => {
+        tap((buildEvent) => {
           buildNumber += 1;
           switch (buildNumber) {
             case 1:
@@ -557,28 +581,30 @@ describe('Browser Builder rebuilds', () => {
 
     let buildCount = 1;
     const run = await architect.scheduleTarget(target, overrides);
-    await run.output.pipe(
-      debounceTime(rebuildDebounceTime),
-      tap(() => {
-        const content = virtualFs.fileBufferToString(
-          host.scopedSync().read(join(outputPath, 'main.js')),
-        );
-
-        switch (buildCount) {
-          case 1:
+    await run.output
+      .pipe(
+        debounceTime(rebuildDebounceTime),
+        tap(() => {
+          const content = virtualFs.fileBufferToString(
+            host.scopedSync().read(join(outputPath, 'main.js')),
+          );
+
+          switch (buildCount) {
+            case 1:
               expect(content).not.toContain('color: green');
               host.appendToFile('src/app/app.component.css', 'h1 { color: green; }');
               break;
-          case 2:
+            case 2:
               expect(content).toContain('color: green');
               break;
-        }
+          }
 
-        buildCount++;
-      }),
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      take(2),
-    ).toPromise();
+          buildCount++;
+        }),
+        tap((buildEvent) => expect(buildEvent.success).toBe(true)),
+        take(2),
+      )
+      .toPromise();
     await run.stop();
   });
 
@@ -587,28 +613,30 @@ describe('Browser Builder rebuilds', () => {
 
     let buildCount = 1;
     const run = await architect.scheduleTarget(target, overrides);
-    await run.output.pipe(
-      debounceTime(rebuildDebounceTime),
-      tap(() => {
-        const content = virtualFs.fileBufferToString(
-          host.scopedSync().read(join(outputPath, 'main.js')),
-        );
-
-        switch (buildCount) {
-          case 1:
+    await run.output
+      .pipe(
+        debounceTime(rebuildDebounceTime),
+        tap(() => {
+          const content = virtualFs.fileBufferToString(
+            host.scopedSync().read(join(outputPath, 'main.js')),
+          );
+
+          switch (buildCount) {
+            case 1:
               expect(content).not.toContain('New Updated Content');
               host.appendToFile('src/app/app.component.html', 'New Updated Content');
               break;
-          case 2:
+            case 2:
               expect(content).toContain('New Updated Content');
               break;
-        }
+          }
 
-        buildCount++;
-      }),
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      take(2),
-    ).toPromise();
+          buildCount++;
+        }),
+        tap((buildEvent) => expect(buildEvent.success).toBe(true)),
+        take(2),
+      )
+      .toPromise();
     await run.stop();
   });
 });
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..17a352ef54c6 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
@@ -12,7 +12,6 @@ import { of, race } from 'rxjs';
 import { delay, filter, map, take, takeUntil, takeWhile, tap, timeout } from 'rxjs/operators';
 import { browserBuild, createArchitect, host } from '../../test-utils';
 
-
 describe('Browser Builder file replacements', () => {
   const target = { project: 'app', target: 'build' };
   let architect: Architect;
@@ -23,16 +22,18 @@ describe('Browser Builder file replacements', () => {
   });
   afterEach(async () => host.restore().toPromise());
 
-  beforeEach(() => host.writeMultipleFiles({
-    'src/meaning-too.ts': 'export var meaning = 42;',
-    'src/meaning.ts': `export var meaning = 10;`,
+  beforeEach(() =>
+    host.writeMultipleFiles({
+      'src/meaning-too.ts': 'export var meaning = 42;',
+      'src/meaning.ts': `export var meaning = 10;`,
 
-    'src/main.ts': `
+      'src/main.ts': `
         import { meaning } from './meaning';
 
         console.log(meaning);
       `,
-  }));
+    }),
+  );
 
   it('allows file replacements', async () => {
     const overrides = {
@@ -115,45 +116,48 @@ describe('Browser Builder file replacements', () => {
     let phase = 1;
 
     const run = await architect.scheduleTarget(target, overrides);
-    await run.output.pipe(
-      timeout(30000),
-      tap((result) => {
-        expect(result.success).toBe(true, 'build should succeed');
-
-        const fileName = normalize('dist/main.js');
-        const content = virtualFs.fileBufferToString(host.scopedSync().read(fileName));
-        const has42 = /meaning\s*=\s*42/.test(content);
-        buildCount++;
-        switch (phase) {
-          case 1:
-            const has10 = /meaning\s*=\s*10/.test(content);
-
-            if (has42 && !has10) {
-              phase = 2;
-              host.writeMultipleFiles({
-                'src/meaning-too.ts': 'export var meaning = 84;',
-              });
-            }
-            break;
-
-          case 2:
-            const has84 = /meaning\s*=\s*84/.test(content);
-
-            if (has84 && !has42) {
-              phase = 3;
-            } else {
-              // try triggering a rebuild again
-              host.writeMultipleFiles({
-                'src/meaning-too.ts': 'export var meaning = 84;',
-              });
-            }
-            break;
-        }
-      }),
-      takeWhile(() => phase < 3),
-    ).toPromise().catch(() => {
-      throw new Error(`stuck at phase ${phase} [builds: ${buildCount}]`);
-    });
+    await run.output
+      .pipe(
+        timeout(30000),
+        tap((result) => {
+          expect(result.success).toBe(true, 'build should succeed');
+
+          const fileName = normalize('dist/main.js');
+          const content = virtualFs.fileBufferToString(host.scopedSync().read(fileName));
+          const has42 = /meaning\s*=\s*42/.test(content);
+          buildCount++;
+          switch (phase) {
+            case 1:
+              const has10 = /meaning\s*=\s*10/.test(content);
+
+              if (has42 && !has10) {
+                phase = 2;
+                host.writeMultipleFiles({
+                  'src/meaning-too.ts': 'export var meaning = 84;',
+                });
+              }
+              break;
+
+            case 2:
+              const has84 = /meaning\s*=\s*84/.test(content);
+
+              if (has84 && !has42) {
+                phase = 3;
+              } else {
+                // try triggering a rebuild again
+                host.writeMultipleFiles({
+                  'src/meaning-too.ts': 'export var meaning = 84;',
+                });
+              }
+              break;
+          }
+        }),
+        takeWhile(() => phase < 3),
+      )
+      .toPromise()
+      .catch(() => {
+        throw new Error(`stuck at phase ${phase} [builds: ${buildCount}]`);
+      });
 
     await run.stop();
   });
@@ -169,10 +173,12 @@ describe('Browser Builder file replacements', () => {
     });
 
     const overrides = {
-      fileReplacements: [{
-        replace: normalize('/src/file.ts'),
-        with: normalize('/src/file-replaced.ts'),
-      }],
+      fileReplacements: [
+        {
+          replace: normalize('/src/file.ts'),
+          with: normalize('/src/file-replaced.ts'),
+        },
+      ],
       watch: true,
     };
 
@@ -183,27 +189,29 @@ describe('Browser Builder file replacements', () => {
 
     // Race between a timeout and the expected log entry.
     const stop$ = race<null | string>(
-      of(null).pipe(delay(45000 * 2 / 3)),
+      of(null).pipe(delay((45000 * 2) / 3)),
       logger.pipe(
-        filter(entry => entry.message.includes(expectedError)),
-        map(entry => entry.message),
+        filter((entry) => entry.message.includes(expectedError)),
+        map((entry) => entry.message),
         take(1),
       ),
     );
 
     let errorAdded = false;
     const run = await architect.scheduleTarget(target, overrides, { logger });
-    run.output.pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true, 'build should succeed')),
-      tap(() => {
-        // Introduce a known type error to detect in the logger filter.
-        if (!errorAdded) {
-          host.appendToFile('src/main.ts', 'console.log({}.prop);');
-          errorAdded = true;
-        }
-      }),
-      takeUntil(stop$),
-    ).subscribe();
+    run.output
+      .pipe(
+        tap((buildEvent) => expect(buildEvent.success).toBe(true, 'build should succeed')),
+        tap(() => {
+          // Introduce a known type error to detect in the logger filter.
+          if (!errorAdded) {
+            host.appendToFile('src/main.ts', 'console.log({}.prop);');
+            errorAdded = true;
+          }
+        }),
+        takeUntil(stop$),
+      )
+      .subscribe();
 
     const res = await stop$.toPromise();
     expect(res).not.toBe(null, 'Test timed out.');
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 030d9dbc6958..7a2124fe540b 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
@@ -11,7 +11,6 @@ import { join, virtualFs } from '@angular-devkit/core';
 import { take, tap } from 'rxjs/operators';
 import { createArchitect, host, outputPath } from '../../test-utils';
 
-
 describe('Browser Builder resolve json module', () => {
   const target = { project: 'app', target: 'build' };
   let architect: Architect;
@@ -38,29 +37,30 @@ describe('Browser Builder resolve json module', () => {
 
     let buildCount = 1;
     const run = await architect.scheduleTarget(target, overrides);
-    await run.output.pipe(
-      tap(() => {
-        const content = virtualFs.fileBufferToString(
-          host.scopedSync().read(join(outputPath, 'main.js')),
-        );
+    await run.output
+      .pipe(
+        tap(() => {
+          const content = virtualFs.fileBufferToString(
+            host.scopedSync().read(join(outputPath, 'main.js')),
+          );
 
-        switch (buildCount) {
-          case 1:
-            expect(content).toContain('"foo":"1"');
-            host.writeMultipleFiles({
-              'src/my-json-file.json': `{"foo": "2"}`,
-            });
-            break;
-          case 2:
-            expect(content).toContain('"foo":"2"');
-            break;
-        }
+          switch (buildCount) {
+            case 1:
+              expect(content).toContain('"foo":"1"');
+              host.writeMultipleFiles({
+                'src/my-json-file.json': `{"foo": "2"}`,
+              });
+              break;
+            case 2:
+              expect(content).toContain('"foo":"2"');
+              break;
+          }
 
-        buildCount++;
-      }),
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      take(2),
-    ).toPromise();
+          buildCount++;
+        }),
+        tap((buildEvent) => expect(buildEvent.success).toBe(true)),
+        take(2),
+      )
+      .toPromise();
   });
-
 });
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..438e653dfce5 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,16 +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
  */
-// tslint:disable:no-big-function
+
 import { Architect } from '@angular-devkit/architect';
 import { normalize } from '@angular-devkit/core';
 import { browserBuild, createArchitect, host } from '../../test-utils';
 
-
 describe('Browser Builder styles resources output path', () => {
   const imgSvg = `
     <svg width="100" height="100" xmlns="http://www.w3.org/2000/svg">
@@ -63,14 +62,16 @@ describe('Browser Builder styles resources output path', () => {
     expect(main).toContain(`url('/assets/component-img-absolute.svg')`);
     expect(main).toContain(`url('out-assets/component-img-relative.png')`);
 
-    expect(host.scopedSync()
-      .exists(normalize('dist/assets/global-img-absolute.svg'))).toBe(true);
-    expect(host.scopedSync()
-      .exists(normalize('dist/out-assets/global-img-relative.png'))).toBe(true);
-    expect(host.scopedSync()
-      .exists(normalize('dist/assets/component-img-absolute.svg'))).toBe(true);
-    expect(host.scopedSync()
-      .exists(normalize('dist/out-assets/component-img-relative.png'))).toBe(true);
+    expect(host.scopedSync().exists(normalize('dist/assets/global-img-absolute.svg'))).toBe(true);
+    expect(host.scopedSync().exists(normalize('dist/out-assets/global-img-relative.png'))).toBe(
+      true,
+    );
+    expect(host.scopedSync().exists(normalize('dist/assets/component-img-absolute.svg'))).toBe(
+      true,
+    );
+    expect(host.scopedSync().exists(normalize('dist/out-assets/component-img-relative.png'))).toBe(
+      true,
+    );
   });
 
   it(`supports blank resourcesOutputPath`, async () => {
@@ -86,13 +87,11 @@ describe('Browser Builder styles resources output path', () => {
     expect(styles).toContain(`url('global-img-relative.png')`);
     expect(main).toContain(`url('/assets/component-img-absolute.svg')`);
     expect(main).toContain(`url('component-img-relative.png')`);
-    expect(host.scopedSync().exists(normalize('dist/assets/global-img-absolute.svg')))
-      .toBe(true);
-    expect(host.scopedSync().exists(normalize('dist/global-img-relative.png')))
-      .toBe(true);
-    expect(host.scopedSync().exists(normalize('dist/assets/component-img-absolute.svg')))
-      .toBe(true);
-    expect(host.scopedSync().exists(normalize('dist/component-img-relative.png')))
-      .toBe(true);
+    expect(host.scopedSync().exists(normalize('dist/assets/global-img-absolute.svg'))).toBe(true);
+    expect(host.scopedSync().exists(normalize('dist/global-img-relative.png'))).toBe(true);
+    expect(host.scopedSync().exists(normalize('dist/assets/component-img-absolute.svg'))).toBe(
+      true,
+    );
+    expect(host.scopedSync().exists(normalize('dist/component-img-relative.png'))).toBe(true);
   });
 });
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 3451187e839a..6af3b92b3175 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
@@ -10,19 +10,18 @@ import { Architect } from '@angular-devkit/architect';
 import { logging } from '@angular-devkit/core';
 import { browserBuild, createArchitect, host } from '../../test-utils';
 
-
 describe('Browser Builder scripts array', () => {
   const scripts: { [path: string]: string } = {
-    'src/input-script.js': 'console.log(\'input-script\'); var number = 1+1;',
-    'src/zinput-script.js': 'console.log(\'zinput-script\');',
-    'src/finput-script.js': 'console.log(\'finput-script\');',
-    'src/uinput-script.js': 'console.log(\'uinput-script\');',
-    'src/binput-script.js': 'console.log(\'binput-script\');',
-    'src/ainput-script.js': 'console.log(\'ainput-script\');',
-    'src/cinput-script.js': 'console.log(\'cinput-script\');',
-    'src/lazy-script.js': 'console.log(\'lazy-script\');',
-    'src/pre-rename-script.js': 'console.log(\'pre-rename-script\');',
-    'src/pre-rename-lazy-script.js': 'console.log(\'pre-rename-lazy-script\');',
+    'src/input-script.js': "console.log('input-script'); var number = 1+1;",
+    'src/zinput-script.js': "console.log('zinput-script');",
+    'src/finput-script.js': "console.log('finput-script');",
+    'src/uinput-script.js': "console.log('uinput-script');",
+    'src/binput-script.js': "console.log('binput-script');",
+    'src/ainput-script.js': "console.log('ainput-script');",
+    'src/cinput-script.js': "console.log('cinput-script');",
+    'src/lazy-script.js': "console.log('lazy-script');",
+    'src/pre-rename-script.js': "console.log('pre-rename-script');",
+    'src/pre-rename-lazy-script.js': "console.log('pre-rename-lazy-script');",
   };
   const getScriptsOption = () => [
     'src/input-script.js',
@@ -53,16 +52,17 @@ describe('Browser Builder scripts array', () => {
       'renamed-script.js': 'pre-rename-script',
       'renamed-lazy-script.js': 'pre-rename-lazy-script',
       'main.js': 'input-script',
-      'index.html': '<script src="runtime.js" defer></script>'
-        + '<script src="polyfills.js" defer></script>'
-        + '<script src="scripts.js" defer></script>'
-        + '<script src="renamed-script.js" defer></script>'
-        + '<script src="vendor.js" defer></script>'
-        + '<script src="main.js" defer></script>',
+      'index.html':
+        '<script src="runtime.js" defer></script>' +
+        '<script src="polyfills.js" defer></script>' +
+        '<script src="scripts.js" defer></script>' +
+        '<script src="renamed-script.js" defer></script>' +
+        '<script src="vendor.js" defer></script>' +
+        '<script src="main.js" defer></script>',
     };
 
     host.writeMultipleFiles(scripts);
-    host.appendToFile('src/main.ts', '\nimport \'./input-script.js\';');
+    host.appendToFile('src/main.ts', "\nimport './input-script.js';");
 
     // Remove styles so we don't have to account for them in the index.html order check.
     const { files } = await browserBuild(architect, host, target, {
@@ -82,16 +82,17 @@ describe('Browser Builder scripts array', () => {
       'renamed-script.js': 'pre-rename-script',
       'renamed-lazy-script.js': 'pre-rename-lazy-script',
       'main-es2017.js': 'input-script',
-      'index.html': '<script src="runtime-es2017.js" type="module"></script>'
-        + '<script src="polyfills-es2017.js" type="module"></script>'
-        + '<script src="scripts.js" defer></script>'
-        + '<script src="renamed-script.js" defer></script>'
-        + '<script src="vendor-es2017.js" type="module"></script>'
-        + '<script src="main-es2017.js" type="module"></script>',
+      'index.html':
+        '<script src="runtime-es2017.js" type="module"></script>' +
+        '<script src="polyfills-es2017.js" type="module"></script>' +
+        '<script src="scripts.js" defer></script>' +
+        '<script src="renamed-script.js" defer></script>' +
+        '<script src="vendor-es2017.js" type="module"></script>' +
+        '<script src="main-es2017.js" type="module"></script>',
     };
 
     host.writeMultipleFiles(scripts);
-    host.appendToFile('src/main.ts', '\nimport \'./input-script.js\';');
+    host.appendToFile('src/main.ts', "\nimport './input-script.js';");
 
     // Enable differential loading
     host.appendToFile('.browserslistrc', '\nIE 11');
@@ -119,14 +120,14 @@ describe('Browser Builder scripts array', () => {
     } as {});
 
     const fileNames = Object.keys(files);
-    const scriptsBundle = fileNames.find(n => /scripts\.[0-9a-f]{20}\.js/.test(n));
+    const scriptsBundle = fileNames.find((n) => /scripts\.[0-9a-f]{20}\.js/.test(n));
     expect(scriptsBundle).toBeTruthy();
     expect(await files[scriptsBundle || '']).toMatch('var number=2;');
 
-    expect(fileNames.some(n => /scripts\.[0-9a-f]{20}\.js\.map/.test(n))).toBeTruthy();
-    expect(fileNames.some(n => /renamed-script\.[0-9a-f]{20}\.js/.test(n))).toBeTruthy();
-    expect(fileNames.some(n => /renamed-script\.[0-9a-f]{20}\.js\.map/.test(n))).toBeTruthy();
-    expect(fileNames.some(n => /script\.[0-9a-f]{20}\.js/.test(n))).toBeTruthy();
+    expect(fileNames.some((n) => /scripts\.[0-9a-f]{20}\.js\.map/.test(n))).toBeTruthy();
+    expect(fileNames.some((n) => /renamed-script\.[0-9a-f]{20}\.js/.test(n))).toBeTruthy();
+    expect(fileNames.some((n) => /renamed-script\.[0-9a-f]{20}\.js\.map/.test(n))).toBeTruthy();
+    expect(fileNames.some((n) => /script\.[0-9a-f]{20}\.js/.test(n))).toBeTruthy();
     expect(await files['lazy-script.js']).not.toBeUndefined();
     expect(await files['lazy-script.js.map']).not.toBeUndefined();
     expect(await files['renamed-lazy-script.js']).not.toBeUndefined();
@@ -140,15 +141,17 @@ describe('Browser Builder scripts array', () => {
       scripts: getScriptsOption(),
     } as {});
 
-    expect(await files['scripts.js']).toMatch(new RegExp(
-      /.*['"]input-script['"](.|\n|\r)*/.source
-      + /['"]zinput-script['"](.|\n|\r)*/.source
-      + /['"]finput-script['"](.|\n|\r)*/.source
-      + /['"]uinput-script['"](.|\n|\r)*/.source
-      + /['"]binput-script['"](.|\n|\r)*/.source
-      + /['"]ainput-script['"](.|\n|\r)*/.source
-      + /['"]cinput-script['"]/.source,
-    ));
+    expect(await files['scripts.js']).toMatch(
+      new RegExp(
+        /.*['"]input-script['"](.|\n|\r)*/.source +
+          /['"]zinput-script['"](.|\n|\r)*/.source +
+          /['"]finput-script['"](.|\n|\r)*/.source +
+          /['"]uinput-script['"](.|\n|\r)*/.source +
+          /['"]binput-script['"](.|\n|\r)*/.source +
+          /['"]ainput-script['"](.|\n|\r)*/.source +
+          /['"]cinput-script['"]/.source,
+      ),
+    );
   });
 
   it('chunk in entry', async () => {
@@ -171,21 +174,17 @@ describe('Browser Builder scripts array', () => {
     );
 
     const joinedLogs = logs.join('\n');
-    expect(joinedLogs).toMatch(/lazy-script.+69 bytes/);
-    expect(joinedLogs).toMatch(/renamed-script.+78 bytes/);
-    expect(joinedLogs).toMatch(/renamed-lazy-script.+88 bytes/);
+    expect(joinedLogs).toMatch(/lazy-script.+\d+ bytes/);
+    expect(joinedLogs).toMatch(/renamed-script.+\d+ bytes/);
+    expect(joinedLogs).toMatch(/renamed-lazy-script.+\d+ bytes/);
     expect(joinedLogs).not.toContain('Lazy Chunks');
   });
 
   it(`should error when a script doesn't exist`, async () => {
-    await expectAsync(browserBuild(
-      architect,
-      host,
-      target,
-      {
+    await expectAsync(
+      browserBuild(architect, host, target, {
         scripts: ['./invalid.js'],
-      },
-    ))
-      .toBeRejectedWithError(`Script file ./invalid.js does not exist.`);
+      }),
+    ).toBeRejectedWithError(`Script file ./invalid.js does not exist.`);
   });
 });
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..5bf935191c23 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,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
  */
+
 import { Architect } from '@angular-devkit/architect';
 import { normalize, virtualFs } from '@angular-devkit/core';
 import { debounceTime, take, tap } from 'rxjs/operators';
 import { createArchitect, host } from '../../test-utils';
 
-// tslint:disable-next-line: no-big-function
 describe('Browser Builder service worker', () => {
   const manifest = {
     index: '/index.html',
@@ -19,13 +19,7 @@ describe('Browser Builder service worker', () => {
         name: 'app',
         installMode: 'prefetch',
         resources: {
-          files: [
-            '/favicon.ico',
-            '/index.html',
-            '/*.bundle.css',
-            '/*.bundle.js',
-            '/*.chunk.js',
-          ],
+          files: ['/favicon.ico', '/index.html', '/*.bundle.css', '/*.bundle.js', '/*.chunk.js'],
         },
       },
       {
@@ -33,10 +27,7 @@ describe('Browser Builder service worker', () => {
         installMode: 'lazy',
         updateMode: 'prefetch',
         resources: {
-          files: [
-            '/assets/**',
-            '/*.(eot|svg|cur|jpg|png|webp|gif|otf|ttf|woff|woff2|ani)',
-          ],
+          files: ['/assets/**', '/*.(eot|svg|cur|jpg|png|webp|gif|otf|ttf|woff|woff2|ani)'],
         },
       },
     ],
@@ -74,54 +65,51 @@ describe('Browser Builder service worker', () => {
     await expectAsync(run.result).toBeResolvedTo(jasmine.objectContaining({ success: true }));
 
     expect(host.scopedSync().exists(normalize('dist/ngsw.json'))).toBeTrue();
-    const ngswJson = JSON.parse(virtualFs.fileBufferToString(
-      host.scopedSync().read(normalize('dist/ngsw.json'))));
+    const ngswJson = JSON.parse(
+      virtualFs.fileBufferToString(host.scopedSync().read(normalize('dist/ngsw.json'))),
+    );
     // Verify index and assets are there.
-    expect(ngswJson).toEqual(jasmine.objectContaining({
-      configVersion: 1,
-      index: '/index.html',
-      navigationUrls: [
-        { positive: true, regex: '^\\\/.*$' },
-        { positive: false, regex: '^\\\/(?:.+\\\/)?[^\/]*\\.[^\/]*$' },
-        { positive: false, regex: '^\\\/(?:.+\\\/)?[^\/]*__[^\/]*$' },
-        { positive: false, regex: '^\\\/(?:.+\\\/)?[^\/]*__[^\/]*\\\/.*$' },
-      ],
-      assetGroups: [
-        {
-          name: 'app',
-          installMode: 'prefetch',
-          updateMode: 'prefetch',
-          urls: [
-            '/favicon.ico',
-            '/index.html',
-          ],
-          cacheQueryOptions: {
-            ignoreVary: true,
+    expect(ngswJson).toEqual(
+      jasmine.objectContaining({
+        configVersion: 1,
+        index: '/index.html',
+        navigationUrls: [
+          { positive: true, regex: '^\\/.*$' },
+          { positive: false, regex: '^\\/(?:.+\\/)?[^/]*\\.[^/]*$' },
+          { positive: false, regex: '^\\/(?:.+\\/)?[^/]*__[^/]*$' },
+          { positive: false, regex: '^\\/(?:.+\\/)?[^/]*__[^/]*\\/.*$' },
+        ],
+        assetGroups: [
+          {
+            name: 'app',
+            installMode: 'prefetch',
+            updateMode: 'prefetch',
+            urls: ['/favicon.ico', '/index.html'],
+            cacheQueryOptions: {
+              ignoreVary: true,
+            },
+            patterns: [],
           },
-          patterns: [],
-        },
-        {
-          name: 'assets',
-          installMode: 'lazy',
-          updateMode: 'prefetch',
-          urls: [
-            '/assets/folder-asset.txt',
-            '/spectrum.png',
-          ],
-          cacheQueryOptions: {
-            ignoreVary: true,
+          {
+            name: 'assets',
+            installMode: 'lazy',
+            updateMode: 'prefetch',
+            urls: ['/assets/folder-asset.txt', '/spectrum.png'],
+            cacheQueryOptions: {
+              ignoreVary: true,
+            },
+            patterns: [],
           },
-          patterns: [],
+        ],
+        dataGroups: [],
+        hashTable: {
+          '/favicon.ico': '84161b857f5c547e3699ddfbffc6d8d737542e01',
+          '/assets/folder-asset.txt': '617f202968a6a81050aa617c2e28e1dca11ce8d4',
+          '/index.html': 'f0bea8ced1dfbeeb771a5f48651fbcff52a625eb',
+          '/spectrum.png': '8d048ece46c0f3af4b598a95fd8e4709b631c3c0',
         },
-      ],
-      dataGroups: [],
-      hashTable: {
-        '/favicon.ico': '84161b857f5c547e3699ddfbffc6d8d737542e01',
-        '/assets/folder-asset.txt': '617f202968a6a81050aa617c2e28e1dca11ce8d4',
-        '/index.html': 'f0bea8ced1dfbeeb771a5f48651fbcff52a625eb',
-        '/spectrum.png': '8d048ece46c0f3af4b598a95fd8e4709b631c3c0',
-      },
-    }));
+      }),
+    );
 
     await run.stop();
   });
@@ -140,12 +128,14 @@ describe('Browser Builder service worker', () => {
     await run.output
       .pipe(
         debounceTime(3000),
-        tap(buildEvent => {
+        tap((buildEvent) => {
           expect(buildEvent.success).toBeTrue();
 
           const ngswJsonPath = normalize('dist/ngsw.json');
           expect(host.scopedSync().exists(ngswJsonPath)).toBeTrue();
-          const ngswJson = JSON.parse(virtualFs.fileBufferToString(host.scopedSync().read(ngswJsonPath)));
+          const ngswJson = JSON.parse(
+            virtualFs.fileBufferToString(host.scopedSync().read(ngswJsonPath)),
+          );
 
           const hashTableEntries = Object.keys(ngswJson.hashTable);
 
@@ -192,52 +182,50 @@ describe('Browser Builder service worker', () => {
     await expectAsync(run.result).toBeResolvedTo(jasmine.objectContaining({ success: true }));
 
     expect(host.scopedSync().exists(normalize('dist/ngsw.json'))).toBeTrue();
-    const ngswJson = JSON.parse(virtualFs.fileBufferToString(
-      host.scopedSync().read(normalize('dist/ngsw.json'))));
+    const ngswJson = JSON.parse(
+      virtualFs.fileBufferToString(host.scopedSync().read(normalize('dist/ngsw.json'))),
+    );
     // Verify index and assets include the base href.
-    expect(ngswJson).toEqual(jasmine.objectContaining({
-      configVersion: 1,
-      index: '/foo/bar/index.html',
-      navigationUrls: [
-        { positive: true, regex: '^\\\/.*$' },
-        { positive: false, regex: '^\\\/(?:.+\\\/)?[^\/]*\\.[^\/]*$' },
-        { positive: false, regex: '^\\\/(?:.+\\\/)?[^\/]*__[^\/]*$' },
-        { positive: false, regex: '^\\\/(?:.+\\\/)?[^\/]*__[^\/]*\\\/.*$' },
-      ],
-      assetGroups: [
-        {
-          name: 'app',
-          installMode: 'prefetch',
-          updateMode: 'prefetch',
-          urls: [
-            '/foo/bar/favicon.ico',
-            '/foo/bar/index.html',
-          ],
-          patterns: [],
-          cacheQueryOptions: {
-            ignoreVary: true,
+    expect(ngswJson).toEqual(
+      jasmine.objectContaining({
+        configVersion: 1,
+        index: '/foo/bar/index.html',
+        navigationUrls: [
+          { positive: true, regex: '^\\/.*$' },
+          { positive: false, regex: '^\\/(?:.+\\/)?[^/]*\\.[^/]*$' },
+          { positive: false, regex: '^\\/(?:.+\\/)?[^/]*__[^/]*$' },
+          { positive: false, regex: '^\\/(?:.+\\/)?[^/]*__[^/]*\\/.*$' },
+        ],
+        assetGroups: [
+          {
+            name: 'app',
+            installMode: 'prefetch',
+            updateMode: 'prefetch',
+            urls: ['/foo/bar/favicon.ico', '/foo/bar/index.html'],
+            patterns: [],
+            cacheQueryOptions: {
+              ignoreVary: true,
+            },
           },
-        },
-        {
-          name: 'assets',
-          installMode: 'lazy',
-          updateMode: 'prefetch',
-          urls: [
-            '/foo/bar/assets/folder-asset.txt',
-          ],
-          patterns: [],
-          cacheQueryOptions: {
-            ignoreVary: true,
+          {
+            name: 'assets',
+            installMode: 'lazy',
+            updateMode: 'prefetch',
+            urls: ['/foo/bar/assets/folder-asset.txt'],
+            patterns: [],
+            cacheQueryOptions: {
+              ignoreVary: true,
+            },
           },
+        ],
+        dataGroups: [],
+        hashTable: {
+          '/foo/bar/favicon.ico': '84161b857f5c547e3699ddfbffc6d8d737542e01',
+          '/foo/bar/assets/folder-asset.txt': '617f202968a6a81050aa617c2e28e1dca11ce8d4',
+          '/foo/bar/index.html': 'f6650ac91428c6933dfe4c24079b3b15400da1ba',
         },
-      ],
-      dataGroups: [],
-      hashTable: {
-        '/foo/bar/favicon.ico': '84161b857f5c547e3699ddfbffc6d8d737542e01',
-        '/foo/bar/assets/folder-asset.txt': '617f202968a6a81050aa617c2e28e1dca11ce8d4',
-        '/foo/bar/index.html': 'f6650ac91428c6933dfe4c24079b3b15400da1ba',
-      },
-    }));
+      }),
+    );
 
     await run.stop();
   });
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 73675b20f6dc..03507f9f3968 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,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 } from '@angular-devkit/architect';
 import { OutputHashing } from '@angular-devkit/build-angular';
 import { browserBuild, createArchitect, host } from '../../test-utils';
 
-// tslint:disable-next-line:no-big-function
 describe('Browser Builder source map', () => {
   const target = { project: 'app', target: 'build' };
   let architect: Architect;
@@ -59,7 +59,7 @@ describe('Browser Builder source map', () => {
       outputHashing: OutputHashing.All,
     });
 
-    expect(Object.keys(files).some(name => /main\.[0-9a-f]{20}\.js.map/.test(name))).toBeTruthy();
+    expect(Object.keys(files).some((name) => /main\.[0-9a-f]{20}\.js.map/.test(name))).toBeTruthy();
   });
 
   it('does not output source map when disabled', async () => {
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..ac0d01b47061 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,14 +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 { Architect } from '@angular-devkit/architect';
 import { browserBuild, createArchitect, host } from '../../test-utils';
 
-
 describe('Browser Builder stats json', () => {
   const target = { project: 'app', target: 'build' };
   let architect: Architect;
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 7e8e64ec45e5..69176dbd96f8 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,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
  */
-// tslint:disable:no-big-function
 
 import { Architect } from '@angular-devkit/architect';
 import { normalize, tags } from '@angular-devkit/core';
@@ -174,7 +173,7 @@ describe('Browser Builder styles', () => {
     expect(await files['main.js']).toContain('-ms-flex: 1;');
   });
 
-  extensionsWithImportSupport.forEach(ext => {
+  extensionsWithImportSupport.forEach((ext) => {
     it(`supports imports in ${ext} files`, async () => {
       host.writeMultipleFiles({
         [`src/styles.${ext}`]: `
@@ -228,7 +227,7 @@ describe('Browser Builder styles', () => {
     });
   });
 
-  extensionsWithImportSupport.forEach(ext => {
+  extensionsWithImportSupport.forEach((ext) => {
     it(`supports material imports in ${ext} files`, async () => {
       host.writeMultipleFiles({
         [`src/styles.${ext}`]: `
@@ -254,7 +253,7 @@ describe('Browser Builder styles', () => {
     });
   });
 
-  extensionsWithVariableSupport.forEach(ext => {
+  extensionsWithVariableSupport.forEach((ext) => {
     it(`supports ${ext} includePaths`, async () => {
       let variableAssignment = '';
       let variablereference = '';
@@ -404,110 +403,126 @@ describe('Browser Builder styles', () => {
   });
 
   // TODO: consider making this a unit test in the url processing plugins.
-  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');
-    host.writeMultipleFiles({
-      'src/styles.css': `
+  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');
+      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': `
+        'src/app/app.component.css': `
         h3 { background: url('/assets/component-img-absolute.svg'); }
         h4 { background: url('../assets/component-img-relative.png'); }
       `,
-      'src/assets/global-img-absolute.svg': imgSvg,
-      'src/assets/component-img-absolute.svg': imgSvg,
-    });
-
-    let { files } = await browserBuild(architect, host, target, { aot: true, extractCss: true });
-
-    // Check base paths are correctly generated.
-    let styles = await files['styles.css'];
-    let main = await files['main.js'];
-
-    expect(styles).toContain(`url('/assets/global-img-absolute.svg')`);
-    expect(styles).toContain(`url('global-img-relative.png')`);
-    expect(main).toContain(`url('/assets/component-img-absolute.svg')`);
-    expect(main).toContain(`url('component-img-relative.png')`);
-
-    expect(host.scopedSync().exists(normalize('dist/assets/global-img-absolute.svg'))).toBe(true);
-    expect(host.scopedSync().exists(normalize('dist/global-img-relative.png'))).toBe(true);
-    expect(host.scopedSync().exists(normalize('dist/assets/component-img-absolute.svg'))).toBe(
-      true,
-    );
-    expect(host.scopedSync().exists(normalize('dist/component-img-relative.png'))).toBe(true);
-
-    // Check urls with deploy-url scheme are used as is.
-    files = (await browserBuild(architect, host, target, {
-      extractCss: true,
-      baseHref: '/base/',
-      deployUrl: 'http://deploy.url/',
-    })).files;
+        'src/assets/global-img-absolute.svg': imgSvg,
+        'src/assets/component-img-absolute.svg': imgSvg,
+      });
 
-    styles = await files['styles.css'];
-    main = await files['main.js'];
-    expect(styles).toContain(`url('/assets/global-img-absolute.svg')`);
-    expect(main).toContain(`url('/assets/component-img-absolute.svg')`);
+      let { files } = await browserBuild(architect, host, target, { aot: true, extractCss: true });
 
-    // Check urls with base-href scheme are used as is (with deploy-url).
-    files = (await browserBuild(architect, host, target, {
-      extractCss: true,
-      baseHref: 'http://base.url/',
-      deployUrl: 'deploy/',
-    })).files;
-    styles = await files['styles.css'];
-    main = await files['main.js'];
-    expect(styles).toContain(`url('/assets/global-img-absolute.svg')`);
-    expect(main).toContain(`url('/assets/component-img-absolute.svg')`);
-
-    // Check urls with deploy-url and base-href scheme only use deploy-url.
-    files = (await browserBuild(architect, host, target, {
-      extractCss: true,
-      baseHref: 'http://base.url/',
-      deployUrl: 'http://deploy.url/',
-    })).files;
-    styles = await files['styles.css'];
-    main = await files['main.js'];
-    expect(styles).toContain(`url('/assets/global-img-absolute.svg')`);
-    expect(main).toContain(`url('/assets/component-img-absolute.svg')`);
-
-    // Check with schemeless base-href and deploy-url flags.
-    files = (await browserBuild(architect, host, target, {
-      extractCss: true,
-      baseHref: '/base/',
-      deployUrl: 'deploy/',
-    })).files;
-    styles = await files['styles.css'];
-    main = await files['main.js'];
-    expect(styles).toContain(`url('/assets/global-img-absolute.svg')`);
-    expect(main).toContain(`url('/assets/component-img-absolute.svg')`);
-
-    // Check with identical base-href and deploy-url flags.
-    files = (await browserBuild(architect, host, target, {
-      extractCss: true,
-      baseHref: '/base/',
-      deployUrl: '/base/',
-    })).files;
+      // Check base paths are correctly generated.
+      let styles = await files['styles.css'];
+      let main = await files['main.js'];
 
-    styles = await files['styles.css'];
-    main = await files['main.js'];
-    expect(styles).toContain(`url('/assets/global-img-absolute.svg')`);
-    expect(main).toContain(`url('/assets/component-img-absolute.svg')`);
+      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')`);
 
-    // Check with only base-href flag.
-    files = (await browserBuild(architect, host, target, {
-      extractCss: true,
-      baseHref: '/base/',
-    })).files;
+      expect(host.scopedSync().exists(normalize('dist/assets/global-img-absolute.svg'))).toBe(true);
+      expect(host.scopedSync().exists(normalize('dist/global-img-relative.png'))).toBe(true);
+      expect(host.scopedSync().exists(normalize('dist/assets/component-img-absolute.svg'))).toBe(
+        true,
+      );
+      expect(host.scopedSync().exists(normalize('dist/component-img-relative.png'))).toBe(true);
+
+      // Check urls with deploy-url scheme are used as is.
+      files = (
+        await browserBuild(architect, host, target, {
+          extractCss: true,
+          baseHref: '/base/',
+          deployUrl: 'http://deploy.url/',
+        })
+      ).files;
+
+      styles = await files['styles.css'];
+      main = await files['main.js'];
+      expect(styles).toContain(`url('/assets/global-img-absolute.svg')`);
+      expect(main).toContain(`url('/assets/component-img-absolute.svg')`);
+
+      // Check urls with base-href scheme are used as is (with deploy-url).
+      files = (
+        await browserBuild(architect, host, target, {
+          extractCss: true,
+          baseHref: 'http://base.url/',
+          deployUrl: 'deploy/',
+        })
+      ).files;
+      styles = await files['styles.css'];
+      main = await files['main.js'];
+      expect(styles).toContain(`url('/assets/global-img-absolute.svg')`);
+      expect(main).toContain(`url('/assets/component-img-absolute.svg')`);
+
+      // Check urls with deploy-url and base-href scheme only use deploy-url.
+      files = (
+        await browserBuild(architect, host, target, {
+          extractCss: true,
+          baseHref: 'http://base.url/',
+          deployUrl: 'http://deploy.url/',
+        })
+      ).files;
+      styles = await files['styles.css'];
+      main = await files['main.js'];
+      expect(styles).toContain(`url('/assets/global-img-absolute.svg')`);
+      expect(main).toContain(`url('/assets/component-img-absolute.svg')`);
+
+      // Check with schemeless base-href and deploy-url flags.
+      files = (
+        await browserBuild(architect, host, target, {
+          extractCss: true,
+          baseHref: '/base/',
+          deployUrl: 'deploy/',
+        })
+      ).files;
+      styles = await files['styles.css'];
+      main = await files['main.js'];
+      expect(styles).toContain(`url('/assets/global-img-absolute.svg')`);
+      expect(main).toContain(`url('/assets/component-img-absolute.svg')`);
+
+      // Check with identical base-href and deploy-url flags.
+      files = (
+        await browserBuild(architect, host, target, {
+          extractCss: true,
+          baseHref: '/base/',
+          deployUrl: '/base/',
+        })
+      ).files;
+
+      styles = await files['styles.css'];
+      main = await files['main.js'];
+      expect(styles).toContain(`url('/assets/global-img-absolute.svg')`);
+      expect(main).toContain(`url('/assets/component-img-absolute.svg')`);
+
+      // Check with only base-href flag.
+      files = (
+        await browserBuild(architect, host, target, {
+          extractCss: true,
+          baseHref: '/base/',
+        })
+      ).files;
 
-    styles = await files['styles.css'];
-    main = await files['main.js'];
-    expect(styles).toContain(`url('/assets/global-img-absolute.svg')`);
-    expect(main).toContain(`url('/assets/component-img-absolute.svg')`);
-  // NOTE: Timeout for large amount of builds in test. Test should be split up when refactored.
-  }, 4 * 60 * 1000);
+      styles = await files['styles.css'];
+      main = await files['main.js'];
+      expect(styles).toContain(`url('/assets/global-img-absolute.svg')`);
+      expect(main).toContain(`url('/assets/component-img-absolute.svg')`);
+      // NOTE: Timeout for large amount of builds in test. Test should be split up when refactored.
+    },
+    4 * 60 * 1000,
+  );
 
   it(`supports bootstrap@4 with full path`, async () => {
     const bootstrapPath = dirname(require.resolve('bootstrap/package.json'));
@@ -606,7 +621,7 @@ describe('Browser Builder styles', () => {
     expect(output.success).toBe(true);
   });
 
-  extensionsWithImportSupport.forEach(ext => {
+  extensionsWithImportSupport.forEach((ext) => {
     it(`retains declarations order in ${ext} files with extractCss when using @import`, async () => {
       host.writeMultipleFiles({
         [`src/styles-one.${ext}`]: tags.stripIndents`
@@ -622,7 +637,9 @@ describe('Browser Builder styles', () => {
         // LESS doesn't support css imports by default.
         // See: https://github.com/less/less.js/issues/3188#issuecomment-374690630
         [`src/styles-three.${ext}`]: tags.stripIndents`
-            @import ${ext === 'less' ? ' (css) ' : ''}url("https://fonts.googleapis.com/css?family=Roboto:400");
+            @import ${
+              ext === 'less' ? ' (css) ' : ''
+            }url("https://fonts.googleapis.com/css?family=Roboto:400");
             .three {
               color: #fff;
             }
@@ -631,18 +648,14 @@ describe('Browser Builder styles', () => {
 
       const overrides = {
         extractCss: true,
-        styles: [
-          `src/styles-one.${ext}`,
-          `src/styles-two.${ext}`,
-          `src/styles-three.${ext}`,
-        ],
+        styles: [`src/styles-one.${ext}`, `src/styles-two.${ext}`, `src/styles-three.${ext}`],
       };
       const { files } = await browserBuild(architect, host, target, overrides);
       expect(await files['styles.css']).toMatch(/\.one(.|\n|\r)*\.two(.|\n|\r)*\.three/);
     });
   });
 
-  extensionsWithImportSupport.forEach(ext => {
+  extensionsWithImportSupport.forEach((ext) => {
     it(`adjusts relative resource URLs when using @import in ${ext} (global)`, async () => {
       host.copyFile('src/spectrum.png', './src/more-styles/images/global-img-relative.png');
       host.writeMultipleFiles({
@@ -659,12 +672,10 @@ describe('Browser Builder styles', () => {
       const overrides = {
         sourceMap: false,
         extractCss: true,
-        styles: [
-          `src/styles-one.${ext}`,
-        ],
+        styles: [`src/styles-one.${ext}`],
       };
       const { files } = await browserBuild(architect, host, target, overrides);
-      expect(await files['styles.css']).toContain('\'global-img-relative.png\'');
+      expect(await files['styles.css']).toContain("'global-img-relative.png'");
     });
 
     it(`adjusts relative resource URLs when using @import in ${ext} (component)`, async () => {
@@ -689,5 +700,36 @@ describe('Browser Builder styles', () => {
       };
       await browserBuild(architect, host, target, overrides);
     });
+
+    it('should minify colors based on browser support', async () => {
+      host.writeMultipleFiles({
+        'src/app/app.component.css': `
+          div { box-shadow: 0 3px 10px, rgba(0, 0, 0, 0.15); }
+        `,
+      });
+      host.replaceInFile('tsconfig.json', 'es2017', 'es5');
+
+      let result = await browserBuild(architect, host, target, { optimization: true, aot: true });
+      expect(await result.files['main.js']).toContain('#00000026');
+
+      await host.restore().toPromise();
+      await host.initialize().toPromise();
+      architect = (await createArchitect(host.root())).architect;
+
+      // IE 11 doesn't support #rrggbbaa colors
+      // https://github.com/angular/angular-cli/issues/21594#:~:text=%23rrggbbaa%20hex%20color%20notation
+      // While this browser is un-supported, this is used as a base case to test that the underlying
+      // logic to pass the list of supported browsers to the css optimizer works.
+      host.writeMultipleFiles({
+        'src/app/app.component.css': `
+          div { box-shadow: 0 3px 10px, rgba(0, 0, 0, 0.15); }
+        `,
+        '.browserslistrc': 'ie 11',
+      });
+      host.replaceInFile('tsconfig.json', 'es2017', 'es5');
+
+      result = await browserBuild(architect, host, target, { optimization: true, aot: true });
+      expect(await result.files['main.js']).toContain('rgba(0,0,0,.15)');
+    });
   });
 });
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 82cc1cb8ac7c..10f37411a9e5 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,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 { Architect } from '@angular-devkit/architect';
 import { join, normalize, virtualFs } from '@angular-devkit/core';
 import { createArchitect, host, outputPath } from '../../test-utils';
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..152c575bac0e 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
@@ -9,7 +9,6 @@
 import { Architect } from '@angular-devkit/architect';
 import { browserBuild, createArchitect, host } from '../../test-utils';
 
-
 describe('Browser Builder tsconfig paths', () => {
   const target = { project: 'app', target: 'build' };
   let architect: Architect;
@@ -22,14 +21,18 @@ describe('Browser Builder tsconfig paths', () => {
 
   it('works', async () => {
     host.replaceInFile('src/app/app.module.ts', './app.component', '@root/app/app.component');
-    host.replaceInFile('tsconfig.json', /"baseUrl": ".\/",/, `
+    host.replaceInFile(
+      'tsconfig.json',
+      /"baseUrl": ".\/",/,
+      `
       "baseUrl": "./",
       "paths": {
         "@root/*": [
           "./src/*"
         ]
       },
-    `);
+    `,
+    );
 
     await browserBuild(architect, host, target);
   });
@@ -40,7 +43,10 @@ describe('Browser Builder tsconfig paths', () => {
       'src/app/shared/meaning.ts': 'export var meaning = 42;',
       'src/app/shared/index.ts': `export * from './meaning'`,
     });
-    host.replaceInFile('tsconfig.json', /"baseUrl": ".\/",/, `
+    host.replaceInFile(
+      'tsconfig.json',
+      /"baseUrl": ".\/",/,
+      `
       "baseUrl": "./",
       "paths": {
         "@shared": [
@@ -54,8 +60,11 @@ describe('Browser Builder tsconfig paths', () => {
           "src/app/shared/*"
         ]
       },
-    `);
-    host.appendToFile('src/app/app.component.ts', `
+    `,
+    );
+    host.appendToFile(
+      'src/app/app.component.ts',
+      `
       import { meaning } from 'src/app/shared/meaning';
       import { meaning as meaning2 } from '@shared';
       import { meaning as meaning3 } from '@shared/meaning';
@@ -69,7 +78,8 @@ describe('Browser Builder tsconfig paths', () => {
       console.log(meaning3)
       console.log(meaning4)
       console.log(meaning5)
-    `);
+    `,
+    );
 
     await browserBuild(architect, host, target);
   });
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 d1295d67a07a..b5f66bfa03a6 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,17 +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 { Architect } from '@angular-devkit/architect';
 import { BrowserBuilderOutput } from '@angular-devkit/build-angular';
 import { logging } from '@angular-devkit/core';
 import { debounceTime, take, tap } from 'rxjs/operators';
 import { createArchitect, host } from '../../test-utils';
 
-// tslint:disable-next-line:no-big-function
 describe('Browser Builder unused files warnings', () => {
   const warningMessageSuffix = `is part of the TypeScript compilation but it's unused`;
   const targetSpec = { project: 'app', target: 'build' };
@@ -27,10 +27,10 @@ describe('Browser Builder unused files warnings', () => {
   it('should not show warning when all files are used', async () => {
     const logger = new logging.Logger('');
     const logs: string[] = [];
-    logger.subscribe(e => logs.push(e.message));
+    logger.subscribe((e) => logs.push(e.message));
 
     const run = await architect.scheduleTarget(targetSpec, undefined, { logger });
-    const output = await run.result as BrowserBuilderOutput;
+    const output = (await run.result) as BrowserBuilderOutput;
     expect(output.success).toBe(true);
     expect(logs.join().includes(warningMessageSuffix)).toBe(false);
 
@@ -46,10 +46,10 @@ describe('Browser Builder unused files warnings', () => {
 
     const logger = new logging.Logger('');
     const logs: string[] = [];
-    logger.subscribe(e => logs.push(e.message));
+    logger.subscribe((e) => logs.push(e.message));
 
     const run = await architect.scheduleTarget(targetSpec, undefined, { logger });
-    const output = await run.result as BrowserBuilderOutput;
+    const output = (await run.result) as BrowserBuilderOutput;
     expect(output.success).toBe(true);
     expect(logs.join().includes(`environment.prod.ts ${warningMessageSuffix}`)).toBe(true);
 
@@ -66,7 +66,9 @@ describe('Browser Builder unused files warnings', () => {
     host.replaceInFile(
       'src/tsconfig.app.json',
       '"main.ts"',
-      `"main.ts", ${Object.keys(ignoredFiles).map(f => `"${f.replace('src/', '')}"`).join(',')}`,
+      `"main.ts", ${Object.keys(ignoredFiles)
+        .map((f) => `"${f.replace('src/', '')}"`)
+        .join(',')}`,
     );
 
     host.replaceInFile(
@@ -77,10 +79,10 @@ describe('Browser Builder unused files warnings', () => {
 
     const logger = new logging.Logger('');
     const logs: string[] = [];
-    logger.subscribe(e => logs.push(e.message));
+    logger.subscribe((e) => logs.push(e.message));
 
     const run = await architect.scheduleTarget(targetSpec, { aot: true }, { logger });
-    const output = await run.result as BrowserBuilderOutput;
+    const output = (await run.result) as BrowserBuilderOutput;
     expect(output.success).toBe(true);
     expect(logs.join().includes(warningMessageSuffix)).toBe(false);
 
@@ -100,10 +102,10 @@ describe('Browser Builder unused files warnings', () => {
 
     const logger = new logging.Logger('');
     const logs: string[] = [];
-    logger.subscribe(e => logs.push(e.message));
+    logger.subscribe((e) => logs.push(e.message));
 
     const run = await architect.scheduleTarget(targetSpec, undefined, { logger });
-    const output = await run.result as BrowserBuilderOutput;
+    const output = (await run.result) as BrowserBuilderOutput;
     expect(output.success).toBe(true);
     expect(logs.join().includes(warningMessageSuffix)).toBe(false);
 
@@ -112,8 +114,7 @@ describe('Browser Builder unused files warnings', () => {
 
   it('should not show warning when type files are used transitively', async () => {
     host.writeMultipleFiles({
-      'src/app/type.ts':
-        `import {Myinterface} from './interface'; export type MyType = Myinterface;`,
+      'src/app/type.ts': `import {Myinterface} from './interface'; export type MyType = Myinterface;`,
       'src/app/interface.ts': 'export interface Myinterface {nbr: number;}',
     });
 
@@ -125,10 +126,10 @@ describe('Browser Builder unused files warnings', () => {
 
     const logger = new logging.Logger('');
     const logs: string[] = [];
-    logger.subscribe(e => logs.push(e.message));
+    logger.subscribe((e) => logs.push(e.message));
 
     const run = await architect.scheduleTarget(targetSpec, undefined, { logger });
-    const output = await run.result as BrowserBuilderOutput;
+    const output = (await run.result) as BrowserBuilderOutput;
     expect(output.success).toBe(true);
     expect(logs.join().includes(warningMessageSuffix)).toBe(false);
 
@@ -136,15 +137,11 @@ describe('Browser Builder unused files warnings', () => {
   });
 
   it('works for rebuilds', async () => {
-    host.replaceInFile(
-      'src/tsconfig.app.json',
-      '"**/*.d.ts"',
-      '"**/*.d.ts", "testing/**/*.ts"',
-    );
+    host.replaceInFile('src/tsconfig.app.json', '"**/*.d.ts"', '"**/*.d.ts", "testing/**/*.ts"');
 
     const logger = new logging.Logger('');
     let logs: string[] = [];
-    logger.subscribe(e => logs.push(e.message));
+    logger.subscribe((e) => logs.push(e.message));
 
     let buildNumber = 0;
     const run = await architect.scheduleTarget(targetSpec, { watch: true }, { logger });
@@ -152,14 +149,17 @@ describe('Browser Builder unused files warnings', () => {
     await run.output
       .pipe(
         debounceTime(1000),
-        tap(buildEvent => {
+        tap((buildEvent) => {
           expect(buildEvent.success).toBe(true);
 
-          buildNumber ++;
+          buildNumber++;
           switch (buildNumber) {
             case 1:
               // The first should not have unused files
-              expect(logs.join().includes(warningMessageSuffix)).toBe(false, `Case ${buildNumber} failed.`);
+              expect(logs.join().includes(warningMessageSuffix)).toBe(
+                false,
+                `Case ${buildNumber} failed.`,
+              );
 
               // Write a used file
               host.writeMultipleFiles({
@@ -176,7 +176,10 @@ describe('Browser Builder unused files warnings', () => {
 
             case 2:
               // The second should have type.ts as unused
-              expect(logs.join().includes(`type.ts ${warningMessageSuffix}`)).toBe(true, `Case ${buildNumber} failed.`);
+              expect(logs.join().includes(`type.ts ${warningMessageSuffix}`)).toBe(
+                true,
+                `Case ${buildNumber} failed.`,
+              );
 
               host.replaceInFile(
                 'src/app/app.component.ts',
@@ -187,7 +190,10 @@ describe('Browser Builder unused files warnings', () => {
 
             case 3:
               // The third should not have any unused files
-              expect(logs.join().includes(warningMessageSuffix)).toBe(false, `Case ${buildNumber} failed.`);
+              expect(logs.join().includes(warningMessageSuffix)).toBe(
+                false,
+                `Case ${buildNumber} failed.`,
+              );
               break;
           }
 
@@ -200,11 +206,7 @@ describe('Browser Builder unused files warnings', () => {
   });
 
   it('should only show warning once per file', async () => {
-    host.replaceInFile(
-      'src/tsconfig.app.json',
-      '"**/*.d.ts"',
-      '"**/*.d.ts", "testing/**/*.ts"',
-    );
+    host.replaceInFile('src/tsconfig.app.json', '"**/*.d.ts"', '"**/*.d.ts", "testing/**/*.ts"');
 
     // Write a used file
     host.writeMultipleFiles({
@@ -213,28 +215,34 @@ describe('Browser Builder unused files warnings', () => {
 
     const logger = new logging.Logger('');
     let logs: string[] = [];
-    logger.subscribe(e => logs.push(e.message));
+    logger.subscribe((e) => logs.push(e.message));
     let buildNumber = 0;
     const run = await architect.scheduleTarget(targetSpec, { watch: true }, { logger });
 
     await run.output
       .pipe(
         debounceTime(1000),
-        tap(buildEvent => {
+        tap((buildEvent) => {
           expect(buildEvent.success).toBe(true);
 
-          buildNumber ++;
+          buildNumber++;
           switch (buildNumber) {
             case 1:
               // The first should have type.ts as unused.
-              expect(logs.join().includes(`type.ts ${warningMessageSuffix}`)).toBe(true, `Case ${buildNumber} failed.`);
+              expect(logs.join().includes(`type.ts ${warningMessageSuffix}`)).toBe(
+                true,
+                `Case ${buildNumber} failed.`,
+              );
 
               // touch a file to trigger a rebuild
               host.appendToFile('src/main.ts', '');
               break;
             case 2:
               // The second should should have type.ts as unused but shouldn't warn.
-              expect(logs.join().includes(warningMessageSuffix)).toBe(false, `Case ${buildNumber} failed.`);
+              expect(logs.join().includes(warningMessageSuffix)).toBe(
+                false,
+                `Case ${buildNumber} failed.`,
+              );
               break;
           }
 
@@ -245,5 +253,4 @@ describe('Browser Builder unused files warnings', () => {
       .toPromise();
     await run.stop();
   });
-
 });
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..bcff7de45201 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,14 +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 { Architect } from '@angular-devkit/architect';
 import { browserBuild, createArchitect, host } from '../../test-utils';
 
-
 describe('Browser Builder vendor chunk', () => {
   const target = { project: 'app', target: 'build' };
   let architect: Architect;
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 b2c9a3373fc7..e28242cf5fba 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,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 { Architect } from '@angular-devkit/architect';
 import * as path from 'path';
 import { browserBuild, createArchitect, host } from '../../test-utils';
@@ -30,7 +31,7 @@ describe('Browser Builder external source map', () => {
 
     const { files } = await browserBuild(architect, host, target, overrides);
     const sourcePaths: string[] = JSON.parse(await files['vendor.js.map']).sources;
-    const hasTsSourcePaths = sourcePaths.some(p => path.extname(p) == '.ts');
+    const hasTsSourcePaths = sourcePaths.some((p) => path.extname(p) == '.ts');
     expect(hasTsSourcePaths).toBe(true, `vendor.js.map should have '.ts' extentions`);
   });
 
@@ -45,7 +46,7 @@ describe('Browser Builder external source map', () => {
 
     const { files } = await browserBuild(architect, host, target, overrides);
     const sourcePaths: string[] = JSON.parse(await files['vendor.js.map']).sources;
-    const hasTsSourcePaths = sourcePaths.some(p => path.extname(p) == '.ts');
+    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 51d1dd6d867e..76232f116944 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
@@ -12,7 +12,6 @@ import { timer } from 'rxjs';
 import { debounceTime, map, switchMap, takeWhile, tap } from 'rxjs/operators';
 import { browserBuild, createArchitect, host, outputPath } from '../../test-utils';
 
-
 describe('Browser Builder Web Worker support', () => {
   const target = { project: 'app', target: 'build' };
   let architect: Architect;
@@ -89,20 +88,22 @@ describe('Browser Builder Web Worker support', () => {
 
     const logger = new logging.Logger('');
     const logs: string[] = [];
-    logger.subscribe(e => logs.push(e.message));
+    logger.subscribe((e) => logs.push(e.message));
 
     const overrides = { webWorkerTsConfig: 'src/tsconfig.worker.json' };
     await browserBuild(architect, host, target, overrides, { logger });
 
     // Worker bundle contains worker code.
     const workerContent = virtualFs.fileBufferToString(
-      host.scopedSync().read(join(outputPath, 'src_app_app_worker_ts.js')));
+      host.scopedSync().read(join(outputPath, 'src_app_app_worker_ts.js')),
+    );
     expect(workerContent).toContain('hello from worker');
     expect(workerContent).toContain('bar');
 
     // Main bundle references worker.
     const mainContent = virtualFs.fileBufferToString(
-      host.scopedSync().read(join(outputPath, 'main.js')));
+      host.scopedSync().read(join(outputPath, 'main.js')),
+    );
     expect(mainContent).toContain('src_app_app_worker_ts');
     expect(logs.join().includes('Warning')).toBe(false, 'Should show no warnings.');
   });
@@ -117,10 +118,14 @@ describe('Browser Builder Web Worker support', () => {
     await browserBuild(architect, host, target, overrides);
 
     // Worker bundle should have hash and minified code.
-    const workerBundle = host.fileMatchExists(outputPath, /src_app_app_worker_ts\.[0-9a-f]{20}\.js/) as string;
+    const workerBundle = host.fileMatchExists(
+      outputPath,
+      /src_app_app_worker_ts\.[0-9a-f]{20}\.js/,
+    ) as string;
     expect(workerBundle).toBeTruthy('workerBundle should exist');
     const workerContent = virtualFs.fileBufferToString(
-      host.scopedSync().read(join(outputPath, workerBundle)));
+      host.scopedSync().read(join(outputPath, workerBundle)),
+    );
     expect(workerContent).toContain('hello from worker');
     expect(workerContent).toContain('bar');
     expect(workerContent).toContain('"hello"===e&&postMessage');
@@ -129,7 +134,8 @@ describe('Browser Builder Web Worker support', () => {
     const mainBundle = host.fileMatchExists(outputPath, /main\.[0-9a-f]{20}\.js/) as string;
     expect(mainBundle).toBeTruthy('mainBundle should exist');
     const mainContent = virtualFs.fileBufferToString(
-      host.scopedSync().read(join(outputPath, mainBundle)));
+      host.scopedSync().read(join(outputPath, mainBundle)),
+    );
     expect(mainContent).toContain('src_app_app_worker_ts');
   });
 
@@ -147,32 +153,34 @@ describe('Browser Builder Web Worker support', () => {
     // The current linux-based CI environments may not fully settled in regards to filesystem
     // changes from previous tests which reuse the same directory and fileset.
     // The initial delay helps mitigate false positive rebuild triggers in such scenarios.
-    const { run } = await timer(1000).pipe(
-      switchMap(() => architect.scheduleTarget(target, overrides)),
-      switchMap(run => run.output.pipe(map(output => ({ run, output })))),
-      debounceTime(1000),
-      tap(({ output }) => expect(output.success).toBe(true, 'build should succeed')),
-      tap(() => {
-        switch (phase) {
-          case 1:
-            // Original worker content should be there.
-            workerContent = virtualFs.fileBufferToString(host.scopedSync().read(workerPath));
-            expect(workerContent).toContain('bar');
-            // Change content of worker dependency.
-            host.writeMultipleFiles({ 'src/app/dep.ts': `export const foo = 'baz';` });
-            phase = 2;
-            break;
-
-          case 2:
-            workerContent = virtualFs.fileBufferToString(host.scopedSync().read(workerPath));
-            // Worker content should have changed.
-            expect(workerContent).toContain('baz');
-            phase = 3;
-            break;
-        }
-      }),
-      takeWhile(() => phase < 3),
-    ).toPromise();
+    const { run } = await timer(1000)
+      .pipe(
+        switchMap(() => architect.scheduleTarget(target, overrides)),
+        switchMap((run) => run.output.pipe(map((output) => ({ run, output })))),
+        debounceTime(1000),
+        tap(({ output }) => expect(output.success).toBe(true, 'build should succeed')),
+        tap(() => {
+          switch (phase) {
+            case 1:
+              // Original worker content should be there.
+              workerContent = virtualFs.fileBufferToString(host.scopedSync().read(workerPath));
+              expect(workerContent).toContain('bar');
+              // Change content of worker dependency.
+              host.writeMultipleFiles({ 'src/app/dep.ts': `export const foo = 'baz';` });
+              phase = 2;
+              break;
+
+            case 2:
+              workerContent = virtualFs.fileBufferToString(host.scopedSync().read(workerPath));
+              // Worker content should have changed.
+              expect(workerContent).toContain('baz');
+              phase = 3;
+              break;
+          }
+        }),
+        takeWhile(() => phase < 3),
+      )
+      .toPromise();
     await run.stop();
   });
 });
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 8de151c2ca8c..06645ed87e76 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,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 { describeBuilder } from '../../testing';
 import { buildWebpackBrowser } from '../index';
 
@@ -24,6 +25,7 @@ describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => {
         polyfills: 'src/polyfills.ts',
         tsConfig: 'src/tsconfig.app.json',
         progress: false,
+        vendorChunk: true,
         assets: ['src/favicon.ico', 'src/assets'],
         styles: ['src/styles.css'],
         scripts: [],
@@ -33,13 +35,13 @@ describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => {
       await harness.executeOnce();
 
       // 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);
+      expect(harness.hasFile('dist/runtime.js')).toBeTrue();
+      expect(harness.hasFile('dist/main.js')).toBeTrue();
+      expect(harness.hasFile('dist/polyfills.js')).toBeTrue();
+      expect(harness.hasFile('dist/vendor.js')).toBeTrue();
+      expect(harness.hasFile('dist/favicon.ico')).toBeTrue();
+      expect(harness.hasFile('dist/styles.css')).toBeTrue();
+      expect(harness.hasFile('dist/index.html')).toBeTrue();
     });
   });
 });
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
index 06d766cd23fa..6dfe95b144c9 100644
--- 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
@@ -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
  */
-// tslint:disable: no-big-function
+
 import { logging } from '@angular-devkit/core';
 import { concatMap, count, take, timeout } from 'rxjs/operators';
 import { buildWebpackBrowser } from '../../index';
@@ -13,7 +13,6 @@ 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,
@@ -33,7 +32,9 @@ describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => {
 
       // Create a directive and add to application
       await harness.writeFile('src/app/dir.ts', goodDirectiveContents);
-      await harness.writeFile('src/app/app.module.ts', `
+      await harness.writeFile(
+        'src/app/app.module.ts',
+        `
         import { NgModule } from '@angular/core';
         import { BrowserModule } from '@angular/platform-browser';
         import { AppComponent } from './app.component';
@@ -50,17 +51,21 @@ describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => {
           bootstrap: [AppComponent]
         })
         export class AppModule { }
-      `);
+      `,
+      );
 
       // Create app component that uses the directive
-      await harness.writeFile('src/app/app.component.ts', `
+      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 })
@@ -73,13 +78,16 @@ describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => {
 
                 // Update directive to use a different input type for 'foo' (number -> string)
                 // Should cause a template error
-                await harness.writeFile('src/app/dir.ts', `
+                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:
@@ -150,13 +158,16 @@ describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => {
       const typeErrorText = `Type 'number' is not assignable to type 'string'.`;
 
       // Create two directives and add to application
-      await harness.writeFile('src/app/dir.ts', `
+      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 = `
@@ -168,7 +179,9 @@ describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => {
       `;
       await harness.writeFile('src/app/dir2.ts', goodDirectiveContents);
 
-      await harness.writeFile('src/app/app.module.ts', `
+      await harness.writeFile(
+        'src/app/app.module.ts',
+        `
         import { NgModule } from '@angular/core';
         import { BrowserModule } from '@angular/platform-browser';
         import { AppComponent } from './app.component';
@@ -187,17 +200,21 @@ describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => {
           bootstrap: [AppComponent]
         })
         export class AppModule { }
-      `);
+      `,
+      );
 
       // Create app component that uses the directive
-      await harness.writeFile('src/app/app.component.ts', `
+      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 })
@@ -210,13 +227,16 @@ describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => {
 
                 // Update second directive to use string property `foo` as an Input
                 // Should cause a template error
-                await harness.writeFile('src/app/dir2.ts', `
+                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:
@@ -281,6 +301,7 @@ describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => {
       harness.useTarget('build', {
         ...BASE_OPTIONS,
         watch: true,
+        aot: false,
       });
 
       const buildCount = await harness
diff --git a/packages/angular_devkit/build_angular/src/browser/tests/behavior/rxjs-export-conditions_spec.ts b/packages/angular_devkit/build_angular/src/browser/tests/behavior/rxjs-export-conditions_spec.ts
new file mode 100644
index 000000000000..0e95ad085c43
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/browser/tests/behavior/rxjs-export-conditions_spec.ts
@@ -0,0 +1,43 @@
+/**
+ * @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: "RxJS ES2015 exports condition"', () => {
+    it('uses the rxjs ES2015 distribution files with rxjs 7.x', async () => {
+      // The `es2015` export condition is enabled by the browser webpack configuration partial.
+      // This should cause the application output to contain the ES2015 code and not the ES5 code.
+
+      // Add rxjs usage to ensure it is present in the application output
+      // The `rxjs-7` module specifier (and accompanying root package.json entry) is required to
+      // support testing rxjs 7 while the actual CLI dependencies are still using rxjs 6 since
+      // bazel unit test setup uses the main package.json dependencies during test.
+      await harness.modifyFile(
+        'src/main.ts',
+        (content) => `import { of } from 'rxjs-7';\n` + content + '\nof(1, 2, 3);',
+      );
+
+      harness.useTarget('build', {
+        ...BASE_OPTIONS,
+        vendorChunk: true,
+      });
+
+      const { result } = await harness.executeOnce();
+
+      expect(result?.success).toBe(true);
+      harness
+        .expectFile('dist/vendor.js')
+        .content.not.toContain('./node_modules/rxjs-7/dist/esm5/');
+      harness.expectFile('dist/vendor.js').content.toContain('./node_modules/rxjs-7/dist/esm/');
+      harness.expectFile('dist/vendor.js').content.not.toContain('var Observable');
+      harness.expectFile('dist/vendor.js').content.toContain('class Observable');
+    });
+  });
+});
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
index 8ebb5f784d66..b4c63e1cc5b7 100644
--- 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
@@ -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 { buildWebpackBrowser } from '../../index';
 import { BASE_OPTIONS, BROWSER_BUILDER_INFO, describeBuilder } from '../setup';
 
@@ -39,17 +40,12 @@ describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => {
 
       harness.useTarget('build', {
         ...BASE_OPTIONS,
+        vendorChunk: true,
       });
 
-      const { result, logs } = await harness.executeOnce();
+      const { result } = 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"');
@@ -87,6 +83,7 @@ describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => {
 
       harness.useTarget('build', {
         ...BASE_OPTIONS,
+        vendorChunk: true,
         sourceMap: {
           scripts: true,
         },
@@ -119,19 +116,49 @@ describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => {
 
       harness.useTarget('build', {
         ...BASE_OPTIONS,
+        vendorChunk: true,
       });
 
-      const { result, logs } = await harness.executeOnce();
+      const { result } = 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"');
     });
+
+    it('downlevels "for await...of" when targetting ES2018+', 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 () => {
+          for await (const o of [1, 2, 3]) {
+            console.log("for await...of");
+          }
+        })();
+        `,
+      );
+
+      harness.useTarget('build', {
+        ...BASE_OPTIONS,
+        vendorChunk: true,
+      });
+
+      const { result } = await harness.executeOnce();
+
+      expect(result?.success).toBe(true);
+      harness.expectFile('dist/main.js').content.not.toMatch(/\sawait\s/);
+      harness.expectFile('dist/main.js').content.toContain('"for await...of"');
+    });
   });
 });
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
index f39c6877a96e..05e23a758b5b 100644
--- 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
@@ -1,15 +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 { logging } from '@angular-devkit/core';
 import { buildWebpackBrowser } from '../../index';
 import { BASE_OPTIONS, BROWSER_BUILDER_INFO, describeBuilder } from '../setup';
 
-describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, harness => {
+describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => {
   describe('Option: "allowedCommonJsDependencies"', () => {
     describe('given option is not set', () => {
       for (const aot of [true, false]) {
@@ -33,7 +34,9 @@ describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, harness => {
           );
         });
 
-        it(`should show warning when depending on a Common JS bundle in ${aot ? 'AOT' : 'JIT'} Mode`, async () => {
+        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';`);
 
@@ -48,11 +51,15 @@ describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, harness => {
           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/),
+              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') }),
+            jasmine.objectContaining<logging.LogEntry>({
+              message: jasmine.stringMatching('jquery'),
+            }),
             'Should not warn on transitive CommonJS packages which parent is also CommonJS.',
           );
         });
@@ -61,17 +68,17 @@ describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, harness => {
 
     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', `
+      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',
-        ],
+        allowedCommonJsDependencies: ['bootstrap', 'zone.js'],
       });
 
       const { result, logs } = await harness.executeOnce();
@@ -85,7 +92,10 @@ describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, harness => {
     });
 
     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';`);
+      await harness.appendToFile(
+        'src/app/app.component.ts',
+        `import '@angular/common/locales/fr';`,
+      );
 
       harness.useTarget('build', {
         ...BASE_OPTIONS,
@@ -103,21 +113,22 @@ describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, harness => {
     });
 
     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": ".\/",/, `
+      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'),
+      await harness.modifyFile('src/app/app.module.ts', (content) =>
+        content.replace('./app.component', '@app/app.component'),
       );
 
       harness.useTarget('build', {
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
index 7893869156b7..0029b6b1e8ca 100644
--- 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
@@ -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
  */
-// tslint:disable:no-big-function
+
 import { buildWebpackBrowser } from '../../index';
 import { BASE_OPTIONS, BROWSER_BUILDER_INFO, describeBuilder } from '../setup';
 
@@ -243,9 +243,7 @@ describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => {
 
         harness.useTarget('build', {
           ...BASE_OPTIONS,
-          assets: [
-            { glob: '**/*', input: 'src/files', output: '.', ignore: ['another.file'] },
-          ],
+          assets: [{ glob: '**/*', input: 'src/files', output: '.', ignore: ['another.file'] }],
         });
 
         const { result } = await harness.executeOnce();
@@ -266,9 +264,7 @@ describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => {
 
         harness.useTarget('build', {
           ...BASE_OPTIONS,
-          assets: [
-            { glob: '**/*', input: 'src/files', output: '.', ignore: ['**/*.file'] },
-          ],
+          assets: [{ glob: '**/*', input: 'src/files', output: '.', ignore: ['**/*.file'] }],
         });
 
         const { result } = await harness.executeOnce();
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
index 50b29d23ee1b..d8d4aca94a68 100644
--- 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
@@ -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 { buildWebpackBrowser } from '../../index';
 import { BASE_OPTIONS, BROWSER_BUILDER_INFO, describeBuilder } from '../setup';
 
@@ -32,14 +33,14 @@ describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => {
       harness.expectFile('dist/3rdpartylicenses.txt').toNotExist();
     });
 
-    it(`should not generate '3rdpartylicenses.txt' when 'extractLicenses' is not set`, async () => {
+    it(`should 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();
+      harness.expectFile('dist/3rdpartylicenses.txt').content.toContain('MIT');
     });
   });
 });
diff --git a/packages/angular_devkit/build_angular/src/browser/tests/options/inline-critical_spec.ts b/packages/angular_devkit/build_angular/src/browser/tests/options/inline-critical_spec.ts
new file mode 100644
index 000000000000..a8c86d84c9a8
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/browser/tests/options/inline-critical_spec.ts
@@ -0,0 +1,163 @@
+/**
+ * @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: "inlineCritical"', () => {
+    beforeEach(async () => {
+      await harness.writeFile('src/styles.css', 'body { color: #000 }');
+    });
+
+    it(`should extract critical css when 'inlineCritical' is true`, async () => {
+      harness.useTarget('build', {
+        ...BASE_OPTIONS,
+        optimization: {
+          scripts: false,
+          styles: {
+            minify: true,
+            inlineCritical: true,
+          },
+          fonts: false,
+        },
+        styles: ['src/styles.css'],
+      });
+
+      const { result } = await harness.executeOnce();
+
+      expect(result?.success).toBe(true);
+      harness
+        .expectFile('dist/index.html')
+        .content.toContain(
+          `<link rel="stylesheet" href="styles.css" media="print" onload="this.media='all'">`,
+        );
+      harness.expectFile('dist/index.html').content.toContain(`body{color:#000}`);
+    });
+
+    it(`should extract critical css when 'optimization' is unset`, async () => {
+      harness.useTarget('build', {
+        ...BASE_OPTIONS,
+        styles: ['src/styles.css'],
+        optimization: undefined,
+      });
+
+      const { result } = await harness.executeOnce();
+
+      expect(result?.success).toBe(true);
+      harness
+        .expectFile('dist/index.html')
+        .content.toContain(
+          `<link rel="stylesheet" href="styles.css" media="print" onload="this.media='all'">`,
+        );
+      harness.expectFile('dist/index.html').content.toContain(`body{color:#000}`);
+    });
+
+    it(`should extract critical css when 'optimization' is true`, async () => {
+      harness.useTarget('build', {
+        ...BASE_OPTIONS,
+        styles: ['src/styles.css'],
+        optimization: true,
+      });
+
+      const { result } = await harness.executeOnce();
+
+      expect(result?.success).toBe(true);
+      harness
+        .expectFile('dist/index.html')
+        .content.toContain(
+          `<link rel="stylesheet" href="styles.css" media="print" onload="this.media='all'">`,
+        );
+      harness.expectFile('dist/index.html').content.toContain(`body{color:#000}`);
+    });
+
+    it(`should not extract critical css when 'optimization' is false`, async () => {
+      harness.useTarget('build', {
+        ...BASE_OPTIONS,
+        styles: ['src/styles.css'],
+        optimization: false,
+      });
+
+      const { result } = await harness.executeOnce();
+
+      expect(result?.success).toBe(true);
+      harness.expectFile('dist/index.html').content.not.toContain(`<style`);
+    });
+
+    it(`should not extract critical css when 'inlineCritical' is false`, async () => {
+      harness.useTarget('build', {
+        ...BASE_OPTIONS,
+        styles: ['src/styles.css'],
+        optimization: {
+          scripts: false,
+          styles: {
+            minify: false,
+            inlineCritical: false,
+          },
+          fonts: false,
+        },
+      });
+
+      const { result } = await harness.executeOnce();
+
+      expect(result?.success).toBe(true);
+      harness.expectFile('dist/index.html').content.not.toContain(`<style`);
+    });
+
+    it(`should extract critical css when 'inlineCritical' when using 'deployUrl'`, async () => {
+      harness.useTarget('build', {
+        ...BASE_OPTIONS,
+        deployUrl: 'http://cdn.com/',
+        optimization: {
+          scripts: false,
+          styles: {
+            minify: true,
+            inlineCritical: true,
+          },
+          fonts: false,
+        },
+        styles: ['src/styles.css'],
+      });
+
+      const { result } = await harness.executeOnce();
+      expect(result?.success).toBe(true);
+      harness
+        .expectFile('dist/index.html')
+        .content.toContain(
+          `<link rel="stylesheet" href="http://cdn.com/styles.css" media="print" onload="this.media='all'">`,
+        );
+      harness.expectFile('dist/index.html').content.toContain(`body{color:#000}`);
+    });
+
+    it(`should extract critical css when using '@media all {}' and 'minify' is set to true`, async () => {
+      harness.useTarget('build', {
+        ...BASE_OPTIONS,
+        styles: ['src/styles.css'],
+        optimization: {
+          scripts: false,
+          styles: {
+            minify: true,
+            inlineCritical: true,
+          },
+          fonts: false,
+        },
+      });
+
+      await harness.writeFile('src/styles.css', '@media all { body { color: #000 } }');
+
+      const { result } = await harness.executeOnce();
+      expect(result?.success).toBe(true);
+      harness
+        .expectFile('dist/index.html')
+        .content.toContain(
+          `<link rel="stylesheet" href="styles.css" media="print" onload="this.media='all'">`,
+        );
+      harness.expectFile('dist/index.html').content.toContain(`body{color:#000}`);
+    });
+  });
+});
diff --git a/packages/angular_devkit/build_angular/src/browser/tests/options/inline-style-language_spec.ts b/packages/angular_devkit/build_angular/src/browser/tests/options/inline-style-language_spec.ts
index 8bcdd8f0ce25..f1ad0e8f104c 100644
--- a/packages/angular_devkit/build_angular/src/browser/tests/options/inline-style-language_spec.ts
+++ b/packages/angular_devkit/build_angular/src/browser/tests/options/inline-style-language_spec.ts
@@ -1,10 +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 { concatMap, count, take, timeout } from 'rxjs/operators';
 import { buildWebpackBrowser } from '../../index';
 import { InlineStyleLanguage } from '../../schema';
 import { BASE_OPTIONS, BROWSER_BUILDER_INFO, describeBuilder } from '../setup';
@@ -30,10 +32,7 @@ describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => {
           });
 
           await harness.modifyFile('src/app/app.component.ts', (content) =>
-            content.replace(
-              '__STYLE_MARKER__',
-              '$primary-color: green;\\nh1 { color: $primary-color; }',
-            ),
+            content.replace('__STYLE_MARKER__', '$primary: green;\\nh1 { color: $primary; }'),
           );
 
           const { result } = await harness.executeOnce();
@@ -50,10 +49,7 @@ describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => {
           });
 
           await harness.modifyFile('src/app/app.component.ts', (content) =>
-            content.replace(
-              '__STYLE_MARKER__',
-              '$primary-color: green\\nh1\\n\\tcolor: $primary-color',
-            ),
+            content.replace('__STYLE_MARKER__', '$primary: green\\nh1\\n\\tcolor: $primary'),
           );
 
           const { result } = await harness.executeOnce();
@@ -75,7 +71,7 @@ describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => {
         //   await harness.modifyFile('src/app/app.component.ts', (content) =>
         //     content.replace(
         //       '__STYLE_MARKER__',
-        //       '$primary-color = green;\\nh1 { color: $primary-color; }',
+        //       '$primary = green;\\nh1 { color: $primary; }',
         //     ),
         //   );
 
@@ -93,10 +89,7 @@ describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => {
           });
 
           await harness.modifyFile('src/app/app.component.ts', (content) =>
-            content.replace(
-              '__STYLE_MARKER__',
-              '@primary-color: green;\\nh1 { color: @primary-color; }',
-            ),
+            content.replace('__STYLE_MARKER__', '@primary: green;\\nh1 { color: @primary; }'),
           );
 
           const { result } = await harness.executeOnce();
@@ -104,6 +97,64 @@ describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => {
           expect(result?.success).toBe(true);
           harness.expectFile('dist/main.js').content.toContain('color: green');
         });
+
+        it('updates produced stylesheet in watch mode', async () => {
+          harness.useTarget('build', {
+            ...BASE_OPTIONS,
+            main: 'src/main.ts',
+            inlineStyleLanguage: InlineStyleLanguage.Scss,
+            aot,
+            watch: true,
+          });
+
+          await harness.modifyFile('src/app/app.component.ts', (content) =>
+            content.replace('__STYLE_MARKER__', '$primary: green;\\nh1 { color: $primary; }'),
+          );
+
+          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.toContain('color: green');
+                    harness.expectFile('dist/main.js').content.not.toContain('color: aqua');
+
+                    await harness.modifyFile('src/app/app.component.ts', (content) =>
+                      content.replace(
+                        '$primary: green;\\nh1 { color: $primary; }',
+                        '$primary: aqua;\\nh1 { color: $primary; }',
+                      ),
+                    );
+                    break;
+                  case 1:
+                    harness.expectFile('dist/main.js').content.not.toContain('color: green');
+                    harness.expectFile('dist/main.js').content.toContain('color: aqua');
+
+                    await harness.modifyFile('src/app/app.component.ts', (content) =>
+                      content.replace(
+                        '$primary: aqua;\\nh1 { color: $primary; }',
+                        '$primary: blue;\\nh1 { color: $primary; }',
+                      ),
+                    );
+                    break;
+                  case 2:
+                    harness.expectFile('dist/main.js').content.not.toContain('color: green');
+                    harness.expectFile('dist/main.js').content.not.toContain('color: aqua');
+                    harness.expectFile('dist/main.js').content.toContain('color: blue');
+                    break;
+                }
+              }),
+              take(3),
+              count(),
+            )
+            .toPromise();
+
+          expect(buildCount).toBe(3);
+        });
       });
     }
   });
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
index 021039529a92..967bedded489 100644
--- 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
@@ -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 { buildWebpackBrowser } from '../../index';
 import { BASE_OPTIONS, BROWSER_BUILDER_INFO, describeBuilder } from '../setup';
 
@@ -22,7 +23,6 @@ describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => {
 
       harness.expectFile('dist/runtime.js').toExist();
       harness.expectFile('dist/main.js').toExist();
-      harness.expectFile('dist/vendor.js').toExist();
       harness.expectFile('dist/index.html').toExist();
     });
 
@@ -40,7 +40,6 @@ describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => {
 
       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')`);
@@ -61,7 +60,6 @@ describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => {
 
       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/named-chunks_spec.ts b/packages/angular_devkit/build_angular/src/browser/tests/options/named-chunks_spec.ts
index 85fcb4796240..9791d25d702b 100644
--- a/packages/angular_devkit/build_angular/src/browser/tests/options/named-chunks_spec.ts
+++ b/packages/angular_devkit/build_angular/src/browser/tests/options/named-chunks_spec.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 { buildWebpackBrowser } from '../../index';
 import { BASE_OPTIONS, BROWSER_BUILDER_INFO, describeBuilder } from '../setup';
 
@@ -62,8 +63,8 @@ describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => {
       expect(result?.success).toBe(true);
 
       harness.expectFile(MAIN_OUTPUT).toExist();
-      harness.expectFile(NAMED_LAZY_OUTPUT).toExist();
-      harness.expectFile(UNNAMED_LAZY_OUTPUT).toNotExist();
+      harness.expectFile(NAMED_LAZY_OUTPUT).toNotExist();
+      harness.expectFile(UNNAMED_LAZY_OUTPUT).toExist();
     });
   });
 });
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
index 6f046fcede67..2be061f3f951 100644
--- 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
@@ -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 { buildWebpackBrowser } from '../../index';
 import { OutputHashing } from '../../schema';
 import { BASE_OPTIONS, BROWSER_BUILDER_INFO, describeBuilder } from '../setup';
@@ -16,17 +15,16 @@ describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => {
     beforeEach(async () => {
       // Application code is not needed for asset tests
       await harness.writeFile('src/main.ts', '');
+      await harness.writeFile('src/polyfills.ts', '');
     });
 
     it('hashes all filenames when set to "all"', async () => {
-      await harness.writeFile(
-        'src/styles.css',
-        `h1 { background: url('./spectrum.png')}`,
-      );
+      await harness.writeFile('src/styles.css', `h1 { background: url('./spectrum.png')}`);
 
       harness.useTarget('build', {
         ...BASE_OPTIONS,
         styles: ['src/styles.css'],
+        polyfills: 'src/polyfills.ts',
         outputHashing: OutputHashing.All,
       });
 
@@ -41,13 +39,11 @@ describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => {
     });
 
     it(`doesn't hash any filenames when not set`, async () => {
-      await harness.writeFile(
-        'src/styles.css',
-        `h1 { background: url('./spectrum.png')}`,
-      );
+      await harness.writeFile('src/styles.css', `h1 { background: url('./spectrum.png')}`);
 
       harness.useTarget('build', {
         ...BASE_OPTIONS,
+        polyfills: 'src/polyfills.ts',
         styles: ['src/styles.css'],
       });
 
@@ -62,14 +58,12 @@ describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => {
     });
 
     it(`doesn't hash any filenames when set to "none"`, async () => {
-      await harness.writeFile(
-        'src/styles.css',
-        `h1 { background: url('./spectrum.png')}`,
-      );
+      await harness.writeFile('src/styles.css', `h1 { background: url('./spectrum.png')}`);
 
       harness.useTarget('build', {
         ...BASE_OPTIONS,
         styles: ['src/styles.css'],
+        polyfills: 'src/polyfills.ts',
         outputHashing: OutputHashing.None,
       });
 
@@ -84,14 +78,12 @@ describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => {
     });
 
     it(`hashes CSS resources filenames only when set to "media"`, async () => {
-      await harness.writeFile(
-        'src/styles.css',
-        `h1 { background: url('./spectrum.png')}`,
-      );
+      await harness.writeFile('src/styles.css', `h1 { background: url('./spectrum.png')}`);
 
       harness.useTarget('build', {
         ...BASE_OPTIONS,
         styles: ['src/styles.css'],
+        polyfills: 'src/polyfills.ts',
         outputHashing: OutputHashing.Media,
       });
 
@@ -106,14 +98,12 @@ describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => {
     });
 
     it(`hashes bundles filenames only when set to "bundles"`, async () => {
-      await harness.writeFile(
-        'src/styles.css',
-        `h1 { background: url('./spectrum.png')}`,
-      );
+      await harness.writeFile('src/styles.css', `h1 { background: url('./spectrum.png')}`);
 
       harness.useTarget('build', {
         ...BASE_OPTIONS,
         styles: ['src/styles.css'],
+        polyfills: 'src/polyfills.ts',
         outputHashing: OutputHashing.Bundles,
       });
 
@@ -131,10 +121,13 @@ describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => {
       harness.useTarget('build', {
         ...BASE_OPTIONS,
         outputHashing: OutputHashing.All,
-        styles: [{
-          input: 'src/styles.css',
-          inject: false,
-        }],
+        sourceMap: true,
+        styles: [
+          {
+            input: 'src/styles.css',
+            inject: false,
+          },
+        ],
       });
 
       const { result } = await harness.executeOnce();
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
index 0f3d3893ec72..e47b22531437 100644
--- 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
@@ -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 { buildWebpackBrowser } from '../../index';
 import { BASE_OPTIONS, BROWSER_BUILDER_INFO, describeBuilder } from '../setup';
 
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
index c3ad0d0a0702..036cc58970b9 100644
--- 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
@@ -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
  */
-// tslint:disable:no-big-function
+
 import { buildWebpackBrowser } from '../../index';
 import { BASE_OPTIONS, BROWSER_BUILDER_INFO, describeBuilder } from '../setup';
 
diff --git a/packages/angular_devkit/build_angular/src/browser/tests/options/show-circular-dependencies_spec.ts b/packages/angular_devkit/build_angular/src/browser/tests/options/show-circular-dependencies_spec.ts
index 33dfd04b80ea..491df3956c1a 100644
--- a/packages/angular_devkit/build_angular/src/browser/tests/options/show-circular-dependencies_spec.ts
+++ b/packages/angular_devkit/build_angular/src/browser/tests/options/show-circular-dependencies_spec.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 { logging } from '@angular-devkit/core';
 import { buildWebpackBrowser } from '../../index';
 import { BASE_OPTIONS, BROWSER_BUILDER_INFO, describeBuilder } from '../setup';
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
index f458a2f04d0a..b085f31f96d1 100644
--- 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
@@ -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 { buildWebpackBrowser } from '../../index';
 import { BASE_OPTIONS, BROWSER_BUILDER_INFO, describeBuilder } from '../setup';
 
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
index 7ee1a9005032..1b110454fba0 100644
--- 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
@@ -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
  */
-// tslint:disable:no-big-function
+
 import { buildWebpackBrowser } from '../../index';
 import { BASE_OPTIONS, BROWSER_BUILDER_INFO, describeBuilder } from '../setup';
 
@@ -107,7 +107,7 @@ describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => {
         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}/,
+            /\.test-c {color: blue}[\s|\S]+\.test-d {color: yellow}[\s|\S]+\.test-b {color: green}[\s|\S]+\.test-a {color: red}/m,
           );
       });
 
@@ -300,7 +300,7 @@ describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => {
         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}/,
+            /\.test-c {color: blue}[\s|\S]+\.test-d {color: yellow}[\s|\S]+\.test-b {color: green}[\s|\S]+\.test-a {color: red}/,
           );
       });
 
@@ -328,10 +328,10 @@ describeBuilder(buildWebpackBrowser, BROWSER_BUILDER_INFO, (harness) => {
 
         harness
           .expectFile('dist/other.css')
-          .content.toMatch(/\.test-c {color: blue}\s+\.test-a {color: red}/);
+          .content.toMatch(/\.test-c {color: blue}[\s|\S]+\.test-a {color: red}/);
         harness
           .expectFile('dist/extra.css')
-          .content.toMatch(/\.test-d {color: yellow}\s+\.test-b {color: green}/);
+          .content.toMatch(/\.test-d {color: yellow}[\s|\S]+\.test-b {color: green}/);
         harness
           .expectFile('dist/index.html')
           .content.toMatch(
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
index d7e31047b2b8..9cd62361e1e6 100644
--- 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
@@ -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
  */
-// tslint:disable:no-big-function
+
 import { logging } from '@angular-devkit/core';
 import { buildWebpackBrowser } from '../../index';
 import { BASE_OPTIONS, BROWSER_BUILDER_INFO, describeBuilder } from '../setup';
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
index f74bd5784e4e..06ceb617be02 100644
--- 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
@@ -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 { buildWebpackBrowser } from '../../index';
 import { BASE_OPTIONS, BROWSER_BUILDER_INFO, describeBuilder } from '../setup';
 
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
index c57834ed03e7..d9cb3f57399a 100644
--- 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
@@ -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 { concatMap, count, take, timeout } from 'rxjs/operators';
 import { buildWebpackBrowser } from '../../index';
 import { BASE_OPTIONS, BROWSER_BUILDER_INFO, describeBuilder } from '../setup';
diff --git a/packages/angular_devkit/build_angular/src/browser/tests/setup.ts b/packages/angular_devkit/build_angular/src/browser/tests/setup.ts
index 6c44764e064f..b27d8b75d826 100644
--- a/packages/angular_devkit/build_angular/src/browser/tests/setup.ts
+++ b/packages/angular_devkit/build_angular/src/browser/tests/setup.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 { Schema } from '../schema';
 
 export { describeBuilder } from '../../testing';
@@ -24,4 +25,8 @@ export const BASE_OPTIONS = Object.freeze<Schema>({
   outputPath: 'dist',
   tsConfig: 'src/tsconfig.app.json',
   progress: false,
+
+  // Disable optimizations
+  optimization: false,
+  buildOptimizer: false,
 });
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 56257ab2c0a7..03ddb17fa0fa 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,23 +1,24 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of 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
+/* eslint-disable import/no-extraneous-dependencies */
 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
+/* eslint-enable import/no-extraneous-dependencies */
 import { debounceTime, switchMap, take } from 'rxjs/operators';
 import { createArchitect, host } from '../test-utils';
 
-// tslint:disable: no-any
+/* eslint-disable @typescript-eslint/no-explicit-any */
 declare const document: any;
 declare const getComputedStyle: any;
-// tslint:enable: no-any
+/* eslint-enable @typescript-eslint/no-explicit-any */
 
 describe('Dev Server Builder HMR', () => {
   const target = { project: 'app', target: 'serve' };
@@ -33,7 +34,7 @@ describe('Dev Server Builder HMR', () => {
       // 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
+      // eslint-disable-next-line max-len
       // executablePath: '/Users/<USERNAME>/git/angular-cli/node_modules/puppeteer/.local-chromium/mac-800071/chrome-mac/Chromium.app/Contents/MacOS/Chromium',
       args: ['--no-sandbox', '--disable-gpu'],
     });
@@ -50,7 +51,7 @@ describe('Dev Server Builder HMR', () => {
     logs = [];
     runs = [];
     page = await browser.newPage();
-    page.on('console', msg => logs.push(msg.text()));
+    page.on('console', (msg) => logs.push(msg.text()));
 
     host.writeMultipleFiles({
       'src/app/app.component.html': `
@@ -69,7 +70,7 @@ describe('Dev Server Builder HMR', () => {
   afterEach(async () => {
     await host.restore().toPromise();
     await page.close();
-    await Promise.all(runs.map(r => r.stop()));
+    await Promise.all(runs.map((r) => r.stop()));
   });
 
   it('works for CSS changes', async () => {
@@ -80,7 +81,7 @@ describe('Dev Server Builder HMR', () => {
     await run.output
       .pipe(
         debounceTime(1000),
-        switchMap(async buildEvent => {
+        switchMap(async (buildEvent) => {
           expect(buildEvent.success).toBe(true);
           const url = buildEvent.baseUrl as string;
           switch (buildCount) {
@@ -96,13 +97,13 @@ describe('Dev Server Builder HMR', () => {
               expect(logs).toContain(`[HMR] css reload %s ${url}styles.css`);
               expect(logs).toContain('[HMR] App is up to date.');
 
-              const pTag = await page.evaluate(() => {
+              const pTagColor = await page.evaluate(() => {
                 const el = document.querySelector('p');
 
-                return JSON.parse(JSON.stringify(getComputedStyle(el)));
+                return getComputedStyle(el).color;
               });
 
-              expect(pTag.color).toBe('rgb(255, 255, 0)');
+              expect(pTagColor).toBe('rgb(255, 255, 0)');
               break;
           }
 
@@ -122,7 +123,7 @@ describe('Dev Server Builder HMR', () => {
     await run.output
       .pipe(
         debounceTime(1000),
-        switchMap(async buildEvent => {
+        switchMap(async (buildEvent) => {
           expect(buildEvent.success).toBe(true);
           const url = buildEvent.baseUrl as string;
 
@@ -157,7 +158,7 @@ describe('Dev Server Builder HMR', () => {
     await run.output
       .pipe(
         debounceTime(1000),
-        switchMap(async buildEvent => {
+        switchMap(async (buildEvent) => {
           expect(buildEvent.success).toBe(true);
           const url = buildEvent.baseUrl as string;
           switch (buildCount) {
@@ -177,7 +178,9 @@ 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.visible').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 736fe3741eee..045d1f29abef 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
@@ -18,10 +18,9 @@ import { Observable, from } from 'rxjs';
 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 { getAnalyticsConfig, getCompilerConfig } from '../browser';
-import { OutputHashing, Schema as BrowserBuilderSchema } from '../browser/schema';
+import webpack from 'webpack';
+import webpackDevServer from 'webpack-dev-server';
+import { Schema as BrowserBuilderSchema, OutputHashing } from '../browser/schema';
 import { ExecutionTransformer } from '../transforms';
 import { BuildBrowserFeatures, normalizeOptimization } from '../utils';
 import { findCachePath } from '../utils/cache-path';
@@ -32,14 +31,19 @@ import { IndexHtmlTransform } from '../utils/index-file/index-html-generator';
 import { generateEntryPoints } from '../utils/package-chunk-sort';
 import { readTsconfig } from '../utils/read-tsconfig';
 import { assertCompatibleAngularVersion } from '../utils/version';
-import { generateI18nBrowserWebpackConfigFromContext, getIndexInputFile, getIndexOutputFile } from '../utils/webpack-browser-config';
-import { addError, addWarning } from '../utils/webpack-diagnostics';
 import {
+  generateI18nBrowserWebpackConfigFromContext,
+  getIndexInputFile,
+  getIndexOutputFile,
+} from '../utils/webpack-browser-config';
+import {
+  getAnalyticsConfig,
   getBrowserConfig,
   getCommonConfig,
   getDevServerConfig,
   getStatsConfig,
   getStylesConfig,
+  getTypeScriptConfig,
   getWorkerConfig,
 } from '../webpack/configs';
 import { IndexHtmlWebpackPlugin } from '../webpack/plugins/index-html-webpack-plugin';
@@ -62,6 +66,24 @@ const devServerBuildOverriddenKeys: (keyof DevServerBuilderOptions)[] = [
   'deployUrl',
 ];
 
+// Get dev-server only options.
+type DevServerOptions = Partial<
+  Omit<
+    Schema,
+    | 'watch'
+    | 'optimization'
+    | 'aot'
+    | 'sourceMap'
+    | 'vendorChunk'
+    | 'commonChunk'
+    | 'baseHref'
+    | 'progress'
+    | 'poll'
+    | 'verbose'
+    | 'deployUrl'
+  >
+>;
+
 /**
  * @experimental Direct usage of this type is considered experimental.
  */
@@ -78,7 +100,7 @@ export type DevServerBuilderOutput = DevServerBuildOutput & {
  *
  * @experimental Direct usage of this function is considered experimental.
  */
-// tslint:disable-next-line: no-big-function
+// eslint-disable-next-line max-lines-per-function
 export function serveWebpackBrowser(
   options: DevServerBuilderOptions,
   context: BuilderContext,
@@ -90,7 +112,7 @@ export function serveWebpackBrowser(
 ): Observable<DevServerBuilderOutput> {
   // Check Angular version.
   const { logger, workspaceRoot } = context;
-  assertCompatibleAngularVersion(workspaceRoot, logger);
+  assertCompatibleAngularVersion(workspaceRoot);
 
   const browserTarget = targetFromTargetString(options.browserTarget);
 
@@ -101,12 +123,13 @@ export function serveWebpackBrowser(
     locale: string | undefined;
   }> {
     // Get the browser configuration from the target name.
-    const rawBrowserOptions = (await context.getTargetOptions(browserTarget)) as json.JsonObject & BrowserBuilderSchema;
+    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)[])
-      .filter(key => options[key] !== undefined && devServerBuildOverriddenKeys.includes(key))
+      .filter((key) => options[key] !== undefined && devServerBuildOverriddenKeys.includes(key))
       .reduce<json.JsonObject & Partial<BrowserBuilderSchema>>(
         (previous, key) => ({
           ...previous,
@@ -115,11 +138,8 @@ 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')
+      .filter((key) => !devServerBuildOverriddenKeys.includes(key) && key !== 'browserTarget')
       .reduce<DevServerOptions>(
         (previous, key) => ({
           ...previous,
@@ -138,44 +158,83 @@ export function serveWebpackBrowser(
       logger.warn(`Warning: 'outputHashing' option is disabled when using the dev-server.`);
     }
 
+    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.`);
+    }
+
+    if (
+      !options.disableHostCheck &&
+      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 "--disable-host-check" 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.
+      `);
+    }
+
     // Webpack's live reload functionality adds the `strip-ansi` package which is commonJS
     rawBrowserOptions.allowedCommonJsDependencies ??= [];
     rawBrowserOptions.allowedCommonJsDependencies.push('strip-ansi');
 
     const browserName = await context.getBuilderNameForTarget(browserTarget);
-    const browserOptions = await context.validateOptions(
+    const browserOptions = (await context.validateOptions(
       { ...rawBrowserOptions, ...overrides },
       browserName,
-    ) as json.JsonObject & BrowserBuilderSchema;
+    )) as json.JsonObject & BrowserBuilderSchema;
+
+    const { styles, scripts } = normalizeOptimization(browserOptions.optimization);
+    if (scripts || 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.
+
+        DON'T USE IT FOR PRODUCTION!
+        ****************************************************************************************
+      `);
+    }
 
     const { config, projectRoot, i18n } = await generateI18nBrowserWebpackConfigFromContext(
       browserOptions,
       context,
-      wco => [
+      (wco) => [
         getDevServerConfig(wco),
         getCommonConfig(wco),
         getBrowserConfig(wco),
         getStylesConfig(wco),
         getStatsConfig(wco),
         getAnalyticsConfig(wco, context),
-        getCompilerConfig(wco),
+        getTypeScriptConfig(wco),
         browserOptions.webWorkerTsConfig ? getWorkerConfig(wco) : {},
       ],
       devServerOptions,
     );
 
     if (!config.devServer) {
-      throw new Error(
-        'Webpack Dev Server configuration was not set.',
-      );
+      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.
-      // tslint:disable-next-line: no-any
-      webpackDevServer.addDevServerEntrypoints(config as any, {
+      webpackDevServer.addDevServerEntrypoints(config, {
         ...config.devServer,
         inline: true,
       });
@@ -183,13 +242,20 @@ export function serveWebpackBrowser(
       // 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) {
+      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' || !Array.isArray(value)) {
             continue;
           }
 
-          const webpackClientScriptIndex = value.findIndex(x => x.includes('webpack-dev-server/client/index.js'));
+          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);
@@ -198,35 +264,6 @@ export function serveWebpackBrowser(
       }
     }
 
-    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.`);
-    }
-
-    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 (i18n.shouldInline) {
       // Dev-server only supports one locale
@@ -267,8 +304,6 @@ export function serveWebpackBrowser(
 
   return from(setup()).pipe(
     switchMap(({ browserOptions, webpackConfig, projectRoot, locale }) => {
-      const normalizedOptimization = normalizeOptimization(browserOptions.optimization);
-
       if (browserOptions.index) {
         const { scripts = [], styles = [], baseHref, tsConfig } = browserOptions;
         const { options: compilerOptions } = readTsconfig(tsConfig, workspaceRoot);
@@ -292,7 +327,7 @@ export function serveWebpackBrowser(
             deployUrl: browserOptions.deployUrl,
             sri: browserOptions.subresourceIntegrity,
             postTransform: transforms.indexHtml,
-            optimization: normalizedOptimization,
+            optimization: normalizeOptimization(browserOptions.optimization),
             WOFFSupportNeeded: !buildBrowserFeatures.isFeatureSupported('woff2'),
             crossOrigin: browserOptions.crossOrigin,
             lang: locale,
@@ -300,26 +335,11 @@ export function serveWebpackBrowser(
         );
       }
 
-      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.
-
-          DON'T USE IT FOR PRODUCTION!
-          ****************************************************************************************
-        `);
-      }
-
-      return runWebpackDevServer(
-        webpackConfig,
-        context,
-        {
-          logging: transforms.logging || createWebpackLoggingCallback(!!options.verbose, logger),
-          webpackFactory: require('webpack') as typeof webpack,
-          webpackDevServerFactory: require('webpack-dev-server') as typeof webpackDevServer,
-        },
-      ).pipe(
+      return runWebpackDevServer(webpackConfig, context, {
+        logging: transforms.logging || createWebpackLoggingCallback(browserOptions, logger),
+        webpackFactory: require('webpack') as typeof webpack,
+        webpackDevServerFactory: require('webpack-dev-server') as typeof webpackDevServer,
+      }).pipe(
         concatMap(async (buildEvent, index) => {
           // Resolve serve address.
           const serverAddress = url.format({
@@ -330,21 +350,27 @@ export function serveWebpackBrowser(
           });
 
           if (index === 0) {
-            logger.info('\n' + tags.oneLine`
+            logger.info(
+              '\n' +
+                tags.oneLine`
               **
               Angular Live Development Server is listening on ${options.host}:${buildEvent.port},
               open your browser on ${serverAddress}
               **
-            ` + '\n');
+            ` +
+                '\n',
+            );
 
             if (options.open) {
-              const open = await import('open');
+              const open = (await import('open')).default;
               await open(serverAddress);
             }
           }
 
           if (buildEvent.success) {
             logger.info(`\n${colors.greenBright(colors.symbols.check)} Compiled successfully.`);
+          } else {
+            logger.info(`\n${colors.redBright(colors.symbols.cross)} Failed to compile.`);
           }
 
           return { ...buildEvent, baseUrl: serverAddress } as DevServerBuilderOutput;
@@ -372,7 +398,10 @@ async function setupLocalize(
     if (Array.isArray(webpackConfig.entry['main'])) {
       webpackConfig.entry['main'].unshift(localeDescription.dataPath);
     } else {
-      webpackConfig.entry['main'] = [localeDescription.dataPath, webpackConfig.entry['main'] as string];
+      webpackConfig.entry['main'] = [
+        localeDescription.dataPath,
+        webpackConfig.entry['main'] as string,
+      ];
     }
   }
 
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 8e4f0e049dc6..63da2eaadd23 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,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 { DevServerBuilderOutput } from '@angular-devkit/build-angular';
 import { workspaces } from '@angular-devkit/core';
-import fetch from 'node-fetch'; // tslint:disable-line:no-implicit-dependencies
+import fetch from 'node-fetch'; // eslint-disable-line import/no-extraneous-dependencies
 import { createArchitect, host } from '../test-utils';
 
 describe('Dev Server Builder index', () => {
@@ -47,7 +48,10 @@ describe('Dev Server Builder index', () => {
       'test.js': 'console.log("test");',
     });
 
-    const { workspace } = await workspaces.readWorkspace(host.root(), workspaces.createWorkspaceHost(host));
+    const { workspace } = await workspaces.readWorkspace(
+      host.root(),
+      workspaces.createWorkspaceHost(host),
+    );
     const app = workspace.projects.get('app');
     if (!app) {
       fail('Test application "app" not found.');
@@ -104,7 +108,10 @@ describe('Dev Server Builder index', () => {
 
   it('sets HTML lang attribute with the active locale', async () => {
     const locale = 'fr';
-    const { workspace } = await workspaces.readWorkspace(host.root(), workspaces.createWorkspaceHost(host));
+    const { workspace } = await workspaces.readWorkspace(
+      host.root(),
+      workspaces.createWorkspaceHost(host),
+    );
     const app = workspace.projects.get('app');
     if (!app) {
       fail('Test application "app" not found.');
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
index 04995ebf72d2..d091c19cf135 100644
--- 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
@@ -1,11 +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
  */
-// tslint:disable: no-implicit-dependencies
+
+/* eslint-disable import/no-extraneous-dependencies */
 import { Architect, BuilderRun } from '@angular-devkit/architect';
 import { tags } from '@angular-devkit/core';
 import { createProxyServer } from 'http-proxy';
@@ -16,7 +17,7 @@ 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
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 declare const document: any;
 
 interface ProxyInstance {
@@ -87,8 +88,7 @@ function createProxy(target: string, secure: boolean, ws = true): ProxyInstance
       -----END CERTIFICATE-----
     `,
     },
-  })
-    .listen(proxyPort);
+  }).listen(proxyPort);
 
   return {
     server,
@@ -100,7 +100,9 @@ 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.waitForResponse(
+      (r: HTTPResponse) => r.url().startsWith(socksRequest) && r.status() === 200,
+    ),
     page.goto(url),
   ]);
 }
@@ -121,13 +123,10 @@ describe('Dev Server Builder live-reload', () => {
       // 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
+      // eslint-disable-next-line max-len
       // 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',
-      ],
+      args: ['--no-sandbox', '--disable-gpu'],
     });
   });
 
@@ -154,7 +153,7 @@ describe('Dev Server Builder live-reload', () => {
     proxy = undefined;
     await host.restore().toPromise();
     await page.close();
-    await Promise.all(runs.map(r => r.stop()));
+    await Promise.all(runs.map((r) => r.stop()));
   });
 
   it('works without proxy', async () => {
@@ -165,7 +164,7 @@ describe('Dev Server Builder live-reload', () => {
     await run.output
       .pipe(
         debounceTime(1000),
-        switchMap(async buildEvent => {
+        switchMap(async (buildEvent) => {
           expect(buildEvent.success).toBe(true);
           const url = buildEvent.baseUrl as string;
           switch (buildCount) {
@@ -195,7 +194,7 @@ describe('Dev Server Builder live-reload', () => {
     await run.output
       .pipe(
         debounceTime(1000),
-        switchMap(async buildEvent => {
+        switchMap(async (buildEvent) => {
           expect(buildEvent.success).toBe(true);
           const url = buildEvent.baseUrl as string;
           switch (buildCount) {
@@ -226,7 +225,7 @@ describe('Dev Server Builder live-reload', () => {
     await run.output
       .pipe(
         debounceTime(1000),
-        switchMap(async buildEvent => {
+        switchMap(async (buildEvent) => {
           expect(buildEvent.success).toBe(true);
           const url = buildEvent.baseUrl as string;
           switch (buildCount) {
@@ -258,14 +257,17 @@ describe('Dev Server Builder live-reload', () => {
     await run.output
       .pipe(
         debounceTime(1000),
-        switchMap(async buildEvent => {
+        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);
+              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:
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 f65027d95197..10420805c597 100644
--- a/packages/angular_devkit/build_angular/src/dev-server/schema.json
+++ b/packages/angular_devkit/build_angular/src/dev-server/schema.json
@@ -21,7 +21,7 @@
     },
     "proxyConfig": {
       "type": "string",
-      "description": "Proxy configuration file."
+      "description": "Proxy configuration file. For more information, see https://angular.io/guide/build#proxying-to-a-backend-server."
     },
     "ssl": {
       "type": "boolean",
@@ -202,7 +202,5 @@
     }
   },
   "additionalProperties": false,
-  "required": [
-    "browserTarget"
-  ]
+  "required": ["browserTarget"]
 }
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 f352ba0092c2..8d535b329ed5 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,18 +1,18 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of 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 { tags } from '@angular-devkit/core';
 import * as https from 'https';
-import fetch from 'node-fetch'; // tslint:disable-line:no-implicit-dependencies
+import fetch from 'node-fetch'; // eslint-disable-line import/no-extraneous-dependencies
 import { createArchitect, host } from '../test-utils';
 
-
 describe('Dev Server Builder ssl', () => {
   const target = { project: 'app', target: 'serve' };
   let architect: Architect;
@@ -26,13 +26,13 @@ describe('Dev Server Builder ssl', () => {
   });
   afterEach(async () => {
     await host.restore().toPromise();
-    await Promise.all(runs.map(r => r.stop()));
+    await Promise.all(runs.map((r) => r.stop()));
   });
 
   it('works', async () => {
     const run = await architect.scheduleTarget(target, { ssl: true, port: 0 });
     runs.push(run);
-    const output = await run.result as DevServerBuilderOutput;
+    const output = (await run.result) as DevServerBuilderOutput;
     expect(output.success).toBe(true);
     expect(output.baseUrl).toMatch(/^https:\/\/localhost:\d+\//);
 
@@ -109,7 +109,7 @@ describe('Dev Server Builder ssl', () => {
 
     const run = await architect.scheduleTarget(target, overrides);
     runs.push(run);
-    const output = await run.result as DevServerBuilderOutput;
+    const output = (await run.result) as DevServerBuilderOutput;
     expect(output.success).toBe(true);
     expect(output.baseUrl).toMatch(/^https:\/\/localhost:\d+\//);
 
diff --git a/packages/angular_devkit/build_angular/src/dev-server/tests/behavior/build-budgets_spec.ts b/packages/angular_devkit/build_angular/src/dev-server/tests/behavior/build-budgets_spec.ts
index be5020619969..8c659871cb2f 100644
--- a/packages/angular_devkit/build_angular/src/dev-server/tests/behavior/build-budgets_spec.ts
+++ b/packages/angular_devkit/build_angular/src/dev-server/tests/behavior/build-budgets_spec.ts
@@ -1,13 +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 { Type as BudgetType } from '../../../';
 import { serveWebpackBrowser } from '../../index';
-import { BASE_OPTIONS, DEV_SERVER_BUILDER_INFO, describeBuilder, setupBrowserTarget } from '../setup';
+import {
+  BASE_OPTIONS,
+  DEV_SERVER_BUILDER_INFO,
+  describeBuilder,
+  setupBrowserTarget,
+} from '../setup';
 
 describeBuilder(serveWebpackBrowser, DEV_SERVER_BUILDER_INFO, (harness) => {
   describe('Behavior: "browser builder budgets"', () => {
diff --git a/packages/angular_devkit/build_angular/src/dev-server/tests/behavior/build-deploy-url_spec.ts b/packages/angular_devkit/build_angular/src/dev-server/tests/behavior/build-deploy-url_spec.ts
index f8a0cbaccc21..04c55d703ef1 100644
--- a/packages/angular_devkit/build_angular/src/dev-server/tests/behavior/build-deploy-url_spec.ts
+++ b/packages/angular_devkit/build_angular/src/dev-server/tests/behavior/build-deploy-url_spec.ts
@@ -1,13 +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 { serveWebpackBrowser } from '../../index';
 import { executeOnceAndFetch } from '../execute-fetch';
-import { BASE_OPTIONS, DEV_SERVER_BUILDER_INFO, describeBuilder, setupBrowserTarget } from '../setup';
+import {
+  BASE_OPTIONS,
+  DEV_SERVER_BUILDER_INFO,
+  describeBuilder,
+  setupBrowserTarget,
+} from '../setup';
 
 describeBuilder(serveWebpackBrowser, DEV_SERVER_BUILDER_INFO, (harness) => {
   describe('Behavior: "browser builder deployUrl"', () => {
diff --git a/packages/angular_devkit/build_angular/src/dev-server/tests/behavior/build-inline-critical-css_spec.ts b/packages/angular_devkit/build_angular/src/dev-server/tests/behavior/build-inline-critical-css_spec.ts
index 6b92996d22ac..206bce6c590a 100644
--- a/packages/angular_devkit/build_angular/src/dev-server/tests/behavior/build-inline-critical-css_spec.ts
+++ b/packages/angular_devkit/build_angular/src/dev-server/tests/behavior/build-inline-critical-css_spec.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 { serveWebpackBrowser } from '../../index';
 import { executeOnceAndFetch } from '../execute-fetch';
 import {
@@ -43,7 +44,7 @@ describeBuilder(serveWebpackBrowser, DEV_SERVER_BUILDER_INFO, (harness) => {
       const { result, response } = await executeOnceAndFetch(harness, '/');
 
       expect(result?.success).toBeTrue();
-      expect(await response?.text()).toContain('body{color:#000;}');
+      expect(await response?.text()).toContain('body{color:#000}');
     });
   });
 });
diff --git a/packages/angular_devkit/build_angular/src/dev-server/tests/execute-fetch.ts b/packages/angular_devkit/build_angular/src/dev-server/tests/execute-fetch.ts
index 4525fb558cec..90994d406785 100644
--- a/packages/angular_devkit/build_angular/src/dev-server/tests/execute-fetch.ts
+++ b/packages/angular_devkit/build_angular/src/dev-server/tests/execute-fetch.ts
@@ -1,11 +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 fetch, { RequestInit, Response } from 'node-fetch'; // tslint:disable-line:no-implicit-dependencies
+
+import fetch, { RequestInit, Response } from 'node-fetch'; // eslint-disable-line import/no-extraneous-dependencies
 import { mergeMap, take, timeout } from 'rxjs/operators';
 import { URL } from 'url';
 import {
diff --git a/packages/angular_devkit/build_angular/src/dev-server/tests/options/allowed-hosts_spec.ts b/packages/angular_devkit/build_angular/src/dev-server/tests/options/allowed-hosts_spec.ts
index 730fd9d4c50d..364067d19c9f 100644
--- a/packages/angular_devkit/build_angular/src/dev-server/tests/options/allowed-hosts_spec.ts
+++ b/packages/angular_devkit/build_angular/src/dev-server/tests/options/allowed-hosts_spec.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 { serveWebpackBrowser } from '../../index';
 import { executeOnceAndFetch } from '../execute-fetch';
 import {
diff --git a/packages/angular_devkit/build_angular/src/dev-server/tests/options/disable-host-check_spec.ts b/packages/angular_devkit/build_angular/src/dev-server/tests/options/disable-host-check_spec.ts
index ce583fb96d23..76702ff10fc3 100644
--- a/packages/angular_devkit/build_angular/src/dev-server/tests/options/disable-host-check_spec.ts
+++ b/packages/angular_devkit/build_angular/src/dev-server/tests/options/disable-host-check_spec.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 { serveWebpackBrowser } from '../../index';
 import { executeOnceAndFetch } from '../execute-fetch';
 import {
diff --git a/packages/angular_devkit/build_angular/src/dev-server/tests/options/hmr_spec.ts b/packages/angular_devkit/build_angular/src/dev-server/tests/options/hmr_spec.ts
index d0f76f7f1ee5..96d5da7a8f9b 100644
--- a/packages/angular_devkit/build_angular/src/dev-server/tests/options/hmr_spec.ts
+++ b/packages/angular_devkit/build_angular/src/dev-server/tests/options/hmr_spec.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 { serveWebpackBrowser } from '../../index';
 import {
   BASE_OPTIONS,
diff --git a/packages/angular_devkit/build_angular/src/dev-server/tests/options/live-reload_spec.ts b/packages/angular_devkit/build_angular/src/dev-server/tests/options/live-reload_spec.ts
index 12ce756e1b3e..79d1c4ecd143 100644
--- a/packages/angular_devkit/build_angular/src/dev-server/tests/options/live-reload_spec.ts
+++ b/packages/angular_devkit/build_angular/src/dev-server/tests/options/live-reload_spec.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 { serveWebpackBrowser } from '../../index';
 import {
   BASE_OPTIONS,
diff --git a/packages/angular_devkit/build_angular/src/dev-server/tests/options/port_spec.ts b/packages/angular_devkit/build_angular/src/dev-server/tests/options/port_spec.ts
index 9811860d88e0..8413f2ad5f9d 100644
--- a/packages/angular_devkit/build_angular/src/dev-server/tests/options/port_spec.ts
+++ b/packages/angular_devkit/build_angular/src/dev-server/tests/options/port_spec.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 { URL } from 'url';
 import { serveWebpackBrowser } from '../../index';
 import { executeOnceAndFetch } from '../execute-fetch';
diff --git a/packages/angular_devkit/build_angular/src/dev-server/tests/options/proxy-config_spec.ts b/packages/angular_devkit/build_angular/src/dev-server/tests/options/proxy-config_spec.ts
index 2a703e1d7e2c..5c2abd6f467c 100644
--- a/packages/angular_devkit/build_angular/src/dev-server/tests/options/proxy-config_spec.ts
+++ b/packages/angular_devkit/build_angular/src/dev-server/tests/options/proxy-config_spec.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 * as http from 'http';
 import { serveWebpackBrowser } from '../../index';
 import { executeOnceAndFetch } from '../execute-fetch';
diff --git a/packages/angular_devkit/build_angular/src/dev-server/tests/options/public-host_spec.ts b/packages/angular_devkit/build_angular/src/dev-server/tests/options/public-host_spec.ts
index 6e1dfb1c9035..952d7e822662 100644
--- a/packages/angular_devkit/build_angular/src/dev-server/tests/options/public-host_spec.ts
+++ b/packages/angular_devkit/build_angular/src/dev-server/tests/options/public-host_spec.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 { serveWebpackBrowser } from '../../index';
 import { executeOnceAndFetch } from '../execute-fetch';
 import {
diff --git a/packages/angular_devkit/build_angular/src/dev-server/tests/options/serve-path_spec.ts b/packages/angular_devkit/build_angular/src/dev-server/tests/options/serve-path_spec.ts
index 2741c16f0fd9..953abb23ef74 100644
--- a/packages/angular_devkit/build_angular/src/dev-server/tests/options/serve-path_spec.ts
+++ b/packages/angular_devkit/build_angular/src/dev-server/tests/options/serve-path_spec.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 { URL } from 'url';
 import { serveWebpackBrowser } from '../../index';
 import { executeOnceAndFetch } from '../execute-fetch';
diff --git a/packages/angular_devkit/build_angular/src/dev-server/tests/options/verbose_spec.ts b/packages/angular_devkit/build_angular/src/dev-server/tests/options/verbose_spec.ts
index 8d18b030eac8..ed0082dc989d 100644
--- a/packages/angular_devkit/build_angular/src/dev-server/tests/options/verbose_spec.ts
+++ b/packages/angular_devkit/build_angular/src/dev-server/tests/options/verbose_spec.ts
@@ -1,12 +1,18 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+
 import { serveWebpackBrowser } from '../../index';
-import { BASE_OPTIONS, DEV_SERVER_BUILDER_INFO, describeBuilder, setupBrowserTarget } from '../setup';
+import {
+  BASE_OPTIONS,
+  DEV_SERVER_BUILDER_INFO,
+  describeBuilder,
+  setupBrowserTarget,
+} from '../setup';
 
 const VERBOSE_LOG_TEXT = /\[emitted\] \(name: main\)/;
 
diff --git a/packages/angular_devkit/build_angular/src/dev-server/tests/options/watch_spec.ts b/packages/angular_devkit/build_angular/src/dev-server/tests/options/watch_spec.ts
index 8d8d5399dd6b..8aad6f724149 100644
--- a/packages/angular_devkit/build_angular/src/dev-server/tests/options/watch_spec.ts
+++ b/packages/angular_devkit/build_angular/src/dev-server/tests/options/watch_spec.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 { TimeoutError } from 'rxjs';
 import { concatMap, count, take, timeout } from 'rxjs/operators';
 import { serveWebpackBrowser } from '../../index';
diff --git a/packages/angular_devkit/build_angular/src/dev-server/tests/setup.ts b/packages/angular_devkit/build_angular/src/dev-server/tests/setup.ts
index cc864a9922a6..58aaf5032f51 100644
--- a/packages/angular_devkit/build_angular/src/dev-server/tests/setup.ts
+++ b/packages/angular_devkit/build_angular/src/dev-server/tests/setup.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 { json } from '@angular-devkit/core';
 import { readFileSync } from 'fs';
 import { buildWebpackBrowser } from '../../browser';
@@ -24,7 +25,7 @@ export const DEV_SERVER_BUILDER_INFO = Object.freeze({
 });
 
 /**
- * Contains all required extract-i18n builder fields.
+ * Contains all required dev-server builder fields.
  * The port is also set to zero to ensure a free port is used for each test which
  * supports parallel test execution.
  */
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 493c2cbfe8f9..5704d63f4fd1 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,17 +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 { Architect, BuilderRun } from '@angular-devkit/architect';
 import { DevServerBuilderOutput } from '@angular-devkit/build-angular';
 import { normalize, virtualFs } from '@angular-devkit/core';
-import fetch from 'node-fetch'; // tslint:disable-line:no-implicit-dependencies
+import fetch from 'node-fetch'; // eslint-disable-line import/no-extraneous-dependencies
 import { createArchitect, host } from '../test-utils';
 
-
 describe('Dev Server Builder', () => {
   const target = { project: 'app', target: 'serve' };
   let architect: Architect;
@@ -24,13 +24,13 @@ describe('Dev Server Builder', () => {
   });
   afterEach(async () => {
     await host.restore().toPromise();
-    await Promise.all(runs.map(r => r.stop()));
+    await Promise.all(runs.map((r) => r.stop()));
   });
 
   it(`doesn't serve files on the cwd directly`, async () => {
     const run = await architect.scheduleTarget(target);
     runs.push(run);
-    const output = await run.result as DevServerBuilderOutput;
+    const output = (await run.result) as DevServerBuilderOutput;
     expect(output.success).toBe(true);
 
     // When webpack-dev-server doesn't have `contentBase: false`, this will serve the repo README.
@@ -47,19 +47,25 @@ describe('Dev Server Builder', () => {
 
   it('should not generate sourcemaps when running prod build', async () => {
     // Production builds have sourcemaps turned off.
-    const run = await architect.scheduleTarget({ ...target, configuration: 'production' }, { port: 0 });
+    const run = await architect.scheduleTarget(
+      { ...target, configuration: 'production' },
+      { port: 0 },
+    );
     runs.push(run);
-    const output = await run.result as DevServerBuilderOutput;
+    const output = (await run.result) as DevServerBuilderOutput;
     expect(output.success).toBe(true);
-    const hasSourceMaps = output.emittedFiles && output.emittedFiles.some(f => f.extension === '.map');
+    const hasSourceMaps =
+      output.emittedFiles && output.emittedFiles.some((f) => f.extension === '.map');
     expect(hasSourceMaps).toBe(false, `Expected emitted files not to contain '.map' files.`);
   });
 
   it('serves custom headers', async () => {
-    const run = await architect.scheduleTarget(
-        target, {headers: {'X-Header': 'Hello World'}, port: 0});
+    const run = await architect.scheduleTarget(target, {
+      headers: { 'X-Header': 'Hello World' },
+      port: 0,
+    });
     runs.push(run);
-    const output = await run.result as DevServerBuilderOutput;
+    const output = (await run.result) as DevServerBuilderOutput;
     expect(output.success).toBe(true);
     const response = await fetch(output.baseUrl);
     expect(response.headers.get('X-Header')).toBe('Hello World');
@@ -78,7 +84,7 @@ describe('Dev Server Builder', () => {
 
     const architect = (await createArchitect(host.root())).architect;
     const run = await architect.scheduleTarget(target, { port: 0 });
-    const output = await run.result as DevServerBuilderOutput;
+    const output = (await run.result) as DevServerBuilderOutput;
     expect(output.success).toBe(true);
 
     const indexResponse = await fetch(output.baseUrl);
@@ -90,5 +96,4 @@ describe('Dev Server Builder', () => {
 
     await run.stop();
   });
-
 });
diff --git a/packages/angular_devkit/build_angular/src/extract-i18n/empty-export-default.js b/packages/angular_devkit/build_angular/src/extract-i18n/empty-export-default.js
deleted file mode 100644
index 08d725cd4e46..000000000000
--- a/packages/angular_devkit/build_angular/src/extract-i18n/empty-export-default.js
+++ /dev/null
@@ -1 +0,0 @@
-export default '';
diff --git a/packages/angular_devkit/build_optimizer/src/_golden-api.ts b/packages/angular_devkit/build_angular/src/extract-i18n/empty-loader.ts
similarity index 54%
rename from packages/angular_devkit/build_optimizer/src/_golden-api.ts
rename to packages/angular_devkit/build_angular/src/extract-i18n/empty-loader.ts
index 06e63e7a2c84..791cb7c0c230 100644
--- a/packages/angular_devkit/build_optimizer/src/_golden-api.ts
+++ b/packages/angular_devkit/build_angular/src/extract-i18n/empty-loader.ts
@@ -1,9 +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
  */
-export * from './index';
-export { default } from './build-optimizer/webpack-loader';
+
+export default function () {
+  return `export default '';`;
+}
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 6748db2a9e6d..220330ce5953 100644
--- a/packages/angular_devkit/build_angular/src/extract-i18n/index.ts
+++ b/packages/angular_devkit/build_angular/src/extract-i18n/index.ts
@@ -1,28 +1,31 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import {
-  BuilderContext,
-  createBuilder,
-  targetFromTargetString,
-} from '@angular-devkit/architect';
+
+import { BuilderContext, createBuilder, targetFromTargetString } from '@angular-devkit/architect';
 import { BuildResult, runWebpack } from '@angular-devkit/build-webpack';
 import { JsonObject } from '@angular-devkit/core';
 import type { ɵParsedMessage as LocalizeMessage } from '@angular/localize';
 import type { Diagnostics } from '@angular/localize/src/tools/src/diagnostics';
 import * as fs from 'fs';
 import * as path from 'path';
-import * as webpack from 'webpack';
-import { Schema as BrowserBuilderOptions } from '../browser/schema';
+import webpack from 'webpack';
+import { Schema as BrowserBuilderOptions, OutputHashing } from '../browser/schema';
 import { ExecutionTransformer } from '../transforms';
 import { createI18nOptions } from '../utils/i18n-options';
 import { assertCompatibleAngularVersion } from '../utils/version';
 import { generateBrowserWebpackConfigFromContext } from '../utils/webpack-browser-config';
-import { getAotConfig, getBrowserConfig, getCommonConfig, getStatsConfig } from '../webpack/configs';
+import {
+  getBrowserConfig,
+  getCommonConfig,
+  getStatsConfig,
+  getTypeScriptConfig,
+  getWorkerConfig,
+} from '../webpack/configs';
 import { createWebpackLoggingCallback } from '../webpack/utils/stats';
 import { Format, Schema } from './schema';
 
@@ -48,42 +51,54 @@ function getI18nOutfile(format: string | undefined) {
   }
 }
 
-async function getSerializer(format: Format, sourceLocale: string, basePath: string, useLegacyIds: boolean, diagnostics: Diagnostics) {
+async function getSerializer(
+  format: Format,
+  sourceLocale: string,
+  basePath: string,
+  useLegacyIds: boolean,
+  diagnostics: Diagnostics,
+) {
   switch (format) {
     case Format.Xmb:
-      const { XmbTranslationSerializer } =
-      await import('@angular/localize/src/tools/src/extract/translation_files/xmb_translation_serializer');
+      const { XmbTranslationSerializer } = await import(
+        '@angular/localize/src/tools/src/extract/translation_files/xmb_translation_serializer'
+      );
 
-      // tslint:disable-next-line: no-any
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       return new XmbTranslationSerializer(basePath as any, useLegacyIds);
     case Format.Xlf:
     case Format.Xlif:
     case Format.Xliff:
-      const { Xliff1TranslationSerializer } =
-        await import('@angular/localize/src/tools/src/extract/translation_files/xliff1_translation_serializer');
+      const { Xliff1TranslationSerializer } = await import(
+        '@angular/localize/src/tools/src/extract/translation_files/xliff1_translation_serializer'
+      );
 
-      // tslint:disable-next-line: no-any
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       return new Xliff1TranslationSerializer(sourceLocale, basePath as any, useLegacyIds, {});
     case Format.Xlf2:
     case Format.Xliff2:
-      const { Xliff2TranslationSerializer } =
-        await import('@angular/localize/src/tools/src/extract/translation_files/xliff2_translation_serializer');
+      const { Xliff2TranslationSerializer } = await import(
+        '@angular/localize/src/tools/src/extract/translation_files/xliff2_translation_serializer'
+      );
 
-      // tslint:disable-next-line: no-any
+      // eslint-disable-next-line @typescript-eslint/no-explicit-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');
+      const { SimpleJsonTranslationSerializer } = await import(
+        '@angular/localize/src/tools/src/extract/translation_files/json_translation_serializer'
+      );
 
       return new SimpleJsonTranslationSerializer(sourceLocale);
     case Format.LegacyMigrate:
-      const { LegacyMessageIdMigrationSerializer } =
-        await import('@angular/localize/src/tools/src/extract/translation_files/legacy_message_id_migration_serializer');
+      const { LegacyMessageIdMigrationSerializer } = await import(
+        '@angular/localize/src/tools/src/extract/translation_files/legacy_message_id_migration_serializer'
+      );
 
       return new LegacyMessageIdMigrationSerializer(diagnostics);
     case Format.Arb:
-      const { ArbTranslationSerializer } =
-        await import('@angular/localize/src/tools/src/extract/translation_files/arb_translation_serializer');
+      const { ArbTranslationSerializer } = await import(
+        '@angular/localize/src/tools/src/extract/translation_files/arb_translation_serializer'
+      );
 
       const fileSystem = {
         relative(from: string, to: string): string {
@@ -91,7 +106,7 @@ async function getSerializer(format: Format, sourceLocale: string, basePath: str
         },
       };
 
-      // tslint:disable-next-line: no-any
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       return new ArbTranslationSerializer(sourceLocale, basePath as any, fileSystem as any);
   }
 }
@@ -132,7 +147,7 @@ export async function execute(
   },
 ): Promise<BuildResult> {
   // Check Angular version.
-  assertCompatibleAngularVersion(context.workspaceRoot, context.logger);
+  assertCompatibleAngularVersion(context.workspaceRoot);
 
   const browserTarget = targetFromTargetString(options.browserTarget);
   const browserOptions = await context.validateOptions<JsonObject & BrowserBuilderOptions>(
@@ -160,25 +175,29 @@ export async function execute(
   let useLegacyIds = true;
 
   const ivyMessages: LocalizeMessage[] = [];
-  const { config, projectRoot } = await generateBrowserWebpackConfigFromContext(
-    {
-      ...browserOptions,
-      optimization: false,
-      sourceMap: {
-        scripts: true,
-        styles: false,
-        vendor: true,
-      },
-      buildOptimizer: false,
-      aot: true,
-      progress: options.progress,
-      assets: [],
-      scripts: [],
-      styles: [],
-      deleteOutputPath: false,
-      extractLicenses: false,
-      subresourceIntegrity: false,
+  const builderOptions = {
+    ...browserOptions,
+    optimization: false,
+    sourceMap: {
+      scripts: true,
+      styles: false,
+      vendor: true,
     },
+    buildOptimizer: false,
+    aot: true,
+    progress: options.progress,
+    budgets: [],
+    assets: [],
+    scripts: [],
+    styles: [],
+    deleteOutputPath: false,
+    extractLicenses: false,
+    subresourceIntegrity: false,
+    outputHashing: OutputHashing.None,
+    namedChunks: true,
+  };
+  const { config, projectRoot } = await generateBrowserWebpackConfigFromContext(
+    builderOptions,
     context,
     (wco) => {
       if (wco.tsConfig.options.enableIvy === false) {
@@ -194,7 +213,8 @@ export async function execute(
         { plugins: [new NoEmitPlugin()] },
         getCommonConfig(wco),
         getBrowserConfig(wco),
-        getAotConfig(wco),
+        getTypeScriptConfig(wco),
+        getWorkerConfig(wco),
         getStatsConfig(wco),
       ];
 
@@ -213,14 +233,16 @@ export async function execute(
         },
       });
 
-      // Replace all stylesheets with an empty default export
+      // Replace all stylesheets with empty content
       partials.push({
-        plugins: [
-          new webpack.NormalModuleReplacementPlugin(
-            /\.(css|scss|sass|styl|less)$/,
-            path.join(__dirname, 'empty-export-default.js'),
-          ),
-        ],
+        module: {
+          rules: [
+            {
+              test: /\.(css|scss|sass|styl|less)$/,
+              loader: require.resolve('./empty-loader'),
+            },
+          ],
+        },
       });
 
       return partials;
@@ -241,7 +263,7 @@ export async function execute(
     (await transforms?.webpackConfiguration?.(config)) || config,
     context,
     {
-      logging: createWebpackLoggingCallback(false, context.logger),
+      logging: createWebpackLoggingCallback(builderOptions, context.logger),
       webpackFactory: webpack,
     },
   ).toPromise();
@@ -257,7 +279,6 @@ export async function execute(
   const basePath = config.context || projectRoot;
 
   const { checkDuplicateMessages } = await import(
-    // tslint:disable-next-line: trailing-comma
     '@angular/localize/src/tools/src/extract/duplicates'
   );
 
@@ -269,11 +290,11 @@ export async function execute(
     },
   };
   const diagnostics = checkDuplicateMessages(
-    // tslint:disable-next-line: no-any
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     checkFileSystem as any,
     ivyMessages,
     'warning',
-    // tslint:disable-next-line: no-any
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     basePath as any,
   );
   if (diagnostics.messages.length > 0) {
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 af1bdddf4596..88ec9717a415 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,54 +1,55 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+
 import { MessageExtractor } from '@angular/localize/src/tools/src/extract/extraction';
-import { getOptions } from 'loader-utils';
 import * as nodePath from 'path';
 
+// Extract loader source map parameter type since it is not exported directly
+type LoaderSourceMap = Parameters<import('webpack').LoaderDefinitionFunction>[1];
+
 interface LocalizeExtractLoaderOptions {
   messageHandler: (messages: import('@angular/localize').ɵParsedMessage[]) => void;
 }
 
 export default function localizeExtractLoader(
-  // tslint:disable-next-line: no-any
-  this: any,
+  this: import('webpack').LoaderContext<LocalizeExtractLoaderOptions>,
   content: string,
-  // Source map types are broken in the webpack type definitions
-  // tslint:disable-next-line: no-any
-  map: any,
+  map: LoaderSourceMap,
 ) {
+  // eslint-disable-next-line @typescript-eslint/no-this-alias
   const loaderContext = this;
-
-  // Casts are needed to workaround the loader-utils typings limited support for option values
-  const options = (getOptions(this) as unknown) as LocalizeExtractLoaderOptions | undefined;
+  const options = this.getOptions();
 
   // Setup a Webpack-based logger instance
   const logger = {
     // level 2 is warnings
     level: 2,
     debug(...args: string[]): void {
-      // tslint:disable-next-line: no-console
+      // eslint-disable-next-line no-console
       console.debug(...args);
     },
     info(...args: string[]): void {
-      loaderContext.emitWarning(args.join(''));
+      loaderContext.emitWarning(new Error(args.join('')));
     },
     warn(...args: string[]): void {
-      loaderContext.emitWarning(args.join(''));
+      loaderContext.emitWarning(new Error(args.join('')));
     },
     error(...args: string[]): void {
-      loaderContext.emitError(args.join(''));
+      loaderContext.emitError(new Error(args.join('')));
     },
   };
 
   let filename = loaderContext.resourcePath;
-  if (map?.file) {
+  const mapObject =
+    typeof map === 'string' ? (JSON.parse(map) as Exclude<LoaderSourceMap, string>) : map;
+  if (mapObject?.file) {
     // The extractor's internal sourcemap handling expects the filenames to match
-    filename = nodePath.join(loaderContext.context, map.file);
+    filename = nodePath.join(loaderContext.context, mapObject.file);
   }
 
   // Setup a virtual file system instance for the extractor
@@ -78,9 +79,9 @@ export default function localizeExtractLoader(
     },
   };
 
-  // tslint:disable-next-line: no-any
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const extractor = new MessageExtractor(filesystem as any, logger, {
-    // tslint:disable-next-line: no-any
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     basePath: this.rootContext as any,
     useSourceMaps: !!map,
   });
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 9f70bc8dfaa3..f4bf78ba361d 100644
--- a/packages/angular_devkit/build_angular/src/extract-i18n/schema.json
+++ b/packages/angular_devkit/build_angular/src/extract-i18n/schema.json
@@ -13,17 +13,7 @@
       "type": "string",
       "description": "Output format for the generated file.",
       "default": "xlf",
-      "enum": [
-        "xmb",
-        "xlf",
-        "xlif",
-        "xliff",
-        "xlf2",
-        "xliff2",
-        "json",
-        "arb",
-        "legacy-migrate"
-      ]
+      "enum": ["xmb", "xlf", "xlif", "xliff", "xlf2", "xliff2", "json", "arb", "legacy-migrate"]
     },
     "progress": {
       "type": "boolean",
@@ -40,7 +30,5 @@
     }
   },
   "additionalProperties": false,
-  "required": [
-    "browserTarget"
-  ]
+  "required": ["browserTarget"]
 }
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 cbc951852e96..7989d77fe748 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,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 { Architect } from '@angular-devkit/architect';
 import { join, logging, normalize, virtualFs } from '@angular-devkit/core';
 import { createArchitect, extractI18nTargetSpec, host } from '../test-utils';
@@ -53,10 +54,12 @@ describe('Extract i18n Target', () => {
   it('shows errors', async () => {
     const logger = new logging.Logger('');
     const logs: string[] = [];
-    logger.subscribe(e => logs.push(e.message));
+    logger.subscribe((e) => logs.push(e.message));
 
-    host.appendToFile('src/app/app.component.html',
-      '<p i18n>Hello world <span i18n>inner</span></p>');
+    host.appendToFile(
+      'src/app/app.component.html',
+      '<p i18n>Hello world <span i18n>inner</span></p>',
+    );
 
     const run = await architect.scheduleTarget(extractI18nTargetSpec, undefined, { logger });
 
@@ -64,7 +67,9 @@ describe('Extract i18n Target', () => {
 
     await run.stop();
 
-    expect(logs.join()).toMatch('Cannot mark an element as translatable inside of a translatable section');
+    expect(logs.join()).toMatch(
+      'Cannot mark an element as translatable inside of a translatable section',
+    );
   });
 
   it('supports out file', async () => {
@@ -80,8 +85,9 @@ describe('Extract i18n Target', () => {
     await run.stop();
 
     expect(host.scopedSync().exists(extractionFile)).toBe(true);
-    expect(virtualFs.fileBufferToString(host.scopedSync().read(extractionFile)))
-      .toMatch(/i18n test/);
+    expect(virtualFs.fileBufferToString(host.scopedSync().read(extractionFile))).toMatch(
+      /i18n test/,
+    );
   });
 
   it('supports output path', async () => {
@@ -98,8 +104,9 @@ describe('Extract i18n Target', () => {
     await run.stop();
 
     expect(host.scopedSync().exists(extractionFile)).toBe(true);
-    expect(virtualFs.fileBufferToString(host.scopedSync().read(extractionFile)))
-      .toMatch(/i18n test/);
+    expect(virtualFs.fileBufferToString(host.scopedSync().read(extractionFile))).toMatch(
+      /i18n test/,
+    );
   });
 
   it('supports i18n format', async () => {
@@ -114,8 +121,9 @@ describe('Extract i18n Target', () => {
     await run.stop();
 
     expect(host.scopedSync().exists(extractionFile)).toBe(true);
-    expect(virtualFs.fileBufferToString(host.scopedSync().read(extractionFile)))
-      .toMatch(/i18n test/);
+    expect(virtualFs.fileBufferToString(host.scopedSync().read(extractionFile))).toMatch(
+      /i18n test/,
+    );
   });
 
   it('issues warnings for duplicate message identifiers', async () => {
@@ -136,9 +144,19 @@ describe('Extract i18n Target', () => {
     expect(host.scopedSync().exists(extractionFile)).toBe(true);
 
     const fullLog = logs.join();
-    expect(fullLog).toContain(
-      'Duplicate messages with id',
-    );
+    expect(fullLog).toContain('Duplicate messages with id');
+  });
+
+  it('ignores inline styles', async () => {
+    host.appendToFile('src/app/app.component.html', '<p i18n>i18n test</p>');
+    host.replaceInFile('src/app/app.component.ts', 'styleUrls', 'styles');
+    host.replaceInFile('src/app/app.component.ts', './app.component.css', 'h1 { color: green; }');
+
+    const run = await architect.scheduleTarget(extractI18nTargetSpec);
+
+    // This will fail if a style is processed since the style rules are not included during extraction
+    await expectAsync(run.result).toBeResolvedTo(jasmine.objectContaining({ success: true }));
 
+    await run.stop();
   });
 });
diff --git a/packages/angular_devkit/build_angular/src/index.ts b/packages/angular_devkit/build_angular/src/index.ts
index 83613150fc33..05a8a871f976 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
@@ -26,10 +26,7 @@ export {
   Type,
 } from './browser/schema';
 
-export {
-  buildWebpackBrowser as executeBrowserBuilder,
-  BrowserBuilderOutput,
-} from './browser';
+export { buildWebpackBrowser as executeBrowserBuilder, BrowserBuilderOutput } from './browser';
 
 export {
   serveWebpackBrowser as executeDevServerBuilder,
@@ -37,21 +34,11 @@ export {
   DevServerBuilderOutput,
 } from './dev-server';
 
-export {
-  execute as executeExtractI18nBuilder,
-  ExtractI18nBuilderOptions,
-} from './extract-i18n';
+export { execute as executeExtractI18nBuilder, ExtractI18nBuilderOptions } from './extract-i18n';
 
-export {
-  execute as executeKarmaBuilder,
-  KarmaBuilderOptions,
-  KarmaConfigOptions,
-} from './karma';
+export { execute as executeKarmaBuilder, KarmaBuilderOptions, KarmaConfigOptions } from './karma';
 
-export {
-  execute as executeProtractorBuilder,
-  ProtractorBuilderOptions,
-} from './protractor';
+export { execute as executeProtractorBuilder, ProtractorBuilderOptions } from './protractor';
 
 export {
   execute as executeServerBuilder,
@@ -59,7 +46,4 @@ export {
   ServerBuilderOutput,
 } from './server';
 
-export {
-  execute as executeNgPackagrBuilder,
-  NgPackagrBuilderOptions,
-} from './ng-packagr';
+export { execute as executeNgPackagrBuilder, NgPackagrBuilderOptions } from './ng-packagr';
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
deleted file mode 100644
index 52d03f7848bb..000000000000
--- a/packages/angular_devkit/build_angular/src/karma/code-coverage_spec.ts
+++ /dev/null
@@ -1,199 +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 { Architect } from '@angular-devkit/architect';
-import { normalize, virtualFs } from '@angular-devkit/core';
-import { last, tap } from 'rxjs/operators';
-import { promisify } from 'util';
-import { createArchitect, host, karmaTargetSpec } from '../test-utils';
-
-// In each of the test below we'll have to call setTimeout to wait for the coverage
-// analysis to be done. This is because karma-coverage performs the analysis
-// asynchronously but the promise that it returns is not awaited by Karma.
-// Coverage analysis begins when onRunComplete() is invoked, and output files
-// are subsequently written to disk. For more information, see
-// https://github.com/karma-runner/karma-coverage/blob/32acafa90ed621abd1df730edb44ae55a4009c2c/lib/reporter.js#L221
-
-const setTimeoutPromise = promisify(setTimeout);
-
-describe('Karma Builder code coverage', () => {
-  const coverageFilePath = normalize('coverage/lcov.info');
-  let architect: Architect;
-
-  beforeEach(async () => {
-    await host.initialize().toPromise();
-    architect = (await createArchitect(host.root())).architect;
-  });
-
-  afterEach(() => host.restore().toPromise());
-
-  it('supports code coverage option', async () => {
-    const run = await architect.scheduleTarget(karmaTargetSpec, { codeCoverage: true });
-
-    const {success} = await run.result;
-    expect(success).toBe(true);
-
-    await run.stop();
-
-    await setTimeoutPromise(1000);
-
-    const exists = host.scopedSync().exists(coverageFilePath);
-    expect(exists).toBe(true, `${coverageFilePath} does not exist`);
-
-    if (exists) {
-      const content = virtualFs.fileBufferToString(host.scopedSync().read(coverageFilePath));
-      expect(content).toContain('app.component.ts');
-      expect(content).toContain('test.ts');
-    }
-  });
-
-  it('supports code coverage exclude option', async () => {
-    const overrides = {
-      codeCoverage: true,
-      codeCoverageExclude: [
-        '**/test.ts',
-      ],
-    };
-
-    const run = await architect.scheduleTarget(karmaTargetSpec, overrides);
-
-    const {success} = await run.result;
-    expect(success).toBe(true);
-
-    await run.stop();
-
-    await setTimeoutPromise(1000);
-
-    const exists = host.scopedSync().exists(coverageFilePath);
-    expect(exists).toBe(true);
-
-    if (exists) {
-      const content = virtualFs.fileBufferToString(host.scopedSync().read(coverageFilePath));
-      expect(content).not.toContain('test.ts');
-    }
-  });
-
-  it(`should collect coverage from paths in 'sourceRoot'`, async () => {
-    const files: { [path: string]: string } = {
-      './dist/my-lib/index.d.ts': `
-        export declare const title = 'app';
-      `,
-      './dist/my-lib/index.js': `
-        export const title = 'app';
-      `,
-      './src/app/app.component.ts': `
-        import { Component } from '@angular/core';
-        import { title } from 'my-lib';
-
-        @Component({
-          selector: 'app-root',
-          templateUrl: './app.component.html',
-          styleUrls: ['./app.component.css']
-        })
-        export class AppComponent {
-          title = title;
-        }
-      `,
-    };
-
-    host.writeMultipleFiles(files);
-
-    host.replaceInFile('tsconfig.json', /"baseUrl": ".\/",/, `
-      "baseUrl": "./",
-      "paths": {
-        "my-lib": [
-          "./dist/my-lib"
-        ]
-      },
-    `);
-
-    const run = await architect.scheduleTarget(karmaTargetSpec, { codeCoverage: true });
-
-    const {success} = await run.result;
-    expect(success).toBe(true);
-
-    await run.stop();
-
-    await setTimeoutPromise(1000);
-
-    const exists = host.scopedSync().exists(coverageFilePath);
-    expect(exists).toBe(true);
-
-    if (exists) {
-      const content = virtualFs.fileBufferToString(host.scopedSync().read(coverageFilePath));
-      expect(content).not.toContain('my-lib');
-    }
-  });
-
-  it('should exit with non-zero code when coverage is below threshold', async () => {
-    host.replaceInFile('karma.conf.js', 'coverageReporter: {', `
-      coverageReporter: {
-        check: {
-          global: {
-            statements: 100,
-            lines: 100,
-            branches: 100,
-            functions: 100
-          }
-        },
-    `);
-
-    host.appendToFile('src/app/app.component.ts', `
-      export function nonCovered(): boolean {
-        return true;
-      }
-    `);
-
-    const run = await architect.scheduleTarget(karmaTargetSpec, { codeCoverage: true });
-
-    // In incremental mode, karma-coverage does not have the ability to mark a
-    // run as failed if code coverage does not pass. This is because it does
-    // the coverage asynchoronously and Karma does not await the promise
-    // returned by the plugin.
-    expect((await run.result).success).toBeTrue();
-
-    // However the program must exit with non-zero exit code.
-    // This is a more common use case of coverage testing and must be supported.
-    await run.output.pipe(
-      last(),
-      tap(buildEvent => expect(buildEvent.success).toBeFalse()),
-    ).toPromise();
-
-    await run.stop();
-
-  });
-
-  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();
-  });
-
-  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();
-  });
-});
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..070528e7032a 100644
--- a/packages/angular_devkit/build_angular/src/karma/find-tests.ts
+++ b/packages/angular_devkit/build_angular/src/karma/find-tests.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 { existsSync } from 'fs';
 import * as glob from 'glob';
 import { basename, dirname, extname, join } from 'path';
@@ -12,20 +13,17 @@ import { isDirectory } from '../utils/is-directory';
 
 // go through all patterns and find unique list of files
 export function findTests(patterns: string[], cwd: string, workspaceRoot: string): string[] {
-  return patterns.reduce(
-    (files, pattern) => {
-      const relativePathToMain = cwd.replace(workspaceRoot, '').substr(1); // remove leading slash
-      const tests = findMatchingTests(pattern, cwd, relativePathToMain);
-      tests.forEach(file => {
-        if (!files.includes(file)) {
-          files.push(file);
-        }
-      });
-
-      return files;
-    },
-    [] as string[],
-  );
+  return patterns.reduce((files, pattern) => {
+    const relativePathToMain = cwd.replace(workspaceRoot, '').substr(1); // remove leading slash
+    const tests = findMatchingTests(pattern, cwd, relativePathToMain);
+    tests.forEach((file) => {
+      if (!files.includes(file)) {
+        files.push(file);
+      }
+    });
+
+    return files;
+  }, [] as string[]);
 }
 
 function findMatchingTests(pattern: string, cwd: string, relativePathToMain: string): string[] {
diff --git a/packages/angular_devkit/build_angular/src/karma/index.ts b/packages/angular_devkit/build_angular/src/karma/index.ts
index 76678ec8c1d5..39b986558c41 100644
--- a/packages/angular_devkit/build_angular/src/karma/index.ts
+++ b/packages/angular_devkit/build_angular/src/karma/index.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 { BuilderContext, BuilderOutput, createBuilder } from '@angular-devkit/architect';
 import { getSystemPath, join, normalize } from '@angular-devkit/core';
 import { Config, ConfigOptions } from 'karma';
@@ -12,15 +13,15 @@ import { dirname, resolve } from 'path';
 import { Observable, from } from 'rxjs';
 import { defaultIfEmpty, switchMap } from 'rxjs/operators';
 import * as webpack from 'webpack';
-import { Schema as BrowserBuilderOptions } from '../browser/schema';
+import { Schema as BrowserBuilderOptions, OutputHashing } from '../browser/schema';
 import { ExecutionTransformer } from '../transforms';
 import { assertCompatibleAngularVersion } from '../utils/version';
 import { generateBrowserWebpackConfigFromContext } from '../utils/webpack-browser-config';
 import {
   getCommonConfig,
-  getNonAotConfig,
   getStylesConfig,
   getTestConfig,
+  getTypeScriptConfig,
   getWorkerConfig,
 } from '../webpack/configs';
 import { SingleTestTransformLoader } from '../webpack/plugins/single-test-transform';
@@ -41,12 +42,29 @@ async function initialize(
     // only two properties are missing:
     // * `outputPath` which is fixed for tests
     // * `budgets` which might be incorrect due to extra dev libs
-    { ...((options as unknown) as BrowserBuilderOptions), outputPath: '', budgets: undefined },
+    {
+      ...(options as unknown as BrowserBuilderOptions),
+      outputPath: '',
+      budgets: undefined,
+      optimization: false,
+      buildOptimizer: false,
+      aot: false,
+      vendorChunk: true,
+      namedChunks: true,
+      extractLicenses: false,
+      outputHashing: OutputHashing.None,
+      // The webpack tier owns the watch behavior so we want to force it in the config.
+      // When not in watch mode, webpack-dev-middleware will call `compiler.watch` anyway.
+      // https://github.com/webpack/webpack-dev-middleware/blob/698c9ae5e9bb9a013985add6189ff21c1a1ec185/src/index.js#L65
+      // https://github.com/webpack/webpack/blob/cde1b73e12eb8a77eb9ba42e7920c9ec5d29c2c9/lib/Compiler.js#L379-L388
+      watch: true,
+      extractCss: true,
+    },
     context,
-    wco => [
+    (wco) => [
       getCommonConfig(wco),
       getStylesConfig(wco),
-      getNonAotConfig(wco),
+      getTypeScriptConfig(wco),
       getTestConfig(wco),
       getWorkerConfig(wco),
     ],
@@ -73,15 +91,18 @@ export function execute(
   } = {},
 ): Observable<BuilderOutput> {
   // Check Angular version.
-  assertCompatibleAngularVersion(context.workspaceRoot, context.logger);
+  assertCompatibleAngularVersion(context.workspaceRoot);
+
+  let singleRun: boolean | undefined;
+  if (options.watch !== undefined) {
+    singleRun = !options.watch;
+  }
 
   return from(initialize(options, context, transforms.webpackConfiguration)).pipe(
     switchMap(async ([karma, webpackConfig]) => {
-      const karmaOptions: KarmaConfigOptions = {};
-
-      if (options.watch !== undefined) {
-        karmaOptions.singleRun = !options.watch;
-      }
+      const karmaOptions: KarmaConfigOptions = {
+        singleRun,
+      };
 
       // Convert browsers from a string to an array
       if (options.browsers) {
@@ -92,7 +113,7 @@ export function execute(
         // Split along commas to make it more natural, and remove empty strings.
         const reporters = options.reporters
           .reduce<string[]>((acc, curr) => acc.concat(curr.split(',')), [])
-          .filter(x => !!x);
+          .filter((x) => !!x);
 
         if (reporters.length > 0) {
           karmaOptions.reporters = reporters;
@@ -101,9 +122,7 @@ export function execute(
 
       // prepend special webpack loader that will transform test.ts
       if (options.include && options.include.length > 0) {
-        const mainFilePath = getSystemPath(
-          join(normalize(context.workspaceRoot), options.main),
-        );
+        const mainFilePath = getSystemPath(join(normalize(context.workspaceRoot), options.main));
         const files = findTests(options.include, dirname(mainFilePath), context.workspaceRoot);
         // early exit, no reason to start karma
         if (!files.length) {
@@ -147,30 +166,32 @@ export function execute(
 
       return [karma, config] as [typeof karma, KarmaConfigOptions];
     }),
-    switchMap(([karma, karmaConfig]) => new Observable<BuilderOutput>(subscriber => {
-      // Pass onto Karma to emit BuildEvents.
-      karmaConfig.buildWebpack ??= {};
-      if (typeof karmaConfig.buildWebpack === 'object') {
-        // tslint:disable-next-line: no-any
-        (karmaConfig.buildWebpack as any).failureCb ??= () => subscriber.next({ success: false });
-        // tslint:disable-next-line: no-any
-        (karmaConfig.buildWebpack as any).successCb ??= () => subscriber.next({ success: true });
-      }
-
-      // Complete the observable once the Karma server returns.
-      const karmaServer = new karma.Server(
-        karmaConfig as Config,
-        exitCode => {
-          subscriber.next({ success: exitCode === 0 });
-          subscriber.complete();
-        },
-      );
-
-      const karmaStart = karmaServer.start();
-
-      // Cleanup, signal Karma to exit.
-      return () => karmaStart.then(() => karmaServer.stop());
-    })),
+    switchMap(
+      ([karma, karmaConfig]) =>
+        new Observable<BuilderOutput>((subscriber) => {
+          // Pass onto Karma to emit BuildEvents.
+          karmaConfig.buildWebpack ??= {};
+          if (typeof karmaConfig.buildWebpack === 'object') {
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            (karmaConfig.buildWebpack as any).failureCb ??= () =>
+              subscriber.next({ success: false });
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            (karmaConfig.buildWebpack as any).successCb ??= () =>
+              subscriber.next({ success: true });
+          }
+
+          // Complete the observable once the Karma server returns.
+          const karmaServer = new karma.Server(karmaConfig as Config, (exitCode) => {
+            subscriber.next({ success: exitCode === 0 });
+            subscriber.complete();
+          });
+
+          const karmaStart = karmaServer.start();
+
+          // Cleanup, signal Karma to exit.
+          return () => karmaStart.then(() => karmaServer.stop());
+        }),
+    ),
     defaultIfEmpty({ success: false }),
   );
 }
diff --git a/packages/angular_devkit/build_angular/src/karma/rebuilds_spec.ts b/packages/angular_devkit/build_angular/src/karma/rebuilds_spec.ts
deleted file mode 100644
index fd73eb706184..000000000000
--- a/packages/angular_devkit/build_angular/src/karma/rebuilds_spec.ts
+++ /dev/null
@@ -1,125 +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 { Subject, timer } from 'rxjs';
-import {
-  catchError,
-  debounceTime,
-  delay,
-  map,
-  switchMap,
-  takeUntil,
-  takeWhile,
-  tap,
-} from 'rxjs/operators';
-import { createArchitect, host, karmaTargetSpec } from '../test-utils';
-
-describe('Karma Builder watch mode', () => {
-  let architect: Architect;
-
-  beforeEach(async () => {
-    await host.initialize().toPromise();
-    architect = (await createArchitect(host.root())).architect;
-  });
-
-  afterEach(() => host.restore().toPromise());
-
-  it('performs initial build', async () => {
-    const run = await architect.scheduleTarget(karmaTargetSpec, { watch: true });
-
-    await expectAsync(run.result).toBeResolvedTo(jasmine.objectContaining({ success: true }));
-
-    await run.stop();
-  });
-
-  it('recovers from compilation failures in watch mode', async () => {
-    let buildCount = 0;
-    let phase = 1;
-
-    // The current linux-based CI environments may not fully settled in regards to filesystem
-    // changes from previous tests which reuse the same directory and fileset.
-    // The initial delay helps mitigate false positive rebuild triggers in such scenarios.
-    const { run } = await timer(1000).pipe(
-      switchMap(() => architect.scheduleTarget(karmaTargetSpec, { watch: true })),
-      switchMap(run => run.output.pipe(map(output => ({ run, output })))),
-      debounceTime(500),
-      tap(({ output }) => {
-        buildCount += 1;
-        switch (phase) {
-          case 1:
-            // Karma run should succeed.
-            // Add a compilation error.
-            expect(output.success).toBe(true);
-            // Add an syntax error to a non-main file.
-            host.appendToFile('src/app/app.component.spec.ts', `]]]`);
-            phase = 2;
-            break;
-
-          case 2:
-            // Karma run should fail due to compilation error. Fix it.
-            expect(output.success).toBe(false);
-            host.replaceInFile('src/app/app.component.spec.ts', `]]]`, '');
-            phase = 3;
-            break;
-
-          case 3:
-            // Karma run should succeed again.
-            expect(output.success).toBe(true);
-            phase = 4;
-            break;
-        }
-      }),
-      takeWhile(() => phase < 4),
-      catchError((_, caught) => {
-        fail(`stuck at phase ${phase} [builds: ${buildCount}]`);
-
-        return caught;
-      }),
-    ).toPromise();
-
-    await run.stop();
-  });
-
-  it('does not rebuild when nothing changed', async () => {
-    let phase = 1;
-
-    const stopSubject = new Subject();
-    const stop$ = stopSubject.asObservable().pipe(delay(5000));
-
-    // The current linux-based CI environments may not fully settled in regards to filesystem
-    // changes from previous tests which reuse the same directory and fileset.
-    // The initial delay helps mitigate false positive rebuild triggers in such scenarios.
-    const { run } = await timer(1000).pipe(
-      switchMap(() => architect.scheduleTarget(karmaTargetSpec, { watch: true })),
-      switchMap(run => run.output.pipe(map(output => ({ run, output })))),
-      debounceTime(500),
-      tap(({ output }) => {
-        switch (phase) {
-          case 1:
-            // Karma run should succeed.
-            expect(output.success).toBe(true);
-            // Touch the file.
-            host.appendToFile('src/app/app.component.spec.ts', ``);
-            // Signal the stopper, which delays emission by 5s.
-            // If there's no rebuild within that time then the test is successful.
-            stopSubject.next();
-            phase = 2;
-            break;
-
-          case 2:
-            // Should never trigger this second build.
-            fail('Should not trigger second build.');
-            break;
-        }
-      }),
-      takeUntil(stop$),
-    ).toPromise();
-
-    await run.stop();
-  });
-});
diff --git a/packages/angular_devkit/build_angular/src/karma/schema.json b/packages/angular_devkit/build_angular/src/karma/schema.json
index 75cd984ec0f1..d527486607f6 100644
--- a/packages/angular_devkit/build_angular/src/karma/schema.json
+++ b/packages/angular_devkit/build_angular/src/karma/schema.json
@@ -48,19 +48,14 @@
       "description": "The stylesheet language to use for the application's inline component styles.",
       "type": "string",
       "default": "css",
-      "enum": [
-        "css",
-        "less",
-        "sass",
-        "scss"
-      ]
+      "enum": ["css", "less", "sass", "scss"]
     },
     "stylePreprocessorOptions": {
       "description": "Options to pass to style preprocessors",
       "type": "object",
       "properties": {
         "includePaths": {
-          "description": "Paths to include. Paths will be resolved to project root.",
+          "description": "Paths to include. Paths will be resolved to workspace root.",
           "type": "array",
           "items": {
             "type": "string"
@@ -157,10 +152,7 @@
               }
             },
             "additionalProperties": false,
-            "required": [
-              "src",
-              "replaceWith"
-            ]
+            "required": ["src", "replaceWith"]
           },
           {
             "type": "object",
@@ -173,10 +165,7 @@
               }
             },
             "additionalProperties": false,
-            "required": [
-              "replace",
-              "with"
-            ]
+            "required": ["replace", "with"]
           }
         ]
       },
@@ -195,11 +184,7 @@
     }
   },
   "additionalProperties": false,
-  "required": [
-    "main",
-    "tsConfig",
-    "karmaConfig"
-  ],
+  "required": ["main", "tsConfig", "karmaConfig"],
   "definitions": {
     "assetPattern": {
       "oneOf": [
@@ -227,11 +212,7 @@
             }
           },
           "additionalProperties": false,
-          "required": [
-            "glob",
-            "input",
-            "output"
-          ]
+          "required": ["glob", "input", "output"]
         },
         {
           "type": "string"
@@ -259,9 +240,7 @@
             }
           },
           "additionalProperties": false,
-          "required": [
-            "input"
-          ]
+          "required": ["input"]
         },
         {
           "type": "string",
@@ -270,4 +249,4 @@
       ]
     }
   }
-}
\ No newline at end of file
+}
diff --git a/packages/angular_devkit/build_angular/src/karma/selected_spec.ts b/packages/angular_devkit/build_angular/src/karma/selected_spec.ts
deleted file mode 100644
index 84623f836359..000000000000
--- a/packages/angular_devkit/build_angular/src/karma/selected_spec.ts
+++ /dev/null
@@ -1,165 +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, karmaTargetSpec } from '../test-utils';
-
-describe('Karma Builder', () => {
-  let architect: Architect;
-
-  beforeEach(async () => {
-    await host.initialize().toPromise();
-    architect = (await createArchitect(host.root())).architect;
-  });
-
-  afterEach(() => host.restore().toPromise());
-
-  describe('with include option', () => {
-    it('should fail when include does not match any files', async () => {
-      const overrides = {
-        include: ['abc.spec.ts', 'def.spec.ts'],
-      };
-      const run = await architect.scheduleTarget(karmaTargetSpec, overrides);
-
-      await expectAsync(run.result).toBeRejectedWithError(
-        `Specified patterns: "abc.spec.ts, def.spec.ts" did not match any spec files.`,
-      );
-
-      await run.stop();
-    });
-
-    it('should fail when main test file does not include require.context usage', async () => {
-      let lastErrorLogEntry: logging.LogEntry | undefined;
-      const logger = new logging.Logger('test');
-      logger.subscribe(m => {
-        if (m.level === 'error') {
-          lastErrorLogEntry = m;
-        }
-      });
-
-      const mockedRequireContext = 'Object.assign(() => { }, { keys: () => [] as string[] })';
-      const regex = /require\.context\(.*/;
-      host.replaceInFile('src/test.ts', regex, mockedRequireContext);
-
-      const overrides = {
-        include: ['**/*.spec.ts'],
-      };
-
-      const run = await architect.scheduleTarget(karmaTargetSpec, overrides, {
-        logger,
-      });
-
-      await expectAsync(run.result).toBeResolved();
-
-      expect(lastErrorLogEntry && lastErrorLogEntry.message).toContain(
-        'const context = require.context',
-      );
-      expect(lastErrorLogEntry && lastErrorLogEntry.message)
-        // tslint:disable-next-line:max-line-length
-        .toContain(
-          "The 'include' option requires that the 'main' file for tests includes the below line:",
-        );
-
-      await run.stop();
-    });
-
-    it('should work with test.ts that filters found keys', async () => {
-      // the replacement below is only to prove a point that resulting test.ts file will compile!
-      host.replaceInFile('src/test.ts', 'context.keys().map(context);', 'context.keys().filter(k => !!k).map(context);');
-
-      const overrides = {
-        include: ['src/app/app.component.spec.ts'],
-      };
-      const logger = new logging.Logger('test');
-      logger.subscribe(m => {
-        if (m.level === 'error') {
-          fail(m);
-        }
-      });
-      const run = await architect.scheduleTarget(karmaTargetSpec, overrides, {
-        logger,
-      });
-
-      await expectAsync(run.result).toBeResolvedTo(jasmine.objectContaining({ success: true }));
-
-      await run.stop();
-
-    });
-
-    [
-      {
-        test: 'relative path from workspace to spec',
-        input: ['src/app/app.component.spec.ts'],
-      },
-      {
-        test: 'relative path from workspace to file',
-        input: ['src/app/app.component.ts'],
-      },
-      {
-        test: 'relative path from project root to spec',
-        input: ['app/services/test.service.spec.ts'],
-      },
-      {
-        test: 'relative path from project root to file',
-        input: ['app/services/test.service.ts'],
-      },
-      {
-        test: 'relative path from workspace to directory',
-        input: ['src/app/services'],
-      },
-      {
-        test: 'relative path from project root to directory',
-        input: ['app/services'],
-      },
-      {
-        test: 'glob with spec suffix',
-        input: ['**/*.pipe.spec.ts', '**/*.pipe.spec.ts', '**/*test.service.spec.ts'],
-      },
-    ].forEach((options, index) => {
-      it(`should work with ${options.test} (${index})`, async () => {
-        host.writeMultipleFiles({
-          'src/app/services/test.service.spec.ts': `
-            describe('TestService', () => {
-              it('should succeed', () => {
-                expect(true).toBe(true);
-              });
-            });`,
-          'src/app/failing.service.spec.ts': `
-            describe('FailingService', () => {
-              it('should be ignored', () => {
-                expect(true).toBe(false);
-              });
-            });`,
-          'src/app/property.pipe.spec.ts': `
-            describe('PropertyPipe', () => {
-              it('should succeed', () => {
-                expect(true).toBe(true);
-              });
-            });`,
-        });
-
-        const overrides = {
-          include: options.input,
-        };
-        const logger = new logging.Logger('test');
-        logger.subscribe(m => {
-          if (m.level === 'error') {
-            fail(m);
-          }
-        });
-        const run = await architect.scheduleTarget(karmaTargetSpec, overrides, {
-          logger,
-        });
-
-        await expectAsync(run.result).toBeResolvedTo(jasmine.objectContaining({ success: true }));
-
-        await run.stop();
-      });
-    });
-  });
-});
diff --git a/packages/angular_devkit/build_angular/src/karma/tests/behavior/code-coverage_spec.ts b/packages/angular_devkit/build_angular/src/karma/tests/behavior/code-coverage_spec.ts
new file mode 100644
index 000000000000..0793c4d2c4b0
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/karma/tests/behavior/code-coverage_spec.ts
@@ -0,0 +1,89 @@
+/**
+ * @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 { last, tap } from 'rxjs/operators';
+import { promisify } from 'util';
+import { execute } from '../../index';
+import { BASE_OPTIONS, KARMA_BUILDER_INFO, describeBuilder } from '../setup';
+
+// In each of the test below we'll have to call setTimeout to wait for the coverage
+// analysis to be done. This is because karma-coverage performs the analysis
+// asynchronously but the promise that it returns is not awaited by Karma.
+// Coverage analysis begins when onRunComplete() is invoked, and output files
+// are subsequently written to disk. For more information, see
+// https://github.com/karma-runner/karma-coverage/blob/32acafa90ed621abd1df730edb44ae55a4009c2c/lib/reporter.js#L221
+
+const setTimeoutPromise = promisify(setTimeout);
+const coveragePath = 'coverage/lcov.info';
+
+describeBuilder(execute, KARMA_BUILDER_INFO, (harness) => {
+  describe('Behavior: "codeCoverage"', () => {
+    it('should generate coverage report when file was previously processed by Babel', async () => {
+      // Force Babel transformation.
+      await harness.appendToFile('src/app/app.component.ts', '// async');
+
+      harness.useTarget('test', {
+        ...BASE_OPTIONS,
+        codeCoverage: true,
+      });
+
+      const { result } = await harness.executeOnce();
+      expect(result?.success).toBeTrue();
+
+      await setTimeoutPromise(1000);
+      harness.expectFile(coveragePath).toExist();
+    });
+
+    it('should exit with non-zero code when coverage is below threshold', async () => {
+      await harness.modifyFile('karma.conf.js', (content) =>
+        content.replace(
+          'coverageReporter: {',
+          `coverageReporter: {
+             check: {
+               global: {
+                 statements: 100,
+                 lines: 100,
+                 branches: 100,
+                 functions: 100
+               }
+             },
+            `,
+        ),
+      );
+
+      await harness.appendToFile(
+        'src/app/app.component.ts',
+        `
+           export function nonCovered(): boolean {
+             return true;
+           }
+         `,
+      );
+
+      harness.useTarget('test', {
+        ...BASE_OPTIONS,
+        codeCoverage: true,
+      });
+
+      await harness
+        .execute()
+        .pipe(
+          // In incremental mode, karma-coverage does not have the ability to mark a
+          // run as failed if code coverage does not pass. This is because it does
+          // the coverage asynchoronously and Karma does not await the promise
+          // returned by the plugin.
+
+          // However the program must exit with non-zero exit code.
+          // This is a more common use case of coverage testing and must be supported.
+          last(),
+          tap((buildEvent) => expect(buildEvent.result?.success).toBeFalse()),
+        )
+        .toPromise();
+    });
+  });
+});
diff --git a/packages/angular_devkit/build_angular/src/karma/tests/behavior/errors_spec.ts b/packages/angular_devkit/build_angular/src/karma/tests/behavior/errors_spec.ts
new file mode 100644
index 000000000000..b9fd460fa7c7
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/karma/tests/behavior/errors_spec.ts
@@ -0,0 +1,28 @@
+/**
+ * @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 { execute } from '../../index';
+import { BASE_OPTIONS, KARMA_BUILDER_INFO, describeBuilder } from '../setup';
+
+describeBuilder(execute, KARMA_BUILDER_INFO, (harness) => {
+  describe('Behavior: "Errors"', () => {
+    it('should fail when there is a TypeScript error', async () => {
+      harness.useTarget('test', {
+        ...BASE_OPTIONS,
+      });
+
+      await harness.appendToFile('src/app/app.component.spec.ts', `console.lo('foo')`);
+
+      const { result } = await harness.executeOnce({
+        outputLogsOnFailure: false,
+      });
+
+      expect(result?.success).toBeFalse();
+    });
+  });
+});
diff --git a/packages/angular_devkit/build_angular/src/karma/tests/behavior/rebuilds_spec.ts b/packages/angular_devkit/build_angular/src/karma/tests/behavior/rebuilds_spec.ts
new file mode 100644
index 000000000000..10bd13eabf76
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/karma/tests/behavior/rebuilds_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 { concatMap, count, debounceTime, take, timeout } from 'rxjs/operators';
+import { execute } from '../../index';
+import { BASE_OPTIONS, KARMA_BUILDER_INFO, describeBuilder } from '../setup';
+
+describeBuilder(execute, KARMA_BUILDER_INFO, (harness) => {
+  describe('Behavior: "Rebuilds"', () => {
+    it('recovers from compilation failures in watch mode', async () => {
+      harness.useTarget('test', {
+        ...BASE_OPTIONS,
+        watch: true,
+      });
+
+      const goodFile = await harness.readFile('src/app/app.component.spec.ts');
+
+      const buildCount = await harness
+        .execute({ outputLogsOnFailure: false })
+        .pipe(
+          timeout(60000),
+          debounceTime(500),
+          concatMap(async ({ result }, index) => {
+            switch (index) {
+              case 0:
+                // Karma run should succeed.
+                // Add a compilation error.
+                expect(result?.success).toBeTrue();
+                // Add an syntax error to a non-main file.
+                await harness.appendToFile('src/app/app.component.spec.ts', `error`);
+                break;
+
+              case 1:
+                expect(result?.success).toBeFalse();
+                await harness.writeFile('src/app/app.component.spec.ts', goodFile);
+                break;
+
+              case 2:
+                expect(result?.success).toBeTrue();
+                break;
+            }
+          }),
+          take(3),
+          count(),
+        )
+        .toPromise();
+
+      expect(buildCount).toBe(3);
+    });
+  });
+});
diff --git a/packages/angular_devkit/build_angular/src/karma/tests/options/assets_spec.ts b/packages/angular_devkit/build_angular/src/karma/tests/options/assets_spec.ts
new file mode 100644
index 000000000000..ddf04ff5e8b2
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/karma/tests/options/assets_spec.ts
@@ -0,0 +1,101 @@
+/**
+ * @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 { execute } from '../../index';
+import { BASE_OPTIONS, KARMA_BUILDER_INFO, describeBuilder } from '../setup';
+
+describeBuilder(execute, KARMA_BUILDER_INFO, (harness) => {
+  describe('Option: "assets"', () => {
+    it('includes assets', async () => {
+      await harness.writeFiles({
+        './src/string-file-asset.txt': 'string-file-asset.txt',
+        './src/string-folder-asset/file.txt': 'string-folder-asset.txt',
+        './src/glob-asset.txt': 'glob-asset.txt',
+        './src/folder/folder-asset.txt': 'folder-asset.txt',
+        './src/output-asset.txt': 'output-asset.txt',
+        './src/app/app.module.ts': `
+            import { BrowserModule } from '@angular/platform-browser';
+            import { NgModule } from '@angular/core';
+            import { HttpClientModule } from '@angular/common/http';
+            import { AppComponent } from './app.component';
+    
+            @NgModule({
+              declarations: [
+                AppComponent
+              ],
+              imports: [
+                BrowserModule,
+                HttpClientModule
+              ],
+              providers: [],
+              bootstrap: [AppComponent]
+            })
+            export class AppModule { }
+          `,
+        './src/app/app.component.ts': `
+            import { Component } from '@angular/core';
+            import { HttpClient } from '@angular/common/http';
+    
+            @Component({
+              selector: 'app-root',
+              template: '<p *ngFor="let asset of assets">{{ asset.content }}</p>'
+            })
+            export class AppComponent {
+              public assets = [
+                { path: './string-file-asset.txt', content: '' },
+                { path: './string-folder-asset/file.txt', content: '' },
+                { path: './glob-asset.txt', content: '' },
+                { path: './folder/folder-asset.txt', content: '' },
+                { path: './output-folder/output-asset.txt', content: '' },
+              ];
+              constructor(private http: HttpClient) {
+                this.assets.forEach(asset => http.get(asset.path, { responseType: 'text' })
+                  .subscribe(res => asset.content = res));
+              }
+            }`,
+        './src/app/app.component.spec.ts': `
+            import { TestBed } from '@angular/core/testing';
+            import { HttpClientModule } from '@angular/common/http';
+            import { AppComponent } from './app.component';
+    
+            describe('AppComponent', () => {
+              beforeEach(async () => {
+                await TestBed.configureTestingModule({
+                  imports: [
+                    HttpClientModule
+                  ],
+                  declarations: [
+                    AppComponent
+                  ]
+                }).compileComponents();
+              });
+    
+              it('should create the app', () => {
+                const fixture = TestBed.createComponent(AppComponent);
+                const app = fixture.debugElement.componentInstance;
+                expect(app).toBeTruthy();
+              });
+            });`,
+      });
+
+      harness.useTarget('test', {
+        ...BASE_OPTIONS,
+        assets: [
+          'src/string-file-asset.txt',
+          'src/string-folder-asset',
+          { glob: 'glob-asset.txt', input: 'src/', output: '/' },
+          { glob: 'output-asset.txt', input: 'src/', output: '/output-folder' },
+          { glob: '**/*', input: 'src/folder', output: '/folder' },
+        ],
+      });
+
+      const { result } = await harness.executeOnce();
+      expect(result?.success).toBeTrue();
+    });
+  });
+});
diff --git a/packages/angular_devkit/build_angular/src/karma/tests/options/code-coverage-exclude_spec.ts b/packages/angular_devkit/build_angular/src/karma/tests/options/code-coverage-exclude_spec.ts
new file mode 100644
index 000000000000..803f8937132f
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/karma/tests/options/code-coverage-exclude_spec.ts
@@ -0,0 +1,54 @@
+/**
+ * @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 { promisify } from 'util';
+import { execute } from '../../index';
+import { BASE_OPTIONS, KARMA_BUILDER_INFO, describeBuilder } from '../setup';
+
+// In each of the test below we'll have to call setTimeout to wait for the coverage
+// analysis to be done. This is because karma-coverage performs the analysis
+// asynchronously but the promise that it returns is not awaited by Karma.
+// Coverage analysis begins when onRunComplete() is invoked, and output files
+// are subsequently written to disk. For more information, see
+// https://github.com/karma-runner/karma-coverage/blob/32acafa90ed621abd1df730edb44ae55a4009c2c/lib/reporter.js#L221
+
+const setTimeoutPromise = promisify(setTimeout);
+const coveragePath = 'coverage/lcov.info';
+
+describeBuilder(execute, KARMA_BUILDER_INFO, (harness) => {
+  describe('Option: "codeCoverageExclude"', () => {
+    it('should exclude file from coverage when set', async () => {
+      harness.useTarget('test', {
+        ...BASE_OPTIONS,
+        codeCoverage: true,
+        codeCoverageExclude: ['**/app.component.ts'],
+      });
+
+      const { result } = await harness.executeOnce();
+
+      expect(result?.success).toBeTrue();
+
+      await setTimeoutPromise(1000);
+      harness.expectFile(coveragePath).content.not.toContain('app.component.ts');
+    });
+
+    it('should not exclude file from coverage when set', async () => {
+      harness.useTarget('test', {
+        ...BASE_OPTIONS,
+        codeCoverage: true,
+      });
+
+      const { result } = await harness.executeOnce();
+
+      expect(result?.success).toBeTrue();
+
+      await setTimeoutPromise(1000);
+      harness.expectFile(coveragePath).content.toContain('app.component.ts');
+    });
+  });
+});
diff --git a/packages/angular_devkit/build_angular/src/karma/tests/options/code-coverage_spec.ts b/packages/angular_devkit/build_angular/src/karma/tests/options/code-coverage_spec.ts
new file mode 100644
index 000000000000..7fd1abdb0ac9
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/karma/tests/options/code-coverage_spec.ts
@@ -0,0 +1,113 @@
+/**
+ * @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 { last, tap } from 'rxjs/operators';
+import { promisify } from 'util';
+import { execute } from '../../index';
+import { BASE_OPTIONS, KARMA_BUILDER_INFO, describeBuilder } from '../setup';
+
+// In each of the test below we'll have to call setTimeout to wait for the coverage
+// analysis to be done. This is because karma-coverage performs the analysis
+// asynchronously but the promise that it returns is not awaited by Karma.
+// Coverage analysis begins when onRunComplete() is invoked, and output files
+// are subsequently written to disk. For more information, see
+// https://github.com/karma-runner/karma-coverage/blob/32acafa90ed621abd1df730edb44ae55a4009c2c/lib/reporter.js#L221
+
+const setTimeoutPromise = promisify(setTimeout);
+const coveragePath = 'coverage/lcov.info';
+
+describeBuilder(execute, KARMA_BUILDER_INFO, (harness) => {
+  describe('Option: "codeCoverage"', () => {
+    it('should generate coverage report when option is set to true', async () => {
+      harness.useTarget('test', {
+        ...BASE_OPTIONS,
+        codeCoverage: true,
+      });
+
+      const { result } = await harness.executeOnce();
+      expect(result?.success).toBeTrue();
+
+      await setTimeoutPromise(1000);
+      harness.expectFile(coveragePath).toExist();
+    });
+
+    it('should not generate coverage report when option is set to false', async () => {
+      harness.useTarget('test', {
+        ...BASE_OPTIONS,
+        codeCoverage: false,
+      });
+
+      const { result } = await harness.executeOnce();
+
+      expect(result?.success).toBeTrue();
+
+      await setTimeoutPromise(1000);
+      harness.expectFile(coveragePath).toNotExist();
+    });
+
+    it('should not generate coverage report when option is unset', async () => {
+      harness.useTarget('test', {
+        ...BASE_OPTIONS,
+      });
+
+      const { result } = await harness.executeOnce();
+
+      expect(result?.success).toBeTrue();
+
+      await setTimeoutPromise(1000);
+      harness.expectFile(coveragePath).toNotExist();
+    });
+
+    it(`should collect coverage from paths in 'sourceRoot'`, async () => {
+      await harness.writeFiles({
+        './dist/my-lib/index.d.ts': `
+          export declare const title = 'app';
+        `,
+        './dist/my-lib/index.js': `
+          export const title = 'app';
+        `,
+        './src/app/app.component.ts': `
+          import { Component } from '@angular/core';
+          import { title } from 'my-lib';
+  
+          @Component({
+            selector: 'app-root',
+            templateUrl: './app.component.html',
+            styleUrls: ['./app.component.css']
+          })
+          export class AppComponent {
+            title = title;
+          }
+        `,
+      });
+      await harness.modifyFile('tsconfig.json', (content) =>
+        content.replace(
+          /"baseUrl": ".\/",/,
+          `
+            "baseUrl": "./",
+            "paths": {
+              "my-lib": [
+                "./dist/my-lib"
+              ]
+            },
+          `,
+        ),
+      );
+
+      harness.useTarget('test', {
+        ...BASE_OPTIONS,
+        codeCoverage: true,
+      });
+      const { result } = await harness.executeOnce();
+      expect(result?.success).toBeTrue();
+
+      await setTimeoutPromise(1000);
+      harness.expectFile(coveragePath).content.not.toContain('my-lib');
+    });
+  });
+});
diff --git a/packages/angular_devkit/build_angular/src/karma/tests/options/include_spec.ts b/packages/angular_devkit/build_angular/src/karma/tests/options/include_spec.ts
new file mode 100644
index 000000000000..f9af40f861c8
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/karma/tests/options/include_spec.ts
@@ -0,0 +1,90 @@
+/**
+ * @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 { execute } from '../../index';
+import { BASE_OPTIONS, KARMA_BUILDER_INFO, describeBuilder } from '../setup';
+
+describeBuilder(execute, KARMA_BUILDER_INFO, (harness) => {
+  describe('Option: "include"', () => {
+    it(`should fail when includes doesn't match any files`, async () => {
+      harness.useTarget('test', {
+        ...BASE_OPTIONS,
+        include: ['abc.spec.ts', 'def.spec.ts'],
+      });
+
+      const { error } = await harness.executeOnce({
+        outputLogsOnException: false,
+      });
+      expect(error?.message).toBe(
+        'Specified patterns: "abc.spec.ts, def.spec.ts" did not match any spec files.',
+      );
+    });
+
+    [
+      {
+        test: 'relative path from workspace to spec',
+        input: ['src/app/app.component.spec.ts'],
+      },
+      {
+        test: 'relative path from workspace to file',
+        input: ['src/app/app.component.ts'],
+      },
+      {
+        test: 'relative path from project root to spec',
+        input: ['app/services/test.service.spec.ts'],
+      },
+      {
+        test: 'relative path from project root to file',
+        input: ['app/services/test.service.ts'],
+      },
+      {
+        test: 'relative path from workspace to directory',
+        input: ['src/app/services'],
+      },
+      {
+        test: 'relative path from project root to directory',
+        input: ['app/services'],
+      },
+      {
+        test: 'glob with spec suffix',
+        input: ['**/*.pipe.spec.ts', '**/*.pipe.spec.ts', '**/*test.service.spec.ts'],
+      },
+    ].forEach((options, index) => {
+      it(`should work with ${options.test} (${index})`, async () => {
+        await harness.writeFiles({
+          'src/app/services/test.service.spec.ts': `
+            describe('TestService', () => {
+              it('should succeed', () => {
+                expect(true).toBe(true);
+              });
+            });`,
+          'src/app/failing.service.spec.ts': `
+            describe('FailingService', () => {
+              it('should be ignored', () => {
+                expect(true).toBe(false);
+              });
+            });`,
+          'src/app/property.pipe.spec.ts': `
+            describe('PropertyPipe', () => {
+              it('should succeed', () => {
+                expect(true).toBe(true);
+              });
+            });`,
+        });
+
+        harness.useTarget('test', {
+          ...BASE_OPTIONS,
+          include: options.input,
+        });
+
+        const { result } = await harness.executeOnce();
+        expect(result?.success).toBeTrue();
+      });
+    });
+  });
+});
diff --git a/packages/angular_devkit/build_angular/src/karma/tests/options/styles_spec.ts b/packages/angular_devkit/build_angular/src/karma/tests/options/styles_spec.ts
new file mode 100644
index 000000000000..bc7623828784
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/karma/tests/options/styles_spec.ts
@@ -0,0 +1,133 @@
+/**
+ * @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 { execute } from '../../index';
+import { BASE_OPTIONS, KARMA_BUILDER_INFO, describeBuilder } from '../setup';
+
+describeBuilder(execute, KARMA_BUILDER_INFO, (harness) => {
+  describe('Option: "styles"', () => {
+    it(`processes 'styles.css' styles`, async () => {
+      await harness.writeFiles({
+        'src/styles.css': 'p {display: none}',
+        'src/app/app.component.ts': `
+          import { Component } from '@angular/core';
+  
+          @Component({
+            selector: 'app-root',
+            template: '<p>Hello World</p>'
+          })
+          export class AppComponent {
+          }
+         `,
+        'src/app/app.component.spec.ts': `
+          import { TestBed } from '@angular/core/testing';
+          import { AppComponent } from './app.component';
+  
+          describe('AppComponent', () => {
+            beforeEach(async () => {
+              await TestBed.configureTestingModule({
+                imports: [
+                ],
+                declarations: [
+                  AppComponent
+                ]
+              }).compileComponents();
+            });
+  
+            it('should not contain text that is hidden via css', () => {
+              const fixture = TestBed.createComponent(AppComponent);
+              expect(fixture.nativeElement.innerText).not.toContain('Hello World');
+            });
+          });`,
+      });
+
+      harness.useTarget('test', {
+        ...BASE_OPTIONS,
+        styles: ['src/styles.css'],
+      });
+
+      const { result } = await harness.executeOnce();
+      expect(result?.success).toBeTrue();
+    });
+
+    it('processes style with bundleName', async () => {
+      await harness.writeFiles({
+        'src/dark-theme.css': '',
+        'src/app/app.module.ts': `
+        import { BrowserModule } from '@angular/platform-browser';
+        import { NgModule } from '@angular/core';
+        import { HttpClientModule } from '@angular/common/http';
+        import { AppComponent } from './app.component';
+        @NgModule({
+          declarations: [
+            AppComponent
+          ],
+          imports: [
+            BrowserModule,
+            HttpClientModule
+          ],
+          providers: [],
+          bootstrap: [AppComponent]
+        })
+        export class AppModule { }
+      `,
+        'src/app/app.component.ts': `
+        import { Component } from '@angular/core';
+        import { HttpClient } from '@angular/common/http';
+        @Component({
+          selector: 'app-root',
+          template: '<p *ngFor="let asset of css">{{ asset.content }}</p>'
+        })
+        export class AppComponent {
+          public assets = [
+            { path: './dark-theme.css', content: '' },
+          ];
+          constructor(private http: HttpClient) {
+            this.assets.forEach(asset => http.get(asset.path, { responseType: 'text' })
+              .subscribe(res => asset.content = res));
+          }
+        }`,
+        'src/app/app.component.spec.ts': `
+        import { TestBed } from '@angular/core/testing';
+        import { HttpClientModule } from '@angular/common/http';
+        import { AppComponent } from './app.component';
+        describe('AppComponent', () => {
+          beforeEach(async () => {
+            await TestBed.configureTestingModule({
+              imports: [
+                HttpClientModule
+              ],
+              declarations: [
+                AppComponent
+              ]
+            }).compileComponents();
+          });
+          it('should create the app', () => {
+            const fixture = TestBed.createComponent(AppComponent);
+            const app = fixture.debugElement.componentInstance;
+            expect(app).toBeTruthy();
+          });
+        });`,
+      });
+
+      harness.useTarget('test', {
+        ...BASE_OPTIONS,
+        styles: [
+          {
+            inject: false,
+            input: 'src/dark-theme.css',
+            bundleName: 'dark-theme',
+          },
+        ],
+      });
+
+      const { result } = await harness.executeOnce();
+      expect(result?.success).toBeTrue();
+    });
+  });
+});
diff --git a/packages/angular_devkit/build_angular/src/karma/tests/options/web-worker-tsconfig_spec.ts b/packages/angular_devkit/build_angular/src/karma/tests/options/web-worker-tsconfig_spec.ts
new file mode 100644
index 000000000000..e45a5feddee8
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/karma/tests/options/web-worker-tsconfig_spec.ts
@@ -0,0 +1,114 @@
+/**
+ * @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 { execute } from '../../index';
+import { BASE_OPTIONS, KARMA_BUILDER_INFO, describeBuilder } from '../setup';
+
+describeBuilder(execute, KARMA_BUILDER_INFO, (harness) => {
+  describe('Option: "webWorkerTsConfig"', () => {
+    beforeEach(async () => {
+      await harness.writeFiles({
+        'src/tsconfig.worker.json': `
+        {
+          "extends": "../tsconfig.json",
+          "compilerOptions": {
+            "outDir": "../out-tsc/worker",
+            "lib": [
+              "es2018",
+              "webworker"
+            ],
+            "types": []
+          },
+          "include": [
+            "**/*.worker.ts",
+          ]
+        }`,
+        'src/app/app.worker.ts': `
+        /// <reference lib="webworker" />
+  
+        const prefix: string = 'Data: ';
+        addEventListener('message', ({ data }) => {
+          postMessage(prefix + data);
+        });
+      `,
+        'src/app/app.component.ts': `
+        import { Component } from '@angular/core';
+
+        @Component({
+          selector: 'app-root',
+          template: ''
+        })
+        export class AppComponent {
+          worker = new Worker(new URL('./app.worker', import.meta.url));
+        }
+        `,
+        './src/app/app.component.spec.ts': `
+        import { TestBed } from '@angular/core/testing';
+        import { AppComponent } from './app.component';
+
+        describe('AppComponent', () => {
+          beforeEach(async () => {
+            await TestBed.configureTestingModule({
+              declarations: [
+                AppComponent
+              ]
+            }).compileComponents();
+          });
+
+          it('worker should be defined', () => {
+            const fixture = TestBed.createComponent(AppComponent);
+            const app = fixture.debugElement.componentInstance;
+            expect(app.worker).toBeDefined();
+          });
+        });`,
+      });
+    });
+
+    it(`should not parse web workers when "webWorkerTsConfig" is not set or set to undefined.`, async () => {
+      harness.useTarget('test', {
+        ...BASE_OPTIONS,
+        webWorkerTsConfig: undefined,
+      });
+
+      await harness.writeFile(
+        './src/app/app.component.spec.ts',
+        `
+        import { TestBed } from '@angular/core/testing';
+        import { AppComponent } from './app.component';
+
+        describe('AppComponent', () => {
+          beforeEach(async () => {
+            await TestBed.configureTestingModule({
+              declarations: [
+                AppComponent
+              ]
+            }).compileComponents();
+          });
+
+          it('worker should throw', () => {
+            expect(() => TestBed.createComponent(AppComponent))
+              .toThrowError(/Failed to construct 'Worker'/);
+          });
+        });`,
+      );
+
+      const { result } = await harness.executeOnce();
+      expect(result?.success).toBeTrue();
+    });
+
+    it(`should parse web workers when "webWorkerTsConfig" is set.`, async () => {
+      harness.useTarget('test', {
+        ...BASE_OPTIONS,
+        webWorkerTsConfig: 'src/tsconfig.worker.json',
+      });
+
+      const { result } = await harness.executeOnce();
+      expect(result?.success).toBeTrue();
+    });
+  });
+});
diff --git a/packages/angular_devkit/build_angular/src/karma/tests/setup.ts b/packages/angular_devkit/build_angular/src/karma/tests/setup.ts
new file mode 100644
index 000000000000..50a5eba70500
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/karma/tests/setup.ts
@@ -0,0 +1,30 @@
+/**
+ * @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 KARMA_BUILDER_INFO = Object.freeze({
+  name: '@angular-devkit/build-angular:karma',
+  schemaPath: __dirname + '/../schema.json',
+});
+
+/**
+ * Contains all required karma builder fields.
+ * Also disables progress reporting to minimize logging output.
+ */
+export const BASE_OPTIONS = Object.freeze<Schema>({
+  main: 'src/test.ts',
+  polyfills: 'src/polyfills.ts',
+  tsConfig: 'src/tsconfig.spec.json',
+  karmaConfig: 'karma.conf.js',
+  browsers: 'ChromeHeadlessCI',
+  progress: false,
+  watch: false,
+});
diff --git a/packages/angular_devkit/build_angular/src/karma/works_spec.ts b/packages/angular_devkit/build_angular/src/karma/works_spec.ts
deleted file mode 100644
index 4a8701464ce3..000000000000
--- a/packages/angular_devkit/build_angular/src/karma/works_spec.ts
+++ /dev/null
@@ -1,206 +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 { createArchitect, host, karmaTargetSpec } from '../test-utils';
-
-
-// tslint:disable-next-line:no-big-function
-describe('Karma Builder', () => {
-  let architect: Architect;
-
-  beforeEach(async () => {
-    await host.initialize().toPromise();
-    architect = (await createArchitect(host.root())).architect;
-  });
-
-  afterEach(() => host.restore().toPromise());
-
-  it('runs', async () => {
-    const run = await architect.scheduleTarget(karmaTargetSpec);
-
-    await expectAsync(run.result).toBeResolvedTo(jasmine.objectContaining({ success: true }));
-
-    await run.stop();
-  });
-
-  it('fails with broken compilation', async () => {
-    host.writeMultipleFiles({
-      'src/app/app.component.spec.ts': '<p> definitely not typescript </p>',
-    });
-
-    const run = await architect.scheduleTarget(karmaTargetSpec);
-
-    await expectAsync(run.result).toBeResolvedTo(jasmine.objectContaining({ success: false }));
-
-    await run.stop();
-  });
-
-  it('generates and uses global styles', async () => {
-    host.writeMultipleFiles({
-      'src/styles.css': 'p {display: none}',
-      'src/app/app.component.ts': `
-        import { Component } from '@angular/core';
-
-        @Component({
-          selector: 'app-root',
-          template: '<p>Hello World</p>'
-        })
-        export class AppComponent {
-        }
-       `,
-      'src/app/app.component.spec.ts': `
-        import { TestBed } from '@angular/core/testing';
-        import { AppComponent } from './app.component';
-
-        describe('AppComponent', () => {
-          beforeEach(async () => {
-            await TestBed.configureTestingModule({
-              imports: [
-              ],
-              declarations: [
-                AppComponent
-              ]
-            }).compileComponents();
-          });
-
-          it('should not contain text that is hidden via css', () => {
-            const fixture = TestBed.createComponent(AppComponent);
-            expect(fixture.nativeElement.innerText).not.toContain('Hello World');
-          });
-        });`,
-    });
-
-    const run = await architect.scheduleTarget(karmaTargetSpec);
-
-    await expectAsync(run.result).toBeResolvedTo(jasmine.objectContaining({ success: true }));
-
-    await run.stop();
-  });
-
-  it('generates and uses assets', async () => {
-    const assets: { [path: string]: string } = {
-      './src/string-file-asset.txt': 'string-file-asset.txt',
-      './src/string-folder-asset/file.txt': 'string-folder-asset.txt',
-      './src/glob-asset.txt': 'glob-asset.txt',
-      './src/folder/folder-asset.txt': 'folder-asset.txt',
-      './src/output-asset.txt': 'output-asset.txt',
-    };
-    host.writeMultipleFiles(assets);
-    host.writeMultipleFiles({
-      'src/app/app.module.ts': `
-        import { BrowserModule } from '@angular/platform-browser';
-        import { NgModule } from '@angular/core';
-        import { HttpClientModule } from '@angular/common/http';
-        import { AppComponent } from './app.component';
-
-        @NgModule({
-          declarations: [
-            AppComponent
-          ],
-          imports: [
-            BrowserModule,
-            HttpClientModule
-          ],
-          providers: [],
-          bootstrap: [AppComponent]
-        })
-        export class AppModule { }
-      `,
-      'src/app/app.component.ts': `
-        import { Component } from '@angular/core';
-        import { HttpClient } from '@angular/common/http';
-
-        @Component({
-          selector: 'app-root',
-          template: '<p *ngFor="let asset of assets">{{asset.content }}</p>'
-        })
-        export class AppComponent {
-          public assets = [
-            { path: './string-file-asset.txt', content: '' },
-            { path: './string-folder-asset/file.txt', content: '' },
-            { path: './glob-asset.txt', content: '' },
-            { path: './folder/folder-asset.txt', content: '' },
-            { path: './output-folder/output-asset.txt', content: '' },
-          ];
-          constructor(private http: HttpClient) {
-            this.assets.forEach(asset => http.get(asset.path, { responseType: 'text' })
-              .subscribe(res => asset.content = res));
-          }
-        }`,
-      'src/app/app.component.spec.ts': `
-        import { TestBed } from '@angular/core/testing';
-        import { HttpClientModule } from '@angular/common/http';
-        import { AppComponent } from './app.component';
-
-        describe('AppComponent', () => {
-          beforeEach(async () => {
-            await TestBed.configureTestingModule({
-              imports: [
-                HttpClientModule
-              ],
-              declarations: [
-                AppComponent
-              ]
-            }).compileComponents();
-          });
-
-          it('should create the app', () => {
-            const fixture = TestBed.createComponent(AppComponent);
-            const app = fixture.debugElement.componentInstance;
-            expect(app).toBeTruthy();
-          });
-        });`,
-    });
-
-    const overrides = {
-      assets: [
-        'src/string-file-asset.txt',
-        'src/string-folder-asset',
-        { glob: 'glob-asset.txt', input: 'src/', output: '/' },
-        { glob: 'output-asset.txt', input: 'src/', output: '/output-folder' },
-        { glob: '**/*', input: 'src/folder', output: '/folder' },
-      ],
-    };
-
-    const run = await architect.scheduleTarget(karmaTargetSpec, overrides);
-
-    await expectAsync(run.result).toBeResolvedTo(jasmine.objectContaining({ success: true }));
-
-    await run.stop();
-  });
-
-  it('allows file replacements', async () => {
-    host.writeMultipleFiles({
-      'src/meaning-too.ts': 'export var meaning = 42;',
-      'src/meaning.ts': `export var meaning = 10;`,
-
-      'src/test.ts': `
-        import { meaning } from './meaning';
-
-        describe('Test file replacement', () => {
-          it('should replace file', () => {
-            expect(meaning).toBe(42);
-          });
-        });
-      `,
-    });
-
-    const overrides = {
-      fileReplacements: [{
-        replace: '/src/meaning.ts',
-        with: '/src/meaning-too.ts',
-      }],
-    };
-
-    const run = await architect.scheduleTarget(karmaTargetSpec, overrides);
-
-    await expectAsync(run.result).toBeResolvedTo(jasmine.objectContaining({ success: true }));
-
-    await run.stop();
-  });
-});
diff --git a/packages/angular_devkit/build_angular/src/ng-packagr/index.ts b/packages/angular_devkit/build_angular/src/ng-packagr/index.ts
index 09aad0f68717..bfd465dbb2a5 100644
--- a/packages/angular_devkit/build_angular/src/ng-packagr/index.ts
+++ b/packages/angular_devkit/build_angular/src/ng-packagr/index.ts
@@ -1,14 +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 { BuilderContext, BuilderOutput, createBuilder } from '@angular-devkit/architect';
 import { resolve } from 'path';
-import { Observable, from } from 'rxjs';
-import { mapTo, switchMap } from 'rxjs/operators';
+import { Observable, from, of } from 'rxjs';
+import { catchError, mapTo, switchMap } from 'rxjs/operators';
 import { Schema as NgPackagrBuilderOptions } from './schema';
 
 async function initialize(
@@ -34,8 +35,9 @@ export function execute(
   context: BuilderContext,
 ): Observable<BuilderOutput> {
   return from(initialize(options, context.workspaceRoot)).pipe(
-    switchMap(packager => options.watch ? packager.watch() : packager.build()),
+    switchMap((packager) => (options.watch ? packager.watch() : packager.build())),
     mapTo({ success: true }),
+    catchError((err) => of({ success: false, error: err.message })),
   );
 }
 
diff --git a/packages/angular_devkit/build_angular/src/ng-packagr/schema.json b/packages/angular_devkit/build_angular/src/ng-packagr/schema.json
index a72def315064..9fd60637cb00 100644
--- a/packages/angular_devkit/build_angular/src/ng-packagr/schema.json
+++ b/packages/angular_devkit/build_angular/src/ng-packagr/schema.json
@@ -19,7 +19,5 @@
     }
   },
   "additionalProperties": false,
-  "required": [
-    "project"
-  ]
+  "required": ["project"]
 }
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 52eea6f67a10..cb59df43d540 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,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 { Architect } from '@angular-devkit/architect';
 import { WorkspaceNodeModulesArchitectHost } from '@angular-devkit/architect/node';
 import { TestProjectHost, TestingArchitectHost } from '@angular-devkit/architect/testing';
@@ -16,12 +17,11 @@ import {
   virtualFs,
   workspaces,
 } from '@angular-devkit/core';
-import { map, take, tap } from 'rxjs/operators';
+import { debounceTime, map, take, tap } from 'rxjs/operators';
 
 // Default timeout for large specs is 2.5 minutes.
 jasmine.DEFAULT_TIMEOUT_INTERVAL = 150000;
 
-
 describe('NgPackagr Builder', () => {
   const workspaceRoot = join(normalize(__dirname), `../../test/hello-world-lib/`);
   const host = new TestProjectHost(workspaceRoot);
@@ -85,33 +85,34 @@ describe('NgPackagr Builder', () => {
 
     let buildNumber = 0;
 
-    await run.output.pipe(
-      tap((buildEvent) => expect(buildEvent.success).toBe(true)),
-      map(() => {
-        const fileName = './dist/lib/fesm2015/lib.js';
-        const content = virtualFs.fileBufferToString(
-          host.scopedSync().read(normalize(fileName)),
-        );
-
-        return content;
-      }),
-      tap(content => {
-        buildNumber += 1;
-        switch (buildNumber) {
-          case 1:
-            expect(content).toMatch(/lib works/);
-            host.writeMultipleFiles(goldenValueFiles);
-            break;
-
-          case 2:
-            expect(content).toMatch(/lib update works/);
-            break;
-          default:
-            break;
-        }
-      }),
-      take(2),
-    ).toPromise();
+    await run.output
+      .pipe(
+        tap((buildEvent) => expect(buildEvent.success).toBe(true)),
+        debounceTime(1000),
+        map(() => {
+          const fileName = './dist/lib/fesm2015/lib.js';
+          const content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
+
+          return content;
+        }),
+        tap((content) => {
+          buildNumber += 1;
+          switch (buildNumber) {
+            case 1:
+              expect(content).toMatch(/lib works/);
+              host.writeMultipleFiles(goldenValueFiles);
+              break;
+
+            case 2:
+              expect(content).toMatch(/lib update works/);
+              break;
+            default:
+              break;
+          }
+        }),
+        take(2),
+      )
+      .toPromise();
 
     await run.stop();
   });
diff --git a/packages/angular_devkit/build_angular/src/protractor/index.ts b/packages/angular_devkit/build_angular/src/protractor/index.ts
index 7d3aca6cd704..4c19f3ff322c 100644
--- a/packages/angular_devkit/build_angular/src/protractor/index.ts
+++ b/packages/angular_devkit/build_angular/src/protractor/index.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 {
   BuilderContext,
   BuilderOutput,
@@ -18,7 +19,6 @@ import { DevServerBuilderOptions } from '../dev-server/index';
 import { runModuleAsObservableFork } from '../utils';
 import { Schema as ProtractorBuilderOptions } from './schema';
 
-
 interface JasmineNodeOpts {
   jasmineNodeOpts: {
     grep?: string;
@@ -40,12 +40,10 @@ function runProtractor(root: string, options: ProtractorBuilderOptions): Promise
   // TODO: Protractor manages process.exit itself, so this target will allways quit the
   // process. To work around this we run it in a subprocess.
   // https://github.com/angular/protractor/issues/4160
-  return runModuleAsObservableFork(
-    root,
-    'protractor/built/launcher',
-    'init',
-    [resolve(root, options.protractorConfig), additionalProtractorConfig],
-  ).toPromise() as Promise<BuilderOutput>;
+  return runModuleAsObservableFork(root, 'protractor/built/launcher', 'init', [
+    resolve(root, options.protractorConfig),
+    additionalProtractorConfig,
+  ]).toPromise() as Promise<BuilderOutput>;
 }
 
 async function updateWebdriver() {
@@ -70,7 +68,6 @@ async function updateWebdriver() {
     `);
   }
 
-  // tslint:disable-next-line:max-line-length no-implicit-dependencies
   const webdriverUpdate = await import(path);
   // const webdriverUpdate = await import(path) as typeof import ('webdriver-manager/built/lib/cmds/update');
 
@@ -92,6 +89,10 @@ export async function execute(
   options: ProtractorBuilderOptions,
   context: BuilderContext,
 ): Promise<BuilderOutput> {
+  context.logger.warn(
+    'Protractor has been deprecated including its support in the Angular CLI. For additional information and alternatives, please see https://github.com/angular/protractor/issues/5502.',
+  );
+
   // ensure that only one of these options is used
   if (options.devServerTarget && options.baseUrl) {
     throw new Error(tags.stripIndents`
@@ -138,9 +139,7 @@ export async function execute(
     if (typeof serverOptions.publicHost === 'string') {
       let publicHost = serverOptions.publicHost as string;
       if (!/^\w+:\/\//.test(publicHost)) {
-        publicHost = `${serverOptions.ssl
-          ? 'https'
-          : 'http'}://${publicHost}`;
+        publicHost = `${serverOptions.ssl ? 'https' : 'http'}://${publicHost}`;
       }
       const clientUrl = url.parse(publicHost);
       baseUrl = url.format(clientUrl);
diff --git a/packages/angular_devkit/build_angular/src/protractor/schema.json b/packages/angular_devkit/build_angular/src/protractor/schema.json
index ff431254bdfe..286a315a96a9 100644
--- a/packages/angular_devkit/build_angular/src/protractor/schema.json
+++ b/packages/angular_devkit/build_angular/src/protractor/schema.json
@@ -54,7 +54,5 @@
     }
   },
   "additionalProperties": false,
-  "required": [
-    "protractorConfig"
-  ]
+  "required": ["protractorConfig"]
 }
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 36678ec3b362..eb67b3e19c6c 100644
--- a/packages/angular_devkit/build_angular/src/protractor/works_spec.ts
+++ b/packages/angular_devkit/build_angular/src/protractor/works_spec.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 { Architect } from '@angular-devkit/architect';
 import { JsonObject, normalize } from '@angular-devkit/core';
 import { createArchitect, host, protractorTargetSpec } from '../test-utils';
@@ -28,7 +29,7 @@ describe('Protractor Builder', () => {
   });
 
   it('fails with no devServerTarget and no standalone server', async () => {
-    const overrides = { devServerTarget: undefined } as unknown as JsonObject;
+    const overrides = ({ devServerTarget: undefined } as unknown) as JsonObject;
     const run = await architect.scheduleTarget(protractorTargetSpec, overrides);
 
     await expectAsync(run.result).toBeResolvedTo(jasmine.objectContaining({ success: false }));
@@ -37,10 +38,9 @@ describe('Protractor Builder', () => {
   });
 
   it('overrides protractor specs', async () => {
-    host.scopedSync().rename(
-      normalize('./e2e/app.e2e-spec.ts'),
-      normalize('./e2e/renamed-app.e2e.spec.ts'),
-    );
+    host
+      .scopedSync()
+      .rename(normalize('./e2e/app.e2e-spec.ts'), normalize('./e2e/renamed-app.e2e.spec.ts'));
 
     const overrides = { specs: ['./e2e/renamed-app.e2e.spec.ts'] };
     const run = await architect.scheduleTarget(protractorTargetSpec, overrides);
@@ -51,18 +51,21 @@ describe('Protractor Builder', () => {
   });
 
   it('overrides protractor suites', async () => {
-    host.scopedSync().rename(
-      normalize('./e2e/app.e2e-spec.ts'),
-      normalize('./e2e/renamed-app.e2e-spec.ts'),
-    );
+    host
+      .scopedSync()
+      .rename(normalize('./e2e/app.e2e-spec.ts'), normalize('./e2e/renamed-app.e2e-spec.ts'));
 
     // Suites block needs to be added in the protractor.conf.js file to test suites
-    host.replaceInFile('protractor.conf.js', `allScriptsTimeout: 11000,`, `
+    host.replaceInFile(
+      'protractor.conf.js',
+      `allScriptsTimeout: 11000,`,
+      `
       allScriptsTimeout: 11000,
       suites: {
         app: './e2e/app.e2e-spec.ts'
       },
-    `);
+    `,
+    );
 
     const overrides = { suite: 'app' };
     const run = await architect.scheduleTarget(protractorTargetSpec, overrides);
diff --git a/packages/angular_devkit/build_angular/src/sass/sass-service.ts b/packages/angular_devkit/build_angular/src/sass/sass-service.ts
new file mode 100644
index 000000000000..7a85370293d1
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/sass/sass-service.ts
@@ -0,0 +1,250 @@
+/**
+ * @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 { Importer, ImporterReturnType, Options, Result, SassException } from 'sass';
+import { MessageChannel, Worker } from 'worker_threads';
+import { maxWorkers } from '../utils/environment-options';
+
+/**
+ * The maximum number of Workers that will be created to execute render requests.
+ */
+const MAX_RENDER_WORKERS = maxWorkers;
+
+/**
+ * The callback type for the `dart-sass` asynchronous render function.
+ */
+type RenderCallback = (error?: SassException, result?: Result) => void;
+
+/**
+ * An object containing the contextual information for a specific render request.
+ */
+interface RenderRequest {
+  id: number;
+  workerIndex: number;
+  callback: RenderCallback;
+  importers?: Importer[];
+}
+
+/**
+ * A response from the Sass render Worker containing the result of the operation.
+ */
+interface RenderResponseMessage {
+  id: number;
+  error?: SassException;
+  result?: Result;
+}
+
+/**
+ * Workaround required for lack of new Worker transfer list support in Node.js prior to 12.17
+ */
+let transferListWorkaround = false;
+const version = process.versions.node.split('.').map((part) => Number(part));
+if (version[0] === 12 && version[1] < 17) {
+  transferListWorkaround = true;
+}
+
+/**
+ * A Sass renderer implementation that provides an interface that can be used by Webpack's
+ * `sass-loader`. The implementation uses a Worker thread to perform the Sass rendering
+ * with the `dart-sass` package.  The `dart-sass` synchronous render function is used within
+ * the worker which can be up to two times faster than the asynchronous variant.
+ */
+export class SassWorkerImplementation {
+  private readonly workers: Worker[] = [];
+  private readonly availableWorkers: number[] = [];
+  private readonly requests = new Map<number, RenderRequest>();
+  private idCounter = 1;
+  private nextWorkerIndex = 0;
+
+  /**
+   * Provides information about the Sass implementation.
+   * This mimics enough of the `dart-sass` value to be used with the `sass-loader`.
+   */
+  get info(): string {
+    return 'dart-sass\tworker';
+  }
+
+  /**
+   * The synchronous render function is not used by the `sass-loader`.
+   */
+  renderSync(): never {
+    throw new Error('Sass renderSync is not supported.');
+  }
+
+  /**
+   * Asynchronously request a Sass stylesheet to be renderered.
+   *
+   * @param options The `dart-sass` options to use when rendering the stylesheet.
+   * @param callback The function to execute when the rendering is complete.
+   */
+  render(options: Options, callback: RenderCallback): void {
+    // The `functions` and `importer` options are JavaScript functions that cannot be transferred.
+    // If any additional function options are added in the future, they must be excluded as well.
+    const { functions, importer, ...serializableOptions } = options;
+
+    // The CLI's configuration does not use or expose the ability to defined custom Sass functions
+    if (functions && Object.keys(functions).length > 0) {
+      throw new Error('Sass custom functions are not supported.');
+    }
+
+    let workerIndex = this.availableWorkers.pop();
+    if (workerIndex === undefined) {
+      if (this.workers.length < MAX_RENDER_WORKERS) {
+        workerIndex = this.workers.length;
+        this.workers.push(this.createWorker());
+      } else {
+        workerIndex = this.nextWorkerIndex++;
+        if (this.nextWorkerIndex >= this.workers.length) {
+          this.nextWorkerIndex = 0;
+        }
+      }
+    }
+
+    const request = this.createRequest(workerIndex, callback, importer);
+    this.requests.set(request.id, request);
+
+    this.workers[workerIndex].postMessage({
+      id: request.id,
+      hasImporter: !!importer,
+      options: serializableOptions,
+    });
+  }
+
+  /**
+   * Shutdown the Sass render worker.
+   * Executing this method will stop any pending render requests.
+   */
+  close(): void {
+    for (const worker of this.workers) {
+      try {
+        void worker.terminate();
+      } catch {}
+    }
+    this.requests.clear();
+  }
+
+  private createWorker(): Worker {
+    const { port1: mainImporterPort, port2: workerImporterPort } = new MessageChannel();
+    const importerSignal = new Int32Array(new SharedArrayBuffer(4));
+
+    const workerPath = require.resolve('./worker');
+    const worker = new Worker(workerPath, {
+      workerData: transferListWorkaround ? undefined : { workerImporterPort, importerSignal },
+      transferList: transferListWorkaround ? undefined : [workerImporterPort],
+    });
+
+    if (transferListWorkaround) {
+      worker.postMessage({ init: true, workerImporterPort, importerSignal }, [workerImporterPort]);
+    }
+
+    worker.on('message', (response: RenderResponseMessage) => {
+      const request = this.requests.get(response.id);
+      if (!request) {
+        return;
+      }
+
+      this.requests.delete(response.id);
+      this.availableWorkers.push(request.workerIndex);
+
+      if (response.result) {
+        // The results are expected to be Node.js `Buffer` objects but will each be transferred as
+        // a Uint8Array that does not have the expected `toString` behavior of a `Buffer`.
+        const { css, map, stats } = response.result;
+        const result: Result = {
+          // This `Buffer.from` override will use the memory directly and avoid making a copy
+          css: Buffer.from(css.buffer, css.byteOffset, css.byteLength),
+          stats,
+        };
+        if (map) {
+          // This `Buffer.from` override will use the memory directly and avoid making a copy
+          result.map = Buffer.from(map.buffer, map.byteOffset, map.byteLength);
+        }
+        request.callback(undefined, result);
+      } else {
+        request.callback(response.error);
+      }
+    });
+
+    mainImporterPort.on(
+      'message',
+      ({
+        id,
+        url,
+        prev,
+        fromImport,
+      }: {
+        id: number;
+        url: string;
+        prev: string;
+        fromImport: boolean;
+      }) => {
+        const request = this.requests.get(id);
+        if (!request?.importers) {
+          mainImporterPort.postMessage(null);
+          Atomics.store(importerSignal, 0, 1);
+          Atomics.notify(importerSignal, 0);
+
+          return;
+        }
+
+        this.processImporters(request.importers, url, prev, fromImport)
+          .then((result) => {
+            mainImporterPort.postMessage(result);
+          })
+          .catch((error) => {
+            mainImporterPort.postMessage(error);
+          })
+          .finally(() => {
+            Atomics.store(importerSignal, 0, 1);
+            Atomics.notify(importerSignal, 0);
+          });
+      },
+    );
+
+    mainImporterPort.unref();
+
+    return worker;
+  }
+
+  private async processImporters(
+    importers: Iterable<Importer>,
+    url: string,
+    prev: string,
+    fromImport: boolean,
+  ): Promise<ImporterReturnType> {
+    let result = null;
+    for (const importer of importers) {
+      result = await new Promise<ImporterReturnType>((resolve) => {
+        // Importers can be both sync and async
+        const innerResult = importer.call({ fromImport }, url, prev, resolve);
+        if (innerResult !== undefined) {
+          resolve(innerResult);
+        }
+      });
+
+      if (result) {
+        break;
+      }
+    }
+
+    return result;
+  }
+
+  private createRequest(
+    workerIndex: number,
+    callback: RenderCallback,
+    importer: Importer | Importer[] | undefined,
+  ): RenderRequest {
+    return {
+      id: this.idCounter++,
+      workerIndex,
+      callback,
+      importers: !importer || Array.isArray(importer) ? importer : [importer],
+    };
+  }
+}
diff --git a/packages/angular_devkit/build_angular/src/sass/worker.ts b/packages/angular_devkit/build_angular/src/sass/worker.ts
new file mode 100644
index 000000000000..60ff52335179
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/sass/worker.ts
@@ -0,0 +1,88 @@
+/**
+ * @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 { ImporterReturnType, Options, renderSync } from 'sass';
+import { MessagePort, parentPort, receiveMessageOnPort, workerData } from 'worker_threads';
+
+/**
+ * A request to render a Sass stylesheet using the supplied options.
+ */
+interface RenderRequestMessage {
+  /**
+   * The unique request identifier that links the render action with a callback and optional
+   * importer on the main thread.
+   */
+  id: number;
+
+  /**
+   * The Sass options to provide to the `dart-sass` render function.
+   */
+  options: Options;
+
+  /**
+   * Indicates the request has a custom importer function on the main thread.
+   */
+  hasImporter: boolean;
+
+  /**
+   * Indicates this is not an init message.
+   */
+  init: undefined;
+}
+
+interface InitMessage {
+  init: true;
+  workerImporterPort: MessagePort;
+  importerSignal: Int32Array;
+}
+
+if (!parentPort) {
+  throw new Error('Sass worker must be executed as a Worker.');
+}
+
+// The importer variables are used to proxy import requests to the main thread
+let { workerImporterPort, importerSignal } = (workerData || {}) as InitMessage;
+
+parentPort.on('message', (message: RenderRequestMessage | InitMessage) => {
+  // The init message is only needed to support Node.js < 12.17 and can be removed once support is dropped
+  if (message.init) {
+    workerImporterPort = message.workerImporterPort;
+    importerSignal = message.importerSignal;
+
+    return;
+  }
+
+  const { id, hasImporter, options } = message;
+  try {
+    if (hasImporter) {
+      // When a custom importer function is present, the importer request must be proxied
+      // back to the main thread where it can be executed.
+      // This process must be synchronous from the perspective of dart-sass. The `Atomics`
+      // functions combined with the shared memory `importSignal` and the Node.js
+      // `receiveMessageOnPort` function are used to ensure synchronous behavior.
+      options.importer = function (url, prev) {
+        Atomics.store(importerSignal, 0, 0);
+        // `this.fromImport` was added in dart-sass in 1.33.0, `@types/sass` doesn't include it yet.
+        const { fromImport } = this as { fromImport: boolean };
+        workerImporterPort.postMessage({ id, url, prev, fromImport });
+        Atomics.wait(importerSignal, 0, 0);
+
+        return receiveMessageOnPort(workerImporterPort)?.message as ImporterReturnType;
+      };
+    }
+
+    // The synchronous Sass render function can be up to two times faster than the async variant
+    const result = renderSync(options);
+
+    parentPort?.postMessage({ id, result });
+  } catch (error) {
+    // Needed because V8 will only serialize the message and stack properties of an Error instance.
+    const { formatted, file, line, column, message, stack } = error;
+    parentPort?.postMessage({ id, error: { formatted, file, line, column, message, stack } });
+  }
+});
diff --git a/packages/angular_devkit/build_angular/src/server/base_spec.ts b/packages/angular_devkit/build_angular/src/server/base_spec.ts
deleted file mode 100644
index 913356bb77f8..000000000000
--- a/packages/angular_devkit/build_angular/src/server/base_spec.ts
+++ /dev/null
@@ -1,148 +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 { ServerBuilderOutput } from '@angular-devkit/build-angular';
-import { getSystemPath, join, normalize, virtualFs } from '@angular-devkit/core';
-import { take, tap } from 'rxjs/operators';
-import { createArchitect, host } from '../test-utils';
-
-
-describe('Server Builder', () => {
-  const target = { project: 'app', target: 'server' };
-  let architect: Architect;
-
-  beforeEach(async () => {
-    await host.initialize().toPromise();
-    architect = (await createArchitect(host.root())).architect;
-  });
-  afterEach(async () => host.restore().toPromise());
-
-  const outputPath = normalize('dist-server');
-
-  it('works (base)', async () => {
-    const run = await architect.scheduleTarget(target);
-    const output = await run.result as ServerBuilderOutput;
-    expect(output.success).toBe(true);
-
-    const fileName = join(outputPath, 'main.js');
-    const content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
-    expect(content).toMatch(/AppServerModule\.ɵmod/);
-    await run.stop();
-  });
-
-  it('should not emit polyfills', async () => {
-    const run = await architect.scheduleTarget(target);
-    const output = await run.result as ServerBuilderOutput;
-    expect(output.success).toBe(true);
-
-    expect(host.fileMatchExists(getSystemPath(outputPath), /polyfills/)).not.toBeDefined();
-    expect(host.fileMatchExists(getSystemPath(outputPath), /main/)).toBeDefined();
-
-    await run.stop();
-  });
-
-  it('should not emit polyfills when ES5 support is needed', async () => {
-    // the below is needed because of different code paths
-    // for polyfills if differential loading is needed
-    host.writeMultipleFiles({
-      '.browserslistrc': 'IE 10',
-    });
-
-    const run = await architect.scheduleTarget(target);
-    const output = await run.result as ServerBuilderOutput;
-    expect(output.success).toBe(true);
-
-    expect(host.fileMatchExists(getSystemPath(outputPath), /polyfills/)).not.toBeDefined();
-    expect(host.fileMatchExists(getSystemPath(outputPath), /main/)).toBeDefined();
-
-    await run.stop();
-  });
-
-  it('supports sourcemaps', async () => {
-    const overrides = { sourceMap: true };
-    const run = await architect.scheduleTarget(target, overrides);
-    const output = await run.result as ServerBuilderOutput;
-    expect(output.success).toBe(true);
-    expect(host.scopedSync().exists(join(outputPath, 'main.js.map'))).toBeTruthy();
-    await run.stop();
-  });
-
-  it('supports scripts only sourcemaps', async () => {
-    host.writeMultipleFiles({
-      'src/app/app.component.css': `p { color: red; }`,
-    });
-
-    const run = await architect.scheduleTarget(target, {
-      bundleDependencies: false,
-      sourceMap: {
-        styles: false,
-        scripts: true,
-      },
-    });
-    const output = await run.result as ServerBuilderOutput;
-    expect(output.success).toBe(true);
-
-    expect(host.scopedSync().exists(join(outputPath, 'main.js.map'))).toBe(true);
-
-    const scriptContent = virtualFs.fileBufferToString(
-      host.scopedSync().read(join(outputPath, 'main.js')),
-    );
-    expect(scriptContent).toContain('sourceMappingURL=main.js.map');
-    expect(scriptContent).not.toContain('sourceMappingURL=data:application/json');
-
-    await run.stop();
-  });
-
-  it('supports component styles sourcemaps', async () => {
-    const overrides = {
-      bundleDependencies: false,
-      sourceMap: {
-        styles: true,
-        scripts: true,
-      },
-    };
-
-    host.writeMultipleFiles({
-      'src/app/app.component.css': `p { color: red; }`,
-    });
-
-    const run = await architect.scheduleTarget(target, overrides);
-    const output = await run.result as ServerBuilderOutput;
-    expect(output.success).toBe(true);
-
-    expect(host.scopedSync().exists(join(outputPath, 'main.js.map'))).toBe(true);
-
-    const scriptContent = virtualFs.fileBufferToString(
-      host.scopedSync().read(join(outputPath, 'main.js')),
-    );
-    expect(scriptContent).toContain('sourceMappingURL=main.js.map');
-    expect(scriptContent).toContain('sourceMappingURL=data:application/json');
-
-    await run.stop();
-  });
-
-  it('runs watch mode', async () => {
-    const overrides = { watch: true };
-
-    const run = await architect.scheduleTarget(target, overrides);
-
-    await run.output.pipe(
-      tap((buildEvent) => {
-        expect(buildEvent.success).toBe(true);
-
-        const fileName = join(outputPath, 'main.js');
-        const content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
-        expect(content).toMatch(/AppServerModule\.ɵmod/);
-      }),
-      take(1),
-    ).toPromise();
-
-    await run.stop();
-  });
-});
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
deleted file mode 100644
index e8ddba737bfa..000000000000
--- a/packages/angular_devkit/build_angular/src/server/external_dependencies_spec.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 { Architect } from '@angular-devkit/architect';
-import { ServerBuilderOutput } from '@angular-devkit/build-angular';
-import { join, normalize, virtualFs } from '@angular-devkit/core';
-import { createArchitect, host } from '../test-utils';
-
-
-describe('Server Builder external dependencies', () => {
-  const target = { project: 'app', target: 'server' };
-  let architect: Architect;
-
-  beforeEach(async () => {
-    await host.initialize().toPromise();
-    architect = (await createArchitect(host.root())).architect;
-  });
-  afterEach(async () => host.restore().toPromise());
-
-  const outputPath = normalize('dist-server');
-
-  it('should not bundle an given external dependency', async () => {
-    const overrides = {
-      bundleDependencies: true,
-      externalDependencies: [
-        '@angular/core',
-      ],
-    };
-
-    const run = await architect.scheduleTarget(target, overrides);
-    const output = await run.result as ServerBuilderOutput;
-    expect(output.success).toBe(true);
-
-    const fileName = join(outputPath, 'main.js');
-    const content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
-    expect(content).toContain('require("@angular/core")');
-    expect(content).not.toContain('require("@angular/common")');
-
-    await run.stop();
-  });
-});
diff --git a/packages/angular_devkit/build_angular/src/server/index.ts b/packages/angular_devkit/build_angular/src/server/index.ts
index 6c0934943164..edd3760014e6 100644
--- a/packages/angular_devkit/build_angular/src/server/index.ts
+++ b/packages/angular_devkit/build_angular/src/server/index.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 { BuilderContext, BuilderOutput, createBuilder } from '@angular-devkit/architect';
 import { runWebpack } from '@angular-devkit/build-webpack';
 import { json, tags } from '@angular-devkit/core';
@@ -12,7 +13,7 @@ import * as path from 'path';
 import { Observable, from } from 'rxjs';
 import { concatMap, map } from 'rxjs/operators';
 import { ScriptTarget } from 'typescript';
-import * as webpack from 'webpack';
+import webpack from 'webpack';
 import { ExecutionTransformer } from '../transforms';
 import { NormalizedBrowserBuilderSchema, deleteOutputDir } from '../utils';
 import { i18nInlineEmittedFiles } from '../utils/i18n-inlining';
@@ -22,26 +23,27 @@ import { readTsconfig } from '../utils/read-tsconfig';
 import { assertCompatibleAngularVersion } from '../utils/version';
 import { generateI18nBrowserWebpackConfigFromContext } from '../utils/webpack-browser-config';
 import {
-  getAotConfig,
   getCommonConfig,
   getServerConfig,
   getStatsConfig,
   getStylesConfig,
+  getTypeScriptConfig,
 } from '../webpack/configs';
-import { JsonCompilationStats, webpackStatsLogger } from '../webpack/utils/stats';
+import { webpackStatsLogger } from '../webpack/utils/stats';
 import { Schema as ServerBuilderOptions } from './schema';
 
 /**
  * @experimental Direct usage of this type is considered experimental.
  */
-export type ServerBuilderOutput = json.JsonObject & BuilderOutput & {
-  baseOutputPath: string;
-  outputPaths: string[];
-  /**
-   * @deprecated in version 9. Use 'outputPaths' instead.
-   */
-  outputPath: string;
-};
+export type ServerBuilderOutput = json.JsonObject &
+  BuilderOutput & {
+    baseOutputPath: string;
+    outputPaths: string[];
+    /**
+     * @deprecated in version 9. Use 'outputPaths' instead.
+     */
+    outputPath: string;
+  };
 
 export { ServerBuilderOptions };
 
@@ -58,7 +60,7 @@ export function execute(
   const root = context.workspaceRoot;
 
   // Check Angular version.
-  assertCompatibleAngularVersion(root, context.logger);
+  assertCompatibleAngularVersion(root);
 
   const tsConfig = readTsconfig(options.tsConfig, root);
   const target = tsConfig.options.target || ScriptTarget.ES5;
@@ -67,11 +69,13 @@ export function execute(
 
   if (typeof options.bundleDependencies === 'string') {
     options.bundleDependencies = options.bundleDependencies === 'all';
-    context.logger.warn(`Option 'bundleDependencies' string value is deprecated since version 9. Use a boolean value instead.`);
+    context.logger.warn(
+      `Option 'bundleDependencies' string value is deprecated since version 9. Use a boolean value instead.`,
+    );
   }
 
   if (!options.bundleDependencies && tsConfig.options.enableIvy) {
-    // tslint:disable-next-line: no-implicit-dependencies
+    // eslint-disable-next-line import/no-extraneous-dependencies
     const { __processed_by_ivy_ngcc__, main = '' } = require('@angular/core/package.json');
     if (
       !__processed_by_ivy_ngcc__ ||
@@ -96,7 +100,7 @@ export function execute(
           }
         },
       }).pipe(
-        concatMap(async output => {
+        concatMap(async (output) => {
           const { emittedFiles = [], outputPath, webpackStats } = output;
           if (!webpackStats) {
             throw new Error('Webpack stats build result is required.');
@@ -119,13 +123,13 @@ export function execute(
             );
           }
 
-          webpackStatsLogger(context.logger, webpackStats as JsonCompilationStats, config);
+          webpackStatsLogger(context.logger, webpackStats, config);
 
           return { ...output, success };
         }),
       );
     }),
-    map(output => {
+    map((output) => {
       if (!output.success) {
         return output as ServerBuilderOutput;
       }
@@ -140,9 +144,7 @@ export function execute(
   );
 }
 
-export default createBuilder<json.JsonObject & ServerBuilderOptions, ServerBuilderOutput>(
-  execute,
-);
+export default createBuilder<json.JsonObject & ServerBuilderOptions, ServerBuilderOutput>(execute);
 
 async function initialize(
   options: ServerBuilderOptions,
@@ -161,12 +163,12 @@ async function initialize(
       platform: 'server',
     } as NormalizedBrowserBuilderSchema,
     context,
-    wco => [
+    (wco) => [
       getCommonConfig(wco),
       getServerConfig(wco),
       getStylesConfig(wco),
       getStatsConfig(wco),
-      getAotConfig(wco),
+      getTypeScriptConfig(wco),
     ],
   );
 
@@ -176,10 +178,7 @@ async function initialize(
   }
 
   if (options.deleteOutputPath) {
-    deleteOutputDir(
-      context.workspaceRoot,
-      originalOutputPath,
-    );
+    deleteOutputDir(context.workspaceRoot, originalOutputPath);
   }
 
   return { config: transformedConfig || config, i18n };
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
deleted file mode 100644
index 643f1b272cc9..000000000000
--- a/packages/angular_devkit/build_angular/src/server/resources-output-path_spec.ts
+++ /dev/null
@@ -1,75 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-// tslint:disable:no-big-function
-import { Architect } from '@angular-devkit/architect';
-import { ServerBuilderOutput } from '@angular-devkit/build-angular';
-import { join, normalize, virtualFs } from '@angular-devkit/core';
-import { createArchitect, host } from '../test-utils';
-
-
-describe('Server Builder styles resources output path (No emit assets)', () => {
-  function writeFiles() {
-    host.copyFile('src/spectrum.png', './src/assets/component-img-relative.png');
-    host.copyFile('src/spectrum.png', './src/assets/component-img-absolute.png');
-    host.writeMultipleFiles({
-      'src/app/app.component.css': `
-          h3 { background: url('/assets/component-img-absolute.png'); }
-          h4 { background: url('../assets/component-img-relative.png'); }
-        `,
-    });
-  }
-
-  const target = { project: 'app', target: 'server' };
-  let architect: Architect;
-
-  const outputPath = normalize('dist-server');
-
-  beforeEach(async () => {
-    await host.initialize().toPromise();
-    architect = (await createArchitect(host.root())).architect;
-  });
-  afterEach(async () => host.restore().toPromise());
-
-  it(`supports resourcesOutputPath in resource urls`, async () => {
-    writeFiles();
-    const overrides = {
-      resourcesOutputPath: 'out-assets',
-    };
-
-    const run = await architect.scheduleTarget(target, overrides);
-    const output = await run.result as ServerBuilderOutput;
-    expect(output.success).toBe(true);
-
-    const fileName = join(outputPath, 'main.js');
-
-    const content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
-
-    expect(content).toContain(`url('/assets/component-img-absolute.png')`);
-    expect(content).toContain(`url('out-assets/component-img-relative.png')`);
-
-    expect(host.scopedSync().exists(normalize(`${outputPath}/out-assets/component-img-relative.png`)))
-      .toBe(false);
-  });
-
-  it(`supports blank resourcesOutputPath`, async () => {
-    writeFiles();
-
-    const run = await architect.scheduleTarget(target);
-    const output = await run.result as ServerBuilderOutput;
-    expect(output.success).toBe(true);
-
-    const fileName = join(outputPath, 'main.js');
-    const content = virtualFs.fileBufferToString(host.scopedSync().read(normalize(fileName)));
-
-    expect(content).toContain(`url('/assets/component-img-absolute.png')`);
-    expect(content).toContain(`url('component-img-relative.png')`);
-
-    expect(host.scopedSync().exists(normalize(`${outputPath}/component-img-relative.png`)))
-      .toBe(false);
-  });
-});
diff --git a/packages/angular_devkit/build_angular/src/server/schema.json b/packages/angular_devkit/build_angular/src/server/schema.json
index aa4c01521026..249fe9f34e62 100644
--- a/packages/angular_devkit/build_angular/src/server/schema.json
+++ b/packages/angular_devkit/build_angular/src/server/schema.json
@@ -17,19 +17,14 @@
       "description": "The stylesheet language to use for the application's inline component styles.",
       "type": "string",
       "default": "css",
-      "enum": [
-        "css",
-        "less",
-        "sass",
-        "scss"
-      ]
+      "enum": ["css", "less", "sass", "scss"]
     },
     "stylePreprocessorOptions": {
       "description": "Options to pass to style preprocessors",
       "type": "object",
       "properties": {
         "includePaths": {
-          "description": "Paths to include. Paths will be resolved to project root.",
+          "description": "Paths to include. Paths will be resolved to workspace root.",
           "type": "array",
           "items": {
             "type": "string"
@@ -42,7 +37,7 @@
     "optimization": {
       "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,
+      "default": true,
       "oneOf": [
         {
           "type": "object",
@@ -84,7 +79,7 @@
     },
     "sourceMap": {
       "description": "Output source maps for scripts and styles. For more information, see https://angular.io/guide/workspace-config#source-map-configuration.",
-      "default": true,
+      "default": false,
       "oneOf": [
         {
           "type": "object",
@@ -159,12 +154,7 @@
       "type": "string",
       "description": "Define the output filename cache-busting hashing mode.",
       "default": "none",
-      "enum": [
-        "none",
-        "all",
-        "media",
-        "bundles"
-      ]
+      "enum": ["none", "all", "media", "bundles"]
     },
     "deleteOutputPath": {
       "type": "boolean",
@@ -184,12 +174,12 @@
       "type": "boolean",
       "description": "Show circular dependency warnings on builds.",
       "default": false,
-      "x-deprecated": "The recommended method to detect circular dependencies in project code is to use a either a lint rule or other external tooling."
+      "x-deprecated": "The recommended method to detect circular dependencies in project code is to use either a lint rule or other external tooling."
     },
     "namedChunks": {
       "type": "boolean",
       "description": "Use file name for lazy loaded chunks.",
-      "default": true
+      "default": false
     },
     "bundleDependencies": {
       "description": "Which external dependencies to bundle into the bundle. By default, all of node_modules will be bundled.",
@@ -200,10 +190,7 @@
         },
         {
           "type": "string",
-          "enum": [
-            "none",
-            "all"
-          ]
+          "enum": ["none", "all"]
         }
       ]
     },
@@ -220,11 +207,6 @@
       "description": "Generates a 'stats.json' file which can be analyzed using tools such as 'webpack-bundle-analyzer'.",
       "default": false
     },
-    "forkTypeChecker": {
-      "type": "boolean",
-      "description": "Run the TypeScript type checker in a forked process.",
-      "default": true
-    },
     "watch": {
       "type": "boolean",
       "description": "Run build when files change.",
@@ -236,11 +218,7 @@
     }
   },
   "additionalProperties": false,
-  "required": [
-    "outputPath",
-    "main",
-    "tsConfig"
-  ],
+  "required": ["outputPath", "main", "tsConfig"],
   "definitions": {
     "fileReplacement": {
       "oneOf": [
@@ -257,10 +235,7 @@
             }
           },
           "additionalProperties": false,
-          "required": [
-            "src",
-            "replaceWith"
-          ]
+          "required": ["src", "replaceWith"]
         },
         {
           "type": "object",
@@ -275,10 +250,7 @@
             }
           },
           "additionalProperties": false,
-          "required": [
-            "replace",
-            "with"
-          ]
+          "required": ["replace", "with"]
         }
       ]
     }
diff --git a/packages/angular_devkit/build_angular/src/server/tests/behavior/web-workers_spec.ts b/packages/angular_devkit/build_angular/src/server/tests/behavior/web-workers_spec.ts
new file mode 100644
index 000000000000..b9cd9618cb78
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/server/tests/behavior/web-workers_spec.ts
@@ -0,0 +1,44 @@
+/**
+ * @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 { execute } from '../../index';
+import { BASE_OPTIONS, SERVER_BUILDER_INFO, describeBuilder } from '../setup';
+
+describeBuilder(execute, SERVER_BUILDER_INFO, (harness) => {
+  describe('Behavior: "Errors"', () => {
+    it('should not try to resolve web-workers', async () => {
+      harness.useTarget('test', {
+        ...BASE_OPTIONS,
+      });
+
+      await harness.writeFiles({
+        'src/app/app.worker.ts': `
+          /// <reference lib="webworker" />
+  
+          const foo: string = 'hello world';
+          addEventListener('message', ({ data }) => {
+            postMessage(foo);
+          });
+        `,
+        'src/main.server.ts': `
+          if (typeof Worker !== 'undefined') {
+            const worker = new Worker(new URL('./app/app.worker', import.meta.url), { type: 'module' });
+            worker.onmessage = ({ data }) => {
+              console.log('page got message:', data);
+            };
+            worker.postMessage('hello');
+          }
+        `,
+      });
+
+      const { result } = await harness.executeOnce();
+
+      expect(result?.success).toBeTrue();
+    });
+  });
+});
diff --git a/packages/angular_devkit/build_angular/src/server/tests/options/external-dependencies_spec.ts b/packages/angular_devkit/build_angular/src/server/tests/options/external-dependencies_spec.ts
new file mode 100644
index 000000000000..5e04fd9e712b
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/server/tests/options/external-dependencies_spec.ts
@@ -0,0 +1,38 @@
+/**
+ * @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 { execute } from '../../index';
+import { BASE_OPTIONS, SERVER_BUILDER_INFO, describeBuilder } from '../setup';
+
+describeBuilder(execute, SERVER_BUILDER_INFO, (harness) => {
+  describe('Option: "externalDependencies"', () => {
+    it(`should not bundle dependency when set "externalDependencies" is set.`, async () => {
+      harness.useTarget('server', {
+        ...BASE_OPTIONS,
+        externalDependencies: ['@angular/core'],
+      });
+
+      const { result } = await harness.executeOnce();
+      expect(result?.success).toBe(true);
+
+      harness.expectFile('dist/main.js').content.toContain('require("@angular/core")');
+      harness.expectFile('dist/main.js').content.not.toContain('require("@angular/common")');
+    });
+
+    it(`should bundle all dependencies when "externalDependencies" is unset`, async () => {
+      harness.useTarget('server', {
+        ...BASE_OPTIONS,
+      });
+
+      const { result } = await harness.executeOnce();
+      expect(result?.success).toBe(true);
+      harness.expectFile('dist/main.js').content.not.toContain('require("@angular/core")');
+      harness.expectFile('dist/main.js').content.not.toContain('require("@angular/common")');
+    });
+  });
+});
diff --git a/packages/angular_devkit/build_angular/src/server/tests/options/extract-licenses_spec.ts b/packages/angular_devkit/build_angular/src/server/tests/options/extract-licenses_spec.ts
new file mode 100644
index 000000000000..a6d9705f62c4
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/server/tests/options/extract-licenses_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 { execute } from '../../index';
+import { BASE_OPTIONS, SERVER_BUILDER_INFO, describeBuilder } from '../setup';
+
+describeBuilder(execute, SERVER_BUILDER_INFO, (harness) => {
+  describe('Option: "extractLicenses"', () => {
+    it(`should generate '3rdpartylicenses.txt' when 'extractLicenses' is true`, async () => {
+      harness.useTarget('server', {
+        ...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('server', {
+        ...BASE_OPTIONS,
+        extractLicenses: false,
+      });
+
+      const { result } = await harness.executeOnce();
+      expect(result?.success).toBe(true);
+      harness.expectFile('dist/3rdpartylicenses.txt').toNotExist();
+    });
+
+    it(`should generate '3rdpartylicenses.txt' when 'extractLicenses' is not set`, async () => {
+      harness.useTarget('server', {
+        ...BASE_OPTIONS,
+      });
+
+      const { result } = await harness.executeOnce();
+      expect(result?.success).toBe(true);
+      harness.expectFile('dist/3rdpartylicenses.txt').content.toContain('MIT');
+    });
+  });
+});
diff --git a/packages/angular_devkit/build_angular/src/server/tests/options/resources-output-path_spec.ts b/packages/angular_devkit/build_angular/src/server/tests/options/resources-output-path_spec.ts
new file mode 100644
index 000000000000..581207ce4468
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/server/tests/options/resources-output-path_spec.ts
@@ -0,0 +1,64 @@
+/**
+ * @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 { execute } from '../../index';
+import { BASE_OPTIONS, SERVER_BUILDER_INFO, describeBuilder } from '../setup';
+
+describeBuilder(execute, SERVER_BUILDER_INFO, (harness) => {
+  describe('Option: "resourcesOutputPath"', () => {
+    beforeEach(async () => {
+      const img = await harness.readFile('src/spectrum.png');
+
+      await harness.writeFiles({
+        'src/assets/component-img-relative.png': img,
+        'src/assets/component-img-absolute.png': img,
+        'src/app/app.component.css': `
+            h3 { background: url('/assets/component-img-absolute.png'); }
+            h4 { background: url('../assets/component-img-relative.png'); }
+          `,
+      });
+    });
+
+    it(`should prepend value of "resourcesOutputPath" as part of the resource urls`, async () => {
+      harness.useTarget('server', {
+        ...BASE_OPTIONS,
+        resourcesOutputPath: 'out-assets',
+      });
+
+      const { result } = await harness.executeOnce();
+      expect(result?.success).toBe(true);
+
+      harness
+        .expectFile('dist/main.js')
+        .content.toContain(`url(/assets/component-img-absolute.png)`);
+      harness
+        .expectFile('dist/main.js')
+        .content.toContain(`url(out-assets/component-img-relative.png)`);
+
+      // Assets are not emitted during a server builds.
+      harness.expectFile('dist/out-assets/component-img-relative.png').toNotExist();
+    });
+
+    it(`should not prepend anything when value of "resourcesOutputPath" is unset.`, async () => {
+      harness.useTarget('server', {
+        ...BASE_OPTIONS,
+      });
+
+      const { result } = await harness.executeOnce();
+      expect(result?.success).toBe(true);
+
+      harness
+        .expectFile('dist/main.js')
+        .content.toContain(`url(/assets/component-img-absolute.png)`);
+      harness.expectFile('dist/main.js').content.toContain(`url(component-img-relative.png)`);
+
+      // Assets are not emitted during a server builds.
+      harness.expectFile('dist/component-img-relative.png').toNotExist();
+    });
+  });
+});
diff --git a/packages/angular_devkit/build_angular/src/server/tests/options/source-map_spec.ts b/packages/angular_devkit/build_angular/src/server/tests/options/source-map_spec.ts
new file mode 100644
index 000000000000..4e0a38dd0b4d
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/server/tests/options/source-map_spec.ts
@@ -0,0 +1,150 @@
+/**
+ * @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 { execute } from '../../index';
+import { BASE_OPTIONS, SERVER_BUILDER_INFO, describeBuilder } from '../setup';
+
+describeBuilder(execute, SERVER_BUILDER_INFO, (harness) => {
+  describe('Option: "sourceMap"', () => {
+    const INLINE_SOURCEMAP_MARKER = '/*# sourceMappingURL=data:application/json;base64,';
+
+    beforeEach(async () => {
+      await harness.writeFiles({
+        'src/app/app.component.css': `p { color: red; }`,
+      });
+    });
+
+    it(`should not generate sourceMaps when "sourceMap" option is unset`, async () => {
+      harness.useTarget('server', {
+        ...BASE_OPTIONS,
+      });
+
+      const { result } = await harness.executeOnce();
+      expect(result?.success).toBe(true);
+      harness.expectFile('dist/main.js.map').toNotExist();
+    });
+
+    it(`should generate sourceMaps when "sourceMap" option is true`, async () => {
+      harness.useTarget('server', {
+        ...BASE_OPTIONS,
+        sourceMap: true,
+      });
+
+      const { result } = await harness.executeOnce();
+      expect(result?.success).toBe(true);
+      harness.expectFile('dist/main.js.map').toExist();
+    });
+
+    it(`should not generate sourceMaps when "sourceMap" option is false`, async () => {
+      harness.useTarget('server', {
+        ...BASE_OPTIONS,
+        sourceMap: false,
+      });
+
+      const { result } = await harness.executeOnce();
+      expect(result?.success).toBe(true);
+      harness.expectFile('dist/main.js.map').toNotExist();
+    });
+
+    it(`should not generate components sourceMaps when "styles" option is false`, async () => {
+      harness.useTarget('server', {
+        ...BASE_OPTIONS,
+        // Components sourcemaps are only present when optimization is false.
+        optimization: false,
+        sourceMap: {
+          styles: false,
+          scripts: true,
+        },
+      });
+
+      const { result } = await harness.executeOnce();
+      expect(result?.success).toBe(true);
+      harness.expectFile('dist/main.js.map').toExist();
+      harness.expectFile('dist/main.js').content.toContain('sourceMappingURL=main.js.map');
+      console.log(await harness.readFile('dist/main.js'));
+      harness.expectFile('dist/main.js').content.not.toContain(INLINE_SOURCEMAP_MARKER);
+    });
+
+    it(`should generate components sourceMaps when "styles" option is true`, async () => {
+      harness.useTarget('server', {
+        ...BASE_OPTIONS,
+        // Components sourcemaps are only present when optimization is false.
+        optimization: false,
+        sourceMap: {
+          styles: true,
+          scripts: true,
+        },
+      });
+
+      const { result } = await harness.executeOnce();
+      expect(result?.success).toBe(true);
+      harness.expectFile('dist/main.js.map').toExist();
+      harness.expectFile('dist/main.js').content.toContain('sourceMappingURL=main.js.map');
+      harness
+        .expectFile('dist/main.js')
+        .content.toContain('sourceMappingURL=data:application/json');
+    });
+
+    it(`should generate components sourceMaps when "styles" option is unset`, async () => {
+      harness.useTarget('server', {
+        ...BASE_OPTIONS,
+        // Components sourcemaps are only present when optimization is false.
+        optimization: false,
+        sourceMap: {
+          scripts: true,
+        },
+      });
+
+      const { result } = await harness.executeOnce();
+      expect(result?.success).toBe(true);
+      harness.expectFile('dist/main.js.map').toExist();
+      harness.expectFile('dist/main.js').content.toContain('sourceMappingURL=main.js.map');
+      harness.expectFile('dist/main.js').content.toContain(INLINE_SOURCEMAP_MARKER);
+    });
+
+    it(`should generate scripts sourceMaps when "scripts" option is unset`, async () => {
+      harness.useTarget('server', {
+        ...BASE_OPTIONS,
+        sourceMap: {},
+      });
+
+      const { result } = await harness.executeOnce();
+      expect(result?.success).toBe(true);
+      harness.expectFile('dist/main.js.map').toExist();
+      harness.expectFile('dist/main.js').content.toContain('sourceMappingURL=main.js.map');
+    });
+
+    it(`should not generate scripts sourceMaps when "scripts" option is false`, async () => {
+      harness.useTarget('server', {
+        ...BASE_OPTIONS,
+        sourceMap: {
+          scripts: false,
+        },
+      });
+
+      const { result } = await harness.executeOnce();
+      expect(result?.success).toBe(true);
+      harness.expectFile('dist/main.js.map').toNotExist();
+      harness.expectFile('dist/main.js').content.not.toContain('sourceMappingURL=main.js.map');
+    });
+
+    it(`should generate scripts sourceMaps when "scripts" option is true`, async () => {
+      harness.useTarget('server', {
+        ...BASE_OPTIONS,
+        sourceMap: {
+          scripts: true,
+        },
+      });
+
+      const { result } = await harness.executeOnce();
+      expect(result?.success).toBe(true);
+      harness.expectFile('dist/main.js.map').toExist();
+      harness.expectFile('dist/main.js').content.toContain('sourceMappingURL=main.js.map');
+    });
+  });
+});
diff --git a/packages/angular_devkit/build_angular/src/server/tests/setup.ts b/packages/angular_devkit/build_angular/src/server/tests/setup.ts
new file mode 100644
index 000000000000..2ba2746cc124
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/server/tests/setup.ts
@@ -0,0 +1,28 @@
+/**
+ * @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 SERVER_BUILDER_INFO = Object.freeze({
+  name: '@angular-devkit/build-angular:server',
+  schemaPath: __dirname + '/../schema.json',
+});
+
+/**
+ * Contains all required Server builder fields.
+ * Also disables progress reporting to minimize logging output.
+ */
+export const BASE_OPTIONS = Object.freeze<Schema>({
+  main: 'src/main.server.ts',
+  tsConfig: 'src/tsconfig.server.json',
+  progress: false,
+  watch: false,
+  outputPath: 'dist',
+});
diff --git a/packages/angular_devkit/build_angular/src/test-utils.ts b/packages/angular_devkit/build_angular/src/test-utils.ts
index 282053d339e5..0636dfb9ab7d 100644
--- a/packages/angular_devkit/build_angular/src/test-utils.ts
+++ b/packages/angular_devkit/build_angular/src/test-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 { Architect, BuilderOutput, ScheduleOptions, Target } from '@angular-devkit/architect';
 import { WorkspaceNodeModulesArchitectHost } from '@angular-devkit/architect/node';
 import { TestProjectHost, TestingArchitectHost } from '@angular-devkit/architect/testing';
@@ -20,7 +21,6 @@ import {
   workspaces,
 } from '@angular-devkit/core';
 
-
 // Default timeout for large specs is 2.5 minutes.
 jasmine.DEFAULT_TIMEOUT_INTERVAL = 150000;
 
@@ -102,7 +102,7 @@ export async function browserBuild(
         cache = host
           .read(join(outputPath, path))
           .toPromise()
-          .then(content => virtualFs.fileBufferToString(content));
+          .then((content) => virtualFs.fileBufferToString(content));
 
         return cache;
       },
diff --git a/packages/angular_devkit/build_angular/src/testing/builder-harness.ts b/packages/angular_devkit/build_angular/src/testing/builder-harness.ts
index ce3782ec7111..da48c0c72e05 100644
--- a/packages/angular_devkit/build_angular/src/testing/builder-harness.ts
+++ b/packages/angular_devkit/build_angular/src/testing/builder-harness.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 {
   BuilderContext,
   BuilderHandlerFn,
@@ -47,7 +48,7 @@ export class BuilderHarness<T> {
   private options = new Map<string | null, T>();
   private builderTargets = new Map<
     string,
-    // tslint:disable-next-line: no-any
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     { handler: BuilderHandlerFn<any>; info: BuilderInfo; options: json.JsonObject }
   >();
   private watcherNotifier?: WatcherNotifier;
@@ -222,9 +223,9 @@ export class BuilderHarness<T> {
       map((buildResult) => ({ result: buildResult, error: undefined })),
       catchError((error) => {
         if (outputLogsOnException) {
-          // tslint:disable-next-line: no-console
+          // eslint-disable-next-line no-console
           console.error(logs.map((entry) => entry.message).join('\n'));
-          // tslint:disable-next-line: no-console
+          // eslint-disable-next-line no-console
           console.error(error);
         }
 
@@ -232,7 +233,7 @@ export class BuilderHarness<T> {
       }),
       map(({ result, error }) => {
         if (outputLogsOnFailure && result?.success === false && logs.length > 0) {
-          // tslint:disable-next-line: no-console
+          // eslint-disable-next-line no-console
           console.error(logs.map((entry) => entry.message).join('\n'));
         }
 
@@ -246,6 +247,7 @@ export class BuilderHarness<T> {
         this.watcherNotifier = undefined;
 
         for (const teardown of context.teardowns) {
+          // eslint-disable-next-line @typescript-eslint/no-floating-promises
           teardown();
         }
       }),
@@ -316,9 +318,10 @@ export class BuilderHarness<T> {
   }
 
   hasFileMatch(directory: string, pattern: RegExp): boolean {
-    return this.host.scopedSync()
+    return this.host
+      .scopedSync()
       .list(normalize(directory))
-      .some(name => pattern.test(name));
+      .some((name) => pattern.test(name));
   }
 
   readFile(path: string): string {
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
index e82402f02d59..86d22e1808a7 100644
--- a/packages/angular_devkit/build_angular/src/testing/builder-harness_spec.ts
+++ b/packages/angular_devkit/build_angular/src/testing/builder-harness_spec.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 { TestProjectHost } from '@angular-devkit/architect/testing';
 import { BuilderHarness } from './builder-harness';
 
@@ -116,7 +117,7 @@ describe('BuilderHarness', () => {
     const mockHandler = jasmine.createSpy().and.returnValue({ success: true });
 
     const harness = new BuilderHarness(async (_, context) => {
-      const run = await context.scheduleTarget({project: 'test', target: 'another' });
+      const run = await context.scheduleTarget({ project: 'test', target: 'another' });
       expect(await run.result).toEqual(jasmine.objectContaining({ success: true }));
       await run.stop();
 
diff --git a/packages/angular_devkit/build_angular/src/testing/file-watching.ts b/packages/angular_devkit/build_angular/src/testing/file-watching.ts
index e47e6a19d5ff..a09c38dc8645 100644
--- a/packages/angular_devkit/build_angular/src/testing/file-watching.ts
+++ b/packages/angular_devkit/build_angular/src/testing/file-watching.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 {
   BuilderWatcherCallback,
   BuilderWatcherFactory,
diff --git a/packages/angular_devkit/build_angular/src/testing/index.ts b/packages/angular_devkit/build_angular/src/testing/index.ts
index 3300346cf5d4..51bcba582bbc 100644
--- a/packages/angular_devkit/build_angular/src/testing/index.ts
+++ b/packages/angular_devkit/build_angular/src/testing/index.ts
@@ -1,9 +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
  */
+
 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
index e393fa756719..8f93ecad3fd9 100644
--- a/packages/angular_devkit/build_angular/src/testing/jasmine-helpers.ts
+++ b/packages/angular_devkit/build_angular/src/testing/jasmine-helpers.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 { BuilderHandlerFn } from '@angular-devkit/architect';
 import { json } from '@angular-devkit/core';
 import { readFileSync } from 'fs';
diff --git a/packages/angular_devkit/build_angular/src/transforms.ts b/packages/angular_devkit/build_angular/src/transforms.ts
index c724aedab646..bb500c173c25 100644
--- a/packages/angular_devkit/build_angular/src/transforms.ts
+++ b/packages/angular_devkit/build_angular/src/transforms.ts
@@ -1,8 +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
  */
+
 export type ExecutionTransformer<T> = (input: T) => T | Promise<T>;
diff --git a/packages/angular_devkit/build_angular/src/tslint/index.ts b/packages/angular_devkit/build_angular/src/tslint/index.ts
index 3f5f4fe9df3b..ed02d4dea8ad 100644
--- a/packages/angular_devkit/build_angular/src/tslint/index.ts
+++ b/packages/angular_devkit/build_angular/src/tslint/index.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 { BuilderContext, BuilderOutput, createBuilder } from '@angular-devkit/architect';
 import { json } from '@angular-devkit/core';
 import { readFileSync } from 'fs';
@@ -16,7 +17,6 @@ import { Program } from 'typescript';
 import { stripBom } from '../utils/strip-bom';
 import { Schema as RealTslintBuilderOptions } from './schema';
 
-
 type TslintBuilderOptions = RealTslintBuilderOptions & json.JsonObject;
 interface LintResult extends tslint.LintResult {
   fileNames: string[];
@@ -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-an-angular-cli-project-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;
@@ -64,7 +64,7 @@ async function _run(
   if (options.tsConfig) {
     const tsConfigs = Array.isArray(options.tsConfig) ? options.tsConfig : [options.tsConfig];
     context.reportProgress(0, tsConfigs.length);
-    const allPrograms = tsConfigs.map(tsConfig => {
+    const allPrograms = tsConfigs.map((tsConfig) => {
       return Linter.createProgram(path.resolve(systemRoot, tsConfig));
     });
 
@@ -82,8 +82,8 @@ async function _run(
         result = partial;
       } else {
         result.failures = result.failures
-          .filter(curr => {
-            return !partial.failures.some(prev => curr.equals(prev));
+          .filter((curr) => {
+            return !partial.failures.some((prev) => curr.equals(prev));
           })
           .concat(partial.failures);
 
@@ -138,11 +138,9 @@ async function _run(
   };
 }
 
-
 /** @deprecated since version 11 as part of the TSLint deprecation. */
 export default createBuilder<TslintBuilderOptions>(_run);
 
-
 async function _lint(
   projectTslint: typeof tslint,
   systemRoot: string,
@@ -168,7 +166,7 @@ async function _lint(
   for (const file of files) {
     if (program && allPrograms) {
       // If it cannot be found in ANY program, then this is an error.
-      if (allPrograms.every(p => p.getSourceFile(file) === undefined)) {
+      if (allPrograms.every((p) => p.getSourceFile(file) === undefined)) {
         throw new Error(
           `File ${JSON.stringify(file)} is not part of a TypeScript project '${options.tsConfig}'.`,
         );
@@ -212,9 +210,9 @@ function getFilesToLint(
 
   if (files.length > 0) {
     return files
-      .map(file => glob.sync(file, { cwd: root, ignore, nodir: true }))
+      .map((file) => glob.sync(file, { cwd: root, ignore, nodir: true }))
       .reduce((prev, curr) => prev.concat(curr), [])
-      .map(file => path.join(root, file));
+      .map((file) => path.join(root, file));
   }
 
   if (!program) {
@@ -225,11 +223,13 @@ function getFilesToLint(
 
   if (ignore && ignore.length > 0) {
     // normalize to support ./ paths
-    const ignoreMatchers = ignore
-      .map(pattern => new Minimatch(path.normalize(pattern), { dot: true }));
+    const ignoreMatchers = ignore.map(
+      (pattern) => new Minimatch(path.normalize(pattern), { dot: true }),
+    );
 
-    programFiles = programFiles
-      .filter(file => !ignoreMatchers.some(matcher => matcher.match(path.relative(root, file))));
+    programFiles = programFiles.filter(
+      (file) => !ignoreMatchers.some((matcher) => matcher.match(path.relative(root, file))),
+    );
   }
 
   return programFiles;
diff --git a/packages/angular_devkit/build_angular/src/tslint/schema.json b/packages/angular_devkit/build_angular/src/tslint/schema.json
index 64fa97adcf52..254287eddc60 100644
--- a/packages/angular_devkit/build_angular/src/tslint/schema.json
+++ b/packages/angular_devkit/build_angular/src/tslint/schema.json
@@ -83,4 +83,4 @@
   },
   "additionalProperties": false,
   "required": []
-}
\ No newline at end of file
+}
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 bd4ec4829772..0c6755743c6a 100644
--- a/packages/angular_devkit/build_angular/src/tslint/works_spec.ts
+++ b/packages/angular_devkit/build_angular/src/tslint/works_spec.ts
@@ -1,26 +1,20 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+
 import { Architect, Target } from '@angular-devkit/architect';
 import { WorkspaceNodeModulesArchitectHost } from '@angular-devkit/architect/node';
 import { TestingArchitectHost } from '@angular-devkit/architect/testing';
-import {
-  logging,
-  normalize,
-  schema,
-  workspaces,
-} from '@angular-devkit/core';
+import { logging, normalize, schema, workspaces } from '@angular-devkit/core';
 import { NodeJsSyncHost } from '@angular-devkit/core/node';
 import { workspaceRoot } from '../test-utils';
 
-
 const lintTarget: Target = { project: 'app', target: 'lint' };
 
-// tslint:disable-next-line:no-big-function
 describe('Tslint Target', () => {
   // const filesWithErrors = { 'src/foo.ts': 'const foo = "";\n' };
   let testArchitectHost: TestingArchitectHost;
@@ -54,13 +48,13 @@ describe('Tslint Target', () => {
     // Check logs.
     const logger = new logging.Logger('lint-info');
     const allLogs: string[] = [];
-    logger.subscribe(entry => allLogs.push(entry.message));
+    logger.subscribe((entry) => allLogs.push(entry.message));
 
     const run = await architect.scheduleTarget(lintTarget, {}, { logger });
 
     // Check status updates.
     const allStatus: string[] = [];
-    run.progress.subscribe(progress => {
+    run.progress.subscribe((progress) => {
       if (progress.status !== undefined) {
         allStatus.push(progress.status);
       }
@@ -81,13 +75,13 @@ describe('Tslint Target', () => {
     // Check logs.
     const logger = new logging.Logger('lint-info');
     const allLogs: string[] = [];
-    logger.subscribe(entry => allLogs.push(entry.message));
+    logger.subscribe((entry) => allLogs.push(entry.message));
 
     const run = await architect.scheduleTarget(lintTarget, overrides, { logger });
 
     // Check status updates.
     const allStatus: string[] = [];
-    run.progress.subscribe(progress => {
+    run.progress.subscribe((progress) => {
       if (progress.status !== undefined) {
         allStatus.push(progress.status);
       }
diff --git a/packages/angular_devkit/build_angular/src/typings.d.ts b/packages/angular_devkit/build_angular/src/typings.d.ts
index bdf566191697..78ac0d8ee009 100644
--- a/packages/angular_devkit/build_angular/src/typings.d.ts
+++ b/packages/angular_devkit/build_angular/src/typings.d.ts
@@ -1,10 +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
  */
+
 declare module '@discoveryjs/json-ext' {
   export function stringifyStream(value: unknown): import('stream').Readable;
 }
+
+declare module '@babel/helper-annotate-as-pure' {
+  export default function annotateAsPure(
+    pathOrNode: import('@babel/types').Node | { node: import('@babel/types').Node },
+  ): void;
+}
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 6aa1b4c9afa6..a9f6b40bdfdf 100644
--- a/packages/angular_devkit/build_angular/src/utils/action-cache.ts
+++ b/packages/angular_devkit/build_angular/src/utils/action-cache.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 * as cacache from 'cacache';
 import { createHash } from 'crypto';
 import * as fs from 'fs';
@@ -35,9 +36,7 @@ export class BundleActionCache {
 
   generateIntegrityValue(content: string): string {
     const algorithm = this.integrityAlgorithm || 'sha1';
-    const codeHash = createHash(algorithm)
-      .update(content)
-      .digest('base64');
+    const codeHash = createHash(algorithm).update(content).digest('base64');
 
     return `${algorithm}-${codeHash}`;
   }
@@ -63,7 +62,8 @@ export class BundleActionCache {
     // sourceMappingURL is added at the very end which causes the code to be the same when sourcemaps are enabled/disabled
     // When using hiddenSourceMaps we can omit the postfix since sourceMappingURL will not be added.
     // When having sourcemaps a hashed file and non hashed file can have the same content. But the sourceMappingURL will differ.
-    const sourceMapPostFix = action.sourceMaps && !action.hiddenSourceMaps ? `|sourcemap|${action.filename}` : '';
+    const sourceMapPostFix =
+      action.sourceMaps && !action.hiddenSourceMaps ? `|sourcemap|${action.filename}` : '';
 
     const baseCacheKey = this.generateBaseCacheKey(action.code);
 
@@ -104,7 +104,7 @@ export class BundleActionCache {
         }
         cacheEntries.push({
           path: entry.path,
-          // tslint:disable-next-line: no-any
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
           size: (entry as any).size,
           integrity: entry.metadata && entry.metadata.integrity,
         });
@@ -117,7 +117,7 @@ export class BundleActionCache {
   }
 
   async getCachedBundleResult(action: ProcessBundleOptions): Promise<ProcessBundleResult | null> {
-    const entries = action.cacheKeys && await this.getCacheEntries(action.cacheKeys);
+    const entries = action.cacheKeys && (await this.getCacheEntries(action.cacheKeys));
     if (!entries) {
       return null;
     }
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..4daf9dd6b823 100644
--- a/packages/angular_devkit/build_angular/src/utils/action-executor.ts
+++ b/packages/angular_devkit/build_angular/src/utils/action-executor.ts
@@ -1,94 +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 JestWorker from 'jest-worker';
-import * as os from 'os';
-import * as path from 'path';
-import * as v8 from 'v8';
+
+import Piscina from 'piscina';
 import { BundleActionCache } from './action-cache';
+import { maxWorkers } from './environment-options';
 import { I18nOptions } from './i18n-options';
 import { InlineOptions, ProcessBundleOptions, ProcessBundleResult } from './process-bundle';
-import { maxWorkers } from './workers';
-
-const hasThreadSupport = (() => {
-  try {
-    require('worker_threads');
-
-    return true;
-  } catch {
-    return false;
-  }
-})();
 
-// This is used to normalize serialization messaging across threads and processes
-// Threads use the structured clone algorithm which handles more types
-// Processes use JSON which is much more limited
-const serialize = ((v8 as unknown) as { serialize(value: unknown): Buffer }).serialize;
-
-let workerFile = require.resolve('./process-bundle');
-workerFile =
-  path.extname(workerFile) === '.ts'
-    ? require.resolve('./process-bundle-bootstrap')
-    : workerFile;
+const workerFile = require.resolve('./process-bundle');
 
 export class BundleActionExecutor {
-  private largeWorker?: JestWorker;
-  private smallWorker?: JestWorker;
+  private workerPool?: Piscina;
   private cache?: BundleActionCache;
 
   constructor(
     private workerOptions: { cachePath?: string; i18n: I18nOptions },
     integrityAlgorithm?: string,
-    private readonly sizeThreshold = 32 * 1024,
   ) {
     if (workerOptions.cachePath) {
       this.cache = new BundleActionCache(workerOptions.cachePath, integrityAlgorithm);
     }
   }
 
-  private static executeMethod<O>(worker: JestWorker, method: string, input: unknown): Promise<O> {
-    return ((worker as unknown) as Record<string, (i: unknown) => Promise<O>>)[method](input);
-  }
-
-  private ensureLarge(): JestWorker {
-    if (this.largeWorker) {
-      return this.largeWorker;
-    }
-
-    // larger files are processed in a separate process to limit memory usage in the main process
-    return (this.largeWorker = new JestWorker(workerFile, {
-      exposedMethods: ['process', 'inlineLocales'],
-      setupArgs: [[...serialize(this.workerOptions)]],
-      numWorkers: maxWorkers,
-    }));
-  }
-
-  private ensureSmall(): JestWorker {
-    if (this.smallWorker) {
-      return this.smallWorker;
+  private ensureWorkerPool(): Piscina {
+    if (this.workerPool) {
+      return this.workerPool;
     }
 
-    // small files are processed in a limited number of threads to improve speed
-    // The limited number also prevents a large increase in memory usage for an otherwise short operation
-    return (this.smallWorker = new JestWorker(workerFile, {
-      exposedMethods: ['process', 'inlineLocales'],
-      setupArgs: hasThreadSupport ? [this.workerOptions] : [[...serialize(this.workerOptions)]],
-      numWorkers: os.cpus().length < 2 ? 1 : 2,
-      enableWorkerThreads: hasThreadSupport,
-    }));
-  }
+    this.workerPool = new Piscina({
+      filename: workerFile,
+      name: 'process',
+      workerData: this.workerOptions,
+      maxThreads: maxWorkers,
+    });
 
-  private executeAction<O>(method: string, action: { code: string }): Promise<O> {
-    // code.length is not an exact byte count but close enough for this
-    if (action.code.length > this.sizeThreshold) {
-      return BundleActionExecutor.executeMethod<O>(this.ensureLarge(), method, action);
-    } else {
-      return BundleActionExecutor.executeMethod<O>(this.ensureSmall(), method, action);
-    }
+    return this.workerPool;
   }
 
   async process(action: ProcessBundleOptions): Promise<ProcessBundleResult> {
@@ -105,55 +56,44 @@ export class BundleActionExecutor {
       } catch {}
     }
 
-    return this.executeAction<ProcessBundleResult>('process', action);
+    return this.ensureWorkerPool().run(action, { name: 'process' });
   }
 
   processAll(actions: Iterable<ProcessBundleOptions>): AsyncIterable<ProcessBundleResult> {
-    return BundleActionExecutor.executeAll(actions, action => this.process(action));
+    return BundleActionExecutor.executeAll(actions, (action) => this.process(action));
   }
 
   async inline(
     action: InlineOptions,
   ): Promise<{ file: string; diagnostics: { type: string; message: string }[]; count: number }> {
-    return this.executeAction('inlineLocales', action);
+    return this.ensureWorkerPool().run(action, { name: 'inlineLocales' });
   }
 
   inlineAll(actions: Iterable<InlineOptions>) {
-    return BundleActionExecutor.executeAll(actions, action => this.inline(action));
+    return BundleActionExecutor.executeAll(actions, (action) => this.inline(action));
   }
 
   private static async *executeAll<I, O>(
     actions: Iterable<I>,
     executor: (action: I) => Promise<O>,
   ): AsyncIterable<O> {
-    const executions = new Map<Promise<O>, Promise<O>>();
+    const executions = new Map<Promise<O>, Promise<[Promise<O>, O]>>();
     for (const action of actions) {
       const execution = executor(action);
       executions.set(
         execution,
-        execution.then(result => {
-          executions.delete(execution);
-
-          return result;
-        }),
+        execution.then((result) => [execution, result]),
       );
     }
 
     while (executions.size > 0) {
-      yield Promise.race(executions.values());
+      const [execution, result] = await Promise.race(executions.values());
+      executions.delete(execution);
+      yield result;
     }
   }
 
   stop(): void {
-    // Floating promises are intentional here
-    // https://github.com/facebook/jest/tree/56079a5aceacf32333089cea50c64385885fee26/packages/jest-worker#end
-    if (this.largeWorker) {
-      // tslint:disable-next-line: no-floating-promises
-      this.largeWorker.end();
-    }
-    if (this.smallWorker) {
-      // tslint:disable-next-line: no-floating-promises
-      this.smallWorker.end();
-    }
+    void this.workerPool?.destroy();
   }
 }
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 f5662b60b7b0..3be2a093fb05 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,21 +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 * as browserslist from 'browserslist';
+import browserslist from 'browserslist';
 import { feature, features } from 'caniuse-lite';
 import * as ts from 'typescript';
 
 export class BuildBrowserFeatures {
   readonly supportedBrowsers: string[];
 
-  constructor(
-    private projectRoot: string,
-  ) {
+  constructor(private projectRoot: string) {
     this.supportedBrowsers = browserslist(undefined, { path: this.projectRoot });
   }
 
@@ -44,24 +42,20 @@ export class BuildBrowserFeatures {
     // n: feature is unavailable
     // a: feature is partially supported
     // x: feature is prefixed
-    const criteria = [
-      'y',
-      'a',
-    ];
+    const criteria = ['y', 'a'];
 
     const data = feature(features[featureId]);
 
-    return !this.supportedBrowsers
-      .some(browser => {
-        const [agentId, version] = browser.split(' ');
+    return !this.supportedBrowsers.some((browser) => {
+      const [agentId, version] = browser.split(' ');
 
-        const browserData = data.stats[agentId];
-        const featureStatus = (browserData && browserData[version]) as string | undefined;
+      const browserData = data.stats[agentId];
+      const featureStatus = (browserData && browserData[version]) as string | undefined;
 
-        // We are only interested in the first character
-        // Ex: when 'a #4 #5', we only need to check for 'a'
-        // as for such cases we should polyfill these features as needed
-        return !featureStatus || !criteria.includes(featureStatus.charAt(0));
-      });
+      // We are only interested in the first character
+      // Ex: when 'a #4 #5', we only need to check for 'a'
+      // as for such cases we should polyfill these features as needed
+      return !featureStatus || !criteria.includes(featureStatus.charAt(0));
+    });
   }
 }
diff --git a/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 c50e885b4f5e..69220e4dba24 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,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 { TestProjectHost } from '@angular-devkit/architect/testing';
 import { getSystemPath, join, normalize } from '@angular-devkit/core';
 import { ScriptTarget } from 'typescript';
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 433e194d1040..8ebd51c7e9cb 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
@@ -57,7 +57,6 @@ export interface BuildOptions {
   serviceWorker?: boolean;
   webWorkerTsConfig?: string;
   statsJson: boolean;
-  forkTypeChecker: boolean;
   hmr?: boolean;
   main: string;
   polyfills?: string;
@@ -80,7 +79,9 @@ export interface WebpackTestOptions extends BuildOptions {
   codeCoverageExclude?: string[];
 }
 
-export interface WebpackDevServerOptions extends BuildOptions, Omit<DevServerSchema, 'optimization' | 'sourceMap' | 'browserTarget'> { }
+export interface WebpackDevServerOptions
+  extends BuildOptions,
+    Omit<DevServerSchema, 'optimization' | 'sourceMap' | 'browserTarget'> {}
 
 export interface WebpackConfigOptions<T = BuildOptions> {
   root: string;
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 31dee86cf99c..a1021043f37d 100644
--- a/packages/angular_devkit/build_angular/src/utils/bundle-calculator.ts
+++ b/packages/angular_devkit/build_angular/src/utils/bundle-calculator.ts
@@ -1,19 +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 { basename } from 'path';
+import { StatsAsset, StatsChunk, StatsCompilation } from 'webpack';
 import { Budget, Type } from '../browser/schema';
 import { ProcessBundleFile, ProcessBundleResult } from '../utils/process-bundle';
-import {
-  JsonAssetStats,
-  JsonChunkStats,
-  JsonCompilationStats,
-  formatSize,
-} from '../webpack/utils/stats';
+import { formatSize } from '../webpack/utils/stats';
 
 interface Size {
   size: number;
@@ -108,21 +105,23 @@ export function* calculateThresholds(budget: Budget): IterableIterator<Threshold
  */
 function calculateSizes(
   budget: Budget,
-  stats: JsonCompilationStats,
+  stats: StatsCompilation,
   processResults: ProcessBundleResult[],
 ): Size[] {
   if (budget.type === Type.AnyComponentStyle) {
     // Component style size information is not available post-build, this must
     // be checked mid-build via the `AnyComponentStyleBudgetChecker` plugin.
-    throw new Error('Can not calculate size of AnyComponentStyle. Use `AnyComponentStyleBudgetChecker` instead.');
+    throw new Error(
+      'Can not calculate size of AnyComponentStyle. Use `AnyComponentStyleBudgetChecker` instead.',
+    );
   }
 
   type NonComponentStyleBudgetTypes = Exclude<Budget['type'], Type.AnyComponentStyle>;
   type CalculatorTypes = {
     new (
       budget: Budget,
-      chunks: JsonChunkStats[],
-      assets: JsonAssetStats[],
+      chunks: StatsChunk[],
+      assets: StatsAsset[],
       processResults: ProcessBundleResult[],
     ): Calculator;
   };
@@ -136,7 +135,7 @@ function calculateSizes(
   };
 
   const ctor = calculatorMap[budget.type];
-  const {chunks, assets} = stats;
+  const { chunks, assets } = stats;
   if (!chunks) {
     throw new Error('Webpack stats output did not include chunk information.');
   }
@@ -150,50 +149,53 @@ function calculateSizes(
 }
 
 abstract class Calculator {
-  constructor (
+  constructor(
     protected budget: Budget,
-    protected chunks: JsonChunkStats[],
-    protected assets: JsonAssetStats[],
+    protected chunks: StatsChunk[],
+    protected assets: StatsAsset[],
     protected processResults: ProcessBundleResult[],
   ) {}
 
   abstract calculate(): Size[];
 
   /** Calculates the size of the given chunk for the provided build type. */
-  protected calculateChunkSize(
-    chunk: JsonChunkStats,
-    buildType: DifferentialBuildType,
-  ): number {
+  protected calculateChunkSize(chunk: StatsChunk, buildType: DifferentialBuildType): number {
     // Look for a process result containing different builds for this chunk.
-    const processResult = this.processResults
-        .find((processResult) => processResult.name === chunk.id.toString());
+    const processResult = this.processResults.find(
+      (processResult) => processResult.name === chunk.id?.toString(),
+    );
 
     if (processResult) {
       // Found a differential build, use the correct size information.
-      const processResultFile = getDifferentialBuildResult(
-        processResult, buildType);
+      const processResultFile = getDifferentialBuildResult(processResult, buildType);
 
-      return processResultFile && processResultFile.size || 0;
+      return (processResultFile && processResultFile.size) || 0;
     } else {
       // No differential builds, get the chunk size by summing its assets.
+      if (!chunk.files) {
+        return 0;
+      }
+
       return chunk.files
-          .filter(file => !file.endsWith('.map'))
-          .map(file => {
-            const asset = this.assets.find((asset) => asset.name === file);
-            if (!asset) {
-              throw new Error(`Could not find asset for file: ${file}`);
-            }
-
-            return asset.size;
-          })
-          .reduce((l, r) => l + r, 0);
+        .filter((file) => !file.endsWith('.map'))
+        .map((file) => {
+          const asset = this.assets.find((asset) => asset.name === file);
+          if (!asset) {
+            throw new Error(`Could not find asset for file: ${file}`);
+          }
+
+          return asset.size;
+        })
+        .reduce((l, r) => l + r, 0);
     }
   }
 
-  protected getAssetSize(asset: JsonAssetStats): number {
+  protected getAssetSize(asset: StatsAsset): number {
     if (asset.name.endsWith('.js')) {
-      const processResult = this.processResults
-        .find((processResult) => processResult.original && basename(processResult.original.filename) === asset.name);
+      const processResult = this.processResults.find(
+        (processResult) =>
+          processResult.original && basename(processResult.original.filename) === asset.name,
+      );
       if (processResult?.original) {
         return processResult.original.size;
       }
@@ -219,8 +221,8 @@ class BundleCalculator extends Calculator {
     // 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.includes(budgetName))
-        .map(chunk => this.calculateChunkSize(chunk, buildType))
+        .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}-${buildTypeLabels[buildType]}` };
@@ -246,8 +248,8 @@ class InitialCalculator extends Calculator {
       return {
         label: `bundle initial-${buildTypeLabels[buildType]}`,
         size: this.chunks
-          .filter(chunk => chunk.initial)
-          .map(chunk => this.calculateChunkSize(chunk, buildType))
+          .filter((chunk) => chunk.initial)
+          .map((chunk) => this.calculateChunkSize(chunk, buildType))
           .reduce((l, r) => l + r, 0),
       };
     });
@@ -268,11 +270,11 @@ class InitialCalculator extends Calculator {
 class AllScriptCalculator extends Calculator {
   calculate() {
     const size = this.assets
-      .filter(asset => asset.name.endsWith('.js'))
-      .map(asset => this.getAssetSize(asset))
+      .filter((asset) => asset.name.endsWith('.js'))
+      .map((asset) => this.getAssetSize(asset))
       .reduce((total: number, size: number) => total + size, 0);
 
-    return [{size, label: 'total scripts'}];
+    return [{ size, label: 'total scripts' }];
   }
 }
 
@@ -282,11 +284,11 @@ class AllScriptCalculator extends Calculator {
 class AllCalculator extends Calculator {
   calculate() {
     const size = this.assets
-      .filter(asset => !asset.name.endsWith('.map'))
-      .map(asset => this.getAssetSize(asset))
+      .filter((asset) => !asset.name.endsWith('.map'))
+      .map((asset) => this.getAssetSize(asset))
       .reduce((total: number, size: number) => total + size, 0);
 
-    return [{size, label: 'total'}];
+    return [{ size, label: 'total' }];
   }
 }
 
@@ -296,8 +298,8 @@ class AllCalculator extends Calculator {
 class AnyScriptCalculator extends Calculator {
   calculate() {
     return this.assets
-      .filter(asset => asset.name.endsWith('.js'))
-      .map(asset => ({
+      .filter((asset) => asset.name.endsWith('.js'))
+      .map((asset) => ({
         size: this.getAssetSize(asset),
         label: asset.name,
       }));
@@ -310,8 +312,8 @@ class AnyScriptCalculator extends Calculator {
 class AnyCalculator extends Calculator {
   calculate() {
     return this.assets
-      .filter(asset => !asset.name.endsWith('.map'))
-      .map(asset => ({
+      .filter((asset) => !asset.name.endsWith('.map'))
+      .map((asset) => ({
         size: this.getAssetSize(asset),
         label: asset.name,
       }));
@@ -321,22 +323,18 @@ class AnyCalculator extends Calculator {
 /**
  * Calculate the bytes given a string value.
  */
-function calculateBytes(
-  input: string,
-  baseline?: string,
-  factor: 1 | -1 = 1,
-): number {
+function calculateBytes(input: string, baseline?: string, factor: 1 | -1 = 1): number {
   const matches = input.match(/^\s*(\d+(?:\.\d+)?)\s*(%|(?:[mM]|[kK]|[gG])?[bB])?\s*$/);
   if (!matches) {
     return NaN;
   }
 
-  const baselineBytes = baseline && calculateBytes(baseline) || 0;
+  const baselineBytes = (baseline && calculateBytes(baseline)) || 0;
 
   let value = Number(matches[1]);
   switch (matches[2] && matches[2].toLowerCase()) {
     case '%':
-      value = baselineBytes * value / 100;
+      value = (baselineBytes * value) / 100;
       break;
     case 'kb':
       value *= 1024;
@@ -358,9 +356,9 @@ function calculateBytes(
 
 export function* checkBudgets(
   budgets: Budget[],
-  webpackStats: JsonCompilationStats,
+  webpackStats: StatsCompilation,
   processResults: ProcessBundleResult[],
-): IterableIterator<{ severity: ThresholdSeverity, message: string }> {
+): IterableIterator<{ severity: ThresholdSeverity; message: string }> {
   // Ignore AnyComponentStyle budgets as these are handled in `AnyComponentStyleBudgetChecker`.
   const computableBudgets = budgets.filter((budget) => budget.type !== Type.AnyComponentStyle);
 
@@ -372,8 +370,11 @@ export function* checkBudgets(
   }
 }
 
-export function* checkThresholds(thresholds: IterableIterator<Threshold>, size: number, label?: string):
-    IterableIterator<{ severity: ThresholdSeverity, message: string }> {
+export function* checkThresholds(
+  thresholds: IterableIterator<Threshold>,
+  size: number,
+  label?: string,
+): IterableIterator<{ severity: ThresholdSeverity; message: string }> {
   for (const threshold of thresholds) {
     switch (threshold.type) {
       case ThresholdType.Max: {
@@ -384,9 +385,9 @@ export function* checkThresholds(thresholds: IterableIterator<Threshold>, size:
         const sizeDifference = formatSize(size - threshold.limit);
         yield {
           severity: threshold.severity,
-          message: `${label} exceeded maximum budget. Budget ${
-            formatSize(threshold.limit)} was not met by ${
-            sizeDifference} with a total of ${formatSize(size)}.`,
+          message: `${label} exceeded maximum budget. Budget ${formatSize(
+            threshold.limit,
+          )} was not met by ${sizeDifference} with a total of ${formatSize(size)}.`,
         };
         break;
       }
@@ -398,12 +399,13 @@ export function* checkThresholds(thresholds: IterableIterator<Threshold>, size:
         const sizeDifference = formatSize(threshold.limit - size);
         yield {
           severity: threshold.severity,
-          message: `${label} failed to meet minimum budget. Budget ${
-            formatSize(threshold.limit)} was not met by ${
-            sizeDifference} with a total of ${formatSize(size)}.`,
+          message: `${label} failed to meet minimum budget. Budget ${formatSize(
+            threshold.limit,
+          )} was not met by ${sizeDifference} with a total of ${formatSize(size)}.`,
         };
         break;
-      } default: {
+      }
+      default: {
         throw new Error(`Unexpected threshold type: ${ThresholdType[threshold.type]}`);
       }
     }
@@ -412,11 +414,14 @@ export function* checkThresholds(thresholds: IterableIterator<Threshold>, size:
 
 /** Returns the {@link ProcessBundleFile} for the given {@link DifferentialBuildType}. */
 function getDifferentialBuildResult(
-    processResult: ProcessBundleResult, buildType: DifferentialBuildType):
-    ProcessBundleFile|null {
+  processResult: ProcessBundleResult,
+  buildType: DifferentialBuildType,
+): ProcessBundleFile | null {
   switch (buildType) {
-    case DifferentialBuildType.ORIGINAL: return processResult.original || null;
-    case DifferentialBuildType.DOWNLEVEL: return processResult.downlevel || null;
+    case DifferentialBuildType.ORIGINAL:
+      return processResult.original || null;
+    case DifferentialBuildType.DOWNLEVEL:
+      return processResult.downlevel || null;
   }
 }
 
@@ -432,10 +437,12 @@ function mergeDifferentialBuildSizes(buildSizes: Size[], mergeLabel: string): Si
   }
 
   // Only one size.
-  return [{
-    label: mergeLabel,
-    size: buildSizes[0].size,
-  }];
+  return [
+    {
+      label: mergeLabel,
+      size: buildSizes[0].size,
+    },
+  ];
 }
 
 /** Returns whether or not all items in the list are equivalent to each other. */
@@ -443,10 +450,13 @@ function allEquivalent<T>(items: Iterable<T>): boolean {
   return new Set(items).size < 2;
 }
 
-function getBuildTypeLabels(processResults: ProcessBundleResult[]): Record<DifferentialBuildType, string> {
+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;
+  const originalFileName = processResults.find(
+    ({ original }) => original?.filename && fileNameSuffixRegExp.test(original.filename),
+  )?.original?.filename;
 
   let originalSuffix: string | undefined;
   if (originalFileName) {
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 a9fe37c633dc..47785cd84eb9 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,26 +1,28 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+
+import { StatsCompilation } from 'webpack';
 import { Budget, Type } from '../browser/schema';
 import { ThresholdSeverity, checkBudgets } from './bundle-calculator';
 import { ProcessBundleResult } from './process-bundle';
 
 const KB = 1024;
 
-// tslint:disable-next-line: no-big-function
 describe('bundle-calculator', () => {
-  // tslint:disable-next-line: no-big-function
   describe('checkBudgets()', () => {
     it('yields maximum budgets exceeded', () => {
-      const budgets: Budget[] = [{
-        type: Type.Any,
-        maximumError: '1kb',
-      }];
-      const stats = {
+      const budgets: Budget[] = [
+        {
+          type: Type.Any,
+          maximumError: '1kb',
+        },
+      ];
+      const stats = ({
         chunks: [],
         assets: [
           {
@@ -32,7 +34,7 @@ describe('bundle-calculator', () => {
             size: 0.5 * KB,
           },
         ],
-      };
+      } as unknown) as StatsCompilation;
 
       const failures = Array.from(checkBudgets(budgets, stats, [] /* processResults */));
 
@@ -44,11 +46,13 @@ describe('bundle-calculator', () => {
     });
 
     it('yields minimum budgets exceeded', () => {
-      const budgets: Budget[] = [{
-        type: Type.Any,
-        minimumError: '1kb',
-      }];
-      const stats = {
+      const budgets: Budget[] = [
+        {
+          type: Type.Any,
+          minimumError: '1kb',
+        },
+      ];
+      const stats = ({
         chunks: [],
         assets: [
           {
@@ -60,7 +64,7 @@ describe('bundle-calculator', () => {
             size: 0.5 * KB,
           },
         ],
-      };
+      } as unknown) as StatsCompilation;
 
       const failures = Array.from(checkBudgets(budgets, stats, [] /* processResults */));
 
@@ -72,17 +76,19 @@ describe('bundle-calculator', () => {
     });
 
     it('yields exceeded bundle budgets', () => {
-      const budgets: Budget[] = [{
-        type: Type.Bundle,
-        name: 'foo',
-        maximumError: '1kb',
-      }];
-      const stats = {
+      const budgets: Budget[] = [
+        {
+          type: Type.Bundle,
+          name: 'foo',
+          maximumError: '1kb',
+        },
+      ];
+      const stats = ({
         chunks: [
           {
             id: 0,
-            names: [ 'foo' ],
-            files: [ 'foo.js', 'bar.js' ],
+            names: ['foo'],
+            files: ['foo.js', 'bar.js'],
           },
         ],
         assets: [
@@ -95,7 +101,7 @@ describe('bundle-calculator', () => {
             size: 0.75 * KB,
           },
         ],
-      };
+      } as unknown) as StatsCompilation;
 
       const failures = Array.from(checkBudgets(budgets, stats, [] /* processResults */));
 
@@ -107,21 +113,24 @@ describe('bundle-calculator', () => {
     });
 
     it('yields exceeded differential bundle budgets', () => {
-      const budgets: Budget[] = [{
-        type: Type.Bundle,
-        name: 'foo',
-        maximumError: '1kb',
-      }];
-      const stats = {
+      const budgets: Budget[] = [
+        {
+          type: Type.Bundle,
+          name: 'foo',
+          maximumError: '1kb',
+        },
+      ];
+      const stats = ({
         chunks: [
           {
             id: 0,
-            names: [ 'foo' ],
-            files: [ 'foo.js', 'bar.js' ],
+            names: ['foo'],
+            files: ['foo.js', 'bar.js'],
           },
         ],
         assets: [],
-      };
+      } as unknown) as StatsCompilation;
+
       const processResults: ProcessBundleResult[] = [
         {
           name: '0',
@@ -150,21 +159,23 @@ describe('bundle-calculator', () => {
     });
 
     it('does *not* yield a combined differential bundle budget', () => {
-      const budgets: Budget[] = [{
-        type: Type.Bundle,
-        name: 'foo',
-        maximumError: '1kb',
-      }];
-      const stats = {
+      const budgets: Budget[] = [
+        {
+          type: Type.Bundle,
+          name: 'foo',
+          maximumError: '1kb',
+        },
+      ];
+      const stats = ({
         chunks: [
           {
             id: 0,
-            names: [ 'foo' ],
-            files: [ 'foo.js', 'bar.js' ],
+            names: ['foo'],
+            files: ['foo.js', 'bar.js'],
           },
         ],
         assets: [],
-      };
+      } as unknown) as StatsCompilation;
       const processResults: ProcessBundleResult[] = [
         {
           name: '0',
@@ -188,17 +199,19 @@ describe('bundle-calculator', () => {
     });
 
     it('yields exceeded initial budget', () => {
-      const budgets: Budget[] = [{
-        type: Type.Initial,
-        maximumError: '1kb',
-      }];
-      const stats = {
+      const budgets: Budget[] = [
+        {
+          type: Type.Initial,
+          maximumError: '1kb',
+        },
+      ];
+      const stats = ({
         chunks: [
           {
             id: 0,
             initial: true,
-            names: [ 'foo' ],
-            files: [ 'foo.js', 'bar.js' ],
+            names: ['foo'],
+            files: ['foo.js', 'bar.js'],
           },
         ],
         assets: [
@@ -211,7 +224,7 @@ describe('bundle-calculator', () => {
             size: 0.75 * KB,
           },
         ],
-      };
+      } as unknown) as StatsCompilation;
 
       const failures = Array.from(checkBudgets(budgets, stats, [] /* processResults */));
 
@@ -223,21 +236,23 @@ describe('bundle-calculator', () => {
     });
 
     it('yields exceeded differential initial budget', () => {
-      const budgets: Budget[] = [{
-        type: Type.Initial,
-        maximumError: '1kb',
-      }];
-      const stats = {
+      const budgets: Budget[] = [
+        {
+          type: Type.Initial,
+          maximumError: '1kb',
+        },
+      ];
+      const stats = ({
         chunks: [
           {
             id: 0,
             initial: true,
-            names: [ 'foo' ],
-            files: [ 'foo.js', 'bar.js' ],
+            names: ['foo'],
+            files: ['foo.js', 'bar.js'],
           },
         ],
         assets: [],
-      };
+      } as unknown) as StatsCompilation;
       const processResults: ProcessBundleResult[] = [
         {
           name: '0',
@@ -267,21 +282,23 @@ describe('bundle-calculator', () => {
     });
 
     it('does *not* yield a combined differential initial budget', () => {
-      const budgets: Budget[] = [{
-        type: Type.Initial,
-        maximumError: '1kb',
-      }];
-      const stats = {
+      const budgets: Budget[] = [
+        {
+          type: Type.Initial,
+          maximumError: '1kb',
+        },
+      ];
+      const stats = ({
         chunks: [
           {
             id: 0,
             initial: true,
-            names: [ 'foo' ],
-            files: [ 'foo.js', 'bar.js' ],
+            names: ['foo'],
+            files: ['foo.js', 'bar.js'],
           },
         ],
         assets: [],
-      };
+      } as unknown) as StatsCompilation;
       const processResults: ProcessBundleResult[] = [
         {
           name: '0',
@@ -305,17 +322,19 @@ describe('bundle-calculator', () => {
     });
 
     it('yields exceeded total scripts budget', () => {
-      const budgets: Budget[] = [{
-        type: Type.AllScript,
-        maximumError: '1kb',
-      }];
-      const stats = {
+      const budgets: Budget[] = [
+        {
+          type: Type.AllScript,
+          maximumError: '1kb',
+        },
+      ];
+      const stats = ({
         chunks: [
           {
             id: 0,
             initial: true,
-            names: [ 'foo' ],
-            files: [ 'foo.js', 'bar.js' ],
+            names: ['foo'],
+            files: ['foo.js', 'bar.js'],
           },
         ],
         assets: [
@@ -332,7 +351,7 @@ describe('bundle-calculator', () => {
             size: 1.5 * KB,
           },
         ],
-      };
+      } as unknown) as StatsCompilation;
 
       const failures = Array.from(checkBudgets(budgets, stats, [] /* processResults */));
 
@@ -344,17 +363,19 @@ describe('bundle-calculator', () => {
     });
 
     it('yields exceeded total budget', () => {
-      const budgets: Budget[] = [{
-        type: Type.All,
-        maximumError: '1kb',
-      }];
-      const stats = {
+      const budgets: Budget[] = [
+        {
+          type: Type.All,
+          maximumError: '1kb',
+        },
+      ];
+      const stats = ({
         chunks: [
           {
             id: 0,
             initial: true,
-            names: [ 'foo' ],
-            files: [ 'foo.js', 'bar.css' ],
+            names: ['foo'],
+            files: ['foo.js', 'bar.css'],
           },
         ],
         assets: [
@@ -367,7 +388,7 @@ describe('bundle-calculator', () => {
             size: 0.75 * KB,
           },
         ],
-      };
+      } as unknown) as StatsCompilation;
 
       const failures = Array.from(checkBudgets(budgets, stats, [] /* processResults */));
 
@@ -379,17 +400,19 @@ describe('bundle-calculator', () => {
     });
 
     it('skips component style budgets', () => {
-      const budgets: Budget[] = [{
-        type: Type.AnyComponentStyle,
-        maximumError: '1kb',
-      }];
-      const stats = {
+      const budgets: Budget[] = [
+        {
+          type: Type.AnyComponentStyle,
+          maximumError: '1kb',
+        },
+      ];
+      const stats = ({
         chunks: [
           {
             id: 0,
             initial: true,
-            names: [ 'foo' ],
-            files: [ 'foo.css', 'bar.js' ],
+            names: ['foo'],
+            files: ['foo.css', 'bar.js'],
           },
         ],
         assets: [
@@ -402,7 +425,7 @@ describe('bundle-calculator', () => {
             size: 0.5 * KB,
           },
         ],
-      };
+      } as unknown) as StatsCompilation;
 
       const failures = Array.from(checkBudgets(budgets, stats, [] /* processResults */));
 
@@ -410,17 +433,19 @@ describe('bundle-calculator', () => {
     });
 
     it('yields exceeded individual script budget', () => {
-      const budgets: Budget[] = [{
-        type: Type.AnyScript,
-        maximumError: '1kb',
-      }];
-      const stats = {
+      const budgets: Budget[] = [
+        {
+          type: Type.AnyScript,
+          maximumError: '1kb',
+        },
+      ];
+      const stats = ({
         chunks: [
           {
             id: 0,
             initial: true,
-            names: [ 'foo' ],
-            files: [ 'foo.js', 'bar.js' ],
+            names: ['foo'],
+            files: ['foo.js', 'bar.js'],
           },
         ],
         assets: [
@@ -433,7 +458,7 @@ describe('bundle-calculator', () => {
             size: 0.5 * KB,
           },
         ],
-      };
+      } as unknown) as StatsCompilation;
 
       const failures = Array.from(checkBudgets(budgets, stats, [] /* processResults */));
 
@@ -445,17 +470,19 @@ describe('bundle-calculator', () => {
     });
 
     it('yields exceeded individual file budget', () => {
-      const budgets: Budget[] = [{
-        type: Type.Any,
-        maximumError: '1kb',
-      }];
-      const stats = {
+      const budgets: Budget[] = [
+        {
+          type: Type.Any,
+          maximumError: '1kb',
+        },
+      ];
+      const stats = ({
         chunks: [
           {
             id: 0,
             initial: true,
-            names: [ 'foo' ],
-            files: [ 'foo.ext', 'bar.ext' ],
+            names: ['foo'],
+            files: ['foo.ext', 'bar.ext'],
           },
         ],
         assets: [
@@ -468,7 +495,7 @@ describe('bundle-calculator', () => {
             size: 0.5 * KB,
           },
         ],
-      };
+      } as unknown) as StatsCompilation;
 
       const failures = Array.from(checkBudgets(budgets, stats, [] /* processResults */));
 
@@ -480,17 +507,19 @@ describe('bundle-calculator', () => {
     });
 
     it('does *not* yield a combined differential bundle budget for any script', () => {
-      const budgets: Budget[] = [{
-        type: Type.AnyScript,
-        maximumError: '1kb',
-      }];
-      const stats = {
+      const budgets: Budget[] = [
+        {
+          type: Type.AnyScript,
+          maximumError: '1kb',
+        },
+      ];
+      const stats = ({
         chunks: [
           {
             id: 0,
             initial: true,
-            names: [ 'foo' ],
-            files: [ 'foo.js' ],
+            names: ['foo'],
+            files: ['foo.js'],
           },
         ],
         assets: [
@@ -499,7 +528,7 @@ describe('bundle-calculator', () => {
             size: 1.25 * KB,
           },
         ],
-      };
+      } as unknown) as StatsCompilation;
       const processResults: ProcessBundleResult[] = [
         {
           name: '0',
@@ -523,17 +552,19 @@ describe('bundle-calculator', () => {
     });
 
     it('does *not* yield a combined differential bundle budget for all script', () => {
-      const budgets: Budget[] = [{
-        type: Type.AllScript,
-        maximumError: '1kb',
-      }];
-      const stats = {
+      const budgets: Budget[] = [
+        {
+          type: Type.AllScript,
+          maximumError: '1kb',
+        },
+      ];
+      const stats = ({
         chunks: [
           {
             id: 0,
             initial: true,
-            names: [ 'foo' ],
-            files: [ 'foo.js' ],
+            names: ['foo'],
+            files: ['foo.js'],
           },
         ],
         assets: [
@@ -542,7 +573,7 @@ describe('bundle-calculator', () => {
             size: 1.25 * KB,
           },
         ],
-      };
+      } as unknown) as StatsCompilation;
       const processResults: ProcessBundleResult[] = [
         {
           name: '0',
@@ -566,17 +597,19 @@ describe('bundle-calculator', () => {
     });
 
     it('does *not* yield a combined differential bundle budget for total budget', () => {
-      const budgets: Budget[] = [{
-        type: Type.All,
-        maximumError: '1kb',
-      }];
-      const stats = {
+      const budgets: Budget[] = [
+        {
+          type: Type.All,
+          maximumError: '1kb',
+        },
+      ];
+      const stats = ({
         chunks: [
           {
             id: 0,
             initial: true,
-            names: [ 'foo' ],
-            files: [ 'foo.js' ],
+            names: ['foo'],
+            files: ['foo.js'],
           },
         ],
         assets: [
@@ -585,7 +618,7 @@ describe('bundle-calculator', () => {
             size: 1.25 * KB,
           },
         ],
-      };
+      } as unknown) as StatsCompilation;
       const processResults: ProcessBundleResult[] = [
         {
           name: '0',
@@ -609,17 +642,19 @@ describe('bundle-calculator', () => {
     });
 
     it('does *not* yield a combined differential bundle budget for individual file budget', () => {
-      const budgets: Budget[] = [{
-        type: Type.Any,
-        maximumError: '1kb',
-      }];
-      const stats = {
+      const budgets: Budget[] = [
+        {
+          type: Type.Any,
+          maximumError: '1kb',
+        },
+      ];
+      const stats = ({
         chunks: [
           {
             id: 0,
             initial: true,
-            names: [ 'foo' ],
-            files: [ 'foo.js' ],
+            names: ['foo'],
+            files: ['foo.js'],
           },
         ],
         assets: [
@@ -628,7 +663,7 @@ describe('bundle-calculator', () => {
             size: 1.25 * KB,
           },
         ],
-      };
+      } as unknown) as StatsCompilation;
       const processResults: ProcessBundleResult[] = [
         {
           name: '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..26dfd13ac7fa 100644
--- a/packages/angular_devkit/build_angular/src/utils/cache-path.ts
+++ b/packages/angular_devkit/build_angular/src/utils/cache-path.ts
@@ -1,11 +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 findCacheDirectory from 'find-cache-dir';
+
+import findCacheDirectory from 'find-cache-dir';
 import { tmpdir } from 'os';
 import { resolve } from 'path';
 import { cachingBasePath } from './environment-options';
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..37aeacc9c3ed 100644
--- a/packages/angular_devkit/build_angular/src/utils/check-port.ts
+++ b/packages/angular_devkit/build_angular/src/utils/check-port.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 { prompt } from 'inquirer';
 import * as net from 'net';
 import { isTTY } from './tty';
@@ -41,7 +42,7 @@ export async function checkPort(port: number, host: string): Promise<number> {
           message: `Port ${port} is already in use.\nWould you like to use a different port?`,
           default: true,
         }).then(
-          (answers) => answers.useDifferent ? resolve(0) : reject(createInUseError(port)),
+          (answers) => (answers.useDifferent ? resolve(0) : reject(createInUseError(port))),
           () => reject(createInUseError(port)),
         );
       })
diff --git a/packages/angular_devkit/build_angular/src/utils/color.ts b/packages/angular_devkit/build_angular/src/utils/color.ts
index ad77d8230fc7..8ddcadf3d1eb 100644
--- a/packages/angular_devkit/build_angular/src/utils/color.ts
+++ b/packages/angular_devkit/build_angular/src/utils/color.ts
@@ -1,15 +1,42 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of 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 ansiColors from 'ansi-colors';
 import { WriteStream } from 'tty';
 
 type AnsiColors = typeof ansiColors;
-const supportsColor = process.stdout instanceof WriteStream && process.stdout.getColorDepth() > 1;
+
+function supportColor(): boolean {
+  if (process.env.FORCE_COLOR !== undefined) {
+    // 2 colors: FORCE_COLOR = 0 (Disables colors), depth 1
+    // 16 colors: FORCE_COLOR = 1, depth 4
+    // 256 colors: FORCE_COLOR = 2, depth 8
+    // 16,777,216 colors: FORCE_COLOR = 3, depth 16
+    // See: https://nodejs.org/dist/latest-v12.x/docs/api/tty.html#tty_writestream_getcolordepth_env
+    // and https://github.com/nodejs/node/blob/b9f36062d7b5c5039498e98d2f2c180dca2a7065/lib/internal/tty.js#L106;
+    switch (process.env.FORCE_COLOR) {
+      case '':
+      case 'true':
+      case '1':
+      case '2':
+      case '3':
+        return true;
+      default:
+        return false;
+    }
+  }
+
+  if (process.stdout instanceof WriteStream) {
+    return process.stdout.getColorDepth() > 1;
+  }
+
+  return false;
+}
 
 export function removeColor(text: string): string {
   // This has been created because when colors.enabled is false unstyle doesn't work
@@ -20,6 +47,6 @@ export function removeColor(text: string): string {
 // Create a separate instance to prevent unintended global changes to the color configuration
 // Create function is not defined in the typings. See: https://github.com/doowb/ansi-colors/pull/44
 const colors = (ansiColors as AnsiColors & { create: () => AnsiColors }).create();
-colors.enabled = supportsColor;
+colors.enabled = supportColor();
 
 export { colors };
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 976796ce4cdd..28a5b2cf9014 100644
--- a/packages/angular_devkit/build_angular/src/utils/copy-assets.ts
+++ b/packages/angular_devkit/build_angular/src/utils/copy-assets.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 * as fs from 'fs';
-import * as glob from 'glob';
+import glob from 'glob';
 import * as path from 'path';
 import { copyFile } from './copy-file';
 
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..f5017d5e52fb 100644
--- a/packages/angular_devkit/build_angular/src/utils/copy-file.ts
+++ b/packages/angular_devkit/build_angular/src/utils/copy-file.ts
@@ -1,17 +1,18 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of 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';
 
 // Workaround Node.js issue prior to 10.16 with copyFile on macOS
 // https://github.com/angular/angular-cli/issues/15544 & https://github.com/nodejs/node/pull/27241
 let copyFileWorkaround = false;
 if (process.platform === 'darwin') {
-  const version = process.versions.node.split('.').map(part => Number(part));
+  const version = process.versions.node.split('.').map((part) => Number(part));
   if (version[0] < 10 || version[0] === 11 || (version[0] === 10 && version[1] < 16)) {
     copyFileWorkaround = true;
   }
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..2bb58977b9c0 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,21 +1,39 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of 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 { resolve } from 'path';
-import * as rimraf from 'rimraf';
 
 /**
  * Delete an output directory, but error out if it's the root of the project.
  */
-export function deleteOutputDir(root: string, outputPath: string) {
+export function deleteOutputDir(root: string, outputPath: string): void {
   const resolvedOutputPath = resolve(root, outputPath);
   if (resolvedOutputPath === root) {
     throw new Error('Output path MUST not be project root directory!');
   }
 
-  rimraf.sync(resolvedOutputPath);
+  // The below should be removed and replace with just `rmSync` when support for Node.Js 12 is removed.
+  const { rmSync, rmdirSync } = fs as typeof fs & {
+    rmSync?: (
+      path: fs.PathLike,
+      options?: {
+        force?: boolean;
+        maxRetries?: number;
+        recursive?: boolean;
+        retryDelay?: number;
+      },
+    ) => void;
+  };
+
+  if (rmSync) {
+    rmSync(resolvedOutputPath, { force: true, recursive: true, maxRetries: 3 });
+  } else {
+    rmdirSync(resolvedOutputPath, { recursive: true, maxRetries: 3 });
+  }
 }
diff --git a/packages/angular_devkit/build_angular/src/utils/empty.js b/packages/angular_devkit/build_angular/src/utils/empty.js
index 8b137891791f..e69de29bb2d1 100644
--- a/packages/angular_devkit/build_angular/src/utils/empty.js
+++ b/packages/angular_devkit/build_angular/src/utils/empty.js
@@ -1 +0,0 @@
-
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..1b019c4cc96d 100644
--- a/packages/angular_devkit/build_angular/src/utils/environment-options.ts
+++ b/packages/angular_devkit/build_angular/src/utils/environment-options.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 * as path from 'path';
 
 function isDisabled(variable: string): boolean {
@@ -79,6 +80,25 @@ export const cachingBasePath = (() => {
   return cacheVariable;
 })();
 
+// Persistent build cache
+const persistentBuildCacheVariable = process.env['NG_PERSISTENT_BUILD_CACHE'];
+export const persistentBuildCacheEnabled =
+  !cachingDisabled &&
+  isPresent(persistentBuildCacheVariable) &&
+  isEnabled(persistentBuildCacheVariable);
+
 // Build profiling
 const profilingVariable = process.env['NG_BUILD_PROFILING'];
 export const profilingEnabled = isPresent(profilingVariable) && isEnabled(profilingVariable);
+
+/**
+ * Some environments, like CircleCI which use Docker report a number of CPUs by the host and not the count of available.
+ * This cause `Error: Call retries were exceeded` errors when trying to use them.
+ *
+ * @see https://github.com/nodejs/node/issues/28762
+ * @see https://github.com/webpack-contrib/terser-webpack-plugin/issues/143
+ * @see https://ithub.com/angular/angular-cli/issues/16860#issuecomment-588828079
+ *
+ */
+const maxWorkersVariable = process.env['NG_BUILD_MAX_WORKERS'];
+export const maxWorkers = isPresent(maxWorkersVariable) ? +maxWorkersVariable : 4;
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 d99687c5fdf9..b5d15a1b3da7 100644
--- a/packages/angular_devkit/build_angular/src/utils/find-up.ts
+++ b/packages/angular_devkit/build_angular/src/utils/find-up.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 { existsSync } from 'fs';
 import * as path from 'path';
 import { isDirectory } from './is-directory';
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 ee1fb9e9e49d..f531af67ee91 100644
--- a/packages/angular_devkit/build_angular/src/utils/i18n-inlining.ts
+++ b/packages/angular_devkit/build_angular/src/utils/i18n-inlining.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 { BuilderContext } from '@angular-devkit/architect';
 import { EmittedFiles } from '@angular-devkit/build-webpack';
 import * as fs from 'fs';
@@ -22,7 +23,7 @@ function emittedFilesToInlineOptions(
   outputPath: string,
   es5: boolean,
   missingTranslation: 'error' | 'warning' | 'ignore' | undefined,
-): { options: InlineOptions[]; originalFiles: string[] }  {
+): { options: InlineOptions[]; originalFiles: string[] } {
   const options: InlineOptions[] = [];
   const originalFiles: string[] = [];
   for (const emittedFile of emittedFiles) {
@@ -107,7 +108,7 @@ export async function i18nInlineEmittedFiles(
           glob: '**/*',
           input: emittedPath,
           output: '',
-          ignore: [...processedFiles].map(f => path.relative(emittedPath, f)),
+          ignore: [...processedFiles].map((f) => path.relative(emittedPath, f)),
         },
       ],
       outputPaths,
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 2a803f8fdc66..f747ffae5fbc 100644
--- a/packages/angular_devkit/build_angular/src/utils/i18n-options.ts
+++ b/packages/angular_devkit/build_angular/src/utils/i18n-options.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
  */
+
 import { BuilderContext } from '@angular-devkit/architect';
 import { json } from '@angular-devkit/core';
 import * as fs from 'fs';
 import * as os from 'os';
 import * as path from 'path';
-import * as rimraf from 'rimraf';
 import { Schema as BrowserBuilderSchema } from '../browser/schema';
 import { Schema as ServerBuilderSchema } from '../server/schema';
 import { readTsconfig } from '../utils/read-tsconfig';
@@ -79,7 +79,10 @@ export function createI18nOptions(
   let rawSourceLocaleBaseHref;
   if (json.isJsonObject(metadata.sourceLocale)) {
     rawSourceLocale = metadata.sourceLocale.code;
-    if (metadata.sourceLocale.baseHref !== undefined && typeof metadata.sourceLocale.baseHref !== 'string') {
+    if (
+      metadata.sourceLocale.baseHref !== undefined &&
+      typeof metadata.sourceLocale.baseHref !== 'string'
+    ) {
       throw new Error('Project i18n sourceLocale baseHref field is malformed. Expected a string.');
     }
     rawSourceLocaleBaseHref = metadata.sourceLocale.baseHref;
@@ -132,7 +135,7 @@ export function createI18nOptions(
 
   if (inline === true) {
     i18n.inlineLocales.add(i18n.sourceLocale);
-    Object.keys(i18n.locales).forEach(locale => i18n.inlineLocales.add(locale));
+    Object.keys(i18n.locales).forEach((locale) => i18n.inlineLocales.add(locale));
   } else if (inline) {
     for (const locale of inline) {
       if (!i18n.locales[locale] && i18n.sourceLocale !== locale) {
@@ -175,7 +178,7 @@ export async function configureI18nBuild<T extends BrowserBuilderSchema | Server
     );
   }
 
-  // Load locale data and translations (if present)
+  // Load locale data and translations (if present)
   let loader;
   const usedFormats = new Set<string>();
   for (const [locale, desc] of Object.entries(i18n.locales)) {
@@ -216,9 +219,7 @@ export async function configureI18nBuild<T extends BrowserBuilderSchema | Server
 
       for (const diagnostics of loadResult.diagnostics.messages) {
         if (diagnostics.type === 'error') {
-          throw new Error(
-            `Error parsing translation file '${file.path}': ${diagnostics.message}`,
-          );
+          throw new Error(`Error parsing translation file '${file.path}': ${diagnostics.message}`);
         } else {
           context.logger.warn(`WARNING [${file.path}]: ${diagnostics.message}`);
         }
@@ -266,7 +267,7 @@ export async function configureI18nBuild<T extends BrowserBuilderSchema | Server
     // Remove temporary directory used for i18n processing
     process.on('exit', () => {
       try {
-        rimraf.sync(tempPath);
+        fs.rmdirSync(tempPath, { recursive: true, maxRetries: 3 });
       } catch {}
     });
   }
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 d27516c8c3af..77b3b1d3682a 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
@@ -56,8 +56,16 @@ export interface FileInfo {
  */
 export async function augmentIndexHtml(params: AugmentIndexHtmlOptions): Promise<string> {
   const {
-    loadOutputFile, files, noModuleFiles = [], moduleFiles = [], entrypoints,
-    sri, deployUrl = '', lang, baseHref, html,
+    loadOutputFile,
+    files,
+    noModuleFiles = [],
+    moduleFiles = [],
+    entrypoints,
+    sri,
+    deployUrl = '',
+    lang,
+    baseHref,
+    html,
   } = params;
 
   let { crossOrigin = 'none' } = params;
@@ -126,10 +134,7 @@ export async function augmentIndexHtml(params: AugmentIndexHtmlOptions): Promise
 
   let linkTags: string[] = [];
   for (const stylesheet of stylesheets) {
-    const attrs = [
-      `rel="stylesheet"`,
-      `href="${deployUrl}${stylesheet}"`,
-    ];
+    const attrs = [`rel="stylesheet"`, `href="${deployUrl}${stylesheet}"`];
 
     if (crossOrigin !== 'none') {
       attrs.push(`crossorigin="${crossOrigin}"`);
@@ -147,7 +152,7 @@ export async function augmentIndexHtml(params: AugmentIndexHtmlOptions): Promise
   const baseTagExists = html.includes('<base');
 
   rewriter
-    .on('startTag', tag => {
+    .on('startTag', (tag) => {
       switch (tag.tagName) {
         case 'html':
           // Adjust document locale if specified
@@ -174,7 +179,7 @@ export async function augmentIndexHtml(params: AugmentIndexHtmlOptions): Promise
 
       rewriter.emitStartTag(tag);
     })
-    .on('endTag', tag => {
+    .on('endTag', (tag) => {
       switch (tag.tagName) {
         case 'head':
           for (const linkTag of linkTags) {
@@ -208,15 +213,17 @@ export async function augmentIndexHtml(params: AugmentIndexHtmlOptions): Promise
 
 function generateSriAttributes(content: string): string {
   const algo = 'sha384';
-  const hash = createHash(algo)
-    .update(content, 'utf8')
-    .digest('base64');
+  const hash = createHash(algo).update(content, 'utf8').digest('base64');
 
   return `integrity="${algo}-${hash}"`;
 }
 
-function updateAttribute(tag: { attrs: { name: string, value: string }[] }, name: string, value: string): void {
-  const index = tag.attrs.findIndex(a => a.name === name);
+function updateAttribute(
+  tag: { attrs: { name: string; value: string }[] },
+  name: string,
+  value: string,
+): void {
+  const index = tag.attrs.findIndex((a) => a.name === name);
   const newValue = { name, value };
 
   if (index === -1) {
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 0324d56f8e2e..5a6ad78914e9 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,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 { AugmentIndexHtmlOptions, FileInfo, augmentIndexHtml } from './augment-index-html';
 
@@ -110,31 +111,29 @@ describe('augment-index-html', () => {
     `);
   });
 
-  it(
-    `should not add 'module' and 'non-module' attr to js files which are in both module formats`,
-    async () => {
-      const es2017JsFiles: FileInfo[] = [
-        { file: 'scripts.js', extension: '.js', name: 'scripts' },
-        { file: 'main-es2017.js', extension: '.js', name: 'main' },
-      ];
-
-      const es5JsFiles: FileInfo[] = [
-        { file: 'scripts.js', extension: '.js', name: 'scripts' },
-        { file: 'main-es5.js', extension: '.js', name: 'main' },
-      ];
-
-      const source = augmentIndexHtml({
-        ...indexGeneratorOptions,
-        files: [
-          { file: 'styles.css', extension: '.css', name: 'styles' },
-          { file: 'styles.css', extension: '.css', name: 'styles' },
-        ],
-        moduleFiles: es2017JsFiles,
-        noModuleFiles: es5JsFiles,
-      });
-
-      const html = await source;
-      expect(html).toEqual(oneLineHtml`
+  it(`should not add 'module' and 'non-module' attr to js files which are in both module formats`, async () => {
+    const es2017JsFiles: FileInfo[] = [
+      { file: 'scripts.js', extension: '.js', name: 'scripts' },
+      { file: 'main-es2017.js', extension: '.js', name: 'main' },
+    ];
+
+    const es5JsFiles: FileInfo[] = [
+      { file: 'scripts.js', extension: '.js', name: 'scripts' },
+      { file: 'main-es5.js', extension: '.js', name: 'main' },
+    ];
+
+    const source = augmentIndexHtml({
+      ...indexGeneratorOptions,
+      files: [
+        { file: 'styles.css', extension: '.css', name: 'styles' },
+        { file: 'styles.css', extension: '.css', name: 'styles' },
+      ],
+      moduleFiles: es2017JsFiles,
+      noModuleFiles: es5JsFiles,
+    });
+
+    const html = await source;
+    expect(html).toEqual(oneLineHtml`
       <html>
         <head>
           <base href="/">
@@ -147,7 +146,7 @@ describe('augment-index-html', () => {
         </body>
       </html>
     `);
-    });
+  });
 
   it('should add lang attribute', async () => {
     const source = augmentIndexHtml({
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 e9c910019ef8..679b238a8ec7 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
@@ -9,15 +9,15 @@
 import { Readable, Writable } from 'stream';
 
 export async function htmlRewritingStream(content: string): Promise<{
-  rewriter: import('parse5-html-rewriting-stream'),
-  transformedContent: Promise<string>,
+  rewriter: import('parse5-html-rewriting-stream');
+  transformedContent: Promise<string>;
 }> {
   const chunks: Buffer[] = [];
-  const rewriter = new (await import('parse5-html-rewriting-stream'))();
+  const rewriter = new (await import('parse5-html-rewriting-stream')).default();
 
   return {
     rewriter,
-    transformedContent: new Promise(resolve => {
+    transformedContent: new Promise((resolve) => {
       new Readable({
         encoding: 'utf8',
         read(): void {
@@ -25,17 +25,21 @@ export async function htmlRewritingStream(content: string): Promise<{
           this.push(null);
         },
       })
-      .pipe(rewriter)
-      .pipe(new Writable({
-        write(chunk: string | Buffer, encoding: string | undefined, callback: Function): void {
-          chunks.push(typeof chunk === 'string' ? Buffer.from(chunk, encoding as BufferEncoding) : chunk);
-          callback();
-        },
-        final(callback: (error?: Error) => void): void {
-          callback();
-          resolve(Buffer.concat(chunks).toString());
-        },
-      }));
+        .pipe(rewriter)
+        .pipe(
+          new Writable({
+            write(chunk: string | Buffer, encoding: string | undefined, callback: Function): void {
+              chunks.push(
+                typeof chunk === 'string' ? Buffer.from(chunk, encoding as BufferEncoding) : chunk,
+              );
+              callback();
+            },
+            final(callback: (error?: Error) => void): void {
+              callback();
+              resolve(Buffer.concat(chunks).toString());
+            },
+          }),
+        );
     }),
   };
 }
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
index 299789721bbb..bc0330e5e17e 100644
--- 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
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use 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,10 @@ import { CrossOriginValue, FileInfo, augmentIndexHtml } from './augment-index-ht
 import { InlineCriticalCssProcessor } from './inline-critical-css';
 import { InlineFontsProcessor } from './inline-fonts';
 
-type IndexHtmlGeneratorPlugin = (html: string, options: IndexHtmlGeneratorProcessOptions) => Promise<string | IndexHtmlTransformResult>;
+type IndexHtmlGeneratorPlugin = (
+  html: string,
+  options: IndexHtmlGeneratorProcessOptions,
+) => Promise<string | IndexHtmlTransformResult>;
 
 export interface IndexHtmlGeneratorProcessOptions {
   lang: string | undefined;
@@ -57,11 +60,7 @@ export class IndexHtmlGenerator {
       extraPlugins.push(inlineCriticalCssPlugin(this));
     }
 
-    this.plugins = [
-      augmentIndexHtmlPlugin(this),
-      ...extraPlugins,
-      postTransformPlugin(this),
-    ];
+    this.plugins = [augmentIndexHtmlPlugin(this), ...extraPlugins, postTransformPlugin(this)];
   }
 
   async process(options: IndexHtmlGeneratorProcessOptions): Promise<IndexHtmlTransformResult> {
@@ -103,22 +102,10 @@ export class IndexHtmlGenerator {
 }
 
 function augmentIndexHtmlPlugin(generator: IndexHtmlGenerator): IndexHtmlGeneratorPlugin {
-  const {
-    deployUrl,
-    crossOrigin,
-    sri = false,
-    entrypoints,
-  } = generator.options;
+  const { deployUrl, crossOrigin, sri = false, entrypoints } = generator.options;
 
   return async (html, options) => {
-    const {
-      lang,
-      baseHref,
-      outputPath = '',
-      noModuleFiles,
-      files,
-      moduleFiles,
-    } = options;
+    const { lang, baseHref, outputPath = '', noModuleFiles, files, moduleFiles } = options;
 
     return augmentIndexHtml({
       html,
@@ -128,7 +115,7 @@ function augmentIndexHtmlPlugin(generator: IndexHtmlGenerator): IndexHtmlGenerat
       sri,
       lang,
       entrypoints,
-      loadOutputFile: filePath => generator.readAsset(join(outputPath, filePath)),
+      loadOutputFile: (filePath) => generator.readAsset(join(outputPath, filePath)),
       noModuleFiles,
       moduleFiles,
       files,
@@ -142,20 +129,20 @@ function inlineFontsPlugin({ options }: IndexHtmlGenerator): IndexHtmlGeneratorP
     WOFFSupportNeeded: options.WOFFSupportNeeded,
   });
 
-  return async html => inlineFontsProcessor.process(html);
+  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),
+    readAsset: (filePath) => generator.readAsset(filePath),
   });
 
-  return async (html, options) => inlineCriticalCssProcessor.process(html, { outputPath: options.outputPath });
+  return async (html, options) =>
+    inlineCriticalCssProcessor.process(html, { outputPath: options.outputPath });
 }
 
 function postTransformPlugin({ options }: IndexHtmlGenerator): IndexHtmlGeneratorPlugin {
-  return async html => options.postTransform ? options.postTransform(html) : html;
+  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
index dd835688bc35..e53e951d8d93 100644
--- 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
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
@@ -24,12 +24,15 @@ class CrittersExtended extends Critters {
   readonly warnings: string[] = [];
   readonly errors: string[] = [];
 
-  constructor(private readonly optionsExtended: InlineCriticalCssProcessorOptions & InlineCriticalCssProcessOptions) {
+  constructor(
+    private readonly optionsExtended: InlineCriticalCssProcessorOptions &
+      InlineCriticalCssProcessOptions,
+  ) {
     super({
       logger: {
         warn: (s: string) => this.warnings.push(s),
         error: (s: string) => this.errors.push(s),
-        info: () => { },
+        info: () => {},
       },
       logLevel: 'warn',
       path: optionsExtended.outputPath,
@@ -44,7 +47,7 @@ class CrittersExtended extends Critters {
     });
   }
 
-  protected readFile(path: string): Promise<string> {
+  public override readFile(path: string): Promise<string> {
     const readAsset = this.optionsExtended.readAsset;
 
     return readAsset ? readAsset(path) : fs.promises.readFile(path, 'utf-8');
@@ -52,10 +55,12 @@ class CrittersExtended extends Critters {
 }
 
 export class InlineCriticalCssProcessor {
-  constructor(protected readonly options: InlineCriticalCssProcessorOptions) { }
+  constructor(protected readonly options: InlineCriticalCssProcessorOptions) {}
 
-  async process(html: string, options: InlineCriticalCssProcessOptions)
-    : Promise<{ content: string, warnings: string[], errors: string[] }> {
+  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);
 
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
index dd29f5da3019..1af80e8dc847 100644
--- 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
@@ -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 { InlineCriticalCssProcessor } from './inline-critical-css';
 
@@ -49,18 +50,18 @@ describe('InlineCriticalCssProcessor', () => {
       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(
+      `<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>
-      `);
+    <style>
+    body { margin: 0; }
+    html { color: white; }
+    </style>`);
   });
 
   it('should inline critical css when using deployUrl', async () => {
@@ -73,17 +74,17 @@ describe('InlineCriticalCssProcessor', () => {
       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(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>
-      `);
+    <style>
+    body { margin: 0; }
+    html { color: white; }
+    </style>`);
   });
 
   it('should compress inline critical css when minify is enabled', async () => {
@@ -96,8 +97,12 @@ describe('InlineCriticalCssProcessor', () => {
       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>');
+    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 e927dd2d0322..15c5e40e5958 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,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use 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,13 +9,15 @@
 import * as cacache from 'cacache';
 import * as fs from 'fs';
 import * as https from 'https';
-import * as proxyAgent from 'https-proxy-agent';
+import proxyAgent from 'https-proxy-agent';
 import { URL } from 'url';
 import { findCachePath } from '../cache-path';
 import { cachingDisabled } from '../environment-options';
 import { htmlRewritingStream } from './html-rewriting-stream';
 
-const cacheFontsPath: string | undefined = cachingDisabled ? undefined : findCachePath('angular-build-fonts');
+const cacheFontsPath: string | undefined = cachingDisabled
+  ? undefined
+  : findCachePath('angular-build-fonts');
 const packageVersion = require('../../../package.json').version;
 
 const enum UserAgent {
@@ -23,68 +25,135 @@ const enum UserAgent {
   IE = 'Mozilla/5.0 (Windows NT 10.0; Trident/7.0; rv:11. 0) like Gecko',
 }
 
-const SUPPORTED_PROVIDERS = [
-  'fonts.googleapis.com',
-];
+interface FontProviderDetails {
+  preconnectUrl: string;
+  seperateRequestForWOFF: boolean;
+}
 
 export interface InlineFontsOptions {
   minify?: boolean;
   WOFFSupportNeeded: boolean;
 }
 
-export class InlineFontsProcessor {
+const SUPPORTED_PROVIDERS: Record<string, FontProviderDetails> = {
+  'fonts.googleapis.com': {
+    seperateRequestForWOFF: true,
+    preconnectUrl: 'https://fonts.gstatic.com',
+  },
+  'use.typekit.net': {
+    seperateRequestForWOFF: false,
+    preconnectUrl: 'https://use.typekit.net',
+  },
+};
 
-  constructor(private options: InlineFontsOptions) { }
+export class InlineFontsProcessor {
+  constructor(private options: InlineFontsOptions) {}
 
   async process(content: string): Promise<string> {
     const hrefList: string[] = [];
+    const existingPreconnect = new Set<string>();
 
     // Collector link tags with href
     const { rewriter: collectorStream } = await htmlRewritingStream(content);
 
-    collectorStream.on('startTag', tag => {
+    collectorStream.on('startTag', (tag) => {
       const { tagName, attrs } = tag;
 
       if (tagName !== 'link') {
         return;
       }
 
-      // <link tag with rel="stylesheet" and a href.
-      const href = attrs.find(({ name, value }) => name === 'rel' && value === 'stylesheet')
-        && attrs.find(({ name }) => name === 'href')?.value;
+      let hrefValue: string | undefined;
+      let relValue: string | undefined;
+      for (const { name, value } of attrs) {
+        switch (name) {
+          case 'rel':
+            relValue = value;
+            break;
+
+          case 'href':
+            hrefValue = value;
+            break;
+        }
+
+        if (hrefValue && relValue) {
+          switch (relValue) {
+            case 'stylesheet':
+              // <link rel="stylesheet" href="https://example.com/main.css">
+              hrefList.push(hrefValue);
+              break;
+
+            case 'preconnect':
+              // <link rel="preconnect" href="https://example.com">
+              existingPreconnect.add(hrefValue.replace(/\/$/, ''));
+              break;
+          }
 
-      if (href) {
-        hrefList.push(href);
+          return;
+        }
       }
     });
 
-    await new Promise(resolve => collectorStream.on('finish', resolve));
+    await new Promise((resolve) => collectorStream.on('finish', resolve));
 
     // Download stylesheets
-    const hrefsContent = await this.processHrefs(hrefList);
+    const hrefsContent = new Map<string, string>();
+    const newPreconnectUrls = new Set<string>();
+
+    for (const hrefItem of hrefList) {
+      const url = this.createNormalizedUrl(hrefItem);
+      if (!url) {
+        continue;
+      }
+
+      const content = await this.processHref(url);
+      if (content === undefined) {
+        continue;
+      }
+
+      hrefsContent.set(hrefItem, content);
+
+      // Add preconnect
+      const preconnectUrl = this.getFontProviderDetails(url)?.preconnectUrl;
+      if (preconnectUrl && !existingPreconnect.has(preconnectUrl)) {
+        newPreconnectUrls.add(preconnectUrl);
+      }
+    }
+
     if (hrefsContent.size === 0) {
       return content;
     }
 
     // Replace link with style tag.
     const { rewriter, transformedContent } = await htmlRewritingStream(content);
-    rewriter.on('startTag', tag => {
+    rewriter.on('startTag', (tag) => {
       const { tagName, attrs } = tag;
 
-      if (tagName !== 'link') {
-        rewriter.emitStartTag(tag);
+      switch (tagName) {
+        case 'head':
+          rewriter.emitStartTag(tag);
+          for (const url of newPreconnectUrls) {
+            rewriter.emitRaw(`<link rel="preconnect" href="${url}" crossorigin>`);
+          }
+          break;
+
+        case 'link':
+          const hrefAttr =
+            attrs.some(({ name, value }) => name === 'rel' && value === 'stylesheet') &&
+            attrs.find(({ name, value }) => name === 'href' && hrefsContent.has(value));
+          if (hrefAttr) {
+            const href = hrefAttr.value;
+            const cssContent = hrefsContent.get(href);
+            rewriter.emitRaw(`<style type="text/css">${cssContent}</style>`);
+          } else {
+            rewriter.emitStartTag(tag);
+          }
+          break;
 
-        return;
-      }
+        default:
+          rewriter.emitStartTag(tag);
 
-      const hrefAttr = attrs.some(({ name, value }) => name === 'rel' && value === 'stylesheet')
-        && attrs.find(({ name, value }) => name === 'href' && hrefsContent.has(value));
-      if (hrefAttr) {
-        const href = hrefAttr.value;
-        const cssContent = hrefsContent.get(href);
-        rewriter.emitRaw(`<style type="text/css">${cssContent}</style>`);
-      } else {
-        rewriter.emitStartTag(tag);
+          break;
       }
     });
 
@@ -110,32 +179,38 @@ export class InlineFontsProcessor {
 
     const data = await new Promise<string>((resolve, reject) => {
       let rawResponse = '';
-      https.get(
-        url,
-        {
-          agent,
-          rejectUnauthorized: false,
-          headers: {
-            'user-agent': userAgent,
+      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(new Error(
-            `Inlining of fonts failed. An error has occurred while retrieving ${url} over the internet.\n` +
-            e.message,
-          )));
+          (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(
+            new Error(
+              `Inlining of fonts failed. An error has occurred while retrieving ${url} over the internet.\n` +
+                e.message,
+            ),
+          ),
+        );
     });
 
     if (cacheFontsPath) {
@@ -145,47 +220,50 @@ export class InlineFontsProcessor {
     return data;
   }
 
-  private async processHrefs(hrefList: string[]): Promise<Map<string, string>> {
-    const hrefsContent = new Map<string, string>();
+  private async processHref(url: URL): Promise<string | undefined> {
+    const provider = this.getFontProviderDetails(url);
+    if (!provider) {
+      return undefined;
+    }
 
-    for (const hrefPath of hrefList) {
-      // Need to convert '//' to 'https://' because the URL parser will fail with '//'.
-      const normalizedHref = hrefPath.startsWith('//') ? `https:${hrefPath}` : hrefPath;
-      if (!normalizedHref.startsWith('http')) {
-        // Non valid URL.
-        // Example: relative path styles.css.
-        continue;
-      }
+    // The order IE -> Chrome is important as otherwise Chrome will load woff1.
+    let cssContent = '';
+    if (this.options.WOFFSupportNeeded && provider.seperateRequestForWOFF) {
+      cssContent += await this.getResponse(url, UserAgent.IE);
+    }
 
-      const url = new URL(normalizedHref);
-      // Force HTTPS protocol
-      url.protocol = 'https:';
+    cssContent += await this.getResponse(url, UserAgent.Chrome);
 
-      if (!SUPPORTED_PROVIDERS.includes(url.hostname)) {
-        // Provider not supported.
-        continue;
-      }
+    if (this.options.minify) {
+      cssContent = cssContent
+        // Comments.
+        .replace(/\/\*([\s\S]*?)\*\//g, '')
+        // New lines.
+        .replace(/\n/g, '')
+        // Safe spaces.
+        .replace(/\s?[\{\:\;]\s+/g, (s) => s.trim());
+    }
 
-      // The order IE -> Chrome is important as otherwise Chrome will load woff1.
-      let cssContent = '';
-      if (this.options.WOFFSupportNeeded) {
-        cssContent += await this.getResponse(url, UserAgent.IE);
-      }
-      cssContent += await this.getResponse(url, UserAgent.Chrome);
-
-      if (this.options.minify) {
-        cssContent = cssContent
-          // Comments.
-          .replace(/\/\*([\s\S]*?)\*\//g, '')
-          // New lines.
-          .replace(/\n/g, '')
-          // Safe spaces.
-          .replace(/\s?[\{\:\;]\s+/g, s => s.trim());
-      }
+    return cssContent;
+  }
+
+  private getFontProviderDetails(url: URL): FontProviderDetails | undefined {
+    return SUPPORTED_PROVIDERS[url.hostname];
+  }
 
-      hrefsContent.set(hrefPath, cssContent);
+  private createNormalizedUrl(value: string): URL | undefined {
+    // Need to convert '//' to 'https://' because the URL parser will fail with '//'.
+    const normalizedHref = value.startsWith('//') ? `https:${value}` : value;
+    if (!normalizedHref.startsWith('http')) {
+      // Non valid URL.
+      // Example: relative path styles.css.
+      return undefined;
     }
 
-    return hrefsContent;
+    const url = new URL(normalizedHref);
+    // Force HTTPS protocol
+    url.protocol = 'https:';
+
+    return url;
   }
 }
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 506c69fbc229..46a7db401c4d 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,14 +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 { InlineFontsProcessor } from './inline-fonts';
 
 describe('InlineFontsProcessor', () => {
-  const content = `
+  describe('Google fonts', () => {
+    const content = `
   <html>
     <head>
       <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
@@ -16,13 +18,23 @@ describe('InlineFontsProcessor', () => {
     <body></body>
   </html>`;
 
-  it('should inline supported fonts and icons in HTML', async () => {
-    const inlineFontsProcessor = new InlineFontsProcessor({
-      minify: false,
-      WOFFSupportNeeded: false,
+    it('works with // protocol', async () => {
+      const inlineFontsProcessor = new InlineFontsProcessor({
+        WOFFSupportNeeded: false,
+        minify: false,
+      });
+
+      const html = await inlineFontsProcessor.process(content.replace('https://', '//'));
+      expect(html).toContain(`format('woff2');`);
     });
 
-    const html = await inlineFontsProcessor.process(`
+    it('should inline supported fonts and icons in HTML', async () => {
+      const inlineFontsProcessor = new InlineFontsProcessor({
+        minify: false,
+        WOFFSupportNeeded: false,
+      });
+
+      const html = await inlineFontsProcessor.process(`
       <html>
       <head>
         <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
@@ -32,20 +44,22 @@ describe('InlineFontsProcessor', () => {
       <body></body>
     </html>`);
 
-    expect(html).not.toContain('href="https://fonts.googleapis.com/css?family=Roboto:300,400,500"');
-    expect(html).not.toContain('href="https://fonts.googleapis.com/icon?family=Material+Icons"');
-    expect(html).toContain('href="theme.css"');
-    expect(html).toContain(`font-family: 'Roboto'`);
-    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,
+      expect(html).not.toContain(
+        'href="https://fonts.googleapis.com/css?family=Roboto:300,400,500"',
+      );
+      expect(html).not.toContain('href="https://fonts.googleapis.com/icon?family=Material+Icons"');
+      expect(html).toContain('href="theme.css"');
+      expect(html).toContain(`font-family: 'Roboto'`);
+      expect(html).toContain(`font-family: 'Material Icons'`);
     });
 
-    const html = await inlineFontsProcessor.process(`
+    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">
@@ -54,53 +68,86 @@ describe('InlineFontsProcessor', () => {
       <body></body>
     </html>`);
 
-    expect(html).toContain(`'Google Sans'`);
-    expect(html).toContain(`'Roboto'`);
-    expect(html).toContain(`'Roboto Mono'`);
-    expect(html).toContain(`'Material Icons'`);
-  });
+      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,
+        minify: false,
+      });
 
-  it('works with http protocol', async () => {
-    const inlineFontsProcessor = new InlineFontsProcessor({
-      WOFFSupportNeeded: false,
-      minify: false,
+      const html = await inlineFontsProcessor.process(content.replace('https://', 'http://'));
+      expect(html).toContain(`format('woff2');`);
     });
 
-    const html = await inlineFontsProcessor
-      .process(content.replace('https://', 'http://'));
-    expect(html).toContain(`format('woff2');`);
-  });
+    it('should include WOFF1 definitions when `WOFF1SupportNeeded` is true', async () => {
+      const inlineFontsProcessor = new InlineFontsProcessor({
+        WOFFSupportNeeded: true,
+        minify: false,
+      });
 
-  it('works with // protocol', async () => {
-    const inlineFontsProcessor = new InlineFontsProcessor({
-      WOFFSupportNeeded: false,
-      minify: false,
+      const html = await inlineFontsProcessor.process(content);
+      expect(html).toContain(`format('woff2');`);
+      expect(html).toContain(`format('woff');`);
     });
 
-    const html = await inlineFontsProcessor
-      .process(content.replace('https://', '//'));
-    expect(html).toContain(`format('woff2');`);
-  });
+    it('should remove comments and line breaks when `minifyInlinedCSS` is true', async () => {
+      const inlineFontsProcessor = new InlineFontsProcessor({
+        WOFFSupportNeeded: false,
+        minify: true,
+      });
 
-  it('should include WOFF1 definitions when `WOFF1SupportNeeded` is true', async () => {
-    const inlineFontsProcessor = new InlineFontsProcessor({
-      WOFFSupportNeeded: true,
-      minify: false,
+      const html = await inlineFontsProcessor.process(content);
+      expect(html).not.toContain('/*');
+      expect(html).toContain(';font-style:normal;');
     });
 
-    const html = await inlineFontsProcessor.process(content);
-    expect(html).toContain(`format('woff2');`);
-    expect(html).toContain(`format('woff');`);
+    it('should add preconnect hint', async () => {
+      const inlineFontsProcessor = new InlineFontsProcessor({
+        WOFFSupportNeeded: true,
+        minify: false,
+      });
+
+      const html = await inlineFontsProcessor.process(content);
+      expect(html).toContain(
+        `<link rel="preconnect" href="https://fonts.gstatic.com" crossorigin>`,
+      );
+    });
   });
 
-  it('should remove comments and line breaks when `minifyInlinedCSS` is true', async () => {
-    const inlineFontsProcessor = new InlineFontsProcessor({
-      WOFFSupportNeeded: false,
-      minify: true,
+  describe('Adobe Typekit fonts', () => {
+    const content = `
+  <html>
+    <head>
+      <link href="https://use.typekit.net/plm1izr.css" rel="stylesheet">
+    </head>
+    <body></body>
+  </html>`;
+
+    it('should include WOFF1 definitions when `WOFF1SupportNeeded` is true', async () => {
+      const inlineFontsProcessor = new InlineFontsProcessor({
+        WOFFSupportNeeded: true,
+        minify: false,
+      });
+
+      const html = await inlineFontsProcessor.process(content);
+      expect(html).not.toContain('href="https://use.typekit.net/plm1izr.css"');
+      expect(html).toContain(`format("woff2")`);
+      expect(html).toContain(`format("woff")`);
     });
 
-    const html = await inlineFontsProcessor.process(content);
-    expect(html).not.toContain('/*');
-    expect(html).toContain(';font-style:normal;');
+    it('should add preconnect hint', async () => {
+      const inlineFontsProcessor = new InlineFontsProcessor({
+        WOFFSupportNeeded: true,
+        minify: false,
+      });
+
+      const html = await inlineFontsProcessor.process(content);
+      expect(html).toContain(`<link rel="preconnect" href="https://use.typekit.net" crossorigin>`);
+    });
   });
 });
diff --git a/packages/angular_devkit/build_angular/src/utils/index.ts b/packages/angular_devkit/build_angular/src/utils/index.ts
index 47bdbc914ce9..8e5b242fb8ed 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
@@ -16,4 +16,3 @@ export * from './normalize-source-maps';
 export * from './normalize-optimization';
 export * from './normalize-builder-schema';
 export * from './url';
-export * from './workers';
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..a048f3896060 100644
--- a/packages/angular_devkit/build_angular/src/utils/is-directory.ts
+++ b/packages/angular_devkit/build_angular/src/utils/is-directory.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
  */
-// tslint:disable
+
 // TODO: cleanup this file, it's copied as is from Angular CLI.
 
 import * as fs from 'fs';
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 ac78333e0c27..606c2dd0c97a 100644
--- a/packages/angular_devkit/build_angular/src/utils/load-translations.ts
+++ b/packages/angular_devkit/build_angular/src/utils/load-translations.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 { createHash } from 'crypto';
 import * as fs from 'fs';
 
@@ -47,7 +48,7 @@ export async function createTranslationLoader(): Promise<TranslationLoader> {
   };
 
   // TODO: `parser.canParse()` is deprecated; remove this polyfill once we are sure all parsers provide the `parser.analyze()` method.
-  // tslint:disable-next-line: no-any
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   function analyze(parser: any, path: string, content: string) {
     if (parser.analyze !== undefined) {
       return parser.analyze(path, content);
@@ -61,32 +62,36 @@ export async function createTranslationLoader(): Promise<TranslationLoader> {
 
 async function importParsers() {
   try {
-
     const localizeDiag = await import('@angular/localize/src/tools/src/diagnostics');
     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'
-      )).SimpleJsonTranslationParser(),
-      xlf: new (await import(
-        // tslint:disable-next-line:trailing-comma
-        '@angular/localize/src/tools/src/translate/translation_files/translation_parsers/xliff1_translation_parser'
-      )).Xliff1TranslationParser(),
-      xlf2: new (await import(
-        // tslint:disable-next-line:trailing-comma
-        '@angular/localize/src/tools/src/translate/translation_files/translation_parsers/xliff2_translation_parser'
-      )).Xliff2TranslationParser(),
+      arb: new (
+        await import(
+          '@angular/localize/src/tools/src/translate/translation_files/translation_parsers/arb_translation_parser'
+        )
+      ).ArbTranslationParser(),
+      json: new (
+        await import(
+          '@angular/localize/src/tools/src/translate/translation_files/translation_parsers/simple_json_translation_parser'
+        )
+      ).SimpleJsonTranslationParser(),
+      xlf: new (
+        await import(
+          '@angular/localize/src/tools/src/translate/translation_files/translation_parsers/xliff1_translation_parser'
+        )
+      ).Xliff1TranslationParser(),
+      xlf2: new (
+        await import(
+          '@angular/localize/src/tools/src/translate/translation_files/translation_parsers/xliff2_translation_parser'
+        )
+      ).Xliff2TranslationParser(),
       // The name ('xmb') needs to match the AOT compiler option
-      xmb: new (await import(
-        // tslint:disable-next-line:trailing-comma
-        '@angular/localize/src/tools/src/translate/translation_files/translation_parsers/xtb_translation_parser'
-      )).XtbTranslationParser(),
+      xmb: new (
+        await import(
+          '@angular/localize/src/tools/src/translate/translation_files/translation_parsers/xtb_translation_parser'
+        )
+      ).XtbTranslationParser(),
     };
 
     return { parsers, diagnostics };
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 da17ac8d3568..1dec35c2f0d1 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,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 {
   BaseException,
   Path,
@@ -19,7 +20,6 @@ import {
 import { statSync } from 'fs';
 import { AssetPattern, AssetPatternClass } from '../browser/schema';
 
-
 export class MissingAssetSourceRootException extends BaseException {
   constructor(path: String) {
     super(`The ${path} asset path must start with the project source root.`);
@@ -40,47 +40,46 @@ export function normalizeAssetPatterns(
     return [];
   }
 
-  return assetPatterns
-    .map(assetPattern => {
-      // Normalize string asset patterns to objects.
-      if (typeof assetPattern === 'string') {
-        const assetPath = normalize(assetPattern);
-        const resolvedAssetPath = resolve(root, assetPath);
-
-        // Check if the string asset is within sourceRoot.
-        if (!resolvedAssetPath.startsWith(resolvedSourceRoot)) {
-          throw new MissingAssetSourceRootException(assetPattern);
-        }
-
-        let glob: string, input: Path, output: Path;
-        let isDirectory = false;
+  return assetPatterns.map((assetPattern) => {
+    // Normalize string asset patterns to objects.
+    if (typeof assetPattern === 'string') {
+      const assetPath = normalize(assetPattern);
+      const resolvedAssetPath = resolve(root, assetPath);
 
-        try {
-          isDirectory = statSync(getSystemPath(resolvedAssetPath)).isDirectory();
-        } catch {
-          isDirectory = true;
-        }
+      // Check if the string asset is within sourceRoot.
+      if (!resolvedAssetPath.startsWith(resolvedSourceRoot)) {
+        throw new MissingAssetSourceRootException(assetPattern);
+      }
 
-        if (isDirectory) {
-          // Folders get a recursive star glob.
-          glob = '**/*';
-          // Input directory is their original path.
-          input = assetPath;
-        } else {
-          // Files are their own glob.
-          glob = basename(assetPath);
-          // Input directory is their original dirname.
-          input = dirname(assetPath);
-        }
+      let glob: string, input: Path;
+      let isDirectory = false;
 
-        // Output directory for both is the relative path from source root to input.
-        output = relative(resolvedSourceRoot, resolve(root, input));
+      try {
+        isDirectory = statSync(getSystemPath(resolvedAssetPath)).isDirectory();
+      } catch {
+        isDirectory = true;
+      }
 
-        // Return the asset pattern in object format.
-        return { glob, input, output };
+      if (isDirectory) {
+        // Folders get a recursive star glob.
+        glob = '**/*';
+        // Input directory is their original path.
+        input = assetPath;
       } else {
-        // It's already an AssetPatternObject, no need to convert.
-        return assetPattern;
+        // Files are their own glob.
+        glob = basename(assetPath);
+        // Input directory is their original dirname.
+        input = dirname(assetPath);
       }
-    });
+
+      // Output directory for both is the relative path from source root to input.
+      const output = relative(resolvedSourceRoot, resolve(root, input));
+
+      // Return the asset pattern in object format.
+      return { glob, input, output };
+    } else {
+      // It's already an AssetPatternObject, no need to convert.
+      return assetPattern;
+    }
+  });
 }
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 5fe6d10b7e3d..d1f77a2cf8bc 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,13 +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 { Path } from '@angular-devkit/core';
 import {
   AssetPatternClass,
@@ -23,16 +21,16 @@ import {
 import { NormalizedOptimizationOptions, normalizeOptimization } from './normalize-optimization';
 import { normalizeSourceMaps } from './normalize-source-maps';
 
-
 /**
  * A normalized browser builder schema.
  */
-export type NormalizedBrowserBuilderSchema = BrowserBuilderSchema & BuildOptions & {
-  sourceMap: SourceMapClass;
-  assets: AssetPatternClass[];
-  fileReplacements: NormalizedFileReplacement[];
-  optimization: NormalizedOptimizationOptions;
-};
+export type NormalizedBrowserBuilderSchema = BrowserBuilderSchema &
+  BuildOptions & {
+    sourceMap: SourceMapClass;
+    assets: AssetPatternClass[];
+    fileReplacements: NormalizedFileReplacement[];
+    optimization: NormalizedOptimizationOptions;
+  };
 
 export function normalizeBrowserSchema(
   root: Path,
@@ -48,16 +46,17 @@ export function normalizeBrowserSchema(
     fileReplacements: normalizeFileReplacements(options.fileReplacements || [], root),
     optimization: normalizeOptimization(options.optimization),
     sourceMap: normalizedSourceMapOptions,
-    preserveSymlinks: options.preserveSymlinks === undefined ? process.execArgv.includes('--preserve-symlinks') : options.preserveSymlinks,
+    preserveSymlinks:
+      options.preserveSymlinks === undefined
+        ? process.execArgv.includes('--preserve-symlinks')
+        : options.preserveSymlinks,
     statsJson: options.statsJson || false,
-    forkTypeChecker: options.forkTypeChecker || false,
     budgets: options.budgets || [],
     scripts: options.scripts || [],
     styles: options.styles || [],
     stylePreprocessorOptions: {
-      includePaths: options.stylePreprocessorOptions
-        && options.stylePreprocessorOptions.includePaths
-        || [],
+      includePaths:
+        (options.stylePreprocessorOptions && options.stylePreprocessorOptions.includePaths) || [],
     },
     // 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
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 27d80d7491aa..33f5b7878722 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,22 +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 {
-  BaseException,
-  Path,
-  getSystemPath,
-  join,
-  normalize,
-} from '@angular-devkit/core';
+import { BaseException, Path, getSystemPath, join, normalize } from '@angular-devkit/core';
 import { existsSync } from 'fs';
 import { FileReplacement } from '../browser/schema';
 
-
 export class MissingFileReplacementException extends BaseException {
   constructor(path: String) {
     super(`The ${path} path in file replacements does not exist.`);
@@ -36,8 +29,9 @@ export function normalizeFileReplacements(
     return [];
   }
 
-  const normalizedReplacement = fileReplacements
-    .map(replacement => normalizeFileReplacement(replacement, root));
+  const normalizedReplacement = fileReplacements.map((replacement) =>
+    normalizeFileReplacement(replacement, root),
+  );
 
   for (const { replace, with: replacementWith } of normalizedReplacement) {
     if (!existsSync(getSystemPath(replacementWith))) {
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 6946a3039f1a..2118085dc359 100644
--- a/packages/angular_devkit/build_angular/src/utils/normalize-optimization.ts
+++ b/packages/angular_devkit/build_angular/src/utils/normalize-optimization.ts
@@ -1,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use 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,22 +8,32 @@
 
 import { FontsClass, OptimizationClass, OptimizationUnion, StylesClass } from '../browser/schema';
 
-export type NormalizedOptimizationOptions = Required<Omit<OptimizationClass, 'fonts' | 'styles'>> & {
-  fonts: FontsClass,
-  styles: StylesClass,
+export type NormalizedOptimizationOptions = Required<
+  Omit<OptimizationClass, 'fonts' | 'styles'>
+> & {
+  fonts: FontsClass;
+  styles: StylesClass;
 };
 
-export function normalizeOptimization(optimization: OptimizationUnion = false): NormalizedOptimizationOptions {
+export function normalizeOptimization(
+  optimization: OptimizationUnion = true,
+): NormalizedOptimizationOptions {
   if (typeof optimization === 'object') {
     return {
       scripts: !!optimization.scripts,
-      styles: typeof optimization.styles === 'object' ? optimization.styles : {
-        minify: !!optimization.styles,
-        inlineCritical: !!optimization.styles,
-      },
-      fonts: typeof optimization.fonts === 'object' ? optimization.fonts : {
-        inline: !!optimization.fonts,
-      },
+      styles:
+        typeof optimization.styles === 'object'
+          ? optimization.styles
+          : {
+              minify: !!optimization.styles,
+              inlineCritical: !!optimization.styles,
+            },
+      fonts:
+        typeof optimization.fonts === 'object'
+          ? optimization.fonts
+          : {
+              inline: !!optimization.fonts,
+            },
     };
   }
 
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..9ec6dfddf2e1 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
@@ -11,8 +11,8 @@ import { SourceMapClass, SourceMapUnion } from '../browser/schema';
 export function normalizeSourceMaps(sourceMap: SourceMapUnion): SourceMapClass {
   const scripts = typeof sourceMap === 'object' ? sourceMap.scripts : sourceMap;
   const styles = typeof sourceMap === 'object' ? sourceMap.styles : sourceMap;
-  const hidden = typeof sourceMap === 'object' && sourceMap.hidden || false;
-  const vendor = typeof sourceMap === 'object' && sourceMap.vendor || false;
+  const hidden = (typeof sourceMap === 'object' && sourceMap.hidden) || false;
+  const vendor = (typeof sourceMap === 'object' && sourceMap.vendor) || false;
 
   return {
     vendor,
diff --git a/packages/angular_devkit/build_angular/src/utils/output-paths.ts b/packages/angular_devkit/build_angular/src/utils/output-paths.ts
index 78e34299c801..b3a6ab4e431d 100644
--- a/packages/angular_devkit/build_angular/src/utils/output-paths.ts
+++ b/packages/angular_devkit/build_angular/src/utils/output-paths.ts
@@ -1,17 +1,21 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+
 import { existsSync, mkdirSync } from 'fs';
 import { join } from 'path';
 import { I18nOptions } from './i18n-options';
 
 export function ensureOutputPaths(baseOutputPath: string, i18n: I18nOptions): Map<string, string> {
   const outputPaths: [string, string][] = i18n.shouldInline
-    ? [...i18n.inlineLocales].map(l => [l, i18n.flatOutput ? baseOutputPath : join(baseOutputPath, l)])
+    ? [...i18n.inlineLocales].map((l) => [
+        l,
+        i18n.flatOutput ? baseOutputPath : join(baseOutputPath, l),
+      ])
     : [['', baseOutputPath]];
 
   for (const [, outputPath] of outputPaths) {
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 982c3f294c54..a0665b69b01a 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,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 { ExtraEntryPoint } from '../browser/schema';
 import { normalizeExtraEntryPoints } from '../webpack/utils/helpers';
 
@@ -18,8 +19,8 @@ export function generateEntryPoints(appConfig: {
     defaultBundleName: string,
   ): string[] => {
     const entryPoints = normalizeExtraEntryPoints(extraEntryPoints, defaultBundleName)
-      .filter(entry => entry.inject)
-      .map(entry => entry.bundleName);
+      .filter((entry) => entry.inject)
+      .map((entry) => entry.bundleName);
 
     // remove duplicates
     return [...new Set(entryPoints)];
@@ -37,7 +38,7 @@ export function generateEntryPoints(appConfig: {
   ];
 
   const duplicates = [
-    ...new Set(entryPoints.filter(x => entryPoints.indexOf(x) !== entryPoints.lastIndexOf(x))),
+    ...new Set(entryPoints.filter((x) => entryPoints.indexOf(x) !== entryPoints.lastIndexOf(x))),
   ];
 
   if (duplicates.length > 0) {
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..7ff6bb28fcdc 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,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
  */
+
 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 88e0cc55ae56..4c511025376b 100644
--- a/packages/angular_devkit/build_angular/src/utils/process-bundle.ts
+++ b/packages/angular_devkit/build_angular/src/utils/process-bundle.ts
@@ -1,10 +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 remapping from '@ampproject/remapping';
 import {
   NodePath,
   ParseResult,
@@ -20,22 +22,20 @@ import * as cacache from 'cacache';
 import { createHash } from 'crypto';
 import * as fs from 'fs';
 import * as path from 'path';
-import { RawSourceMap, SourceMapConsumer, SourceMapGenerator } from 'source-map';
 import { minify } from 'terser';
-import * as v8 from 'v8';
-import { sources } from 'webpack';
+import { workerData } from 'worker_threads';
 import { allowMangle, allowMinify, shouldBeautify } from './environment-options';
 import { I18nOptions } from './i18n-options';
 
-const {
-  ConcatSource,
-  OriginalSource,
-  ReplaceSource,
-  SourceMapSource,
-} = sources;
-
 type LocalizeUtilities = typeof import('@angular/localize/src/tools/src/source_file_utils');
 
+// Extract Sourcemap input type from the remapping function since it is not currently exported
+type SourceMapInput = Exclude<Parameters<typeof remapping>[0], unknown[]>;
+
+// Lazy loaded webpack-sources object
+// Webpack is only imported if needed during the processing
+let webpackSources: typeof import('webpack').sources | undefined;
+
 // If code size is larger than 500KB, consider lower fidelity but faster sourcemap merge
 const FAST_SOURCEMAP_THRESHOLD = 500 * 1024;
 
@@ -56,6 +56,7 @@ export interface ProcessBundleOptions {
   runtimeData?: ProcessBundleResult[];
   replacements?: [string, string][];
   supportedBrowsers?: string[] | Record<string, string>;
+  memoryMode?: boolean;
 }
 
 export interface ProcessBundleResult {
@@ -69,9 +70,11 @@ export interface ProcessBundleFile {
   filename: string;
   size: number;
   integrity?: string;
+  content?: string;
   map?: {
     filename: string;
     size: number;
+    content?: string;
   };
 }
 
@@ -82,18 +85,13 @@ export const enum CacheKey {
   DownlevelMap = 3,
 }
 
-let cachePath: string | undefined;
-let i18n: I18nOptions | undefined;
+const { cachePath, i18n } = (workerData || {}) as { cachePath?: string; i18n?: I18nOptions };
 
-export function setup(data: number[] | { cachePath: string; i18n: I18nOptions }): void {
-  const options = Array.isArray(data)
-    ? (v8.deserialize(Buffer.from(data)) as { cachePath: string; i18n: I18nOptions })
-    : data;
-  cachePath = options.cachePath;
-  i18n = options.i18n;
-}
-
-async function cachePut(content: string, key: string | undefined, integrity?: string): Promise<void> {
+async function cachePut(
+  content: string,
+  key: string | undefined,
+  integrity?: string,
+): Promise<void> {
   if (cachePath && key) {
     await cacache.put(cachePath, key, content, {
       metadata: { integrity },
@@ -122,12 +120,9 @@ export async function process(options: ProcessBundleOptions): Promise<ProcessBun
   const downlevelFilename = filename.replace(/\-(es20\d{2}|esnext)/, '-es5');
   const downlevel = !options.optimizeOnly;
   const sourceCode = options.code;
-  const sourceMap = options.map ? JSON.parse(options.map) : undefined;
 
-  let downlevelCode;
-  let downlevelMap;
   if (downlevel) {
-    const {supportedBrowsers: targets = []} = options;
+    const { supportedBrowsers: targets = [] } = options;
 
     // todo: revisit this in version 10, when we update our defaults browserslist
     // Without this workaround bundles will not be downlevelled because Babel doesn't know handle to 'op_mini all'
@@ -143,57 +138,40 @@ export async function process(options: ProcessBundleOptions): Promise<ProcessBun
       filename,
       // using false ensures that babel will NOT search and process sourcemap comments (large memory usage)
       // The types do not include the false option even though it is valid
-      // tslint:disable-next-line: no-any
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       inputSourceMap: false as any,
       babelrc: false,
       configFile: false,
-      presets: [[
-        require.resolve('@babel/preset-env'),
-        {
-          // browserslist-compatible query or object of minimum environment versions to support
-          targets,
-          // modules aren't needed since the bundles use webpack's custom module loading
-          modules: false,
-          // 'transform-typeof-symbol' generates slower code
-          exclude: ['transform-typeof-symbol'],
-        },
-      ]],
+      presets: [
+        [
+          require.resolve('@babel/preset-env'),
+          {
+            // browserslist-compatible query or object of minimum environment versions to support
+            targets,
+            // modules aren't needed since the bundles use webpack's custom module loading
+            modules: false,
+            // 'transform-typeof-symbol' generates slower code
+            exclude: ['transform-typeof-symbol'],
+          },
+        ],
+      ],
       plugins: [
         createIifeWrapperPlugin(),
         ...(options.replacements ? [createReplacePlugin(options.replacements)] : []),
       ],
       minified: allowMinify && !!options.optimize,
       compact: !shouldBeautify && !!options.optimize,
-      sourceMaps: !!sourceMap,
+      sourceMaps: !!options.map,
     });
 
     if (!transformResult || !transformResult.code) {
       throw new Error(`Unknown error occurred processing bundle for "${options.filename}".`);
     }
-    downlevelCode = transformResult.code;
-
-    if (sourceMap && transformResult.map) {
-      // String length is used as an estimate for byte length
-      const fastSourceMaps = sourceCode.length > FAST_SOURCEMAP_THRESHOLD;
-
-      downlevelMap = await mergeSourceMaps(
-        sourceCode,
-        sourceMap,
-        downlevelCode,
-        transformResult.map,
-        filename,
-        // When not optimizing, the sourcemaps are significantly less complex
-        // and can use the higher fidelity merge
-        !!options.optimize && fastSourceMaps,
-      );
-    }
-  }
 
-  if (downlevelCode) {
     result.downlevel = await processBundle({
       ...options,
-      code: downlevelCode,
-      map: downlevelMap,
+      code: transformResult.code,
+      downlevelMap: (transformResult.map as SourceMapInput) ?? undefined,
       filename: path.join(basePath, downlevelFilename),
       isOriginal: false,
     });
@@ -209,180 +187,93 @@ export async function process(options: ProcessBundleOptions): Promise<ProcessBun
   return result;
 }
 
-async function mergeSourceMaps(
-  inputCode: string,
-  inputSourceMap: RawSourceMap,
-  resultCode: string,
-  resultSourceMap: RawSourceMap,
-  filename: string,
-  fast = false,
-): Promise<RawSourceMap> {
-  // Webpack 5 terser sourcemaps currently fail merging with the high-quality method
-  if (fast) {
-    return mergeSourceMapsFast(inputSourceMap, resultSourceMap);
-  }
-
-  // SourceMapSource produces high-quality sourcemaps
-  // Final sourcemap will always be available when providing the input sourcemaps
-  // tslint:disable-next-line: no-non-null-assertion
-  const finalSourceMap = new SourceMapSource(
-    resultCode,
-    filename,
-    resultSourceMap,
-    inputCode,
-    inputSourceMap,
-    true,
-  ).map()!;
-
-  return finalSourceMap as RawSourceMap;
-}
-
-async function mergeSourceMapsFast(first: RawSourceMap, second: RawSourceMap) {
-  const sourceRoot = first.sourceRoot;
-  const generator = new SourceMapGenerator();
-
-  // sourcemap package adds the sourceRoot to all position source paths if not removed
-  delete first.sourceRoot;
-
-  await SourceMapConsumer.with(first, null, originalConsumer => {
-    return SourceMapConsumer.with(second, null, newConsumer => {
-      newConsumer.eachMapping(mapping => {
-        if (mapping.originalLine === null) {
-          return;
-        }
-        const originalPosition = originalConsumer.originalPositionFor({
-          line: mapping.originalLine,
-          column: mapping.originalColumn,
-        });
-        if (
-          originalPosition.line === null ||
-          originalPosition.column === null ||
-          originalPosition.source === null
-        ) {
-          return;
-        }
-        generator.addMapping({
-          generated: {
-            line: mapping.generatedLine,
-            column: mapping.generatedColumn,
-          },
-          name: originalPosition.name || undefined,
-          original: {
-            line: originalPosition.line,
-            column: originalPosition.column,
-          },
-          source: originalPosition.source,
-        });
-      });
-    });
-  });
-
-  const map = generator.toJSON();
-  map.file = second.file;
-  map.sourceRoot = sourceRoot;
-
-  // Add source content if present
-  if (first.sourcesContent) {
-    // Source content array is based on index of sources
-    const sourceContentMap = new Map<string, number>();
-    for (let i = 0; i < first.sources.length; i++) {
-      // make paths "absolute" so they can be compared (`./a.js` and `a.js` are equivalent)
-      sourceContentMap.set(path.resolve('/', first.sources[i]), i);
-    }
-    map.sourcesContent = [];
-    for (let i = 0; i < map.sources.length; i++) {
-      const contentIndex = sourceContentMap.get(path.resolve('/', map.sources[i]));
-      if (contentIndex === undefined) {
-        map.sourcesContent.push('');
-      } else {
-        map.sourcesContent.push(first.sourcesContent[contentIndex]);
-      }
-    }
-  }
-
-  // Put the sourceRoot back
-  if (sourceRoot) {
-    first.sourceRoot = sourceRoot;
-  }
-
-  return map;
-}
-
 async function processBundle(
-  options: Omit<ProcessBundleOptions, 'map'> & { isOriginal: boolean; map?: string | RawSourceMap },
+  options: ProcessBundleOptions & {
+    isOriginal: boolean;
+    downlevelMap?: SourceMapInput;
+  },
 ): Promise<ProcessBundleFile> {
   const {
     optimize,
     isOriginal,
     code,
     map,
+    downlevelMap,
     filename: filepath,
     hiddenSourceMaps,
     cacheKeys = [],
     integrityAlgorithm,
-   } = options;
+    memoryMode,
+  } = options;
 
-  const rawMap = typeof map === 'string' ? JSON.parse(map) as RawSourceMap : map;
   const filename = path.basename(filepath);
+  let resultCode = code;
 
-  let result: {
-    code: string,
-    map: RawSourceMap | undefined,
-  };
-
-  if (rawMap) {
-    rawMap.file = filename;
-  }
-
+  let optimizeResult;
   if (optimize) {
-    result = await terserMangle(code, {
+    optimizeResult = await terserMangle(code, {
       filename,
-      map: rawMap,
+      sourcemap: !!map,
       compress: !isOriginal, // We only compress bundles which are downlevelled.
       ecma: isOriginal ? 2015 : 5,
     });
-  } else {
-    result = {
-      map: rawMap,
-      code,
-    };
+    resultCode = optimizeResult.code;
   }
 
   let mapContent: string | undefined;
-  if (result.map) {
+  if (map) {
     if (!hiddenSourceMaps) {
-      result.code += `\n//# sourceMappingURL=${filename}.map`;
+      resultCode += `\n//# sourceMappingURL=${filename}.map`;
     }
 
-    mapContent = JSON.stringify(result.map);
+    const partialSourcemaps: SourceMapInput[] = [];
+    if (optimizeResult && optimizeResult.map) {
+      partialSourcemaps.push(optimizeResult.map);
+    }
+    if (downlevelMap) {
+      partialSourcemaps.push(downlevelMap);
+    }
+
+    if (partialSourcemaps.length > 0) {
+      partialSourcemaps.push(map);
+      const fullSourcemap = remapping(partialSourcemaps, () => null);
+      mapContent = JSON.stringify(fullSourcemap);
+    } else {
+      mapContent = map;
+    }
 
     await cachePut(
       mapContent,
       cacheKeys[isOriginal ? CacheKey.OriginalMap : CacheKey.DownlevelMap],
     );
-    fs.writeFileSync(filepath + '.map', mapContent);
+    if (!memoryMode) {
+      fs.writeFileSync(filepath + '.map', mapContent);
+    }
   }
 
   const fileResult = createFileEntry(
     filepath,
-    result.code,
+    resultCode,
     mapContent,
+    memoryMode,
     integrityAlgorithm,
   );
 
   await cachePut(
-    result.code,
+    resultCode,
     cacheKeys[isOriginal ? CacheKey.OriginalCode : CacheKey.DownlevelCode],
     fileResult.integrity,
   );
-  fs.writeFileSync(filepath, result.code);
+  if (!memoryMode) {
+    fs.writeFileSync(filepath, resultCode);
+  }
 
   return fileResult;
 }
 
 async function terserMangle(
   code: string,
-  options: { filename?: string; map?: RawSourceMap; compress?: boolean; ecma?: 5 | 2015 } = {},
+  options: { filename?: string; sourcemap?: boolean; compress?: boolean; ecma?: 5 | 2015 } = {},
 ) {
   // Note: Investigate converting the AST instead of re-parsing
   // estree -> terser is already supported; need babel -> estree/terser
@@ -400,59 +291,42 @@ async function terserMangle(
       wrap_func_args: false,
     },
     sourceMap:
-      !!options.map &&
+      !!options.sourcemap &&
       ({
         asObject: true,
         // typings don't include asObject option
-        // tslint:disable-next-line: no-any
+        // eslint-disable-next-line @typescript-eslint/no-explicit-any
       } as any),
   });
 
-  // tslint:disable-next-line: no-non-null-assertion
-  const outputCode = minifyOutput.code!;
-
-  let outputMap;
-  if (options.map && minifyOutput.map) {
-    outputMap = await mergeSourceMaps(
-      code,
-      options.map,
-      outputCode,
-      minifyOutput.map as unknown as RawSourceMap,
-      options.filename || '0',
-      code.length > FAST_SOURCEMAP_THRESHOLD,
-    );
-  }
-
-  return { code: outputCode, map: outputMap };
+  // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+  return { code: minifyOutput.code!, map: minifyOutput.map as SourceMapInput | undefined };
 }
 
 function createFileEntry(
   filename: string,
   code: string,
   map: string | undefined,
+  memoryMode?: boolean,
   integrityAlgorithm?: string,
 ): ProcessBundleFile {
   return {
     filename: filename,
     size: Buffer.byteLength(code),
     integrity: integrityAlgorithm && generateIntegrityValue(integrityAlgorithm, code),
+    content: memoryMode ? code : undefined,
     map: !map
       ? undefined
       : {
           filename: filename + '.map',
           size: Buffer.byteLength(map),
+          content: memoryMode ? map : undefined,
         },
   };
 }
 
 function generateIntegrityValue(hashAlgorithm: string, code: string) {
-  return (
-    hashAlgorithm +
-    '-' +
-    createHash(hashAlgorithm)
-      .update(code)
-      .digest('base64')
-  );
+  return hashAlgorithm + '-' + createHash(hashAlgorithm).update(code).digest('base64');
 }
 
 // The webpack runtime chunk is already ES5.
@@ -559,22 +433,20 @@ export async function createI18nPlugins(
 
   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
+      // eslint-disable-next-line @typescript-eslint/no-explicit-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
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       es5.makeEs5TranslatePlugin(diagnostics, (translation || {}) as any, {
         missingTranslation: translation === undefined ? 'ignore' : missingTranslation,
       }),
@@ -582,7 +454,6 @@ export async function createI18nPlugins(
   }
 
   const inlineLocale = await import(
-    // tslint:disable-next-line: trailing-comma
     '@angular/localize/src/tools/src/translate/source_files/locale_plugin'
   );
   plugins.push(inlineLocale.makeLocalePlugin(locale));
@@ -660,10 +531,9 @@ export async function inlineLocales(options: InlineOptions) {
   }
 
   const diagnostics = [];
-  const inputMap = options.map && (JSON.parse(options.map) as RawSourceMap);
   for (const locale of i18n.inlineLocales) {
     const isSourceLocale = locale === i18n.sourceLocale;
-    // tslint:disable-next-line: no-any
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const translations: any = isSourceLocale ? {} : i18n.locales[locale].translation || {};
     let localeDataContent;
     if (options.setLocale) {
@@ -685,13 +555,13 @@ export async function inlineLocales(options: InlineOptions) {
       filename: options.filename,
       // using false ensures that babel will NOT search and process sourcemap comments (large memory usage)
       // The types do not include the false option even though it is valid
-      // tslint:disable-next-line: no-any
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       inputSourceMap: false as any,
       babelrc: false,
       configFile: false,
       plugins,
       compact: !shouldBeautify,
-      sourceMaps: !!inputMap,
+      sourceMaps: !!options.map,
     });
 
     diagnostics.push(...localeDiagnostics.messages);
@@ -707,15 +577,8 @@ export async function inlineLocales(options: InlineOptions) {
     );
     fs.writeFileSync(outputPath, transformResult.code);
 
-    if (inputMap && transformResult.map) {
-      const outputMap = await mergeSourceMaps(
-        options.code,
-        inputMap,
-        transformResult.code,
-        transformResult.map,
-        options.filename,
-        options.code.length > FAST_SOURCEMAP_THRESHOLD,
-      );
+    if (options.map && transformResult.map) {
+      const outputMap = remapping([transformResult.map as SourceMapInput, options.map], () => null);
 
       fs.writeFileSync(outputPath + '.map', JSON.stringify(outputMap));
     }
@@ -741,23 +604,28 @@ async function inlineLocalesDirect(ast: ParseResult, options: InlineOptions) {
     return inlineCopyOnly(options);
   }
 
-  const inputMap = options.map && (JSON.parse(options.map) as RawSourceMap);
+  const inputMap = !!options.map && (JSON.parse(options.map) as { sourceRoot?: string });
   // Cleanup source root otherwise it will be added to each source entry
   const mapSourceRoot = inputMap && inputMap.sourceRoot;
   if (inputMap) {
     delete inputMap.sourceRoot;
   }
 
+  // Load Webpack only when needed
+  if (webpackSources === undefined) {
+    webpackSources = (await import('webpack')).sources;
+  }
+  const { ConcatSource, OriginalSource, ReplaceSource, SourceMapSource } = webpackSources;
+
   for (const locale of i18n.inlineLocales) {
     const content = new ReplaceSource(
       inputMap
-        ? // tslint:disable-next-line: no-any
-          new SourceMapSource(options.code, options.filename, inputMap as any)
+        ? new SourceMapSource(options.code, options.filename, inputMap)
         : new OriginalSource(options.code, options.filename),
     );
 
     const isSourceLocale = locale === i18n.sourceLocale;
-    // tslint:disable-next-line: no-any
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const translations: any = isSourceLocale ? {} : i18n.locales[locale].translation || {};
     for (const position of positions) {
       const translated = utils.translate(
@@ -774,12 +642,12 @@ async function inlineLocalesDirect(ast: ParseResult, options: InlineOptions) {
       content.replace(position.start, position.end - 1, code);
     }
 
-    let outputSource: sources.Source = content;
+    let outputSource: import('webpack').sources.Source = content;
     if (options.setLocale) {
       const setLocaleText = `var $localize=Object.assign(void 0===$localize?{}:$localize,{locale:"${locale}"});\n`;
 
       // If locale data is provided, load it and prepend to file
-      let localeDataSource: sources.Source | null = null;
+      let localeDataSource;
       const localeDataPath = i18n.locales[locale] && i18n.locales[locale].dataPath;
       if (localeDataPath) {
         const localeDataContent = await loadLocaleData(localeDataPath, true, options.es5);
@@ -787,14 +655,14 @@ async function inlineLocalesDirect(ast: ParseResult, options: InlineOptions) {
       }
 
       outputSource = localeDataSource
-        // The semicolon ensures that there is no syntax error between statements
-        ? new ConcatSource(setLocaleText, localeDataSource, ';\n', content)
+        ? // The semicolon ensures that there is no syntax error between statements
+          new ConcatSource(setLocaleText, localeDataSource, ';\n', content)
         : new ConcatSource(setLocaleText, content);
     }
 
     const { source: outputCode, map: outputMap } = outputSource.sourceAndMap() as {
       source: string;
-      map: RawSourceMap;
+      map: { file: string; sourceRoot?: string };
     };
     const outputPath = path.join(
       options.outputPath,
@@ -857,9 +725,9 @@ function findLocalizePositions(
         ) {
           const [messageParts, expressions] = unwrapLocalizeCall(path, utils);
           positions.push({
-            // tslint:disable-next-line: no-non-null-assertion
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
             start: path.node.start!,
-            // tslint:disable-next-line: no-non-null-assertion
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
             end: path.node.end!,
             messageParts,
             expressions,
@@ -873,9 +741,9 @@ function findLocalizePositions(
         if (types.isIdentifier(path.node.tag) && path.node.tag.name === localizeName) {
           const [messageParts, expressions] = unwrapTemplateLiteral(path, utils);
           positions.push({
-            // tslint:disable-next-line: no-non-null-assertion
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
             start: path.node.start!,
-            // tslint:disable-next-line: no-non-null-assertion
+            // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
             end: path.node.end!,
             messageParts,
             expressions,
@@ -918,7 +786,7 @@ async function loadLocaleData(path: string, optimize: boolean, es5: boolean): Pr
   const transformResult = await transformAsync(content, {
     filename: path,
     // The types do not include the false option even though it is valid
-    // tslint:disable-next-line: no-any
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     inputSourceMap: false as any,
     babelrc: false,
     configFile: false,
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..7deba0a8165b 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
@@ -17,9 +17,7 @@ import * as path from 'path';
  * it will resolve 'tsconfigPath' from this path.
  */
 export function readTsconfig(tsconfigPath: string, workspaceRoot?: string): ParsedConfiguration {
-  const tsConfigFullPath = workspaceRoot
-    ? path.resolve(workspaceRoot, tsconfigPath)
-    : tsconfigPath;
+  const tsConfigFullPath = workspaceRoot ? path.resolve(workspaceRoot, tsconfigPath) : tsconfigPath;
 
   // We use 'ng' instead of 'ts' here because 'ts' is not aware of 'angularCompilerOptions'
   // and will not merged them if they are at un upper level tsconfig file when using `extends`.
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..37b497fe7cac 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,25 +1,26 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+
 import { BuilderOutput } from '@angular-devkit/architect';
 import { ForkOptions, fork } from 'child_process';
 import { resolve } from 'path';
 import { Observable } from 'rxjs';
-const treeKill = require('tree-kill');
 
+const treeKill = require('tree-kill');
 
 export function runModuleAsObservableFork(
   cwd: string,
   modulePath: string,
   exportName: string | undefined,
-  // tslint:disable-next-line:no-any
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   args: any[],
 ): Observable<BuilderOutput> {
-  return new Observable(obs => {
+  return new Observable((obs) => {
     const workerPath: string = resolve(__dirname, './run-module-worker.js');
 
     const debugArgRegex = /--inspect(?:-brk|-port)?|--debug(?:-brk|-port)/;
@@ -28,10 +29,10 @@ export function runModuleAsObservableFork(
       // Workaround for https://github.com/nodejs/node/issues/9435
       return !debugArgRegex.test(arg);
     });
-    const forkOptions: ForkOptions = {
+    const forkOptions: ForkOptions = ({
       cwd,
       execArgv,
-    } as {} as ForkOptions;
+    } as {}) as ForkOptions;
 
     // TODO: support passing in a logger to use as stdio streams
     // if (logger) {
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..d1be8e869590 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,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
  */
-
 process.on('message', (message) => {
   // Only process messages with the hash in 'run-module-as-observable-fork.ts'.
   if (message.hash === '5d4b9a5c0a4e0f9977598437b0e85bcc') {
@@ -17,4 +16,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 10eb38973855..32ec4a5d0e1c 100644
--- a/packages/angular_devkit/build_angular/src/utils/service-worker.ts
+++ b/packages/angular_devkit/build_angular/src/utils/service-worker.ts
@@ -1,14 +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 { Path, getSystemPath, normalize } from '@angular-devkit/core';
 import { Config, Filesystem, Generator } from '@angular/service-worker/config';
 import * as crypto from 'crypto';
-import { constants as fsConstants, createReadStream, promises as fs } from 'fs';
+import { createReadStream, promises as fs, constants as fsConstants } from 'fs';
 import * as path from 'path';
 import { pipeline } from 'stream';
 
@@ -26,10 +27,8 @@ class CliFilesystem implements Filesystem {
   hash(file: string): Promise<string> {
     return new Promise((resolve, reject) => {
       const hash = crypto.createHash('sha1').setEncoding('hex');
-      pipeline(
-        createReadStream(this._resolve(file)),
-        hash,
-        (error) => error ? reject(error) : resolve(hash.read()),
+      pipeline(createReadStream(this._resolve(file)), hash, (error) =>
+        error ? reject(error) : resolve(hash.read()),
       );
     });
   }
@@ -47,7 +46,7 @@ class CliFilesystem implements Filesystem {
     for await (const entry of await fs.opendir(dir)) {
       if (entry.isFile()) {
         // Uses posix paths since the service worker expects URLs
-        items.push('/' + path.posix.relative(this.base, path.posix.join(dir, entry.name)));
+        items.push('/' + path.relative(this.base, path.join(dir, entry.name)).replace(/\\/g, '/'));
       } else if (entry.isDirectory()) {
         subdirectories.push(path.join(dir, entry.name));
       }
diff --git a/packages/angular_devkit/build_angular/src/utils/spinner.ts b/packages/angular_devkit/build_angular/src/utils/spinner.ts
index 35c16486832d..4a0e3deb587a 100644
--- a/packages/angular_devkit/build_angular/src/utils/spinner.ts
+++ b/packages/angular_devkit/build_angular/src/utils/spinner.ts
@@ -1,19 +1,21 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of 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 ora from 'ora';
 import { colors } from './color';
+import { isTTY } from './tty';
 
 export class Spinner {
   private readonly spinner: ora.Ora;
 
   /** When false, only fail messages will be displayed. */
   enabled = true;
+  readonly #isTTY = isTTY();
 
   constructor(text?: string) {
     this.spinner = ora({
@@ -22,6 +24,7 @@ export class Spinner {
       // when the underlying process is sync.
       hideCursor: false,
       discardStdin: false,
+      isEnabled: this.#isTTY,
     });
   }
 
@@ -29,6 +32,10 @@ export class Spinner {
     this.spinner.text = text;
   }
 
+  get isSpinning(): boolean {
+    return this.spinner.isSpinning || !this.#isTTY;
+  }
+
   succeed(text?: string): void {
     if (this.enabled) {
       this.spinner.succeed(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..7cc13e4748c4 100644
--- a/packages/angular_devkit/build_angular/src/utils/strip-bom.ts
+++ b/packages/angular_devkit/build_angular/src/utils/strip-bom.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
  */
-// tslint:disable
+
 // TODO: cleanup this file, it's copied as is from Angular CLI.
 
 // Strip BOM from file data.
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..dcf713db3fe1 100644
--- a/packages/angular_devkit/build_angular/src/utils/url.ts
+++ b/packages/angular_devkit/build_angular/src/utils/url.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
  */
 
-
 export function urlJoin(...parts: string[]): string {
   const [p, ...rest] = parts;
 
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..7eef5cc4d070 100644
--- a/packages/angular_devkit/build_angular/src/utils/url_spec.ts
+++ b/packages/angular_devkit/build_angular/src/utils/url_spec.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 { urlJoin } from './url';
 
 describe('urlJoin', () => {
diff --git a/packages/angular_devkit/build_angular/src/utils/version.ts b/packages/angular_devkit/build_angular/src/utils/version.ts
index 0217bcca6147..2638c3d40e97 100644
--- a/packages/angular_devkit/build_angular/src/utils/version.ts
+++ b/packages/angular_devkit/build_angular/src/utils/version.ts
@@ -1,14 +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 { logging, tags } from '@angular-devkit/core';
-import { SemVer, gte, satisfies } from 'semver';
 
-export function assertCompatibleAngularVersion(projectRoot: string, logger: logging.LoggerApi) {
+/* eslint-disable no-console */
+
+import { tags } from '@angular-devkit/core';
+import { SemVer, satisfies } from 'semver';
+
+export function assertCompatibleAngularVersion(projectRoot: string): void | never {
   let angularCliPkgJson;
   let angularPkgJson;
   let rxjsPkgJson;
@@ -21,7 +24,7 @@ export function assertCompatibleAngularVersion(projectRoot: string, logger: logg
     angularPkgJson = require(angularPackagePath);
     rxjsPkgJson = require(rxjsPackagePath);
   } catch {
-    logger.error(tags.stripIndents`
+    console.error(tags.stripIndents`
       You seem to not be depending on "@angular/core" and/or "rxjs". This is an error.
     `);
 
@@ -29,7 +32,7 @@ export function assertCompatibleAngularVersion(projectRoot: string, logger: logg
   }
 
   if (!(angularPkgJson && angularPkgJson['version'] && rxjsPkgJson && rxjsPkgJson['version'])) {
-    logger.error(tags.stripIndents`
+    console.error(tags.stripIndents`
       Cannot determine versions of "@angular/core" and/or "rxjs".
       This likely means your local installation is broken. Please reinstall your packages.
     `);
@@ -62,7 +65,7 @@ export function assertCompatibleAngularVersion(projectRoot: string, logger: logg
   const supportedAngularSemver = `^${cliMajor}.0.0-next || >=${cliMajor}.0.0 <${cliMajor + 1}.0.0`;
 
   if (!satisfies(angularVersion, supportedAngularSemver, { includePrerelease: true })) {
-    logger.error(
+    console.error(
       tags.stripIndents`
         This version of CLI is only compatible with Angular versions ${supportedAngularSemver},
         but Angular version ${angularVersion} was found instead.
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 d8831849c6fa..98b1734ca577 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,26 +1,18 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+
 import { BuilderContext } from '@angular-devkit/architect';
-import {
-  getSystemPath,
-  logging,
-  normalize,
-  resolve,
-} from '@angular-devkit/core';
+import { getSystemPath, logging, normalize, resolve } from '@angular-devkit/core';
 import * as path from 'path';
-import * as webpack from 'webpack';
+import { Configuration, javascript } from 'webpack';
 import { merge as webpackMerge } from 'webpack-merge';
 import { Schema as BrowserBuilderSchema } from '../browser/schema';
-import {
-  NormalizedBrowserBuilderSchema,
-  defaultProgress,
-  normalizeBrowserSchema,
-} from '../utils';
+import { NormalizedBrowserBuilderSchema, defaultProgress, normalizeBrowserSchema } from '../utils';
 import { WebpackConfigOptions } from '../utils/build-options';
 import { readTsconfig } from '../utils/read-tsconfig';
 import { BuilderWatchPlugin, BuilderWatcherFactory } from '../webpack/plugins/builder-watch-plugin';
@@ -33,10 +25,10 @@ export async function generateWebpackConfig(
   projectRoot: string,
   sourceRoot: string | undefined,
   options: NormalizedBrowserBuilderSchema,
-  webpackPartialGenerator: (wco: BrowserWebpackConfigOptions) => webpack.Configuration[],
+  webpackPartialGenerator: (wco: BrowserWebpackConfigOptions) => Configuration[],
   logger: logging.LoggerApi,
   extraBuildOptions: Partial<NormalizedBrowserBuilderSchema>,
-): Promise<webpack.Configuration> {
+): Promise<Configuration> {
   // Ensure Build Optimizer is only used with AOT.
   if (options.buildOptimizer && !options.aot) {
     throw new Error(`The 'buildOptimizer' option cannot be used without 'aot'.`);
@@ -70,9 +62,14 @@ export async function generateWebpackConfig(
 export async function generateI18nBrowserWebpackConfigFromContext(
   options: BrowserBuilderSchema,
   context: BuilderContext,
-  webpackPartialGenerator: (wco: BrowserWebpackConfigOptions) => webpack.Configuration[],
+  webpackPartialGenerator: (wco: BrowserWebpackConfigOptions) => Configuration[],
   extraBuildOptions: Partial<NormalizedBrowserBuilderSchema> = {},
-): Promise<{ config: webpack.Configuration; projectRoot: string; projectSourceRoot?: string, i18n: I18nOptions }> {
+): Promise<{
+  config: Configuration;
+  projectRoot: string;
+  projectSourceRoot?: string;
+  i18n: I18nOptions;
+}> {
   const { buildOptions, i18n } = await configureI18nBuild(context, options);
   const result = await generateBrowserWebpackConfigFromContext(
     buildOptions,
@@ -106,25 +103,14 @@ export async function generateI18nBrowserWebpackConfigFromContext(
       (data, locale) => data + locale.files.map((file) => file.integrity || '').join('|'),
       '',
     );
-    if (!config.plugins) {
-      config.plugins = [];
-    }
+
+    config.plugins ??= [];
     config.plugins.push({
-      apply(compiler: webpack.Compiler) {
-        compiler.hooks.compilation.tap('build-angular', compilation => {
-          // Webpack typings do not contain template hashForChunk hook
-          // tslint:disable-next-line: no-any
-          (compilation.mainTemplate.hooks as any).hashForChunk.tap(
-            'build-angular',
-            (hash: { update(data: string): void }) => {
-              hash.update('$localize' + i18nHash);
-            },
-          );
-          // Webpack typings do not contain hooks property
-          // tslint:disable-next-line: no-any
-          (compilation.chunkTemplate as any).hooks.hashForChunk.tap(
+      apply(compiler) {
+        compiler.hooks.compilation.tap('build-angular', (compilation) => {
+          javascript.JavascriptModulesPlugin.getCompilationHooks(compilation).chunkHash.tap(
             'build-angular',
-            (hash: { update(data: string): void }) => {
+            (_, hash) => {
               hash.update('$localize' + i18nHash);
             },
           );
@@ -138,9 +124,9 @@ export async function generateI18nBrowserWebpackConfigFromContext(
 export async function generateBrowserWebpackConfigFromContext(
   options: BrowserBuilderSchema,
   context: BuilderContext,
-  webpackPartialGenerator: (wco: BrowserWebpackConfigOptions) => webpack.Configuration[],
+  webpackPartialGenerator: (wco: BrowserWebpackConfigOptions) => Configuration[],
   extraBuildOptions: Partial<NormalizedBrowserBuilderSchema> = {},
-): Promise<{ config: webpack.Configuration; projectRoot: string; projectSourceRoot?: string }> {
+): Promise<{ config: Configuration; projectRoot: string; projectSourceRoot?: string }> {
   const projectName = context.target && context.target.project;
   if (!projectName) {
     throw new Error('The builder requires a target.');
@@ -154,12 +140,7 @@ export async function generateBrowserWebpackConfigFromContext(
     ? resolve(workspaceRoot, normalize(projectSourceRoot))
     : undefined;
 
-  const normalizedOptions = normalizeBrowserSchema(
-    workspaceRoot,
-    projectRoot,
-    sourceRoot,
-    options,
-  );
+  const normalizedOptions = normalizeBrowserSchema(workspaceRoot, projectRoot, sourceRoot, options);
 
   const config = await generateWebpackConfig(
     getSystemPath(workspaceRoot),
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 4cccd20788dc..41584a617e82 100644
--- a/packages/angular_devkit/build_angular/src/utils/webpack-diagnostics.ts
+++ b/packages/angular_devkit/build_angular/src/utils/webpack-diagnostics.ts
@@ -1,18 +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 { Compilation, WebpackError } from 'webpack';
 
 export function addWarning(compilation: Compilation, message: string): void {
   compilation.warnings.push(new WebpackError(message));
-
 }
 
 export function addError(compilation: Compilation, message: string): void {
   compilation.errors.push(new WebpackError(message));
-
 }
diff --git a/packages/angular_devkit/build_angular/src/utils/workers.ts b/packages/angular_devkit/build_angular/src/utils/workers.ts
deleted file mode 100644
index 83b4c778fff8..000000000000
--- a/packages/angular_devkit/build_angular/src/utils/workers.ts
+++ /dev/null
@@ -1,24 +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 { cpus } from 'os';
-/**
- * Use CPU count -1 with limit to 7 for workers not to clog the system.
- * Some environments, like CircleCI which use Docker report a number of CPUs by the host and not the count of available.
- * This cause `Error: Call retries were exceeded` errors when trying to use them.
- *
- * See:
- *
- * https://github.com/nodejs/node/issues/28762
- *
- * https://github.com/webpack-contrib/terser-webpack-plugin/issues/143
- *
- * https://github.com/angular/angular-cli/issues/16860#issuecomment-588828079
- *
- */
-export const maxWorkers = Math.max(Math.min(cpus().length, 8) - 1, 1);
diff --git a/packages/angular_devkit/build_angular/src/webpack/configs/analytics.ts b/packages/angular_devkit/build_angular/src/webpack/configs/analytics.ts
new file mode 100644
index 000000000000..38996af2ee67
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/webpack/configs/analytics.ts
@@ -0,0 +1,40 @@
+/**
+ * @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 } from '@angular-devkit/architect';
+import { Configuration } from 'webpack';
+import { WebpackConfigOptions } from '../../utils/build-options';
+import { NgBuildAnalyticsPlugin } from '../plugins/analytics';
+
+export function getAnalyticsConfig(
+  wco: WebpackConfigOptions,
+  context: BuilderContext,
+): Configuration {
+  if (!context.analytics) {
+    return {};
+  }
+
+  // If there's analytics, add our plugin. Otherwise no need to slow down the build.
+  let category = 'build';
+  if (context.builder) {
+    // We already vetted that this is a "safe" package, otherwise the analytics would be noop.
+    category = context.builder.builderName.split(':')[1] || context.builder.builderName || 'build';
+  }
+
+  // The category is the builder name if it's an angular builder.
+  return {
+    plugins: [
+      new NgBuildAnalyticsPlugin(
+        wco.projectRoot,
+        context.analytics,
+        category,
+        !!wco.tsConfig.options.enableIvy,
+      ),
+    ],
+  };
+}
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 08d81c29a814..3c6d2f06e1da 100644
--- a/packages/angular_devkit/build_angular/src/webpack/configs/browser.ts
+++ b/packages/angular_devkit/build_angular/src/webpack/configs/browser.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 { ScriptTarget } from 'typescript';
 import * as webpack from 'webpack';
 import { BuildBrowserFeatures } from '../../utils';
@@ -33,31 +34,22 @@ export function getBrowserConfig(wco: WebpackConfigOptions): webpack.Configurati
 
   if (subresourceIntegrity) {
     const SubresourceIntegrityPlugin = require('webpack-subresource-integrity');
-    extraPlugins.push(new SubresourceIntegrityPlugin({
-      hashFuncNames: ['sha384'],
-    }));
-  }
-
-  if (extractLicenses) {
-    const LicenseWebpackPlugin = require('license-webpack-plugin').LicenseWebpackPlugin;
-    extraPlugins.push(new LicenseWebpackPlugin({
-      stats: {
-        warnings: false,
-        errors: false,
-      },
-      perChunkOutput: false,
-      outputFilename: '3rdpartylicenses.txt',
-      skipChildCompilers: true,
-    }));
+    extraPlugins.push(
+      new SubresourceIntegrityPlugin({
+        hashFuncNames: ['sha384'],
+      }),
+    );
   }
 
   if (scriptsSourceMap || stylesSourceMap) {
-    extraPlugins.push(getSourceMapDevTool(
-      scriptsSourceMap,
-      stylesSourceMap,
-      buildOptions.differentialLoadingNeeded && !buildOptions.watch ? true : hiddenSourceMap,
-      false,
-    ));
+    extraPlugins.push(
+      getSourceMapDevTool(
+        scriptsSourceMap,
+        stylesSourceMap,
+        buildOptions.differentialLoadingNeeded && !buildOptions.watch ? true : hiddenSourceMap,
+        false,
+      ),
+    );
   }
 
   let crossOriginLoading: 'anonymous' | 'use-credentials' | false = false;
@@ -67,21 +59,17 @@ export function getBrowserConfig(wco: WebpackConfigOptions): webpack.Configurati
     crossOriginLoading = crossOrigin;
   }
 
-  const buildBrowserFeatures = new BuildBrowserFeatures(
-    wco.projectRoot,
-  );
+  const buildBrowserFeatures = new BuildBrowserFeatures(wco.projectRoot);
 
   return {
     devtool: false,
     resolve: {
       mainFields: ['es2015', 'browser', 'module', 'main'],
+      conditionNames: ['es2015', '...'],
     },
-    target:
-      wco.tsConfig.options.target === ScriptTarget.ES5 || buildBrowserFeatures.isEs5SupportNeeded()
-        ? ['web', 'es5']
-        : 'web',
     output: {
       crossOriginLoading,
+      trustedTypes: 'angular#bundler',
     },
     optimization: {
       runtimeChunk: 'single',
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 c050e894e784..af503f1c635a 100644
--- a/packages/angular_devkit/build_angular/src/webpack/configs/common.ts
+++ b/packages/angular_devkit/build_angular/src/webpack/configs/common.ts
@@ -1,15 +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 {
   BuildOptimizerWebpackPlugin,
   buildOptimizerLoaderPath,
 } from '@angular-devkit/build-optimizer';
-import * as CopyWebpackPlugin from 'copy-webpack-plugin';
+import {
+  GLOBAL_DEFS_FOR_TERSER,
+  GLOBAL_DEFS_FOR_TERSER_WITH_AOT,
+  VERSION as NG_VERSION,
+} from '@angular/compiler-cli';
+import CopyWebpackPlugin, { ObjectPattern } from 'copy-webpack-plugin';
+import { createHash } from 'crypto';
 import { createWriteStream, existsSync, promises as fsPromises } from 'fs';
 import * as path from 'path';
 import { ScriptTarget } from 'typescript';
@@ -19,46 +26,40 @@ import {
   ContextReplacementPlugin,
   ProgressPlugin,
   RuleSetRule,
+  WebpackOptionsNormalized,
   debug,
 } from 'webpack';
 import { AssetPatternClass } from '../../browser/schema';
-import { BuildBrowserFeatures, maxWorkers } from '../../utils';
+import { BuildBrowserFeatures } from '../../utils';
 import { WebpackConfigOptions } from '../../utils/build-options';
 import { findCachePath } from '../../utils/cache-path';
 import {
   allowMangle,
   allowMinify,
   cachingDisabled,
+  maxWorkers,
+  persistentBuildCacheEnabled,
   profilingEnabled,
-  shouldBeautify,
 } from '../../utils/environment-options';
 import { findAllNodeModules } from '../../utils/find-up';
 import { Spinner } from '../../utils/spinner';
 import { addError } from '../../utils/webpack-diagnostics';
+import { DedupeModuleResolvePlugin, ScriptsWebpackPlugin } from '../plugins';
+import { JavaScriptOptimizerPlugin } from '../plugins/javascript-optimizer-plugin';
 import {
-  DedupeModuleResolvePlugin,
-  OptimizeCssWebpackPlugin,
-  ScriptsWebpackPlugin,
-} from '../plugins';
-import { getEsVersionForFileName, getOutputHashFormat, getWatchOptions, normalizeExtraEntryPoints } from '../utils/helpers';
-import { IGNORE_WARNINGS } from '../utils/stats';
-
-const TerserPlugin = require('terser-webpack-plugin');
+  getEsVersionForFileName,
+  getOutputHashFormat,
+  getWatchOptions,
+  normalizeExtraEntryPoints,
+} from '../utils/helpers';
 
-// tslint:disable-next-line:no-big-function
+// eslint-disable-next-line max-lines-per-function
 export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
   const { root, projectRoot, buildOptions, tsConfig } = wco;
   const {
     platform = 'browser',
-    sourceMap: {
-      styles: stylesSourceMap,
-      scripts: scriptsSourceMap,
-      vendor: vendorSourceMap,
-    },
-    optimization: {
-      styles: stylesOptimization,
-      scripts: scriptsOptimization,
-    },
+    sourceMap: { styles: stylesSourceMap, scripts: scriptsSourceMap, vendor: vendorSourceMap },
+    optimization: { styles: stylesOptimization, scripts: scriptsOptimization },
   } = buildOptions;
 
   const extraPlugins: { apply(compiler: Compiler): void }[] = [];
@@ -67,12 +68,44 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
 
   // determine hashing format
   const hashFormat = getOutputHashFormat(buildOptions.outputHashing || 'none');
+  const buildBrowserFeatures = new BuildBrowserFeatures(projectRoot);
 
   const targetInFileName = getEsVersionForFileName(
     tsConfig.options.target,
     buildOptions.differentialLoadingNeeded,
   );
 
+  if (buildOptions.progress) {
+    const spinner = new Spinner();
+    spinner.start(`Generating ${platform} application bundles (phase: setup)...`);
+
+    extraPlugins.push(
+      new ProgressPlugin({
+        handler: (percentage: number, message: string) => {
+          const phase = message ? ` (phase: ${message})` : '';
+          spinner.text = `Generating ${platform} application bundles${phase}...`;
+
+          switch (percentage) {
+            case 1:
+              if (spinner.isSpinning) {
+                spinner.succeed(
+                  `${platform.replace(/^\w/, (s) =>
+                    s.toUpperCase(),
+                  )} application bundle generation complete.`,
+                );
+              }
+              break;
+            case 0:
+              if (!spinner.isSpinning) {
+                spinner.start();
+              }
+              break;
+          }
+        },
+      }),
+    );
+  }
+
   if (buildOptions.main) {
     const mainPath = path.resolve(root, buildOptions.main);
     entryPoints['main'] = [mainPath];
@@ -81,10 +114,6 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
   const differentialLoadingMode = buildOptions.differentialLoadingNeeded && !buildOptions.watch;
   if (platform !== 'server') {
     if (differentialLoadingMode || tsConfig.options.target === ScriptTarget.ES5) {
-      const buildBrowserFeatures = new BuildBrowserFeatures(
-        projectRoot,
-      );
-
       if (buildBrowserFeatures.isEs5SupportNeeded()) {
         const polyfillsChunkName = 'polyfills-es5';
         entryPoints[polyfillsChunkName] = [path.join(__dirname, '..', 'es5-polyfills.js')];
@@ -145,13 +174,11 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
       }
     }
 
-    const existingEntry = prev.find(el => el.bundleName === bundleName);
+    const existingEntry = prev.find((el) => el.bundleName === bundleName);
     if (existingEntry) {
       if (existingEntry.inject && !inject) {
         // All entries have to be lazy for the bundle to be lazy.
-        throw new Error(
-          `The ${bundleName} bundle is mixing injected and non-injected scripts.`,
-        );
+        throw new Error(`The ${bundleName} bundle is mixing injected and non-injected scripts.`);
       }
 
       existingEntry.paths.push(resolvedPath);
@@ -172,88 +199,62 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
     const hash = script.inject ? hashFormat.script : '';
     const bundleName = script.bundleName;
 
-    extraPlugins.push(new ScriptsWebpackPlugin({
-      name: bundleName,
-      sourceMap: scriptsSourceMap,
-      filename: `${path.basename(bundleName)}${hash}.js`,
-      scripts: script.paths,
-      basePath: projectRoot,
-    }));
+    extraPlugins.push(
+      new ScriptsWebpackPlugin({
+        name: bundleName,
+        sourceMap: scriptsSourceMap,
+        filename: `${path.basename(bundleName)}${hash}.js`,
+        scripts: script.paths,
+        basePath: projectRoot,
+      }),
+    );
   }
 
   // process asset entries
   if (buildOptions.assets.length) {
-    const copyWebpackPluginPatterns = buildOptions.assets.map((asset: AssetPatternClass) => {
-      // Resolve input paths relative to workspace root and add slash at the end.
-      // tslint:disable-next-line: prefer-const
-      let { input, output, ignore = [], glob } = asset;
-      input = path.resolve(root, input).replace(/\\/g, '/');
-      input = input.endsWith('/') ? input : input + '/';
-      output = output.endsWith('/') ? output : output + '/';
-
-      if (output.startsWith('..')) {
-        throw new Error('An asset cannot be written to a location outside of the output path.');
-      }
-
-      return {
-        context: input,
-        // Now we remove starting slash to make Webpack place it from the output root.
-        to: output.replace(/^\//, ''),
-        from: glob,
-        noErrorOnMissing: true,
-        force: true,
-        globOptions: {
-          dot: true,
-          followSymbolicLinks: !!asset.followSymlinks,
-          ignore: [
-            '.gitkeep',
-            '**/.DS_Store',
-            '**/Thumbs.db',
-            // Negate patterns needs to be absolute because copy-webpack-plugin uses absolute globs which
-            // causes negate patterns not to match.
-            // See: https://github.com/webpack-contrib/copy-webpack-plugin/issues/498#issuecomment-639327909
-            ...ignore,
-          ].map(i => path.posix.join(input, i)),
-        },
-      };
-    });
-
-    extraPlugins.push(new CopyWebpackPlugin({
-      patterns: copyWebpackPluginPatterns,
-    // The typings for copy-webpack-plugin use the old @types/webpack package
-    // tslint:disable-next-line: no-any
-    }) as any);
-  }
-
-  if (buildOptions.progress) {
-    const spinner = new Spinner();
-
-    let previousPercentage: number | undefined;
-    extraPlugins.push(new ProgressPlugin({
-      handler: (percentage: number, message: string) => {
-        if (previousPercentage === 1 && percentage !== 0) {
-          // In some scenarios in Webpack 5 percentage goes from 1 back to 0.99.
-          // Ex: 0.99 -> 1 -> 0.99 -> 1
-          // This causes the "complete" message to be displayed multiple times.
-
-          return;
-        }
-
-        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;
+    const copyWebpackPluginPatterns = buildOptions.assets.map(
+      (asset: AssetPatternClass, index: number): ObjectPattern => {
+        // Resolve input paths relative to workspace root and add slash at the end.
+        // eslint-disable-next-line prefer-const
+        let { input, output, ignore = [], glob } = asset;
+        input = path.resolve(root, input).replace(/\\/g, '/');
+        input = input.endsWith('/') ? input : input + '/';
+        output = output.endsWith('/') ? output : output + '/';
+
+        if (output.startsWith('..')) {
+          throw new Error('An asset cannot be written to a location outside of the output path.');
         }
 
-        previousPercentage = percentage;
+        return {
+          context: input,
+          // Now we remove starting slash to make Webpack place it from the output root.
+          to: output.replace(/^\//, ''),
+          from: glob,
+          noErrorOnMissing: true,
+          force: true,
+          globOptions: {
+            dot: true,
+            followSymbolicLinks: !!asset.followSymlinks,
+            ignore: [
+              '.gitkeep',
+              '**/.DS_Store',
+              '**/Thumbs.db',
+              // Negate patterns needs to be absolute because copy-webpack-plugin uses absolute globs which
+              // causes negate patterns not to match.
+              // See: https://github.com/webpack-contrib/copy-webpack-plugin/issues/498#issuecomment-639327909
+              ...ignore,
+            ].map((i) => path.posix.join(input, i)),
+          },
+          priority: index,
+        };
       },
-    }));
+    );
+
+    extraPlugins.push(
+      new CopyWebpackPlugin({
+        patterns: copyWebpackPluginPatterns,
+      }),
+    );
   }
 
   if (buildOptions.showCircularDependencies) {
@@ -265,6 +266,21 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
     );
   }
 
+  if (buildOptions.extractLicenses) {
+    const LicenseWebpackPlugin = require('license-webpack-plugin').LicenseWebpackPlugin;
+    extraPlugins.push(
+      new LicenseWebpackPlugin({
+        stats: {
+          warnings: false,
+          errors: false,
+        },
+        perChunkOutput: false,
+        outputFilename: '3rdpartylicenses.txt',
+        skipChildCompilers: true,
+      }),
+    );
+  }
+
   if (buildOptions.statsJson) {
     extraPlugins.push(
       new (class {
@@ -272,7 +288,7 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
           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(root, buildOptions.outputPath, 'stats.json');
+            const statsOutputPath = path.resolve(root, buildOptions.outputPath, 'stats.json');
 
             try {
               await fsPromises.mkdir(path.dirname(statsOutputPath), { recursive: true });
@@ -295,19 +311,28 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
     );
   }
 
-  if ((scriptsSourceMap || stylesSourceMap)) {
+  if (scriptsSourceMap || stylesSourceMap) {
     extraRules.push({
       test: /\.m?js$/,
-      exclude: vendorSourceMap
-        ? undefined
-        : /[\\\/]node_modules[\\\/]/,
       enforce: 'pre',
       loader: require.resolve('source-map-loader'),
+      options: {
+        filterSourceMappingUrl: (_mapUri: string, resourcePath: string) => {
+          if (vendorSourceMap) {
+            // Consume all sourcemaps when vendor option is enabled.
+            return true;
+          }
+
+          // Don't consume sourcemaps in node_modules when vendor is disabled.
+          // But, do consume local libraries sourcemaps.
+          return !resourcePath.includes('node_modules');
+        },
+      },
     });
   }
 
   let buildOptimizerUseRule: RuleSetRule[] = [];
-  if (buildOptions.buildOptimizer) {
+  if (buildOptions.buildOptimizer && wco.scriptTarget < ScriptTarget.ES2015) {
     extraPlugins.push(new BuildOptimizerWebpackPlugin());
     buildOptimizerUseRule = [
       {
@@ -318,92 +343,42 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
   }
 
   const extraMinimizers = [];
-  if (stylesOptimization.minify) {
-    extraMinimizers.push(
-      new OptimizeCssWebpackPlugin({
-        sourceMap: stylesSourceMap,
-        // component styles retain their original file name
-        test: file => /\.(?:css|scss|sass|less|styl)$/.test(file),
-      }),
-    );
-  }
 
   if (scriptsOptimization) {
-    const { GLOBAL_DEFS_FOR_TERSER, GLOBAL_DEFS_FOR_TERSER_WITH_AOT } = require('@angular/compiler-cli');
-    const angularGlobalDefinitions = buildOptions.aot
-      ? GLOBAL_DEFS_FOR_TERSER_WITH_AOT
-      : GLOBAL_DEFS_FOR_TERSER;
-
-    // TODO: Investigate why this fails for some packages: wco.supportES2015 ? 6 : 5;
-    const terserEcma = 5;
-
-    const terserOptions = {
-      warnings: !!buildOptions.verbose,
-      safari10: true,
-      output: {
-        ecma: terserEcma,
-        // For differential loading, this is handled in the bundle processing.
-        ascii_only: !differentialLoadingMode,
-        // Default behavior (undefined value) is to keep only important comments (licenses, etc.)
-        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 &&
-        (platform === 'server'
-          ? {
-            ecma: terserEcma,
-            global_defs: angularGlobalDefinitions,
-            keep_fnames: true,
-          }
-          : {
-            ecma: terserEcma,
-            pure_getters: buildOptions.buildOptimizer,
-            // PURE comments work best with 3 passes.
-            // See https://github.com/webpack/webpack/issues/2899#issuecomment-317425926.
-            passes: buildOptions.buildOptimizer ? 3 : 1,
-            global_defs: angularGlobalDefinitions,
-            pure_funcs: ['forwardRef'],
-          }),
-      // We also want to avoid mangling on server.
-      // Name mangling is handled within the browser builder
-      mangle: allowMangle && platform !== 'server' && !differentialLoadingMode,
-    };
+    const globalScriptsNames = globalScriptsByBundleName.map((s) => s.bundleName);
 
-    const globalScriptsNames = globalScriptsByBundleName.map(s => s.bundleName);
-    extraMinimizers.push(
-      new TerserPlugin({
-        sourceMap: scriptsSourceMap,
-        parallel: maxWorkers,
-        cache: !cachingDisabled && findCachePath('terser-webpack'),
-        extractComments: false,
-        exclude: globalScriptsNames,
-        terserOptions,
-      }),
+    if (globalScriptsNames.length > 0) {
       // Script bundles are fully optimized here in one step since they are never downleveled.
       // They are shared between ES2015 & ES5 outputs so must support ES5.
-      new TerserPlugin({
-        sourceMap: scriptsSourceMap,
-        parallel: maxWorkers,
-        cache: !cachingDisabled && findCachePath('terser-webpack'),
-        extractComments: false,
-        include: globalScriptsNames,
-        terserOptions: {
-          ...terserOptions,
-          compress: allowMinify && {
-            ...terserOptions.compress,
-            ecma: 5,
-          },
-          output: {
-            ...terserOptions.output,
+      // The `terser-webpack-plugin` will add the minified flag to the asset which will prevent
+      // additional optimizations by the next plugin.
+      const TerserPlugin = require('terser-webpack-plugin');
+      extraMinimizers.push(
+        new TerserPlugin({
+          parallel: maxWorkers,
+          extractComments: false,
+          include: globalScriptsNames,
+          terserOptions: {
             ecma: 5,
+            compress: allowMinify,
+            output: {
+              ascii_only: true,
+              wrap_func_args: false,
+            },
+            mangle: allowMangle && platform !== 'server',
           },
-          mangle: allowMangle && platform !== 'server',
-        },
+        }),
+      );
+    }
+
+    extraMinimizers.push(
+      new JavaScriptOptimizerPlugin({
+        define: buildOptions.aot ? GLOBAL_DEFS_FOR_TERSER_WITH_AOT : GLOBAL_DEFS_FOR_TERSER,
+        sourcemap: scriptsSourceMap,
+        target: wco.scriptTarget,
+        keepNames: !allowMangle || platform === 'server',
+        removeLicenses: buildOptions.extractLicenses,
+        advanced: buildOptions.buildOptimizer,
       }),
     );
   }
@@ -411,12 +386,19 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
   return {
     mode: scriptsOptimization || stylesOptimization.minify ? 'production' : 'development',
     devtool: false,
+    target: [
+      platform === 'server' ? 'node' : 'web',
+      tsConfig.options.target === ScriptTarget.ES5 ||
+      (platform !== 'server' && buildBrowserFeatures.isEs5SupportNeeded())
+        ? 'es5'
+        : 'es2015',
+    ],
     profile: buildOptions.statsJson,
     resolve: {
       roots: [projectRoot],
       extensions: ['.ts', '.tsx', '.mjs', '.js'],
       symlinks: !buildOptions.preserveSymlinks,
-      modules: [wco.tsConfig.options.baseUrl || projectRoot, 'node_modules'],
+      modules: [tsConfig.options.baseUrl || projectRoot, 'node_modules'],
     },
     resolveLoader: {
       symlinks: !buildOptions.preserveSymlinks,
@@ -431,8 +413,9 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
     context: root,
     entry: entryPoints,
     output: {
+      clean: buildOptions.deleteOutputPath ?? true,
       path: path.resolve(root, buildOptions.outputPath),
-      publicPath: buildOptions.deployUrl,
+      publicPath: buildOptions.deployUrl ?? '',
       filename: ({ chunk }) => {
         if (chunk?.name === 'polyfills-es5') {
           return `polyfills-es5${hashFormat.chunk}.js`;
@@ -440,14 +423,22 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
           return `[name]${targetInFileName}${hashFormat.chunk}.js`;
         }
       },
-      chunkFilename: `[id]${targetInFileName}${hashFormat.chunk}.js`,
+      chunkFilename: `[name]${targetInFileName}${hashFormat.chunk}.js`,
     },
     watch: buildOptions.watch,
     watchOptions: getWatchOptions(buildOptions.poll),
     performance: {
       hints: false,
     },
-    ignoreWarnings: IGNORE_WARNINGS,
+    ignoreWarnings: [
+      // 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,
+      // https://github.com/webpack-contrib/source-map-loader/blob/b2de4249c7431dd8432da607e08f0f65e9d64219/src/index.js#L83
+      /Failed to parse source map from/,
+      // https://github.com/webpack-contrib/postcss-loader/blob/bd261875fdf9c596af4ffb3a1a73fe3c549befda/src/index.js#L153-L158
+      /Add postcss as project dependency/,
+    ],
     module: {
       // Show an error for missing exports instead of a warning.
       strictExportPresence: true,
@@ -467,7 +458,9 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
         },
         {
           test: /\.[cm]?js$|\.tsx?$/,
-          exclude: [/[\/\\](?:core-js|\@babel|tslib|web-animations-js)[\/\\]/],
+          // The below is needed due to a bug in `@babel/runtime`. See: https://github.com/babel/babel/issues/12824
+          resolve: { fullySpecified: false },
+          exclude: [/[/\\](?:core-js|@babel|tslib|web-animations-js|web-streams-polyfill)[/\\]/],
           use: [
             {
               loader: require.resolve('../../babel/webpack-loader'),
@@ -475,6 +468,7 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
                 cacheDirectory: findCachePath('babel-webpack'),
                 scriptTarget: wco.scriptTarget,
                 aot: buildOptions.aot,
+                optimize: buildOptions.buildOptimizer && wco.scriptTarget >= ScriptTarget.ES2015,
               },
             },
             ...buildOptimizerUseRule,
@@ -483,7 +477,11 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
         ...extraRules,
       ],
     },
-    cache: !!buildOptions.watch && !cachingDisabled,
+    experiments: {
+      syncWebAssembly: true,
+      asyncWebAssembly: true,
+    },
+    cache: getCacheSettings(wco, buildBrowserFeatures.supportedBrowsers),
     optimization: {
       minimizer: extraMinimizers,
       moduleIds: 'deterministic',
@@ -493,9 +491,55 @@ export function getCommonConfig(wco: WebpackConfigOptions): Configuration {
     plugins: [
       // Always replace the context for the System.import in angular/core to prevent warnings.
       // https://github.com/angular/angular/issues/11580
-      new ContextReplacementPlugin(/\@angular(\\|\/)core(\\|\/)/, path.join(projectRoot, '$_lazy_route_resources'), {}),
+      new ContextReplacementPlugin(
+        /\@angular(\\|\/)core(\\|\/)/,
+        path.join(projectRoot, '$_lazy_route_resources'),
+        {},
+      ),
       new DedupeModuleResolvePlugin({ verbose: buildOptions.verbose }),
       ...extraPlugins,
     ],
   };
 }
+
+function getCacheSettings(
+  wco: WebpackConfigOptions,
+  supportedBrowsers: string[],
+): WebpackOptionsNormalized['cache'] {
+  if (persistentBuildCacheEnabled) {
+    const packageVersion = require('../../../package.json').version;
+
+    return {
+      type: 'filesystem',
+      cacheDirectory: findCachePath('angular-webpack'),
+      maxMemoryGenerations: 1,
+      // We use the versions and build options as the cache name. The Webpack configurations are too
+      // dynamic and shared among different build types: test, build and serve.
+      // None of which are "named".
+      name: createHash('sha1')
+        .update(NG_VERSION.full)
+        .update(packageVersion)
+        .update(wco.projectRoot)
+        .update(JSON.stringify(wco.tsConfig))
+        .update(
+          JSON.stringify({
+            ...wco.buildOptions,
+            // Needed because outputPath changes on every build when using i18n extraction
+            // https://github.com/angular/angular-cli/blob/736a5f89deaca85f487b78aec9ff66d4118ceb6a/packages/angular_devkit/build_angular/src/utils/i18n-options.ts#L264-L265
+            outputPath: undefined,
+          }),
+        )
+        .update(supportedBrowsers.join(''))
+        .digest('hex'),
+    };
+  }
+
+  if (wco.buildOptions.watch && !cachingDisabled) {
+    return {
+      type: 'memory',
+      maxGenerations: 1,
+    };
+  }
+
+  return false;
+}
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
index 50466b039638..9b57696783d6 100644
--- a/packages/angular_devkit/build_angular/src/webpack/configs/dev-server.ts
+++ b/packages/angular_devkit/build_angular/src/webpack/configs/dev-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
@@ -43,7 +43,8 @@ export function getDevServerConfig(
   } = wco;
 
   const servePath = buildServePath(wco.buildOptions, logger);
-  const { styles: stylesOptimization, scripts: scriptsOptimization } = normalizeOptimization(optimization);
+  const { styles: stylesOptimization, scripts: scriptsOptimization } =
+    normalizeOptimization(optimization);
 
   const extraPlugins = [];
 
@@ -64,10 +65,11 @@ export function getDevServerConfig(
     // 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
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       apply: (compiler: any) => {
         compiler.hooks.afterEnvironment.tap('angular-cli', () => {
-          compiler.watchFileSystem = { watch: () => { } };
+          // eslint-disable-next-line @typescript-eslint/no-empty-function
+          compiler.watchFileSystem = { watch: () => {} };
         });
       },
     });
@@ -77,7 +79,7 @@ export function getDevServerConfig(
   if (hmr) {
     extraRules.push({
       loader: HmrLoader,
-      include: [main].map(p => resolve(wco.root, p)),
+      include: [main].map((p) => resolve(wco.root, p)),
     });
   }
 
@@ -100,13 +102,13 @@ export function getDevServerConfig(
         rewrites: [
           {
             from: new RegExp(`^(?!${servePath})/.*`),
-            to: context => url.format(context.parsedUrl),
+            to: (context) => url.format(context.parsedUrl),
           },
         ],
       },
       sockPath: posix.join(servePath, 'sockjs-node'),
       stats: false,
-      compress: stylesOptimization.minify || scriptsOptimization,
+      compress: false,
       watchOptions: getWatchOptions(poll),
       https: getSslConfig(root, wco.buildOptions),
       overlay: {
@@ -121,16 +123,16 @@ export function getDevServerConfig(
       inline: hmr,
       publicPath: servePath,
       liveReload,
+      injectClient: liveReload,
       hotOnly: hmr && !liveReload,
       hot: hmr,
       proxy: addProxyConfig(root, proxyConfig),
       contentBase: false,
-      logLevel: 'silent',
+      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.
@@ -166,10 +168,7 @@ export function buildServePath(
  * Private method to enhance a webpack config with SSL configuration.
  * @private
  */
-function getSslConfig(
-  root: string,
-  options: WebpackDevServerOptions,
-) {
+function getSslConfig(root: string, options: WebpackDevServerOptions) {
   const { ssl, sslCert, sslKey } = options;
   if (ssl && sslCert && sslKey) {
     return {
@@ -185,10 +184,7 @@ function getSslConfig(
  * Private method to enhance a webpack config with Proxy configuration.
  * @private
  */
-function addProxyConfig(
-  root: string,
-  proxyConfig: string | undefined,
-) {
+function addProxyConfig(root: string, proxyConfig: string | undefined) {
   if (!proxyConfig) {
     return undefined;
   }
@@ -220,7 +216,7 @@ function findDefaultServePath(baseHref?: string, deployUrl?: string): string | n
   // normalize baseHref
   // for ng serve the starting base is always `/` so a relative
   // and root relative value are identical
-  const baseHrefParts = (baseHref || '').split('/').filter(part => part !== '');
+  const baseHrefParts = (baseHref || '').split('/').filter((part) => part !== '');
   if (baseHref && !baseHref.endsWith('/')) {
     baseHrefParts.pop();
   }
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 badd91583a97..7bd7532ab545 100644
--- a/packages/angular_devkit/build_angular/src/webpack/configs/index.ts
+++ b/packages/angular_devkit/build_angular/src/webpack/configs/index.ts
@@ -1,10 +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
  */
+
+export * from './analytics';
 export * from './browser';
 export * from './common';
 export * from './dev-server';
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 ca19993a0c6d..82241e555831 100644
--- a/packages/angular_devkit/build_angular/src/webpack/configs/server.ts
+++ b/packages/angular_devkit/build_angular/src/webpack/configs/server.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 { isAbsolute } from 'path';
 import { Configuration, ContextReplacementPlugin } from 'webpack';
 import { WebpackConfigOptions } from '../../utils/build-options';
@@ -15,11 +16,7 @@ import { getSourceMapDevTool } from '../utils/helpers';
  * @param wco Options which include the build options and app config
  */
 export function getServerConfig(wco: WebpackConfigOptions): Configuration {
-  const {
-    sourceMap,
-    bundleDependencies,
-    externalDependencies = [],
-  } = wco.buildOptions;
+  const { sourceMap, bundleDependencies, externalDependencies = [] } = wco.buildOptions;
 
   const extraPlugins = [];
   const { scripts, styles, hidden } = sourceMap;
@@ -38,10 +35,17 @@ export function getServerConfig(wco: WebpackConfigOptions): Configuration {
     resolve: {
       mainFields: ['es2015', 'main', 'module'],
     },
-    target: 'node',
     output: {
       libraryTarget: 'commonjs',
     },
+    module: {
+      parser: {
+        javascript: {
+          worker: false,
+          url: false,
+        },
+      },
+    },
     plugins: [
       // Fixes Critical dependency: the request of a dependency is an expression
       new ContextReplacementPlugin(/@?hapi(\\|\/)/),
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 dca47f16a4d1..204b0caaab4a 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
@@ -15,19 +15,17 @@ const webpackOutputOptions = {
   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,
-  reasons: false,
   warnings: true,
   errors: true,
   assets: true, // required by custom stat output
-  version: false,
-  errorDetails: false,
-  moduleTrace: false,
+  cachedAssets: true, // required for bundle size calculators
+
+  // Needed for markAsyncChunksNonInitial.
+  ids: true,
+  entrypoints: true,
 };
 
-const verboseWebpackOutputOptions:  Record<string, boolean | string | number> = {
+const verboseWebpackOutputOptions: Record<string, boolean | string | number> = {
   // The verbose output will most likely be piped to a file, so colors just mess it up.
   colors: false,
   usedExports: true,
@@ -40,10 +38,9 @@ const verboseWebpackOutputOptions:  Record<string, boolean | string | number> =
   errorDetails: true,
   moduleTrace: true,
   logging: 'verbose',
+  modulesSpace: Infinity,
 };
 
-verboseWebpackOutputOptions['modulesSpace'] = Infinity;
-
 export function getWebpackStatsConfig(verbose = false) {
   return verbose
     ? { ...webpackOutputOptions, ...verboseWebpackOutputOptions }
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 288653c610a5..64510555881e 100644
--- a/packages/angular_devkit/build_angular/src/webpack/configs/styles.ts
+++ b/packages/angular_devkit/build_angular/src/webpack/configs/styles.ts
@@ -1,22 +1,26 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of 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';
 import * as webpack from 'webpack';
 import { ExtraEntryPoint } from '../../browser/schema';
+import { SassWorkerImplementation } from '../../sass/sass-service';
 import { BuildBrowserFeatures } from '../../utils/build-browser-features';
 import { WebpackConfigOptions } from '../../utils/build-options';
+import { maxWorkers } from '../../utils/environment-options';
 import {
   AnyComponentStyleBudgetChecker,
   PostcssCliResources,
   RemoveHashPlugin,
   SuppressExtractedTextChunksWebpackPlugin,
 } from '../plugins';
+import { EsbuildExecutor } from '../plugins/esbuild-executor';
 import {
   assetNameTemplateFactory,
   getOutputHashFormat,
@@ -67,7 +71,7 @@ function resolveGlobalStyles(
   return { entryPoints, noInjectNames, paths };
 }
 
-// tslint:disable-next-line: no-big-function
+// eslint-disable-next-line max-lines-per-function
 export function getStylesConfig(wco: WebpackConfigOptions): webpack.Configuration {
   const MiniCssExtractPlugin = require('mini-css-extract-plugin');
   const postcssImports = require('postcss-import');
@@ -88,26 +92,39 @@ export function getStylesConfig(wco: WebpackConfigOptions): webpack.Configuratio
     buildOptions.stylePreprocessorOptions?.includePaths?.map((p) => path.resolve(root, p)) ?? [];
 
   // Process global styles.
-  const { entryPoints, noInjectNames, paths: globalStylePaths } = resolveGlobalStyles(
-    buildOptions.styles,
-    root,
-    !!buildOptions.preserveSymlinks,
-  );
+  const {
+    entryPoints,
+    noInjectNames,
+    paths: globalStylePaths,
+  } = resolveGlobalStyles(buildOptions.styles, root, !!buildOptions.preserveSymlinks);
   if (noInjectNames.length > 0) {
     // Add plugin to remove hashes from lazy styles.
     extraPlugins.push(new RemoveHashPlugin({ chunkNames: noInjectNames, hashFormat }));
   }
 
-  let sassImplementation: {} | undefined;
+  if (globalStylePaths.some((p) => p.endsWith('.styl'))) {
+    wco.logger.warn(
+      'Stylus usage is deprecated and will be removed in a future major version. ' +
+        'To opt-out of the deprecated behaviour, please migrate to another stylesheet language.',
+    );
+  }
+
+  let sassImplementation: SassWorkerImplementation | undefined;
   try {
-    // tslint:disable-next-line:no-implicit-dependencies
     sassImplementation = require('node-sass');
     wco.logger.warn(
       `'node-sass' usage is deprecated and will be removed in a future major version. ` +
         `To opt-out of the deprecated behaviour and start using 'sass' uninstall 'node-sass'.`,
     );
   } catch {
-    sassImplementation = require('sass');
+    sassImplementation = new SassWorkerImplementation();
+    extraPlugins.push({
+      apply(compiler) {
+        compiler.hooks.shutdown.tap('sass-worker', () => {
+          sassImplementation?.close();
+        });
+      },
+    });
   }
 
   const assetNameTemplate = assetNameTemplateFactory(hashFormat);
@@ -141,13 +158,21 @@ export function getStylesConfig(wco: WebpackConfigOptions): webpack.Configuratio
       );
     }
     if (tailwindPackagePath) {
+      if (process.env['TAILWIND_MODE'] === undefined) {
+        process.env['TAILWIND_MODE'] = buildOptions.watch ? 'watch' : 'build';
+      }
       extraPostcssPlugins.push(require(tailwindPackagePath)({ config: tailwindConfigPath }));
     }
   }
 
   const { supportedBrowsers } = new BuildBrowserFeatures(wco.projectRoot);
+  const postcssPresetEnvPlugin = postcssPresetEnv({
+    browsers: supportedBrowsers,
+    autoprefixer: true,
+    stage: 3,
+  });
   const postcssOptionsCreator = (inlineSourcemaps: boolean, extracted: boolean | undefined) => {
-    // tslint:disable-next-line: no-any
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const optionGenerator = (loader: any) => ({
       map: inlineSourcemaps
         ? {
@@ -183,12 +208,7 @@ export function getStylesConfig(wco: WebpackConfigOptions): webpack.Configuratio
           extracted,
         }),
         ...extraPostcssPlugins,
-        postcssPresetEnv({
-          // tslint:disable-next-line: no-any
-          browsers: supportedBrowsers as any, // Typings only allow a string
-          autoprefixer: true,
-          stage: 3,
-        }),
+        postcssPresetEnvPlugin,
       ],
     });
     // postcss-loader fails when trying to determine configuration files for data URIs
@@ -219,12 +239,14 @@ export function getStylesConfig(wco: WebpackConfigOptions): webpack.Configuratio
     }
   }
 
+  const postCss = require('postcss');
+  const postCssLoaderPath = require.resolve('postcss-loader');
+
   const componentStyleLoaders: webpack.RuleSetUseItem[] = [
-    { loader: require.resolve('raw-loader') },
     {
-      loader: require.resolve('postcss-loader'),
+      loader: postCssLoaderPath,
       options: {
-        implementation: require('postcss'),
+        implementation: postCss,
         postcssOptions: postcssOptionsCreator(componentsSourceMap, false),
       },
     },
@@ -244,28 +266,92 @@ export function getStylesConfig(wco: WebpackConfigOptions): webpack.Configuratio
       },
     },
     {
-      loader: require.resolve('postcss-loader'),
+      loader: postCssLoaderPath,
       options: {
-        implementation: require('postcss'),
+        implementation: postCss,
         postcssOptions: postcssOptionsCreator(false, buildOptions.extractCss),
         sourceMap: !!cssSourceMap,
       },
     },
   ];
 
+  const extraMinimizers = [];
+  if (buildOptions.optimization.styles.minify) {
+    const CssMinimizerPlugin = require('css-minimizer-webpack-plugin');
+    const esbuild = new EsbuildExecutor();
+
+    const 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,
+          // 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,
+          // Workaround for Critters as it doesn't work when `@media all {}` is minified to `@media {}`.
+          // TODO: Remove once they move to postcss.
+          minifyParams: !buildOptions.optimization.styles.inlineCritical,
+        },
+      ],
+    };
+
+    const globalBundlesRegExp = new RegExp(
+      `^(${Object.keys(entryPoints).join('|')})(\.[0-9a-f]{20})?.css$`,
+    );
+
+    const target = transformSupportedBrowsersToTargets(supportedBrowsers);
+    extraMinimizers.push(
+      // Component styles use esbuild which is faster and generates smaller files on average.
+      // esbuild does not yet support style sourcemaps but component style sourcemaps are not
+      // supported by the CLI when style minify is enabled.
+      new CssMinimizerPlugin({
+        // Component styles retain their original file name
+        test: /\.(?:css|scss|sass|less|styl)$/,
+        exclude: globalBundlesRegExp,
+        parallel: false,
+        minify: async (data: string) => {
+          const [[sourcefile, input]] = Object.entries(data);
+          const { code, warnings } = await esbuild.transform(input, {
+            loader: 'css',
+            minify: true,
+            sourcefile,
+            target,
+          });
+
+          return {
+            code,
+            warnings:
+              warnings.length > 0
+                ? await esbuild.formatMessages(warnings, { kind: 'warning' })
+                : [],
+          };
+        },
+      }),
+      // Global styles use cssnano since sourcemap support is required even when minify
+      // is enabled. Once esbuild supports style sourcemaps this can be changed.
+      // esbuild stylesheet source map support issue: https://github.com/evanw/esbuild/issues/519
+      new CssMinimizerPlugin({
+        test: /\.css$/,
+        include: globalBundlesRegExp,
+        parallel: maxWorkers,
+        minify: [CssMinimizerPlugin.cssnanoMinify],
+        minimizerOptions: cssnanoOptions,
+      }),
+    );
+  }
+
   const styleLanguages: {
     extensions: string[];
-    mimetype?: string;
     use: webpack.RuleSetUseItem[];
   }[] = [
     {
       extensions: ['css'],
-      mimetype: 'text/css',
       use: [],
     },
     {
       extensions: ['scss'],
-      mimetype: 'text/x-scss',
       use: [
         {
           loader: require.resolve('resolve-url-loader'),
@@ -279,14 +365,18 @@ export function getStylesConfig(wco: WebpackConfigOptions): webpack.Configuratio
             implementation: sassImplementation,
             sourceMap: true,
             sassOptions: {
+              // Prevent use of `fibers` package as it no longer works in newer Node.js versions
+              fiber: false,
               // bootstrap-sass requires a minimum precision of 8
               precision: 8,
               includePaths,
               // Use expanded as otherwise sass will remove comments that are needed for autoprefixer
               // Ex: /* autoprefixer grid: autoplace */
-              // tslint:disable-next-line: max-line-length
               // See: https://github.com/webpack-contrib/sass-loader/blob/45ad0be17264ceada5f0b4fb87e9357abe85c4ff/src/getSassOptions.js#L68-L70
               outputStyle: 'expanded',
+              // Silences compiler warnings from 3rd party stylesheets
+              quietDeps: !buildOptions.verbose,
+              verbose: buildOptions.verbose,
             },
           },
         },
@@ -294,7 +384,6 @@ export function getStylesConfig(wco: WebpackConfigOptions): webpack.Configuratio
     },
     {
       extensions: ['sass'],
-      mimetype: 'text/x-sass',
       use: [
         {
           loader: require.resolve('resolve-url-loader'),
@@ -308,15 +397,19 @@ export function getStylesConfig(wco: WebpackConfigOptions): webpack.Configuratio
             implementation: sassImplementation,
             sourceMap: true,
             sassOptions: {
+              // Prevent use of `fibers` package as it no longer works in newer Node.js versions
+              fiber: false,
               indentedSyntax: true,
               // bootstrap-sass requires a minimum precision of 8
               precision: 8,
               includePaths,
               // Use expanded as otherwise sass will remove comments that are needed for autoprefixer
               // Ex: /* autoprefixer grid: autoplace */
-              // tslint:disable-next-line: max-line-length
               // See: https://github.com/webpack-contrib/sass-loader/blob/45ad0be17264ceada5f0b4fb87e9357abe85c4ff/src/getSassOptions.js#L68-L70
               outputStyle: 'expanded',
+              // Silences compiler warnings from 3rd party stylesheets
+              quietDeps: !buildOptions.verbose,
+              verbose: buildOptions.verbose,
             },
           },
         },
@@ -324,7 +417,6 @@ export function getStylesConfig(wco: WebpackConfigOptions): webpack.Configuratio
     },
     {
       extensions: ['less'],
-      mimetype: 'text/x-less',
       use: [
         {
           loader: require.resolve('less-loader'),
@@ -341,7 +433,6 @@ export function getStylesConfig(wco: WebpackConfigOptions): webpack.Configuratio
     },
     {
       extensions: ['styl'],
-      mimetype: 'text/x-stylus',
       use: [
         {
           loader: require.resolve('stylus-loader'),
@@ -358,45 +449,69 @@ export function getStylesConfig(wco: WebpackConfigOptions): webpack.Configuratio
     },
   ];
 
-  const inlineLanguageRules: webpack.RuleSetRule[] = [];
-  const fileLanguageRules: webpack.RuleSetRule[] = [];
-  for (const language of styleLanguages) {
-    if (language.mimetype) {
-      // inline component styles use data URIs and processing is selected by mimetype
-      inlineLanguageRules.push({
-        mimetype: language.mimetype,
-        use: [...componentStyleLoaders, ...language.use],
-      });
-    }
-
-    fileLanguageRules.push({
-      test: new RegExp(`\\.(?:${language.extensions.join('|')})$`, 'i'),
-      rules: [
-        // Setup processing rules for global and component styles
-        {
-          oneOf: [
-            // Component styles are all styles except defined global styles
-            {
-              exclude: globalStylePaths,
-              use: componentStyleLoaders,
-            },
-            // Global styles are only defined global styles
-            {
-              include: globalStylePaths,
-              use: globalStyleLoaders,
-            },
-          ],
-        },
-        { use: language.use },
-      ],
-    });
-  }
-
   return {
     entry: entryPoints,
     module: {
-      rules: [...fileLanguageRules, ...inlineLanguageRules],
+      rules: styleLanguages.map(({ extensions, use }) => ({
+        test: new RegExp(`\\.(?:${extensions.join('|')})$`, 'i'),
+        rules: [
+          // Setup processing rules for global and component styles
+          {
+            oneOf: [
+              // Component styles are all styles except defined global styles
+              {
+                exclude: globalStylePaths,
+                use: componentStyleLoaders,
+                type: 'asset/source',
+              },
+              // Global styles are only defined global styles
+              {
+                include: globalStylePaths,
+                use: globalStyleLoaders,
+              },
+            ],
+          },
+          { use },
+        ],
+      })),
+    },
+    optimization: {
+      minimizer: extraMinimizers,
     },
     plugins: extraPlugins,
   };
 }
+
+function transformSupportedBrowsersToTargets(supportedBrowsers: string[]): string[] | undefined {
+  const transformed: string[] = [];
+
+  // https://esbuild.github.io/api/#target
+  const esBuildSupportedBrowsers = new Set(['safari', 'firefox', 'edge', 'chrome', 'ios']);
+
+  for (const browser of supportedBrowsers) {
+    let [browserName, version] = browser.split(' ');
+
+    // browserslist uses the name `ios_saf` for iOS Safari whereas esbuild uses `ios`
+    if (browserName === 'ios_saf') {
+      browserName = 'ios';
+    }
+
+    // browserslist uses ranges `15.2-15.3` versions but only the lowest is required
+    // to perform minimum supported feature checks. esbuild also expects a single version.
+    [version] = version.split('-');
+
+    if (browserName === 'ie') {
+      transformed.push('edge12');
+    } else if (esBuildSupportedBrowsers.has(browserName)) {
+      if (browserName === 'safari' && version === 'TP') {
+        // esbuild only supports numeric versions so `TP` is converted to a high number (999) since
+        // a Technology Preview (TP) of Safari is assumed to support all currently known features.
+        version = '999';
+      }
+
+      transformed.push(browserName + version);
+    }
+  }
+
+  return transformed.length ? transformed : undefined;
+}
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 ab89bb017d2b..98880763f2a1 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
@@ -8,6 +8,7 @@
 
 import * as glob from 'glob';
 import * as path from 'path';
+import { ScriptTarget } from 'typescript';
 import * as webpack from 'webpack';
 import { WebpackConfigOptions, WebpackTestOptions } from '../../utils/build-options';
 import { getSourceMapDevTool, isPolyfillsEntry } from '../utils/helpers';
@@ -16,7 +17,7 @@ export function getTestConfig(
   wco: WebpackConfigOptions<WebpackTestOptions>,
 ): webpack.Configuration {
   const {
-    buildOptions: { codeCoverage, codeCoverageExclude, main, sourceMap },
+    buildOptions: { codeCoverage, codeCoverageExclude, main, sourceMap, webWorkerTsConfig },
     root,
     sourceRoot,
   } = wco;
@@ -25,10 +26,7 @@ export function getTestConfig(
   const extraPlugins: { apply(compiler: webpack.Compiler): void }[] = [];
 
   if (codeCoverage) {
-    const exclude: (string | RegExp)[] = [
-      /\.(e2e|spec)\.tsx?$/,
-      /node_modules/,
-    ];
+    const exclude: (string | RegExp)[] = [/\.(e2e|spec)\.tsx?$/, /node_modules/];
 
     if (codeCoverageExclude) {
       for (const excludeGlob of codeCoverageExclude) {
@@ -49,18 +47,15 @@ export function getTestConfig(
   }
 
   if (sourceMap.scripts || sourceMap.styles) {
-    extraPlugins.push(getSourceMapDevTool(
-      sourceMap.scripts,
-      sourceMap.styles,
-      false,
-      true,
-    ));
+    extraPlugins.push(getSourceMapDevTool(sourceMap.scripts, sourceMap.styles, false, true));
   }
 
   return {
     mode: 'development',
+    target: wco.tsConfig.options.target === ScriptTarget.ES5 ? ['web', 'es5'] : 'web',
     resolve: {
       mainFields: ['es2015', 'browser', 'module', 'main'],
+      conditionNames: ['es2015', '...'],
     },
     devtool: false,
     entry: {
@@ -68,6 +63,15 @@ export function getTestConfig(
     },
     module: {
       rules: extraRules,
+      parser:
+        webWorkerTsConfig === undefined
+          ? {
+              javascript: {
+                worker: false,
+                url: false,
+              },
+            }
+          : undefined,
     },
     plugins: extraPlugins,
     optimization: {
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 e9d35ef1880e..4f3799321c94 100644
--- a/packages/angular_devkit/build_angular/src/webpack/configs/typescript.ts
+++ b/packages/angular_devkit/build_angular/src/webpack/configs/typescript.ts
@@ -1,14 +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 { buildOptimizerLoaderPath } from '@angular-devkit/build-optimizer';
+
 import { getSystemPath } from '@angular-devkit/core';
 import { CompilerOptions } from '@angular/compiler-cli';
 import { AngularWebpackLoaderPath, AngularWebpackPlugin } from '@ngtools/webpack';
+import { Configuration } from 'webpack';
 import { WebpackConfigOptions } from '../../utils/build-options';
 
 function ensureIvy(wco: WebpackConfigOptions): void {
@@ -51,20 +52,20 @@ function createIvyPlugin(
     }
   }
 
-  let inlineStyleMimeType;
+  let inlineStyleFileExtension;
   switch (buildOptions.inlineStyleLanguage) {
     case 'less':
-      inlineStyleMimeType = 'text/x-less';
+      inlineStyleFileExtension = 'less';
       break;
     case 'sass':
-      inlineStyleMimeType = 'text/x-sass';
+      inlineStyleFileExtension = 'sass';
       break;
     case 'scss':
-      inlineStyleMimeType = 'text/x-scss';
+      inlineStyleFileExtension = 'scss';
       break;
     case 'css':
     default:
-      inlineStyleMimeType = 'text/css';
+      inlineStyleFileExtension = 'css';
       break;
   }
 
@@ -74,61 +75,33 @@ function createIvyPlugin(
     fileReplacements,
     jitMode: !aot,
     emitNgModuleScope: !optimize,
-    inlineStyleMimeType,
+    inlineStyleFileExtension,
   });
 }
 
-export function getNonAotConfig(wco: WebpackConfigOptions) {
-  const { tsConfigPath } = wco;
-
-  return {
-    module: {
-      rules: [
-        {
-          test: /\.[jt]sx?$/,
-          loader: AngularWebpackLoaderPath,
-        },
-      ],
-    },
-    plugins: [
-      createIvyPlugin(wco, false, tsConfigPath),
-    ],
-  };
-}
+export function getTypeScriptConfig(wco: WebpackConfigOptions): Configuration {
+  const {
+    buildOptions: { aot = false, main, polyfills },
+    tsConfigPath,
+  } = wco;
 
-export function getAotConfig(wco: WebpackConfigOptions) {
-  const { tsConfigPath, buildOptions } = wco;
+  if (main || polyfills) {
+    ensureIvy(wco);
 
-  ensureIvy(wco);
+    return {
+      module: {
+        rules: [
+          {
+            test: /\.[jt]sx?$/,
+            loader: AngularWebpackLoaderPath,
+          },
+        ],
+      },
+      plugins: [createIvyPlugin(wco, aot, tsConfigPath)],
+    };
+  }
 
-  return {
-    module: {
-      rules: [
-        {
-          test: /\.tsx?$/,
-          use: [
-            ...(buildOptions.buildOptimizer
-              ? [
-                  {
-                    loader: buildOptimizerLoaderPath,
-                    options: { sourceMap: buildOptions.sourceMap.scripts },
-                  },
-                ]
-              : []),
-            AngularWebpackLoaderPath,
-          ],
-        },
-        // "allowJs" support with ivy plugin - ensures build optimizer is not run twice
-        {
-          test: /\.jsx?$/,
-          use: [AngularWebpackLoaderPath],
-        },
-      ],
-    },
-    plugins: [
-      createIvyPlugin(wco, true, tsConfigPath),
-    ],
-  };
+  return {};
 }
 
 export function getTypescriptWorkerPlugin(wco: WebpackConfigOptions, workerTsConfigPath: string) {
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 96145c4d21fb..fb60b4f1df44 100644
--- a/packages/angular_devkit/build_angular/src/webpack/configs/worker.ts
+++ b/packages/angular_devkit/build_angular/src/webpack/configs/worker.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 { resolve } from 'path';
 import { Configuration } from 'webpack';
 import { WebpackConfigOptions } from '../../utils/build-options';
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..43d7cc718aed 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,8 +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 'core-js/es/reflect';
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 caa670e6268e..5b57b1e86960 100644
--- a/packages/angular_devkit/build_angular/src/webpack/es5-polyfills.js
+++ b/packages/angular_devkit/build_angular/src/webpack/es5-polyfills.js
@@ -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
  */
-
 // ES2015 symbol capabilities
 import 'core-js/es/symbol';
 
@@ -114,4 +113,4 @@ import 'core-js/modules/es.json.to-string-tag';
 import 'regenerator-runtime/runtime';
 
 // Zone.js
-import 'zone.js/plugins/zone-legacy';
\ No newline at end of file
+import 'zone.js/plugins/zone-legacy';
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..5df753e031d4 100644
--- a/packages/angular_devkit/build_angular/src/webpack/jit-polyfills.js
+++ b/packages/angular_devkit/build_angular/src/webpack/jit-polyfills.js
@@ -1,8 +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 'core-js/proposals/reflect-metadata';
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 70867734c69b..a430bbb5abad 100644
--- a/packages/angular_devkit/build_angular/src/webpack/plugins/analytics.ts
+++ b/packages/angular_devkit/build_angular/src/webpack/plugins/analytics.ts
@@ -1,25 +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 { analytics } from '@angular-devkit/core';
-import {
-  Compilation,
-  Compiler,
-  Module,
-  Stats,
-  sources,
-} from 'webpack';
-
-const NormalModule = require('webpack/lib/NormalModule');
-
-interface NormalModule extends Module {
-  _source?: sources.OriginalSource | null;
-  resource?: string;
-}
+import { Compilation, Compiler, Module, NormalModule, Stats } from 'webpack';
 
 const webpackAllErrorMessageRe = /^([^(]+)\(\d+,\d\): (.*)$/gm;
 const webpackTsErrorMessageRe = /^[^(]+\(\d+,\d\): error (TS\d+):/;
@@ -43,7 +31,7 @@ export function countOccurrences(source: string, match: string, wordBreak = fals
     const re = /\w/;
     for (let pos = source.lastIndexOf(match); pos >= 0; pos = source.lastIndexOf(match, pos)) {
       if (!(re.test(source[pos - 1] || '') || re.test(source[pos + match.length] || ''))) {
-        count++;  // 1 match, AH! AH! AH! 2 matches, AH! AH! AH!
+        count++; // 1 match, AH! AH! AH! 2 matches, AH! AH! AH!
       }
 
       pos -= match.length;
@@ -53,7 +41,7 @@ export function countOccurrences(source: string, match: string, wordBreak = fals
     }
   } else {
     for (let pos = source.lastIndexOf(match); pos >= 0; pos = source.lastIndexOf(match, pos)) {
-      count++;  // 1 match, AH! AH! AH! 2 matches, AH! AH! AH!
+      count++; // 1 match, AH! AH! AH! 2 matches, AH! AH! AH!
       pos -= match.length;
       if (pos < 0) {
         break;
@@ -64,7 +52,6 @@ export function countOccurrences(source: string, match: string, wordBreak = fals
   return count;
 }
 
-
 /**
  * Holder of statistics related to the build.
  */
@@ -83,7 +70,6 @@ class AnalyticsBuildStats {
   public cssSize = 0;
 }
 
-
 /**
  * Analytics plugin that reports the analytics we want from the CLI.
  */
@@ -96,8 +82,7 @@ export class NgBuildAnalyticsPlugin {
     protected _analytics: analytics.Analytics,
     protected _category: string,
     private _isIvy: boolean,
-  ) {
-  }
+  ) {}
 
   protected _reset() {
     this._stats = new AnalyticsBuildStats();
@@ -107,7 +92,7 @@ export class NgBuildAnalyticsPlugin {
     const startTime = +(stats.startTime || 0);
     const endTime = +(stats.endTime || 0);
     const metrics: (string | number)[] = [];
-    metrics[analytics.NgCliAnalyticsMetrics.BuildTime] = (endTime - startTime);
+    metrics[analytics.NgCliAnalyticsMetrics.BuildTime] = endTime - startTime;
     metrics[analytics.NgCliAnalyticsMetrics.NgOnInitCount] = this._stats.numberOfNgOnInit;
     metrics[analytics.NgCliAnalyticsMetrics.NgComponentCount] = this._stats.numberOfComponents;
     metrics[analytics.NgCliAnalyticsMetrics.InitialChunkSize] = this._stats.initialChunkSize;
@@ -148,21 +133,26 @@ export class NgBuildAnalyticsPlugin {
   }
 
   protected _checkTsNormalModule(module: NormalModule) {
-    if (module._source) {
-      // PLEASE REMEMBER:
-      // We're dealing with ES5 _or_ ES2015 JavaScript at this point (we don't know for sure).
-
-      // Just count the ngOnInit occurences. Comments/Strings/calls occurences should be sparse
-      // so we just consider them within the margin of error. We do break on word break though.
-      this._stats.numberOfNgOnInit += countOccurrences(module._source.source().toString(), 'ngOnInit', true);
-
-      // Count the number of `Component({` strings (case sensitive), which happens in __decorate().
-      this._stats.numberOfComponents += countOccurrences(module._source.source().toString(), 'Component({');
-      // For Ivy we just count ɵcmp.
-      this._stats.numberOfComponents += countOccurrences(module._source.source().toString(), '.ɵcmp', true);
-      // for ascii_only true
-      this._stats.numberOfComponents += countOccurrences(module._source.source().toString(), '.\u0275cmp', true);
+    const originalSource = module.originalSource();
+    if (!originalSource) {
+      return;
     }
+
+    const originalContent = originalSource.source().toString();
+
+    // PLEASE REMEMBER:
+    // We're dealing with ES5 _or_ ES2015 JavaScript at this point (we don't know for sure).
+
+    // Just count the ngOnInit occurences. Comments/Strings/calls occurences should be sparse
+    // so we just consider them within the margin of error. We do break on word break though.
+    this._stats.numberOfNgOnInit += countOccurrences(originalContent, 'ngOnInit', true);
+
+    // Count the number of `Component({` strings (case sensitive), which happens in __decorate().
+    this._stats.numberOfComponents += countOccurrences(originalContent, 'Component({');
+    // For Ivy we just count ɵcmp.
+    this._stats.numberOfComponents += countOccurrences(originalContent, '.ɵcmp', true);
+    // for ascii_only true
+    this._stats.numberOfComponents += countOccurrences(originalContent, '.\u0275cmp', true);
   }
 
   protected _collectErrors(stats: Stats) {
@@ -170,7 +160,7 @@ export class NgBuildAnalyticsPlugin {
       for (const errObject of stats.compilation.errors) {
         if (errObject instanceof Error) {
           const allErrors = errObject.message.match(webpackAllErrorMessageRe);
-          for (const err of [...allErrors || []].slice(1)) {
+          for (const err of [...(allErrors || [])].slice(1)) {
             const message = (err.match(webpackTsErrorMessageRe) || [])[1];
             if (message) {
               // At this point this should be a TS1234.
@@ -223,7 +213,7 @@ export class NgBuildAnalyticsPlugin {
     }
   }
 
-  /************************************************************************************************
+  /** **********************************************************************************************
    * The next section is all the different Webpack hooks for this plugin.
    */
 
@@ -231,19 +221,20 @@ export class NgBuildAnalyticsPlugin {
    * Reports a succeed module.
    * @private
    */
-  protected _succeedModule(mod: Module) {
+  protected _succeedModule(module: Module) {
     // Only report NormalModule instances.
-    if (mod.constructor !== NormalModule) {
+    if (!(module instanceof NormalModule)) {
       return;
     }
-    const module = mod as {} as NormalModule;
 
     // Only reports modules that are part of the user's project. We also don't do node_modules.
     // There is a chance that someone name a file path `hello_node_modules` or something and we
     // will ignore that file for the purpose of gathering, but we're willing to take the risk.
-    if (!module.resource
-        || !module.resource.startsWith(this._projectRoot)
-        || module.resource.indexOf('node_modules') >= 0) {
+    if (
+      !module.resource ||
+      !module.resource.startsWith(this._projectRoot) ||
+      module.resource.indexOf('node_modules') >= 0
+    ) {
       return;
     }
 
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..a19c020fc63c 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,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 { countOccurrences } from './analytics';
 
+import { countOccurrences } from './analytics';
 
 function _randomString(len: number) {
   const charSpace = `0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ`;
@@ -22,16 +22,16 @@ function _randomString(len: number) {
 describe('countOccurrences', () => {
   // Every use cases is a text, search, word break or not, and expected result.
   const useCases: [string, string, boolean, number][] = [
-    ['abc1def1ghi1jkl1mno1pqrs1tuvw1xyz', '1', false, 7],  // 0
-    ['abc1def12ghi1jkl1mno12pqrs12tuvw1xyz12', '12', false, 4],  // 1
-    ['abc', 'abc', false, 1],  // 2
-    ['abc', 'abc', true, 1],  // 3
-    ['aaaaa', 'aaa', false, 1],  // 4
-    ['aa aaa', 'aaa', true, 1],  // 5
-    ['aaaaaa', 'aaa', false, 2],  // 6
-    ['aaa aaa', 'aaa', true, 2],  // 7
-    ['a', 'a', false, 1],  // 8
-    ['a', 'a', true, 1],  // 9
+    ['abc1def1ghi1jkl1mno1pqrs1tuvw1xyz', '1', false, 7], // 0
+    ['abc1def12ghi1jkl1mno12pqrs12tuvw1xyz12', '12', false, 4], // 1
+    ['abc', 'abc', false, 1], // 2
+    ['abc', 'abc', true, 1], // 3
+    ['aaaaa', 'aaa', false, 1], // 4
+    ['aa aaa', 'aaa', true, 1], // 5
+    ['aaaaaa', 'aaa', false, 2], // 6
+    ['aaa aaa', 'aaa', true, 2], // 7
+    ['a', 'a', false, 1], // 8
+    ['a', 'a', true, 1], // 9
   ];
 
   useCases.forEach(([text, search, wordBreak, expected], i) => {
@@ -48,13 +48,14 @@ describe('countOccurrences', () => {
     const nb = Math.floor(Math.random() * 200 + 100);
 
     // Insert nb search string in.
-    new Array(nb).fill(0)
+    new Array(nb)
+      .fill(0)
       // Map it with a random position.
       .map(() => Math.floor(Math.random() * text.length))
       // Sort from highest to lowest.
       .sort((a, b) => b - a)
       // Insert the search string for each position created this way.
-      .forEach(pos => {
+      .forEach((pos) => {
         text = text.slice(0, pos) + search + text.slice(pos);
       });
 
@@ -69,13 +70,14 @@ describe('countOccurrences', () => {
     let nb = Math.floor(Math.random() * 200 + 100);
 
     // Insert nb search string in.
-    new Array(nb).fill(0)
-    // Map it with a random position.
+    new Array(nb)
+      .fill(0)
+      // Map it with a random position.
       .map(() => Math.floor(Math.random() * text.length))
       // Sort from highest to lowest.
       .sort((a, b) => b - a)
       // Insert the search string for each position created this way.
-      .forEach(pos => {
+      .forEach((pos) => {
         switch (Math.floor(Math.random() * 5)) {
           case 0:
             // Do not insert a wordbreak.
@@ -83,10 +85,18 @@ describe('countOccurrences', () => {
             nb--;
             break;
 
-          case 1: text = text.slice(0, pos) + ' ' + search + ' ' + text.slice(pos); break;
-          case 2: text = text.slice(0, pos) + '(' + search + '$' + text.slice(pos); break;
-          case 3: text = text.slice(0, pos) + '|' + search + ')' + text.slice(pos); break;
-          case 4: text = text.slice(0, pos) + '-' + search + '.' + text.slice(pos); break;
+          case 1:
+            text = text.slice(0, pos) + ' ' + search + ' ' + text.slice(pos);
+            break;
+          case 2:
+            text = text.slice(0, pos) + '(' + search + '$' + text.slice(pos);
+            break;
+          case 3:
+            text = text.slice(0, pos) + '|' + search + ')' + text.slice(pos);
+            break;
+          case 4:
+            text = text.slice(0, pos) + '-' + search + '.' + text.slice(pos);
+            break;
         }
       });
 
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 2810ed3397a6..277b675bdde7 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
@@ -9,7 +9,11 @@
 import * as path from 'path';
 import { Compilation, Compiler } from 'webpack';
 import { Budget, Type } from '../../browser/schema';
-import { ThresholdSeverity, calculateThresholds, checkThresholds } from '../../utils/bundle-calculator';
+import {
+  ThresholdSeverity,
+  calculateThresholds,
+  checkThresholds,
+} from '../../utils/bundle-calculator';
 import { addError, addWarning } from '../../utils/webpack-diagnostics';
 
 const PLUGIN_NAME = 'AnyComponentStyleBudgetChecker';
@@ -27,61 +31,57 @@ export class AnyComponentStyleBudgetChecker {
 
   apply(compiler: Compiler) {
     compiler.hooks.compilation.tap(PLUGIN_NAME, (compilation) => {
-      const afterOptimizeChunkAssets = () => {
-        // In AOT compilations component styles get processed in child compilations.
-        // tslint:disable-next-line: no-any
-        const parentCompilation = (compilation.compiler as any).parentCompilation;
-        if (!parentCompilation) {
-          return;
-        }
+      compilation.hooks.processAssets.tap(
+        {
+          name: PLUGIN_NAME,
+          stage: Compilation.PROCESS_ASSETS_STAGE_ANALYSE,
+        },
+        () => {
+          // In AOT compilations component styles get processed in child compilations.
+          if (!compilation.compiler.parentCompilation) {
+            return;
+          }
 
-        const cssExtensions = [
-          '.css',
-          '.scss',
-          '.less',
-          '.styl',
-          '.sass',
-        ];
+          const cssExtensions = ['.css', '.scss', '.less', '.styl', '.sass'];
 
-        const componentStyles = Object.keys(compilation.assets)
-          .filter((name) => cssExtensions.includes(path.extname(name)))
-          .map((name) => ({
-            size: compilation.assets[name].size(),
-            label: name,
-          }));
-        const thresholds = flatMap(this.budgets, (budget) => calculateThresholds(budget));
+          const componentStyles = Object.keys(compilation.assets)
+            .filter((name) => cssExtensions.includes(path.extname(name)))
+            .map((name) => ({
+              size: compilation.assets[name].size(),
+              label: name,
+            }));
 
-        for (const {size, label} of componentStyles) {
-          for (const {severity, message} of checkThresholds(thresholds[Symbol.iterator](), size, label)) {
-            switch (severity) {
-              case ThresholdSeverity.Warning:
-                addWarning(compilation, message);
-                break;
-              case ThresholdSeverity.Error:
-                addError(compilation, message);
-                break;
-              default:
-                assertNever(severity);
-                break;
+          const thresholds = this.budgets.flatMap((budget) => [...calculateThresholds(budget)]);
+          for (const { size, label } of componentStyles) {
+            for (const { severity, message } of checkThresholds(
+              thresholds[Symbol.iterator](),
+              size,
+              label,
+            )) {
+              switch (severity) {
+                case ThresholdSeverity.Warning:
+                  addWarning(compilation, message);
+                  break;
+                case ThresholdSeverity.Error:
+                  addError(compilation, message);
+                  break;
+                default:
+                  assertNever(severity);
+              }
             }
           }
-        }
-      };
-
-      compilation.hooks.processAssets.tap({
-        name: PLUGIN_NAME,
-        stage: Compilation.PROCESS_ASSETS_STAGE_ANALYSE,
-      }, afterOptimizeChunkAssets);
+        },
+      );
     });
   }
 }
 
 function assertNever(input: never): never {
-  throw new Error(`Unexpected call to assertNever() with input: ${
-      JSON.stringify(input, null /* replacer */, 4 /* tabSize */)}`);
-}
-
-function flatMap<T, R>(list: T[], mapper: (item: T, index: number, array: T[]) => IterableIterator<R>): R[] {
-  return ([] as R[]).concat(...list.map(mapper).map((iterator) => Array.from(iterator)));
-
+  throw new Error(
+    `Unexpected call to assertNever() with input: ${JSON.stringify(
+      input,
+      null /* replacer */,
+      4 /* tabSize */,
+    )}`,
+  );
 }
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
index 3d9a41b70553..3656b93e2f69 100644
--- 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
@@ -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 { Compiler } from 'webpack';
 
 export type BuilderWatcherCallback = (
@@ -19,17 +20,6 @@ export interface BuilderWatcherFactory {
   ): { 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 }));
@@ -45,30 +35,15 @@ class TimeInfoMap extends Map<string, { safeTime: number; timestamp: number }> {
   }
 }
 
-type WatchCallback = (
-  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: WatchCallback,
-    callbackUndelayed: (file: string, time: number) => void,
-  ): WebpackWatcher;
-}
+// Extract watch related types from the Webpack compiler type since they are not directly exported
+type WebpackWatchFileSystem = Compiler['watchFileSystem'];
+type WatchOptions = Parameters<WebpackWatchFileSystem['watch']>[4];
+type WatchCallback = Parameters<WebpackWatchFileSystem['watch']>[5];
 
 class BuilderWatchFileSystem implements WebpackWatchFileSystem {
   constructor(
     private readonly watcherFactory: BuilderWatcherFactory,
-    private readonly inputFileSystem: { purge?(path?: string): void },
+    private readonly inputFileSystem: Compiler['inputFileSystem'],
   ) {}
 
   watch(
@@ -76,10 +51,10 @@ class BuilderWatchFileSystem implements WebpackWatchFileSystem {
     directories: Iterable<string>,
     missing: Iterable<string>,
     startTime: number,
-    _options: {},
+    _options: WatchOptions,
     callback: WatchCallback,
     callbackUndelayed?: (file: string, time: number) => void,
-  ): WebpackWatcher {
+  ): ReturnType<WebpackWatchFileSystem['watch']> {
     const watchedFiles = new Set(files);
     const watchedDirectories = new Set(directories);
     const watchedMissing = new Set(missing);
@@ -125,10 +100,12 @@ class BuilderWatchFileSystem implements WebpackWatchFileSystem {
           }
         }
 
+        const timeInfoMap = new Map(timeInfo);
+
         callback(
           undefined,
-          new Map(timeInfo),
-          new Map(timeInfo),
+          timeInfoMap,
+          timeInfoMap,
           new Set([...fileChanges, ...directoryChanges, ...missingChanges]),
           removals,
         );
@@ -140,12 +117,6 @@ class BuilderWatchFileSystem implements WebpackWatchFileSystem {
         watcher.close();
       },
       pause() {},
-      getFileTimestamps() {
-        return timeInfo.toTimestamps();
-      },
-      getContextTimestamps() {
-        return timeInfo.toTimestamps();
-      },
       getFileTimeInfoEntries() {
         return new Map(timeInfo);
       },
@@ -159,7 +130,7 @@ class BuilderWatchFileSystem implements WebpackWatchFileSystem {
 export class BuilderWatchPlugin {
   constructor(private readonly watcherFactory: BuilderWatcherFactory) {}
 
-  apply(compiler: Compiler & { watchFileSystem: unknown }): void {
+  apply(compiler: Compiler): void {
     compiler.hooks.environment.tap('BuilderWatchPlugin', () => {
       compiler.watchFileSystem = new BuilderWatchFileSystem(
         this.watcherFactory,
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 46b6ef783205..07e165f047ae 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
@@ -11,8 +11,8 @@ import { Compilation, Compiler, Dependency, Module, NormalModule } from 'webpack
 import { addWarning } from '../../utils/webpack-diagnostics';
 
 // Webpack doesn't export these so the deep imports can potentially break.
-const CommonJsRequireDependency = require('webpack/lib/dependencies/CommonJsRequireDependency');
 const AMDDefineDependency = require('webpack/lib/dependencies/AMDDefineDependency');
+const CommonJsRequireDependency = require('webpack/lib/dependencies/CommonJsRequireDependency');
 
 export interface CommonJsUsageWarnPluginOptions {
   /** A list of CommonJS packages that are allowed to be used without a warning. */
@@ -28,8 +28,8 @@ export class CommonJsUsageWarnPlugin {
   }
 
   apply(compiler: Compiler) {
-    compiler.hooks.compilation.tap('CommonJsUsageWarnPlugin', compilation => {
-      compilation.hooks.finishModules.tap('CommonJsUsageWarnPlugin', modules => {
+    compiler.hooks.compilation.tap('CommonJsUsageWarnPlugin', (compilation) => {
+      compilation.hooks.finishModules.tap('CommonJsUsageWarnPlugin', (modules) => {
         const mainEntry = compilation.entries.get('main');
         if (!mainEntry) {
           return;
@@ -39,7 +39,7 @@ export class CommonJsUsageWarnPlugin {
         );
 
         for (const module of modules) {
-          const {dependencies, rawRequest} = module as NormalModule;
+          const { dependencies, rawRequest } = module as NormalModule;
           if (
             !rawRequest ||
             rawRequest.startsWith('.') ||
@@ -63,7 +63,10 @@ export class CommonJsUsageWarnPlugin {
             // Check if it's parent issuer is also a CommonJS dependency.
             // In case it is skip as an warning will be show for the parent CommonJS dependency.
             const parentDependencies = getIssuer(compilation, issuer)?.dependencies;
-            if (parentDependencies && this.hasCommonJsDependencies(compilation, parentDependencies, true)) {
+            if (
+              parentDependencies &&
+              this.hasCommonJsDependencies(compilation, parentDependencies, true)
+            ) {
               continue;
             }
 
@@ -78,9 +81,9 @@ 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'.
-            // tslint:disable-next-line: no-any
             if (mainIssuer && mainModules.has(mainIssuer)) {
-              const warning = `${(issuer as NormalModule | null)?.userRequest} depends on '${rawRequest}'. ` +
+              const warning =
+                `${(issuer as NormalModule | null)?.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';
 
@@ -99,7 +102,8 @@ export class CommonJsUsageWarnPlugin {
   private hasCommonJsDependencies(
     compilation: Compilation,
     dependencies: Dependency[],
-    checkParentModules = false): boolean {
+    checkParentModules = false,
+  ): boolean {
     for (const dep of dependencies) {
       if (dep instanceof CommonJsRequireDependency || dep instanceof AMDDefineDependency) {
         return true;
@@ -118,10 +122,10 @@ export class CommonJsUsageWarnPlugin {
 
   private rawRequestToPackageName(rawRequest: string): string {
     return rawRequest.startsWith('@')
-      // Scoped request ex: @angular/common/locale/en -> @angular/common
-      ? rawRequest.split('/', 2).join('/')
-      // Non-scoped request ex: lodash/isEmpty -> lodash
-      : rawRequest.split('/', 1)[0];
+      ? // Scoped request ex: @angular/common/locale/en -> @angular/common
+        rawRequest.split('/', 2).join('/')
+      : // Non-scoped request ex: lodash/isEmpty -> lodash
+        rawRequest.split('/', 1)[0];
   }
 }
 
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 b4366fb8337e..5c44420db96c 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,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 { Compiler } from 'webpack';
 import { addWarning } from '../../utils/webpack-diagnostics';
 
@@ -19,32 +20,16 @@ export interface DedupeModuleResolvePluginOptions {
   verbose?: boolean;
 }
 
-// tslint:disable-next-line: no-any
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 function getResourceData(resolveData: any): ResourceData {
-  if (resolveData.createData) {
-    // Webpack 5+
-    const {
-      descriptionFileData,
-      relativePath,
-    } = resolveData.createData.resourceResolveData;
-
-    return {
-      packageName: descriptionFileData?.name,
-      packageVersion: descriptionFileData?.version,
-      relativePath,
-      resource: resolveData.createData.resource,
-    };
-  } else {
-    // Webpack 4
-    const { resource, resourceResolveData } = resolveData;
-
-    return {
-      packageName: resourceResolveData.descriptionFileData?.name,
-      packageVersion: resourceResolveData.descriptionFileData?.version,
-      relativePath: resourceResolveData.relativePath,
-      resource: resource,
-    };
-  }
+  const { descriptionFileData, relativePath } = resolveData.createData.resourceResolveData;
+
+  return {
+    packageName: descriptionFileData?.name,
+    packageVersion: descriptionFileData?.version,
+    relativePath,
+    resource: resolveData.createData.resource,
+  };
 }
 
 /**
@@ -57,58 +42,56 @@ function getResourceData(resolveData: any): ResourceData {
  * @see https://github.com/webpack/webpack/blob/4a1f068828c2ab47537d8be30d542cd3a1076db4/lib/NormalModuleReplacementPlugin.js#L9
  */
 export class DedupeModuleResolvePlugin {
-  modules = new Map<string, { request: string, resource: string }>();
+  modules = new Map<string, { request: string; resource: string }>();
 
-  constructor(private options?: DedupeModuleResolvePluginOptions) { }
+  constructor(private options?: DedupeModuleResolvePluginOptions) {}
 
   apply(compiler: Compiler) {
-    compiler.hooks.compilation.tap('DedupeModuleResolvePlugin', (compilation, { normalModuleFactory }) => {
-      normalModuleFactory.hooks.afterResolve.tap('DedupeModuleResolvePlugin', (result) => {
-        if (!result) {
-          return;
-        }
-
-        const { packageName, packageVersion, relativePath, resource } = getResourceData(result);
-
-        // Empty name or versions are no valid primary  entrypoints of a library
-        if (!packageName || !packageVersion) {
-          return;
-        }
-
-        const moduleId = packageName + '@' + packageVersion + ':' + relativePath;
-        const prevResolvedModule = this.modules.get(moduleId);
-
-        if (!prevResolvedModule) {
-          // This is the first time we visit this module.
-          this.modules.set(moduleId, {
-            resource,
-            request: result.request,
-          });
-
-          return;
-        }
-
-        const { resource: prevResource, request: prevRequest } = prevResolvedModule;
-        if (resource === prevResource) {
-          // No deduping needed.
-          // Current path and previously resolved path are the same.
-          return;
-        }
-
-        if (this.options?.verbose) {
-          addWarning(compilation, `[DedupeModuleResolvePlugin]: ${resource} -> ${prevResource}`);
-        }
-
-        // Alter current request with previously resolved module.
-        // tslint:disable-next-line: no-any
-        const createData = (result as any).createData;
-        if (createData) {
+    compiler.hooks.compilation.tap(
+      'DedupeModuleResolvePlugin',
+      (compilation, { normalModuleFactory }) => {
+        normalModuleFactory.hooks.afterResolve.tap('DedupeModuleResolvePlugin', (result) => {
+          if (!result) {
+            return;
+          }
+
+          const { packageName, packageVersion, relativePath, resource } = getResourceData(result);
+
+          // Empty name or versions are no valid primary  entrypoints of a library
+          if (!packageName || !packageVersion) {
+            return;
+          }
+
+          const moduleId = packageName + '@' + packageVersion + ':' + relativePath;
+          const prevResolvedModule = this.modules.get(moduleId);
+
+          if (!prevResolvedModule) {
+            // This is the first time we visit this module.
+            this.modules.set(moduleId, {
+              resource,
+              request: result.request,
+            });
+
+            return;
+          }
+
+          const { resource: prevResource, request: prevRequest } = prevResolvedModule;
+          if (resource === prevResource) {
+            // No deduping needed.
+            // Current path and previously resolved path are the same.
+            return;
+          }
+
+          if (this.options?.verbose) {
+            addWarning(compilation, `[DedupeModuleResolvePlugin]: ${resource} -> ${prevResource}`);
+          }
+
+          // Alter current request with previously resolved module.
+          const createData = result.createData as { resource: string; userRequest: string };
           createData.resource = prevResource;
-          createData.userRequest = prevResource;
-        } else {
-          result.request = prevRequest;
-        }
-      });
-    });
+          createData.userRequest = prevRequest;
+        });
+      },
+    );
   }
 }
diff --git a/packages/angular_devkit/build_angular/src/webpack/plugins/esbuild-executor.ts b/packages/angular_devkit/build_angular/src/webpack/plugins/esbuild-executor.ts
new file mode 100644
index 000000000000..68ab904d48d4
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/webpack/plugins/esbuild-executor.ts
@@ -0,0 +1,131 @@
+/**
+ * @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 { spawnSync } from 'child_process';
+import type {
+  FormatMessagesOptions,
+  PartialMessage,
+  TransformOptions,
+  TransformResult,
+} from 'esbuild';
+import * as path from 'path';
+
+/**
+ * Provides the ability to execute esbuild regardless of the current platform's support
+ * for using the native variant of esbuild. The native variant will be preferred (assuming
+ * the `alwaysUseWasm` constructor option is `false) due to its inherent performance advantages.
+ * At first use of esbuild, a supportability test will be automatically performed and the
+ * WASM-variant will be used if needed by the platform.
+ */
+export class EsbuildExecutor
+  implements Pick<typeof import('esbuild'), 'transform' | 'formatMessages'>
+{
+  private esbuildTransform: this['transform'];
+  private esbuildFormatMessages: this['formatMessages'];
+  private initialized = false;
+
+  /**
+   * Constructs an instance of the `EsbuildExecutor` class.
+   *
+   * @param alwaysUseWasm If true, the WASM-variant will be preferred and no support test will be
+   * performed; if false (default), the native variant will be preferred.
+   */
+  constructor(private alwaysUseWasm = false) {
+    this.esbuildTransform = this.esbuildFormatMessages = () => {
+      throw new Error('esbuild implementation missing');
+    };
+  }
+
+  /**
+   * Determines whether the native variant of esbuild can be used on the current platform.
+   *
+   * @returns True, if the native variant of esbuild is support; False, if the WASM variant is required.
+   */
+  static hasNativeSupport(): boolean {
+    // Try to use native variant to ensure it is functional for the platform.
+    // Spawning a separate esbuild check process is used to determine if the native
+    // variant is viable. If check fails, the WASM variant is initialized instead.
+    // Attempting to call one of the native esbuild functions is not a viable test
+    // currently since esbuild spawn errors are currently not propagated through the
+    // call stack for the esbuild function. If this limitation is removed in the future
+    // then the separate process spawn check can be removed in favor of a direct function
+    // call check.
+    try {
+      const { status, error } = spawnSync(process.execPath, [
+        path.join(__dirname, '../../../esbuild-check.js'),
+      ]);
+
+      return status === 0 && error === undefined;
+    } catch {
+      return false;
+    }
+  }
+
+  /**
+   * Initializes the esbuild transform and format messages functions.
+   *
+   * @returns A promise that fulfills when esbuild has been loaded and available for use.
+   */
+  private async ensureEsbuild(): Promise<void> {
+    if (this.initialized) {
+      return;
+    }
+
+    // If the WASM variant was preferred at class construction or native is not supported, use WASM
+    if (this.alwaysUseWasm || !EsbuildExecutor.hasNativeSupport()) {
+      await this.useWasm();
+      this.initialized = true;
+
+      return;
+    }
+
+    try {
+      // Use the faster native variant if available.
+      const { transform, formatMessages } = await import('esbuild');
+
+      this.esbuildTransform = transform;
+      this.esbuildFormatMessages = formatMessages;
+    } catch {
+      // If the native variant is not installed then use the WASM-based variant
+      await this.useWasm();
+    }
+
+    this.initialized = true;
+  }
+
+  /**
+   * Transitions an executor instance to use the WASM-variant of esbuild.
+   */
+  private async useWasm(): Promise<void> {
+    const { transform, formatMessages } = await import('esbuild-wasm');
+    this.esbuildTransform = transform;
+    this.esbuildFormatMessages = formatMessages;
+
+    // The ESBUILD_BINARY_PATH environment variable cannot exist when attempting to use the
+    // WASM variant. If it is then the binary located at the specified path will be used instead
+    // of the WASM variant.
+    delete process.env.ESBUILD_BINARY_PATH;
+
+    this.alwaysUseWasm = true;
+  }
+
+  async transform(input: string, options?: TransformOptions): Promise<TransformResult> {
+    await this.ensureEsbuild();
+
+    return this.esbuildTransform(input, options);
+  }
+
+  async formatMessages(
+    messages: PartialMessage[],
+    options: FormatMessagesOptions,
+  ): Promise<string[]> {
+    await this.ensureEsbuild();
+
+    return this.esbuildFormatMessages(messages, options);
+  }
+}
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 10aee6b52427..782c1f88cf5a 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,21 +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
  */
 
-// tslint:disable-next-line: no-implicit-dependencies
-import { ApplicationRef, PlatformRef, Type, isDevMode, ɵresetCompiledComponents } from '@angular/core';
+// eslint-disable-next-line import/no-extraneous-dependencies
+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,
 // In future when we remove `yarn admin build` we should have this as a seperate compilation unit
 // which includes DOM lib.
 
-// tslint:disable: no-console
-// tslint:disable: no-any
+/* eslint-disable no-console */
+/* eslint-disable @typescript-eslint/no-explicit-any */
 declare const ng: any;
 declare const document: any;
 declare const MutationObserver: any;
@@ -28,7 +34,9 @@ export default function (mod: any): void {
   }
 
   if (!isDevMode()) {
-    console.error(`[NG HMR] Cannot use HMR when Angular is running in production mode. To prevent production mode, do not call 'enableProdMode()'.`);
+    console.error(
+      `[NG HMR] Cannot use HMR when Angular is running in production mode. To prevent production mode, do not call 'enableProdMode()'.`,
+    );
 
     return;
   }
@@ -36,7 +44,9 @@ export default function (mod: any): void {
   mod['hot'].accept();
   mod['hot'].dispose(() => {
     if (typeof ng === 'undefined') {
-      console.warn(`[NG HMR] Cannot find global 'ng'. Likely this is caused because scripts optimization is enabled.`);
+      console.warn(
+        `[NG HMR] Cannot find global 'ng'. Likely this is caused because scripts optimization is enabled.`,
+      );
 
       return;
     }
@@ -63,17 +73,13 @@ export default function (mod: any): void {
     const oldOptions = document.querySelectorAll('option');
 
     // Create new application
-    appRef.components
-      .forEach(cp => {
-        const element = cp.location.nativeElement;
-        const parentNode = element.parentNode;
-        parentNode.insertBefore(
-          document.createElement(element.tagName),
-          element,
-        );
-
-        parentNode.removeChild(element);
-      });
+    appRef.components.forEach((cp) => {
+      const element = cp.location.nativeElement;
+      const parentNode = element.parentNode;
+      parentNode.insertBefore(document.createElement(element.tagName), element);
+
+      parentNode.removeChild(element);
+    });
 
     // Destroy old application, injectors, <style..., etc..
     const platformRef = getPlatformRef(appRoot);
@@ -83,7 +89,7 @@ export default function (mod: any): void {
 
     // Restore all inputs and options
     const bodyElement = document.body;
-    if ((oldInputs.length + oldOptions.length) === 0 || !bodyElement) {
+    if (oldInputs.length + oldOptions.length === 0 || !bodyElement) {
       return;
     }
 
@@ -105,16 +111,15 @@ export default function (mod: any): void {
       // Wait until the application isStable to restore the form values
       newAppRef.isStable
         .pipe(
-          filter(isStable => !!isStable),
+          filter((isStable) => !!isStable),
           take(1),
         )
         .subscribe(() => restoreFormValues(oldInputs, oldOptions));
-    })
-      .observe(bodyElement, {
-        attributes: true,
-        subtree: true,
-        attributeFilter: ['ng-version'],
-      });
+    }).observe(bodyElement, {
+      attributes: true,
+      subtree: true,
+      attributeFilter: ['ng-version'],
+    });
   });
 }
 
@@ -129,8 +134,8 @@ function getAppRoot(): any {
   return appRoot;
 }
 
-function getToken<T>(appRoot: any, token: Type<T> ): T | undefined {
-  return typeof ng === 'object' && ng.getInjector(appRoot).get(token) || undefined;
+function getToken<T>(appRoot: any, token: Type<T>): T | undefined {
+  return (typeof ng === 'object' && ng.getInjector(appRoot).get(token)) || undefined;
 }
 
 function getApplicationRef(appRoot: any): ApplicationRef | undefined {
@@ -156,10 +161,12 @@ function getPlatformRef(appRoot: any): PlatformRef | undefined {
 }
 
 function dispatchEvents(element: any): void {
-  element.dispatchEvent(new Event('input', {
-    bubbles: true,
-    cancelable: true,
-  }));
+  element.dispatchEvent(
+    new Event('input', {
+      bubbles: true,
+      cancelable: true,
+    }),
+  );
 
   element.blur();
 
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 cc7b813c5809..8526b447f5e7 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
@@ -12,11 +12,11 @@ export const HmrLoader = __filename;
 const hmrAcceptPath = join(__dirname, './hmr-accept.js').replace(/\\/g, '/');
 
 export default function (
-  // tslint:disable-next-line: no-any
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   this: any,
   content: string,
   // Source map types are broken in the webpack type definitions
-  // tslint:disable-next-line: no-any
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   map: any,
 ): void {
   const source = `${content}
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 0bf19d407a1c..846dd2e8d0a6 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,18 +1,24 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+
 import { basename, dirname, extname } from 'path';
 import { Compilation, Compiler, sources } from 'webpack';
 import { FileInfo } from '../../utils/index-file/augment-index-html';
-import { IndexHtmlGenerator, IndexHtmlGeneratorOptions, IndexHtmlGeneratorProcessOptions } from '../../utils/index-file/index-html-generator';
+import {
+  IndexHtmlGenerator,
+  IndexHtmlGeneratorOptions,
+  IndexHtmlGeneratorProcessOptions,
+} from '../../utils/index-file/index-html-generator';
 import { addError, addWarning } from '../../utils/webpack-diagnostics';
 
-export interface IndexHtmlWebpackPluginOptions extends IndexHtmlGeneratorOptions,
-  Omit<IndexHtmlGeneratorProcessOptions, 'files' | 'noModuleFiles' | 'moduleFiles'> {
+export interface IndexHtmlWebpackPluginOptions
+  extends IndexHtmlGeneratorOptions,
+    Omit<IndexHtmlGeneratorProcessOptions, 'files' | 'noModuleFiles' | 'moduleFiles'> {
   noModuleEntrypoints: string[];
   moduleEntrypoints: string[];
 }
@@ -28,17 +34,20 @@ export class IndexHtmlWebpackPlugin extends IndexHtmlGenerator {
     throw new Error('compilation is undefined.');
   }
 
-  constructor(readonly options: IndexHtmlWebpackPluginOptions) {
+  constructor(override readonly options: IndexHtmlWebpackPluginOptions) {
     super(options);
   }
 
   apply(compiler: Compiler) {
-    compiler.hooks.thisCompilation.tap(PLUGIN_NAME, compilation => {
+    compiler.hooks.thisCompilation.tap(PLUGIN_NAME, (compilation) => {
       this._compilation = compilation;
-      compilation.hooks.processAssets.tapPromise({
-        name: PLUGIN_NAME,
-        stage: Compilation.PROCESS_ASSETS_STAGE_OPTIMIZE + 1,
-      }, callback);
+      compilation.hooks.processAssets.tapPromise(
+        {
+          name: PLUGIN_NAME,
+          stage: Compilation.PROCESS_ASSETS_STAGE_OPTIMIZE + 1,
+        },
+        callback,
+      );
     });
 
     const callback = async (assets: Record<string, unknown>) => {
@@ -49,13 +58,16 @@ export class IndexHtmlWebpackPlugin extends IndexHtmlGenerator {
 
       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),
-            }),
-          );
+          const entryFiles: FileInfo[] = entrypoint
+            ?.getFiles()
+            ?.filter((f) => !f.endsWith('.hot-update.js'))
+            .map(
+              (f: string): FileInfo => ({
+                name: entryName,
+                file: f,
+                extension: extname(f),
+              }),
+            );
 
           if (!entryFiles) {
             continue;
@@ -81,32 +93,35 @@ export class IndexHtmlWebpackPlugin extends IndexHtmlGenerator {
 
         assets[this.options.outputPath] = new sources.RawSource(content);
 
-        warnings.forEach(msg => addWarning(this.compilation, msg));
-        errors.forEach(msg => addError(this.compilation, msg));
+        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> {
+  override async readAsset(path: string): Promise<string> {
     const data = this.compilation.assets[basename(path)].source();
 
     return typeof data === 'string' ? data : data.toString();
   }
 
-  protected async readIndex(path: string): Promise<string> {
+  protected override async readIndex(path: string): Promise<string> {
     return new Promise<string>((resolve, reject) => {
-      this.compilation.inputFileSystem.readFile(path, (err?: Error, data?: string | Buffer) => {
-        if (err) {
-          reject(err);
+      this.compilation.inputFileSystem.readFile(
+        path,
+        (err?: Error | null, data?: string | Buffer) => {
+          if (err) {
+            reject(err);
 
-          return;
-        }
+            return;
+          }
 
-        this.compilation.fileDependencies.add(path);
-        resolve(data?.toString() ?? '');
-      });
+          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 802f415ff460..d9237fc07263 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
@@ -8,7 +8,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 { 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/javascript-optimizer-plugin.ts b/packages/angular_devkit/build_angular/src/webpack/plugins/javascript-optimizer-plugin.ts
new file mode 100644
index 000000000000..fc665ca4611c
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/webpack/plugins/javascript-optimizer-plugin.ts
@@ -0,0 +1,223 @@
+/**
+ * @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 Piscina from 'piscina';
+import { ScriptTarget } from 'typescript';
+import type { Compiler, sources } from 'webpack';
+import { maxWorkers } from '../../utils/environment-options';
+import { EsbuildExecutor } from './esbuild-executor';
+
+/**
+ * The maximum number of Workers that will be created to execute optimize tasks.
+ */
+const MAX_OPTIMIZE_WORKERS = maxWorkers;
+
+/**
+ * The name of the plugin provided to Webpack when tapping Webpack compiler hooks.
+ */
+const PLUGIN_NAME = 'angular-javascript-optimizer';
+
+/**
+ * The options used to configure the {@link JavaScriptOptimizerPlugin}.
+ */
+export interface JavaScriptOptimizerOptions {
+  /**
+   * Enables advanced optimizations in the underlying JavaScript optimizers.
+   * This currently increases the `terser` passes to 3 and enables the `pure_getters`
+   * option for `terser`.
+   */
+  advanced: boolean;
+
+  /**
+   * An object record of string keys that will be replaced with their respective values when found
+   * within the code during optimization.
+   */
+  define: Record<string, string | number | boolean>;
+
+  /**
+   * Enables the generation of a sourcemap during optimization.
+   * The output sourcemap will be a full sourcemap containing the merge of the input sourcemap and
+   * all intermediate sourcemaps.
+   */
+  sourcemap: boolean;
+
+  /**
+   * The ECMAScript version that should be used when generating output code.
+   * The optimizer will not adjust the output code with features present in newer
+   * ECMAScript versions.
+   */
+  target: ScriptTarget;
+
+  /**
+   * Enables the retention of identifier names and ensures that function and class names are
+   * present in the output code.
+   */
+  keepNames: boolean;
+
+  /**
+   * Enables the removal of all license comments from the output code.
+   */
+  removeLicenses: boolean;
+}
+
+/**
+ * A Webpack plugin that provides JavaScript optimization capabilities.
+ *
+ * The plugin uses both `esbuild` and `terser` to provide both fast and highly-optimized
+ * code output. `esbuild` is used as an initial pass to remove the majority of unused code
+ * as well as shorten identifiers. `terser` is then used as a secondary pass to apply
+ * optimizations not yet implemented by `esbuild`.
+ */
+export class JavaScriptOptimizerPlugin {
+  constructor(public options: Partial<JavaScriptOptimizerOptions> = {}) {}
+
+  apply(compiler: Compiler) {
+    const { OriginalSource, SourceMapSource } = compiler.webpack.sources;
+
+    compiler.hooks.compilation.tap(PLUGIN_NAME, (compilation) => {
+      compilation.hooks.processAssets.tapPromise(
+        {
+          name: PLUGIN_NAME,
+          stage: compiler.webpack.Compilation.PROCESS_ASSETS_STAGE_OPTIMIZE_SIZE,
+        },
+        async (compilationAssets) => {
+          const scriptsToOptimize = [];
+          const cache =
+            compilation.options.cache && compilation.getCache('JavaScriptOptimizerPlugin');
+
+          // Analyze the compilation assets for scripts that require optimization
+          for (const assetName of Object.keys(compilationAssets)) {
+            if (!assetName.endsWith('.js')) {
+              continue;
+            }
+
+            const scriptAsset = compilation.getAsset(assetName);
+            // Skip assets that have already been optimized or are verbatim copies (project assets)
+            if (!scriptAsset || scriptAsset.info.minimized || scriptAsset.info.copied) {
+              continue;
+            }
+
+            const { source: scriptAssetSource, name } = scriptAsset;
+            let cacheItem;
+
+            if (cache) {
+              const eTag = cache.getLazyHashedEtag(scriptAssetSource);
+              cacheItem = cache.getItemCache(name, eTag);
+              const cachedOutput = await cacheItem.getPromise<
+                { source: sources.Source } | undefined
+              >();
+
+              if (cachedOutput) {
+                compilation.updateAsset(name, cachedOutput.source, {
+                  minimized: true,
+                });
+                continue;
+              }
+            }
+
+            const { source, map } = scriptAssetSource.sourceAndMap();
+            scriptsToOptimize.push({
+              name: scriptAsset.name,
+              code: typeof source === 'string' ? source : source.toString(),
+              map,
+              cacheItem,
+            });
+          }
+
+          if (scriptsToOptimize.length === 0) {
+            return;
+          }
+
+          // Ensure all replacement values are strings which is the expected type for esbuild
+          let define: Record<string, string> | undefined;
+          if (this.options.define) {
+            define = {};
+            for (const [key, value] of Object.entries(this.options.define)) {
+              define[key] = String(value);
+            }
+          }
+
+          let target = 2017;
+          if (this.options.target) {
+            if (this.options.target <= ScriptTarget.ES5) {
+              target = 5;
+            } else if (this.options.target < ScriptTarget.ESNext) {
+              target = Number(ScriptTarget[this.options.target].slice(2));
+            } else {
+              target = 2020;
+            }
+          }
+
+          // Setup the options used by all worker tasks
+          const optimizeOptions = {
+            sourcemap: this.options.sourcemap,
+            define,
+            keepNames: this.options.keepNames,
+            target,
+            removeLicenses: this.options.removeLicenses,
+            advanced: this.options.advanced,
+            // Perform a single native esbuild support check.
+            // This removes the need for each worker to perform the check which would
+            // otherwise require spawning a separate process per worker.
+            alwaysUseWasm: !EsbuildExecutor.hasNativeSupport(),
+          };
+
+          // Sort scripts so larger scripts start first - worker pool uses a FIFO queue
+          scriptsToOptimize.sort((a, b) => a.code.length - b.code.length);
+
+          // Initialize the task worker pool
+          const workerPath = require.resolve('./javascript-optimizer-worker');
+          const workerPool = new Piscina({
+            filename: workerPath,
+            maxThreads: MAX_OPTIMIZE_WORKERS,
+          });
+
+          // Enqueue script optimization tasks and update compilation assets as the tasks complete
+          try {
+            const tasks = [];
+            for (const { name, code, map, cacheItem } of scriptsToOptimize) {
+              tasks.push(
+                workerPool
+                  .run({
+                    asset: {
+                      name,
+                      code,
+                      map,
+                    },
+                    options: optimizeOptions,
+                  })
+                  .then(
+                    ({ code, name, map }) => {
+                      const optimizedAsset = map
+                        ? new SourceMapSource(code, name, map)
+                        : new OriginalSource(code, name);
+                      compilation.updateAsset(name, optimizedAsset, { minimized: true });
+
+                      return cacheItem?.storePromise({
+                        source: optimizedAsset,
+                      });
+                    },
+                    (error) => {
+                      const optimizationError = new compiler.webpack.WebpackError(
+                        `Optimization error [${name}]: ${error.stack || error.message}`,
+                      );
+                      compilation.errors.push(optimizationError);
+                    },
+                  ),
+              );
+            }
+
+            await Promise.all(tasks);
+          } finally {
+            void workerPool.destroy();
+          }
+        },
+      );
+    });
+  }
+}
diff --git a/packages/angular_devkit/build_angular/src/webpack/plugins/javascript-optimizer-worker.ts b/packages/angular_devkit/build_angular/src/webpack/plugins/javascript-optimizer-worker.ts
new file mode 100644
index 000000000000..fd5dc266ba7e
--- /dev/null
+++ b/packages/angular_devkit/build_angular/src/webpack/plugins/javascript-optimizer-worker.ts
@@ -0,0 +1,230 @@
+/**
+ * @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 remapping from '@ampproject/remapping';
+import type { TransformFailure, TransformResult } from 'esbuild';
+import { minify } from 'terser';
+import { EsbuildExecutor } from './esbuild-executor';
+
+/**
+ * A request to optimize JavaScript using the supplied options.
+ */
+interface OptimizeRequest {
+  /**
+   * The options to use when optimizing.
+   */
+  options: {
+    /**
+     * Controls advanced optimizations.
+     * Currently these are only terser related:
+     * * terser compress passes are set to 2
+     * * terser pure_getters option is enabled
+     */
+    advanced: boolean;
+    /**
+     * Specifies the string tokens that should be replaced with a defined value.
+     */
+    define?: Record<string, string>;
+    /**
+     * Controls whether class, function, and variable names should be left intact
+     * throughout the output code.
+     */
+    keepNames: boolean;
+    /**
+     * Controls whether license text is removed from the output code.
+     * Within the CLI, this option is linked to the license extraction functionality.
+     */
+    removeLicenses: boolean;
+    /**
+     * Controls whether source maps should be generated.
+     */
+    sourcemap: boolean;
+    /**
+     * Specifies the target ECMAScript version for the output code.
+     */
+    target: 5 | 2015 | 2016 | 2017 | 2018 | 2019 | 2020;
+    /**
+     * Controls whether esbuild should only use the WASM-variant instead of trying to
+     * use the native variant. Some platforms may not support the native-variant and
+     * this option allows one support test to be conducted prior to all the workers starting.
+     */
+    alwaysUseWasm: boolean;
+  };
+
+  /**
+   * The JavaScript asset to optimize.
+   */
+  asset: {
+    /**
+     * The name of the JavaScript asset (typically the filename).
+     */
+    name: string;
+    /**
+     * The source content of the JavaScript asset.
+     */
+    code: string;
+    /**
+     * The source map of the JavaScript asset, if available.
+     * This map is merged with all intermediate source maps during optimization.
+     */
+    map: object;
+  };
+}
+
+/**
+ * The cached esbuild executor.
+ * This will automatically use the native or WASM version based on platform and availability
+ * with the native version given priority due to its superior performance.
+ */
+let esbuild: EsbuildExecutor | undefined;
+
+/**
+ * Handles optimization requests sent from the main thread via the `JavaScriptOptimizerPlugin`.
+ */
+export default async function ({ asset, options }: OptimizeRequest) {
+  // esbuild is used as a first pass
+  const esbuildResult = await optimizeWithEsbuild(asset.code, asset.name, options);
+
+  // terser is used as a second pass
+  const terserResult = await optimizeWithTerser(
+    asset.name,
+    esbuildResult.code,
+    options.sourcemap,
+    options.target,
+    options.advanced,
+  );
+
+  // Merge intermediate sourcemaps with input sourcemap if enabled
+  let fullSourcemap;
+  if (options.sourcemap) {
+    const partialSourcemaps = [];
+
+    if (esbuildResult.map) {
+      partialSourcemaps.unshift(JSON.parse(esbuildResult.map));
+    }
+
+    if (terserResult.map) {
+      partialSourcemaps.unshift(terserResult.map);
+    }
+
+    if (asset.map) {
+      partialSourcemaps.push(asset.map);
+    }
+
+    fullSourcemap = remapping(partialSourcemaps, () => null);
+  }
+
+  return { name: asset.name, code: terserResult.code, map: fullSourcemap };
+}
+
+/**
+ * Optimizes a JavaScript asset using esbuild.
+ *
+ * @param content The JavaScript asset source content to optimize.
+ * @param name The name of the JavaScript asset. Used to generate source maps.
+ * @param options The optimization request options to apply to the content.
+ * @returns A promise that resolves with the optimized code, source map, and any warnings.
+ */
+async function optimizeWithEsbuild(
+  content: string,
+  name: string,
+  options: OptimizeRequest['options'],
+): Promise<TransformResult> {
+  if (!esbuild) {
+    esbuild = new EsbuildExecutor(options.alwaysUseWasm);
+  }
+
+  let result: TransformResult;
+  try {
+    result = await esbuild.transform(content, {
+      minifyIdentifiers: !options.keepNames,
+      minifySyntax: true,
+      // NOTE: Disabling whitespace ensures unused pure annotations are kept
+      minifyWhitespace: false,
+      pure: ['forwardRef'],
+      legalComments: options.removeLicenses ? 'none' : 'inline',
+      sourcefile: name,
+      sourcemap: options.sourcemap && 'external',
+      define: options.define,
+      keepNames: options.keepNames,
+      target: `es${options.target}`,
+    });
+  } catch (error) {
+    const failure = error as TransformFailure;
+
+    // If esbuild fails with only ES5 support errors, fallback to just terser.
+    // This will only happen if ES5 is the output target and a global script contains ES2015+ syntax.
+    // In that case, the global script is technically already invalid for the target environment but
+    // this is and has been considered a configuration issue. Global scripts must be compatible with
+    // the target environment.
+    if (
+      failure.errors?.every((error) =>
+        error.text.includes('to the configured target environment ("es5") is not supported yet'),
+      )
+    ) {
+      result = {
+        code: content,
+        map: '',
+        warnings: [],
+      };
+    } else {
+      throw error;
+    }
+  }
+
+  return result;
+}
+
+/**
+ * Optimizes a JavaScript asset using terser.
+ *
+ * @param name The name of the JavaScript asset. Used to generate source maps.
+ * @param code The JavaScript asset source content to optimize.
+ * @param sourcemaps If true, generate an output source map for the optimized code.
+ * @param target Specifies the target ECMAScript version for the output code.
+ * @param advanced Controls advanced optimizations.
+ * @returns A promise that resolves with the optimized code and source map.
+ */
+async function optimizeWithTerser(
+  name: string,
+  code: string,
+  sourcemaps: boolean,
+  target: OptimizeRequest['options']['target'],
+  advanced: boolean,
+): Promise<{ code: string; map?: object }> {
+  const result = await minify(
+    { [name]: code },
+    {
+      compress: {
+        passes: advanced ? 2 : 1,
+        pure_getters: advanced,
+      },
+      ecma: target,
+      // esbuild in the first pass is used to minify identifiers instead of mangle here
+      mangle: false,
+      format: {
+        // ASCII output is enabled here as well to prevent terser from converting back to UTF-8
+        ascii_only: true,
+        wrap_func_args: false,
+      },
+      sourceMap:
+        sourcemaps &&
+        ({
+          asObject: true,
+          // typings don't include asObject option
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        } as any),
+    },
+  );
+
+  if (!result.code) {
+    throw new Error('Terser failed for unknown reason.');
+  }
+
+  return { code: result.code, map: result.map as object };
+}
diff --git a/packages/angular_devkit/build_angular/src/webpack/plugins/karma/karma-context.html b/packages/angular_devkit/build_angular/src/webpack/plugins/karma/karma-context.html
index 1f91cd461a97..a578cb4b7dcf 100644
--- a/packages/angular_devkit/build_angular/src/webpack/plugins/karma/karma-context.html
+++ b/packages/angular_devkit/build_angular/src/webpack/plugins/karma/karma-context.html
@@ -5,40 +5,41 @@
 Reloaded before every execution run.
 -->
 <html>
+  <head>
+    <title></title>
+    <base href="/" />
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <link rel="stylesheet" href="_karma_webpack_/styles.css" crossorigin="anonymous" />
+    <meta
+      name="viewport"
+      content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"
+    />
+  </head>
 
-<head>
-  <title></title>
-  <base href="/">
-  <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
-  <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
-</head>
-
-<body>
-  <!-- The scripts need to be in the body DOM element, as some test running frameworks need the body
+  <body>
+    <!-- The scripts need to be in the body DOM element, as some test running frameworks need the body
        to have already been created so they can insert their magic into it. For example, if loaded
        before body, Angular Scenario test framework fails to find the body and crashes and burns in
        an epic manner. -->
-  <script src="context.js"></script>
-  <script type="text/javascript">
-    // Configure our Karma and set up bindings
-    %CLIENT_CONFIG%
-      window.__karma__.setupContext(window);
+    <script src="context.js"></script>
+    <script type="text/javascript">
+      // Configure our Karma and set up bindings
+      %CLIENT_CONFIG%
+        window.__karma__.setupContext(window);
 
-    // All served files with the latest timestamps
-    %MAPPINGS%
-  </script>
-  <script src="_karma_webpack_/runtime.js" crossorigin="anonymous"></script>
-  <script src="_karma_webpack_/polyfills-es5.js" crossorigin="anonymous" nomodule></script>
-  <script src="_karma_webpack_/polyfills.js" crossorigin="anonymous"></script>
-  <!-- Dynamically replaced with <script> tags -->
-  %SCRIPTS%
-  <script src="_karma_webpack_/styles.js" crossorigin="anonymous"></script>
-  <script src="_karma_webpack_/scripts.js" crossorigin="anonymous"></script>
-  <script src="_karma_webpack_/vendor.js" crossorigin="anonymous"></script>
-  <script src="_karma_webpack_/main.js" crossorigin="anonymous"></script>
-  <script type="text/javascript">
+      // All served files with the latest timestamps
+      %MAPPINGS%
+    </script>
+    <script src="_karma_webpack_/runtime.js" crossorigin="anonymous"></script>
+    <script src="_karma_webpack_/polyfills-es5.js" crossorigin="anonymous" nomodule></script>
+    <script src="_karma_webpack_/polyfills.js" crossorigin="anonymous"></script>
+    <!-- Dynamically replaced with <script> tags -->
+    %SCRIPTS%
+    <script src="_karma_webpack_/scripts.js" crossorigin="anonymous"></script>
+    <script src="_karma_webpack_/vendor.js" crossorigin="anonymous"></script>
+    <script src="_karma_webpack_/main.js" crossorigin="anonymous"></script>
+    <script type="text/javascript">
       window.__karma__.loaded();
-  </script>
-</body>
-
+    </script>
+  </body>
 </html>
diff --git a/packages/angular_devkit/build_angular/src/webpack/plugins/karma/karma-debug.html b/packages/angular_devkit/build_angular/src/webpack/plugins/karma/karma-debug.html
index 44dbff5898f4..4f64eef5848b 100644
--- a/packages/angular_devkit/build_angular/src/webpack/plugins/karma/karma-debug.html
+++ b/packages/angular_devkit/build_angular/src/webpack/plugins/karma/karma-debug.html
@@ -1,46 +1,47 @@
-<!doctype html>
+<!DOCTYPE html>
 <!--
 This file is almost the same as context.html - loads all source files,
 but its purpose is to be loaded in the main frame (not within an iframe),
 just for immediate execution, without reporting to Karma server.
 -->
 <html>
+  <head>
+    %X_UA_COMPATIBLE%
+    <title>Karma DEBUG RUNNER</title>
+    <base href="/" />
+    <link href="favicon.ico" rel="icon" type="image/x-icon" />
+    <link rel="stylesheet" href="_karma_webpack_/styles.css" crossorigin="anonymous" />
+    <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
+    <meta
+      name="viewport"
+      content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no"
+    />
+  </head>
 
-<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" />
-</head>
-
-<body>
-  <!-- The scripts need to be at the end of body, so that some test running frameworks
+  <body>
+    <!-- The scripts need to be at the end of body, so that some test running frameworks
    (Angular Scenario, for example) need the body to be loaded so that it can insert its magic
    into it. If it is before body, then it fails to find the body and crashes and burns in an epic
    manner. -->
-  <script src="context.js"></script>
-  <script src="debug.js"></script>
-  <script type="text/javascript">
-    // Configure our Karma
-    %CLIENT_CONFIG%
+    <script src="context.js"></script>
+    <script src="debug.js"></script>
+    <script type="text/javascript">
+      // Configure our Karma
+      %CLIENT_CONFIG%
 
-    // All served files with the latest timestamps
-    %MAPPINGS%
-  </script>
-  <script src="_karma_webpack_/runtime.js" crossorigin="anonymous"></script>
-  <script src="_karma_webpack_/polyfills-es5.js" crossorigin="anonymous" nomodule></script>
-  <script src="_karma_webpack_/polyfills.js" crossorigin="anonymous"></script>
-  <!-- Dynamically replaced with <script> tags -->
-  %SCRIPTS%
-  <script src="_karma_webpack_/styles.js" crossorigin="anonymous"></script>
-  <script src="_karma_webpack_/scripts.js" crossorigin="anonymous"></script>
-  <script src="_karma_webpack_/vendor.js" crossorigin="anonymous"></script>
-  <script src="_karma_webpack_/main.js" crossorigin="anonymous"></script>
-  <script type="text/javascript">
+      // All served files with the latest timestamps
+      %MAPPINGS%
+    </script>
+    <script src="_karma_webpack_/runtime.js" crossorigin="anonymous"></script>
+    <script src="_karma_webpack_/polyfills-es5.js" crossorigin="anonymous" nomodule></script>
+    <script src="_karma_webpack_/polyfills.js" crossorigin="anonymous"></script>
+    <!-- Dynamically replaced with <script> tags -->
+    %SCRIPTS%
+    <script src="_karma_webpack_/scripts.js" crossorigin="anonymous"></script>
+    <script src="_karma_webpack_/vendor.js" crossorigin="anonymous"></script>
+    <script src="_karma_webpack_/main.js" crossorigin="anonymous"></script>
+    <script type="text/javascript">
       window.__karma__.loaded();
-  </script>
-</body>
-
+    </script>
+  </body>
 </html>
diff --git a/packages/angular_devkit/build_angular/src/webpack/plugins/karma/karma-webpack-failure-cb.ts b/packages/angular_devkit/build_angular/src/webpack/plugins/karma/karma-webpack-failure-cb.ts
deleted file mode 100644
index b4c02479bd6e..000000000000
--- a/packages/angular_devkit/build_angular/src/webpack/plugins/karma/karma-webpack-failure-cb.ts
+++ /dev/null
@@ -1,24 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-// tslint:disable
-// TODO: cleanup this file, it's copied as is from Angular CLI.
-
-// Force Webpack to throw compilation errors. Useful with karma-webpack when in single-run mode.
-// Workaround for https://github.com/webpack-contrib/karma-webpack/issues/66
-
-export class KarmaWebpackFailureCb {
-  constructor(private callback: (error: string | undefined, errors: string[]) => void) { }
-
-  apply(compiler: any): void {
-    compiler.hooks.done.tap('KarmaWebpackFailureCb', (stats: any) => {
-      if (stats.compilation.errors.length > 0) {
-        this.callback(undefined, stats.compilation.errors.map((error: any) => error.message? error.message : error.toString()));
-      }
-    });
-  }
-}
diff --git a/packages/angular_devkit/build_angular/src/webpack/plugins/karma/karma.ts b/packages/angular_devkit/build_angular/src/webpack/plugins/karma/karma.ts
index 1c77fab9f80c..ce24f7cf9fca 100644
--- a/packages/angular_devkit/build_angular/src/webpack/plugins/karma/karma.ts
+++ b/packages/angular_devkit/build_angular/src/webpack/plugins/karma/karma.ts
@@ -1,36 +1,26 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use 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
+
+/* eslint-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';
+import 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 { createConsoleLogger } from '@angular-devkit/core/node';
 import { logging } from '@angular-devkit/core';
 import { WebpackTestOptions } from '../../../utils/build-options';
 import { normalizeSourceMaps } from '../../../utils/index';
 
-/**
- * Enumerate needed (but not require/imported) dependencies from this file
- *  to let the dependency validator know they are used.
- *
- * require('source-map-support')
- * require('karma-source-map-support')
- */
-
- const KARMA_APPLICATION_PATH = '_karma_webpack_';
-
+const KARMA_APPLICATION_PATH = '_karma_webpack_';
 
 let blocked: any[] = [];
 let isBlocked = false;
@@ -43,14 +33,14 @@ function addKarmaFiles(files: any[], newFiles: any[], prepend = false) {
   const defaults = {
     included: true,
     served: true,
-    watched: true
+    watched: true,
   };
 
   const processedFiles = newFiles
     // Remove globs that do not match any files, otherwise Karma will show a warning for these.
-    .filter(file => glob.sync(file.pattern, { nodir: true }).length != 0)
+    .filter((file) => glob.sync(file.pattern, { nodir: true }).length != 0)
     // Fill in pattern properties with defaults.
-    .map(file => ({ ...defaults, ...file }));
+    .map((file) => ({ ...defaults, ...file }));
 
   // It's important to not replace the array, because
   // karma already has a reference to the existing array.
@@ -63,9 +53,10 @@ function addKarmaFiles(files: any[], newFiles: any[], prepend = false) {
 
 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.`
-    )
+    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.`,
+    );
   }
   const options = config.buildWebpack.options as WebpackTestOptions;
   const logger: logging.Logger = config.buildWebpack.logger || createConsoleLogger();
@@ -82,10 +73,14 @@ const init: any = (config: any, emitter: any) => {
     const smsPath = path.dirname(require.resolve('source-map-support'));
     const ksmsPath = path.dirname(require.resolve('karma-source-map-support'));
 
-    addKarmaFiles(config.files, [
-      { pattern: path.join(smsPath, 'browser-source-map-support.js'), watched: false },
-      { pattern: path.join(ksmsPath, 'client.js'), watched: false }
-    ], true);
+    addKarmaFiles(
+      config.files,
+      [
+        { pattern: path.join(smsPath, 'browser-source-map-support.js'), watched: false },
+        { pattern: path.join(ksmsPath, 'client.js'), watched: false },
+      ],
+      true,
+    );
   }
 
   config.reporters.unshift('@angular-devkit/build-angular--event-reporter');
@@ -94,9 +89,11 @@ const init: any = (config: any, emitter: any) => {
   if (options.codeCoverage) {
     config.plugins = config.plugins || [];
     config.reporters = config.reporters || [];
-    const {plugins, reporters} = config;
+    const { plugins, reporters } = config;
     const hasCoveragePlugin = plugins.some(isPlugin('karma-coverage', 'reporter:coverage'));
-    const hasIstanbulPlugin = plugins.some(isPlugin('karma-coverage-istanbul-reporter', 'reporter:coverage-istanbul'));
+    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) {
@@ -109,9 +106,11 @@ const init: any = (config: any, emitter: any) => {
     }
 
     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.' ` +
-       'For more info, see https://github.com/karma-runner/karma-coverage/blob/master/README.md');
+      logger.warn(
+        `'karma-coverage-istanbul-reporter' usage has been deprecated since version 11.\n` +
+          `Please install 'karma-coverage' and update 'karma.conf.js.' ` +
+          'For more info, see https://github.com/karma-runner/karma-coverage/blob/master/README.md',
+      );
     }
   }
 
@@ -123,21 +122,9 @@ const init: any = (config: any, emitter: any) => {
     publicPath: `/${KARMA_APPLICATION_PATH}/`,
   };
 
-  const compilationErrorCb = (error: string | undefined, errors: string[]) => {
-    // Notify potential listeners of the compile error
-    emitter.emit('compile_error', errors);
-
-    // Finish Karma run early in case of compilation error.
-    emitter.emit('run_complete', [], { exitCode: 1 });
-
-    // Unblock any karma requests (potentially started using `karma run`)
-    unblock();
-  }
-  webpackConfig.plugins.push(new KarmaWebpackFailureCb(compilationErrorCb));
-
   // Use existing config if any.
-  config.webpack = Object.assign(webpackConfig, config.webpack);
-  config.webpackMiddleware = Object.assign(webpackMiddlewareConfig, config.webpackMiddleware);
+  config.webpack = { ...webpackConfig, ...config.webpack };
+  config.webpackMiddleware = { ...webpackMiddlewareConfig, ...config.webpackMiddleware };
 
   // Our custom context and debug files list the webpack bundles directly instead of using
   // the karma files array.
@@ -150,15 +137,13 @@ const init: any = (config: any, emitter: any) => {
   config.middleware = config.middleware || [];
   config.middleware.push('@angular-devkit/build-angular--fallback');
 
-  // The webpack tier owns the watch behavior so we want to force it in the config.
-  webpackConfig.watch = !config.singleRun;
   if (config.singleRun) {
     // There's no option to turn off file watching in webpack-dev-server, but
     // we can override the file watcher instead.
     webpackConfig.plugins.unshift({
-      apply: (compiler: any) => { // tslint:disable-line:no-any
+      apply: (compiler: any) => {
         compiler.hooks.afterEnvironment.tap('karma', () => {
-          compiler.watchFileSystem = { watch: () => { } };
+          compiler.watchFileSystem = { watch: () => {} };
         });
       },
     });
@@ -167,46 +152,54 @@ const init: any = (config: any, emitter: any) => {
   webpackConfig.output.path = `/${KARMA_APPLICATION_PATH}/`;
   webpackConfig.output.publicPath = `/${KARMA_APPLICATION_PATH}/`;
 
-  let compiler;
-  try {
-    compiler = webpack(webpackConfig);
-  } catch (e) {
-    logger.error(e.stack || e)
-    if (e.details) {
-      logger.error(e.details)
+  const compiler = webpack(webpackConfig, (error, stats) => {
+    if (error) {
+      throw error;
     }
-    throw e;
-  }
 
-  function handler(callback?: () => void) {
-    isBlocked = true;
+    if (stats?.hasErrors()) {
+      // Only generate needed JSON stats and when needed.
+      const statsJson = stats?.toJson({
+        all: false,
+        children: true,
+        errors: true,
+        warnings: true,
+      });
 
-    if (typeof callback === 'function') {
-      callback();
+      logger.error(statsErrorsToString(statsJson, { colors: true }));
+
+      // Notify potential listeners of the compile error.
+      emitter.emit('compile_error', {
+        errors: statsJson.errors?.map((e) => e.message),
+      });
+
+      // Finish Karma run early in case of compilation error.
+      emitter.emit('run_complete', [], { exitCode: 1 });
+
+      // Emit a failure build event if there are compilation errors.
+      failureCb();
     }
+  });
+
+  function handler(callback?: () => void): void {
+    isBlocked = true;
+    callback?.();
   }
 
   compiler.hooks.invalid.tap('karma', () => handler());
-
   compiler.hooks.watchRun.tapAsync('karma', (_: any, callback: () => void) => handler(callback));
-
   compiler.hooks.run.tapAsync('karma', (_: any, callback: () => void) => handler(callback));
 
-  function unblock(){
+  function unblock() {
     isBlocked = false;
     blocked.forEach((cb) => cb());
     blocked = [];
   }
 
   let lastCompilationHash: string | undefined;
-  const statsConfig = getWebpackStatsConfig();
   compiler.hooks.done.tap('karma', (stats) => {
     if (stats.hasErrors()) {
-      // Print compilation errors.
-      logger.error(statsErrorsToString(stats.compilation, statsConfig));
       lastCompilationHash = undefined;
-      // Emit a failure build event if there are compilation errors.
-      failureCb();
     } else if (stats.hash != lastCompilationHash) {
       // Refresh karma only when there are no webpack errors, and if the compilation changed.
       lastCompilationHash = stats.hash;
@@ -215,7 +208,7 @@ const init: any = (config: any, emitter: any) => {
     unblock();
   });
 
-  webpackMiddleware = new webpackDevMiddleware(compiler, webpackMiddlewareConfig);
+  webpackMiddleware = webpackDevMiddleware(compiler, webpackMiddlewareConfig);
 
   emitter.on('exit', (done: any) => {
     webpackMiddleware.close();
@@ -244,12 +237,12 @@ function requestBlocker() {
 // browser log, because it is an utility reporter,
 // unless it's alone in the "reporters" option and base reporter is used.
 function muteDuplicateReporterLogging(context: any, config: any) {
-  context.writeCommonMsg = function () { };
+  context.writeCommonMsg = () => {};
   const reporterName = '@angular/cli';
   const hasTrailingReporters = config.reporters.slice(-1).pop() !== reporterName;
 
   if (hasTrailingReporters) {
-    context.writeCommonMsg = function () { };
+    context.writeCommonMsg = () => {};
   }
 }
 
@@ -265,7 +258,7 @@ const eventReporter: any = function (this: any, baseReporterDecorator: any, conf
     } else {
       failureCb();
     }
-  }
+  };
 
   // avoid duplicate failure message
   this.specFailure = () => {};
@@ -308,7 +301,7 @@ function fallbackMiddleware() {
           `/${KARMA_APPLICATION_PATH}/polyfills.js`,
           `/${KARMA_APPLICATION_PATH}/polyfills-es5.js`,
           `/${KARMA_APPLICATION_PATH}/scripts.js`,
-          `/${KARMA_APPLICATION_PATH}/styles.js`,
+          `/${KARMA_APPLICATION_PATH}/styles.css`,
           `/${KARMA_APPLICATION_PATH}/vendor.js`,
         ];
         if (request.url && alwaysServe.includes(request.url)) {
@@ -332,7 +325,7 @@ function fallbackMiddleware() {
  * @param pluginName name of the karma plugin (e.g. reporter:coverage)
  */
 function isPlugin(moduleId: string, pluginName: string) {
-  return (plugin: string|{}): boolean => {
+  return (plugin: string | {}): boolean => {
     if (typeof plugin === 'string') {
       if (!plugin.includes('*')) {
         return plugin === moduleId;
@@ -347,7 +340,7 @@ function isPlugin(moduleId: string, pluginName: string) {
       return false;
     }
     return pluginName in plugin;
-  }
+  };
 }
 
 module.exports = {
@@ -355,5 +348,5 @@ module.exports = {
   'reporter:@angular-devkit/build-angular--sourcemap-reporter': ['type', sourceMapReporter],
   'reporter:@angular-devkit/build-angular--event-reporter': ['type', eventReporter],
   'middleware:@angular-devkit/build-angular--blocker': ['factory', requestBlocker],
-  'middleware:@angular-devkit/build-angular--fallback': ['factory', fallbackMiddleware]
+  'middleware:@angular-devkit/build-angular--fallback': ['factory', fallbackMiddleware],
 };
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
deleted file mode 100644
index 132766a0412f..000000000000
--- a/packages/angular_devkit/build_angular/src/webpack/plugins/optimize-css-webpack-plugin.ts
+++ /dev/null
@@ -1,121 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-import * as cssNano from 'cssnano';
-import { ProcessOptions, Result } from 'postcss';
-import { Compilation, Compiler, sources } from 'webpack';
-import { addWarning } from '../../utils/webpack-diagnostics';
-
-export interface OptimizeCssWebpackPluginOptions {
-  sourceMap: boolean;
-  test: (file: string) => boolean;
-}
-
-const PLUGIN_NAME = 'optimize-css-webpack-plugin';
-
-function hook(
-  compiler: Compiler,
-  action: (compilation: Compilation, assetsURI: string[]) => Promise<void>,
-) {
-  compiler.hooks.compilation.tap(PLUGIN_NAME, (compilation) => {
-    compilation.hooks.processAssets.tapPromise({
-      name: PLUGIN_NAME,
-      stage: Compilation.PROCESS_ASSETS_STAGE_OPTIMIZE,
-    },
-    assets => action(compilation, Object.keys(assets)));
-  });
-}
-
-export class OptimizeCssWebpackPlugin {
-  private readonly _options: OptimizeCssWebpackPluginOptions;
-
-  constructor(options: Partial<OptimizeCssWebpackPluginOptions>) {
-    this._options = {
-      sourceMap: false,
-      test: file => file.endsWith('.css'),
-      ...options,
-    };
-  }
-
-  apply(compiler: Compiler): void {
-    hook(compiler, (compilation: Compilation, assetsURI: string[]) => {
-      const files = [...compilation.additionalChunkAssets, ...assetsURI];
-
-      const actions = files
-        .filter(file => this._options.test(file))
-        .map(async file => {
-          const asset = compilation.assets[file];
-          if (!asset) {
-            return;
-          }
-
-          let content: string | Buffer;
-          // tslint:disable-next-line: no-any
-          let map: any;
-          if (this._options.sourceMap && asset.sourceAndMap) {
-            const sourceAndMap = asset.sourceAndMap({});
-            content = sourceAndMap.source;
-            map = sourceAndMap.map;
-          } else {
-            content = asset.source();
-          }
-
-          if (typeof content !== 'string') {
-            content = content.toString();
-          }
-
-          if (content.length === 0) {
-            return;
-          }
-
-          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,
-            }],
-          };
-
-          const postCssOptions: ProcessOptions = {
-            from: file,
-            map: map && { annotation: false, prev: map },
-          };
-
-          const output = await new Promise<Result>((resolve, reject) => {
-            // @types/cssnano are not up to date with version 5.
-            // tslint:disable-next-line: no-any
-            (cssNano as any)(cssNanoOptions).process(content, postCssOptions)
-              .then(resolve)
-              .catch((err: Error) => reject(new Error(`${file} ${err.message}`)));
-          });
-
-          for (const { text } of output.warnings()) {
-            addWarning(compilation, text);
-          }
-
-          let newSource;
-          if (output.map) {
-            newSource = new sources.SourceMapSource(
-              output.css,
-              file,
-              // tslint:disable-next-line: no-any
-              output.map.toString() as any,
-              content,
-              map,
-            );
-          } else {
-            newSource = new sources.RawSource(output.css);
-          }
-
-          compilation.assets[file] = newSource;
-        });
-
-      return Promise.all(actions).then(() => {});
-    });
-  }
-}
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 9294fde4ea65..40fdf185aada 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,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 { interpolateName } from 'loader-utils';
 import * as path from 'path';
 import { Declaration, Plugin } from 'postcss';
 import * as url from 'url';
-import * as webpack from 'webpack';
 
 function wrapUrl(url: string): string {
   let wrappedUrl;
-  const hasSingleQuotes = url.indexOf('\'') >= 0;
+  const hasSingleQuotes = url.indexOf("'") >= 0;
 
   if (hasSingleQuotes) {
     wrappedUrl = `"${url}"`;
@@ -32,8 +32,7 @@ export interface PostcssCliResourcesOptions {
   /** CSS is extracted to a `.css` or is embedded in a `.js` file. */
   extracted?: boolean;
   filename: (resourcePath: string) => string;
-  // tslint:disable-next-line: no-any
-  loader: any;
+  loader: import('webpack').LoaderContext<unknown>;
   emitFile: boolean;
 }
 
@@ -51,7 +50,7 @@ async function resolve(
 
 export const postcss = true;
 
-export default function(options?: PostcssCliResourcesOptions): Plugin {
+export default function (options?: PostcssCliResourcesOptions): Plugin {
   if (!options) {
     throw new Error('No options were specified to "postcss-cli-resources".');
   }
@@ -92,33 +91,32 @@ export default function(options?: PostcssCliResourcesOptions): Plugin {
     }
 
     const { pathname, hash, search } = url.parse(inputUrl.replace(/\\/g, '/'));
-    const resolver = (file: string, base: string) => new Promise<string>((resolve, reject) => {
-      loader.resolve(base, decodeURI(file), (err: Error, result: string) => {
-        if (err) {
-          reject(err);
-
-          return;
-        }
-        resolve(result);
+    const resolver = (file: string, base: string) =>
+      new Promise<string>((resolve, reject) => {
+        loader.resolve(base, decodeURI(file), (err, result) => {
+          if (err) {
+            reject(err);
+
+            return;
+          }
+          resolve(result as string);
+        });
       });
-    });
 
     const result = await resolve(pathname as string, context, resolver);
 
     return new Promise<string>((resolve, reject) => {
-      loader.fs.readFile(result, (err: Error, content: Buffer) => {
+      loader.fs.readFile(result, (err, content) => {
         if (err) {
           reject(err);
 
           return;
         }
 
-        let outputPath = interpolateName(
-          {  resourcePath: result },
-          filename(result),
-          { content, context: loader.context || loader.rootContext },
-        )
-        .replace(/\\|\//g, '-');
+        let outputPath = interpolateName({ resourcePath: result }, filename(result), {
+          content,
+          context: loader.context || loader.rootContext,
+        }).replace(/\\|\//g, '-');
 
         if (resourcesOutputPath) {
           outputPath = path.posix.join(resourcesOutputPath, outputPath);
@@ -126,7 +124,8 @@ export default function(options?: PostcssCliResourcesOptions): Plugin {
 
         loader.addDependency(result);
         if (emitFile) {
-          loader.emitFile(outputPath, content, undefined);
+          // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+          loader.emitFile(outputPath, content!, undefined, { sourceFilename: result });
         }
 
         let outputUrl = outputPath.replace(/\\/g, '/');
@@ -164,16 +163,16 @@ export default function(options?: PostcssCliResourcesOptions): Plugin {
 
       // We want to load it relative to the file that imports
       const inputFile = decl.source && decl.source.input.file;
-      const context = inputFile && path.dirname(inputFile) || loader.context;
+      const context = (inputFile && path.dirname(inputFile)) || loader.context;
 
-      // tslint:disable-next-line:no-conditional-assignment
-      while (match = urlRegex.exec(value)) {
+      // eslint-disable-next-line no-cond-assign
+      while ((match = urlRegex.exec(value))) {
         const originalUrl = match[1] || match[2] || match[3];
         let processedUrl;
         try {
           processedUrl = await process(originalUrl, context, resourceCache);
         } catch (err) {
-          loader.emitError(decl.error(err.message, { word: originalUrl }).toString());
+          loader.emitError(decl.error(err.message, { word: originalUrl }));
           continue;
         }
 
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 b1fcee81627d..74c6a1807a48 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,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 { Compiler } from 'webpack';
 import { HashFormat } from '../utils/helpers';
 
@@ -14,20 +15,17 @@ export interface RemoveHashPluginOptions {
 }
 
 export class RemoveHashPlugin {
-
-  constructor(private options: RemoveHashPluginOptions) { }
+  constructor(private options: RemoveHashPluginOptions) {}
 
   apply(compiler: Compiler): void {
-    compiler.hooks.compilation.tap('remove-hash-plugin', compilation => {
+    compiler.hooks.compilation.tap('remove-hash-plugin', (compilation) => {
       const assetPath = (path: string, data: { chunk?: { name: string } }) => {
         const chunkName = data.chunk?.name;
         const { chunkNames, hashFormat } = this.options;
 
         if (chunkName && chunkNames?.includes(chunkName)) {
           // Replace hash formats with empty strings.
-          return path
-            .replace(hashFormat.chunk, '')
-            .replace(hashFormat.extract, '');
+          return path.replace(hashFormat.chunk, '').replace(hashFormat.extract, '');
         }
 
         return path;
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 294fbb7c168d..31595dfb93b3 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
@@ -11,6 +11,7 @@ import * as path from 'path';
 import { Chunk, Compilation, Compiler, sources as webpackSources } from 'webpack';
 
 const Entrypoint = require('webpack/lib/Entrypoint');
+
 export interface ScriptsWebpackPluginOptions {
   name: string;
   sourceMap?: boolean;
@@ -33,9 +34,8 @@ export class ScriptsWebpackPlugin {
   private _lastBuildTime?: number;
   private _cachedOutput?: ScriptOutput;
 
-  constructor(private options: ScriptsWebpackPluginOptions) { }
+  constructor(private options: ScriptsWebpackPluginOptions) {}
 
-  // tslint:disable-next-line: no-any
   async shouldSkip(compilation: Compilation, scripts: string[]): Promise<boolean> {
     if (this._lastBuildTime == undefined) {
       this._lastBuildTime = Date.now();
@@ -52,7 +52,7 @@ export class ScriptsWebpackPlugin {
             return;
           }
 
-          resolve((entry && typeof entry !== 'string') ? entry.safeTime : undefined);
+          resolve(entry && typeof entry !== 'string' ? entry.safeTime : undefined);
         });
       });
 
@@ -66,7 +66,11 @@ export class ScriptsWebpackPlugin {
     return true;
   }
 
-  private _insertOutput(compilation: Compilation, { filename, source }: ScriptOutput, cached = false) {
+  private _insertOutput(
+    compilation: Compilation,
+    { filename, source }: ScriptOutput,
+    cached = false,
+  ) {
     const chunk = new Chunk(this.options.name);
     chunk.rendered = !cached;
     chunk.id = this.options.name;
@@ -79,7 +83,7 @@ export class ScriptsWebpackPlugin {
     compilation.entrypoints.set(this.options.name, entrypoint);
     compilation.chunks.add(chunk);
 
-    // tslint:disable-next-line: no-any
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     compilation.assets[filename] = source as any;
     compilation.hooks.chunkAsset.call(chunk, filename);
   }
@@ -90,24 +94,26 @@ export class ScriptsWebpackPlugin {
     }
 
     const scripts = this.options.scripts
-      .filter(script => !!script)
-      .map(script => path.resolve(this.options.basePath || '', script));
+      .filter((script) => !!script)
+      .map((script) => path.resolve(this.options.basePath || '', script));
 
-    compiler.hooks.thisCompilation.tap('scripts-webpack-plugin', compilation => {
+    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);
-            }
+        if (await this.shouldSkip(compilation, scripts)) {
+          if (this._cachedOutput) {
+            this._insertOutput(compilation, this._cachedOutput, true);
+          }
 
-            addDependencies(compilation, scripts);
+          addDependencies(compilation, scripts);
 
-            return;
-          }
+          return;
+        }
 
-          const sourceGetters = scripts.map(fullPath => {
-            return new Promise<webpackSources.Source>((resolve, reject) => {
-              compilation.inputFileSystem.readFile(fullPath, (err?: Error, data?: string | Buffer) => {
+        const sourceGetters = scripts.map((fullPath) => {
+          return new Promise<webpackSources.Source>((resolve, reject) => {
+            compilation.inputFileSystem.readFile(
+              fullPath,
+              (err?: Error | null, data?: string | Buffer) => {
                 if (err) {
                   reject(err);
 
@@ -130,29 +136,32 @@ export class ScriptsWebpackPlugin {
                 }
 
                 resolve(source);
-              });
-            });
-          });
-
-          const sources = await Promise.all(sourceGetters);
-          const concatSource = new webpackSources.ConcatSource();
-          sources.forEach(source => {
-            concatSource.add(source);
-            concatSource.add('\n;');
+              },
+            );
           });
+        });
 
-          const combinedSource = new webpackSources.CachedSource(concatSource);
-          const filename = interpolateName(
-            { resourcePath: 'scripts.js' },
-            this.options.filename as string,
-            { content: combinedSource.source() },
-          );
-
-          const output = { filename, source: combinedSource };
-          this._insertOutput(compilation, output);
-          this._cachedOutput = output;
-          addDependencies(compilation, scripts);
+        const sources = await Promise.all(sourceGetters);
+        const concatSource = new webpackSources.ConcatSource();
+        sources.forEach((source) => {
+          concatSource.add(source);
+          concatSource.add('\n;');
         });
+
+        const combinedSource = new webpackSources.CachedSource(concatSource);
+        const filename = interpolateName(
+          { resourcePath: 'scripts.js' },
+          this.options.filename as string,
+          {
+            content: combinedSource.source(),
+          },
+        );
+
+        const output = { filename, source: combinedSource };
+        this._insertOutput(compilation, output);
+        this._cachedOutput = output;
+        addDependencies(compilation, scripts);
+      });
     });
   }
 }
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 da69e3bba2d5..c3f10ac56dd2 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,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 { logging, tags } from '@angular-devkit/core';
-import { getOptions } from 'loader-utils';
 import { extname } from 'path';
 
 export interface SingleTestTransformLoaderOptions {
@@ -30,13 +30,15 @@ export const SingleTestTransformLoader = __filename;
  * Then it adds import statements for each file in the files options
  * array to import them directly, and thus run the tests there.
  */
-// tslint:disable-next-line: no-any
-export default function loader(this: any, source: string): string {
-  const { files = [], logger = console } = getOptions(this) as SingleTestTransformLoaderOptions;
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export default function loader(
+  this: import('webpack').LoaderContext<SingleTestTransformLoaderOptions>,
+  source: string,
+): string {
+  const { files = [], logger = console } = this.getOptions();
   // signal the user that expected content is not present.
   if (!source.includes('require.context(')) {
-    logger.error(tags.stripIndent
-      `The 'include' option requires that the 'main' file for tests includes the below line:
+    logger.error(tags.stripIndent`The 'include' option requires that the 'main' file for tests includes the below line:
       const context = require.context('./', true, /\.spec\.ts$/);
       Arguments passed to require.context are not strict and can be changed.`);
 
@@ -44,10 +46,11 @@ export default function loader(this: any, source: string): string {
   }
 
   const targettedImports = files
-    .map(path => `require('./${path.replace('.' + extname(path), '')}');`)
+    .map((path) => `require('./${path.replace('.' + extname(path), '')}');`)
     .join('\n');
 
-  const mockedRequireContext = 'Object.assign(() => { }, { keys: () => [], resolve: () => undefined });\n';
+  const mockedRequireContext =
+    'Object.assign(() => { }, { keys: () => [], resolve: () => undefined });\n';
   source = source.replace(/require\.context\(.*/, mockedRequireContext + targettedImports);
 
   return source;
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..64a8f3b2ce1e 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
@@ -21,7 +21,6 @@ export class SuppressExtractedTextChunksWebpackPlugin {
 
         // Only chunks with a css asset should have JavaScript assets removed
         let hasCssFile = false;
-        // chunk.files is an Array in Webpack 4 and a Set in Webpack 5
         for (const file of chunk.files) {
           if (file.endsWith('.css')) {
             hasCssFile = true;
@@ -35,53 +34,20 @@ export class SuppressExtractedTextChunksWebpackPlugin {
 
         // Only chunks with all CSS entry dependencies should have JavaScript assets removed
         let cssOnly = false;
-        // The any cast is used for default Webpack 4 type compatibility
-        // tslint:disable-next-line: no-any
-        const entryModules = (compilation as any).chunkGraph?.getChunkEntryModulesIterable(chunk);
-        if (entryModules) {
-          // Webpack 5
-          for (const module of entryModules) {
-            cssOnly = module.dependencies.every(
-              (dependency: {}) => dependency.constructor.name === 'CssDependency',
-            );
+        const entryModules = compilation.chunkGraph.getChunkEntryModulesIterable(chunk);
+        for (const module of entryModules) {
+          cssOnly = module.dependencies.every(
+            (dependency: {}) => dependency.constructor.name === 'CssDependency',
+          );
 
-            if (!cssOnly) {
-              break;
-            }
-          }
-        } else {
-          // Webpack 4
-          for (const module of chunk.modulesIterable as Iterable<{ dependencies: {}[] }>) {
-            cssOnly = module.dependencies.every((dependency) => {
-              const name = dependency.constructor.name;
-
-              return (
-                name === 'CssDependency' ||
-                name === 'SingleEntryDependency' ||
-                name === 'MultiEntryDependency' ||
-                name === 'HarmonyCompatibilityDependency' ||
-                name === 'HarmonyExportHeaderDependency' ||
-                name === 'HarmonyInitDependency'
-              );
-            });
-
-            if (!cssOnly) {
-              break;
-            }
+          if (!cssOnly) {
+            break;
           }
         }
 
         if (cssOnly) {
-          if (Array.isArray(chunk.files)) {
-            // Webpack 4
-            (chunk.files as string[]) = chunk.files.filter((file) => file !== filename);
-            delete compilation.assets[filename];
-          } else {
-            // Webpack 5
-            // Casting is used for default Webpack 4 type compatibility
-            ((chunk.files as unknown) as Set<string>).delete(filename);
-            ((compilation as unknown) as { deleteAsset(file: string): void }).deleteAsset(filename);
-          }
+          chunk.files.delete(filename);
+          compilation.deleteAsset(filename);
         }
       });
     });
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 4023b41d5177..101af93a7b91 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,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 { StatsChunk, StatsCompilation } from 'webpack';
 import { NormalizedEntryPoint } from './helpers';
-import { JsonChunkStats, JsonCompilationStats } from './stats';
 
 /**
  * Webpack stats may incorrectly mark extra entry points `initial` chunks, when
@@ -15,41 +16,39 @@ import { JsonChunkStats, JsonCompilationStats } from './stats';
  * whereever necessary. Does not modify {@param webpackStats}.
  */
 export function markAsyncChunksNonInitial(
-  webpackStats: JsonCompilationStats,
+  webpackStats: StatsCompilation,
   extraEntryPoints: NormalizedEntryPoint[],
-): JsonChunkStats[] {
-  const {chunks = [], entrypoints: entryPoints = {}} = webpackStats;
+): StatsChunk[] {
+  const { chunks = [], entrypoints: entryPoints = {} } = webpackStats;
 
   // Find all Webpack chunk IDs not injected into the main bundle. We don't have
   // to worry about transitive dependencies because extra entry points cannot be
   // depended upon in Webpack, thus any extra entry point with `inject: false`,
   // **cannot** be loaded in main bundle.
-  const asyncEntryPoints = extraEntryPoints.filter((entryPoint) => !entryPoint.inject);
-  const asyncChunkIds = flatMap(asyncEntryPoints,
-      (entryPoint) => entryPoints[entryPoint.bundleName].chunks);
+  const asyncChunkIds = extraEntryPoints
+    .filter((entryPoint) => !entryPoint.inject && entryPoints[entryPoint.bundleName])
+    .flatMap((entryPoint) =>
+      entryPoints[entryPoint.bundleName].chunks?.filter((n) => n !== 'runtime'),
+    );
 
   // Find chunks for each ID.
   const asyncChunks = asyncChunkIds.map((chunkId) => {
-      const chunk = chunks.find((chunk) => chunk.id === chunkId);
-      if (!chunk) {
-        throw new Error(`Failed to find chunk (${chunkId}) in set:\n${
-            JSON.stringify(chunks)}`);
-      }
+    const chunk = chunks.find((chunk) => chunk.id === chunkId);
+    if (!chunk) {
+      throw new Error(`Failed to find chunk (${chunkId}) in set:\n${JSON.stringify(chunks)}`);
+    }
 
-      return chunk;
-    })
-    // All Webpack chunks are dependent on `runtime`, which is never an async
-    // entry point, simply ignore this one.
-    .filter((chunk) => chunk.names.indexOf('runtime') === -1);
+    return chunk;
+  });
 
   // A chunk is considered `initial` only if Webpack already belives it to be initial
   // and the application developer did not mark it async via an extra entry point.
-  return chunks.map((chunk) => ({
-    ...chunk,
-    initial: chunk.initial && !asyncChunks.find((asyncChunk) => asyncChunk === chunk),
-  }));
-}
-
-function flatMap<T, R>(list: T[], mapper: (item: T, index: number, array: T[]) => R[]): R[] {
-  return ([] as R[]).concat(...list.map(mapper));
+  return chunks.map((chunk) => {
+    return asyncChunks.find((asyncChunk) => asyncChunk === chunk)
+      ? {
+          ...chunk,
+          initial: false,
+        }
+      : chunk;
+  });
 }
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
deleted file mode 100644
index f6b9629380e1..000000000000
--- a/packages/angular_devkit/build_angular/src/webpack/utils/async-chunks_spec.ts
+++ /dev/null
@@ -1,137 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-import * as webpack from 'webpack';
-import { markAsyncChunksNonInitial } from './async-chunks';
-
-describe('async-chunks', () => {
-  describe('markAsyncChunksNonInitial()', () => {
-    it('sets `initial: false` for all extra entry points loaded asynchronously', () => {
-      const chunks = [
-        {
-          id: 0,
-          names: ['first'],
-          initial: true,
-          files: [],
-        },
-        {
-          id: 1,
-          names: ['second'],
-          initial: true,
-          files: [],
-        },
-        {
-          id: 'third', // IDs can be strings too.
-          names: ['third'],
-          initial: true,
-          files: [],
-        },
-      ];
-      const entrypoints = {
-        first: {
-          chunks: [0],
-        },
-        second: {
-          chunks: [1],
-        },
-        third: {
-          chunks: ['third'],
-        },
-      };
-      const webpackStats = { chunks, entrypoints };
-
-      const extraEntryPoints = [
-        {
-          bundleName: 'first',
-          inject: false, // Loaded asynchronously.
-          input: 'first.css',
-        },
-        {
-          bundleName: 'second',
-          inject: true,
-          input: 'second.js',
-        },
-        {
-          bundleName: 'third',
-          inject: false, // Loaded asynchronously.
-          input: 'third.js',
-        },
-      ];
-
-      const newChunks = markAsyncChunksNonInitial(webpackStats, extraEntryPoints);
-
-      expect(newChunks).toEqual([
-        {
-          id: 0,
-          names: ['first'],
-          initial: false, // No longer initial because it was marked async.
-          files: [],
-        },
-        {
-          id: 1,
-          names: ['second'],
-          initial: true,
-          files: [],
-        },
-        {
-          id: 'third',
-          names: ['third'],
-          initial: false, // No longer initial because it was marked async.
-          files: [],
-        },
-      ]);
-    });
-
-    it('ignores runtime dependency of async chunks', () => {
-      const chunks = [
-        {
-          id: 0,
-          names: ['asyncStuff'],
-          initial: true,
-          files: [],
-        },
-        {
-          id: 1,
-          names: ['runtime'],
-          initial: true,
-          files: [],
-        },
-      ];
-      const entrypoints = {
-        asyncStuff: {
-          chunks: [0, 1], // Includes runtime as a dependency.
-        },
-      };
-      const webpackStats = { chunks, entrypoints };
-
-      const extraEntryPoints = [
-        {
-          bundleName: 'asyncStuff',
-          inject: false, // Loaded asynchronously.
-          input: 'asyncStuff.js',
-        },
-      ];
-
-      const newChunks = markAsyncChunksNonInitial(webpackStats, extraEntryPoints);
-
-      expect(newChunks).toEqual([
-        {
-          id: 0,
-          names: ['asyncStuff'],
-          initial: false, // No longer initial because it was marked async.
-          files: [],
-        },
-        {
-          id: 1,
-          names: ['runtime'],
-          initial: true, // Still initial, even though its a dependency.
-          files: [],
-        },
-      ]);
-    });
-  });
-});
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 832a2bc15a49..f07178b07c91 100644
--- a/packages/angular_devkit/build_angular/src/webpack/utils/helpers.ts
+++ b/packages/angular_devkit/build_angular/src/webpack/utils/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
@@ -46,7 +46,7 @@ export function normalizeExtraEntryPoints(
   extraEntryPoints: ExtraEntryPoint[],
   defaultBundleName: string,
 ): NormalizedEntryPoint[] {
-  return extraEntryPoints.map(entry => {
+  return extraEntryPoints.map((entry) => {
     if (typeof entry === 'string') {
       return { input: entry, inject: true, bundleName: defaultBundleName };
     }
@@ -57,9 +57,7 @@ export function normalizeExtraEntryPoints(
       bundleName = entry.bundleName;
     } else if (!inject) {
       // Lazy entry points use the file name as bundle name.
-      bundleName = basename(
-        normalize(entry.input.replace(/\.(js|css|scss|sass|less|styl)$/i, '')),
-      );
+      bundleName = basename(normalize(entry.input.replace(/\.(js|css|scss|sass|less|styl)$/i, '')));
     } else {
       bundleName = defaultBundleName;
     }
@@ -121,7 +119,7 @@ export function isPolyfillsEntry(name: string): boolean {
 export function getWatchOptions(poll: number | undefined): Configuration['watchOptions'] {
   return {
     poll,
-    ignored: poll === undefined ? undefined : 'node_modules/**',
+    ignored: poll === undefined ? '**/$_lazy_route_resources' : 'node_modules/**',
   };
 }
 
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 79cb2c1073ba..5d49c2198dcf 100644
--- a/packages/angular_devkit/build_angular/src/webpack/utils/stats.ts
+++ b/packages/angular_devkit/build_angular/src/webpack/utils/stats.ts
@@ -1,43 +1,21 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use 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 { logging, tags } from '@angular-devkit/core';
+
 import { WebpackLoggingCallback } from '@angular-devkit/build-webpack';
+import { logging, tags } from '@angular-devkit/core';
 import * as path from 'path';
-import * as textTable from 'text-table';
+import textTable from 'text-table';
+import { Configuration, StatsCompilation } from 'webpack';
+import { Schema as BrowserBuilderOptions } from '../../browser/schema';
 import { colors as ansiColors, removeColor } from '../../utils/color';
-import { Configuration } from 'webpack';
-
-export interface JsonAssetStats {
-  name: string;
-  size: number;
-}
-
-export interface JsonChunkStats {
-  id: number | string;
-  initial?: boolean;
-  files: string[];
-  names: string[];
-}
-
-export interface JsonEntrypointStats {
-  chunks: (number | string)[];
-}
-
-export interface JsonCompilationStats {
-  assets?: JsonAssetStats[];
-  chunks?: JsonChunkStats[];
-  entrypoints?: Record<string, JsonEntrypointStats>;
-  outputPath?: string;
-  warnings?: ({ message: string } | string)[];
-  errors?: ({ message: string } | string)[];
-}
+import { getWebpackStatsConfig } from '../configs/stats';
+import { markAsyncChunksNonInitial } from './async-chunks';
+import { normalizeExtraEntryPoints } from './helpers';
 
 export function formatSize(size: number): string {
   if (size <= 0) {
@@ -49,6 +27,7 @@ export function formatSize(size: number): string {
   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]}`;
 }
 
@@ -60,37 +39,42 @@ export interface BundleStats {
   initial: boolean;
   stats: BundleStatsData;
   chunkType: ChunkType;
-};
-
-export function generateBundleStats(
-  info: {
-    size?: number;
-    files: string[];
-    names?: string[];
-    entry?: boolean;
-    initial?: boolean;
-    rendered?: boolean;
-    chunkType?: ChunkType,
-  },
-): BundleStats {
+}
+
+export function generateBundleStats(info: {
+  size?: number;
+  files?: string[];
+  names?: string[];
+  initial?: boolean;
+  rendered?: boolean;
+  chunkType?: ChunkType;
+}): BundleStats {
   const size = typeof info.size === 'number' ? info.size : '-';
-  const files = info.files.filter(f => !f.endsWith('.map')).map(f => path.basename(f)).join(', ');
+  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 initial = !!info.initial;
   const chunkType = info.chunkType || 'unknown';
 
   return {
     chunkType,
     initial,
     stats: [files, names, size],
-  }
+  };
 }
 
-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;
+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[] = [];
@@ -138,10 +122,7 @@ function generateBuildStatsTable(data: BundleStats[], colors: boolean, showTotal
 
   // Entry chunks
   if (changedEntryChunksStats.length) {
-    bundleInfo.push(
-      ['Initial Chunk Files', 'Names', 'Size'].map(bold),
-      ...changedEntryChunksStats,
-    );
+    bundleInfo.push(['Initial Chunk Files', 'Names', 'Size'].map(bold), ...changedEntryChunksStats);
 
     if (showTotalSize) {
       bundleInfo.push([]);
@@ -163,41 +144,62 @@ function generateBuildStatsTable(data: BundleStats[], colors: boolean, showTotal
 
   // Lazy chunks
   if (changedLazyChunksStats.length) {
-    bundleInfo.push(
-      ['Lazy Chunk Files', 'Names', 'Size'].map(bold),
-      ...changedLazyChunksStats,
-    );
+    bundleInfo.push(['Lazy Chunk Files', 'Names', 'Size'].map(bold), ...changedLazyChunksStats);
   }
 
   return textTable(bundleInfo, {
     hsep: dim(' | '),
-    stringLength: s => removeColor(s).length,
+    stringLength: (s) => removeColor(s).length,
     align: ['l', 'l', 'r'],
   });
 }
 
 function generateBuildStats(hash: string, time: number, colors: boolean): string {
-  const w = (x: string) => colors ? ansiColors.bold.white(x) : x;
+  const w = (x: string) => (colors ? ansiColors.bold.white(x) : x);
+
   return `Build at: ${w(new Date().toISOString())} - Hash: ${w(hash)} - Time: ${w('' + time)}ms`;
 }
 
-function statsToString(json: any, statsConfig: any, bundleState?: BundleStats[]): string {
+// We use this cache because we can have multiple builders running in the same process,
+// where each builder has different output path.
+
+// Ideally, we should create the logging callback as a factory, but that would need a refactoring.
+const runsCache = new Set<string>();
+
+function statsToString(
+  json: StatsCompilation,
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  statsConfig: any,
+  bundleState?: BundleStats[],
+): string {
+  if (!json.chunks?.length) {
+    return '';
+  }
+
   const colors = statsConfig.colors;
-  const rs = (x: string) => colors ? ansiColors.reset(x) : x;
+  const rs = (x: string) => (colors ? ansiColors.reset(x) : x);
 
   const changedChunksStats: BundleStats[] = bundleState ?? [];
   let unchangedChunkNumber = 0;
   if (!bundleState?.length) {
+    const isFirstRun = !runsCache.has(json.outputPath || '');
+
     for (const chunk of json.chunks) {
-      if (!chunk.rendered) {
+      // During first build we want to display unchanged chunks
+      // but unchanged cached chunks are always marked as not rendered.
+      if (!isFirstRun && !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);
+      const assets = json.assets?.filter((asset) => chunk.files?.includes(asset.name));
+      const summedSize = assets
+        ?.filter((asset) => !asset.name.endsWith('.map'))
+        .reduce((total, asset) => total + asset.size, 0);
       changedChunksStats.push(generateBundleStats({ ...chunk, size: summedSize }));
     }
     unchangedChunkNumber = json.chunks.length - changedChunksStats.length;
+
+    runsCache.add(json.outputPath || '');
   }
 
   // Sort chunks by size in descending order
@@ -213,60 +215,57 @@ function statsToString(json: any, statsConfig: any, bundleState?: BundleStats[])
     return 0;
   });
 
-  const statsTable = generateBuildStatsTable(changedChunksStats, colors, unchangedChunkNumber === 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;
+  let time = 0;
+  if (json.builtAt !== undefined && json.time !== undefined) {
+    time = Date.now() - json.builtAt + json.time;
+  }
 
   if (unchangedChunkNumber > 0) {
-    return '\n' + rs(tags.stripIndents`
+    return (
+      '\n' +
+      rs(tags.stripIndents`
       ${statsTable}
 
       ${unchangedChunkNumber} unchanged chunks
 
-      ${generateBuildStats(json.hash, time, colors)}
-      `);
+      ${generateBuildStats(json.hash || '', time, colors)}
+      `)
+    );
   } else {
-    return '\n' + rs(tags.stripIndents`
+    return (
+      '\n' +
+      rs(tags.stripIndents`
       ${statsTable}
 
-      ${generateBuildStats(json.hash, time, colors)}
-      `);
+      ${generateBuildStats(json.hash || '', time, colors)}
+      `)
+    );
   }
 }
 
-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,
-  // https://github.com/webpack-contrib/source-map-loader/blob/b2de4249c7431dd8432da607e08f0f65e9d64219/src/index.js#L83
-  /Failed to parse source map from/,
-];
-interface WebpackDiagnostic {
-  message: string;
-  file?: string;
-  moduleName?: string;
-  loc?: string;
-}
-
-export function statsWarningsToString(json: any, statsConfig: any): string {
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export function statsWarningsToString(json: StatsCompilation, statsConfig: any): string {
   const colors = statsConfig.colors;
-  const c = (x: string) => colors ? ansiColors.reset.cyan(x) : x;
-  const y = (x: string) => colors ? ansiColors.reset.yellow(x) : x;
-  const yb = (x: string) => colors ? ansiColors.reset.yellowBright(x) : x;
+  const c = (x: string) => (colors ? ansiColors.reset.cyan(x) : x);
+  const y = (x: string) => (colors ? ansiColors.reset.yellow(x) : x);
+  const yb = (x: string) => (colors ? ansiColors.reset.yellowBright(x) : x);
 
-  const warnings = [...json.warnings];
+  const warnings = json.warnings ? [...json.warnings] : [];
   if (json.children) {
-    warnings.push(...json.children
-      .map((c: any) => c.warnings)
-      .reduce((a: string[], b: string[]) => [...a, ...b], [])
-    );
+    warnings.push(...json.children.map((c) => c.warnings ?? []).reduce((a, b) => [...a, ...b], []));
   }
 
   let output = '';
-  for (const warning of warnings as (string | WebpackDiagnostic)[]) {
+  for (const warning of warnings) {
     if (typeof warning === 'string') {
       output += yb(`Warning: ${warning}\n\n`);
     } else {
@@ -285,29 +284,23 @@ export function statsWarningsToString(json: any, statsConfig: any): string {
     }
   }
 
-  if (output) {
-    return '\n' + output;
-  }
-
-  return '';
+  return output ? '\n' + output : output;
 }
 
-export function statsErrorsToString(json: any, statsConfig: any): string {
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export function statsErrorsToString(json: StatsCompilation, statsConfig: any): string {
   const colors = statsConfig.colors;
-  const c = (x: string) => colors ? ansiColors.reset.cyan(x) : x;
-  const yb = (x: string) => colors ? ansiColors.reset.yellowBright(x) : x;
-  const r = (x: string) => colors ? ansiColors.reset.redBright(x) : x;
+  const c = (x: string) => (colors ? ansiColors.reset.cyan(x) : x);
+  const yb = (x: string) => (colors ? ansiColors.reset.yellowBright(x) : x);
+  const r = (x: string) => (colors ? ansiColors.reset.redBright(x) : x);
 
-  const errors = [...json.errors];
+  const errors = json.errors ? [...json.errors] : [];
   if (json.children) {
-    errors.push(...json.children
-      .map((c: any) => c.errors)
-      .reduce((a: string[], b: string[]) => [...a, ...b], [])
-    );
+    errors.push(...json.children.map((c) => c?.errors || []).reduce((a, b) => [...a, ...b], []));
   }
 
   let output = '';
-  for (const error of errors as (string | WebpackDiagnostic)[]) {
+  for (const error of errors) {
     if (typeof error === 'string') {
       output += r(`Error: ${error}\n\n`);
     } else {
@@ -326,47 +319,45 @@ export function statsErrorsToString(json: any, statsConfig: any): string {
     }
   }
 
-  if (output) {
-    return '\n' + output;
-  }
-
-  return '';
+  return output ? '\n' + output : output;
 }
 
-export function statsHasErrors(json: any): boolean {
-  return json.errors.length || !!json.children?.some((c: any) => c.errors.length);
+export function statsHasErrors(json: StatsCompilation): boolean {
+  return !!(json.errors?.length || json.children?.some((c) => c.errors?.length));
 }
 
-export function statsHasWarnings(json: any): boolean {
-  return json.warnings.length || !!json.children?.some((c: any) => c.warnings.length);
+export function statsHasWarnings(json: StatsCompilation): boolean {
+  return !!(json.warnings?.length || json.children?.some((c) => c.warnings?.length));
 }
 
 export function createWebpackLoggingCallback(
-  verbose: boolean,
+  options: BrowserBuilderOptions,
   logger: logging.LoggerApi,
 ): WebpackLoggingCallback {
+  const { verbose = false, scripts = [], styles = [] } = options;
+  const extraEntryPoints = [
+    ...normalizeExtraEntryPoints(styles, 'styles'),
+    ...normalizeExtraEntryPoints(scripts, 'scripts'),
+  ];
+
   return (stats, config) => {
     if (verbose) {
       logger.info(stats.toString(config.stats));
     }
 
-    webpackStatsLogger(
-      logger,
-      stats.toJson({
-        errors: true,
-        warnings: true,
-        builtAt: true,
-        assets: true,
-        chunks: true,
-      }) as JsonCompilationStats,
-      config,
-    );
+    const rawStats = stats.toJson(getWebpackStatsConfig(false));
+    const webpackStats = {
+      ...rawStats,
+      chunks: markAsyncChunksNonInitial(rawStats, extraEntryPoints),
+    };
+
+    webpackStatsLogger(logger, webpackStats, config);
   };
 }
 
 export function webpackStatsLogger(
   logger: logging.LoggerApi,
-  json: JsonCompilationStats,
+  json: StatsCompilation,
   config: Configuration,
   bundleStats?: BundleStats[],
 ): void {
@@ -378,4 +369,4 @@ export function webpackStatsLogger(
   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 060a1593f6a0..7b20e6342c47 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
@@ -22,6 +22,13 @@
             "polyfills": "src/polyfills.ts",
             "tsConfig": "src/tsconfig.app.json",
             "progress": false,
+            "sourceMap": false,
+            "aot": false,
+            "vendorChunk": true,
+            "buildOptimizer": false,
+            "optimization": false,
+            "extractLicenses": false,
+            "namedChunks": true,
             "assets": [
               "src/favicon.ico",
               "src/assets"
@@ -67,7 +74,10 @@
             "outputPath": "dist-server",
             "main": "src/main.server.ts",
             "tsConfig": "src/tsconfig.server.json",
-            "progress": false
+            "progress": false,
+            "sourceMap": true,
+            "optimization": false,
+            "extractLicenses": false
           }
         },
         "app-shell": {
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 390560bd37dc..6cfa9f72cb21 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,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 { AppPage } from './app.po';
 
 describe('hello-world-app App', () => {
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..dcbf96793adc 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,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 { browser, by, element } from 'protractor';
 
 export class AppPage {
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 1b6b10b70e7c..9e0431095e65 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,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
  */
+
 // Karma configuration file, see link for more information
 // https://karma-runner.github.io/1.0/config/configuration-file.html
 
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..9b57663994c9 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,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
  */
+
 // Protractor configuration file, see link for more information
 // https://github.com/angular/protractor/blob/master/lib/config.ts
 
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..56f6ecbf22fa 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,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 { TestBed } from '@angular/core/testing';
 import { AppComponent } from './app.component';
 describe('AppComponent', () => {
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..aef2940f181f 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,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 { Component } from '@angular/core';
 
 @Component({
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..09f4f6fa82bd 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,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 { BrowserModule } from '@angular/platform-browser';
 import { NgModule } from '@angular/core';
 
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..cddaa2d485ce 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,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 { NgModule } from '@angular/core';
 import { ServerModule } from '@angular/platform-server';
 
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..e0818f2e9056 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,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
  */
+
 export const environment = {
   production: true,
 };
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..a922b2b6e660 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,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
  */
+
 // 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.
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..385a12d1a665 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,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 '@angular/localize/init';
 import { enableProdMode } from '@angular/core';
 
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..fdde6bed1f3f 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,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 { enableProdMode } from '@angular/core';
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 
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 345f7b9d8005..eb6530df1887 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,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
  */
+
 /**
  * This file includes polyfills needed by Angular and is loaded before the app.
  * You can add your own extra polyfills to this file.
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 6355082bbf2a..00b85b49756c 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,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
  */
+
 // This file is required by karma.conf.js and loads recursively all the .spec and framework files
 
 import 'zone.js/testing';
@@ -22,7 +23,11 @@ declare const require: {
 };
 
 // First, initialize the Angular testing environment.
-getTestBed().initTestEnvironment(BrowserDynamicTestingModule, platformBrowserDynamicTesting());
+getTestBed().initTestEnvironment(
+  BrowserDynamicTestingModule,
+  platformBrowserDynamicTesting(),
+  { teardown: { destroyAfterEach: true }},
+);
 // Then we find all the tests.
 const context = require.context('./', true, /\.spec\.ts$/);
 // And load the modules.
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..9ba8f77b9c67 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,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
  */
+
 /* SystemJS module definition */
 declare var module: NodeModule;
 interface NodeModule {
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 80b89d8439ac..a0e81b921f61 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,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
  */
+
 // Karma configuration file, see link for more information
 // https://karma-runner.github.io/1.0/config/configuration-file.html
 
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 5917d86fecca..67aa57126998 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": "^11.0.0",
-    "@angular/core": "^11.0.0"
+    "@angular/common": "^12.0.0",
+    "@angular/core": "^12.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..3757410c6510 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,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 { ComponentFixture, TestBed } from '@angular/core/testing';
 
 import { LibComponent } from './lib.component';
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..345514700ee8 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,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 { Component, OnInit } from '@angular/core';
 
 @Component({
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..22f2b46c3e66 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,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 { NgModule } from '@angular/core';
 import { LibComponent } from './lib.component';
 import { LibService } from './lib.service';
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..480f827b6999 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,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 { TestBed, inject } from '@angular/core/testing';
 
 import { LibService } from './lib.service';
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..c4745e811a63 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,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 { Injectable } from '@angular/core';
 
 @Injectable()
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..8b8ca08454c2 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,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
  */
+
 /*
  * Public API Surface of lib
  */
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 798ae95022a0..179ce7251b5c 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,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
  */
+
 // This file is required by karma.conf.js and loads recursively all the .spec and framework files
 
 import 'zone.js';
@@ -25,7 +26,8 @@ declare const require: {
 // First, initialize the Angular testing environment.
 getTestBed().initTestEnvironment(
   BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting()
+  platformBrowserDynamicTesting(),
+  { teardown: { destroyAfterEach: true }},
 );
 // Then we find all the tests.
 const context = require.context('./', true, /\.spec\.ts$/);
diff --git a/packages/angular_devkit/build_optimizer/BUILD.bazel b/packages/angular_devkit/build_optimizer/BUILD.bazel
index e787842c8694..b02beb4a7d81 100644
--- a/packages/angular_devkit/build_optimizer/BUILD.bazel
+++ b/packages/angular_devkit/build_optimizer/BUILD.bazel
@@ -9,6 +9,7 @@ load("//tools:defaults.bzl", "ts_library")
 # @external_begin
 load("@bazel_tools//tools/build_defs/pkg:pkg.bzl", "pkg_tar")
 load("@build_bazel_rules_nodejs//:index.bzl", "pkg_npm")
+load("@npm//@angular/dev-infra-private/bazel/api-golden:index.bzl", "api_golden_test_npm_package")
 # @external_end
 
 licenses(["notice"])  # MIT
@@ -80,4 +81,14 @@ pkg_tar(
     strip_prefix = "./npm_package",
     tags = ["manual"],
 )
+
+api_golden_test_npm_package(
+    name = "build_optimizer_api",
+    data = [
+        ":npm_package",
+        "//goldens:public-api",
+    ],
+    golden_dir = "angular_cli/goldens/public-api/angular_devkit/build_optimizer",
+    npm_package = "angular_cli/packages/angular_devkit/build_optimizer/npm_package",
+)
 # @external_end
diff --git a/packages/angular_devkit/build_optimizer/README.md b/packages/angular_devkit/build_optimizer/README.md
index 6b97c1b3588d..0875c259f711 100644
--- a/packages/angular_devkit/build_optimizer/README.md
+++ b/packages/angular_devkit/build_optimizer/README.md
@@ -2,7 +2,6 @@
 
 Angular Build Optimizer contains Angular optimizations applicable to JavaScript code as a TypeScript transform pipeline.
 
-
 ## Available optimizations
 
 Transformations applied depend on file content:
@@ -13,21 +12,26 @@ Transformations applied depend on file content:
 Some of these optimizations add `/*@__PURE__*/` comments.
 These are used by JS optimization tools to identify pure functions that can potentially be dropped.
 
-
 ### Class fold
 
 Static properties are folded into ES5 classes:
 
 ```typescript
 // input
-var Clazz = (function () { function Clazz() { } return Clazz; }());
+var Clazz = (function () {
+  function Clazz() {}
+  return Clazz;
+})();
 Clazz.prop = 1;
 
 // output
-var Clazz = (function () { function Clazz() { } Clazz.prop = 1; return Clazz; }());
+var Clazz = (function () {
+  function Clazz() {}
+  Clazz.prop = 1;
+  return Clazz;
+})();
 ```
 
-
 ### Scrub file
 
 Angular decorators, property decorators and constructor parameters are removed, while leaving non-Angular ones intact.
@@ -36,50 +40,59 @@ Angular decorators, property decorators and constructor parameters are removed,
 // input
 import { Injectable, Input, Component } from '@angular/core';
 import { NotInjectable, NotComponent, NotInput } from 'another-lib';
-var Clazz = (function () { function Clazz() { } return Clazz; }());
+var Clazz = (function () {
+  function Clazz() {}
+  return Clazz;
+})();
 Clazz.decorators = [{ type: Injectable }, { type: NotInjectable }];
 Clazz.propDecorators = { 'ngIf': [{ type: Input }] };
-Clazz.ctorParameters = function () { return [{type: Injector}]; };
+Clazz.ctorParameters = function () {
+  return [{ type: Injector }];
+};
 var ComponentClazz = (function () {
-  function ComponentClazz() { }
-  __decorate([
-    Input(),
-    __metadata("design:type", Object)
-  ], Clazz.prototype, "selected", void 0);
-  __decorate([
-    NotInput(),
-    __metadata("design:type", Object)
-  ], Clazz.prototype, "notSelected", void 0);
-  ComponentClazz = __decorate([
-    NotComponent(),
-    Component({
+  function ComponentClazz() {}
+  __decorate([Input(), __metadata('design:type', Object)], Clazz.prototype, 'selected', void 0);
+  __decorate(
+    [NotInput(), __metadata('design:type', Object)],
+    Clazz.prototype,
+    'notSelected',
+    void 0,
+  );
+  ComponentClazz = __decorate(
+    [
+      NotComponent(),
+      Component({
         selector: 'app-root',
         templateUrl: './app.component.html',
-        styleUrls: ['./app.component.css']
-    })
-  ], ComponentClazz);
+        styleUrls: ['./app.component.css'],
+      }),
+    ],
+    ComponentClazz,
+  );
   return ComponentClazz;
-}());
+})();
 
 // output
 import { Injectable, Input, Component } from '@angular/core';
 import { NotInjectable, NotComponent } from 'another-lib';
-var Clazz = (function () { function Clazz() { } return Clazz; }());
+var Clazz = (function () {
+  function Clazz() {}
+  return Clazz;
+})();
 Clazz.decorators = [{ type: NotInjectable }];
 var ComponentClazz = (function () {
-  function ComponentClazz() { }
-  __decorate([
-    NotInput(),
-    __metadata("design:type", Object)
-  ], Clazz.prototype, "notSelected", void 0);
-  ComponentClazz = __decorate([
-    NotComponent()
-  ], ComponentClazz);
+  function ComponentClazz() {}
+  __decorate(
+    [NotInput(), __metadata('design:type', Object)],
+    Clazz.prototype,
+    'notSelected',
+    void 0,
+  );
+  ComponentClazz = __decorate([NotComponent()], ComponentClazz);
   return ComponentClazz;
-}());
+})();
 ```
 
-
 ### Prefix functions
 
 Adds `/*@__PURE__*/` comments to top level downleveled class declarations and instantiation.
@@ -88,17 +101,22 @@ Warning: this transform assumes the file is a pure module. It should not be used
 
 ```typescript
 // input
-var Clazz = (function () { function Clazz() { } return Clazz; }());
+var Clazz = (function () {
+  function Clazz() {}
+  return Clazz;
+})();
 var newClazz = new Clazz();
 var newClazzTwo = Clazz();
 
 // output
-var Clazz = /*@__PURE__*/ (function () { function Clazz() { } return Clazz; }());
+var Clazz = /*@__PURE__*/ (function () {
+  function Clazz() {}
+  return Clazz;
+})();
 var newClazz = /*@__PURE__*/ new Clazz();
 var newClazzTwo = /*@__PURE__*/ Clazz();
 ```
 
-
 ### Prefix Classes
 
 Adds `/*@__PURE__*/` to downleveled TypeScript classes.
@@ -106,38 +124,41 @@ Adds `/*@__PURE__*/` to downleveled TypeScript classes.
 ```typescript
 // input
 var ReplayEvent = (function () {
-    function ReplayEvent(time, value) {
-        this.time = time;
-        this.value = value;
-    }
-    return ReplayEvent;
-}());
+  function ReplayEvent(time, value) {
+    this.time = time;
+    this.value = value;
+  }
+  return ReplayEvent;
+})();
 
 // output
 var ReplayEvent = /*@__PURE__*/ (function () {
-    function ReplayEvent(time, value) {
-        this.time = time;
-        this.value = value;
-    }
-    return ReplayEvent;
-}());
+  function ReplayEvent(time, value) {
+    this.time = time;
+    this.value = value;
+  }
+  return ReplayEvent;
+})();
 ```
 
-
 ### Import tslib
 
 TypeScript helpers (`__extends/__decorate/__metadata/__param`) are replaced with `tslib` imports whenever found.
 
 ```typescript
 // input
-var __extends = (this && this.__extends) || function (d, b) {
-  for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
-  function __() { this.constructor = d; }
-  d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
-};
+var __extends =
+  (this && this.__extends) ||
+  function (d, b) {
+    for (var p in b) if (b.hasOwnProperty(p)) d[p] = b[p];
+    function __() {
+      this.constructor = d;
+    }
+    d.prototype = b === null ? Object.create(b) : ((__.prototype = b.prototype), new __());
+  };
 
 // output
-import { __extends } from "tslib";
+import { __extends } from 'tslib';
 ```
 
 ### Wrap enums
@@ -148,20 +169,19 @@ Wrap downleveled TypeScript enums in a function, and adds `/*@__PURE__*/` commen
 // input
 var ChangeDetectionStrategy;
 (function (ChangeDetectionStrategy) {
-    ChangeDetectionStrategy[ChangeDetectionStrategy["OnPush"] = 0] = "OnPush";
-    ChangeDetectionStrategy[ChangeDetectionStrategy["Default"] = 1] = "Default";
+  ChangeDetectionStrategy[(ChangeDetectionStrategy['OnPush'] = 0)] = 'OnPush';
+  ChangeDetectionStrategy[(ChangeDetectionStrategy['Default'] = 1)] = 'Default';
 })(ChangeDetectionStrategy || (ChangeDetectionStrategy = {}));
 
 // output
 var ChangeDetectionStrategy = /*@__PURE__*/ (function () {
   var ChangeDetectionStrategy = {};
-  ChangeDetectionStrategy[ChangeDetectionStrategy["OnPush"] = 0] = "OnPush";
-  ChangeDetectionStrategy[ChangeDetectionStrategy["Default"] = 1] = "Default";
+  ChangeDetectionStrategy[(ChangeDetectionStrategy['OnPush'] = 0)] = 'OnPush';
+  ChangeDetectionStrategy[(ChangeDetectionStrategy['Default'] = 1)] = 'Default';
   return ChangeDetectionStrategy;
 })();
 ```
 
-
 ## Library Usage
 
 ```typescript
@@ -171,6 +191,7 @@ const transpiledContent = buildOptimizer({ content: input }).content;
 ```
 
 Available options:
+
 ```typescript
 export interface BuildOptimizerOptions {
   content?: string;
@@ -182,7 +203,6 @@ export interface BuildOptimizerOptions {
 }
 ```
 
-
 ## Webpack loader usage:
 
 ```typescript
@@ -206,7 +226,6 @@ module.exports = {
 }
 ```
 
-
 ## CLI usage
 
 ```bash
diff --git a/packages/angular_devkit/build_optimizer/package.json b/packages/angular_devkit/build_optimizer/package.json
index 5bfa929d1189..d51b28468819 100644
--- a/packages/angular_devkit/build_optimizer/package.json
+++ b/packages/angular_devkit/build_optimizer/package.json
@@ -10,8 +10,8 @@
   },
   "dependencies": {
     "source-map": "0.7.3",
-    "tslib": "2.2.0",
-    "typescript": "4.2.4"
+    "tslib": "2.3.0",
+    "typescript": "4.3.5"
   },
   "peerDependencies": {
     "webpack": "^5.30.0"
@@ -22,6 +22,6 @@
     }
   },
   "devDependencies": {
-    "webpack": "5.32.0"
+    "webpack": "5.50.0"
   }
 }
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 d1e79fc67abf..42baa78d38ec 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,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 { readFileSync } from 'fs';
 import {
   TransformJavascriptOptions,
@@ -14,13 +15,9 @@ import {
 } from '../helpers/transform-javascript';
 import { getPrefixClassesTransformer, testPrefixClasses } from '../transforms/prefix-classes';
 import { getPrefixFunctionsTransformer } from '../transforms/prefix-functions';
-import {
-  createScrubFileTransformerFactory,
-  testScrubFile,
-} from '../transforms/scrub-file';
+import { createScrubFileTransformerFactory, testScrubFile } from '../transforms/scrub-file';
 import { getWrapEnumsTransformer } from '../transforms/wrap-enums';
 
-
 // Angular packages are known to have no side effects.
 const knownSideEffectFreeAngularModules = [
   /[\\/]node_modules[\\/]@angular[\\/]animations[\\/]/,
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 e86217806082..cedf83bac194 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,18 +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
  */
-// tslint:disable:no-big-function
-// tslint:disable-next-line:no-implicit-dependencies
+
 import { tags } from '@angular-devkit/core';
 import { RawSourceMap } from 'source-map';
 import { TransformJavascriptOutput } from '../helpers/transform-javascript';
 import { buildOptimizer } from './build-optimizer';
 
-
 describe('build-optimizer', () => {
   const imports = `
     import { __decorate, __metadata } from "tslib";
@@ -188,9 +186,8 @@ describe('build-optimizer', () => {
     });
   });
 
-
   describe('resilience', () => {
-    it('doesn\'t process files with invalid syntax by default', () => {
+    it("doesn't process files with invalid syntax by default", () => {
       const input = tags.oneLine`
         ))))invalid syntax
         ${clazz}
@@ -222,9 +219,9 @@ describe('build-optimizer', () => {
         var BigClass = /** @class */ (function () {
           function BigClass() {
           }
-          ${Array.from(new Array(1000)).map((_v, i) =>
-            `BigClass.prototype.method${i} = function () { return this.myVar; };`,
-          ).join('\n')}
+          ${Array.from(new Array(1000))
+            .map((_v, i) => `BigClass.prototype.method${i} = function () { return this.myVar; };`)
+            .join('\n')}
           return BigClass;
         }());
         ${clazz}
@@ -252,15 +249,13 @@ describe('build-optimizer', () => {
       expect(boOutput.emitSkipped).toEqual(false);
     });
 
-    it('should not process modules which are not in the list of known side effect free modules',
-     () => {
+    it('should not process modules which are not in the list of known side effect free modules', () => {
       const inputFilePath = '/node_modules/other-package/core.es5.js';
       const boOutput = buildOptimizer({ content: input, inputFilePath });
       expect(boOutput.emitSkipped).toEqual(true);
     });
 
-    it('should not process umd modules which are not in the list of known side effect free modules',
-    () => {
+    it('should not process umd modules which are not in the list of known side effect free modules', () => {
       const inputFilePath = '/node_modules/other_lib/index.js';
       const boOutput = buildOptimizer({ content: input, inputFilePath });
       expect(boOutput.emitSkipped).toEqual(true);
@@ -274,19 +269,19 @@ describe('build-optimizer', () => {
       ${decorators}
     `;
 
-    it('doesn\'t produce sourcemaps by default', () => {
+    it("doesn't produce sourcemaps by default", () => {
       expect(buildOptimizer({ content: transformableInput }).sourceMap).toBeFalsy();
     });
 
     it('produces sourcemaps', () => {
-      expect(buildOptimizer(
-        { content: transformableInput, emitSourceMap: true },
-      ).sourceMap).toBeTruthy();
+      expect(
+        buildOptimizer({ content: transformableInput, emitSourceMap: true }).sourceMap,
+      ).toBeTruthy();
     });
 
     // TODO: re-enable this test, it was temporarily disabled as part of
     // https://github.com/angular/devkit/pull/842
-    xit('doesn\'t produce sourcemaps when emitting was skipped', () => {
+    xit("doesn't produce sourcemaps when emitting was skipped", () => {
       const ignoredInput = tags.oneLine`
         var Clazz = (function () { function Clazz() { } return Clazz; }());
       `;
@@ -306,16 +301,17 @@ describe('build-optimizer', () => {
     });
 
     it('emits sources content', () => {
-      const sourceMap = buildOptimizer(
-        { content: transformableInput, emitSourceMap: true },
-      ).sourceMap as RawSourceMap;
+      const sourceMap = buildOptimizer({ content: transformableInput, emitSourceMap: true })
+        .sourceMap as RawSourceMap;
       const sourceContent = sourceMap.sourcesContent as string[];
       expect(sourceContent[0]).toEqual(transformableInput);
     });
 
     it('uses empty strings if inputFilePath and outputFilePath is not provided', () => {
-      const { content, sourceMap } = buildOptimizer(
-        { content: transformableInput, emitSourceMap: true });
+      const { content, sourceMap } = buildOptimizer({
+        content: transformableInput,
+        emitSourceMap: true,
+      });
 
       if (!sourceMap) {
         throw new Error('sourceMap was not generated.');
@@ -343,5 +339,4 @@ describe('build-optimizer', () => {
       expect(content).toContain(`sourceMappingURL=${outputFilePath}.map`);
     });
   });
-
 });
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..6f413fd952ff 100644
--- a/packages/angular_devkit/build_optimizer/src/build-optimizer/cli.ts
+++ b/packages/angular_devkit/build_optimizer/src/build-optimizer/cli.ts
@@ -1,16 +1,17 @@
 #!/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
  */
+
 import { writeFileSync } from 'fs';
 import { join } from 'path';
 import { buildOptimizer } from './build-optimizer';
 
-// tslint:disable: no-console
+/* eslint-disable no-console */
 if (process.argv.length < 3 || process.argv.length > 4) {
   throw new Error(`
     build-optimizer should be called with either one or two arguments:
@@ -30,7 +31,7 @@ if (!inputFile.match(tsOrJsRegExp)) {
 }
 
 // Use provided output file, or add the .bo suffix before the extension.
-const outputFile = process.argv[3] || inputFile.replace(tsOrJsRegExp, subStr => `.bo${subStr}`);
+const outputFile = process.argv[3] || inputFile.replace(tsOrJsRegExp, (subStr) => `.bo${subStr}`);
 
 const boOutput = buildOptimizer({
   inputFilePath: join(currentDir, inputFile),
diff --git a/packages/angular_devkit/build_optimizer/src/build-optimizer/rollup-plugin.ts b/packages/angular_devkit/build_optimizer/src/build-optimizer/rollup-plugin.ts
index cb661c66abbe..d3497c11f504 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
@@ -26,7 +26,7 @@ export interface Options {
 export default function optimizer(options: Options) {
   // Normalize paths for comparison.
   if (options.sideEffectFreeModules) {
-    options.sideEffectFreeModules = options.sideEffectFreeModules.map(p => p.replace(/\\/g, '/'));
+    options.sideEffectFreeModules = options.sideEffectFreeModules.map((p) => p.replace(/\\/g, '/'));
   }
 
   return {
@@ -35,10 +35,10 @@ export default function optimizer(options: Options) {
       const normalizedId = id.replace(/\\/g, '/');
       const isSideEffectFree =
         options.sideEffectFreeModules &&
-        options.sideEffectFreeModules.some(m => normalizedId.indexOf(m) >= 0);
+        options.sideEffectFreeModules.some((m) => normalizedId.indexOf(m) >= 0);
       const isAngularCoreFile =
         options.angularCoreModules &&
-        options.angularCoreModules.some(m => normalizedId.indexOf(m) >= 0);
+        options.angularCoreModules.some((m) => normalizedId.indexOf(m) >= 0);
       const { content: code, sourceMap: map } = buildOptimizer({
         content,
         inputFilePath: id,
@@ -48,7 +48,7 @@ export default function optimizer(options: Options) {
       });
       if (!code) {
         if (DEBUG) {
-          // tslint:disable-next-line: no-console
+          // eslint-disable-next-line no-console
           console.error(
             'no transforms produced by buildOptimizer for ' + path.relative(process.cwd(), id),
           );
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 1fc6fcdb423c..e8ea09bfd342 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,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 { RawSourceMap } from 'source-map';
 import { sources } from 'webpack';
 import { buildOptimizer } from './build-optimizer';
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 29aa1ffbbc7f..25d52de89a74 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,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 type { Compiler, Module } from 'webpack';
 
 interface ModuleData {
@@ -13,8 +14,7 @@ interface ModuleData {
 
 export class BuildOptimizerWebpackPlugin {
   apply(compiler: Compiler) {
-    compiler.hooks.normalModuleFactory.tap('BuildOptimizerWebpackPlugin', nmf => {
-      // tslint:disable-next-line: no-any
+    compiler.hooks.normalModuleFactory.tap('BuildOptimizerWebpackPlugin', (nmf) => {
       nmf.hooks.module.tap('BuildOptimizerWebpackPlugin', (module: Module, data: ModuleData) => {
         if (data.resourceResolveData?.descriptionFileData) {
           // Only TS packages should use Build Optimizer.
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..d7f01ef96a78 100644
--- a/packages/angular_devkit/build_optimizer/src/helpers/ast-utils.ts
+++ b/packages/angular_devkit/build_optimizer/src/helpers/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 * as tslib from 'tslib';
 import * as ts from 'typescript';
 
@@ -12,7 +13,7 @@ const pureFunctionComment = '@__PURE__';
 
 // We include only exports that start with '__' because tslib helpers
 // all start with a suffix of two underscores.
-const tslibHelpers = new Set<string>(Object.keys(tslib).filter(h => h.startsWith('__')));
+const tslibHelpers = new Set<string>(Object.keys(tslib).filter((h) => h.startsWith('__')));
 
 // Find all nodes from the AST in the subtree of node of SyntaxKind kind.
 export function collectDeepNodes<T extends ts.Node>(node: ts.Node, kind: ts.SyntaxKind): T[] {
@@ -44,7 +45,7 @@ export function hasPureComment(node: ts.Node): boolean {
 
   const leadingComment = ts.getSyntheticLeadingComments(node);
 
-  return !!leadingComment && leadingComment.some(comment => comment.text === pureFunctionComment);
+  return !!leadingComment && leadingComment.some((comment) => comment.text === pureFunctionComment);
 }
 
 export function isHelperName(name: string): boolean {
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..1008abfad5cc 100644
--- a/packages/angular_devkit/build_optimizer/src/helpers/transform-javascript.ts
+++ b/packages/angular_devkit/build_optimizer/src/helpers/transform-javascript.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 { RawSourceMap } from 'source-map';
 import * as ts from 'typescript';
 
@@ -35,7 +36,7 @@ interface DiagnosticSourceFile extends ts.SourceFile {
 function validateDiagnostics(diagnostics: ReadonlyArray<ts.Diagnostic>, strict?: boolean): boolean {
   // Print error diagnostics.
 
-  const hasError = diagnostics.some(diag => diag.category === ts.DiagnosticCategory.Error);
+  const hasError = diagnostics.some((diag) => diag.category === ts.DiagnosticCategory.Error);
   if (hasError) {
     // Throw only if we're in strict mode, otherwise return original content.
     if (strict) {
@@ -61,15 +62,7 @@ function validateDiagnostics(diagnostics: ReadonlyArray<ts.Diagnostic>, strict?:
 export function transformJavascript(
   options: TransformJavascriptOptions,
 ): TransformJavascriptOutput {
-
-  const {
-    content,
-    getTransforms,
-    emitSourceMap,
-    inputFilePath,
-    outputFilePath,
-    strict,
-  } = options;
+  const { content, getTransforms, emitSourceMap, inputFilePath, outputFilePath, strict } = options;
 
   // Bail if there's no transform to do.
   if (getTransforms.length === 0) {
@@ -125,13 +118,10 @@ export function transformJavascript(
       };
     }
 
-    const printer = ts.createPrinter(
-      undefined,
-      {
-        onEmitNode: result.emitNodeWithNotification,
-        substituteNode: result.substituteNode,
-      },
-    );
+    const printer = ts.createPrinter(undefined, {
+      onEmitNode: result.emitNodeWithNotification,
+      substituteNode: result.substituteNode,
+    });
 
     const output = printer.printFile(result.transformed[0]);
 
@@ -198,8 +188,10 @@ export function transformJavascript(
     // Fix sourcemaps file references.
     if (outputFilePath) {
       sourceMap.file = outputFilePath;
-      transformedContent = transformedContent.replace(urlRegExp,
-        `//# sourceMappingURL=${sourceMap.file}.map\n`);
+      transformedContent = transformedContent.replace(
+        urlRegExp,
+        `//# sourceMappingURL=${sourceMap.file}.map\n`,
+      );
       if (inputFilePath) {
         sourceMap.sources = [inputFilePath];
       } else {
diff --git a/packages/angular_devkit/build_optimizer/src/index.ts b/packages/angular_devkit/build_optimizer/src/index.ts
index 4d4c11ab9c79..56c257a3a78a 100644
--- a/packages/angular_devkit/build_optimizer/src/index.ts
+++ b/packages/angular_devkit/build_optimizer/src/index.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 * as ts from 'typescript';
 import { createScrubFileTransformerFactory } from './transforms/scrub-file';
 
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..7f3624e7ef8f 100644
--- a/packages/angular_devkit/build_optimizer/src/transforms/prefix-classes.ts
+++ b/packages/angular_devkit/build_optimizer/src/transforms/prefix-classes.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 * as ts from 'typescript';
 import { addPureComment } from '../helpers/ast-utils';
 
@@ -16,20 +17,27 @@ export function testPrefixClasses(content: string) {
   const regexes = [
     [
       /^/,
-      exportVarSetter, multiLineComment,
-      /\(/, multiLineComment,
-      /\s*function \(\) {/, newLine,
+      exportVarSetter,
+      multiLineComment,
+      /\(/,
       multiLineComment,
-      /function (?:\S+)\([^\)]*\) \{/, newLine,
+      /\s*function \(\) {/,
+      newLine,
+      multiLineComment,
+      /function (?:\S+)\([^\)]*\) \{/,
+      newLine,
     ],
     [
       /^/,
-      exportVarSetter, multiLineComment,
-      /\(/, multiLineComment,
-      /\s*function \(_super\) {/, newLine,
+      exportVarSetter,
+      multiLineComment,
+      /\(/,
+      multiLineComment,
+      /\s*function \(_super\) {/,
+      newLine,
       /\S*\.?__extends\(\S+, _super\);/,
     ],
-  ].map(arr => new RegExp(arr.map(x => x.source).join(''), 'm'));
+  ].map((arr) => new RegExp(arr.map((x) => x.source).join(''), 'm'));
 
   return regexes.some((regex) => regex.test(content));
 }
@@ -41,7 +49,6 @@ export function getPrefixClassesTransformer(): ts.TransformerFactory<ts.SourceFi
   return (context: ts.TransformationContext): ts.Transformer<ts.SourceFile> => {
     const transformer: ts.Transformer<ts.SourceFile> = (sf: ts.SourceFile) => {
       const visitor: ts.Visitor = (node: ts.Node): ts.VisitResult<ts.Node> => {
-
         // Add pure comment to downleveled classes.
         if (ts.isVariableStatement(node) && isDownleveledClass(node)) {
           const varDecl = node.declarationList.declarations[0];
@@ -51,17 +58,14 @@ export function getPrefixClassesTransformer(): ts.TransformerFactory<ts.SourceFi
           const newNode = ts.updateVariableStatement(
             node,
             node.modifiers,
-            ts.updateVariableDeclarationList(
-              node.declarationList,
-              [
-                ts.updateVariableDeclaration(
-                  varDecl,
-                  varDecl.name,
-                  varDecl.type,
-                  addPureComment(varInitializer),
-                ),
-              ],
-            ),
+            ts.updateVariableDeclarationList(node.declarationList, [
+              ts.updateVariableDeclaration(
+                varDecl,
+                varDecl.name,
+                varDecl.type,
+                addPureComment(varInitializer),
+              ),
+            ]),
           );
 
           // Replace node with modified one.
@@ -81,7 +85,6 @@ export function getPrefixClassesTransformer(): ts.TransformerFactory<ts.SourceFi
 
 // Determine if a node matched the structure of a downleveled TS class.
 function isDownleveledClass(node: ts.Node): boolean {
-
   if (!ts.isVariableStatement(node)) {
     return false;
   }
@@ -92,8 +95,7 @@ function isDownleveledClass(node: ts.Node): boolean {
 
   const variableDeclaration = node.declarationList.declarations[0];
 
-  if (!ts.isIdentifier(variableDeclaration.name)
-      || !variableDeclaration.initializer) {
+  if (!ts.isIdentifier(variableDeclaration.name) || !variableDeclaration.initializer) {
     return false;
   }
 
@@ -113,8 +115,10 @@ function isDownleveledClass(node: ts.Node): boolean {
   let wrapperBody: ts.Block;
   if (ts.isFunctionExpression(potentialClass.expression)) {
     wrapperBody = potentialClass.expression.body;
-  } else if (ts.isArrowFunction(potentialClass.expression)
-             && ts.isBlock(potentialClass.expression.body)) {
+  } else if (
+    ts.isArrowFunction(potentialClass.expression) &&
+    ts.isBlock(potentialClass.expression.body)
+  ) {
     wrapperBody = potentialClass.expression.body;
   } else {
     return false;
@@ -143,17 +147,21 @@ function isDownleveledClass(node: ts.Node): boolean {
     }
   }
 
-  if (returnStatement == undefined
-      || returnStatement.expression == undefined
-      || !ts.isIdentifier(returnStatement.expression)) {
+  if (
+    returnStatement == undefined ||
+    returnStatement.expression == undefined ||
+    !ts.isIdentifier(returnStatement.expression)
+  ) {
     return false;
   }
 
   if (functionExpression.parameters.length === 0) {
     // potential non-extended class or wrapped es2015 class
-    return (ts.isFunctionDeclaration(firstStatement) || ts.isClassDeclaration(firstStatement))
-           && firstStatement.name !== undefined
-           && returnStatement.expression.text === firstStatement.name.text;
+    return (
+      (ts.isFunctionDeclaration(firstStatement) || ts.isClassDeclaration(firstStatement)) &&
+      firstStatement.name !== undefined &&
+      returnStatement.expression.text === firstStatement.name.text
+    );
   } else if (functionExpression.parameters.length !== 1) {
     return false;
   }
@@ -162,8 +170,10 @@ function isDownleveledClass(node: ts.Node): boolean {
 
   const functionParameter = functionExpression.parameters[0];
 
-  if (!ts.isIdentifier(functionParameter.name)
-      || functionParameter.name.text !== superParameterName) {
+  if (
+    !ts.isIdentifier(functionParameter.name) ||
+    functionParameter.name.text !== superParameterName
+  ) {
     return false;
   }
 
@@ -200,7 +210,9 @@ function isDownleveledClass(node: ts.Node): boolean {
 
   const secondStatement = functionStatements[1];
 
-  return ts.isFunctionDeclaration(secondStatement)
-         && secondStatement.name !== undefined
-         && returnStatement.expression.text === secondStatement.name.text;
+  return (
+    ts.isFunctionDeclaration(secondStatement) &&
+    secondStatement.name !== undefined &&
+    returnStatement.expression.text === secondStatement.name.text
+  );
 }
diff --git a/packages/angular_devkit/build_optimizer/src/transforms/prefix-classes_spec.ts b/packages/angular_devkit/build_optimizer/src/transforms/prefix-classes_spec.ts
index 21149b28bf00..a1aa5e2f1a9b 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,19 +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
  */
-// tslint:disable:no-big-function
-// tslint:disable-next-line:no-implicit-dependencies
+
 import { tags } from '@angular-devkit/core';
 import { transformJavascript } from '../helpers/transform-javascript';
 import { getPrefixClassesTransformer, testPrefixClasses } from './prefix-classes';
 
-
-const transform = (content: string) => transformJavascript(
-  { content, getTransforms: [getPrefixClassesTransformer] }).content;
+const transform = (content: string) =>
+  transformJavascript({ content, getTransforms: [getPrefixClassesTransformer] }).content;
 
 describe('prefix-classes', () => {
   it('prefix TS 2.0 - 2.4 downlevel class', () => {
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..e53563a95f75 100644
--- a/packages/angular_devkit/build_optimizer/src/transforms/prefix-functions.ts
+++ b/packages/angular_devkit/build_optimizer/src/transforms/prefix-functions.ts
@@ -1,17 +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 * as ts from 'typescript';
 import { addPureComment, getCleanHelperName, hasPureComment } from '../helpers/ast-utils';
 
 export function getPrefixFunctionsTransformer(): ts.TransformerFactory<ts.SourceFile> {
   return (context: ts.TransformationContext): ts.Transformer<ts.SourceFile> => {
     const transformer: ts.Transformer<ts.SourceFile> = (sf: ts.SourceFile) => {
-
       const topLevelFunctions = findTopLevelFunctions(sf);
 
       const visitor: ts.Visitor = (node: ts.Node): ts.Node => {
@@ -44,10 +44,11 @@ export function findTopLevelFunctions(parentNode: ts.Node): Set<ts.Node> {
     // need to mark function calls inside them as pure.
     // Class static initializers in ES2015 are an exception we don't cover. They would need similar
     // processing as enums to prevent property setting from causing the class to be retained.
-    if (ts.isFunctionLike(node)
-      || ts.isClassLike(node)
-      || ts.isArrowFunction(node)
-      || ts.isMethodDeclaration(node)
+    if (
+      ts.isFunctionLike(node) ||
+      ts.isClassLike(node) ||
+      ts.isArrowFunction(node) ||
+      ts.isMethodDeclaration(node)
     ) {
       return;
     }
@@ -63,11 +64,13 @@ export function findTopLevelFunctions(parentNode: ts.Node): Set<ts.Node> {
       return;
     }
 
-    if ((ts.isFunctionExpression(innerNode) || ts.isArrowFunction(innerNode))
-      && ts.isParenthesizedExpression(node)) {
-        // pure functions can be wrapped in parentizes
-        // we should not add pure comments to this sort of syntax.
-        // example var foo = (() => x)
+    if (
+      (ts.isFunctionExpression(innerNode) || ts.isArrowFunction(innerNode)) &&
+      ts.isParenthesizedExpression(node)
+    ) {
+      // pure functions can be wrapped in parentizes
+      // we should not add pure comments to this sort of syntax.
+      // example var foo = (() => x)
       return;
     }
 
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..c069c4e0be9b 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,18 +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
  */
-// tslint:disable-next-line:no-implicit-dependencies
+
 import { tags } from '@angular-devkit/core';
 import { transformJavascript } from '../helpers/transform-javascript';
 import { getPrefixFunctionsTransformer } from './prefix-functions';
 
-
-const transform = (content: string) => transformJavascript(
-  { content, getTransforms: [getPrefixFunctionsTransformer] }).content;
+const transform = (content: string) =>
+  transformJavascript({ content, getTransforms: [getPrefixFunctionsTransformer] }).content;
 
 describe('prefix-functions', () => {
   const clazz = 'var Clazz = (function () { function Clazz() { } return Clazz; }());';
@@ -53,7 +52,7 @@ describe('prefix-functions', () => {
       expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
     });
 
-    it('doesn\'t add comment when inside function declarations or expressions', () => {
+    it("doesn't add comment when inside function declarations or expressions", () => {
       const input = tags.stripIndent`
         function funcDecl() {
           var newClazz = Clazz();
@@ -72,7 +71,7 @@ describe('prefix-functions', () => {
       expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
     });
 
-    it('doesn\'t add comment to downlevel namespaces', () => {
+    it("doesn't add comment to downlevel namespaces", () => {
       const input = tags.stripIndent`
         function MyFunction() { }
 
@@ -90,7 +89,7 @@ describe('prefix-functions', () => {
       expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
     });
 
-    it('doesn\'t add comment when inside class', () => {
+    it("doesn't add comment when inside class", () => {
       const input = tags.stripIndent`
         class Foo {
           constructor(e) {
@@ -108,7 +107,7 @@ describe('prefix-functions', () => {
       expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
     });
 
-    it('doesn\'t add comment when inside arrow function', () => {
+    it("doesn't add comment when inside arrow function", () => {
       const input = tags.stripIndent`
         export const subscribeToArray = (array) => (subscriber) => {
             for (let i = 0, len = array.length; i < len && !subscriber.closed; i++) {
@@ -126,7 +125,7 @@ describe('prefix-functions', () => {
       expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
     });
 
-    it('doesn\'t add comment when inside object literal method', () => {
+    it("doesn't add comment when inside object literal method", () => {
       const input = tags.stripIndent`
         const literal = {
           method() {
@@ -142,7 +141,7 @@ describe('prefix-functions', () => {
     });
   });
 
-  it('doesn\'t add comment to downlevel arrow function', () => {
+  it("doesn't add comment to downlevel arrow function", () => {
     const input = tags.stripIndent`
       var populate = (function (props, rawData, entity) {
           props.forEach(function (prop) { });
@@ -155,7 +154,7 @@ describe('prefix-functions', () => {
     expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
   });
 
-  it('doesn\'t add comment inside arrow function', () => {
+  it("doesn't add comment inside arrow function", () => {
     const input = tags.stripIndent`
       const populate = ((props, rawData, entity) => {
           props.forEach(x => x);
@@ -168,7 +167,7 @@ describe('prefix-functions', () => {
     expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
   });
 
-  it('doesn\'t add comment when inside class expression', () => {
+  it("doesn't add comment when inside class expression", () => {
     const input = tags.stripIndent`
       let Foo = class Foo {
         constructor() {
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..2018a617fbb9 100644
--- a/packages/angular_devkit/build_optimizer/src/transforms/scrub-file.ts
+++ b/packages/angular_devkit/build_optimizer/src/transforms/scrub-file.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 * as ts from 'typescript';
 import { collectDeepNodes } from '../helpers/ast-utils';
 
@@ -26,10 +27,7 @@ export function createScrubFileTransformerFactory(
   return (program) => scrubFileTransformer(program, isAngularCoreFile);
 }
 
-function scrubFileTransformer(
-  program: ts.Program | undefined,
-  isAngularCoreFile: boolean,
-) {
+function scrubFileTransformer(program: ts.Program | undefined, isAngularCoreFile: boolean) {
   if (!program) {
     throw new Error('scrubFileTransformer requires a TypeScript Program.');
   }
@@ -105,7 +103,9 @@ function findAngularMetadata(node: ts.Node, isAngularCoreFile: boolean): ts.Node
     if (child.kind === ts.SyntaxKind.ImportDeclaration) {
       const importDecl = child as ts.ImportDeclaration;
       if (isAngularCoreImport(importDecl, isAngularCoreFile)) {
-        specs.push(...collectDeepNodes<ts.ImportSpecifier>(importDecl, ts.SyntaxKind.ImportSpecifier));
+        specs.push(
+          ...collectDeepNodes<ts.ImportSpecifier>(importDecl, ts.SyntaxKind.ImportSpecifier),
+        );
       }
     }
   });
@@ -229,7 +229,6 @@ function isAngularDecoratorExpression(
   tslibImports: ts.NamedImports[],
   checker: ts.TypeChecker,
 ): boolean {
-
   if (!ts.isCallExpression(exprStmt.expression)) {
     return false;
   }
@@ -249,7 +248,7 @@ function isAngularDecoratorExpression(
     return false;
   }
 
-  return decorateArray.elements.some(decoratorCall => {
+  return decorateArray.elements.some((decoratorCall) => {
     if (!ts.isCallExpression(decoratorCall) || !ts.isIdentifier(decoratorCall.expression)) {
       return false;
     }
@@ -279,8 +278,9 @@ function isCtorParamsAssignmentExpression(exprStmt: ts.ExpressionStatement): boo
     return false;
   }
   const expr = exprStmt.expression as ts.BinaryExpression;
-  if (expr.right.kind !== ts.SyntaxKind.FunctionExpression
-    && expr.right.kind !== ts.SyntaxKind.ArrowFunction
+  if (
+    expr.right.kind !== ts.SyntaxKind.FunctionExpression &&
+    expr.right.kind !== ts.SyntaxKind.ArrowFunction
   ) {
     return false;
   }
@@ -366,17 +366,18 @@ function pickDecorationNodesToRemove(
   ngMetadata: ts.Node[],
   checker: ts.TypeChecker,
 ): ts.Node[] {
-
   const expr = expect<ts.BinaryExpression>(exprStmt.expression, ts.SyntaxKind.BinaryExpression);
-  const literal = expect<ts.ArrayLiteralExpression>(expr.right,
-    ts.SyntaxKind.ArrayLiteralExpression);
-  if (!literal.elements.every(elem => ts.isObjectLiteralExpression(elem))) {
+  const literal = expect<ts.ArrayLiteralExpression>(
+    expr.right,
+    ts.SyntaxKind.ArrayLiteralExpression,
+  );
+  if (!literal.elements.every((elem) => ts.isObjectLiteralExpression(elem))) {
     return [];
   }
   const elements = literal.elements as ts.NodeArray<ts.ObjectLiteralExpression>;
   const ngDecorators = elements.filter((elem) => isAngularDecorator(elem, ngMetadata, checker));
 
-  return (elements.length > ngDecorators.length) ? ngDecorators : [exprStmt];
+  return elements.length > ngDecorators.length ? ngDecorators : [exprStmt];
 }
 
 // Remove Angular decorators from `Clazz = __decorate([...], Clazz)`, or expression itself if all
@@ -403,8 +404,10 @@ function pickDecorateNodesToRemove(
     return [];
   }
 
-  const arrLiteral = expect<ts.ArrayLiteralExpression>(callExpr.arguments[0],
-    ts.SyntaxKind.ArrayLiteralExpression);
+  const arrLiteral = expect<ts.ArrayLiteralExpression>(
+    callExpr.arguments[0],
+    ts.SyntaxKind.ArrayLiteralExpression,
+  );
 
   if (!arrLiteral.elements.every((elem) => ts.isCallExpression(elem))) {
     return [];
@@ -453,7 +456,7 @@ function pickDecorateNodesToRemove(
   // statement so that it is removed in entirety.
   // If not then only remove the Angular decorators.
   // The metadata and param calls may be used by the non-Angular decorators.
-  return (elements.length === callCount) ? [exprStmt] : ngDecoratorCalls;
+  return elements.length === callCount ? [exprStmt] : ngDecoratorCalls;
 }
 
 // Remove Angular decorators from`Clazz.propDecorators = [...];`, or expression itself if all
@@ -463,12 +466,16 @@ function pickPropDecorationNodesToRemove(
   ngMetadata: ts.Node[],
   checker: ts.TypeChecker,
 ): ts.Node[] {
-
   const expr = expect<ts.BinaryExpression>(exprStmt.expression, ts.SyntaxKind.BinaryExpression);
-  const literal = expect<ts.ObjectLiteralExpression>(expr.right,
-    ts.SyntaxKind.ObjectLiteralExpression);
-  if (!literal.properties.every(elem => ts.isPropertyAssignment(elem)
-    && ts.isArrayLiteralExpression(elem.initializer))) {
+  const literal = expect<ts.ObjectLiteralExpression>(
+    expr.right,
+    ts.SyntaxKind.ObjectLiteralExpression,
+  );
+  if (
+    !literal.properties.every(
+      (elem) => ts.isPropertyAssignment(elem) && ts.isArrayLiteralExpression(elem.initializer),
+    )
+  ) {
     return [];
   }
   const assignments = literal.properties as ts.NodeArray<ts.PropertyAssignment>;
@@ -476,15 +483,18 @@ function pickPropDecorationNodesToRemove(
   // a particular decorator within will.
   const toRemove = assignments
     .map((assign) => {
-      const decorators =
-        expect<ts.ArrayLiteralExpression>(assign.initializer,
-          ts.SyntaxKind.ArrayLiteralExpression).elements;
+      const decorators = expect<ts.ArrayLiteralExpression>(
+        assign.initializer,
+        ts.SyntaxKind.ArrayLiteralExpression,
+      ).elements;
       if (!decorators.every((el) => ts.isObjectLiteralExpression(el))) {
         return [];
       }
       const decsToRemove = decorators.filter((expression) => {
-        const lit = expect<ts.ObjectLiteralExpression>(expression,
-          ts.SyntaxKind.ObjectLiteralExpression);
+        const lit = expect<ts.ObjectLiteralExpression>(
+          expression,
+          ts.SyntaxKind.ObjectLiteralExpression,
+        );
 
         return isAngularDecorator(lit, ngMetadata, checker);
       });
@@ -498,7 +508,10 @@ function pickPropDecorationNodesToRemove(
   // If every node to be removed is a property assignment (full property's decorators) and
   // all properties are accounted for, remove the whole assignment. Otherwise, remove the
   // nodes which were marked as safe.
-  if (toRemove.length === assignments.length && toRemove.every((node) => ts.isPropertyAssignment(node))) {
+  if (
+    toRemove.length === assignments.length &&
+    toRemove.every((node) => ts.isPropertyAssignment(node))
+  ) {
     return [exprStmt];
   }
 
@@ -510,7 +523,6 @@ function isAngularDecorator(
   ngMetadata: ts.Node[],
   checker: ts.TypeChecker,
 ): boolean {
-
   const types = literal.properties.filter(isTypeProperty);
   if (types.length !== 1) {
     return false;
@@ -548,16 +560,14 @@ function identifierIsMetadata(
     return false;
   }
 
-  return symbol
-    .declarations
-    .some((spec) => metadata.includes(spec));
+  return symbol.declarations.some((spec) => metadata.includes(spec));
 }
 
 // Find all named imports for `tslib`.
 function findTslibImports(node: ts.Node): ts.NamedImports[] {
   const imports: ts.NamedImports[] = [];
 
-  ts.forEachChild(node, child => {
+  ts.forEachChild(node, (child) => {
     if (
       ts.isImportDeclaration(child) &&
       child.moduleSpecifier &&
@@ -590,7 +600,7 @@ function isTslibHelper(
   }
 
   for (const dec of symbol.declarations) {
-    if (ts.isImportSpecifier(dec) && tslibImports.some(name => name.elements.includes(dec))) {
+    if (ts.isImportSpecifier(dec) && tslibImports.some((name) => name.elements.includes(dec))) {
       return true;
     }
 
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..9101e4ff1d18 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,24 +1,28 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use 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
-// tslint:disable-next-line:no-implicit-dependencies
+
+/* eslint-disable max-len */
 import { tags } from '@angular-devkit/core';
 import { transformJavascript } from '../helpers/transform-javascript';
-import {
-  createScrubFileTransformerFactory,
-  testScrubFile,
-} from './scrub-file';
-
-
-const transform = (content: string) => transformJavascript(
-  { content, getTransforms: [createScrubFileTransformerFactory(false)], typeCheck: true }).content;
-const transformCore = (content: string) => transformJavascript(
-  { content, getTransforms: [createScrubFileTransformerFactory(true)], typeCheck: true }).content;
+import { createScrubFileTransformerFactory, testScrubFile } from './scrub-file';
+
+const transform = (content: string) =>
+  transformJavascript({
+    content,
+    getTransforms: [createScrubFileTransformerFactory(false)],
+    typeCheck: true,
+  }).content;
+const transformCore = (content: string) =>
+  transformJavascript({
+    content,
+    getTransforms: [createScrubFileTransformerFactory(true)],
+    typeCheck: true,
+  }).content;
 
 describe('scrub-file', () => {
   const clazz = 'var Clazz = (function () { function Clazz() { } return Clazz; }());';
@@ -58,7 +62,7 @@ describe('scrub-file', () => {
       expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
     });
 
-    it('doesn\'t remove non Angular decorators', () => {
+    it("doesn't remove non Angular decorators", () => {
       const input = tags.stripIndent`
         import { Injectable } from 'another-lib';
         ${clazz}
@@ -760,7 +764,7 @@ describe('scrub-file', () => {
       expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
     });
 
-    it('doesn\'t remove non Angular propDecorators', () => {
+    it("doesn't remove non Angular propDecorators", () => {
       const input = tags.stripIndent`
         import { Input } from 'another-lib';
         ${clazz}
@@ -819,7 +823,6 @@ describe('scrub-file', () => {
       expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
     });
 
-
     it('removes top-level Angular constructor parameters in es2015', () => {
       const output = tags.stripIndent`
         class Clazz extends BaseClazz { constructor(e) { super(e); } }
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 2105cc6b6186..35bfb542df85 100644
--- a/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums.ts
+++ b/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums.ts
@@ -1,24 +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 * as ts from 'typescript';
 import { addPureComment } from '../helpers/ast-utils';
 
 function isBlockLike(node: ts.Node): node is ts.BlockLike {
-  return node.kind === ts.SyntaxKind.Block
-    || node.kind === ts.SyntaxKind.ModuleBlock
-    || node.kind === ts.SyntaxKind.CaseClause
-    || node.kind === ts.SyntaxKind.DefaultClause
-    || node.kind === ts.SyntaxKind.SourceFile;
+  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
+  );
 }
 
 export function getWrapEnumsTransformer(): ts.TransformerFactory<ts.SourceFile> {
   return (context: ts.TransformationContext): ts.Transformer<ts.SourceFile> => {
-    const transformer: ts.Transformer<ts.SourceFile> = sf => {
+    const transformer: ts.Transformer<ts.SourceFile> = (sf) => {
       const result = visitBlockStatements(sf.statements, context);
 
       return context.factory.updateSourceFile(sf, ts.setTextRange(result, sf.statements));
@@ -83,9 +86,10 @@ function visitBlockStatements(
     //   * have only one declaration
     //   * have an ClassExpression or BinaryExpression and a right
     //     of kind ClassExpression as a initializer
-    if (ts.isVariableStatement(currentStatement)
-      && currentStatement.declarationList.declarations.length === 1) {
-
+    if (
+      ts.isVariableStatement(currentStatement) &&
+      currentStatement.declarationList.declarations.length === 1
+    ) {
       const variableDeclaration = currentStatement.declarationList.declarations[0];
       const initializer = variableDeclaration.initializer;
       if (ts.isIdentifier(variableDeclaration.name)) {
@@ -96,21 +100,13 @@ function visitBlockStatements(
           if (iife) {
             // update IIFE and replace variable statement and old IIFE
             oldStatementsLength = 2;
-            newStatement = updateEnumIife(
-              nodeFactory,
-              currentStatement,
-              iife[0],
-              iife[1],
-            );
+            newStatement = updateEnumIife(nodeFactory, currentStatement, iife[0], iife[1]);
             // skip IIFE statement
             oIndex++;
           }
         } else if (
-          ts.isClassExpression(initializer)
-          || (
-            ts.isBinaryExpression(initializer)
-            && ts.isClassExpression(initializer.right)
-          )
+          ts.isClassExpression(initializer) ||
+          (ts.isBinaryExpression(initializer) && ts.isClassExpression(initializer.right))
         ) {
           const classStatements = findStatements(name, statements, oIndex);
           if (!classStatements) {
@@ -118,11 +114,7 @@ function visitBlockStatements(
           }
 
           oldStatementsLength = classStatements.length;
-          newStatement = createWrappedClass(
-            nodeFactory,
-            variableDeclaration,
-            classStatements,
-          );
+          newStatement = createWrappedClass(nodeFactory, variableDeclaration, classStatements);
 
           oIndex += classStatements.length - 1;
         }
@@ -135,11 +127,7 @@ function visitBlockStatements(
       }
 
       oldStatementsLength = classStatements.length;
-      newStatement = createWrappedClass(
-        nodeFactory,
-        currentStatement,
-        classStatements,
-      );
+      newStatement = createWrappedClass(nodeFactory, currentStatement, classStatements);
 
       oIndex += oldStatementsLength - 1;
     }
@@ -152,7 +140,7 @@ function visitBlockStatements(
       updatedStatements.splice(uIndex, oldStatementsLength, ...newStatement);
       // When having more than a single new statement
       // we need to update the update Index
-      uIndex += (newStatement ? newStatement.length - 1 : 0);
+      uIndex += newStatement ? newStatement.length - 1 : 0;
     }
 
     const result = ts.visitNode(currentStatement, visitor);
@@ -205,16 +193,19 @@ function findEnumIife(
 
   let argument = callExpression.arguments[0];
   if (
-    !ts.isBinaryExpression(argument)
-    || !ts.isIdentifier(argument.left)
-    || argument.left.text !== name
+    !ts.isBinaryExpression(argument) ||
+    !ts.isIdentifier(argument.left) ||
+    argument.left.text !== name
   ) {
     return null;
   }
 
   let potentialExport = false;
   if (argument.operatorToken.kind === ts.SyntaxKind.FirstAssignment) {
-    if (ts.isBinaryExpression(argument.right) && argument.right.operatorToken.kind !== ts.SyntaxKind.BarBarToken) {
+    if (
+      ts.isBinaryExpression(argument.right) &&
+      argument.right.operatorToken.kind !== ts.SyntaxKind.BarBarToken
+    ) {
       return null;
     }
 
@@ -237,9 +228,9 @@ function findEnumIife(
   // Go through all the statements and check that all match the name
   for (const statement of functionExpression.body.statements) {
     if (
-      !ts.isExpressionStatement(statement)
-      || !ts.isBinaryExpression(statement.expression)
-      || !ts.isElementAccessExpression(statement.expression.left)
+      !ts.isExpressionStatement(statement) ||
+      !ts.isBinaryExpression(statement.expression) ||
+      !ts.isElementAccessExpression(statement.expression.left)
     ) {
       return null;
     }
@@ -263,18 +254,15 @@ function updateHostNode(
   const outerVarStmt = nodeFactory.updateVariableStatement(
     hostNode,
     hostNode.modifiers,
-    nodeFactory.updateVariableDeclarationList(
-      hostNode.declarationList,
-      [
-        nodeFactory.updateVariableDeclaration(
-          variableDeclaration,
-          variableDeclaration.name,
-          variableDeclaration.exclamationToken,
-          variableDeclaration.type,
-          expression,
-        ),
-      ],
-    ),
+    nodeFactory.updateVariableDeclarationList(hostNode.declarationList, [
+      nodeFactory.updateVariableDeclaration(
+        variableDeclaration,
+        variableDeclaration.name,
+        variableDeclaration.exclamationToken,
+        variableDeclaration.type,
+        expression,
+      ),
+    ]),
   );
 
   return outerVarStmt;
@@ -318,7 +306,7 @@ function findStatements(
       const args = expression.arguments;
 
       if (args.length > 2) {
-        const isReferenced = args.some(arg => {
+        const isReferenced = args.some((arg) => {
           const potentialIdentifier = ts.isPropertyAccessExpression(arg) ? arg.expression : arg;
 
           return ts.isIdentifier(potentialIdentifier) && potentialIdentifier.text === name;
@@ -330,16 +318,15 @@ function findStatements(
         }
       }
     } else if (ts.isBinaryExpression(expression)) {
-      const node = ts.isBinaryExpression(expression.left)
-        ? expression.left.left
-        : expression.left;
+      const node = ts.isBinaryExpression(expression.left) ? expression.left.left : expression.left;
 
-      const leftExpression = ts.isPropertyAccessExpression(node) || ts.isElementAccessExpression(node)
-        // Static Properties // Ex: Foo.bar = 'value';
-        // ENUM Property // Ex:  ChangeDetectionStrategy[ChangeDetectionStrategy.Default] = "Default";
-        ? node.expression
-        // Ex: FooClass = __decorate([Component()], FooClass);
-        : node;
+      const leftExpression =
+        ts.isPropertyAccessExpression(node) || ts.isElementAccessExpression(node)
+          ? // Static Properties // Ex: Foo.bar = 'value';
+            // ENUM Property // Ex:  ChangeDetectionStrategy[ChangeDetectionStrategy.Default] = "Default";
+            node.expression
+          : // Ex: FooClass = __decorate([Component()], FooClass);
+            node;
 
       if (ts.isIdentifier(leftExpression) && leftExpression.text === name) {
         count++;
@@ -363,14 +350,18 @@ function updateEnumIife(
   iife: ts.CallExpression,
   exportAssignment?: ts.Expression,
 ): ts.Statement[] {
-  if (!ts.isParenthesizedExpression(iife.expression)
-    || !ts.isFunctionExpression(iife.expression.expression)) {
+  if (
+    !ts.isParenthesizedExpression(iife.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) {
+  if (
+    hostNode.modifiers &&
+    hostNode.modifiers.findIndex((m) => m.kind == ts.SyntaxKind.ExportKeyword) != -1
+  ) {
     exportAssignment = undefined;
   }
 
@@ -383,13 +374,10 @@ function updateEnumIife(
     expression.typeParameters,
     expression.parameters,
     expression.type,
-    nodeFactory.updateBlock(
-      expression.body,
-      [
-        ...expression.body.statements,
-        nodeFactory.createReturnStatement(expression.parameters[0].name as ts.Identifier),
-      ],
-    ),
+    nodeFactory.updateBlock(expression.body, [
+      ...expression.body.statements,
+      nodeFactory.createReturnStatement(expression.parameters[0].name as ts.Identifier),
+    ]),
   );
 
   let arg: ts.Expression = nodeFactory.createObjectLiteralExpression();
@@ -398,10 +386,7 @@ function updateEnumIife(
   }
   const updatedIife = nodeFactory.updateCallExpression(
     iife,
-    nodeFactory.updateParenthesizedExpression(
-      iife.expression,
-      updatedFunction,
-    ),
+    nodeFactory.updateParenthesizedExpression(iife.expression, updatedFunction),
     iife.typeArguments,
     [arg],
   );
@@ -411,7 +396,8 @@ function updateEnumIife(
     value = nodeFactory.createBinaryExpression(
       exportAssignment,
       ts.SyntaxKind.FirstAssignment,
-      updatedIife);
+      updatedIife,
+    );
   }
 
   return [updateHostNode(nodeFactory, hostNode, value)];
@@ -445,19 +431,18 @@ function createWrappedClass(
   );
 
   const modifiers = hostNode.modifiers;
-  const isDefault = !!modifiers
-    && modifiers.some(x => x.kind === ts.SyntaxKind.DefaultKeyword);
+  const isDefault = !!modifiers && modifiers.some((x) => x.kind === ts.SyntaxKind.DefaultKeyword);
 
   const newStatement: ts.Statement[] = [];
   newStatement.push(
     nodeFactory.createVariableStatement(
       isDefault ? undefined : modifiers,
-      nodeFactory.createVariableDeclarationList([
-        nodeFactory.createVariableDeclaration(name, undefined, undefined, pureIife),
-      ],
-      ts.NodeFlags.Let,
+      nodeFactory.createVariableDeclarationList(
+        [nodeFactory.createVariableDeclaration(name, undefined, undefined, pureIife)],
+        ts.NodeFlags.Let,
       ),
-    ));
+    ),
+  );
 
   if (isDefault) {
     newStatement.push(
@@ -466,7 +451,8 @@ function createWrappedClass(
         undefined,
         false,
         nodeFactory.createIdentifier(name),
-      ));
+      ),
+    );
   }
 
   return newStatement;
diff --git a/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums_spec.ts b/packages/angular_devkit/build_optimizer/src/transforms/wrap-enums_spec.ts
index 0789b1c5643b..6823581ff225 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,20 +1,18 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-// tslint:disable-next-line:no-implicit-dependencies
+
 import { tags } from '@angular-devkit/core';
 import { transformJavascript } from '../helpers/transform-javascript';
 import { getWrapEnumsTransformer } from './wrap-enums';
 
+const transform = (content: string) =>
+  transformJavascript({ content, getTransforms: [getWrapEnumsTransformer] }).content;
 
-const transform = (content: string) => transformJavascript(
-  { content, getTransforms: [getWrapEnumsTransformer] }).content;
-
-// tslint:disable:no-big-function
 describe('wrap enums and classes transformer', () => {
   describe('wraps class declarations', () => {
     it('should wrap default exported classes', () => {
@@ -464,7 +462,6 @@ describe('wrap enums and classes transformer', () => {
       expect(tags.oneLine`${transform(input)}`).toEqual(tags.oneLine`${output}`);
     });
 
-
     it('wraps ts >2.3 enums in IIFE', () => {
       const input = tags.stripIndent`
         export var ChangeDetectionStrategy;
diff --git a/packages/angular_devkit/build_webpack/BUILD.bazel b/packages/angular_devkit/build_webpack/BUILD.bazel
index df31bb3302c9..9876e2c92431 100644
--- a/packages/angular_devkit/build_webpack/BUILD.bazel
+++ b/packages/angular_devkit/build_webpack/BUILD.bazel
@@ -10,6 +10,7 @@ load("//tools:ts_json_schema.bzl", "ts_json_schema")
 # @external_begin
 load("@bazel_tools//tools/build_defs/pkg:pkg.bzl", "pkg_tar")
 load("@build_bazel_rules_nodejs//:index.bzl", "pkg_npm")
+load("@npm//@angular/dev-infra-private/bazel/api-golden:index.bzl", "api_golden_test_npm_package")
 # @external_end
 
 licenses(["notice"])  # MIT
@@ -86,7 +87,6 @@ ts_library(
         "@npm//@angular/platform-browser-dynamic",
         "@npm//@types/node-fetch",
         "@npm//node-fetch",
-        "@npm//raw-loader",
         "@npm//tslib",
         "@npm//zone.js",
     ],
@@ -119,4 +119,14 @@ pkg_tar(
     strip_prefix = "./npm_package",
     tags = ["manual"],
 )
+
+api_golden_test_npm_package(
+    name = "build_webpack_api",
+    data = [
+        ":npm_package",
+        "//goldens:public-api",
+    ],
+    golden_dir = "angular_cli/goldens/public-api/angular_devkit/build_webpack",
+    npm_package = "angular_cli/packages/angular_devkit/build_webpack/npm_package",
+)
 # @external_end
diff --git a/packages/angular_devkit/build_webpack/README.md b/packages/angular_devkit/build_webpack/README.md
index 49e19302d939..2663efe82dae 100644
--- a/packages/angular_devkit/build_webpack/README.md
+++ b/packages/angular_devkit/build_webpack/README.md
@@ -7,6 +7,7 @@ To use it on your Angular CLI app, follow these steps:
 - run `npm install @angular-devkit/build-webpack`.
 - create a webpack configuration.
 - add the following targets inside `angular.json`.
+
 ```
   "projects": {
     "app": {
@@ -27,6 +28,7 @@ To use it on your Angular CLI app, follow these steps:
         }
       }
 ```
+
 - run `ng run app:build-webpack` to build, and `ng run app:serve-webpack` to serve.
 
-All options, including `watch` and `stats`, are looked up inside the webpack configuration.
\ No newline at end of file
+All options, including `watch` and `stats`, are looked up inside the webpack configuration.
diff --git a/packages/angular_devkit/build_webpack/package.json b/packages/angular_devkit/build_webpack/package.json
index 2db099a6a9e3..eac47314fe4a 100644
--- a/packages/angular_devkit/build_webpack/package.json
+++ b/packages/angular_devkit/build_webpack/package.json
@@ -13,7 +13,7 @@
   "devDependencies": {
     "@angular-devkit/core": "0.0.0",
     "node-fetch": "2.6.1",
-    "webpack": "5.32.0"
+    "webpack": "5.50.0"
   },
   "peerDependencies": {
     "webpack": "^5.30.0",
diff --git a/packages/angular_devkit/build_webpack/src/index.ts b/packages/angular_devkit/build_webpack/src/index.ts
index fbd92d0eb827..107e3c99d535 100644
--- a/packages/angular_devkit/build_webpack/src/index.ts
+++ b/packages/angular_devkit/build_webpack/src/index.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
  */
+
 export * from './webpack';
 export * from './webpack-dev-server';
 export { EmittedFiles } from './utils';
diff --git a/packages/angular_devkit/build_webpack/src/utils.ts b/packages/angular_devkit/build_webpack/src/utils.ts
index 64609278b0ac..61aa028b1fff 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
@@ -26,7 +26,7 @@ export function getEmittedFiles(compilation: webpack.Compilation): EmittedFiles[
     for (const file of chunk.files) {
       files.push({
         // The id is guaranteed to exist at this point in the compilation process
-        // tslint:disable-next-line: no-non-null-assertion
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         id: chunk.id!.toString(),
         name: chunk.name,
         file,
@@ -42,6 +42,8 @@ export function getEmittedFiles(compilation: webpack.Compilation): EmittedFiles[
   }
 
   // dedupe
-  return files.filter(({ file, name }, index) =>
-    files.findIndex(f => f.file === file && (!name || name === f.name)) === index);
+  return files.filter(
+    ({ file, name }, index) =>
+      files.findIndex((f) => f.file === file && (!name || name === f.name)) === index,
+  );
 }
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 5a02f9a71149..bea3c99be376 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,17 +1,18 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of 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 * 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';
-import * as WebpackDevServer from 'webpack-dev-server';
+import webpack from 'webpack';
+import WebpackDevServer from 'webpack-dev-server';
 import { getEmittedFiles } from '../utils';
 import { BuildResult, WebpackFactory, WebpackLoggingCallback } from '../webpack';
 import { Schema as WebpackDevServerBuilderSchema } from './schema';
@@ -28,10 +29,10 @@ export function runWebpackDevServer(
   config: webpack.Configuration,
   context: BuilderContext,
   options: {
-    devServerConfig?: WebpackDevServer.Configuration,
-    logging?: WebpackLoggingCallback,
-    webpackFactory?: WebpackFactory,
-    webpackDevServerFactory?: WebpackDevServerFactory,
+    devServerConfig?: WebpackDevServer.Configuration;
+    logging?: WebpackLoggingCallback;
+    webpackFactory?: WebpackFactory;
+    webpackDevServerFactory?: WebpackDevServerFactory;
   } = {},
 ): Observable<DevServerBuildOutput> {
   const createWebpack = (c: webpack.Configuration) => {
@@ -53,19 +54,19 @@ export function runWebpackDevServer(
   ) => {
     if (options.webpackDevServerFactory) {
       // webpack-dev-server types currently do not support Webpack 5
-      // tslint:disable-next-line: no-any
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       return new options.webpackDevServerFactory(webpack as any, config);
     }
 
     // webpack-dev-server types currently do not support Webpack 5
-    // tslint:disable-next-line: no-any
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     return new WebpackDevServer(webpack as any, config);
   };
 
-  const log: WebpackLoggingCallback = options.logging
-    || ((stats, config) => context.logger.info(stats.toString(config.stats)));
+  const log: WebpackLoggingCallback =
+    options.logging || ((stats, config) => context.logger.info(stats.toString(config.stats)));
 
-  // tslint:disable-next-line: no-any
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   const devServerConfig = options.devServerConfig || (config as any).devServer || {};
   if (devServerConfig.stats) {
     config.stats = devServerConfig.stats;
@@ -74,62 +75,66 @@ export function runWebpackDevServer(
   devServerConfig.stats = false;
 
   return createWebpack({ ...config, watch: false }).pipe(
-    switchMap(webpackCompiler => new Observable<DevServerBuildOutput>(obs => {
-      const server = createWebpackDevServer(webpackCompiler, devServerConfig);
-      let result: Partial<DevServerBuildOutput>;
-
-      webpackCompiler.hooks.done.tap('build-webpack', (stats) => {
-        // Log stats.
-        log(stats, config);
-
-        obs.next({
-          ...result,
-          emittedFiles: getEmittedFiles(stats.compilation),
-          success: !stats.hasErrors(),
-          outputPath: stats.compilation.outputOptions.path,
-        } as unknown as DevServerBuildOutput);
-      });
-
-      server.listen(
-        devServerConfig.port === undefined ? 8080 : devServerConfig.port,
-        devServerConfig.host === undefined ? 'localhost' : devServerConfig.host,
-        function (this: net.Server, err) {
-          if (err) {
-            obs.error(err);
-          } else {
-            const address = this.address();
-            if (!address) {
-              obs.error(new Error(`Dev-server address info is not defined.`));
-
-              return;
-            }
-
-            result = {
-              success: true,
-              port: typeof address === 'string' ? 0 : address.port,
-              family: typeof address === 'string' ? '' : address.family,
-              address: typeof address === 'string' ? address : address.address,
-            };
-          }
-        },
-      );
-
-      // Teardown logic. Close the server when unsubscribed from.
-      return (() => {
-        server.close();
-        webpackCompiler.close?.(() => {});
-      });
-    })),
+    switchMap(
+      (webpackCompiler) =>
+        new Observable<DevServerBuildOutput>((obs) => {
+          const server = createWebpackDevServer(webpackCompiler, devServerConfig);
+          let result: Partial<DevServerBuildOutput>;
+
+          webpackCompiler.hooks.done.tap('build-webpack', (stats) => {
+            // Log stats.
+            log(stats, config);
+
+            obs.next({
+              ...result,
+              emittedFiles: getEmittedFiles(stats.compilation),
+              success: !stats.hasErrors(),
+              outputPath: stats.compilation.outputOptions.path,
+            } as unknown as DevServerBuildOutput);
+          });
+
+          server.listen(
+            devServerConfig.port === undefined ? 8080 : devServerConfig.port,
+            devServerConfig.host === undefined ? 'localhost' : devServerConfig.host,
+            function (this: net.Server, err) {
+              if (err) {
+                obs.error(err);
+              } else {
+                const address = this.address();
+                if (!address) {
+                  obs.error(new Error(`Dev-server address info is not defined.`));
+
+                  return;
+                }
+
+                result = {
+                  success: true,
+                  port: typeof address === 'string' ? 0 : address.port,
+                  family: typeof address === 'string' ? '' : address.family,
+                  address: typeof address === 'string' ? address : address.address,
+                };
+              }
+            },
+          );
+
+          // Teardown logic. Close the server when unsubscribed from.
+          return () => {
+            server.close();
+            webpackCompiler.close?.(() => {});
+          };
+        }),
+    ),
   );
 }
 
-
 export default createBuilder<WebpackDevServerBuilderSchema, DevServerBuildOutput>(
   (options, context) => {
     const configPath = pathResolve(context.workspaceRoot, options.webpackConfig);
 
     return from(import(configPath)).pipe(
-      switchMap((config: webpack.Configuration) => runWebpackDevServer(config, context)),
+      switchMap(({ default: config }: { default: 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 c8294fd0f1f5..75e230835ba1 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,20 +1,20 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+
 import { Architect } from '@angular-devkit/architect';
 import { WorkspaceNodeModulesArchitectHost } from '@angular-devkit/architect/node';
 import { TestingArchitectHost } from '@angular-devkit/architect/testing';
-import { schema, workspaces } from '@angular-devkit/core'; // tslint:disable-line:no-implicit-dependencies
-import { NodeJsSyncHost } from '@angular-devkit/core/node'; // tslint:disable-line:no-implicit-dependencies
-import fetch from 'node-fetch';  // tslint:disable-line:no-implicit-dependencies
+import { schema, workspaces } from '@angular-devkit/core';
+import { NodeJsSyncHost } from '@angular-devkit/core/node';
+import fetch from 'node-fetch'; // eslint-disable-line import/no-extraneous-dependencies
 import * as path from 'path';
 import { DevServerBuildOutput } from './index';
 
-
 describe('Dev Server Builder', () => {
   let testArchitectHost: TestingArchitectHost;
   let architect: Architect;
@@ -33,8 +33,11 @@ describe('Dev Server Builder', () => {
       workspaces.createWorkspaceHost(vfHost),
     );
 
-    testArchitectHost = new TestingArchitectHost(workspaceRoot, workspaceRoot,
-      new WorkspaceNodeModulesArchitectHost(workspace, workspaceRoot));
+    testArchitectHost = new TestingArchitectHost(
+      workspaceRoot,
+      workspaceRoot,
+      new WorkspaceNodeModulesArchitectHost(workspace, workspaceRoot),
+    );
     architect = new Architect(testArchitectHost, registry);
   }
 
@@ -46,7 +49,7 @@ describe('Dev Server Builder', () => {
 
   it('works', async () => {
     const run = await architect.scheduleTarget(webpackTargetSpec);
-    const output = await run.result as DevServerBuildOutput;
+    const output = (await run.result) as DevServerBuildOutput;
     expect(output.success).toBe(true);
 
     const response = await fetch(`http://${output.address}:${output.port}/bundle.js`);
@@ -57,7 +60,7 @@ describe('Dev Server Builder', () => {
 
   it('works and returns emitted files', async () => {
     const run = await architect.scheduleTarget(webpackTargetSpec);
-    const output = await run.result as DevServerBuildOutput;
+    const output = (await run.result) as DevServerBuildOutput;
 
     expect(output.success).toBe(true);
     expect(output.emittedFiles).toContain({
diff --git a/packages/angular_devkit/build_webpack/src/webpack-dev-server/schema.json b/packages/angular_devkit/build_webpack/src/webpack-dev-server/schema.json
index 9a694cc36edc..6a1e18fd92e5 100644
--- a/packages/angular_devkit/build_webpack/src/webpack-dev-server/schema.json
+++ b/packages/angular_devkit/build_webpack/src/webpack-dev-server/schema.json
@@ -10,7 +10,5 @@
     }
   },
   "additionalProperties": false,
-  "required": [
-    "webpackConfig"
-  ]
+  "required": ["webpackConfig"]
 }
diff --git a/packages/angular_devkit/build_webpack/src/webpack/index.ts b/packages/angular_devkit/build_webpack/src/webpack/index.ts
index 0f99f565be37..0dec67cb1fd6 100644
--- a/packages/angular_devkit/build_webpack/src/webpack/index.ts
+++ b/packages/angular_devkit/build_webpack/src/webpack/index.ts
@@ -1,15 +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 { BuilderContext, BuilderOutput, createBuilder } from '@angular-devkit/architect';
 import { resolve as pathResolve } from 'path';
 import { Observable, from, isObservable, of } from 'rxjs';
 import { switchMap } from 'rxjs/operators';
-import * as webpack from 'webpack';
+import webpack from 'webpack';
 import { EmittedFiles, getEmittedFiles } from '../utils';
 import { Schema as RealWebpackBuilderSchema } from './schema';
 
@@ -32,9 +33,9 @@ export function runWebpack(
   config: webpack.Configuration,
   context: BuilderContext,
   options: {
-    logging?: WebpackLoggingCallback,
-    webpackFactory?: WebpackFactory,
-    shouldProvideStats?: boolean,
+    logging?: WebpackLoggingCallback;
+    webpackFactory?: WebpackFactory;
+    shouldProvideStats?: boolean;
   } = {},
 ): Observable<BuildResult> {
   const {
@@ -55,68 +56,71 @@ export function runWebpack(
   };
 
   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);
-        }
+    switchMap(
+      (webpackCompiler) =>
+        new Observable<BuildResult>((obs) => {
+          const callback = (err?: Error, stats?: webpack.Stats) => {
+            if (err) {
+              return obs.error(err);
+            }
 
-        if (!stats) {
-          return;
-        }
+            if (!stats) {
+              return;
+            }
 
-        // Log stats.
-        log(stats, config);
+            // Log stats.
+            log(stats, config);
 
-        obs.next({
-          success: !stats.hasErrors(),
-          webpackStats: shouldProvideStats ? stats.toJson() : undefined,
-          emittedFiles: getEmittedFiles(stats.compilation),
-          outputPath: stats.compilation.outputOptions.path,
-        } as unknown as BuildResult);
+            const statsOptions = typeof config.stats === 'boolean' ? undefined : config.stats;
+            const result = {
+              success: !stats.hasErrors(),
+              webpackStats: shouldProvideStats ? stats.toJson(statsOptions) : undefined,
+              emittedFiles: getEmittedFiles(stats.compilation),
+              outputPath: stats.compilation.outputOptions.path,
+            } as unknown as BuildResult;
 
-        if (!config.watch) {
-          if (compilerClose) {
-            compilerClose(() => obs.complete());
-          } else {
-            obs.complete();
-          }
-        }
-      };
+            if (config.watch) {
+              obs.next(result);
+            } else {
+              webpackCompiler.close(() => {
+                obs.next(result);
+                obs.complete();
+              });
+            }
+          };
 
-      try {
-        if (config.watch) {
-          const watchOptions = config.watchOptions || {};
-          const watching = webpackCompiler.watch(watchOptions, callback);
+          try {
+            if (config.watch) {
+              const watchOptions = config.watchOptions || {};
+              const watching = webpackCompiler.watch(watchOptions, callback);
 
-          // Teardown logic. Close the watcher when unsubscribed from.
-          return () => {
-            watching.close(() => { });
-            compilerClose?.(() => { });
-          };
-        } else {
-          webpackCompiler.run(callback);
-        }
-      } catch (err) {
-        if (err) {
-          context.logger.error(`\nAn error occurred during the build:\n${err && err.stack || err}`);
-        }
-        throw err;
-      }
-    }),
-  ));
+              // Teardown logic. Close the watcher when unsubscribed from.
+              return () => {
+                watching.close(() => {});
+                webpackCompiler.close(() => {});
+              };
+            } else {
+              webpackCompiler.run(callback);
+            }
+          } catch (err) {
+            if (err) {
+              context.logger.error(
+                `\nAn error occurred during the build:\n${(err && err.stack) || err}`,
+              );
+            }
+            throw err;
+          }
+        }),
+    ),
+  );
 }
 
-
 export default createBuilder<WebpackBuilderSchema>((options, context) => {
   const configPath = pathResolve(context.workspaceRoot, options.webpackConfig);
 
   return from(import(configPath)).pipe(
-    switchMap((config: webpack.Configuration) => runWebpack(config, context)),
+    switchMap(({ default: config }: { default: 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 537e36729ee4..5a905aecce5d 100644
--- a/packages/angular_devkit/build_webpack/src/webpack/index_spec.ts
+++ b/packages/angular_devkit/build_webpack/src/webpack/index_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 { Architect } from '@angular-devkit/architect';
 import { WorkspaceNodeModulesArchitectHost } from '@angular-devkit/architect/node';
 import { TestingArchitectHost } from '@angular-devkit/architect/testing';
-import { join, normalize, schema, workspaces } from '@angular-devkit/core'; // tslint:disable-line:no-implicit-dependencies
-import { NodeJsSyncHost, createConsoleLogger } from '@angular-devkit/core/node'; // tslint:disable-line:no-implicit-dependencies
+import { join, normalize, schema, workspaces } from '@angular-devkit/core';
+import { NodeJsSyncHost, createConsoleLogger } from '@angular-devkit/core/node';
 import * as path from 'path';
 import { BuildResult } from './index';
 
-
 describe('Webpack Builder basic test', () => {
   let testArchitectHost: TestingArchitectHost;
   let architect: Architect;
@@ -30,8 +30,11 @@ describe('Webpack Builder basic test', () => {
       workspaces.createWorkspaceHost(vfHost),
     );
 
-    testArchitectHost = new TestingArchitectHost(workspaceRoot, workspaceRoot,
-      new WorkspaceNodeModulesArchitectHost(workspace, workspaceRoot));
+    testArchitectHost = new TestingArchitectHost(
+      workspaceRoot,
+      workspaceRoot,
+      new WorkspaceNodeModulesArchitectHost(workspace, workspaceRoot),
+    );
     architect = new Architect(testArchitectHost, registry);
   }
 
@@ -55,7 +58,7 @@ describe('Webpack Builder basic test', () => {
 
     it('works and returns emitted files', async () => {
       const run = await architect.scheduleTarget({ project: 'app', target: 'build' });
-      const output = await run.result as BuildResult;
+      const output = (await run.result) as BuildResult;
 
       expect(output.success).toBe(true);
       expect(output.emittedFiles).toContain({
@@ -81,7 +84,11 @@ describe('Webpack Builder basic test', () => {
     });
 
     it('works', async () => {
-      const run = await architect.scheduleTarget({ project: 'app', target: 'build-webpack' }, {}, {logger: createConsoleLogger()});
+      const run = await architect.scheduleTarget(
+        { project: 'app', target: 'build-webpack' },
+        {},
+        { logger: createConsoleLogger() },
+      );
       const output = await run.result;
 
       expect(output.success).toBe(true);
@@ -92,12 +99,18 @@ describe('Webpack Builder basic test', () => {
 
     it('works and returns emitted files', async () => {
       const run = await architect.scheduleTarget({ project: 'app', target: 'build-webpack' });
-      const output = await run.result as BuildResult;
+      const output = (await run.result) as BuildResult;
 
       expect(output.success).toBe(true);
       expect(output.emittedFiles).toContain(
         { id: 'main', name: 'main', initial: true, file: 'main.js', extension: '.js' },
-        { id: 'polyfills', name: 'polyfills', initial: true, file: 'polyfills.js', extension: '.js' },
+        {
+          id: 'polyfills',
+          name: 'polyfills',
+          initial: true,
+          file: 'polyfills.js',
+          extension: '.js',
+        },
       );
 
       await run.stop();
diff --git a/packages/angular_devkit/build_webpack/src/webpack/schema.json b/packages/angular_devkit/build_webpack/src/webpack/schema.json
index 8f1255f20f3d..fc27c6082b9c 100644
--- a/packages/angular_devkit/build_webpack/src/webpack/schema.json
+++ b/packages/angular_devkit/build_webpack/src/webpack/schema.json
@@ -10,7 +10,5 @@
     }
   },
   "additionalProperties": false,
-  "required": [
-    "webpackConfig"
-  ]
+  "required": ["webpackConfig"]
 }
diff --git a/packages/angular_devkit/build_webpack/test/angular-app/angular.json b/packages/angular_devkit/build_webpack/test/angular-app/angular.json
index 61b5bf3affc8..e1f7cbd432d9 100644
--- a/packages/angular_devkit/build_webpack/test/angular-app/angular.json
+++ b/packages/angular_devkit/build_webpack/test/angular-app/angular.json
@@ -27,4 +27,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/packages/angular_devkit/build_webpack/test/angular-app/src/app/app.component.html b/packages/angular_devkit/build_webpack/test/angular-app/src/app/app.component.html
index 248632148832..43182ead282e 100644
--- a/packages/angular_devkit/build_webpack/test/angular-app/src/app/app.component.html
+++ b/packages/angular_devkit/build_webpack/test/angular-app/src/app/app.component.html
@@ -1,17 +1,23 @@
 <!--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 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>
+<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>
+    <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>
@@ -19,4 +25,3 @@ <h2><a target="_blank" rel="noopener" href="https://blog.angular.io/">Angular bl
 </ul>
 
 <p i18n>i18n test</p>
-
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..56f6ecbf22fa 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,18 +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 { TestBed } from '@angular/core/testing';
 import { AppComponent } from './app.component';
 describe('AppComponent', () => {
   beforeEach(async () => {
     await TestBed.configureTestingModule({
-      declarations: [
-        AppComponent
-      ],
+      declarations: [AppComponent],
     }).compileComponents();
   });
   it('should create the app', () => {
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..aef2940f181f 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,16 +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 { Component } from '@angular/core';
 
 @Component({
   selector: 'app-root',
   templateUrl: './app.component.html',
-  styleUrls: ['./app.component.css']
+  styleUrls: ['./app.component.css'],
 })
 export class AppComponent {
   title = 'app';
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..34cc32f32747 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,25 +1,20 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+
 import { BrowserModule } from '@angular/platform-browser';
 import { NgModule } from '@angular/core';
 
-
 import { AppComponent } from './app.component';
 
-
 @NgModule({
-  declarations: [
-    AppComponent
-  ],
-  imports: [
-    BrowserModule
-  ],
+  declarations: [AppComponent],
+  imports: [BrowserModule],
   providers: [],
-  bootstrap: [AppComponent]
+  bootstrap: [AppComponent],
 })
-export class AppModule { }
+export class AppModule {}
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..e0818f2e9056 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,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
  */
+
 export const environment = {
-  production: true
+  production: true,
 };
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..a922b2b6e660 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,15 +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
  */
+
 // 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
+  production: false,
 };
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..d591155b22cd 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,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 { enableProdMode } from '@angular/core';
 import { platformBrowserDynamic } from '@angular/platform-browser-dynamic';
 
@@ -15,5 +16,6 @@ if (environment.production) {
   enableProdMode();
 }
 
-platformBrowserDynamic().bootstrapModule(AppModule)
-  .catch(err => console.log(err));
+platformBrowserDynamic()
+  .bootstrapModule(AppModule)
+  .catch((err) => console.log(err));
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..9fff3a536ee3 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,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
  */
+
 /**
  * This file includes polyfills needed by Angular and is loaded before the app.
  * You can add your own extra polyfills to this file.
@@ -53,14 +54,10 @@
  **/
 // import 'web-animations-js';  // Run `npm install --save web-animations-js`.
 
-
-
 /***************************************************************************************************
  * Zone JS is required by default for Angular itself.
  */
-import 'zone.js/dist/zone';  // Included with Angular CLI.
-
-
+import 'zone.js/dist/zone'; // Included with Angular CLI.
 
 /***************************************************************************************************
  * APPLICATION IMPORTS
diff --git a/packages/angular_devkit/build_webpack/test/angular-app/src/tsconfig.app.json b/packages/angular_devkit/build_webpack/test/angular-app/src/tsconfig.app.json
index 40a1cd9e3ec6..c1ec1d179974 100644
--- a/packages/angular_devkit/build_webpack/test/angular-app/src/tsconfig.app.json
+++ b/packages/angular_devkit/build_webpack/test/angular-app/src/tsconfig.app.json
@@ -5,8 +5,5 @@
     "module": "es2020",
     "types": []
   },
-  "exclude": [
-    "test.ts",
-    "**/*.spec.ts"
-  ]
+  "exclude": ["test.ts", "**/*.spec.ts"]
 }
diff --git a/packages/angular_devkit/build_webpack/test/angular-app/tsconfig.json b/packages/angular_devkit/build_webpack/test/angular-app/tsconfig.json
index baba7668686d..1807c9908f73 100644
--- a/packages/angular_devkit/build_webpack/test/angular-app/tsconfig.json
+++ b/packages/angular_devkit/build_webpack/test/angular-app/tsconfig.json
@@ -9,13 +9,8 @@
     "emitDecoratorMetadata": true,
     "experimentalDecorators": true,
     "target": "es2017",
-    "typeRoots": [
-      "node_modules/@types"
-    ],
-    "lib": [
-      "es2017",
-      "dom"
-    ]
+    "typeRoots": ["node_modules/@types"],
+    "lib": ["es2017", "dom"]
   },
   "angularCompilerOptions": {
     "enableIvy": true,
diff --git a/packages/angular_devkit/build_webpack/test/angular-app/webpack.config.js b/packages/angular_devkit/build_webpack/test/angular-app/webpack.config.js
index 1a8572ea232f..3288bb639201 100644
--- a/packages/angular_devkit/build_webpack/test/angular-app/webpack.config.js
+++ b/packages/angular_devkit/build_webpack/test/angular-app/webpack.config.js
@@ -1,7 +1,6 @@
 const ngToolsWebpack = require('@ngtools/webpack');
 const path = require('path');
 
-
 const workspaceRoot = path.resolve(__dirname, './');
 const projectRoot = path.resolve(__dirname, './');
 
@@ -12,7 +11,7 @@ module.exports = {
   },
   entry: {
     main: path.resolve(projectRoot, './src/main.ts'),
-    polyfills: path.resolve(projectRoot, './src/polyfills.ts')
+    polyfills: path.resolve(projectRoot, './src/polyfills.ts'),
   },
   output: {
     path: path.resolve(workspaceRoot, './dist'),
@@ -20,17 +19,17 @@ module.exports = {
   },
   plugins: [
     new ngToolsWebpack.AngularWebpackPlugin({
-      tsconfig: path.resolve(projectRoot, './src/tsconfig.app.json')
-    })
+      tsconfig: path.resolve(projectRoot, './src/tsconfig.app.json'),
+    }),
   ],
   module: {
     rules: [
-      { test: /\.css$/, loader: 'raw-loader' },
-      { test: /\.html$/, loader: 'raw-loader' },
+      { test: /\.css$/, type: 'asset/source' },
+      { test: /\.html$/, type: 'asset/source' },
       { test: /\.ts$/, loader: '@ngtools/webpack' },
-    ]
+    ],
   },
   devServer: {
-    historyApiFallback: true
-  }
+    historyApiFallback: true,
+  },
 };
diff --git a/packages/angular_devkit/build_webpack/test/basic-app/angular.json b/packages/angular_devkit/build_webpack/test/basic-app/angular.json
index daae4b2252da..bc1bc0dbbbe8 100644
--- a/packages/angular_devkit/build_webpack/test/basic-app/angular.json
+++ b/packages/angular_devkit/build_webpack/test/basic-app/angular.json
@@ -27,4 +27,4 @@
       }
     }
   }
-}
\ No newline at end of file
+}
diff --git a/packages/angular_devkit/build_webpack/test/basic-app/src/main.js b/packages/angular_devkit/build_webpack/test/basic-app/src/main.js
index 5893f9d0d514..6be02374db11 100644
--- a/packages/angular_devkit/build_webpack/test/basic-app/src/main.js
+++ b/packages/angular_devkit/build_webpack/test/basic-app/src/main.js
@@ -1 +1 @@
-console.log('hello world');
\ No newline at end of file
+console.log('hello world');
diff --git a/packages/angular_devkit/build_webpack/test/basic-app/tsconfig.json b/packages/angular_devkit/build_webpack/test/basic-app/tsconfig.json
index badbab349c48..890391f42fbe 100644
--- a/packages/angular_devkit/build_webpack/test/basic-app/tsconfig.json
+++ b/packages/angular_devkit/build_webpack/test/basic-app/tsconfig.json
@@ -9,13 +9,8 @@
     "experimentalDecorators": true,
     "target": "es2017",
     "module": "esnext",
-    "typeRoots": [
-      "node_modules/@types"
-    ],
-    "lib": [
-      "es2017",
-      "dom"
-    ]
+    "typeRoots": ["node_modules/@types"],
+    "lib": ["es2017", "dom"]
   },
   "angularCompilerOptions": {
     "disableTypeScriptVersionCheck": true
diff --git a/packages/angular_devkit/build_webpack/test/basic-app/webpack.config.js b/packages/angular_devkit/build_webpack/test/basic-app/webpack.config.js
index f107cc39f3c7..3ab87b9d6003 100644
--- a/packages/angular_devkit/build_webpack/test/basic-app/webpack.config.js
+++ b/packages/angular_devkit/build_webpack/test/basic-app/webpack.config.js
@@ -5,6 +5,6 @@ module.exports = {
   entry: path.resolve(__dirname, './src/main.js'),
   output: {
     path: path.resolve(__dirname, './dist'),
-    filename: 'bundle.js'
-  }
+    filename: 'bundle.js',
+  },
 };
diff --git a/packages/angular_devkit/core/BUILD.bazel b/packages/angular_devkit/core/BUILD.bazel
index d9f09172b1ca..dfdcdd3b908b 100644
--- a/packages/angular_devkit/core/BUILD.bazel
+++ b/packages/angular_devkit/core/BUILD.bazel
@@ -4,6 +4,7 @@ load("//tools:defaults.bzl", "ts_library")
 # @external_begin
 load("@bazel_tools//tools/build_defs/pkg:pkg.bzl", "pkg_tar")
 load("@build_bazel_rules_nodejs//:index.bzl", "pkg_npm")
+load("@npm//@angular/dev-infra-private/bazel/api-golden:index.bzl", "api_golden_test_npm_package")
 # @external_end
 
 # Copyright Google Inc. All Rights Reserved.
@@ -93,4 +94,15 @@ pkg_tar(
     strip_prefix = "./npm_package",
     tags = ["manual"],
 )
+
+api_golden_test_npm_package(
+    name = "core_api",
+    data = [
+        ":npm_package",
+        "//goldens:public-api",
+    ],
+    golden_dir = "angular_cli/goldens/public-api/angular_devkit/core",
+    npm_package = "angular_cli/packages/angular_devkit/core/npm_package",
+    types = ["@npm//@types/node"],
+)
 # @external_end
diff --git a/packages/angular_devkit/core/README.md b/packages/angular_devkit/core/README.md
index c2821d0e4584..18ebc31ca477 100644
--- a/packages/angular_devkit/core/README.md
+++ b/packages/angular_devkit/core/README.md
@@ -1,4 +1,5 @@
 # Core
+
 > Shared utilities for Angular DevKit.
 
 # Exception
@@ -8,6 +9,7 @@
 ## Schema
 
 ### SchemaValidatorResult
+
 ```
 export interface SchemaValidatorResult {
   success: boolean;
@@ -62,33 +64,33 @@ export class CoreSchemaRegistry implements SchemaRegistry {
 
 The `workspaces` namespace provides an API for interacting with the workspace file formats.
 It provides an abstraction of the underlying storage format of the workspace and provides
-support for both reading and writing.  Currently, the only supported format is the JSON-based
-format used by the Angular CLI.  For this format, the API provides internal change tracking of values which
-enables fine-grained updates to the underlying storage of the workspace.  This allows for the
+support for both reading and writing. Currently, the only supported format is the JSON-based
+format used by the Angular CLI. For this format, the API provides internal change tracking of values which
+enables fine-grained updates to the underlying storage of the workspace. This allows for the
 retention of existing formatting and comments.
 
-A workspace is defined via the following object model.  Definition collection objects are specialized
+A workspace is defined via the following object model. Definition collection objects are specialized
 Javascript `Map` objects with an additional `add` method to simplify addition and provide more localized
 error checking of the newly added values.
 
 ```ts
 export interface WorkspaceDefinition {
-    readonly extensions: Record<string, JsonValue | undefined>;
-    readonly projects: ProjectDefinitionCollection;
+  readonly extensions: Record<string, JsonValue | undefined>;
+  readonly projects: ProjectDefinitionCollection;
 }
 
 export interface ProjectDefinition {
-    readonly extensions: Record<string, JsonValue | undefined>;
-    readonly targets: TargetDefinitionCollection;
-    root: string;
-    prefix?: string;
-    sourceRoot?: string;
+  readonly extensions: Record<string, JsonValue | undefined>;
+  readonly targets: TargetDefinitionCollection;
+  root: string;
+  prefix?: string;
+  sourceRoot?: string;
 }
 
 export interface TargetDefinition {
-    options?: Record<string, JsonValue | undefined>;
-    configurations?: Record<string, Record<string, JsonValue | undefined> | undefined>;
-    builder: string;
+  options?: Record<string, JsonValue | undefined>;
+  configurations?: Record<string, Record<string, JsonValue | undefined> | undefined>;
+  builder: string;
 }
 ```
 
@@ -106,7 +108,7 @@ export function readWorkspace(
   path: string,
   host: WorkspaceHost,
   format?: WorkspaceFormat,
-): Promise<{ workspace: WorkspaceDefinition; }>;
+): Promise<{ workspace: WorkspaceDefinition }>;
 ```
 
 ```ts
@@ -118,16 +120,16 @@ export function writeWorkspace(
 ): Promise<void>;
 ```
 
-A `WorkspaceHost` abstracts the underlying data access methods from the functions.  It provides
-methods to read, write, and analyze paths.  A utility function is provided to create
+A `WorkspaceHost` abstracts the underlying data access methods from the functions. It provides
+methods to read, write, and analyze paths. A utility function is provided to create
 an instance of a `WorkspaceHost` from the Angular DevKit's virtual filesystem host abstraction.
 
 ```ts
 export interface WorkspaceHost {
-    readFile(path: string): Promise<string>;
-    writeFile(path: string, data: string): Promise<void>;
-    isDirectory(path: string): Promise<boolean>;
-    isFile(path: string): Promise<boolean>;
+  readFile(path: string): Promise<string>;
+  writeFile(path: string, data: string): Promise<void>;
+  isDirectory(path: string): Promise<boolean>;
+  isFile(path: string): Promise<boolean>;
 }
 
 export function createWorkspaceHost(host: virtualFs.Host): WorkspaceHost;
@@ -143,23 +145,23 @@ import { NodeJsSyncHost } from '@angular-devkit/core/node';
 import { workspaces } from '@angular-devkit/core';
 
 async function demonstrate() {
-    const host = workspaces.createWorkspaceHost(new NodeJsSyncHost());
-    const { workspace } = await workspaces.readWorkspace('path/to/workspace/directory/', host);
+  const host = workspaces.createWorkspaceHost(new NodeJsSyncHost());
+  const { workspace } = await workspaces.readWorkspace('path/to/workspace/directory/', host);
 
-    const project = workspace.projects.get('my-app');
-    if (!project) {
-      throw new Error('my-app does not exist');
-    }
+  const project = workspace.projects.get('my-app');
+  if (!project) {
+    throw new Error('my-app does not exist');
+  }
 
-    const buildTarget = project.targets.get('build');
-    if (!buildTarget) {
-      throw new Error('build target does not exist');
-    }
+  const buildTarget = project.targets.get('build');
+  if (!buildTarget) {
+    throw new Error('build target does not exist');
+  }
 
-    buildTarget.options.optimization = true;
+  buildTarget.options.optimization = true;
 
-    await workspaces.writeWorkspace(workspace, host);
+  await workspaces.writeWorkspace(workspace, host);
 }
 
 demonstrate();
-```
\ No newline at end of file
+```
diff --git a/packages/angular_devkit/core/node/BUILD.bazel b/packages/angular_devkit/core/node/BUILD.bazel
index 4b36f7b7e60b..ed94cdc47f1a 100644
--- a/packages/angular_devkit/core/node/BUILD.bazel
+++ b/packages/angular_devkit/core/node/BUILD.bazel
@@ -20,6 +20,7 @@ ts_library(
             "**/*_benchmark.ts",
         ],
     ),
+    data = ["package.json"],
     module_name = "@angular-devkit/core/node",
     module_root = "index.d.ts",
     # The attribute below is needed in g3 to turn off strict typechecking
@@ -53,8 +54,6 @@ ts_library(
 jasmine_node_test(
     name = "node_test",
     srcs = [":node_test_lib"],
-    # TODO: Audit tests to determine if tests can be run in RBE environments
-    local = True,
     deps = [
         "@npm//chokidar",
         "@npm//temp",
diff --git a/packages/angular_devkit/core/node/_golden-api.ts b/packages/angular_devkit/core/node/_golden-api.ts
deleted file mode 100644
index 1e8277d996a8..000000000000
--- a/packages/angular_devkit/core/node/_golden-api.ts
+++ /dev/null
@@ -1,17 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-// Start experimental namespace
-// Start jobs namespace
-export * from './experimental/jobs/job-registry';
-// End jobs namespace
-// End experimental namespace
-
-export * from './fs';
-export * from './cli-logger';
-export * from './host';
diff --git a/packages/angular_devkit/core/node/cli-logger.ts b/packages/angular_devkit/core/node/cli-logger.ts
index 07cb5ef39aa9..2ff2e1d145ef 100644
--- a/packages/angular_devkit/core/node/cli-logger.ts
+++ b/packages/angular_devkit/core/node/cli-logger.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 { filter } from 'rxjs/operators';
 import { logging } from '../src';
 
@@ -23,48 +24,46 @@ export function createConsoleLogger(
 ): logging.Logger {
   const logger = new logging.IndentLogger('cling');
 
-  logger
-    .pipe(filter(entry => entry.level !== 'debug' || verbose))
-    .subscribe(entry => {
-      const color = colors && colors[entry.level];
-      let output = stdout;
+  logger.pipe(filter((entry) => entry.level !== 'debug' || verbose)).subscribe((entry) => {
+    const color = colors && colors[entry.level];
+    let output = stdout;
 
-      switch (entry.level) {
-        case 'warn':
-        case 'fatal':
-        case 'error':
-          output = stderr;
-          break;
-      }
+    switch (entry.level) {
+      case 'warn':
+      case 'fatal':
+      case 'error':
+        output = stderr;
+        break;
+    }
 
-      // If we do console.log(message) or process.stdout.write(message + '\n'), the process might
-      // stop before the whole message is written and the stream is flushed. This happens when
-      // streams are asynchronous.
-      //
-      // NodeJS IO streams are different depending on platform and usage. In POSIX environment,
-      // for example, they're asynchronous when writing to a pipe, but synchronous when writing
-      // to a TTY. In windows, it's the other way around. You can verify which is which with
-      // stream.isTTY and platform, but this is not good enough.
-      // In the async case, one should wait for the callback before sending more data or
-      // continuing the process. In our case it would be rather hard to do (but not impossible).
-      //
-      // Instead we take the easy way out and simply chunk the message and call the write
-      // function while the buffer drain itself asynchronously. With a smaller chunk size than
-      // the buffer, we are mostly certain that it works. In this case, the chunk has been picked
-      // as half a page size (4096/2 = 2048), minus some bytes for the color formatting.
-      // On POSIX it seems the buffer is 2 pages (8192), but just to be sure (could be different
-      // by platform).
-      //
-      // For more details, see https://nodejs.org/api/process.html#process_a_note_on_process_i_o
-      const chunkSize = 2000;  // Small chunk.
-      let message = entry.message;
-      while (message) {
-        const chunk = message.slice(0, chunkSize);
-        message = message.slice(chunkSize);
-        output.write(color ? color(chunk) : chunk);
-      }
-      output.write('\n');
-    });
+    // If we do console.log(message) or process.stdout.write(message + '\n'), the process might
+    // stop before the whole message is written and the stream is flushed. This happens when
+    // streams are asynchronous.
+    //
+    // NodeJS IO streams are different depending on platform and usage. In POSIX environment,
+    // for example, they're asynchronous when writing to a pipe, but synchronous when writing
+    // to a TTY. In windows, it's the other way around. You can verify which is which with
+    // stream.isTTY and platform, but this is not good enough.
+    // In the async case, one should wait for the callback before sending more data or
+    // continuing the process. In our case it would be rather hard to do (but not impossible).
+    //
+    // Instead we take the easy way out and simply chunk the message and call the write
+    // function while the buffer drain itself asynchronously. With a smaller chunk size than
+    // the buffer, we are mostly certain that it works. In this case, the chunk has been picked
+    // as half a page size (4096/2 = 2048), minus some bytes for the color formatting.
+    // On POSIX it seems the buffer is 2 pages (8192), but just to be sure (could be different
+    // by platform).
+    //
+    // For more details, see https://nodejs.org/api/process.html#process_a_note_on_process_i_o
+    const chunkSize = 2000; // Small chunk.
+    let message = entry.message;
+    while (message) {
+      const chunk = message.slice(0, chunkSize);
+      message = message.slice(chunkSize);
+      output.write(color ? color(chunk) : chunk);
+    }
+    output.write('\n');
+  });
 
   return logger;
 }
diff --git a/packages/angular_devkit/core/node/experimental/index.ts b/packages/angular_devkit/core/node/experimental/index.ts
index 012ac72a4ae5..5e70f7eeba46 100644
--- a/packages/angular_devkit/core/node/experimental/index.ts
+++ b/packages/angular_devkit/core/node/experimental/index.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 * as jobs from './jobs';
 
-export {
-  jobs,
-};
+export { jobs };
diff --git a/packages/angular_devkit/core/node/experimental/jobs/index.ts b/packages/angular_devkit/core/node/experimental/jobs/index.ts
index d931a0289414..1038877cd091 100644
--- a/packages/angular_devkit/core/node/experimental/jobs/index.ts
+++ b/packages/angular_devkit/core/node/experimental/jobs/index.ts
@@ -1,8 +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
  */
+
 export * from './job-registry';
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..2a0f790d648c 100644
--- a/packages/angular_devkit/core/node/experimental/jobs/job-registry.ts
+++ b/packages/angular_devkit/core/node/experimental/jobs/job-registry.ts
@@ -1,20 +1,24 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+
 import { Observable, of } from 'rxjs';
 import { JsonValue, experimental as core_experimental, schema } from '../../../src';
 
-export class NodeModuleJobRegistry<MinimumArgumentValueT extends JsonValue = JsonValue,
+export class NodeModuleJobRegistry<
+  MinimumArgumentValueT extends JsonValue = JsonValue,
   MinimumInputValueT extends JsonValue = JsonValue,
-  MinimumOutputValueT extends JsonValue = JsonValue,
-> implements core_experimental.jobs.Registry<MinimumArgumentValueT,
-  MinimumInputValueT,
-  MinimumOutputValueT> {
-
+  MinimumOutputValueT extends JsonValue = JsonValue
+> implements
+    core_experimental.jobs.Registry<
+      MinimumArgumentValueT,
+      MinimumInputValueT,
+      MinimumOutputValueT
+    > {
   protected _resolve(name: string): string | null {
     try {
       return require.resolve(name);
@@ -32,10 +36,7 @@ export class NodeModuleJobRegistry<MinimumArgumentValueT extends JsonValue = Jso
    * @param name The name of the job.
    * @returns A description, or null if the job is not registered.
    */
-  get<A extends MinimumArgumentValueT,
-    I extends MinimumInputValueT,
-    O extends MinimumOutputValueT,
-    >(
+  get<A extends MinimumArgumentValueT, I extends MinimumInputValueT, O extends MinimumOutputValueT>(
     name: core_experimental.jobs.JobName,
   ): Observable<core_experimental.jobs.JobHandler<A, I, O> | null> {
     const [moduleName, exportName] = name.split(/#/, 2);
@@ -52,7 +53,7 @@ export class NodeModuleJobRegistry<MinimumArgumentValueT extends JsonValue = Jso
     }
 
     function _getValue(...fields: unknown[]) {
-      return fields.find(x => schema.isJsonSchema(x)) || true;
+      return fields.find((x) => schema.isJsonSchema(x)) || true;
     }
 
     const argument = _getValue(pkg.argument, handler.argument);
@@ -60,13 +61,15 @@ export class NodeModuleJobRegistry<MinimumArgumentValueT extends JsonValue = Jso
     const output = _getValue(pkg.output, handler.output);
     const channels = _getValue(pkg.channels, handler.channels);
 
-    return of(Object.assign(handler.bind(undefined), {
-      jobDescription: {
-        argument,
-        input,
-        output,
-        channels,
-      },
-    }));
+    return of(
+      Object.assign(handler.bind(undefined), {
+        jobDescription: {
+          argument,
+          input,
+          output,
+          channels,
+        },
+      }),
+    );
   }
 }
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..087f38109b6c 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,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 * as path from 'path';
 import { experimental as core_experimental } from '../../../src';
 import { NodeModuleJobRegistry } from './job-registry';
@@ -14,7 +15,6 @@ const root = path.join(
   '../../../../../../tests/angular_devkit/core/node/jobs',
 );
 
-
 describe('NodeModuleJobScheduler', () => {
   it('works', async () => {
     const registry = new NodeModuleJobRegistry();
diff --git a/packages/angular_devkit/core/node/fs.ts b/packages/angular_devkit/core/node/fs.ts
index a09048e9a87d..1eccf093eac9 100644
--- a/packages/angular_devkit/core/node/fs.ts
+++ b/packages/angular_devkit/core/node/fs.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 { statSync } from 'fs';
 
 /** @deprecated Since v11.0, unused by the Angular tooling */
diff --git a/packages/angular_devkit/core/node/host.ts b/packages/angular_devkit/core/node/host.ts
index 6a525e079827..cbcf55da0f58 100644
--- a/packages/angular_devkit/core/node/host.ts
+++ b/packages/angular_devkit/core/node/host.ts
@@ -1,17 +1,18 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+
 import {
   PathLike,
   Stats,
   constants,
   existsSync,
-  mkdirSync,
   promises as fsPromises,
+  mkdirSync,
   readFileSync,
   readdirSync,
   renameSync,
@@ -22,13 +23,7 @@ import {
 } from 'fs';
 import { dirname as pathDirname, join as pathJoin } from 'path';
 import { Observable, concat, from as observableFrom, of, throwError } from 'rxjs';
-import {
-  concatMap,
-  map,
-  mergeMap,
-  publish,
-  refCount,
-} from 'rxjs/operators';
+import { concatMap, map, mergeMap, publish, refCount } from 'rxjs/operators';
 import {
   Path,
   PathFragment,
@@ -40,9 +35,9 @@ import {
   virtualFs,
 } from '../src';
 
-
 interface ChokidarWatcher {
-  new(options: {}): ChokidarWatcher;
+  // eslint-disable-next-line @typescript-eslint/no-misused-new
+  new (options: {}): ChokidarWatcher;
 
   add(path: string): ChokidarWatcher;
   on(type: 'change', cb: (path: string) => void): ChokidarWatcher;
@@ -69,12 +64,14 @@ let FSWatcher: ChokidarWatcher;
 function loadFSWatcher() {
   if (!FSWatcher) {
     try {
-      // tslint:disable-next-line:no-implicit-dependencies
+      // eslint-disable-next-line import/no-extraneous-dependencies
       FSWatcher = require('chokidar').FSWatcher;
     } catch (e) {
       if (e.code !== 'MODULE_NOT_FOUND') {
-        throw new Error('As of angular-devkit version 8.0, the "chokidar" package ' +
-          'must be installed in order to use watch() features.');
+        throw new Error(
+          'As of angular-devkit version 8.0, the "chokidar" package ' +
+            'must be installed in order to use watch() features.',
+        );
       }
       throw e;
     }
@@ -91,25 +88,23 @@ export class NodeJsAsyncHost implements virtualFs.Host<Stats> {
   }
 
   write(path: Path, content: virtualFs.FileBuffer): Observable<void> {
-    return observableFrom(fsPromises.mkdir(getSystemPath(dirname(path)), { recursive: true }))
-      .pipe(
-        mergeMap(() => fsPromises.writeFile(getSystemPath(path), content)),
-      );
+    return observableFrom(fsPromises.mkdir(getSystemPath(dirname(path)), { recursive: true })).pipe(
+      mergeMap(() => fsPromises.writeFile(getSystemPath(path), new Uint8Array(content))),
+    );
   }
 
   read(path: Path): Observable<virtualFs.FileBuffer> {
-    return observableFrom(fsPromises.readFile(getSystemPath(path)))
-      .pipe(
-        map(buffer => new Uint8Array(buffer).buffer as virtualFs.FileBuffer),
-      );
+    return observableFrom(fsPromises.readFile(getSystemPath(path))).pipe(
+      map((buffer) => new Uint8Array(buffer).buffer as virtualFs.FileBuffer),
+    );
   }
 
   delete(path: Path): Observable<void> {
     return this.isDirectory(path).pipe(
-      mergeMap(async isDirectory => {
+      mergeMap(async (isDirectory) => {
         if (isDirectory) {
           const recursiveDelete = async (dirPath: string) => {
-            for (const fragment of (await fsPromises.readdir(dirPath))) {
+            for (const fragment of await fsPromises.readdir(dirPath)) {
               const sysPath = pathJoin(dirPath, fragment);
               const stats = await fsPromises.stat(sysPath);
 
@@ -136,23 +131,20 @@ export class NodeJsAsyncHost implements virtualFs.Host<Stats> {
 
   list(path: Path): Observable<PathFragment[]> {
     return observableFrom(fsPromises.readdir(getSystemPath(path))).pipe(
-      map((names) => names.map(name => fragment(name))),
+      map((names) => names.map((name) => fragment(name))),
     );
   }
 
   exists(path: Path): Observable<boolean> {
-    return observableFrom(exists(path));
+    return observableFrom(exists(getSystemPath(path)));
   }
 
   isDirectory(path: Path): Observable<boolean> {
-    return this.stat(path).pipe(
-      map(stat => stat.isDirectory()),
-    );
+    return this.stat(path).pipe(map((stat) => stat.isDirectory()));
   }
+
   isFile(path: Path): Observable<boolean> {
-    return this.stat(path).pipe(
-      map(stat => stat.isFile()),
-    );
+    return this.stat(path).pipe(map((stat) => stat.isFile()));
   }
 
   // Some hosts may not support stat.
@@ -165,26 +157,26 @@ export class NodeJsAsyncHost implements virtualFs.Host<Stats> {
     path: Path,
     _options?: virtualFs.HostWatchOptions,
   ): Observable<virtualFs.HostWatchEvent> | null {
-    return new Observable<virtualFs.HostWatchEvent>(obs => {
+    return new Observable<virtualFs.HostWatchEvent>((obs) => {
       loadFSWatcher();
       const watcher = new FSWatcher({ persistent: true }).add(getSystemPath(path));
 
       watcher
-        .on('change', path => {
+        .on('change', (path) => {
           obs.next({
             path: normalize(path),
             time: new Date(),
             type: virtualFs.HostWatchEventType.Changed,
           });
         })
-        .on('add', path => {
+        .on('add', (path) => {
           obs.next({
             path: normalize(path),
             time: new Date(),
             type: virtualFs.HostWatchEventType.Created,
           });
         })
-        .on('unlink', path => {
+        .on('unlink', (path) => {
           obs.next({
             path: normalize(path),
             time: new Date(),
@@ -193,14 +185,10 @@ export class NodeJsAsyncHost implements virtualFs.Host<Stats> {
         });
 
       return () => watcher.close();
-    }).pipe(
-      publish(),
-      refCount(),
-    );
+    }).pipe(publish(), refCount());
   }
 }
 
-
 /**
  * An implementation of the Virtual FS using Node as the backend, synchronously.
  */
@@ -210,7 +198,7 @@ export class NodeJsSyncHost implements virtualFs.Host<Stats> {
   }
 
   write(path: Path, content: virtualFs.FileBuffer): Observable<void> {
-    return new Observable(obs => {
+    return new Observable((obs) => {
       mkdirSync(getSystemPath(dirname(path)), { recursive: true });
       writeFileSync(getSystemPath(path), new Uint8Array(content));
       obs.next();
@@ -219,7 +207,7 @@ export class NodeJsSyncHost implements virtualFs.Host<Stats> {
   }
 
   read(path: Path): Observable<virtualFs.FileBuffer> {
-    return new Observable(obs => {
+    return new Observable((obs) => {
       const buffer = readFileSync(getSystemPath(path));
 
       obs.next(new Uint8Array(buffer).buffer as virtualFs.FileBuffer);
@@ -229,7 +217,7 @@ export class NodeJsSyncHost implements virtualFs.Host<Stats> {
 
   delete(path: Path): Observable<void> {
     return this.isDirectory(path).pipe(
-      concatMap(isDir => {
+      concatMap((isDir) => {
         if (isDir) {
           const dirPaths = readdirSync(getSystemPath(path));
           const rmDirComplete = new Observable<void>((obs) => {
@@ -237,10 +225,7 @@ export class NodeJsSyncHost implements virtualFs.Host<Stats> {
             obs.complete();
           });
 
-          return concat(
-            ...dirPaths.map(name => this.delete(join(path, name))),
-            rmDirComplete,
-          );
+          return concat(...dirPaths.map((name) => this.delete(join(path, name))), rmDirComplete);
         } else {
           try {
             unlinkSync(getSystemPath(path));
@@ -255,7 +240,7 @@ export class NodeJsSyncHost implements virtualFs.Host<Stats> {
   }
 
   rename(from: Path, to: Path): Observable<void> {
-    return new Observable(obs => {
+    return new Observable((obs) => {
       const toSystemPath = getSystemPath(to);
       mkdirSync(pathDirname(toSystemPath), { recursive: true });
       renameSync(getSystemPath(from), toSystemPath);
@@ -265,32 +250,33 @@ export class NodeJsSyncHost implements virtualFs.Host<Stats> {
   }
 
   list(path: Path): Observable<PathFragment[]> {
-    return new Observable(obs => {
+    return new Observable((obs) => {
       const names = readdirSync(getSystemPath(path));
-      obs.next(names.map(name => fragment(name)));
+      obs.next(names.map((name) => fragment(name)));
       obs.complete();
     });
   }
 
   exists(path: Path): Observable<boolean> {
-    return new Observable(obs => {
+    return new Observable((obs) => {
       obs.next(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()));
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    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()));
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    return this.stat(path)!.pipe(map((stat) => stat.isFile()));
   }
 
   // Some hosts may not support stat.
   stat(path: Path): Observable<virtualFs.Stats<Stats>> {
-    return new Observable(obs => {
+    return new Observable((obs) => {
       obs.next(statSync(getSystemPath(path)));
       obs.complete();
     });
@@ -301,27 +287,27 @@ export class NodeJsSyncHost implements virtualFs.Host<Stats> {
     path: Path,
     _options?: virtualFs.HostWatchOptions,
   ): Observable<virtualFs.HostWatchEvent> | null {
-    return new Observable<virtualFs.HostWatchEvent>(obs => {
+    return new Observable<virtualFs.HostWatchEvent>((obs) => {
       const opts = { persistent: false };
       loadFSWatcher();
       const watcher = new FSWatcher(opts).add(getSystemPath(path));
 
       watcher
-        .on('change', path => {
+        .on('change', (path) => {
           obs.next({
             path: normalize(path),
             time: new Date(),
             type: virtualFs.HostWatchEventType.Changed,
           });
         })
-        .on('add', path => {
+        .on('add', (path) => {
           obs.next({
             path: normalize(path),
             time: new Date(),
             type: virtualFs.HostWatchEventType.Created,
           });
         })
-        .on('unlink', path => {
+        .on('unlink', (path) => {
           obs.next({
             path: normalize(path),
             time: new Date(),
@@ -330,9 +316,6 @@ export class NodeJsSyncHost implements virtualFs.Host<Stats> {
         });
 
       return () => watcher.close();
-    }).pipe(
-      publish(),
-      refCount(),
-    );
+    }).pipe(publish(), refCount());
   }
 }
diff --git a/packages/angular_devkit/core/node/host_spec.ts b/packages/angular_devkit/core/node/host_spec.ts
index 7ac9615b5db3..c4315f793a99 100644
--- a/packages/angular_devkit/core/node/host_spec.ts
+++ b/packages/angular_devkit/core/node/host_spec.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
  */
-// tslint:disable:no-any
-// tslint:disable:no-non-null-assertion
-// tslint:disable:no-implicit-dependencies
+
+/* eslint-disable @typescript-eslint/no-explicit-any */
+/* eslint-disable @typescript-eslint/no-non-null-assertion */
+/* eslint-disable import/no-extraneous-dependencies */
 import { normalize, virtualFs } from '@angular-devkit/core';
 import { NodeJsAsyncHost, NodeJsSyncHost } from '@angular-devkit/core/node';
 import * as fs from 'fs';
@@ -15,14 +16,12 @@ import { Observable, Subscription } from 'rxjs';
 
 const temp = require('temp');
 
-
 // TODO: replace this with an "it()" macro that's reusable globally.
 let linuxOnlyIt: typeof it = it;
 if (process.platform.startsWith('win') || process.platform.startsWith('darwin')) {
   linuxOnlyIt = xit;
 }
 
-
 describe('NodeJsAsyncHost', () => {
   let root: string;
   let host: virtualFs.Host<fs.Stats>;
@@ -31,38 +30,51 @@ describe('NodeJsAsyncHost', () => {
     root = temp.mkdirSync('core-node-spec-');
     host = new virtualFs.ScopedHost(new NodeJsAsyncHost(), normalize(root));
   });
-  afterEach(done => host.delete(normalize('/')).toPromise().then(done, done.fail));
 
-  linuxOnlyIt('can watch', done => {
-    let obs: Observable<virtualFs.HostWatchEvent>;
-    let subscription: Subscription;
-    const content = virtualFs.stringToFileBuffer('hello world');
-    const content2 = virtualFs.stringToFileBuffer('hello world 2');
-    const allEvents: virtualFs.HostWatchEvent[] = [];
+  afterEach((done) => host.delete(normalize('/')).toPromise().then(done, done.fail));
 
-    Promise.resolve()
-      .then(() => fs.mkdirSync(root + '/sub1'))
-      .then(() => fs.writeFileSync(root + '/sub1/file1', 'hello world'))
-      .then(() => {
-        obs = host.watch(normalize('/sub1'), { recursive: true }) !;
-        expect(obs).not.toBeNull();
-        subscription = obs.subscribe(event => { allEvents.push(event); });
-      })
-      .then(() => new Promise(resolve => setTimeout(resolve, 100)))
-      // Discard the events registered so far.
-      .then(() => allEvents.splice(0))
-      .then(() => host.write(normalize('/sub1/sub2/file3'), content).toPromise())
-      .then(() => host.write(normalize('/sub1/file2'), content2).toPromise())
-      .then(() => host.delete(normalize('/sub1/file1')).toPromise())
-      .then(() => new Promise(resolve => setTimeout(resolve, 2000)))
-      .then(() => {
-        expect(allEvents.length).toBe(3);
-        subscription.unsubscribe();
-      })
-      .then(done, done.fail);
-  }, 30000);
-});
+  it('should get correct result for exists', async () => {
+    const filePath = normalize('not-found');
+    expect(await host.exists(filePath).toPromise()).toBeFalse();
+    await host.write(filePath, virtualFs.stringToFileBuffer('content')).toPromise();
+    expect(await host.exists(filePath).toPromise()).toBeTrue();
+  });
 
+  linuxOnlyIt(
+    'can watch',
+    (done) => {
+      let obs: Observable<virtualFs.HostWatchEvent>;
+      let subscription: Subscription;
+      const content = virtualFs.stringToFileBuffer('hello world');
+      const content2 = virtualFs.stringToFileBuffer('hello world 2');
+      const allEvents: virtualFs.HostWatchEvent[] = [];
+
+      Promise.resolve()
+        .then(() => fs.mkdirSync(root + '/sub1'))
+        .then(() => fs.writeFileSync(root + '/sub1/file1', 'hello world'))
+        .then(() => {
+          obs = host.watch(normalize('/sub1'), { recursive: true })!;
+          expect(obs).not.toBeNull();
+          subscription = obs.subscribe((event) => {
+            allEvents.push(event);
+          });
+        })
+        .then(() => new Promise((resolve) => setTimeout(resolve, 100)))
+        // Discard the events registered so far.
+        .then(() => allEvents.splice(0))
+        .then(() => host.write(normalize('/sub1/sub2/file3'), content).toPromise())
+        .then(() => host.write(normalize('/sub1/file2'), content2).toPromise())
+        .then(() => host.delete(normalize('/sub1/file1')).toPromise())
+        .then(() => new Promise((resolve) => setTimeout(resolve, 2000)))
+        .then(() => {
+          expect(allEvents.length).toBe(3);
+          subscription.unsubscribe();
+        })
+        .then(done, done.fail);
+    },
+    30000,
+  );
+});
 
 describe('NodeJsSyncHost', () => {
   let root: string;
@@ -71,57 +83,66 @@ describe('NodeJsSyncHost', () => {
   beforeEach(() => {
     root = temp.mkdirSync('core-node-spec-');
     host = new virtualFs.SyncDelegateHost(
-      new virtualFs.ScopedHost(new NodeJsSyncHost(), normalize(root)));
+      new virtualFs.ScopedHost(new NodeJsSyncHost(), normalize(root)),
+    );
   });
   afterEach(() => {
     host.delete(normalize('/'));
   });
 
-  linuxOnlyIt('can watch', done => {
-    let obs: Observable<virtualFs.HostWatchEvent>;
-    let subscription: Subscription;
-    const content = virtualFs.stringToFileBuffer('hello world');
-    const content2 = virtualFs.stringToFileBuffer('hello world 2');
-    const allEvents: virtualFs.HostWatchEvent[] = [];
-
-    Promise.resolve()
-      .then(() => fs.mkdirSync(root + '/sub1'))
-      .then(() => fs.writeFileSync(root + '/sub1/file1', 'hello world'))
-      .then(() => {
-        obs = host.watch(normalize('/sub1'), { recursive: true })!;
-        expect(obs).not.toBeNull();
-        subscription = obs.subscribe(event => { allEvents.push(event); });
-      })
-      .then(() => new Promise(resolve => setTimeout(resolve, 100)))
-      // Discard the events registered so far.
-      .then(() => allEvents.splice(0))
-      .then(() => {
-        host.write(normalize('/sub1/sub2/file3'), content);
-        host.write(normalize('/sub1/file2'), content2);
-        host.delete(normalize('/sub1/file1'));
-      })
-      .then(() => new Promise(resolve => setTimeout(resolve, 2000)))
-      .then(() => {
-        expect(allEvents.length).toBe(3);
-        subscription.unsubscribe();
-      })
-      .then(done, done.fail);
-  }, 30000);
-
-  linuxOnlyIt('rename to a non-existing dir', done => {
-
-    Promise.resolve()
-      .then(() => fs.mkdirSync(root + '/rename'))
-      .then(() => fs.writeFileSync(root + '/rename/a.txt', 'hello world'))
-      .then(() => {
-        host.rename(normalize('/rename/a.txt'), normalize('/rename/b/c/d/a.txt'));
-        if (fs.existsSync(root + '/rename/b/c/d/a.txt')) {
-          const resContent = host.read(normalize('/rename/b/c/d/a.txt'));
-          const content = virtualFs.fileBufferToString(resContent);
-          expect(content).toEqual('hello world');
-        }
-      })
-      .then(done, done.fail);
-  }, 30000);
-
+  linuxOnlyIt(
+    'can watch',
+    (done) => {
+      let obs: Observable<virtualFs.HostWatchEvent>;
+      let subscription: Subscription;
+      const content = virtualFs.stringToFileBuffer('hello world');
+      const content2 = virtualFs.stringToFileBuffer('hello world 2');
+      const allEvents: virtualFs.HostWatchEvent[] = [];
+
+      Promise.resolve()
+        .then(() => fs.mkdirSync(root + '/sub1'))
+        .then(() => fs.writeFileSync(root + '/sub1/file1', 'hello world'))
+        .then(() => {
+          obs = host.watch(normalize('/sub1'), { recursive: true })!;
+          expect(obs).not.toBeNull();
+          subscription = obs.subscribe((event) => {
+            allEvents.push(event);
+          });
+        })
+        .then(() => new Promise((resolve) => setTimeout(resolve, 100)))
+        // Discard the events registered so far.
+        .then(() => allEvents.splice(0))
+        .then(() => {
+          host.write(normalize('/sub1/sub2/file3'), content);
+          host.write(normalize('/sub1/file2'), content2);
+          host.delete(normalize('/sub1/file1'));
+        })
+        .then(() => new Promise((resolve) => setTimeout(resolve, 2000)))
+        .then(() => {
+          expect(allEvents.length).toBe(3);
+          subscription.unsubscribe();
+        })
+        .then(done, done.fail);
+    },
+    30000,
+  );
+
+  linuxOnlyIt(
+    'rename to a non-existing dir',
+    (done) => {
+      Promise.resolve()
+        .then(() => fs.mkdirSync(root + '/rename'))
+        .then(() => fs.writeFileSync(root + '/rename/a.txt', 'hello world'))
+        .then(() => {
+          host.rename(normalize('/rename/a.txt'), normalize('/rename/b/c/d/a.txt'));
+          if (fs.existsSync(root + '/rename/b/c/d/a.txt')) {
+            const resContent = host.read(normalize('/rename/b/c/d/a.txt'));
+            const content = virtualFs.fileBufferToString(resContent);
+            expect(content).toEqual('hello world');
+          }
+        })
+        .then(done, done.fail);
+    },
+    30000,
+  );
 });
diff --git a/packages/angular_devkit/core/node/index.ts b/packages/angular_devkit/core/node/index.ts
index 3f3e175f4315..c1e9cbdd353b 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
@@ -8,10 +8,8 @@
 
 import * as experimental from './experimental/jobs/job-registry';
 import * as fs from './fs';
+
 export * from './cli-logger';
 export * from './host';
 
-export {
-  experimental,
-  fs,
-};
+export { experimental, fs };
diff --git a/packages/angular_devkit/core/node/package.json b/packages/angular_devkit/core/node/package.json
new file mode 100644
index 000000000000..87cb5f4a92c5
--- /dev/null
+++ b/packages/angular_devkit/core/node/package.json
@@ -0,0 +1,5 @@
+{
+  "name": "@angular-devkit/core/node",
+  "main": "index.js",
+  "typings": "index.d.ts"
+}
diff --git a/packages/angular_devkit/core/node/testing/index.ts b/packages/angular_devkit/core/node/testing/index.ts
index d8a7dbea4c6b..b83bd1008d21 100644
--- a/packages/angular_devkit/core/node/testing/index.ts
+++ b/packages/angular_devkit/core/node/testing/index.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 * as fs from 'fs';
 import * as os from 'os';
 import * as path from 'path';
@@ -16,7 +17,7 @@ import { NodeJsSyncHost } from '../host';
  */
 export class TempScopedNodeJsSyncHost extends virtualFs.ScopedHost<fs.Stats> {
   protected _sync?: virtualFs.SyncDelegateHost<fs.Stats>;
-  protected _root: Path;
+  protected override _root: Path;
 
   constructor() {
     const root = normalize(path.join(os.tmpdir(), `devkit-host-${+Date.now()}-${process.pid}`));
@@ -29,7 +30,8 @@ export class TempScopedNodeJsSyncHost extends virtualFs.ScopedHost<fs.Stats> {
   get files(): Path[] {
     const sync = this.sync;
     function _visit(p: Path): Path[] {
-      return sync.list(p)
+      return sync
+        .list(p)
         .map((fragment) => join(p, fragment))
         .reduce((files, path) => {
           if (sync.isDirectory(path)) {
@@ -43,7 +45,9 @@ export class TempScopedNodeJsSyncHost extends virtualFs.ScopedHost<fs.Stats> {
     return _visit(normalize('/'));
   }
 
-  get root() { return this._root; }
+  get root() {
+    return this._root;
+  }
   get sync() {
     if (!this._sync) {
       this._sync = new virtualFs.SyncDelegateHost<fs.Stats>(this);
diff --git a/packages/angular_devkit/core/package.json b/packages/angular_devkit/core/package.json
index c24f1da0bf45..04e9cc96202b 100644
--- a/packages/angular_devkit/core/package.json
+++ b/packages/angular_devkit/core/package.json
@@ -8,8 +8,8 @@
     "core"
   ],
   "dependencies": {
-    "ajv": "8.1.0",
-    "ajv-formats": "2.0.2",
+    "ajv": "8.6.2",
+    "ajv-formats": "2.1.0",
     "fast-json-stable-stringify": "2.1.0",
     "magic-string": "0.25.7",
     "rxjs": "6.6.7",
diff --git a/packages/angular_devkit/core/src/_golden-api.ts b/packages/angular_devkit/core/src/_golden-api.ts
deleted file mode 100644
index 0c8c1c52f68d..000000000000
--- a/packages/angular_devkit/core/src/_golden-api.ts
+++ /dev/null
@@ -1,52 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-export * from './exception/exception';
-
-// Start json namespace
-export * from './json/interface';
-export * from './json/parser';
-export * from './json/schema/interface';
-export * from './json/schema/pointer';
-export * from './json/schema/registry';
-export * from './json/schema/visitor';
-export * from './json/schema/utility';
-export * from './json/schema/transforms';
-// End json namespace
-
-// Start logging namespace
-export * from './logger/indent';
-export * from './logger/level';
-export * from './logger/logger';
-export * from './logger/null-logger';
-export * from './logger/transform-logger';
-// End logging namespace
-
-// Start utils namespace
-export * from './utils/literals';
-export * from './utils/strings';
-export * from './utils/array';
-export * from './utils/object';
-export * from './utils/template';
-export * from './utils/partially-ordered-set';
-export * from './utils/priority-queue';
-export * from './utils/lang';
-// End utils namespace
-
-// Start virtualFs namespace
-export * from './virtual-fs/path';
-export * from './virtual-fs/host/index';
-// End virtualFs namespace
-
-// Start workspace namespace
-export * from './workspace/index';
-// End workspace namespace
-
-// Start analytics namespace
-export * from './analytics/index';
-// End analytics namespace
diff --git a/packages/angular_devkit/core/src/analytics/api.ts b/packages/angular_devkit/core/src/analytics/api.ts
index f538d1ba088a..5bce57099418 100644
--- a/packages/angular_devkit/core/src/analytics/api.ts
+++ b/packages/angular_devkit/core/src/analytics/api.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
  */
+
 export interface CustomDimensionsAndMetricsOptions {
   dimensions?: (boolean | number | string)[];
   metrics?: (boolean | number | string)[];
diff --git a/packages/angular_devkit/core/src/analytics/forwarder.ts b/packages/angular_devkit/core/src/analytics/forwarder.ts
index 8c1ba6de6a92..31e5fb373a28 100644
--- a/packages/angular_devkit/core/src/analytics/forwarder.ts
+++ b/packages/angular_devkit/core/src/analytics/forwarder.ts
@@ -1,14 +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 { JsonObject } from '../json';
 import { Analytics, EventOptions, PageviewOptions, ScreenviewOptions, TimingOptions } from './api';
 
-
 export enum AnalyticsReportKind {
   Event = 'event',
   Screenview = 'screenview',
@@ -46,11 +46,10 @@ export interface AnalyticsReportTiming extends AnalyticsReportBase {
 }
 
 export type AnalyticsReport =
-  AnalyticsReportEvent
+  | AnalyticsReportEvent
   | AnalyticsReportScreenview
   | AnalyticsReportPageview
-  | AnalyticsReportTiming
-  ;
+  | AnalyticsReportTiming;
 
 /**
  * A function that can forward analytics along some stream. AnalyticsReport is already a
@@ -105,7 +104,6 @@ export class ForwardingAnalytics implements Analytics {
   }
 }
 
-
 export class AnalyticsReporter {
   constructor(protected _analytics: Analytics) {}
 
diff --git a/packages/angular_devkit/core/src/analytics/index.ts b/packages/angular_devkit/core/src/analytics/index.ts
index a6ca6c5f1c00..38c996be3914 100644
--- a/packages/angular_devkit/core/src/analytics/index.ts
+++ b/packages/angular_devkit/core/src/analytics/index.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
  */
+
 export * from './api';
 export * from './forwarder';
 export * from './logging';
diff --git a/packages/angular_devkit/core/src/analytics/logging.ts b/packages/angular_devkit/core/src/analytics/logging.ts
index e19785727ffe..2811d8b47717 100644
--- a/packages/angular_devkit/core/src/analytics/logging.ts
+++ b/packages/angular_devkit/core/src/analytics/logging.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 { Logger } from '../logger';
 import { Analytics, EventOptions, PageviewOptions, ScreenviewOptions, TimingOptions } from './api';
 
diff --git a/packages/angular_devkit/core/src/analytics/multi.ts b/packages/angular_devkit/core/src/analytics/multi.ts
index 141f0db38e0b..d5019ba3fd99 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
@@ -19,20 +19,19 @@ export class MultiAnalytics implements Analytics {
   }
 
   event(category: string, action: string, options?: EventOptions): void {
-    this._backends.forEach(be => be.event(category, action, options));
+    this._backends.forEach((be) => be.event(category, action, options));
   }
   screenview(screenName: string, appName: string, options?: ScreenviewOptions): void {
-    this._backends.forEach(be => be.screenview(screenName, appName, options));
+    this._backends.forEach((be) => be.screenview(screenName, appName, options));
   }
   pageview(path: string, options?: PageviewOptions): void {
-    this._backends.forEach(be => be.pageview(path, options));
+    this._backends.forEach((be) => be.pageview(path, options));
   }
   timing(category: string, variable: string, time: string | number, options?: TimingOptions): void {
-    this._backends.forEach(be => be.timing(category, variable, time, options));
+    this._backends.forEach((be) => be.timing(category, variable, time, options));
   }
 
-
   flush(): Promise<void> {
-    return Promise.all(this._backends.map(x => x.flush())).then(() => {});
+    return Promise.all(this._backends.map((x) => x.flush())).then(() => {});
   }
 }
diff --git a/packages/angular_devkit/core/src/analytics/noop.ts b/packages/angular_devkit/core/src/analytics/noop.ts
index a4592a75c174..cba315a3dd2c 100644
--- a/packages/angular_devkit/core/src/analytics/noop.ts
+++ b/packages/angular_devkit/core/src/analytics/noop.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 { Analytics } from './api';
 
 /**
@@ -15,5 +16,7 @@ export class NoopAnalytics implements Analytics {
   screenview() {}
   pageview() {}
   timing() {}
-  flush(): Promise<void> { return Promise.resolve(); }
+  flush(): Promise<void> {
+    return Promise.resolve();
+  }
 }
diff --git a/packages/angular_devkit/core/src/exception/exception.ts b/packages/angular_devkit/core/src/exception/exception.ts
index 31dc67badb1a..38af2ade370c 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
@@ -12,24 +12,32 @@ export class BaseException extends Error {
   }
 }
 
-
 export class UnknownException extends BaseException {
-  constructor(message: string) { super(message); }
+  constructor(message: string) {
+    super(message);
+  }
 }
 
-
 // Exceptions
 export class FileDoesNotExistException extends BaseException {
-  constructor(path: string) { super(`Path "${path}" does not exist.`); }
+  constructor(path: string) {
+    super(`Path "${path}" does not exist.`);
+  }
 }
 export class FileAlreadyExistException extends BaseException {
-  constructor(path: string) { super(`Path "${path}" already exist.`); }
+  constructor(path: string) {
+    super(`Path "${path}" already exist.`);
+  }
 }
 export class PathIsDirectoryException extends BaseException {
-  constructor(path: string) { super(`Path "${path}" is a directory.`); }
+  constructor(path: string) {
+    super(`Path "${path}" is a directory.`);
+  }
 }
 export class PathIsFileException extends BaseException {
-  constructor(path: string) { super(`Path "${path}" is a file.`); }
+  constructor(path: string) {
+    super(`Path "${path}" is a file.`);
+  }
 }
 export class ContentHasMutatedException extends BaseException {
   constructor(path: string) {
@@ -37,7 +45,9 @@ export class ContentHasMutatedException extends BaseException {
   }
 }
 export class InvalidUpdateRecordException extends BaseException {
-  constructor() { super(`Invalid record instance.`); }
+  constructor() {
+    super(`Invalid record instance.`);
+  }
 }
 export class MergeConflictException extends BaseException {
   constructor(path: string) {
@@ -46,9 +56,13 @@ export class MergeConflictException extends BaseException {
 }
 
 export class UnimplementedException extends BaseException {
-  constructor() { super('This function is unimplemented.'); }
+  constructor() {
+    super('This function is unimplemented.');
+  }
 }
 
 export class UnsupportedPlatformException extends BaseException {
-  constructor() { super('This platform is not supported by this code path.'); }
+  constructor() {
+    super('This platform is not supported by this code path.');
+  }
 }
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..628c78be71a2 100644
--- a/packages/angular_devkit/core/src/experimental.ts
+++ b/packages/angular_devkit/core/src/experimental.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 * as jobs from './experimental/jobs/index';
 
-export {
-  jobs,
-};
+export { jobs };
diff --git a/packages/angular_devkit/core/src/experimental/jobs/README.md b/packages/angular_devkit/core/src/experimental/jobs/README.md
index e1640a5382b9..ebb0f90a0578 100644
--- a/packages/angular_devkit/core/src/experimental/jobs/README.md
+++ b/packages/angular_devkit/core/src/experimental/jobs/README.md
@@ -1,6 +1,6 @@
 # Description
 
-Jobs is the Angular DevKit subsystem for scheduling and running generic functions with clearly 
+Jobs is the Angular DevKit subsystem for scheduling and running generic functions with clearly
 typed inputs and outputs. A `Job` instance is a function associated with metadata. You can
 schedule a job, synchronize it with other jobs, and use it to schedule other jobs.
 
@@ -11,30 +11,33 @@ Jobs are lazy, cold, and guaranteed to execute exactly once when scheduled. Subs
 returns messages from the point where the job is at.
 
 ## Argument, Input, Output and Channels
+
 A job receives a single argument when scheduled and can also listen to an input channel. It can
-emit multiple outputs, and can also provide multiple output channels that emit asynchronous JSON 
-messages, which can be typed. 
+emit multiple outputs, and can also provide multiple output channels that emit asynchronous JSON
+messages, which can be typed.
 
-The I/O model is like that of an executable, where the argument corresponds to arguments on the 
+The I/O model is like that of an executable, where the argument corresponds to arguments on the
 command line, the input channel to STDIN, the output channel to STDOUT, and the channels
 would be additional output streams.
 
 ## LifeCycle
+
 A `Job` goes through multiple LifeCycle messages before its completion;
+
 1. `JobState.Queued`. The job was queued and is waiting. This is the default state from the
-    scheduler.
+   scheduler.
 1. `JobState.Ready`. The job's dependencies (see
-    ["Synchronizing and Dependencies"](#Dependencies)) are done running, the argument is 
-    validated, and the job is ready to execute.
-1. `JobState.Started`. The argument has been validated, the job has been called and is running. 
-    This is handled by the job itself (or `createJobHandler()`).
-1. `JobState.Ended`. The job has ended and is done running. This is handled by the job itself (or 
-    `createJobHandler()`).
+   ["Synchronizing and Dependencies"](#Dependencies)) are done running, the argument is
+   validated, and the job is ready to execute.
+1. `JobState.Started`. The argument has been validated, the job has been called and is running.
+   This is handled by the job itself (or `createJobHandler()`).
+1. `JobState.Ended`. The job has ended and is done running. This is handled by the job itself (or
+   `createJobHandler()`).
 1. `JobState.Errored`. A unrecoverable error happened.
 
 Each state (except `Queued`) corresponds to a `JobOutboundMessage` on the `outboundBus` observable
-that triggers the state change. The `Scheduler` emits the `Ready` and `Errored` messages; the job 
-implementation should not emit them, and if it does they are filtered out. You can listen for 
+that triggers the state change. The `Scheduler` emits the `Ready` and `Errored` messages; the job
+implementation should not emit them, and if it does they are filtered out. You can listen for
 these messages or use the corresponding state member.
 
 The job implementation should emit the `Start` and `End` messages when it is starting the job logic
@@ -43,51 +46,53 @@ itself. Only the first `Start` and `End` messages will be forwarded. Any more wi
 The `Queued` state is set as the job is scheduled, so there is no need to listen for the message.
 
 ## `Job<OutputType>` Object
-The `Job` object that is returned when you schedule a job provides access to the job's status and 
-utilities for tracking and modifying the job. 
+
+The `Job` object that is returned when you schedule a job provides access to the job's status and
+utilities for tracking and modifying the job.
 
 1. `id`. A unique symbol that can be used as a Map key.
 1. `description`. The description of the job from the scheduler. See `JobDescription` object.
 1. `argument`. The argument value that was used to start the job.
 1. `input`. An `Observer` that can be used to send validated inputs to the job itself.
 1. `output`. An `Observable<OutputType>` that filters out messages to get only the returned output
-    of a job.
+   of a job.
 1. `promise`. A promise that waits for the last output of a job. Returns the last value outputted
-    (or no value if there's no last value).
+   (or no value if there's no last value).
 1. `state`. The current state of the job (see `LifeCycle`).
 1. `channels`. A map of side channels the user can listen to as `Observable`.
 1. `ping()`. A function that can be used to ping the job, receiving a `Promise` for when the ping
-    is answered.
+   is answered.
 1. `stop()`. Sends a `stop` input to the job, which suggests to stop the job. The job itself can
-    choose to ignore this message.
+   choose to ignore this message.
 1. `inboundBus`. The raw input `Observer<JobInboundMessage>`. This can be used to send messages to
-    the `context.inboundBus` observable in the job. These are `JobInboundMessage` messages. See
-    ["Communicating With Jobs"](#Communicating).
+   the `context.inboundBus` observable in the job. These are `JobInboundMessage` messages. See
+   ["Communicating With Jobs"](#Communicating).
 1. `outboundBus`. The raw output `Observable<JobOutput>`. This can be used to listen to messages
-    from the job. See ["Communicating With Jobs"](#Communicating).
-   
+   from the job. See ["Communicating With Jobs"](#Communicating).
+
 ## `JobHandlerContext<I, O>` Object
+
 The `JobHandlerContext<>` is passed to the job handler code in addition to its argument. The
 context contains the following members:
 
 1. `description`. The description of the job. Its name and schemas.
 1. `scheduler`. A `Scheduler<>` instance that can be used to create additional jobs.
 1. `dependencies`. A generic list of other job instances that were run as dependencies when
-    scheduling this job. Their `id` is not guaranteed to match the `id` of the `Job<>` instance 
-    itself (those `Job<>`s might just be proxies). The state of those `Job<>` is guaranteed to be
-    `JobState.Ended`, as `JobState.Errored` would have prevented this handler from running.
+   scheduling this job. Their `id` is not guaranteed to match the `id` of the `Job<>` instance
+   itself (those `Job<>`s might just be proxies). The state of those `Job<>` is guaranteed to be
+   `JobState.Ended`, as `JobState.Errored` would have prevented this handler from running.
 1. `inboundBus`. The raw input observable, complement of the `inboundBus` observer from the `Job<>`.
 
 # Examples
 
-An example of a job that adds all input together and return the output value. We use a 
+An example of a job that adds all input together and return the output value. We use a
 simple synchronous job registry and a simple job scheduler.
 
 ```typescript
 import { jobs } from '@angular-devkit/core';
 
-const add = jobs.createJobHandle<number[], number>(
-  input => input.reduce((total, curr) => total + curr, 0),
+const add = jobs.createJobHandle<number[], number>((input) =>
+  input.reduce((total, curr) => total + curr, 0),
 );
 
 // Register the job in a SimpleJobRegistry. Different registries have different API.
@@ -99,8 +104,9 @@ registry.register(add, {
   output: { type: 'number' },
 });
 
-scheduler.schedule('add', [1, 2, 3, 4]).promise
-  .then(output => console.log('1 + 2 + 3 + 4 is ' + output));
+scheduler
+  .schedule('add', [1, 2, 3, 4])
+  .promise.then((output) => console.log('1 + 2 + 3 + 4 is ' + output));
 ```
 
 # Creating Jobs
@@ -114,14 +120,15 @@ import { Observable } from 'rxjs';
 import { jobs } from '@angular-devkit/core';
 
 const argument = {
-  type: 'array', items: { type: 'number' },
+  type: 'array',
+  items: { type: 'number' },
 };
 const output = {
   type: 'number',
 };
 
 export function add(argument: number[]): Observable<jobs.JobOutboundMessage<number>> {
-  return new Observable(o => {
+  return new Observable((o) => {
     o.next({ kind: jobs.JobOutboundMessageKind.Start });
     o.next({
       kind: jobs.JobOutboundMessageKind.Output,
@@ -141,17 +148,16 @@ add.jobDescription = {
 
 // Call the job with an array as argument, and log its output.
 declare const scheduler: jobs.Scheduler;
-scheduler.schedule('add', [1, 2, 3, 4])
-    .output.subscribe(x => console.log(x));  // Will output 10.
+scheduler.schedule('add', [1, 2, 3, 4]).output.subscribe((x) => console.log(x)); // Will output 10.
 ```
 
-This is a lot of boilerplate, so we made some helpers to improve readability and manage argument, 
+This is a lot of boilerplate, so we made some helpers to improve readability and manage argument,
 input and output automatically:
 
 ```typescript
 // Add is a JobHandler function, like the above.
-export const add = jobs.createJobHandler<number[], number>(
-  argument => argument.reduce((total, curr) => total + curr, 0),
+export const add = jobs.createJobHandler<number[], number>((argument) =>
+  argument.reduce((total, curr) => total + curr, 0),
 );
 
 // Schedule like above.
@@ -169,23 +175,24 @@ import { jobs } from '@angular-devkit/core';
 // Show progress with each count in a separate output channel. Output "more" in a channel.
 export const count = jobs.createJobHandler<number, number>(
   // Receive a context that contains additional methods to create channels.
-  (argument: number, { createChannel }) => new Observable<number>(o => {
-    const side = createChannel('side', { type: 'string', const: 'more' });
-    const progress = createChannel('progress', { type: 'number' });
-    let i = 0;
-    function doCount() {
-      o.next(i++);
-      progress.next(i / argument);
-      side.next('more');
-  
-      if (i < argument) {
-        setTimeout(doCount, 100);
-      } else {
-        o.complete();
+  (argument: number, { createChannel }) =>
+    new Observable<number>((o) => {
+      const side = createChannel('side', { type: 'string', const: 'more' });
+      const progress = createChannel('progress', { type: 'number' });
+      let i = 0;
+      function doCount() {
+        o.next(i++);
+        progress.next(i / argument);
+        side.next('more');
+
+        if (i < argument) {
+          setTimeout(doCount, 100);
+        } else {
+          o.complete();
+        }
       }
-    }
-    setTimeout(doCount, 100);
-  }),
+      setTimeout(doCount, 100);
+    }),
   {
     argument: { type: 'number' },
     output: { type: 'number' },
@@ -196,63 +203,69 @@ export const count = jobs.createJobHandler<number, number>(
 declare const scheduler: jobs.Scheduler;
 
 const job = scheduler.schedule('count', 0);
-job.getChannel('side').subscribe(x => console.log(x));
+job.getChannel('side').subscribe((x) => console.log(x));
 // You can type a channel too. Messages will be filtered out.
-job.getChannel<number>('progress', { type: 'number' }).subscribe(x => console.log(x));
+job
+  .getChannel<number>('progress', { type: 'number' })
+  .subscribe((x) => console.log(x));
 ```
 
 ## <a name="Communicating"></a>Communicating With Jobs
-Jobs can be started and updated in a separate process or thread, and as such communication with a 
+
+Jobs can be started and updated in a separate process or thread, and as such communication with a
 job should avoid using global objects (which might not be shared). The jobs API and schedulers
-provide 2 communication streams (one for input and the other for output), named `inboundBus` and 
+provide 2 communication streams (one for input and the other for output), named `inboundBus` and
 `outboundBus`.
 
 ### Raw Input Stream
+
 The `schedule()` function returns a `Job<>` interface that contains a `inboundBus` member of type
 `Observer<JobInboundMessage>`. All messages sent _to_ the job goes through this stream. The `kind`
 member of the `JobInboundMessage` interface dictates what kind of message it is sending:
 
 1. `JobInboundMessageKind.Ping`. A simple message that should be answered with
-    `JobOutboundMessageKind.Pong` when the job is responsive. The `id` field of the message should
-    be used when returning `Pong`.
+   `JobOutboundMessageKind.Pong` when the job is responsive. The `id` field of the message should
+   be used when returning `Pong`.
 1. `JobInboundMessageKind.Stop`. The job should be stopped. This is used when
-    cancelling/unsubscribing from the `output` (or by calling `stop()`). Any inputs or outputs
-    after this message will be ignored.
+   cancelling/unsubscribing from the `output` (or by calling `stop()`). Any inputs or outputs
+   after this message will be ignored.
 1. `JobInboundMessageKind.Input` is used when sending inputs to a job. These correspond to the
-    `next` methods of an `Observer` and are reported to the job through its `context.input`
-    Observable. There is no way to communicate an error to the job.
+   `next` methods of an `Observer` and are reported to the job through its `context.input`
+   Observable. There is no way to communicate an error to the job.
 
 Using the `createJobHandler()` helper, all those messages are automatically handled by the
 boilerplate code. If you need direct access to raw inputs, you should subscribe to the
 `context.inboundBus` Observable.
 
 ### Raw Output Stream
+
 The `Job<>` interface also contains a `outboundBus` member (of type
 `Observable<JobOutboundMessage<O>>` where `O` is the typed output of the job) which is the output
 complement of `inboundBus`. All messages sent _from_ the job goes through this stream. The `kind`
 member of the `JobOutboundMessage<O>` interface dictates what kind of message it is sending:
 
 1. `JobOutboundMessageKind.Create`. The `Job<>` was created, its dependencies are done, and the
-    library is validating Argument and calling the internal job code.
+   library is validating Argument and calling the internal job code.
 1. `JobOutboundMessageKind.Start`. The job code itself should send that message when started.
-    `createJobHandler()` will do it automatically.
+   `createJobHandler()` will do it automatically.
 1. `JobOutboundMessageKind.End`. The job has ended. This is done by the job itself and should always
-    be sent when completed. The scheduler will listen to this message to set the state and unblock
-    dependent jobs. `createJobHandler()` automatically send this message.
+   be sent when completed. The scheduler will listen to this message to set the state and unblock
+   dependent jobs. `createJobHandler()` automatically send this message.
 1. `JobOutboundMessageKind.Pong`. The job should answer a `JobInboundMessageKind.Ping` message with
-    this. Automatically done by `createJobHandler()`.
+   this. Automatically done by `createJobHandler()`.
 1. `JobOutboundMessageKind.Output`. An `Output` has been generated by the job.
 1. `JobOutboundMessageKind.ChannelMessage`, `JobOutboundMessageKind.ChannelError` and
-    `JobOutboundMessageKind.ChannelComplete` are used for output channels. These correspond to the
-    `next`, `error` and `complete` methods of an `Observer` and are available to the callee through
-    the `job.channels` map of Observable.
+   `JobOutboundMessageKind.ChannelComplete` are used for output channels. These correspond to the
+   `next`, `error` and `complete` methods of an `Observer` and are available to the callee through
+   the `job.channels` map of Observable.
 
 Those messages can be accessed directly through the `job.outboundBus` member. The job itself should
 return an `Observable<JobOutboundMessage<O>>`. The `createJobHandler()` helper handles most of use
 cases of this and makes it easier for jobs to handle this.
 
 ## Job Dispatchers
-Dispatchers are a helper that redirect to different jobs given conditions. To create a job 
+
+Dispatchers are a helper that redirect to different jobs given conditions. To create a job
 dispatcher, use the `createDispatcher()` function:
 
 ```typescript
@@ -282,12 +295,13 @@ dispatcher.addConditionalDelegate(() => userWantsYarn, yarnInstall.name);
 ```
 
 ## Execution Strategy
-Jobs are always run in parallel and will always start, but many helper functions are provided 
+
+Jobs are always run in parallel and will always start, but many helper functions are provided
 when creating a job to help you control the execution strategy;
 
 1. `serialize()`. Multiple runs of this job will be queued with each others.
-1. `memoize(replayMessages = false)` will create a job, or reuse the same job  when inputs are 
-matching. If the inputs don't match, a new job will be started and its outputs will be stored.
+1. `memoize(replayMessages = false)` will create a job, or reuse the same job when inputs are
+   matching. If the inputs don't match, a new job will be started and its outputs will be stored.
 
 These strategies can be used when creating the job:
 
@@ -295,13 +309,13 @@ These strategies can be used when creating the job:
 // Same input and output as above.
 
 export const add = jobs.strategy.memoize()(
-  jobs.createJobHandler<number[], number>(
-      argument => argument.reduce((total, curr) => total + curr, 0),
+  jobs.createJobHandler<number[], number>((argument) =>
+    argument.reduce((total, curr) => total + curr, 0),
   ),
 );
 ```
 
-Strategies can be reused to synchronize between jobs. For example, given jobs `jobA` and `jobB`, 
+Strategies can be reused to synchronize between jobs. For example, given jobs `jobA` and `jobB`,
 you can reuse the strategy to serialize both jobs together;
 
 ```typescript
@@ -310,8 +324,8 @@ const jobA = strategy(jobs.createJobHandler(...));
 const jobB = strategy(jobs.createJobHandler(...));
 ```
 
-Even further, we can have package A and package B run in serialization, and B and C also be 
-serialized. Running A and C will run in parallel, while running B will wait for both A and C 
+Even further, we can have package A and package B run in serialization, and B and C also be
+serialized. Running A and C will run in parallel, while running B will wait for both A and C
 to finish.
 
 ```typescript
@@ -323,6 +337,7 @@ const jobC = strategy2(jobs.createJobHandler(...));
 ```
 
 # Scheduling Jobs
+
 Jobs can be scheduled using a `Scheduler` interface, which contains a `schedule()` method:
 
 ```typescript
@@ -342,7 +357,7 @@ interface Scheduler {
 }
 ```
 
-The scheduler also has a `getDescription()` method to get a `JobDescription` object for a certain 
+The scheduler also has a `getDescription()` method to get a `JobDescription` object for a certain
 name; that description contains schemas for the argument, input, output, and other channels:
 
 ```typescript
@@ -354,7 +369,7 @@ interface Scheduler {
    * @returns A description, or null if the job cannot be scheduled.
    */
   getDescription(name: JobName): JobDescription | null;
-    
+
   /**
    * Returns true if the job name has been registered.
    * @param name The name of the job.
@@ -364,8 +379,8 @@ interface Scheduler {
 }
 ```
 
-Finally, the scheduler interface has a `pause()` method to stop scheduling. This will queue all 
-jobs and wait for the unpause function to be called before unblocking all the jobs scheduled. 
+Finally, the scheduler interface has a `pause()` method to stop scheduling. This will queue all
+jobs and wait for the unpause function to be called before unblocking all the jobs scheduled.
 This does not affect already running jobs.
 
 ```typescript
@@ -387,7 +402,8 @@ interface Scheduler {
 ```
 
 ## <a name="Dependencies"></a>Synchronizing and Dependencies
-When scheduling jobs, it is often necessary to run jobs after certain other jobs are finished. 
+
+When scheduling jobs, it is often necessary to run jobs after certain other jobs are finished.
 This is done through the `dependencies` options in the `schedule()` method.
 
 These jobs will also be passed to the job being scheduled, through its context. This can be
@@ -397,34 +413,39 @@ An example of this would be a compiler that needs to know the output directory o
 before it, in a tool chain.
 
 ### Dependencies
+
 When scheduling jobs, the user can add a `dependencies` field to the scheduling options. The
-scheduler will wait for those dependencies to finish before running the job, and pass those jobs 
+scheduler will wait for those dependencies to finish before running the job, and pass those jobs
 in the context of the job.
 
 ### Accessing Dependencies
+
 Jobs are called with a `JobHandlerContext` as a second argument, which contains a
-`dependencies: Job<JsonValue>[]` member which contains all dependencies that were used when 
+`dependencies: Job<JsonValue>[]` member which contains all dependencies that were used when
 scheduling the job. Those aren't fully typed as they are determined by the user, and not the job
 itself. They also can contain jobs that are not finished, and the job should use the `state`
 member of the job itself before trying to access its content.
 
 ### Scheduler Sub Jobs
+
 The `JobHandlerContext` also contains a `scheduler` member which can be used to schedule jobs
 using the same scheduler that was used for the job. This allows jobs to call other jobs
 and wait for them to end.
 
 ## Available Schedulers
+
 The Core Angular DevKit library provides 2 implementations for the `Scheduler` interface:
 
 ## SimpleJobRegistry
+
 Available in the jobs namespace. A registry that accept job registration, and can also schedule
 jobs.
 
 ```typescript
 import { jobs } from '@angular-devkit/core';
 
-const add = jobs.createJobHandler<number[], number>(
-  argument => argument.reduce((total, curr) => total + curr, 0),
+const add = jobs.createJobHandler<number[], number>((argument) =>
+  argument.reduce((total, curr) => total + curr, 0),
 );
 
 // Register the job in a SimpleJobRegistry. Different registries have different API.
@@ -441,6 +462,7 @@ scheduler.schedule('add', [1, 2, 3, 4]);
 ```
 
 ## NodeModuleJobRegistry
+
 Available through `@angular-devkit/core/node`.
 
 A scheduler that loads jobs using their node package names. These jobs need to use the
@@ -456,34 +478,33 @@ scheduler.schedule('some-node-package#someExport', 'input');
 # Gotchas
 
 1. Deadlocking Dependencies  
-   It is impossible to add dependencies to an already running job, but it is entirely possible to 
+   It is impossible to add dependencies to an already running job, but it is entirely possible to
    get locked between jobs. Be aware of your own dependencies.
 
 1. Using `job.promise`  
-    `job.promise` waits for the job to ends. Don't rely on it unless you know the job is not 
-    watching and running for a long time. If you aren't sure, use
-    `job.output.pipe(first()).toPromise()` instead which will return the first next output, 
-    regardless of whether the job watches and rerun or not.
-
+   `job.promise` waits for the job to ends. Don't rely on it unless you know the job is not
+   watching and running for a long time. If you aren't sure, use
+   `job.output.pipe(first()).toPromise()` instead which will return the first next output,
+   regardless of whether the job watches and rerun or not.
 
 # FAQ
 
 1. Laziness  
-    A job is lazy until executed, but its messages will be replayed when resubscribed.
+   A job is lazy until executed, but its messages will be replayed when resubscribed.
 
 1. Serialize Strategy vs Dependencies  
-    Strategies are functions that transform the execution of a job, and can be used when
-    declaring the job, or registering it. Dependencies, on the other hand, are listed when
-    scheduling a job to order jobs during scheduling.
-    
-    A job has no control over the way it's scheduled, and its dependencies. It can, however,
-    declare that it shouldn't run at the same time as itself. Alternatively, a user could
-    schedule a job twice and imply that the second run should wait for the first to finish. In
-    practice, this would be equivalent to having the job be serialized, but the important detail 
-    is in _whom_ is defining the rules; using the `serialize()` strategy, the job implementation
-    is, while when using dependencies, the user is.
-    
-    The user does not need to know how to job needs to synchronize with itself, and the job does
-    not need to know how it synchronizes with other jobs that it doesn't know about. That's part 
-    of the strength of this system as every job can be developed in a vacuum, only caring about
-    its contracts (argument, input and output) and its own synchronization.
+   Strategies are functions that transform the execution of a job, and can be used when
+   declaring the job, or registering it. Dependencies, on the other hand, are listed when
+   scheduling a job to order jobs during scheduling.
+
+   A job has no control over the way it's scheduled, and its dependencies. It can, however,
+   declare that it shouldn't run at the same time as itself. Alternatively, a user could
+   schedule a job twice and imply that the second run should wait for the first to finish. In
+   practice, this would be equivalent to having the job be serialized, but the important detail
+   is in _whom_ is defining the rules; using the `serialize()` strategy, the job implementation
+   is, while when using dependencies, the user is.
+
+   The user does not need to know how to job needs to synchronize with itself, and the job does
+   not need to know how it synchronizes with other jobs that it doesn't know about. That's part
+   of the strength of this system as every job can be developed in a vacuum, only caring about
+   its contracts (argument, input and output) and its own synchronization.
diff --git a/packages/angular_devkit/core/src/experimental/jobs/api.ts b/packages/angular_devkit/core/src/experimental/jobs/api.ts
index 2a5297833cf8..d46c34c4ed8a 100644
--- a/packages/angular_devkit/core/src/experimental/jobs/api.ts
+++ b/packages/angular_devkit/core/src/experimental/jobs/api.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 { Observable, Observer } from 'rxjs';
 import { JsonObject, JsonValue, schema } from '../../json/index';
 import { DeepReadonly } from '../../utils/index';
@@ -14,31 +15,28 @@ import { DeepReadonly } from '../../utils/index';
  */
 export type JobName = string;
 
-
 /**
  * The job handler function, which is a method that's executed for the job.
  */
 export interface JobHandler<
   ArgT extends JsonValue,
   InputT extends JsonValue,
-  OutputT extends JsonValue,
+  OutputT extends JsonValue
 > {
-  (
-    argument: ArgT,
-    context: JobHandlerContext<ArgT, InputT, OutputT>,
-  ): Observable<JobOutboundMessage<OutputT>>;
+  (argument: ArgT, context: JobHandlerContext<ArgT, InputT, OutputT>): Observable<
+    JobOutboundMessage<OutputT>
+  >;
 
   jobDescription: Partial<JobDescription>;
 }
 
-
 /**
  * The context in which the job is run.
  */
 export interface JobHandlerContext<
   MinimumArgumentValueT extends JsonValue = JsonValue,
   MinimumInputValueT extends JsonValue = JsonValue,
-  MinimumOutputValueT extends JsonValue = JsonValue,
+  MinimumOutputValueT extends JsonValue = JsonValue
 > {
   readonly description: JobDescription;
   readonly scheduler: Scheduler<JsonValue, JsonValue, JsonValue>;
@@ -49,7 +47,6 @@ export interface JobHandlerContext<
   readonly inboundBus: Observable<JobInboundMessage<MinimumInputValueT>>;
 }
 
-
 /**
  * Metadata associated with a job.
  */
@@ -118,10 +115,9 @@ export interface JobInboundMessageInput<InputT extends JsonValue> extends JobInb
 }
 
 export type JobInboundMessage<InputT extends JsonValue> =
-  JobInboundMessagePing
+  | JobInboundMessagePing
   | JobInboundMessageStop
-  | JobInboundMessageInput<InputT>
-  ;
+  | JobInboundMessageInput<InputT>;
 
 /**
  * Kind of messages that can be outputted from a job.
@@ -173,9 +169,8 @@ export interface JobOutboundMessageStart extends JobOutboundMessageBase {
 /**
  * An output value is available.
  */
-export interface JobOutboundMessageOutput<
-  OutputT extends JsonValue,
-> extends JobOutboundMessageBase {
+export interface JobOutboundMessageOutput<OutputT extends JsonValue>
+  extends JobOutboundMessageBase {
   readonly kind: JobOutboundMessageKind.Output;
 
   /**
@@ -184,7 +179,6 @@ export interface JobOutboundMessageOutput<
   readonly value: OutputT;
 }
 
-
 /**
  * Base interface for all job message related to channels.
  */
@@ -262,7 +256,7 @@ export interface JobOutboundMessagePong extends JobOutboundMessageBase {
  * Generic message type.
  */
 export type JobOutboundMessage<OutputT extends JsonValue> =
-  JobOutboundMessageOnReady
+  | JobOutboundMessageOnReady
   | JobOutboundMessageStart
   | JobOutboundMessageOutput<OutputT>
   | JobOutboundMessageChannelCreate
@@ -270,9 +264,7 @@ export type JobOutboundMessage<OutputT extends JsonValue> =
   | JobOutboundMessageChannelError
   | JobOutboundMessageChannelComplete
   | JobOutboundMessageEnd
-  | JobOutboundMessagePong
-  ;
-
+  | JobOutboundMessagePong;
 
 /**
  * The state of a job. These are changed as the job reports a new state through its messages.
@@ -302,14 +294,13 @@ export enum JobState {
   Errored = 'errored',
 }
 
-
 /**
  * A Job instance, returned from scheduling a job. A Job instance is _not_ serializable.
  */
 export interface Job<
   ArgumentT extends JsonValue = JsonValue,
   InputT extends JsonValue = JsonValue,
-  OutputT extends JsonValue = JsonValue,
+  OutputT extends JsonValue = JsonValue
 > {
   /**
    * Description of the job. Resolving the job's description can be done asynchronously, so this
@@ -380,17 +371,15 @@ export interface ScheduleJobOptions {
 export interface Registry<
   MinimumArgumentValueT extends JsonValue = JsonValue,
   MinimumInputValueT extends JsonValue = JsonValue,
-  MinimumOutputValueT extends JsonValue = JsonValue,
+  MinimumOutputValueT extends JsonValue = JsonValue
 > {
   /**
    * Get a job handler.
    * @param name The name of the job to get a handler from.
    */
-  get<
-    A extends MinimumArgumentValueT,
-    I extends MinimumInputValueT,
-    O extends MinimumOutputValueT,
-  >(name: JobName): Observable<JobHandler<A, I, O> | null>;
+  get<A extends MinimumArgumentValueT, I extends MinimumInputValueT, O extends MinimumOutputValueT>(
+    name: JobName,
+  ): Observable<JobHandler<A, I, O> | null>;
 }
 
 /**
@@ -399,7 +388,7 @@ export interface Registry<
 export interface Scheduler<
   MinimumArgumentValueT extends JsonValue = JsonValue,
   MinimumInputValueT extends JsonValue = JsonValue,
-  MinimumOutputValueT extends JsonValue = JsonValue,
+  MinimumOutputValueT extends JsonValue = JsonValue
 > {
   /**
    * Get a job description for a named job.
@@ -440,7 +429,7 @@ export interface Scheduler<
   schedule<
     A extends MinimumArgumentValueT,
     I extends MinimumInputValueT,
-    O extends MinimumOutputValueT,
+    O extends MinimumOutputValueT
   >(
     name: JobName,
     argument: A,
@@ -448,15 +437,12 @@ export interface Scheduler<
   ): Job<A, I, O>;
 }
 
-
-export function isJobHandler<
-  A extends JsonValue,
-  I extends JsonValue,
-  O extends JsonValue,
->(value: unknown): value is JobHandler<A, I, O> {
+export function isJobHandler<A extends JsonValue, I extends JsonValue, O extends JsonValue>(
+  value: unknown,
+): value is JobHandler<A, I, O> {
   const job = value as JobHandler<A, I, O>;
 
-  return typeof job == 'function'
-      && typeof job.jobDescription == 'object'
-      && job.jobDescription !== null;
+  return (
+    typeof job == 'function' && typeof job.jobDescription == 'object' && job.jobDescription !== null
+  );
 }
diff --git a/packages/angular_devkit/core/src/experimental/jobs/architecture.md b/packages/angular_devkit/core/src/experimental/jobs/architecture.md
index b3f1c8a59627..da67dae59556 100644
--- a/packages/angular_devkit/core/src/experimental/jobs/architecture.md
+++ b/packages/angular_devkit/core/src/experimental/jobs/architecture.md
@@ -1,9 +1,10 @@
-
 # Overview
+
 Jobs is a high-order API that adds inputs, runtime type checking, sequencing, and other
 functionality on top of RxJS' `Observable`s.
 
 # Background
+
 An `Observable` (at a higher level) is a function that receives a `Subscriber`, and outputs
 multiple values, and finishes once it calls the `Subscriber.prototype.complete()` method (in
 JavaScript):
@@ -23,17 +24,18 @@ const output1To10EverySecond = function (subscriber) {
 
 const stream$ = new Observable(output1To10EverySecond);
 // Start the function, and output 1 to 100, once per line.
-stream$.subscribe(x => console.log(x));
+stream$.subscribe((x) => console.log(x));
 ```
 
 This, of course, can be typed in TypeScript, but those types are not enforced at runtime.
 
 # Glossary
+
 - `job handler`. The function that implements the job's logic.
 - `raw input`. The input observable sending messages to the job. These messages are of type
-    `JobInboundMessage`.
+  `JobInboundMessage`.
 - `raw output`. The output observer returned from the `job handler`. Messages on this observable
-    are of type `JobOutboundMessage`.
+  are of type `JobOutboundMessage`.
 
 # Description
 
@@ -43,7 +45,7 @@ Json Schema):
 
 ```javascript
 const output1ToXEverySecond = function (x, context) {
-  return new Observable(subscriber => {
+  return new Observable((subscriber) => {
     let t = 0;
 
     // Notify our users that the actual work is started.
@@ -60,7 +62,7 @@ const output1ToXEverySecond = function (x, context) {
     return () => {
       clearInterval(i);
     };
-  })
+  });
 };
 
 // For now, jobs can not be called without a registry and scheduler.
@@ -76,7 +78,7 @@ const scheduler = new SimpleScheduler(registry);
 const job = scheduler.schedule('output-from-1-to-x', 10);
 
 // A Job<> instance has more members, but we only want the output values here.
-job.output.subscribe(x => console.log(x));
+job.output.subscribe((x) => console.log(x));
 ```
 
 This seems like a lot of boilerplate in comparison, but there are a few advantages;
@@ -84,11 +86,12 @@ This seems like a lot of boilerplate in comparison, but there are a few advantag
 1. lifecycle. Jobs can tell when they start doing work and when work is done.
 1. everything is typed, even at runtime.
 1. the context also contains an input Observable that receives typed input messages, including
-    input values, and stop requests.
+   input values, and stop requests.
 1. jobs can also schedule other jobs and wait for them, even if they don't know if a job is
-    implemented in the system.
+   implemented in the system.
 
 ## Diagram
+
 A simpler way to think about jobs in contrast to observables is that job are closer to a Unix
 process. It has an argument (command line flags), receive inputs (STDIN and interrupt signals),
 and output values (STDOUT) as well as diagnostic (STDERR). They can be plugged one into another
@@ -99,7 +102,7 @@ and output values (STDOUT) as well as diagnostic (STDERR). They can be plugged o
 - given I the type of the input
 - given O the type of the output
 
-                              ,______________________   
+                              ,______________________
     JobInboundMessage<I> --> | handler(argument: A) |  --> JobOutboundMessage<O>
                                                             - JobOutboundMessageKind.Output
                                                             - ...
@@ -108,37 +111,38 @@ and output values (STDOUT) as well as diagnostic (STDERR). They can be plugged o
 `JobInboundMessage` includes:
 
 1. `JobInboundMessageKind.Ping`. A simple message that should be answered with
-    `JobOutboundMessageKind.Pong` when the job is responsive. The `id` field of the message should
-    be used when returning `Pong`.
+   `JobOutboundMessageKind.Pong` when the job is responsive. The `id` field of the message should
+   be used when returning `Pong`.
 1. `JobInboundMessageKind.Stop`. The job should be stopped. This is used when
-    cancelling/unsubscribing from the `output` (or by calling `stop()`). Any inputs or outputs
-    after this message will be ignored.
+   cancelling/unsubscribing from the `output` (or by calling `stop()`). Any inputs or outputs
+   after this message will be ignored.
 1. `JobInboundMessageKind.Input` is used when sending inputs to a job. These correspond to the
-    `next` methods of an `Observer` and are reported to the job through its `context.input`
-    Observable. There is no way to communicate an error to the job.
+   `next` methods of an `Observer` and are reported to the job through its `context.input`
+   Observable. There is no way to communicate an error to the job.
 
 `JobOutboundMessage` includes:
 
 1. `JobOutboundMessageKind.Ready`. The `Job<>` was created, its dependencies are done, and the
-    library is validating Argument and calling the internal job code.
+   library is validating Argument and calling the internal job code.
 1. `JobOutboundMessageKind.Start`. The job code itself should send that message when started.
-    `createJobHandler()` will do it automatically.
+   `createJobHandler()` will do it automatically.
 1. `JobOutboundMessageKind.End`. The job has ended. This is done by the job itself and should
-    always be sent when completed. The scheduler will listen to this message to set the state and
-    unblock dependent jobs. `createJobHandler()` automatically send this message.
+   always be sent when completed. The scheduler will listen to this message to set the state and
+   unblock dependent jobs. `createJobHandler()` automatically send this message.
 1. `JobOutboundMessageKind.Pong`. The job should answer a `JobInboundMessageKind.Ping` message with
-    this. Automatically done by `createJobHandler()`.
+   this. Automatically done by `createJobHandler()`.
 1. `JobOutboundMessageKind.Output`. An `Output` has been generated by the job.
 1. `JobOutboundMessageKind.ChannelMessage`, `JobOutboundMessageKind.ChannelError` and
-    `JobOutboundMessageKind.ChannelComplete` are used for output channels. These correspond to
-    the `next`, `error` and `complete` methods of an `Observer` and are available to the callee
-    through the `job.channels` map of Observable.
+   `JobOutboundMessageKind.ChannelComplete` are used for output channels. These correspond to
+   the `next`, `error` and `complete` methods of an `Observer` and are available to the callee
+   through the `job.channels` map of Observable.
 
 Utilities should have some filtering and dispatching to separate observables, as a convenience for
 the user. An example of this would be the `Job.prototype.output` observable which only contains
 the value contained by messages of type `JobOutboundMessageKind.Output`.
 
 # Higher Order Jobs
+
 Because jobs are expected to be pure functions, they can be composed or transformed to create
 more complex behaviour, similar to how RxJS operators can transform observables.
 
@@ -146,31 +150,31 @@ more complex behaviour, similar to how RxJS operators can transform observables.
 // Runs a job on the hour, every hour, regardless of how long the job takes.
 // This creates a job function that can be registered by itself.
 function scheduleJobOnTheHour(jobFunction) {
-  return function(argument, context) {
-    return new Observable(observer => {
+  return function (argument, context) {
+    return new Observable((observer) => {
       let timeout = 0;
-   
+
       function _timeoutToNextHour() {
         // Just wait until the next hour.
         const t = new Date();
         const secondsToNextHour = 3600 - t.getSeconds() - t.getMinutes() * 60;
         timeout = setTimeout(_scheduleJobAndWaitAnHour, secondsToNextHour);
       }
-   
+
       function _scheduleJobAndWaitAnHour() {
         jobFunction(argument, context).subscribe(
-          message => observer.next(message),
-          error => observer.error(error),
+          (message) => observer.next(message),
+          (error) => observer.error(error),
           // Do not forward completion, but use it to schedule the next job run.
           () => {
             _timeoutToNextHour();
           },
         );
       }
-   
+
       // Kick off by waiting for next hour.
       _timeoutToNextHour();
-   
+
       return () => clearTimeout(timeout);
     });
   };
@@ -184,9 +188,9 @@ Another way to compose jobs is to schedule jobs based on their name, from other
 // This creates a high order job by getting a job name and an argument, and scheduling the job
 // every hour.
 function scheduleJobOnTheHour(job, context) {
-  const { name, argument } = job;  // Destructure our input.
+  const { name, argument } = job; // Destructure our input.
 
-  return new Observable(observer => {
+  return new Observable((observer) => {
     let timeout = 0;
 
     function _timeoutToNextHour() {
@@ -200,8 +204,8 @@ function scheduleJobOnTheHour(job, context) {
       const subJob = context.scheduler.schedule(name, argument);
       // We do not forward the input to the sub-job but that would be a valid example as well.
       subJob.outboundBus.subscribe(
-        message => observer.next(message),
-        error => observer.error(error),
+        (message) => observer.next(message),
+        (error) => observer.error(error),
         // Do not forward completion, but use it to schedule the next job run.
         () => {
           _timeoutToNextHour();
@@ -239,15 +243,16 @@ const job = scheduler.schedule('schedule-job-on-the-hour', {
     to: '/volumes/usb-key',
   },
 });
-job.output.subscribe(x => console.log(x));
+job.output.subscribe((x) => console.log(x));
 ```
 
 # Limitations
+
 Jobs input, output and argument must be serializable to JSONs. This is a big limitation in usage,
 but comes with the benefit that jobs can be serialized and called across memory boundaries. An
 example would be an operator that takes a module path and run the job from that path in a separate
 process. Or even a separate server, using HTTP calls.
- 
+
 Another limitation is that the boilerplate is complex. Manually managing start/end life cycle, and
 other messages such as ping/pong, etc. is tedious and requires a lot of code. A good way to keep
 this limitation under control is to provide helpers to create `JobHandler`s which manage those
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..e2bd7a20efae 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,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 { Observable, Observer, Subject, Subscription, from, isObservable, of } from 'rxjs';
 import { switchMap, tap } from 'rxjs/operators';
 import { BaseException } from '../../exception/index';
@@ -21,7 +21,6 @@ import {
   JobOutboundMessageKind,
 } from './api';
 
-
 export class ChannelAlreadyExistException extends BaseException {
   constructor(name: string) {
     super(`Channel ${JSON.stringify(name)} already exist.`);
@@ -35,13 +34,12 @@ export class ChannelAlreadyExistException extends BaseException {
 export interface SimpleJobHandlerContext<
   A extends JsonValue,
   I extends JsonValue,
-  O extends JsonValue,
+  O extends JsonValue
 > extends JobHandlerContext<A, I, O> {
   createChannel: (name: string) => Observer<JsonValue>;
   input: Observable<I>;
 }
 
-
 /**
  * A simple version of the JobHandler. This simplifies a lot of the interaction with the job
  * scheduler and registry. For example, instead of returning a JobOutboundMessage observable, you
@@ -52,7 +50,6 @@ export type SimpleJobHandlerFn<A extends JsonValue, I extends JsonValue, O exten
   context: SimpleJobHandlerContext<A, I, O>,
 ) => O | Promise<O> | Observable<O>;
 
-
 /**
  * Make a simple job handler that sets start and end from a function that's synchronous.
  *
@@ -70,7 +67,7 @@ export function createJobHandler<A extends JsonValue, I extends JsonValue, O ext
     const inputChannel = new Subject<I>();
     let subscription: Subscription;
 
-    return new Observable<JobOutboundMessage<O>>(subject => {
+    return new Observable<JobOutboundMessage<O>>((subject) => {
       function complete() {
         if (subscription) {
           subscription.unsubscribe();
@@ -81,7 +78,7 @@ export function createJobHandler<A extends JsonValue, I extends JsonValue, O ext
       }
 
       // Handle input.
-      const inboundSub = inboundBus.subscribe(message => {
+      const inboundSub = inboundBus.subscribe((message) => {
         switch (message.kind) {
           case JobInboundMessageKind.Ping:
             subject.next({ kind: JobOutboundMessageKind.Pong, description, id: message.id });
@@ -111,12 +108,15 @@ export function createJobHandler<A extends JsonValue, I extends JsonValue, O ext
           }
           const channelSubject = new Subject<JsonValue>();
           const channelSub = channelSubject.subscribe(
-            message => {
+            (message) => {
               subject.next({
-                kind: JobOutboundMessageKind.ChannelMessage, description, name, message,
+                kind: JobOutboundMessageKind.ChannelMessage,
+                description,
+                name,
+                message,
               });
             },
-            error => {
+            (error) => {
               subject.next({ kind: JobOutboundMessageKind.ChannelError, description, name, error });
               // This can be reopened.
               channels.delete(name);
@@ -148,7 +148,7 @@ export function createJobHandler<A extends JsonValue, I extends JsonValue, O ext
 
       subscription = (result as Observable<O>).subscribe(
         (value: O) => subject.next({ kind: JobOutboundMessageKind.Output, description, value }),
-        error => subject.error(error),
+        (error) => subject.error(error),
         () => complete(),
       );
       subscription.add(inboundSub);
@@ -160,7 +160,6 @@ export function createJobHandler<A extends JsonValue, I extends JsonValue, O ext
   return Object.assign(handler, { jobDescription: options });
 }
 
-
 /**
  * Lazily create a job using a function.
  * @param loader A factory function that returns a promise/observable of a JobHandler.
@@ -171,14 +170,12 @@ export function createJobFactory<A extends JsonValue, I extends JsonValue, O ext
   options: Partial<JobDescription> = {},
 ): JobHandler<A, I, O> {
   const handler = (argument: A, context: JobHandlerContext<A, I, O>) => {
-    return from(loader())
-      .pipe(switchMap(fn => fn(argument, context)));
+    return from(loader()).pipe(switchMap((fn) => fn(argument, context)));
   };
 
   return Object.assign(handler, { jobDescription: options });
 }
 
-
 /**
  * Creates a job that logs out input/output messages of another Job. The messages are still
  * propagated to the other job.
@@ -188,14 +185,14 @@ export function createLoggerJob<A extends JsonValue, I extends JsonValue, O exte
   logger: LoggerApi,
 ): JobHandler<A, I, O> {
   const handler = (argument: A, context: JobHandlerContext<A, I, O>) => {
-    context.inboundBus.pipe(
-      tap(message => logger.info(`Input: ${JSON.stringify(message)}`)),
-    ).subscribe();
+    context.inboundBus
+      .pipe(tap((message) => logger.info(`Input: ${JSON.stringify(message)}`)))
+      .subscribe();
 
     return job(argument, context).pipe(
       tap(
-        message => logger.info(`Message: ${JSON.stringify(message)}`),
-        error => logger.warn(`Error: ${JSON.stringify(error)}`),
+        (message) => logger.info(`Message: ${JSON.stringify(message)}`),
+        (error) => logger.warn(`Error: ${JSON.stringify(error)}`),
         () => logger.info(`Completed`),
       ),
     );
diff --git a/packages/angular_devkit/core/src/experimental/jobs/dispatcher.ts b/packages/angular_devkit/core/src/experimental/jobs/dispatcher.ts
index c1dce056ed30..ff43cd35fac2 100644
--- a/packages/angular_devkit/core/src/experimental/jobs/dispatcher.ts
+++ b/packages/angular_devkit/core/src/experimental/jobs/dispatcher.ts
@@ -1,31 +1,21 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
- *
  */
+
 import { JsonValue } from '../../json/index';
 import { Readwrite } from '../../utils/index';
-import {
-  Job,
-  JobDescription,
-  JobHandler,
-  JobHandlerContext,
-  JobName,
-  isJobHandler,
-} from './api';
+import { Job, JobDescription, JobHandler, JobHandlerContext, JobName, isJobHandler } from './api';
 import { JobDoesNotExistException } from './exception';
 
 /**
  * A JobDispatcher can be used to dispatch between multiple jobs.
  */
-export interface JobDispatcher<
-  A extends JsonValue,
-  I extends JsonValue,
-  O extends JsonValue,
-> extends JobHandler<A, I, O> {
+export interface JobDispatcher<A extends JsonValue, I extends JsonValue, O extends JsonValue>
+  extends JobHandler<A, I, O> {
   /**
    * Set the default job if all conditionals failed.
    * @param name The default name if all conditions are false.
@@ -40,44 +30,39 @@ export interface JobDispatcher<
   addConditionalJob(predicate: (args: A) => boolean, name: string): void;
 }
 
-
 /**
  * OnReady a dispatcher that can dispatch to a sub job, depending on conditions.
  * @param options
  */
-export function createDispatcher<
-  A extends JsonValue,
-  I extends JsonValue,
-  O extends JsonValue,
->(
+export function createDispatcher<A extends JsonValue, I extends JsonValue, O extends JsonValue>(
   options: Partial<Readwrite<JobDescription>> = {},
 ): JobDispatcher<A, I, O> {
   let defaultDelegate: JobName | null = null;
   const conditionalDelegateList: [(args: JsonValue) => boolean, JobName][] = [];
 
   const job: JobHandler<JsonValue, JsonValue, JsonValue> = Object.assign(
-      (argument: JsonValue, context: JobHandlerContext) => {
-        const maybeDelegate = conditionalDelegateList.find(([predicate]) => predicate(argument));
-        let delegate: Job<JsonValue, JsonValue, JsonValue> | null = null;
+    (argument: JsonValue, context: JobHandlerContext) => {
+      const maybeDelegate = conditionalDelegateList.find(([predicate]) => predicate(argument));
+      let delegate: Job<JsonValue, JsonValue, JsonValue> | null = null;
 
-        if (maybeDelegate) {
-          delegate = context.scheduler.schedule(maybeDelegate[1], argument);
-        } else if (defaultDelegate) {
-          delegate = context.scheduler.schedule(defaultDelegate, argument);
-        } else {
-          throw new JobDoesNotExistException('<null>');
-        }
+      if (maybeDelegate) {
+        delegate = context.scheduler.schedule(maybeDelegate[1], argument);
+      } else if (defaultDelegate) {
+        delegate = context.scheduler.schedule(defaultDelegate, argument);
+      } else {
+        throw new JobDoesNotExistException('<null>');
+      }
 
-        context.inboundBus.subscribe(delegate.inboundBus);
+      context.inboundBus.subscribe(delegate.inboundBus);
 
-        return delegate.outboundBus;
-      },
-      {
-        jobDescription: options,
-      },
+      return delegate.outboundBus;
+    },
+    {
+      jobDescription: options,
+    },
   );
 
-  return Object.assign(job, {
+  return (Object.assign(job, {
     setDefaultJob(name: JobName | null | JobHandler<JsonValue, JsonValue, JsonValue>) {
       if (isJobHandler(name)) {
         name = name.jobDescription.name === undefined ? null : name.jobDescription.name;
@@ -88,6 +73,6 @@ export function createDispatcher<
     addConditionalJob(predicate: (args: JsonValue) => boolean, name: JobName) {
       conditionalDelegateList.push([predicate, name]);
     },
-  // TODO: Remove return-only generic from createDispatcher() API.
-  }) as unknown as JobDispatcher<A, I, O>;
+    // TODO: Remove return-only generic from createDispatcher() API.
+  }) as unknown) as JobDispatcher<A, I, O>;
 }
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..86f121c791ec 100644
--- a/packages/angular_devkit/core/src/experimental/jobs/dispatcher_spec.ts
+++ b/packages/angular_devkit/core/src/experimental/jobs/dispatcher_spec.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 { JsonValue } from '../../json';
 import { JobHandler } from './api';
 import { createJobHandler } from './create-job-handler';
diff --git a/packages/angular_devkit/core/src/experimental/jobs/exception.ts b/packages/angular_devkit/core/src/experimental/jobs/exception.ts
index 0fcb761a978f..a439172917e7 100644
--- a/packages/angular_devkit/core/src/experimental/jobs/exception.ts
+++ b/packages/angular_devkit/core/src/experimental/jobs/exception.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 { BaseException } from '../../exception/index';
 import { JobName } from './api';
 
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..899912275e24 100644
--- a/packages/angular_devkit/core/src/experimental/jobs/fallback-registry.ts
+++ b/packages/angular_devkit/core/src/experimental/jobs/fallback-registry.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 { Observable, from } from 'rxjs';
 import { concatMap, first } from 'rxjs/operators';
 import { JsonValue } from '../../json';
-import {  JobHandler, JobName, Registry } from './api';
-
+import { JobHandler, JobName, Registry } from './api';
 
 /**
  * A simple job registry that keep a map of JobName => JobHandler internally.
@@ -17,13 +17,15 @@ import {  JobHandler, JobName, Registry } from './api';
 export class FallbackRegistry<
   MinimumArgumentValueT extends JsonValue = JsonValue,
   MinimumInputValueT extends JsonValue = JsonValue,
-  MinimumOutputValueT extends JsonValue = JsonValue,
+  MinimumOutputValueT extends JsonValue = JsonValue
 > implements Registry<MinimumArgumentValueT, MinimumInputValueT, MinimumOutputValueT> {
-  constructor(protected _fallbacks: Registry<
-    MinimumArgumentValueT,
-    MinimumInputValueT,
-    MinimumOutputValueT
-  >[] = []) {}
+  constructor(
+    protected _fallbacks: Registry<
+      MinimumArgumentValueT,
+      MinimumInputValueT,
+      MinimumOutputValueT
+    >[] = [],
+  ) {}
 
   addFallback(registry: Registry) {
     this._fallbacks.push(registry);
@@ -32,11 +34,11 @@ export class FallbackRegistry<
   get<
     A extends MinimumArgumentValueT = MinimumArgumentValueT,
     I extends MinimumInputValueT = MinimumInputValueT,
-    O extends MinimumOutputValueT = MinimumOutputValueT,
+    O extends MinimumOutputValueT = MinimumOutputValueT
   >(name: JobName): Observable<JobHandler<A, I, O> | null> {
     return from(this._fallbacks).pipe(
-      concatMap(fb => fb.get<A, I, O>(name)),
-      first(x => x !== null, null),
+      concatMap((fb) => fb.get<A, I, O>(name)),
+      first((x) => x !== null, null),
     );
   }
 }
diff --git a/packages/angular_devkit/core/src/experimental/jobs/index.ts b/packages/angular_devkit/core/src/experimental/jobs/index.ts
index 70210cb22e9f..521078d6d0de 100644
--- a/packages/angular_devkit/core/src/experimental/jobs/index.ts
+++ b/packages/angular_devkit/core/src/experimental/jobs/index.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
  */
+
 export * from './api';
 export * from './create-job-handler';
 export * from './exception';
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..b2f89a65c83f 100644
--- a/packages/angular_devkit/core/src/experimental/jobs/simple-registry.ts
+++ b/packages/angular_devkit/core/src/experimental/jobs/simple-registry.ts
@@ -1,19 +1,20 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+
 import { Observable, of } from 'rxjs';
 import { JsonValue, schema } from '../../json';
 import { JobDescription, JobHandler, JobName, Registry, isJobHandler } from './api';
 import { JobNameAlreadyRegisteredException } from './exception';
 
-
 /**
  * SimpleJobRegistry job registration options.
  */
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface RegisterJobOptions extends Partial<JobDescription> {}
 
 /**
@@ -22,7 +23,7 @@ export interface RegisterJobOptions extends Partial<JobDescription> {}
 export class SimpleJobRegistry<
   MinimumArgumentValueT extends JsonValue = JsonValue,
   MinimumInputValueT extends JsonValue = JsonValue,
-  MinimumOutputValueT extends JsonValue = JsonValue,
+  MinimumOutputValueT extends JsonValue = JsonValue
 > implements Registry<MinimumArgumentValueT, MinimumInputValueT, MinimumOutputValueT> {
   private _jobNames = new Map<
     JobName,
@@ -32,9 +33,9 @@ export class SimpleJobRegistry<
   get<
     A extends MinimumArgumentValueT = MinimumArgumentValueT,
     I extends MinimumInputValueT = MinimumInputValueT,
-    O extends MinimumOutputValueT = MinimumOutputValueT,
+    O extends MinimumOutputValueT = MinimumOutputValueT
   >(name: JobName): Observable<JobHandler<A, I, O> | null> {
-    return of(this._jobNames.get(name) as unknown as (JobHandler<A, I, O> | null) || null);
+    return of(((this._jobNames.get(name) as unknown) as JobHandler<A, I, O> | null) || null);
   }
 
   /**
@@ -47,12 +48,8 @@ export class SimpleJobRegistry<
   register<
     A extends MinimumArgumentValueT,
     I extends MinimumInputValueT,
-    O extends MinimumOutputValueT,
-  >(
-    name: JobName,
-    handler: JobHandler<A, I, O>,
-    options?: RegisterJobOptions,
-  ): void;
+    O extends MinimumOutputValueT
+  >(name: JobName, handler: JobHandler<A, I, O>, options?: RegisterJobOptions): void;
 
   /**
    * Register a job handler. The name must be unique.
@@ -99,7 +96,7 @@ export class SimpleJobRegistry<
   protected _register<
     ArgumentT extends JsonValue,
     InputT extends JsonValue,
-    OutputT extends JsonValue,
+    OutputT extends JsonValue
   >(
     name: JobName,
     handler: JobHandler<ArgumentT, InputT, OutputT>,
@@ -111,18 +108,9 @@ export class SimpleJobRegistry<
     }
 
     // Merge all fields with the ones in the handler (to make sure we respect the handler).
-    const argument = schema.mergeSchemas(
-      handler.jobDescription.argument,
-      options.argument,
-    );
-    const input = schema.mergeSchemas(
-      handler.jobDescription.input,
-      options.input,
-    );
-    const output = schema.mergeSchemas(
-      handler.jobDescription.output,
-      options.output,
-    );
+    const argument = schema.mergeSchemas(handler.jobDescription.argument, options.argument);
+    const input = schema.mergeSchemas(handler.jobDescription.input, options.input);
+    const output = schema.mergeSchemas(handler.jobDescription.output, options.output);
 
     // Create the job description.
     const jobDescription: JobDescription = {
@@ -132,8 +120,9 @@ export class SimpleJobRegistry<
       input,
     };
 
-    const jobHandler = Object.assign(handler.bind(undefined), { jobDescription }) as
-        unknown as JobHandler<MinimumArgumentValueT, MinimumInputValueT, MinimumOutputValueT>;
+    const jobHandler = (Object.assign(handler.bind(undefined), {
+      jobDescription,
+    }) as unknown) as JobHandler<MinimumArgumentValueT, MinimumInputValueT, MinimumOutputValueT>;
     this._jobNames.set(name, jobHandler);
   }
 
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..4729b5171a1d 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,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
  */
-// tslint:disable:no-big-function no-non-null-assertion
+
 import { createJobHandler } from './create-job-handler';
 import { SimpleJobRegistry } from './simple-registry';
 
@@ -18,7 +18,9 @@ describe('SimpleJobRegistry', () => {
 
   it('works for a simple case', async () => {
     registry.register(
-      'add', createJobHandler((arg: number[]) => arg.reduce((a, c) => a + c, 0)), {
+      'add',
+      createJobHandler((arg: number[]) => arg.reduce((a, c) => a + c, 0)),
+      {
         argument: { items: { type: 'number' } },
         output: { type: 'number' },
       },
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 5bff342f66ed..2c3e673d4d3c 100644
--- a/packages/angular_devkit/core/src/experimental/jobs/simple-scheduler.ts
+++ b/packages/angular_devkit/core/src/experimental/jobs/simple-scheduler.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 {
   EMPTY,
   MonoTypeOperatorFunction,
@@ -45,7 +46,6 @@ import {
 } from './api';
 import { JobDoesNotExistException } from './exception';
 
-
 export class JobArgumentSchemaValidationError extends schema.SchemaValidationException {
   constructor(errors?: schema.SchemaValidatorError[]) {
     super(errors, 'Job Argument failed to validate. Errors: ');
@@ -62,7 +62,6 @@ export class JobOutputSchemaValidationError extends schema.SchemaValidationExcep
   }
 }
 
-
 interface JobHandlerWithExtra extends JobHandler<JsonValue, JsonValue, JsonValue> {
   jobDescription: JobDescription;
 
@@ -71,7 +70,6 @@ interface JobHandlerWithExtra extends JobHandler<JsonValue, JsonValue, JsonValue
   inputV: Observable<schema.SchemaValidator>;
 }
 
-
 function _jobShare<T>(): MonoTypeOperatorFunction<T> {
   // This is the same code as a `shareReplay()` operator, but uses a dumber Subject rather than a
   // ReplaySubject.
@@ -82,7 +80,7 @@ function _jobShare<T>(): MonoTypeOperatorFunction<T> {
     let isComplete = false;
     let subscription: Subscription;
 
-    return new Observable<T>(subscriber => {
+    return new Observable<T>((subscriber) => {
       let innerSub: Subscription;
       refCount++;
       if (!subject) {
@@ -90,7 +88,9 @@ function _jobShare<T>(): MonoTypeOperatorFunction<T> {
 
         innerSub = subject.subscribe(subscriber);
         subscription = source.subscribe({
-          next(value) { subject.next(value); },
+          next(value) {
+            subject.next(value);
+          },
           error(err) {
             hasError = true;
             subject.error(err);
@@ -115,14 +115,13 @@ function _jobShare<T>(): MonoTypeOperatorFunction<T> {
   };
 }
 
-
 /**
  * Simple scheduler. Should be the base of all registries and schedulers.
  */
 export class SimpleScheduler<
   MinimumArgumentT extends JsonValue = JsonValue,
   MinimumInputT extends JsonValue = JsonValue,
-  MinimumOutputT extends JsonValue = JsonValue,
+  MinimumOutputT extends JsonValue = JsonValue
 > implements Scheduler<MinimumArgumentT, MinimumInputT, MinimumOutputT> {
   private _internalJobDescriptionMap = new Map<JobName, JobHandlerWithExtra>();
   private _queue: (() => void)[] = [];
@@ -142,7 +141,7 @@ export class SimpleScheduler<
     const handler = this._jobRegistry.get<MinimumArgumentT, MinimumInputT, MinimumOutputT>(name);
 
     return handler.pipe(
-      switchMap(handler => {
+      switchMap((handler) => {
         if (handler === null) {
           return of(null);
         }
@@ -178,11 +177,9 @@ export class SimpleScheduler<
    */
   getDescription(name: JobName) {
     return concat(
-      this._getInternalDescription(name).pipe(map(x => x && x.jobDescription)),
+      this._getInternalDescription(name).pipe(map((x) => x && x.jobDescription)),
       of(null),
-    ).pipe(
-      first(),
-    );
+    ).pipe(first());
   }
 
   /**
@@ -191,9 +188,7 @@ export class SimpleScheduler<
    * @returns True if the job exists, false otherwise.
    */
   has(name: JobName) {
-    return this.getDescription(name).pipe(
-      map(x => x !== null),
-    );
+    return this.getDescription(name).pipe(map((x) => x !== null));
   }
 
   /**
@@ -215,7 +210,7 @@ export class SimpleScheduler<
           // Resume the queue.
           const q = this._queue;
           this._queue = [];
-          q.forEach(fn => fn());
+          q.forEach((fn) => fn());
         }
       }
     };
@@ -305,101 +300,107 @@ export class SimpleScheduler<
 
     // Create the input channel by having a filter.
     const input = new Subject<JsonValue>();
-    input.pipe(
-      concatMap(message => handler.pipe(
-        switchMap(handler => {
-          if (handler === null) {
-            throw new JobDoesNotExistException(name);
-          } else {
-            return handler.inputV.pipe(
-              switchMap(validate => validate(message)),
-            );
-          }
-        }),
-      )),
-      filter(result => result.success),
-      map(result => result.data as I),
-    ).subscribe(
-      value => inboundBus.next({ kind: JobInboundMessageKind.Input, value }),
-    );
+    input
+      .pipe(
+        concatMap((message) =>
+          handler.pipe(
+            switchMap((handler) => {
+              if (handler === null) {
+                throw new JobDoesNotExistException(name);
+              } else {
+                return handler.inputV.pipe(switchMap((validate) => validate(message)));
+              }
+            }),
+          ),
+        ),
+        filter((result) => result.success),
+        map((result) => result.data as I),
+      )
+      .subscribe((value) => inboundBus.next({ kind: JobInboundMessageKind.Input, value }));
 
     outboundBus = concat(
       outboundBus,
       // Add an End message at completion. This will be filtered out if the job actually send an
       // End.
-      handler.pipe(switchMap(handler => {
-        if (handler) {
-          return of<JobOutboundMessage<O>>({
-            kind: JobOutboundMessageKind.End, description: handler.jobDescription,
-          });
-        } else {
-          return EMPTY as Observable<JobOutboundMessage<O>>;
-        }
-      })),
+      handler.pipe(
+        switchMap((handler) => {
+          if (handler) {
+            return of<JobOutboundMessage<O>>({
+              kind: JobOutboundMessageKind.End,
+              description: handler.jobDescription,
+            });
+          } else {
+            return EMPTY as Observable<JobOutboundMessage<O>>;
+          }
+        }),
+      ),
     ).pipe(
-      filter(message => this._filterJobOutboundMessages(message, state)),
+      filter((message) => this._filterJobOutboundMessages(message, state)),
       // Update internal logic and Job<> members.
-      tap(message => {
-        // Update the state.
-        state = this._updateState(message, state);
-
-        switch (message.kind) {
-          case JobOutboundMessageKind.ChannelCreate: {
-            const maybeSubject = channelsSubject.get(message.name);
-            // If it doesn't exist or it's closed on the other end.
-            if (!maybeSubject) {
-              const s = new Subject<JsonValue>();
-              channelsSubject.set(message.name, s);
-              channels.set(message.name, s.asObservable());
+      tap(
+        (message) => {
+          // Update the state.
+          state = this._updateState(message, state);
+
+          switch (message.kind) {
+            case JobOutboundMessageKind.ChannelCreate: {
+              const maybeSubject = channelsSubject.get(message.name);
+              // If it doesn't exist or it's closed on the other end.
+              if (!maybeSubject) {
+                const s = new Subject<JsonValue>();
+                channelsSubject.set(message.name, s);
+                channels.set(message.name, s.asObservable());
+              }
+              break;
             }
-            break;
-          }
 
-          case JobOutboundMessageKind.ChannelMessage: {
-            const maybeSubject = channelsSubject.get(message.name);
-            if (maybeSubject) {
-              maybeSubject.next(message.message);
+            case JobOutboundMessageKind.ChannelMessage: {
+              const maybeSubject = channelsSubject.get(message.name);
+              if (maybeSubject) {
+                maybeSubject.next(message.message);
+              }
+              break;
             }
-            break;
-          }
 
-          case JobOutboundMessageKind.ChannelComplete: {
-            const maybeSubject = channelsSubject.get(message.name);
-            if (maybeSubject) {
-              maybeSubject.complete();
-              channelsSubject.delete(message.name);
+            case JobOutboundMessageKind.ChannelComplete: {
+              const maybeSubject = channelsSubject.get(message.name);
+              if (maybeSubject) {
+                maybeSubject.complete();
+                channelsSubject.delete(message.name);
+              }
+              break;
             }
-            break;
-          }
 
-          case JobOutboundMessageKind.ChannelError: {
-            const maybeSubject = channelsSubject.get(message.name);
-            if (maybeSubject) {
-              maybeSubject.error(message.error);
-              channelsSubject.delete(message.name);
+            case JobOutboundMessageKind.ChannelError: {
+              const maybeSubject = channelsSubject.get(message.name);
+              if (maybeSubject) {
+                maybeSubject.error(message.error);
+                channelsSubject.delete(message.name);
+              }
+              break;
             }
-            break;
           }
-        }
-      }, () => {
-        state = JobState.Errored;
-      }),
+        },
+        () => {
+          state = JobState.Errored;
+        },
+      ),
 
       // Do output validation (might include default values so this might have side
       // effects). We keep all messages in order.
-      concatMap(message => {
+      concatMap((message) => {
         if (message.kind !== JobOutboundMessageKind.Output) {
           return of(message);
         }
 
         return handler.pipe(
-          switchMap(handler => {
+          switchMap((handler) => {
             if (handler === null) {
               throw new JobDoesNotExistException(name);
             } else {
               return handler.outputV.pipe(
-                switchMap(validate => validate(message.value)),
-                switchMap(output => {
+                switchMap((validate) => validate(message.value)),
+                switchMap((output) => {
                   if (!output.success) {
                     throw new JobOutputSchemaValidationError(output.errors);
                   }
@@ -418,17 +419,19 @@ export class SimpleScheduler<
     );
 
     const output = outboundBus.pipe(
-      filter(x => x.kind == JobOutboundMessageKind.Output),
+      filter((x) => x.kind == JobOutboundMessageKind.Output),
       map((x) => (x as JobOutboundMessageOutput<O>).value),
       shareReplay(1),
     );
 
     // Return the Job.
     return {
-      get state() { return state; },
+      get state() {
+        return state;
+      },
       argument,
       description: handler.pipe(
-        switchMap(handler => {
+        switchMap((handler) => {
           if (handler === null) {
             throw new JobDoesNotExistException(name);
           } else {
@@ -444,7 +447,7 @@ export class SimpleScheduler<
         let maybeObservable = channels.get(name);
         if (!maybeObservable) {
           const s = new Subject<T>();
-          channelsSubject.set(name, s as unknown as Subject<JsonValue>);
+          channelsSubject.set(name, (s as unknown) as Subject<JsonValue>);
           channels.set(name, s.asObservable());
 
           maybeObservable = s.asObservable();
@@ -452,15 +455,13 @@ export class SimpleScheduler<
 
         return maybeObservable.pipe(
           // Keep the order of messages.
-          concatMap(
-            message => {
-              return schemaRegistry.compile(schema).pipe(
-                switchMap(validate => validate(message)),
-                filter(x => x.success),
-                map(x => x.data as T),
-              );
-            },
-          ),
+          concatMap((message) => {
+            return schemaRegistry.compile(schema).pipe(
+              switchMap((validate) => validate(message)),
+              filter((x) => x.success),
+              map((x) => x.data as T),
+            );
+          }),
         );
       },
       ping() {
@@ -468,7 +469,7 @@ export class SimpleScheduler<
         inboundBus.next({ kind: JobInboundMessageKind.Ping, id });
 
         return outboundBus.pipe(
-          filter(x => x.kind === JobOutboundMessageKind.Pong && x.id == id),
+          filter((x) => x.kind === JobOutboundMessageKind.Pong && x.id == id),
           first(),
           ignoreElements(),
         );
@@ -485,7 +486,7 @@ export class SimpleScheduler<
   protected _scheduleJob<
     A extends MinimumArgumentT,
     I extends MinimumInputT,
-    O extends MinimumOutputT,
+    O extends MinimumOutputT
   >(
     name: JobName,
     argument: A,
@@ -502,41 +503,45 @@ export class SimpleScheduler<
     const outboundBus = concat(
       // Wait for dependencies, make sure to not report messages from dependencies. Subscribe to
       // all dependencies at the same time so they run concurrently.
-      merge(...dependencies.map(x => x.outboundBus)).pipe(ignoreElements()),
+      merge(...dependencies.map((x) => x.outboundBus)).pipe(ignoreElements()),
 
       // Wait for pause() to clear (if necessary).
       waitable,
 
       from(handler).pipe(
-        switchMap(handler => new Observable<JobOutboundMessage<O>>(
-                      (subscriber: Observer<JobOutboundMessage<O>>) => {
-          if (!handler) {
-            throw new JobDoesNotExistException(name);
-          }
-
-          // Validate the argument.
-          return handler.argumentV.pipe(
-            switchMap(validate => validate(argument)),
-            switchMap(output => {
-              if (!output.success) {
-                throw new JobArgumentSchemaValidationError(output.errors);
+        switchMap(
+          (handler) =>
+            new Observable<JobOutboundMessage<O>>((subscriber: Observer<JobOutboundMessage<O>>) => {
+              if (!handler) {
+                throw new JobDoesNotExistException(name);
               }
 
-              const argument: A = output.data as A;
-              const description = handler.jobDescription;
-              subscriber.next({ kind: JobOutboundMessageKind.OnReady, description });
-
-              const context = {
-                description,
-                dependencies: [...dependencies],
-                inboundBus: inboundBus.asObservable(),
-                scheduler: this as Scheduler<MinimumArgumentT, MinimumInputT, MinimumOutputT>,
-              };
-
-              return handler(argument, context);
+              // Validate the argument.
+              return handler.argumentV
+                .pipe(
+                  switchMap((validate) => validate(argument)),
+                  switchMap((output) => {
+                    if (!output.success) {
+                      throw new JobArgumentSchemaValidationError(output.errors);
+                    }
+
+                    const argument: A = output.data as A;
+                    const description = handler.jobDescription;
+                    subscriber.next({ kind: JobOutboundMessageKind.OnReady, description });
+
+                    const context = {
+                      description,
+                      dependencies: [...dependencies],
+                      inboundBus: inboundBus.asObservable(),
+                      scheduler: this as Scheduler<MinimumArgumentT, MinimumInputT, MinimumOutputT>,
+                    };
+
+                    return handler(argument, context);
+                  }),
+                )
+                .subscribe(subscriber as Observer<JobOutboundMessage<JsonValue>>);
             }),
-          ).subscribe(subscriber as Observer<JobOutboundMessage<JsonValue>>);
-        })),
+        ),
       ),
     );
 
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 7c174d8f93ff..4973f96531eb 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,11 +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
  */
-// tslint:disable:no-big-function no-non-null-assertion
+
+/* eslint-disable @typescript-eslint/no-non-null-assertion */
 import { EMPTY, Observable, of, timer } from 'rxjs';
 import { map, take, toArray } from 'rxjs/operators';
 import { promisify } from 'util';
@@ -27,13 +28,15 @@ describe('SimpleScheduler', () => {
 
   it('works for a simple case', async () => {
     registry.register(
-      'add', createJobHandler((arg: number[]) => arg.reduce((a, c) => a + c, 0)), {
+      'add',
+      createJobHandler((arg: number[]) => arg.reduce((a, c) => a + c, 0)),
+      {
         argument: { items: { type: 'number' } },
         output: { type: 'number' },
       },
     );
 
-    const sum = await (scheduler.schedule('add', [1, 2, 3, 4])).output.toPromise();
+    const sum = await scheduler.schedule('add', [1, 2, 3, 4]).output.toPromise();
     expect(sum).toBe(10);
   });
 
@@ -46,8 +49,8 @@ describe('SimpleScheduler', () => {
       createJobHandler((argument: number[]) => {
         started++;
 
-        return new Promise<number>(
-          resolve => setTimeout(() => {
+        return new Promise<number>((resolve) =>
+          setTimeout(() => {
             finished++;
             resolve(argument.reduce((a, c) => a + c, 0));
           }, 10),
@@ -82,34 +85,38 @@ describe('SimpleScheduler', () => {
 
   it('validates arguments', async () => {
     registry.register(
-      'add', createJobHandler((arg: number[]) => arg.reduce((a, c) => a + c, 0)), {
+      'add',
+      createJobHandler((arg: number[]) => arg.reduce((a, c) => a + c, 0)),
+      {
         argument: { items: { type: 'number' } },
         output: { type: 'number' },
       },
     );
 
-    await (scheduler.schedule('add', [1, 2, 3, 4])).output.toPromise();
+    await scheduler.schedule('add', [1, 2, 3, 4]).output.toPromise();
     try {
-      await (scheduler.schedule('add', ['1', 2, 3, 4])).output.toPromise();
+      await scheduler.schedule('add', ['1', 2, 3, 4]).output.toPromise();
       expect(true).toBe(false);
     } catch (e) {
       // TODO: enable this when https://github.com/bazelbuild/rules_typescript/commit/37807e2c4
       // is released, otherwise this breaks because bazel downgrade to ES5 which does not support
       // extending Error.
       // expect(e instanceof JobInboundMessageSchemaValidationError).toBe(true);
-      expect(e.message).toMatch(/"\[0\]".*number/);
+      expect(e.message).toMatch(/"\/0" must be number/);
     }
   });
 
   it('validates outputs', async () => {
     registry.register(
-      'add', createJobHandler(() => 'hello world'), {
+      'add',
+      createJobHandler(() => 'hello world'),
+      {
         output: { type: 'number' },
       },
     );
 
     try {
-      await (scheduler.schedule('add', [1, 2, 3, 4])).output.toPromise();
+      await scheduler.schedule('add', [1, 2, 3, 4]).output.toPromise();
       expect(true).toBe(false);
     } catch (e) {
       // TODO: enable this when https://github.com/bazelbuild/rules_typescript/commit/37807e2c4
@@ -126,10 +133,12 @@ describe('SimpleScheduler', () => {
     registry.register(
       'job',
       createJobHandler<number, number, number>((argument) => {
-        return new Promise(resolve => setImmediate(() => {
-          done.push(argument);
-          resolve(argument);
-        }));
+        return new Promise((resolve) =>
+          setImmediate(() => {
+            done.push(argument);
+            resolve(argument);
+          }),
+        );
       }),
       { argument: true, output: true },
     );
@@ -191,10 +200,12 @@ describe('SimpleScheduler', () => {
       createJobHandler<number, number, number>((argument: number) => {
         started.push(argument);
 
-        return new Promise(resolve => setTimeout(() => {
-          done.push(argument);
-          resolve(argument);
-        }, 10));
+        return new Promise((resolve) =>
+          setTimeout(() => {
+            done.push(argument);
+            resolve(argument);
+          }, 10),
+        );
       }),
       { argument: true, output: true },
     );
@@ -258,30 +269,30 @@ describe('SimpleScheduler', () => {
 
     // Run the job once. Wait for it to finish. We should have a `resume()` and the scheduler will
     // be paused.
-    const p0 = (scheduler.schedule('job', 0)).output.toPromise();
+    const p0 = scheduler.schedule('job', 0).output.toPromise();
     expect(await p0).toBe(0);
 
     // This will wait.
-    const p1 = (scheduler.schedule('job', 1)).output.toPromise();
+    const p1 = scheduler.schedule('job', 1).output.toPromise();
     await Promise.resolve();
 
     expect(resume).not.toBeNull();
-    resume !();
+    resume!();
     resume = null;
 
     // Running p1.
     expect(await p1).toBe(1);
     expect(resume).not.toBeNull();
 
-    const p2 = (scheduler.schedule('job', 2)).output.toPromise();
+    const p2 = scheduler.schedule('job', 2).output.toPromise();
 
     await Promise.resolve();
-    resume !();
+    resume!();
     resume = null;
     expect(await p2).toBe(2);
     expect(resume).not.toBeNull();
 
-    resume !();
+    resume!();
     // Should not error since all jobs have run.
     await Promise.resolve();
   });
@@ -294,16 +305,15 @@ describe('SimpleScheduler', () => {
       createJobHandler((argument: number) => {
         done.push(argument);
 
-        return Promise.resolve()
-          .then(() => argument);
+        return Promise.resolve().then(() => argument);
       }),
     );
 
     // Pause manually.
     const resume = scheduler.pause();
-    const p10 = (scheduler.schedule('jobA', 10)).output.toPromise();
-    const p11 = (scheduler.schedule('jobA', 11)).output.toPromise();
-    const p12 = (scheduler.schedule('jobA', 12)).output.toPromise();
+    const p10 = scheduler.schedule('jobA', 10).output.toPromise();
+    const p11 = scheduler.schedule('jobA', 11).output.toPromise();
+    const p12 = scheduler.schedule('jobA', 12).output.toPromise();
     await flush();
 
     expect(done).toEqual([]);
@@ -324,16 +334,16 @@ describe('SimpleScheduler', () => {
     registry.register(
       'job',
       createJobHandler((argument: number) => {
-        return new Observable<number>(observer => {
+        return new Observable<number>((observer) => {
           function fn() {
             if (keepGoing) {
-              const p = new Promise<void>(r => resolves.push(r));
+              const p = new Promise<void>((r) => resolves.push(r));
 
               observer.next(argument);
               done.push(argument);
               argument++;
 
-              // tslint:disable-next-line:no-floating-promises
+              // eslint-disable-next-line @typescript-eslint/no-floating-promises
               p.then(fn);
             } else {
               done.push(-1);
@@ -351,22 +361,22 @@ describe('SimpleScheduler', () => {
     );
 
     const job = scheduler.schedule('job', 0);
-    await new Promise(r => setTimeout(r, 10));
+    await new Promise((r) => setTimeout(r, 10));
     expect(job.state).toBe(JobState.Queued);
     const subscription = job.output.subscribe();
 
-    await new Promise(r => setTimeout(r, 10));
+    await new Promise((r) => setTimeout(r, 10));
     expect(job.state).toBe(JobState.Started);
     expect(done).toEqual([0]);
     expect(resolves.length).toBe(1);
     resolves[0]();
 
-    await new Promise(r => setTimeout(r, 10));
+    await new Promise((r) => setTimeout(r, 10));
     expect(done).toEqual([0, 1]);
     expect(resolves.length).toBe(2);
     resolves[1]();
 
-    await new Promise(r => setTimeout(r, 10));
+    await new Promise((r) => setTimeout(r, 10));
     expect(done).toEqual([0, 1, 2]);
     expect(resolves.length).toBe(3);
     subscription.unsubscribe();
@@ -380,46 +390,66 @@ describe('SimpleScheduler', () => {
   });
 
   it('sequences raw outputs properly for all use cases', async () => {
-    registry.register('job-sync', createJobHandler<number, number, number>(arg => arg + 1));
-    registry.register('job-promise', createJobHandler<number, number, number>(arg => {
-      return Promise.resolve(arg + 1);
-    }));
-    registry.register('job-obs-sync', createJobHandler<number, number, number>(arg => of(arg + 1)));
-    registry.register('job-obs-async', createJobHandler<number, number, number>(arg => {
-      return timer(1).pipe(
-        take(3),
-        take(1),
-        map(() => arg + 1),
-      );
-    }));
+    registry.register(
+      'job-sync',
+      createJobHandler<number, number, number>((arg) => arg + 1),
+    );
+    registry.register(
+      'job-promise',
+      createJobHandler<number, number, number>((arg) => {
+        return Promise.resolve(arg + 1);
+      }),
+    );
+    registry.register(
+      'job-obs-sync',
+      createJobHandler<number, number, number>((arg) => of(arg + 1)),
+    );
+    registry.register(
+      'job-obs-async',
+      createJobHandler<number, number, number>((arg) => {
+        return timer(1).pipe(
+          take(3),
+          take(1),
+          map(() => arg + 1),
+        );
+      }),
+    );
 
     const job1 = scheduler.schedule('job-sync', 100);
-    const job1OutboundBus = await job1.outboundBus.pipe(
-      // Descriptions are going to differ, so get rid of those.
-      map(x => ({ ...x, description: null })),
-      toArray(),
-    ).toPromise();
+    const job1OutboundBus = await job1.outboundBus
+      .pipe(
+        // Descriptions are going to differ, so get rid of those.
+        map((x) => ({ ...x, description: null })),
+        toArray(),
+      )
+      .toPromise();
 
     const job2 = scheduler.schedule('job-promise', 100);
-    const job2OutboundBus = await job2.outboundBus.pipe(
-      // Descriptions are going to differ, so get rid of those.
-      map(x => ({ ...x, description: null })),
-      toArray(),
-    ).toPromise();
+    const job2OutboundBus = await job2.outboundBus
+      .pipe(
+        // Descriptions are going to differ, so get rid of those.
+        map((x) => ({ ...x, description: null })),
+        toArray(),
+      )
+      .toPromise();
 
     const job3 = scheduler.schedule('job-obs-sync', 100);
-    const job3OutboundBus = await job3.outboundBus.pipe(
-      // Descriptions are going to differ, so get rid of those.
-      map(x => ({ ...x, description: null })),
-      toArray(),
-    ).toPromise();
+    const job3OutboundBus = await job3.outboundBus
+      .pipe(
+        // Descriptions are going to differ, so get rid of those.
+        map((x) => ({ ...x, description: null })),
+        toArray(),
+      )
+      .toPromise();
 
     const job4 = scheduler.schedule('job-obs-async', 100);
-    const job4OutboundBus = await job4.outboundBus.pipe(
-      // Descriptions are going to differ, so get rid of those.
-      map(x => ({ ...x, description: null })),
-      toArray(),
-    ).toPromise();
+    const job4OutboundBus = await job4.outboundBus
+      .pipe(
+        // Descriptions are going to differ, so get rid of those.
+        map((x) => ({ ...x, description: null })),
+        toArray(),
+      )
+      .toPromise();
 
     // The should all report the same stuff.
     expect(job1OutboundBus).toEqual(job4OutboundBus);
@@ -443,7 +473,7 @@ describe('SimpleScheduler', () => {
       const job = scheduler.schedule('job', 0);
       let sideValue = '';
       const c = job.getChannel('any') as Observable<string>;
-      c.subscribe(x => sideValue = x);
+      c.subscribe((x) => (sideValue = x));
 
       expect(await job.output.toPromise()).toBe(0);
       expect(sideValue).toBe('hello world');
@@ -458,7 +488,8 @@ describe('SimpleScheduler', () => {
           channel.complete();
 
           return 0;
-        }), {
+        }),
+        {
           argument: true,
           output: true,
         },
@@ -470,7 +501,7 @@ describe('SimpleScheduler', () => {
       expect(c).toBeDefined(null);
 
       if (c) {
-        c.subscribe(x => sideValue = x);
+        c.subscribe((x) => (sideValue = x));
       }
 
       expect(await job.output.toPromise()).toBe(0);
@@ -481,7 +512,7 @@ describe('SimpleScheduler', () => {
   describe('lifecycle messages', () => {
     it('sequences double start once', async () => {
       const fn = (_: never, { description }: JobHandlerContext) => {
-        return new Observable<JobOutboundMessage<never>>(observer => {
+        return new Observable<JobOutboundMessage<never>>((observer) => {
           observer.next({ kind: JobOutboundMessageKind.Start, description });
           observer.next({ kind: JobOutboundMessageKind.Start, description });
           observer.next({ kind: JobOutboundMessageKind.End, description });
@@ -490,11 +521,9 @@ describe('SimpleScheduler', () => {
       };
 
       registry.register('job', Object.assign(fn, { jobDescription: {} }));
-      const allOutput = await scheduler.schedule('job', 0).outboundBus.pipe(
-        toArray(),
-      ).toPromise();
+      const allOutput = await scheduler.schedule('job', 0).outboundBus.pipe(toArray()).toPromise();
 
-      expect(allOutput.map(x => ({ ...x, description: null }))).toEqual([
+      expect(allOutput.map((x) => ({ ...x, description: null }))).toEqual([
         { kind: JobOutboundMessageKind.OnReady, description: null },
         { kind: JobOutboundMessageKind.Start, description: null },
         { kind: JobOutboundMessageKind.End, description: null },
@@ -505,11 +534,9 @@ describe('SimpleScheduler', () => {
       const fn = () => EMPTY;
 
       registry.register('job', Object.assign(fn, { jobDescription: {} }));
-      const allOutput = await scheduler.schedule('job', 0).outboundBus.pipe(
-        toArray(),
-      ).toPromise();
+      const allOutput = await scheduler.schedule('job', 0).outboundBus.pipe(toArray()).toPromise();
 
-      expect(allOutput.map(x => ({ ...x, description: null }))).toEqual([
+      expect(allOutput.map((x) => ({ ...x, description: null }))).toEqual([
         { kind: JobOutboundMessageKind.OnReady, description: null },
         { kind: JobOutboundMessageKind.End, description: null },
       ]);
@@ -517,7 +544,7 @@ describe('SimpleScheduler', () => {
 
     it('only one End', async () => {
       const fn = (_: never, { description }: JobHandlerContext) => {
-        return new Observable<JobOutboundMessage<never>>(observer => {
+        return new Observable<JobOutboundMessage<never>>((observer) => {
           observer.next({ kind: JobOutboundMessageKind.End, description });
           observer.next({ kind: JobOutboundMessageKind.End, description });
           observer.complete();
@@ -525,11 +552,9 @@ describe('SimpleScheduler', () => {
       };
 
       registry.register('job', Object.assign(fn, { jobDescription: {} }));
-      const allOutput = await scheduler.schedule('job', 0).outboundBus.pipe(
-        toArray(),
-      ).toPromise();
+      const allOutput = await scheduler.schedule('job', 0).outboundBus.pipe(toArray()).toPromise();
 
-      expect(allOutput.map(x => ({ ...x, description: null }))).toEqual([
+      expect(allOutput.map((x) => ({ ...x, description: null }))).toEqual([
         { kind: JobOutboundMessageKind.OnReady, description: null },
         { kind: JobOutboundMessageKind.End, description: null },
       ]);
@@ -541,8 +566,8 @@ describe('SimpleScheduler', () => {
       registry.register(
         'job',
         createJobHandler<number, number, number>((argument, context) => {
-          return new Observable<number>(subscriber => {
-            context.input.subscribe(x => {
+          return new Observable<number>((subscriber) => {
+            context.input.subscribe((x) => {
               if (x === null) {
                 subscriber.complete();
               } else {
@@ -556,7 +581,7 @@ describe('SimpleScheduler', () => {
       const job = scheduler.schedule('job', 100);
       const outputs: number[] = [];
 
-      job.output.subscribe(x => outputs.push(x as number));
+      job.output.subscribe((x) => outputs.push(x as number));
 
       job.input.next(1);
       job.input.next('2');
@@ -568,26 +593,29 @@ describe('SimpleScheduler', () => {
     });
 
     it('validates', async () => {
-      const handler = createJobHandler<number, number, number>((argument, context) => {
-        return new Observable<number>(subscriber => {
-          context.input.subscribe(x => {
-            if (x === null) {
-              subscriber.complete();
-            } else {
-              subscriber.next(parseInt('' + x) + argument);
-            }
+      const handler = createJobHandler<number, number, number>(
+        (argument, context) => {
+          return new Observable<number>((subscriber) => {
+            context.input.subscribe((x) => {
+              if (x === null) {
+                subscriber.complete();
+              } else {
+                subscriber.next(parseInt('' + x) + argument);
+              }
+            });
           });
-        });
-      }, {
-        input: { anyOf: [{ type: 'number' }, { type: 'null' }] },
-      });
+        },
+        {
+          input: { anyOf: [{ type: 'number' }, { type: 'null' }] },
+        },
+      );
 
       registry.register('job', handler);
 
       const job = scheduler.schedule('job', 100);
       const outputs: number[] = [];
 
-      job.output.subscribe(x => outputs.push(x as number));
+      job.output.subscribe((x) => outputs.push(x as number));
 
       job.input.next(1);
       job.input.next('2');
@@ -603,8 +631,8 @@ describe('SimpleScheduler', () => {
       registry.register(
         'job',
         createJobHandler<number, number, number>((argument, context) => {
-          return new Observable<number>(subscriber => {
-            context.input.subscribe(x => {
+          return new Observable<number>((subscriber) => {
+            context.input.subscribe((x) => {
               if (x === null) {
                 setTimeout(() => subscriber.complete(), 10);
               } else {
@@ -618,7 +646,7 @@ describe('SimpleScheduler', () => {
       const job = scheduler.schedule('job', 100);
       const outputs: number[] = [];
 
-      job.output.subscribe(x => outputs.push(x as number));
+      job.output.subscribe((x) => outputs.push(x as number));
 
       job.input.next(1);
       job.input.next(2);
@@ -631,7 +659,13 @@ describe('SimpleScheduler', () => {
   });
 
   it('propagates errors', async () => {
-    registry.register('job', createJobHandler(() => { throw 1; }));
+    registry.register(
+      'job',
+      createJobHandler(() => {
+        // eslint-disable-next-line no-throw-literal
+        throw 1;
+      }),
+    );
     const job = scheduler.schedule('job', 0);
 
     try {
diff --git a/packages/angular_devkit/core/src/experimental/jobs/strategy.ts b/packages/angular_devkit/core/src/experimental/jobs/strategy.ts
index aa538dcfb8b7..4cef95165fc6 100644
--- a/packages/angular_devkit/core/src/experimental/jobs/strategy.ts
+++ b/packages/angular_devkit/core/src/experimental/jobs/strategy.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 { Observable, Subject, concat, of } from 'rxjs';
 import { finalize, ignoreElements, share, shareReplay, tap } from 'rxjs/operators';
 import { JsonValue } from '../../json';
@@ -17,14 +18,14 @@ import {
   JobOutboundMessageKind,
 } from './api';
 
-import stableStringify = require('fast-json-stable-stringify');
+const stableStringify = require('fast-json-stable-stringify');
 
+// eslint-disable-next-line @typescript-eslint/no-namespace
 export namespace strategy {
-
   export type JobStrategy<
     A extends JsonValue = JsonValue,
     I extends JsonValue = JsonValue,
-    O extends JsonValue = JsonValue,
+    O extends JsonValue = JsonValue
   > = (
     handler: JobHandler<A, I, O>,
     options?: Partial<Readonly<JobDescription>>,
@@ -36,7 +37,7 @@ export namespace strategy {
   export function serialize<
     A extends JsonValue = JsonValue,
     I extends JsonValue = JsonValue,
-    O extends JsonValue = JsonValue,
+    O extends JsonValue = JsonValue
   >(): JobStrategy<A, I, O> {
     let latest: Observable<JobOutboundMessage<O>> = of();
 
@@ -45,10 +46,8 @@ export namespace strategy {
         const previous = latest;
         latest = concat(
           previous.pipe(ignoreElements()),
-          new Observable<JobOutboundMessage<O>>(o => handler(argument, context).subscribe(o)),
-        ).pipe(
-          shareReplay(0),
-        );
+          new Observable<JobOutboundMessage<O>>((o) => handler(argument, context).subscribe(o)),
+        ).pipe(shareReplay(0));
 
         return latest;
       };
@@ -59,7 +58,6 @@ export namespace strategy {
     };
   }
 
-
   /**
    * Creates a JobStrategy that will always reuse a running job, and restart it if the job ended.
    * @param replayMessages Replay ALL messages if a job is reused, otherwise just hook up where it
@@ -68,7 +66,7 @@ export namespace strategy {
   export function reuse<
     A extends JsonValue = JsonValue,
     I extends JsonValue = JsonValue,
-    O extends JsonValue = JsonValue,
+    O extends JsonValue = JsonValue
   >(replayMessages = false): JobStrategy<A, I, O> {
     let inboundBus = new Subject<JobInboundMessage<I>>();
     let run: Observable<JobOutboundMessage<O>> | null = null;
@@ -84,17 +82,17 @@ export namespace strategy {
             // Update state.
             of(state),
             run,
-          ).pipe(
-            finalize(() => subscription.unsubscribe()),
-          );
+          ).pipe(finalize(() => subscription.unsubscribe()));
         }
 
         run = handler(argument, { ...context, inboundBus: inboundBus.asObservable() }).pipe(
           tap(
-            message => {
-              if (message.kind == JobOutboundMessageKind.Start
-                  || message.kind == JobOutboundMessageKind.OnReady
-                  || message.kind == JobOutboundMessageKind.End) {
+            (message) => {
+              if (
+                message.kind == JobOutboundMessageKind.Start ||
+                message.kind == JobOutboundMessageKind.OnReady ||
+                message.kind == JobOutboundMessageKind.End
+              ) {
                 state = message;
               }
             },
@@ -115,7 +113,6 @@ export namespace strategy {
     };
   }
 
-
   /**
    * Creates a JobStrategy that will reuse a running job if the argument matches.
    * @param replayMessages Replay ALL messages if a job is reused, otherwise just hook up where it
@@ -124,7 +121,7 @@ export namespace strategy {
   export function memoize<
     A extends JsonValue = JsonValue,
     I extends JsonValue = JsonValue,
-    O extends JsonValue = JsonValue,
+    O extends JsonValue = JsonValue
   >(replayMessages = false): JobStrategy<A, I, O> {
     const runs = new Map<string, Observable<JobOutboundMessage<O>>>();
 
@@ -137,9 +134,7 @@ export namespace strategy {
           return maybeJob;
         }
 
-        const run = handler(argument, context).pipe(
-          replayMessages ? shareReplay() : share(),
-        );
+        const run = handler(argument, context).pipe(replayMessages ? shareReplay() : share());
         runs.set(argumentJson, run);
 
         return run;
@@ -148,5 +143,4 @@ export namespace strategy {
       return Object.assign(newHandler, handler, options || {});
     };
   }
-
 }
diff --git a/packages/angular_devkit/core/src/experimental/jobs/strategy_spec.ts b/packages/angular_devkit/core/src/experimental/jobs/strategy_spec.ts
index dba165d4be5e..5a43be5b5de9 100644
--- a/packages/angular_devkit/core/src/experimental/jobs/strategy_spec.ts
+++ b/packages/angular_devkit/core/src/experimental/jobs/strategy_spec.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 { promisify } from 'util';
 import { JobState } from './api';
 import { createJobHandler } from './create-job-handler';
@@ -27,21 +28,26 @@ describe('strategy.serialize()', () => {
     let started = 0;
     let finished = 0;
 
-    registry.register(strategy.serialize()(createJobHandler((input: number[]) => {
-      started++;
-
-      return new Promise<number>(
-        resolve => setTimeout(() => {
-          finished++;
-          resolve(input.reduce((a, c) => a + c, 0));
-        }, 10),
-      );
-      // tslint:disable-next-line:no-any
-    }) as any), {
-      argument: { items: { type: 'number' } },
-      output: { type: 'number' },
-      name: 'add',
-    });
+    registry.register(
+      strategy.serialize()(
+        createJobHandler((input: number[]) => {
+          started++;
+
+          return new Promise<number>((resolve) =>
+            setTimeout(() => {
+              finished++;
+              resolve(input.reduce((a, c) => a + c, 0));
+            }, 10),
+          );
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        }) as any,
+      ),
+      {
+        argument: { items: { type: 'number' } },
+        output: { type: 'number' },
+        name: 'add',
+      },
+    );
 
     const job1 = scheduler.schedule('add', [1, 2, 3, 4]);
     const job2 = scheduler.schedule('add', [1, 2, 3, 4, 5]);
@@ -54,16 +60,16 @@ describe('strategy.serialize()', () => {
 
     job2.output.subscribe();
     await flush();
-    expect(started).toBe(1);  // Job2 starts when Job1 ends.
+    expect(started).toBe(1); // Job2 starts when Job1 ends.
 
     expect(finished).toBe(0);
 
     await Promise.all([
-      job1.output.toPromise().then(s => {
+      job1.output.toPromise().then((s) => {
         expect(finished).toBe(1);
         expect(s).toBe(10);
       }),
-      job2.output.toPromise().then(s => {
+      job2.output.toPromise().then((s) => {
         expect(finished).toBe(2);
         expect(s).toBe(15);
       }),
@@ -79,36 +85,46 @@ describe('strategy.serialize()', () => {
 
     const strategy1 = strategy.serialize();
 
-    registry.register(strategy1(createJobHandler((input: number[]) => {
-      started++;
-
-      return new Promise<number>(
-        resolve => setTimeout(() => {
-          finished++;
-          resolve(input.reduce((a, c) => a + c, 0));
-        }, 10),
-      );
-      // tslint:disable-next-line:no-any
-    }) as any), {
-      argument: { items: { type: 'number' } },
-      output: { type: 'number' },
-      name: 'add',
-    });
-    registry.register(strategy1(createJobHandler((input: number[]) => {
-      started++;
-
-      return new Promise<number>(
-        resolve => setTimeout(() => {
-          finished++;
-          resolve(input.reduce((a, c) => a + c, 100));
-        }, 10),
-      );
-      // tslint:disable-next-line:no-any
-    }) as any), {
-      argument: { items: { type: 'number' } },
-      output: { type: 'number' },
-      name: 'add100',
-    });
+    registry.register(
+      strategy1(
+        createJobHandler((input: number[]) => {
+          started++;
+
+          return new Promise<number>((resolve) =>
+            setTimeout(() => {
+              finished++;
+              resolve(input.reduce((a, c) => a + c, 0));
+            }, 10),
+          );
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        }) as any,
+      ),
+      {
+        argument: { items: { type: 'number' } },
+        output: { type: 'number' },
+        name: 'add',
+      },
+    );
+    registry.register(
+      strategy1(
+        createJobHandler((input: number[]) => {
+          started++;
+
+          return new Promise<number>((resolve) =>
+            setTimeout(() => {
+              finished++;
+              resolve(input.reduce((a, c) => a + c, 100));
+            }, 10),
+          );
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        }) as any,
+      ),
+      {
+        argument: { items: { type: 'number' } },
+        output: { type: 'number' },
+        name: 'add100',
+      },
+    );
 
     const job1 = scheduler.schedule('add', [1, 2, 3, 4]);
     const job2 = scheduler.schedule('add100', [1, 2, 3, 4, 5]);
@@ -121,16 +137,16 @@ describe('strategy.serialize()', () => {
 
     job2.output.subscribe();
     await flush();
-    expect(started).toBe(1);  // Job2 starts when Job1 ends.
+    expect(started).toBe(1); // Job2 starts when Job1 ends.
 
     expect(finished).toBe(0);
 
     await Promise.all([
-      job1.output.toPromise().then(s => {
+      job1.output.toPromise().then((s) => {
         expect(finished).toBe(1);
         expect(s).toBe(10);
       }),
-      job2.output.toPromise().then(s => {
+      job2.output.toPromise().then((s) => {
         expect(finished).toBe(2);
         expect(s).toBe(115);
       }),
@@ -154,21 +170,26 @@ describe('strategy.reuse()', () => {
     let started = 0;
     let finished = 0;
 
-    registry.register(strategy.reuse()(createJobHandler((input: number[]) => {
-      started++;
-
-      return new Promise<number>(
-        resolve => setTimeout(() => {
-          finished++;
-          resolve(input.reduce((a, c) => a + c, 0));
-        }, 10),
-      );
-      // tslint:disable-next-line:no-any
-    }) as any), {
-      argument: { items: { type: 'number' } },
-      output: { type: 'number' },
-      name: 'add',
-    });
+    registry.register(
+      strategy.reuse()(
+        createJobHandler((input: number[]) => {
+          started++;
+
+          return new Promise<number>((resolve) =>
+            setTimeout(() => {
+              finished++;
+              resolve(input.reduce((a, c) => a + c, 0));
+            }, 10),
+          );
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        }) as any,
+      ),
+      {
+        argument: { items: { type: 'number' } },
+        output: { type: 'number' },
+        name: 'add',
+      },
+    );
 
     const job1 = scheduler.schedule('add', [1, 2, 3, 4]);
     const job2 = scheduler.schedule('add', []);
@@ -181,7 +202,7 @@ describe('strategy.reuse()', () => {
     expect(finished).toBe(0);
 
     job2.output.subscribe();
-    expect(started).toBe(1);  // job2 is reusing job1.
+    expect(started).toBe(1); // job2 is reusing job1.
     expect(finished).toBe(0);
 
     let result = await job1.output.toPromise();
@@ -199,7 +220,7 @@ describe('strategy.reuse()', () => {
     expect(finished).toBe(1);
 
     job4.output.subscribe();
-    expect(started).toBe(2);  // job4 is reusing job3.
+    expect(started).toBe(2); // job4 is reusing job3.
     expect(finished).toBe(1);
 
     result = await job3.output.toPromise();
@@ -224,21 +245,26 @@ describe('strategy.memoize()', () => {
     let started = 0;
     let finished = 0;
 
-    registry.register(strategy.memoize()(createJobHandler((input: number[]) => {
-      started++;
-
-      return new Promise<number>(
-        resolve => setTimeout(() => {
-          finished++;
-          resolve(input.reduce((a, c) => a + c, 0));
-        }, 10),
-      );
-      // tslint:disable-next-line:no-any
-    }) as any), {
-      argument: { items: { type: 'number' } },
-      output: { type: 'number' },
-      name: 'add',
-    });
+    registry.register(
+      strategy.memoize()(
+        createJobHandler((input: number[]) => {
+          started++;
+
+          return new Promise<number>((resolve) =>
+            setTimeout(() => {
+              finished++;
+              resolve(input.reduce((a, c) => a + c, 0));
+            }, 10),
+          );
+          // eslint-disable-next-line @typescript-eslint/no-explicit-any
+        }) as any,
+      ),
+      {
+        argument: { items: { type: 'number' } },
+        output: { type: 'number' },
+        name: 'add',
+      },
+    );
 
     const job1 = scheduler.schedule('add', [1, 2, 3, 4]);
     const job2 = scheduler.schedule('add', [1, 2, 3, 4]);
@@ -253,7 +279,7 @@ describe('strategy.memoize()', () => {
     expect(finished).toBe(0);
 
     job2.output.subscribe();
-    expect(started).toBe(1);  // job2 is reusing job1.
+    expect(started).toBe(1); // job2 is reusing job1.
     expect(finished).toBe(0);
 
     job3.output.subscribe();
@@ -262,28 +288,28 @@ describe('strategy.memoize()', () => {
     expect(finished).toBe(0);
 
     job4.output.subscribe();
-    expect(started).toBe(2);  // job4 is reusing job3.
+    expect(started).toBe(2); // job4 is reusing job3.
     expect(finished).toBe(0);
 
     await Promise.all([
-      job1.output.toPromise().then(s => {
+      job1.output.toPromise().then((s) => {
         // This is hard since job3 and job1 might finish out of order.
         expect(finished).toBeGreaterThanOrEqual(1);
         expect(s).toBe(10);
       }),
-      job2.output.toPromise().then(s => {
+      job2.output.toPromise().then((s) => {
         // This is hard since job3 and job1 might finish out of order.
         expect(finished).toBeGreaterThanOrEqual(1);
         expect(job1.state).toBe(JobState.Ended);
         expect(job2.state).toBe(JobState.Ended);
         expect(s).toBe(10);
       }),
-      job3.output.toPromise().then(s => {
+      job3.output.toPromise().then((s) => {
         // This is hard since job3 and job1 might finish out of order.
         expect(finished).toBeGreaterThanOrEqual(1);
         expect(s).toBe(15);
       }),
-      job4.output.toPromise().then(s => {
+      job4.output.toPromise().then((s) => {
         expect(job3.state).toBe(JobState.Ended);
         expect(job4.state).toBe(JobState.Ended);
         // This is hard since job3 and job1 might finish out of order.
diff --git a/packages/angular_devkit/core/src/index.ts b/packages/angular_devkit/core/src/index.ts
index 2df15fc70f9f..ac146835130f 100644
--- a/packages/angular_devkit/core/src/index.ts
+++ b/packages/angular_devkit/core/src/index.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 * as analytics from './analytics';
 import * as experimental from './experimental';
 import * as json from './json/index';
@@ -16,10 +17,4 @@ export * from './json/index';
 export * from './utils/index';
 export * from './virtual-fs/index';
 
-export {
-  analytics,
-  experimental,
-  json,
-  logging,
-  workspaces,
-};
+export { analytics, experimental, json, logging, workspaces };
diff --git a/packages/angular_devkit/core/src/json/index.ts b/packages/angular_devkit/core/src/json/index.ts
index 16bc0d1ff55c..fe74ea634abe 100644
--- a/packages/angular_devkit/core/src/json/index.ts
+++ b/packages/angular_devkit/core/src/json/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
  */
-export * from './interface';
-export * from './parser';
 
 import * as schema from './schema/index';
+
+export * from './interface';
+export * from './parser';
 export { schema };
diff --git a/packages/angular_devkit/core/src/json/interface.ts b/packages/angular_devkit/core/src/json/interface.ts
index 8769239695cf..8db9911ce5d9 100644
--- a/packages/angular_devkit/core/src/json/interface.ts
+++ b/packages/angular_devkit/core/src/json/interface.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
  */
+
 export interface Position {
   readonly offset: number;
 
@@ -12,16 +13,15 @@ export interface Position {
   readonly character: number;
 }
 
-
-export type JsonAstNode = JsonAstNumber
-    | JsonAstString
-    | JsonAstIdentifier
-    | JsonAstArray
-    | JsonAstObject
-    | JsonAstConstantFalse
-    | JsonAstConstantNull
-    | JsonAstConstantTrue;
-
+export type JsonAstNode =
+  | JsonAstNumber
+  | JsonAstString
+  | JsonAstIdentifier
+  | JsonAstArray
+  | JsonAstObject
+  | JsonAstConstantFalse
+  | JsonAstConstantNull
+  | JsonAstConstantTrue;
 
 export interface JsonAstNodeBase {
   readonly start: Position;
@@ -31,72 +31,61 @@ export interface JsonAstNodeBase {
   readonly comments?: (JsonAstComment | JsonAstMultilineComment)[];
 }
 
-
 export interface JsonAstNumber extends JsonAstNodeBase {
   readonly kind: 'number';
   readonly value: number;
 }
 
-
 export interface JsonAstString extends JsonAstNodeBase {
   readonly kind: 'string';
   readonly value: string;
 }
 
-
 export interface JsonAstIdentifier extends JsonAstNodeBase {
   readonly kind: 'identifier';
   readonly value: string;
 }
 
-
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface JsonArray extends Array<JsonValue> {}
 
-
 export interface JsonAstArray extends JsonAstNodeBase {
   readonly kind: 'array';
   readonly elements: JsonAstNode[];
   readonly value: JsonArray;
 }
 
-
 export interface JsonObject {
   [prop: string]: JsonValue;
 }
 
-
 export interface JsonAstKeyValue extends JsonAstNodeBase {
   readonly kind: 'keyvalue';
   readonly key: JsonAstString | JsonAstIdentifier;
   readonly value: JsonAstNode;
 }
 
-
 export interface JsonAstObject extends JsonAstNodeBase {
   readonly kind: 'object';
   readonly properties: JsonAstKeyValue[];
   readonly value: JsonObject;
 }
 
-
 export interface JsonAstConstantFalse extends JsonAstNodeBase {
   readonly kind: 'false';
   readonly value: false;
 }
 
-
 export interface JsonAstConstantNull extends JsonAstNodeBase {
   readonly kind: 'null';
   readonly value: null;
 }
 
-
 export interface JsonAstConstantTrue extends JsonAstNodeBase {
   readonly kind: 'true';
   readonly value: true;
 }
 
-
 // Loose mode AST.
 export interface JsonAstMultilineComment extends JsonAstNodeBase {
   readonly kind: 'multicomment';
@@ -107,7 +96,6 @@ export interface JsonAstComment extends JsonAstNodeBase {
   readonly content: string;
 }
 
-
 export type JsonValue = JsonAstNode['value'];
 
 export function isJsonObject(value: JsonValue): value is JsonObject {
diff --git a/packages/angular_devkit/core/src/json/parser.ts b/packages/angular_devkit/core/src/json/parser.ts
index 243b51c4f0ea..214ec97f89a5 100644
--- a/packages/angular_devkit/core/src/json/parser.ts
+++ b/packages/angular_devkit/core/src/json/parser.ts
@@ -1,10 +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
  */
+
+/* eslint-disable no-constant-condition */
 import { BaseException } from '../exception';
 import {
   JsonArray,
@@ -49,7 +51,6 @@ 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.
@@ -81,7 +82,6 @@ export interface JsonParserContext {
   readonly mode: JsonParseMode;
 }
 
-
 /**
  * Peek and return the next character from the context.
  * @private
@@ -90,7 +90,6 @@ function _peek(context: JsonParserContext): string | undefined {
   return context.original[context.position.offset];
 }
 
-
 /**
  * Move the context to the next character, including incrementing the line if necessary.
  * @private
@@ -98,7 +97,7 @@ function _peek(context: JsonParserContext): string | undefined {
 function _next(context: JsonParserContext) {
   context.previous = context.position;
 
-  let {offset, line, character} = context.position;
+  let { offset, line, character } = context.position;
   const char = context.original[offset];
   offset++;
   if (char == '\n') {
@@ -107,10 +106,9 @@ function _next(context: JsonParserContext) {
   } else {
     character++;
   }
-  context.position = {offset, line, character};
+  context.position = { offset, line, character };
 }
 
-
 /**
  * Read a single character from the input. If a `valid` string is passed, validate that the
  * character is included in the valid string.
@@ -135,17 +133,18 @@ function _token(context: JsonParserContext, valid?: string): string | undefined
   return char;
 }
 
-
 /**
  * Read the exponent part of a number. The exponent part is looser for JSON than the number
  * part. `str` is the string of the number itself found so far, and start the position
  * where the full number started. Returns the node found.
  * @private
  */
-function _readExpNumber(context: JsonParserContext,
-                        start: Position,
-                        str: string,
-                        comments: (JsonAstComment | JsonAstMultilineComment)[]): JsonAstNumber {
+function _readExpNumber(
+  context: JsonParserContext,
+  start: Position,
+  str: string,
+  comments: (JsonAstComment | JsonAstMultilineComment)[],
+): JsonAstNumber {
   let char;
   let signed = false;
 
@@ -157,8 +156,18 @@ function _readExpNumber(context: JsonParserContext,
       }
       signed = true;
       str += char;
-    } else if (char == '0' || char == '1' || char == '2' || char == '3' || char == '4'
-        || char == '5' || char == '6' || char == '7' || char == '8' || char == '9') {
+    } else if (
+      char == '0' ||
+      char == '1' ||
+      char == '2' ||
+      char == '3' ||
+      char == '4' ||
+      char == '5' ||
+      char == '6' ||
+      char == '7' ||
+      char == '8' ||
+      char == '9'
+    ) {
       signed = true;
       str += char;
     } else {
@@ -179,15 +188,16 @@ function _readExpNumber(context: JsonParserContext,
   };
 }
 
-
 /**
  * Read the hexa part of a 0xBADCAFE hexadecimal number.
  * @private
  */
-function _readHexaNumber(context: JsonParserContext,
-                         isNegative: boolean,
-                         start: Position,
-                         comments: (JsonAstComment | JsonAstMultilineComment)[]): JsonAstNumber {
+function _readHexaNumber(
+  context: JsonParserContext,
+  isNegative: boolean,
+  start: Position,
+  comments: (JsonAstComment | JsonAstMultilineComment)[],
+): JsonAstNumber {
   // Read an hexadecimal number, until it's not hexadecimal.
   let hexa = '';
   const valid = '0123456789abcdefABCDEF';
@@ -230,9 +240,11 @@ function _readNumber(context: JsonParserContext, comments = _readBlanks(context)
       if (str != '') {
         throw new InvalidJsonCharacterException(context);
       }
-    } else if (char == 'I'
-        && (str == '-' || str == '' || str == '+')
-        && (context.mode & JsonParseMode.NumberConstantsAllowed) != 0) {
+    } else if (
+      char == 'I' &&
+      (str == '-' || str == '' || str == '+') &&
+      (context.mode & JsonParseMode.NumberConstantsAllowed) != 0
+    ) {
       // Infinity?
       // _token(context, 'I'); Already read.
       _token(context, 'n');
@@ -249,8 +261,17 @@ function _readNumber(context: JsonParserContext, comments = _readBlanks(context)
       if (str == '0' || str == '-0') {
         throw new InvalidJsonCharacterException(context);
       }
-    } else if (char == '1' || char == '2' || char == '3' || char == '4' || char == '5'
-        || char == '6' || char == '7' || char == '8' || char == '9') {
+    } else if (
+      char == '1' ||
+      char == '2' ||
+      char == '3' ||
+      char == '4' ||
+      char == '5' ||
+      char == '6' ||
+      char == '7' ||
+      char == '8' ||
+      char == '9'
+    ) {
       if (str == '0' || str == '-0') {
         throw new InvalidJsonCharacterException(context);
       }
@@ -263,8 +284,11 @@ function _readNumber(context: JsonParserContext, comments = _readBlanks(context)
       dotted = true;
     } else if (char == 'e' || char == 'E') {
       return _readExpNumber(context, start, str + char, comments);
-    } else if (char == 'x' && (str == '0' || str == '-0')
-               && (context.mode & JsonParseMode.HexadecimalNumberAllowed) != 0) {
+    } else if (
+      char == 'x' &&
+      (str == '0' || str == '-0') &&
+      (context.mode & JsonParseMode.HexadecimalNumberAllowed) != 0
+    ) {
       return _readHexaNumber(context, str == '-0', start, comments);
     } else {
       // We read one too many characters, so rollback the last character.
@@ -290,7 +314,6 @@ function _readNumber(context: JsonParserContext, comments = _readBlanks(context)
   };
 }
 
-
 /**
  * Read a string from the context. Takes the comments of the string or read the blanks before the
  * string.
@@ -302,7 +325,7 @@ function _readString(context: JsonParserContext, comments = _readBlanks(context)
   // Consume the first string delimiter.
   const delim = _token(context);
   if ((context.mode & JsonParseMode.SingleQuotesAllowed) == 0) {
-    if (delim == '\'') {
+    if (delim == "'") {
       throw new InvalidJsonCharacterException(context);
     }
   }
@@ -323,17 +346,27 @@ function _readString(context: JsonParserContext, comments = _readBlanks(context)
       char = _token(context);
       switch (char) {
         case '\\':
-        case '\/':
+        case '/':
         case '"':
         case delim:
           str += char;
           break;
 
-        case 'b': str += '\b'; break;
-        case 'f': str += '\f'; break;
-        case 'n': str += '\n'; break;
-        case 'r': str += '\r'; break;
-        case 't': str += '\t'; break;
+        case 'b':
+          str += '\b';
+          break;
+        case 'f':
+          str += '\f';
+          break;
+        case 'n':
+          str += '\n';
+          break;
+        case 'r':
+          str += '\r';
+          break;
+        case 't':
+          str += '\t';
+          break;
         case 'u':
           const [c0] = _token(context, '0123456789abcdefABCDEF');
           const [c1] = _token(context, '0123456789abcdefABCDEF');
@@ -366,13 +399,14 @@ function _readString(context: JsonParserContext, comments = _readBlanks(context)
   }
 }
 
-
 /**
  * Read the constant `true` from the context.
  * @private
  */
-function _readTrue(context: JsonParserContext,
-                   comments = _readBlanks(context)): JsonAstConstantTrue {
+function _readTrue(
+  context: JsonParserContext,
+  comments = _readBlanks(context),
+): JsonAstConstantTrue {
   const start = context.position;
   _token(context, 't');
   _token(context, 'r');
@@ -391,13 +425,14 @@ function _readTrue(context: JsonParserContext,
   };
 }
 
-
 /**
  * Read the constant `false` from the context.
  * @private
  */
-function _readFalse(context: JsonParserContext,
-                    comments = _readBlanks(context)): JsonAstConstantFalse {
+function _readFalse(
+  context: JsonParserContext,
+  comments = _readBlanks(context),
+): JsonAstConstantFalse {
   const start = context.position;
   _token(context, 'f');
   _token(context, 'a');
@@ -417,13 +452,14 @@ function _readFalse(context: JsonParserContext,
   };
 }
 
-
 /**
  * Read the constant `null` from the context.
  * @private
  */
-function _readNull(context: JsonParserContext,
-                   comments = _readBlanks(context)): JsonAstConstantNull {
+function _readNull(
+  context: JsonParserContext,
+  comments = _readBlanks(context),
+): JsonAstConstantNull {
   const start = context.position;
 
   _token(context, 'n');
@@ -443,13 +479,11 @@ function _readNull(context: JsonParserContext,
   };
 }
 
-
 /**
  * Read the constant `NaN` from the context.
  * @private
  */
-function _readNaN(context: JsonParserContext,
-                  comments = _readBlanks(context)): JsonAstNumber {
+function _readNaN(context: JsonParserContext, comments = _readBlanks(context)): JsonAstNumber {
   const start = context.position;
 
   _token(context, 'N');
@@ -468,7 +502,6 @@ function _readNaN(context: JsonParserContext,
   };
 }
 
-
 /**
  * Read an array of JSON values from the context.
  * @private
@@ -513,14 +546,15 @@ function _readArray(context: JsonParserContext, comments = _readBlanks(context))
   };
 }
 
-
 /**
  * Read an identifier from the context. An identifier is a valid JavaScript identifier, and this
  * function is only used in Loose mode.
  * @private
  */
-function _readIdentifier(context: JsonParserContext,
-                         comments = _readBlanks(context)): JsonAstIdentifier {
+function _readIdentifier(
+  context: JsonParserContext,
+  comments = _readBlanks(context),
+): JsonAstIdentifier {
   const start = context.position;
 
   let char = _peek(context);
@@ -543,8 +577,10 @@ function _readIdentifier(context: JsonParserContext,
 
   while (true) {
     char = _token(context);
-    if (char == undefined
-        || (first ? identValidFirstChar.indexOf(char) : identValidChar.indexOf(char)) == -1) {
+    if (
+      char == undefined ||
+      (first ? identValidFirstChar.indexOf(char) : identValidChar.indexOf(char)) == -1
+    ) {
       context.position = context.previous;
 
       return {
@@ -562,20 +598,21 @@ function _readIdentifier(context: JsonParserContext,
   }
 }
 
-
 /**
  * Read a property from the context. A property is a string or (in Loose mode only) a number or
  * an identifier, followed by a colon `:`.
  * @private
  */
-function _readProperty(context: JsonParserContext,
-                       comments = _readBlanks(context)): JsonAstKeyValue {
+function _readProperty(
+  context: JsonParserContext,
+  comments = _readBlanks(context),
+): JsonAstKeyValue {
   const start = context.position;
 
   let key;
   if ((context.mode & JsonParseMode.IdentifierKeyNamesAllowed) != 0) {
     const top = _peek(context);
-    if (top == '"' || top == '\'') {
+    if (top == '"' || top == "'") {
       key = _readString(context);
     } else {
       key = _readIdentifier(context);
@@ -600,13 +637,11 @@ function _readProperty(context: JsonParserContext,
   };
 }
 
-
 /**
  * Read an object of properties -> JSON values from the context.
  * @private
  */
-function _readObject(context: JsonParserContext,
-                     comments = _readBlanks(context)): JsonAstObject {
+function _readObject(context: JsonParserContext, comments = _readBlanks(context)): JsonAstObject {
   const start = context.position;
   // Consume the first delimiter.
   _token(context, '{');
@@ -645,7 +680,6 @@ function _readObject(context: JsonParserContext,
   };
 }
 
-
 /**
  * Remove any blank character or comments (in Loose mode) from the context, returning an array
  * of comments if any are found.
@@ -662,8 +696,10 @@ function _readBlanks(context: JsonParserContext): (JsonAstComment | JsonAstMulti
         _next(context);
         _next(context);
 
-        while (context.original[context.position.offset] != '*'
-            || context.original[context.position.offset + 1] != '/') {
+        while (
+          context.original[context.position.offset] != '*' ||
+          context.original[context.position.offset + 1] != '/'
+        ) {
           _next(context);
           if (context.position.offset >= context.original.length) {
             throw new UnexpectedEndOfInputException(context);
@@ -723,7 +759,6 @@ function _readBlanks(context: JsonParserContext): (JsonAstComment | JsonAstMulti
   }
 }
 
-
 /**
  * Read a JSON value from the context, which can be any form of JSON value.
  * @private
@@ -759,7 +794,7 @@ function _readValue(context: JsonParserContext, comments = _readBlanks(context))
       result = _readNumber(context, comments);
       break;
 
-    case '\'':
+    case "'":
     case '"':
       result = _readString(context, comments);
       break;
@@ -806,32 +841,34 @@ function _readValue(context: JsonParserContext, comments = _readBlanks(context))
   return result;
 }
 
-
 /**
  * The Parse mode used for parsing the JSON string.
  */
 export enum JsonParseMode {
-  Strict                    =      0,  // Standard JSON.
-  CommentsAllowed           = 1 << 0,  // Allows comments, both single or multi lines.
-  SingleQuotesAllowed       = 1 << 1,  // Allow single quoted strings.
-  IdentifierKeyNamesAllowed = 1 << 2,  // Allow identifiers as objectp properties.
-  TrailingCommasAllowed     = 1 << 3,
-  HexadecimalNumberAllowed  = 1 << 4,
-  MultiLineStringAllowed    = 1 << 5,
-  LaxNumberParsingAllowed   = 1 << 6,  // Allow `.` or `+` as the first character of a number.
-  NumberConstantsAllowed    = 1 << 7,  // Allow -Infinity, Infinity and NaN.
-
-  Default                   = Strict,
-  Loose                     = CommentsAllowed | SingleQuotesAllowed |
-                              IdentifierKeyNamesAllowed | TrailingCommasAllowed |
-                              HexadecimalNumberAllowed | MultiLineStringAllowed |
-                              LaxNumberParsingAllowed | NumberConstantsAllowed,
-
-  Json                      = Strict,
-  Json5                     = Loose,
+  Strict = 0, // Standard JSON.
+  CommentsAllowed = 1 << 0, // Allows comments, both single or multi lines.
+  SingleQuotesAllowed = 1 << 1, // Allow single quoted strings.
+  IdentifierKeyNamesAllowed = 1 << 2, // Allow identifiers as objectp properties.
+  TrailingCommasAllowed = 1 << 3,
+  HexadecimalNumberAllowed = 1 << 4,
+  MultiLineStringAllowed = 1 << 5,
+  LaxNumberParsingAllowed = 1 << 6, // Allow `.` or `+` as the first character of a number.
+  NumberConstantsAllowed = 1 << 7, // Allow -Infinity, Infinity and NaN.
+
+  Default = Strict,
+  Loose = CommentsAllowed |
+    SingleQuotesAllowed |
+    IdentifierKeyNamesAllowed |
+    TrailingCommasAllowed |
+    HexadecimalNumberAllowed |
+    MultiLineStringAllowed |
+    LaxNumberParsingAllowed |
+    NumberConstantsAllowed,
+
+  Json = Strict,
+  Json5 = Loose,
 }
 
-
 /**
  * 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
@@ -859,14 +896,15 @@ export function parseJsonAst(input: string, mode = JsonParseMode.Default): JsonA
   if (context.position.offset < input.length) {
     const rest = input.substr(context.position.offset);
     const i = rest.length > 20 ? rest.substr(0, 20) + '...' : rest;
-    throw new Error(`Expected end of file, got "${i}" at `
-        + `${context.position.line}:${context.position.character}.`);
+    throw new Error(
+      `Expected end of file, got "${i}" at ` +
+        `${context.position.line}:${context.position.character}.`,
+    );
   }
 
   return ast;
 }
 
-
 /**
  * Options for the parseJson() function.
  * @deprecated Deprecated since version 11. Use 3rd party JSON parsers such as `jsonc-parser` instead.
@@ -879,7 +917,6 @@ export interface ParseJsonOptions {
   path?: string;
 }
 
-
 /**
  * Parse a JSON string into its value.  This discards the AST and only returns the value itself.
  *
diff --git a/packages/angular_devkit/core/src/json/parser_spec.ts b/packages/angular_devkit/core/src/json/parser_spec.ts
index 56405eb03aed..379d17b80928 100644
--- a/packages/angular_devkit/core/src/json/parser_spec.ts
+++ b/packages/angular_devkit/core/src/json/parser_spec.ts
@@ -1,34 +1,29 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use 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, parseJsonAst } from './parser';
 
+import { JsonParseMode, parseJson, parseJsonAst } from './parser';
 
 // Node 6 compatibility.
-function entries(x: {[key: string]: any}): any {  // tslint:disable-line:no-any
-  return Object.keys(x).map(k => [k, x[k]]);
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+function entries(x: { [key: string]: any }): any {
+  return Object.keys(x).map((k) => [k, x[k]]);
 }
 
-
 describe('parseJson and parseJsonAst', () => {
   describe('generic', () => {
-    const numbers = {
-    };
-    const errors = [
-      '',
-      '-abcdefghijklmnopqrstuvwxyz',
-    ];
+    const numbers = {};
+    const errors = ['', '-abcdefghijklmnopqrstuvwxyz'];
 
     for (const [n, [start, end, text]] of entries(numbers)) {
       it(`works for ${JSON.stringify(n)}`, () => {
         const ast = parseJsonAst(n);
-        expect(ast.start).toEqual({offset: start[0], line: start[1], character: start[2]});
-        expect(ast.end).toEqual({offset: end[0], line: end[1], character: end[2]});
+        expect(ast.start).toEqual({ offset: start[0], line: start[1], character: start[2] });
+        expect(ast.end).toEqual({ offset: end[0], line: end[1], character: end[2] });
         expect(ast.value).toEqual(JSON.parse(n));
         expect(parseJson(n)).toEqual(JSON.parse(n));
         expect(ast.text).toBe(text === undefined ? n : text);
@@ -46,16 +41,37 @@ describe('parseJson and parseJsonAst', () => {
 
   describe('numbers', () => {
     const numbers = {
-      '1234': [[0, 0, 0], [4, 0, 4]],
-      '12E34': [[0, 0, 0], [5, 0, 5]],
-      '12E+4': [[0, 0, 0], [5, 0, 5]],
-      '12E-4': [[0, 0, 0], [5, 0, 5]],
-      '12E-0004': [[0, 0, 0], [8, 0, 8]],
+      '1234': [
+        [0, 0, 0],
+        [4, 0, 4],
+      ],
+      '12E34': [
+        [0, 0, 0],
+        [5, 0, 5],
+      ],
+      '12E+4': [
+        [0, 0, 0],
+        [5, 0, 5],
+      ],
+      '12E-4': [
+        [0, 0, 0],
+        [5, 0, 5],
+      ],
+      '12E-0004': [
+        [0, 0, 0],
+        [8, 0, 8],
+      ],
       '   1234   ': [[3, 0, 3], [7, 0, 7], '1234'],
       '\r1234\t': [[1, 0, 1], [5, 0, 5], '1234'],
       '\n1234\n': [[1, 1, 0], [5, 1, 4], '1234'],
-      '0.123': [[0, 0, 0], [5, 0, 5]],
-      '0': [[0, 0, 0], [1, 0, 1]],
+      '0.123': [
+        [0, 0, 0],
+        [5, 0, 5],
+      ],
+      '0': [
+        [0, 0, 0],
+        [1, 0, 1],
+      ],
       '\n\n\n\n\n0': [[5, 5, 0], [6, 5, 1], '0'],
     };
     const errors = [
@@ -79,8 +95,8 @@ describe('parseJson and parseJsonAst', () => {
       it(`works for ${JSON.stringify(n)}`, () => {
         const ast = parseJsonAst(n);
         expect(ast.kind).toBe('number');
-        expect(ast.start).toEqual({offset: start[0], line: start[1], character: start[2]});
-        expect(ast.end).toEqual({offset: end[0], line: end[1], character: end[2]});
+        expect(ast.start).toEqual({ offset: start[0], line: start[1], character: start[2] });
+        expect(ast.end).toEqual({ offset: end[0], line: end[1], character: end[2] });
         expect(ast.value).toEqual(JSON.parse(n));
         expect(parseJson(n)).toEqual(JSON.parse(n));
         expect(ast.text).toBe(text === undefined ? n : text);
@@ -98,28 +114,35 @@ describe('parseJson and parseJsonAst', () => {
 
   describe('strings', () => {
     const strings = {
-      '""': [[0, 0, 0], [2, 0, 2]],
-      '"hello"': [[0, 0, 0], [7, 0, 7]],
-      '"a\\nb"': [[0, 0, 0], [6, 0, 6]],
-      '"a\\nb\\tc\\rd\\\\e\\/f\\\"g\\bh\\fi"': [[0, 0, 0], [27, 0, 27]],
-      '"a\\u1234b"': [[0, 0, 0], [10, 0, 10]],
+      '""': [
+        [0, 0, 0],
+        [2, 0, 2],
+      ],
+      '"hello"': [
+        [0, 0, 0],
+        [7, 0, 7],
+      ],
+      '"a\\nb"': [
+        [0, 0, 0],
+        [6, 0, 6],
+      ],
+      '"a\\nb\\tc\\rd\\\\e\\/f\\"g\\bh\\fi"': [
+        [0, 0, 0],
+        [27, 0, 27],
+      ],
+      '"a\\u1234b"': [
+        [0, 0, 0],
+        [10, 0, 10],
+      ],
     };
-    const errors = [
-      '"\\z"',
-      '\'hello\'',
-      '"\\',
-      '"a\\zb"',
-      '"a',
-      '"a\nb"',
-      '"\\\n "',
-    ];
+    const errors = ['"\\z"', "'hello'", '"\\', '"a\\zb"', '"a', '"a\nb"', '"\\\n "'];
 
     for (const [n, [start, end, text]] of entries(strings)) {
       it(`works for ${JSON.stringify(n)}`, () => {
         const ast = parseJsonAst(n);
         expect(ast.kind).toBe('string');
-        expect(ast.start).toEqual({offset: start[0], line: start[1], character: start[2]});
-        expect(ast.end).toEqual({offset: end[0], line: end[1], character: end[2]});
+        expect(ast.start).toEqual({ offset: start[0], line: start[1], character: start[2] });
+        expect(ast.end).toEqual({ offset: end[0], line: end[1], character: end[2] });
         expect(ast.value).toEqual(JSON.parse(n));
         expect(parseJson(n)).toEqual(JSON.parse(n));
         expect(ast.text).toBe(text === undefined ? n : text);
@@ -141,16 +164,14 @@ describe('parseJson and parseJsonAst', () => {
       'false': ['false', [0, 0, 0], [5, 0, 5], false],
       'null': ['null', [0, 0, 0], [4, 0, 4], null],
     };
-    const errors = [
-      'undefined',
-    ];
+    const errors = ['undefined'];
 
     for (const [n, [kind, start, end, value, text]] of entries(strings)) {
       it(`works for ${JSON.stringify(n)}`, () => {
         const ast = parseJsonAst(n);
         expect(ast.kind).toBe(kind);
-        expect(ast.start).toEqual({offset: start[0], line: start[1], character: start[2]});
-        expect(ast.end).toEqual({offset: end[0], line: end[1], character: end[2]});
+        expect(ast.start).toEqual({ offset: start[0], line: start[1], character: start[2] });
+        expect(ast.end).toEqual({ offset: end[0], line: end[1], character: end[2] });
         expect(ast.value).toEqual(value);
         expect(ast.text).toBe(text === undefined ? n : text);
       });
@@ -167,27 +188,40 @@ describe('parseJson and parseJsonAst', () => {
 
   describe('arrays', () => {
     const strings = {
-      '[0,1,2,3]': [[0, 0, 0], [9, 0, 9]],
-      '[[0],1,2,3]': [[0, 0, 0], [11, 0, 11]],
-      '[0\n,\n1,2,3]': [[0, 0, 0], [11, 2, 6]],
-      '[]': [[0, 0, 0], [2, 0, 2]],
+      '[0,1,2,3]': [
+        [0, 0, 0],
+        [9, 0, 9],
+      ],
+      '[[0],1,2,3]': [
+        [0, 0, 0],
+        [11, 0, 11],
+      ],
+      '[0\n,\n1,2,3]': [
+        [0, 0, 0],
+        [11, 2, 6],
+      ],
+      '[]': [
+        [0, 0, 0],
+        [2, 0, 2],
+      ],
       '\n[\n]\n': [[1, 1, 0], [4, 2, 1], '[\n]'],
-      '[\n]': [[0, 0, 0], [3, 1, 1]],
-      '[\n\n]': [[0, 0, 0], [4, 2, 1]],
+      '[\n]': [
+        [0, 0, 0],
+        [3, 1, 1],
+      ],
+      '[\n\n]': [
+        [0, 0, 0],
+        [4, 2, 1],
+      ],
     };
-    const errors = [
-      '[',
-      '[,]',
-      '[0,]',
-      '[,0]',
-    ];
+    const errors = ['[', '[,]', '[0,]', '[,0]'];
 
     for (const [n, [start, end, text]] of entries(strings)) {
       it(`works for ${JSON.stringify(n)}`, () => {
         const ast = parseJsonAst(n);
         expect(ast.kind).toBe('array');
-        expect(ast.start).toEqual({offset: start[0], line: start[1], character: start[2]});
-        expect(ast.end).toEqual({offset: end[0], line: end[1], character: end[2]});
+        expect(ast.start).toEqual({ offset: start[0], line: start[1], character: start[2] });
+        expect(ast.end).toEqual({ offset: end[0], line: end[1], character: end[2] });
         expect(ast.value).toEqual(JSON.parse(n));
         expect(parseJson(n)).toEqual(JSON.parse(n));
         expect(ast.text).toBe(text === undefined ? n : text);
@@ -205,24 +239,35 @@ describe('parseJson and parseJsonAst', () => {
 
   describe('objects', () => {
     const strings = {
-      '{}': [[0, 0, 0], [2, 0, 2]],
-      '{\n}': [[0, 0, 0], [3, 1, 1]],
-      '{"hello": "world"}': [[0, 0, 0], [18, 0, 18]],
-      '{"hello": 0, "world": 1}': [[0, 0, 0], [24, 0, 24]],
-      '{"hello": {"hello": {"hello": "world"}}}': [[0, 0, 0], [40, 0, 40]],
+      '{}': [
+        [0, 0, 0],
+        [2, 0, 2],
+      ],
+      '{\n}': [
+        [0, 0, 0],
+        [3, 1, 1],
+      ],
+      '{"hello": "world"}': [
+        [0, 0, 0],
+        [18, 0, 18],
+      ],
+      '{"hello": 0, "world": 1}': [
+        [0, 0, 0],
+        [24, 0, 24],
+      ],
+      '{"hello": {"hello": {"hello": "world"}}}': [
+        [0, 0, 0],
+        [40, 0, 40],
+      ],
     };
-    const errors = [
-      '{',
-      '{,}',
-      '{"hello": 0',
-    ];
+    const errors = ['{', '{,}', '{"hello": 0'];
 
     for (const [n, [start, end, text]] of entries(strings)) {
       it(`works for ${JSON.stringify(n)}`, () => {
         const ast = parseJsonAst(n);
         expect(ast.kind).toBe('object');
-        expect(ast.start).toEqual({offset: start[0], line: start[1], character: start[2]});
-        expect(ast.end).toEqual({offset: end[0], line: end[1], character: end[2]});
+        expect(ast.start).toEqual({ offset: start[0], line: start[1], character: start[2] });
+        expect(ast.end).toEqual({ offset: end[0], line: end[1], character: end[2] });
         expect(ast.value).toEqual(JSON.parse(n));
         expect(parseJson(n)).toEqual(JSON.parse(n));
         expect(ast.text).toBe(text === undefined ? n : text);
@@ -240,43 +285,42 @@ describe('parseJson and parseJsonAst', () => {
 
   describe('loose', () => {
     const strings = {
-      '{\'hello\': 0}': [[0, 0, 0], [12, 0, 12], {'hello': 0}],
-      '{hello: 0}': [[0, 0, 0], [10, 0, 10], {hello: 0}],
-      '{1: 0}': [[0, 0, 0], [6, 0, 6], {1: 0}],
-      '{hello\n:/**/ 0}': [[0, 0, 0], [15, 1, 8], {hello: 0}],
+      "{'hello': 0}": [[0, 0, 0], [12, 0, 12], { 'hello': 0 }],
+      '{hello: 0}': [[0, 0, 0], [10, 0, 10], { hello: 0 }],
+      '{1: 0}': [[0, 0, 0], [6, 0, 6], { 1: 0 }],
+      '{hello\n:/**/ 0}': [[0, 0, 0], [15, 1, 8], { hello: 0 }],
       '{\n// hello\n}': [[0, 0, 0], [12, 2, 1], {}],
       '{\n/* hello\n*/ }': [[0, 0, 0], [15, 2, 4], {}],
       '{}//  ': [[0, 0, 0], [2, 0, 2], {}, '{}'],
       '{}//': [[0, 0, 0], [2, 0, 2], {}, '{}'],
-      '{hello:0,}': [[0, 0, 0], [10, 0, 10], {hello: 0}],
-      '{hello:0/**/,}': [[0, 0, 0], [14, 0, 14], {hello: 0}],
-      '{hello:0,/**/}': [[0, 0, 0], [14, 0, 14], {hello: 0}],
-      '{hi:["hello",]}': [[0, 0, 0], [15, 0, 15], {hi: ['hello']}],
-      '{hi:["hello",/* */]}': [[0, 0, 0], [20, 0, 20], {hi: ['hello']}],
-      '{hi:["hello"/* */,]}': [[0, 0, 0], [20, 0, 20], {hi: ['hello']}],
-      '{hi:["hello" , ] , }': [[0, 0, 0], [20, 0, 20], {hi: ['hello']}],
-      '{hi:"\\\n "}': [[0, 0, 0], [10, 1, 3], {hi: '\n '}],
-      '{d: -0xdecaf, e: Infinity, f: -Infinity, g: +Infinity, h: NaN,}': [[0, 0, 0], [63, 0, 63], {
-        d: -0xdecaf,
-        e: Infinity,
-        f: -Infinity,
-        g: Infinity,
-        h: NaN,
-      }],
+      '{hello:0,}': [[0, 0, 0], [10, 0, 10], { hello: 0 }],
+      '{hello:0/**/,}': [[0, 0, 0], [14, 0, 14], { hello: 0 }],
+      '{hello:0,/**/}': [[0, 0, 0], [14, 0, 14], { hello: 0 }],
+      '{hi:["hello",]}': [[0, 0, 0], [15, 0, 15], { hi: ['hello'] }],
+      '{hi:["hello",/* */]}': [[0, 0, 0], [20, 0, 20], { hi: ['hello'] }],
+      '{hi:["hello"/* */,]}': [[0, 0, 0], [20, 0, 20], { hi: ['hello'] }],
+      '{hi:["hello" , ] , }': [[0, 0, 0], [20, 0, 20], { hi: ['hello'] }],
+      '{hi:"\\\n "}': [[0, 0, 0], [10, 1, 3], { hi: '\n ' }],
+      '{d: -0xdecaf, e: Infinity, f: -Infinity, g: +Infinity, h: NaN,}': [
+        [0, 0, 0],
+        [63, 0, 63],
+        {
+          d: -0xdecaf,
+          e: Infinity,
+          f: -Infinity,
+          g: Infinity,
+          h: NaN,
+        },
+      ],
     };
-    const errors = [
-      '{1b: 0}',
-      ' /*',
-      '',
-      '.Infinity',
-    ];
+    const errors = ['{1b: 0}', ' /*', '', '.Infinity'];
 
     for (const [n, [start, end, value, text]] of entries(strings)) {
       it(`works for ${JSON.stringify(n)}`, () => {
         const ast = parseJsonAst(n, JsonParseMode.Loose);
         expect(ast.kind).toBe('object');
-        expect(ast.start).toEqual({offset: start[0], line: start[1], character: start[2]});
-        expect(ast.end).toEqual({offset: end[0], line: end[1], character: end[2]});
+        expect(ast.start).toEqual({ offset: start[0], line: start[1], character: start[2] });
+        expect(ast.end).toEqual({ offset: end[0], line: end[1], character: end[2] });
         expect(ast.value).toEqual(value);
         expect(parseJson(n, JsonParseMode.Loose)).toEqual(value);
         expect(ast.text).toBe(text === undefined ? n : text);
@@ -294,7 +338,9 @@ describe('parseJson and parseJsonAst', () => {
 
   describe('complex', () => {
     it('strips comments', () => {
-      expect(parseJson(`
+      expect(
+        parseJson(
+          `
         // THIS IS A COMMENT
         {
           /* THIS IS ALSO A COMMENT */ // IGNORED BECAUSE COMMENT
@@ -309,7 +355,10 @@ describe('parseJson and parseJsonAst', () => {
           , /* STILL VALID */
           "c": 2
         }
-      `, JsonParseMode.Loose)).toEqual({
+      `,
+          JsonParseMode.Loose,
+        ),
+      ).toEqual({
         a: 'this // should not be a comment',
         a2: 'this /* should also not be a comment',
         b: 1,
@@ -336,7 +385,8 @@ No \\\\n's!",
         singleQuotes: 'I can use "double quotes" here',
         lineBreaks: "Look, Mom! \nNo \\n's!",
         hexadecimal: 0xdecaf,
-        leadingDecimalPoint: .8675309, andTrailing: 8675309.,
+        leadingDecimalPoint: 0.8675309,
+        andTrailing: 8675309,
         positiveSign: +1,
         trailingComma: 'in objects',
         andIn: ['arrays'],
diff --git a/packages/angular_devkit/core/src/json/schema/index.ts b/packages/angular_devkit/core/src/json/schema/index.ts
index 92a977ffe736..6e3f3c14e4f4 100644
--- a/packages/angular_devkit/core/src/json/schema/index.ts
+++ b/packages/angular_devkit/core/src/json/schema/index.ts
@@ -1,10 +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 * as transforms from './transforms';
+
 export * from './interface';
 export * from './pointer';
 export * from './registry';
@@ -12,6 +15,4 @@ export * from './schema';
 export * from './visitor';
 export * from './utility';
 
-import * as transforms from './transforms';
-
 export { transforms };
diff --git a/packages/angular_devkit/core/src/json/schema/interface.ts b/packages/angular_devkit/core/src/json/schema/interface.ts
index 42c581e8d026..e56a45d34f35 100644
--- a/packages/angular_devkit/core/src/json/schema/interface.ts
+++ b/packages/angular_devkit/core/src/json/schema/interface.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 { ErrorObject, Format } from 'ajv';
 import { Observable, SubscribableOrPromise } from 'rxjs';
 import { JsonArray, JsonObject, JsonValue } from '../interface';
@@ -18,7 +19,7 @@ export interface SchemaValidatorResult {
   errors?: SchemaValidatorError[];
 }
 
-export type SchemaValidatorError = ErrorObject;
+export type SchemaValidatorError = Partial<ErrorObject>;
 
 export interface SchemaValidatorOptions {
   applyPreTransforms?: boolean;
@@ -59,15 +60,16 @@ export interface PromptDefinition {
   default?: string | string[] | number | boolean | null;
   validator?: (value: JsonValue) => boolean | string | Promise<boolean | string>;
 
-  items?: Array<string | { value: JsonValue, label: string }>;
+  items?: Array<string | { value: JsonValue; label: string }>;
 
   raw?: string | JsonObject;
   multiselect?: boolean;
   propertyTypes: Set<string>;
 }
 
-export type PromptProvider = (definitions: Array<PromptDefinition>)
-  => SubscribableOrPromise<{ [id: string]: JsonValue }>;
+export type PromptProvider = (
+  definitions: Array<PromptDefinition>,
+) => SubscribableOrPromise<{ [id: string]: JsonValue }>;
 
 export interface SchemaRegistry {
   compile(schema: Object): Observable<SchemaValidator>;
@@ -109,10 +111,7 @@ export interface JsonSchemaVisitor {
 }
 
 export interface JsonVisitor {
-  (
-    value: JsonValue,
-    pointer: JsonPointer,
-    schema?: JsonObject,
-    root?: JsonObject | JsonArray,
-  ): Observable<JsonValue> | JsonValue;
+  (value: JsonValue, pointer: JsonPointer, schema?: JsonObject, root?: JsonObject | JsonArray):
+    | Observable<JsonValue>
+    | JsonValue;
 }
diff --git a/packages/angular_devkit/core/src/json/schema/pointer.ts b/packages/angular_devkit/core/src/json/schema/pointer.ts
index 39d054169801..9c1223c8c1f2 100644
--- a/packages/angular_devkit/core/src/json/schema/pointer.ts
+++ b/packages/angular_devkit/core/src/json/schema/pointer.ts
@@ -1,20 +1,20 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { JsonPointer } from './interface';
 
+import { JsonPointer } from './interface';
 
 export function buildJsonPointer(fragments: string[]): JsonPointer {
-  return (
-    '/' + fragments.map(f => {
-      return f.replace(/~/g, '~0')
-              .replace(/\//g, '~1');
-    }).join('/')
-  ) as JsonPointer;
+  return ('/' +
+    fragments
+      .map((f) => {
+        return f.replace(/~/g, '~0').replace(/\//g, '~1');
+      })
+      .join('/')) as JsonPointer;
 }
 export function joinJsonPointer(root: JsonPointer, ...others: string[]): JsonPointer {
   if (root == '/') {
@@ -24,8 +24,15 @@ export function joinJsonPointer(root: JsonPointer, ...others: string[]): JsonPoi
   return (root + buildJsonPointer(others)) as JsonPointer;
 }
 export function parseJsonPointer(pointer: JsonPointer): string[] {
-  if (pointer === '') { return []; }
-  if (pointer.charAt(0) !== '/') { throw new Error('Relative pointer: ' + pointer); }
+  if (pointer === '') {
+    return [];
+  }
+  if (pointer.charAt(0) !== '/') {
+    throw new Error('Relative pointer: ' + pointer);
+  }
 
-  return pointer.substring(1).split(/\//).map(str => str.replace(/~1/g, '/').replace(/~0/g, '~'));
+  return pointer
+    .substring(1)
+    .split(/\//)
+    .map((str) => str.replace(/~1/g, '/').replace(/~0/g, '~'));
 }
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..4a7091f89ccd 100644
--- a/packages/angular_devkit/core/src/json/schema/prompt_spec.ts
+++ b/packages/angular_devkit/core/src/json/schema/prompt_spec.ts
@@ -1,21 +1,21 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-// tslint:disable:no-any no-big-function
+
+/* eslint-disable @typescript-eslint/no-explicit-any */
 import { map, mergeMap } from 'rxjs/operators';
 import { CoreSchemaRegistry } from './registry';
 
-
 describe('Prompt Provider', () => {
-  it('sets properties with answer', done => {
+  it('sets properties with answer', (done) => {
     const registry = new CoreSchemaRegistry();
     const data: any = {};
 
-    registry.usePromptProvider(async definitions => {
+    registry.usePromptProvider(async (definitions) => {
       return { [definitions[0].id]: true };
     });
 
@@ -29,19 +29,20 @@ describe('Prompt Provider', () => {
         },
       })
       .pipe(
-        mergeMap(validator => validator(data)),
+        mergeMap((validator) => validator(data)),
         map(() => {
           expect(data.test).toBe(true);
         }),
       )
-      .toPromise().then(done, done.fail);
-    });
+      .toPromise()
+      .then(done, done.fail);
+  });
 
-  it('supports mixed schema references', done => {
+  it('supports mixed schema references', (done) => {
     const registry = new CoreSchemaRegistry();
     const data: any = {};
 
-    registry.usePromptProvider(async definitions => {
+    registry.usePromptProvider(async (definitions) => {
       return {
         '/bool': true,
         '/test': 'two',
@@ -57,11 +58,7 @@ describe('Prompt Provider', () => {
           },
           test: {
             type: 'string',
-            enum: [
-              'one',
-              'two',
-              'three',
-            ],
+            enum: ['one', 'two', 'three'],
             'x-prompt': {
               type: 'list',
               'message': 'other-message',
@@ -91,23 +88,24 @@ describe('Prompt Provider', () => {
         },
       })
       .pipe(
-        mergeMap(validator => validator(data)),
-        map(result => {
+        mergeMap((validator) => validator(data)),
+        map((result) => {
           expect(result.success).toBe(true);
           expect(data.bool).toBe(true);
           expect(data.test).toBe('two');
           expect(data.obj.deep.three).toEqual('test3-answer');
         }),
       )
-      .toPromise().then(done, done.fail);
+      .toPromise()
+      .then(done, done.fail);
   });
 
   describe('with shorthand', () => {
-    it('supports message value', done => {
+    it('supports message value', (done) => {
       const registry = new CoreSchemaRegistry();
       const data: any = {};
 
-      registry.usePromptProvider(async definitions => {
+      registry.usePromptProvider(async (definitions) => {
         expect(definitions.length).toBe(1);
         expect(definitions[0].message).toBe('test-message');
 
@@ -123,24 +121,19 @@ describe('Prompt Provider', () => {
             },
           },
         })
-        .pipe(
-          mergeMap(validator => validator(data)),
-        )
-        .toPromise().then(done, done.fail);
+        .pipe(mergeMap((validator) => validator(data)))
+        .toPromise()
+        .then(done, done.fail);
     });
 
-    it('analyzes enums', done => {
+    it('analyzes enums', (done) => {
       const registry = new CoreSchemaRegistry();
       const data: any = {};
 
-      registry.usePromptProvider(async definitions => {
+      registry.usePromptProvider(async (definitions) => {
         expect(definitions.length).toBe(1);
         expect(definitions[0].type).toBe('list');
-        expect(definitions[0].items).toEqual([
-          'one',
-          'two',
-          'three',
-        ]);
+        expect(definitions[0].items).toEqual(['one', 'two', 'three']);
 
         return {};
       });
@@ -150,26 +143,21 @@ describe('Prompt Provider', () => {
           properties: {
             test: {
               type: 'string',
-              enum: [
-                'one',
-                'two',
-                'three',
-              ],
+              enum: ['one', 'two', 'three'],
               'x-prompt': 'test-message',
             },
           },
         })
-        .pipe(
-          mergeMap(validator => validator(data)),
-        )
-        .toPromise().then(done, done.fail);
+        .pipe(mergeMap((validator) => validator(data)))
+        .toPromise()
+        .then(done, done.fail);
     });
 
-    it('analyzes boolean properties', done => {
+    it('analyzes boolean properties', (done) => {
       const registry = new CoreSchemaRegistry();
       const data: any = {};
 
-      registry.usePromptProvider(async definitions => {
+      registry.usePromptProvider(async (definitions) => {
         expect(definitions.length).toBe(1);
         expect(definitions[0].type).toBe('confirmation');
         expect(definitions[0].items).toBeUndefined();
@@ -186,20 +174,18 @@ describe('Prompt Provider', () => {
             },
           },
         })
-        .pipe(
-          mergeMap(validator => validator(data)),
-        )
-        .toPromise().then(done, done.fail);
+        .pipe(mergeMap((validator) => validator(data)))
+        .toPromise()
+        .then(done, done.fail);
     });
-
   });
 
   describe('with longhand', () => {
-    it('supports message option', done => {
+    it('supports message option', (done) => {
       const registry = new CoreSchemaRegistry();
       const data: any = {};
 
-      registry.usePromptProvider(async definitions => {
+      registry.usePromptProvider(async (definitions) => {
         expect(definitions.length).toBe(1);
         expect(definitions[0].message).toBe('test-message');
 
@@ -217,24 +203,19 @@ describe('Prompt Provider', () => {
             },
           },
         })
-        .pipe(
-          mergeMap(validator => validator(data)),
-        )
-        .toPromise().then(done, done.fail);
+        .pipe(mergeMap((validator) => validator(data)))
+        .toPromise()
+        .then(done, done.fail);
     });
 
-    it('analyzes enums WITH explicit list type', done => {
+    it('analyzes enums WITH explicit list type', (done) => {
       const registry = new CoreSchemaRegistry();
       const data: any = {};
 
-      registry.usePromptProvider(async definitions => {
+      registry.usePromptProvider(async (definitions) => {
         expect(definitions.length).toBe(1);
         expect(definitions[0].type).toBe('list');
-        expect(definitions[0].items).toEqual([
-          'one',
-          'two',
-          'three',
-        ]);
+        expect(definitions[0].items).toEqual(['one', 'two', 'three']);
 
         return { [definitions[0].id]: 'one' };
       });
@@ -244,11 +225,7 @@ describe('Prompt Provider', () => {
           properties: {
             test: {
               type: 'string',
-              enum: [
-                'one',
-                'two',
-                'three',
-              ],
+              enum: ['one', 'two', 'three'],
               'x-prompt': {
                 'type': 'list',
                 'message': 'test-message',
@@ -256,17 +233,16 @@ describe('Prompt Provider', () => {
             },
           },
         })
-        .pipe(
-          mergeMap(validator => validator(data)),
-        )
-        .toPromise().then(done, done.fail);
+        .pipe(mergeMap((validator) => validator(data)))
+        .toPromise()
+        .then(done, done.fail);
     });
 
-    it('analyzes list with true multiselect option and object items', done => {
+    it('analyzes list with true multiselect option and object items', (done) => {
       const registry = new CoreSchemaRegistry();
       const data: any = {};
 
-      registry.usePromptProvider(async definitions => {
+      registry.usePromptProvider(async (definitions) => {
         expect(definitions.length).toBe(1);
         expect(definitions[0].type).toBe('list');
         expect(definitions[0].multiselect).toBe(true);
@@ -295,17 +271,16 @@ describe('Prompt Provider', () => {
             },
           },
         })
-        .pipe(
-          mergeMap(validator => validator(data)),
-        )
-        .toPromise().then(done, done.fail);
+        .pipe(mergeMap((validator) => validator(data)))
+        .toPromise()
+        .then(done, done.fail);
     });
 
-    it('analyzes list with false multiselect option and object items', done => {
+    it('analyzes list with false multiselect option and object items', (done) => {
       const registry = new CoreSchemaRegistry();
       const data: any = {};
 
-      registry.usePromptProvider(async definitions => {
+      registry.usePromptProvider(async (definitions) => {
         expect(definitions.length).toBe(1);
         expect(definitions[0].type).toBe('list');
         expect(definitions[0].multiselect).toBe(false);
@@ -334,17 +309,16 @@ describe('Prompt Provider', () => {
             },
           },
         })
-        .pipe(
-          mergeMap(validator => validator(data)),
-        )
-        .toPromise().then(done, done.fail);
+        .pipe(mergeMap((validator) => validator(data)))
+        .toPromise()
+        .then(done, done.fail);
     });
 
-    it('analyzes list without multiselect option and object items', done => {
+    it('analyzes list without multiselect option and object items', (done) => {
       const registry = new CoreSchemaRegistry();
       const data: any = {};
 
-      registry.usePromptProvider(async definitions => {
+      registry.usePromptProvider(async (definitions) => {
         expect(definitions.length).toBe(1);
         expect(definitions[0].type).toBe('list');
         expect(definitions[0].multiselect).toBe(true);
@@ -372,25 +346,20 @@ describe('Prompt Provider', () => {
             },
           },
         })
-        .pipe(
-          mergeMap(validator => validator(data)),
-        )
-        .toPromise().then(done, done.fail);
+        .pipe(mergeMap((validator) => validator(data)))
+        .toPromise()
+        .then(done, done.fail);
     });
 
-    it('analyzes enums WITHOUT explicit list type', done => {
+    it('analyzes enums WITHOUT explicit list type', (done) => {
       const registry = new CoreSchemaRegistry();
       const data: any = {};
 
-      registry.usePromptProvider(async definitions => {
+      registry.usePromptProvider(async (definitions) => {
         expect(definitions.length).toBe(1);
         expect(definitions[0].type).toBe('list');
         expect(definitions[0].multiselect).toBeFalsy();
-        expect(definitions[0].items).toEqual([
-          'one',
-          'two',
-          'three',
-        ]);
+        expect(definitions[0].items).toEqual(['one', 'two', 'three']);
 
         return {};
       });
@@ -400,36 +369,27 @@ describe('Prompt Provider', () => {
           properties: {
             test: {
               type: 'string',
-              enum: [
-                'one',
-                'two',
-                'three',
-              ],
+              enum: ['one', 'two', 'three'],
               'x-prompt': {
                 'message': 'test-message',
               },
             },
           },
         })
-        .pipe(
-          mergeMap(validator => validator(data)),
-        )
-        .toPromise().then(done, done.fail);
+        .pipe(mergeMap((validator) => validator(data)))
+        .toPromise()
+        .then(done, done.fail);
     });
 
-    it('analyzes enums WITHOUT explicit list type and multiselect', done => {
+    it('analyzes enums WITHOUT explicit list type and multiselect', (done) => {
       const registry = new CoreSchemaRegistry();
       const data: any = {};
 
-      registry.usePromptProvider(async definitions => {
+      registry.usePromptProvider(async (definitions) => {
         expect(definitions.length).toBe(1);
         expect(definitions[0].type).toBe('list');
         expect(definitions[0].multiselect).toBe(true);
-        expect(definitions[0].items).toEqual([
-          'one',
-          'two',
-          'three',
-        ]);
+        expect(definitions[0].items).toEqual(['one', 'two', 'three']);
 
         return {};
       });
@@ -440,27 +400,22 @@ describe('Prompt Provider', () => {
             test: {
               type: 'array',
               items: {
-                enum: [
-                  'one',
-                  'two',
-                  'three',
-                ],
+                enum: ['one', 'two', 'three'],
               },
               'x-prompt': 'test-message',
             },
           },
         })
-        .pipe(
-          mergeMap(validator => validator(data)),
-        )
-        .toPromise().then(done, done.fail);
+        .pipe(mergeMap((validator) => validator(data)))
+        .toPromise()
+        .then(done, done.fail);
     });
 
-    it('analyzes boolean properties', done => {
+    it('analyzes boolean properties', (done) => {
       const registry = new CoreSchemaRegistry();
       const data: any = {};
 
-      registry.usePromptProvider(async definitions => {
+      registry.usePromptProvider(async (definitions) => {
         expect(definitions.length).toBe(1);
         expect(definitions[0].type).toBe('confirmation');
         expect(definitions[0].items).toBeUndefined();
@@ -479,17 +434,16 @@ describe('Prompt Provider', () => {
             },
           },
         })
-        .pipe(
-          mergeMap(validator => validator(data)),
-        )
-        .toPromise().then(done, done.fail);
+        .pipe(mergeMap((validator) => validator(data)))
+        .toPromise()
+        .then(done, done.fail);
     });
 
-    it('allows prompt type override', done => {
+    it('allows prompt type override', (done) => {
       const registry = new CoreSchemaRegistry();
       const data: any = {};
 
-      registry.usePromptProvider(async definitions => {
+      registry.usePromptProvider(async (definitions) => {
         expect(definitions.length).toBe(1);
         expect(definitions[0].type).toBe('input');
         expect(definitions[0].items).toBeUndefined();
@@ -509,12 +463,9 @@ describe('Prompt Provider', () => {
             },
           },
         })
-        .pipe(
-          mergeMap(validator => validator(data)),
-        )
-        .toPromise().then(done, done.fail);
+        .pipe(mergeMap((validator) => validator(data)))
+        .toPromise()
+        .then(done, done.fail);
     });
-
   });
-
 });
diff --git a/packages/angular_devkit/core/src/json/schema/registry.ts b/packages/angular_devkit/core/src/json/schema/registry.ts
index 1b4bd474373a..652b2327eef2 100644
--- a/packages/angular_devkit/core/src/json/schema/registry.ts
+++ b/packages/angular_devkit/core/src/json/schema/registry.ts
@@ -1,11 +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 Ajv, { ValidateFunction } from 'ajv';
+
+import Ajv, { SchemaObjCxt, ValidateFunction } from 'ajv';
 import ajvAddFormats from 'ajv-formats';
 import * as http from 'http';
 import * as https from 'https';
@@ -32,8 +33,9 @@ import { JsonSchema } from './schema';
 import { getTypesOfSchema } from './utility';
 import { visitJson, visitJsonSchema } from './visitor';
 
-export type UriHandler = (uri: string) =>
-  Observable<JsonObject> | Promise<JsonObject> | null | undefined;
+export type UriHandler = (
+  uri: string,
+) => Observable<JsonObject> | Promise<JsonObject> | null | undefined;
 
 export class SchemaValidationException extends BaseException {
   public readonly errors: SchemaValidatorError[];
@@ -61,8 +63,18 @@ export class SchemaValidationException extends BaseException {
 
     const messages = errors.map((err) => {
       let message = `Data path ${JSON.stringify(err.instancePath)} ${err.message}`;
-      if (err.keyword === 'additionalProperties') {
-        message += `(${err.params.additionalProperty})`;
+      if (err.params) {
+        switch (err.keyword) {
+          case 'additionalProperties':
+            message += `(${err.params.additionalProperty})`;
+            break;
+
+          case 'enum':
+            message += `. Allowed values are: ${(err.params.allowedValues as string[] | undefined)
+              ?.map((v) => `"${v}"`)
+              .join(', ')}`;
+            break;
+        }
       }
 
       return message + '.';
@@ -132,7 +144,7 @@ export class CoreSchemaRegistry implements SchemaRegistry {
     return new Promise<JsonObject>((resolve, reject) => {
       const url = new Url.URL(uri);
       const client = url.protocol === 'https:' ? https : http;
-      client.get(url, res => {
+      client.get(url, (res) => {
         if (!res.statusCode || res.statusCode >= 300) {
           // Consume the rest of the data to free memory.
           res.resume();
@@ -140,7 +152,7 @@ export class CoreSchemaRegistry implements SchemaRegistry {
         } else {
           res.setEncoding('utf8');
           let data = '';
-          res.on('data', chunk => {
+          res.on('data', (chunk) => {
             data += chunk;
           });
           res.on('end', () => {
@@ -180,7 +192,7 @@ export class CoreSchemaRegistry implements SchemaRegistry {
   protected _resolver(
     ref: string,
     validate?: ValidateFunction,
-  ): { context?: ValidateFunction, schema?: JsonObject } {
+  ): { context?: ValidateFunction; schema?: JsonObject } {
     if (!validate || !ref) {
       return {};
     }
@@ -229,6 +241,7 @@ export class CoreSchemaRegistry implements SchemaRegistry {
     this._currentCompilationSchemaInfo = undefined;
     const validate = await this._ajv.compileAsync(schema);
 
+    // eslint-disable-next-line @typescript-eslint/no-this-alias
     const self = this;
 
     function visitor(
@@ -237,14 +250,15 @@ export class CoreSchemaRegistry implements SchemaRegistry {
       parentSchema?: JsonObject | JsonArray,
       index?: string,
     ) {
-      if (current
-        && parentSchema
-        && index
-        && isJsonObject(current)
-        && current.hasOwnProperty('$ref')
-        && typeof current['$ref'] == 'string'
+      if (
+        current &&
+        parentSchema &&
+        index &&
+        isJsonObject(current) &&
+        Object.prototype.hasOwnProperty.call(current, '$ref') &&
+        typeof current['$ref'] == 'string'
       ) {
-        const resolved = self._resolver(current['$ref'] as string, validate);
+        const resolved = self._resolver(current['$ref'], validate);
 
         if (resolved.schema) {
           (parentSchema as JsonObject)[index] = resolved.schema;
@@ -267,14 +281,17 @@ export class CoreSchemaRegistry implements SchemaRegistry {
    */
   compile(schema: JsonSchema): Observable<SchemaValidator> {
     return from(this._compile(schema)).pipe(
-      map(validate => (value, options) => from(validate(value, options))),
+      map((validate) => (value, options) => from(validate(value, options))),
     );
   }
 
-  private async _compile(schema: JsonSchema):
-    Promise<(data: JsonValue, options?: SchemaValidatorOptions) => Promise<SchemaValidatorResult>> {
+  private async _compile(
+    schema: JsonSchema,
+  ): Promise<
+    (data: JsonValue, options?: SchemaValidatorOptions) => Promise<SchemaValidatorResult>
+  > {
     if (typeof schema === 'boolean') {
-      return async data => ({ success: schema, data });
+      return async (data) => ({ success: schema, data });
     }
 
     this._replaceDeprecatedSchemaIdKeyword(schema);
@@ -285,10 +302,17 @@ export class CoreSchemaRegistry implements SchemaRegistry {
     };
 
     this._ajv.removeSchema(schema);
-
     let validator: ValidateFunction;
+
     try {
       this._currentCompilationSchemaInfo = schemaInfo;
+      validator = this._ajv.compile(schema);
+    } catch (e) {
+      // This should eventually be refactored so that we we handle race condition where the same schema is validated at the same time.
+      if (!(e instanceof Ajv.MissingRefError)) {
+        throw e;
+      }
+
       validator = await this._ajv.compileAsync(schema);
     } finally {
       this._currentCompilationSchemaInfo = undefined;
@@ -308,7 +332,13 @@ export class CoreSchemaRegistry implements SchemaRegistry {
       // Apply pre-validation transforms
       if (validationOptions.applyPreTransforms) {
         for (const visitor of this._pre.values()) {
-          data = await visitJson(data, visitor, schema, this._resolver.bind(this), validator).toPromise();
+          data = await visitJson(
+            data,
+            visitor,
+            schema,
+            this._resolver.bind(this),
+            validator,
+          ).toPromise();
         }
       }
 
@@ -328,8 +358,9 @@ export class CoreSchemaRegistry implements SchemaRegistry {
           await visitJson(data, visitor, schema, this._resolver.bind(this), validator).toPromise();
         }
 
-        const definitions = schemaInfo.promptDefinitions
-          .filter(def => !validationContext.promptFieldsWithValue.has(def.id));
+        const definitions = schemaInfo.promptDefinitions.filter(
+          (def) => !validationContext.promptFieldsWithValue.has(def.id),
+        );
 
         if (definitions.length > 0) {
           await this._applyPrompts(data, definitions);
@@ -337,15 +368,30 @@ export class CoreSchemaRegistry implements SchemaRegistry {
       }
 
       // Validate using ajv
-      const success = await validator.call(validationContext, data);
-      if (!success) {
-        return { data, success, errors: validator.errors ?? [] };
+      try {
+        const success = await validator.call(validationContext, data);
+
+        if (!success) {
+          return { data, success, errors: validator.errors ?? [] };
+        }
+      } catch (error) {
+        if (error instanceof Ajv.ValidationError) {
+          return { data, success: false, errors: error.errors };
+        }
+
+        throw error;
       }
 
       // Apply post-validation transforms
       if (validationOptions.applyPostTransforms) {
         for (const visitor of this._post.values()) {
-          data = await visitJson(data, visitor, schema, this._resolver.bind(this), validator).toPromise();
+          data = await visitJson(
+            data,
+            visitor,
+            schema,
+            this._resolver.bind(this),
+            validator,
+          ).toPromise();
         }
       }
 
@@ -378,14 +424,8 @@ export class CoreSchemaRegistry implements SchemaRegistry {
           }
 
           // We cheat, heavily.
-          const pathArray = it.dataPathArr
-            .slice(1, it.dataLevel + 1)
-            .map(p => typeof p === 'number' ? p : p.str.slice(1, -1));
-
-          compilationSchemInfo.smartDefaultRecord.set(
-            JSON.stringify(pathArray),
-            schema,
-          );
+          const pathArray = this.normalizeDataPathArr(it);
+          compilationSchemInfo.smartDefaultRecord.set(JSON.stringify(pathArray), schema);
 
           return () => true;
         },
@@ -424,12 +464,10 @@ export class CoreSchemaRegistry implements SchemaRegistry {
           return () => true;
         }
 
-        const path = '/' + it.dataPathArr
-          .slice(1, it.dataLevel + 1)
-          .map(p => typeof p === 'number' ? p : p.str.slice(1, -1)).join('/');
+        const path = '/' + this.normalizeDataPathArr(it).join('/');
 
         let type: string | undefined;
-        let items: Array<string | { label: string, value: string | number | boolean }> | undefined;
+        let items: Array<string | { label: string; value: string | number | boolean }> | undefined;
         let message: string;
         if (typeof schema == 'string') {
           message = schema;
@@ -465,7 +503,8 @@ export class CoreSchemaRegistry implements SchemaRegistry {
               : schema.multiselect;
 
           const enumValues = multiselect
-            ? (parentSchema as JsonObject).items && ((parentSchema as JsonObject).items as JsonObject).enum
+            ? (parentSchema as JsonObject).items &&
+              ((parentSchema as JsonObject).items as JsonObject).enum
             : (parentSchema as JsonObject).enum;
           if (!items && Array.isArray(enumValues)) {
             items = [];
@@ -491,10 +530,10 @@ export class CoreSchemaRegistry implements SchemaRegistry {
           propertyTypes,
           default:
             typeof (parentSchema as JsonObject).default == 'object' &&
-              (parentSchema as JsonObject).default !== null &&
-              !Array.isArray((parentSchema as JsonObject).default)
+            (parentSchema as JsonObject).default !== null &&
+            !Array.isArray((parentSchema as JsonObject).default)
               ? undefined
-              : (parentSchema as JsonObject).default as string[],
+              : ((parentSchema as JsonObject).default as string[]),
           async validator(data: JsonValue) {
             try {
               const result = await it.self.validate(parentSchema, data);
@@ -555,63 +594,47 @@ export class CoreSchemaRegistry implements SchemaRegistry {
     for (const path in answers) {
       const pathFragments = path.split('/').slice(1);
 
-      CoreSchemaRegistry._set(
-        data,
-        pathFragments,
-        answers[path] as {},
-        null,
-        undefined,
-        true,
-      );
+      CoreSchemaRegistry._set(data, pathFragments, answers[path], null, undefined, true);
     }
   }
 
   private static _set(
-    // tslint:disable-next-line:no-any
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     data: any,
     fragments: string[],
-    value: {},
-    // tslint:disable-next-line:no-any
-    parent: any | null = null,
+    value: unknown,
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    parent: any = null,
     parentProperty?: string,
     force?: boolean,
   ): void {
-    for (let i = 0; i < fragments.length; i++) {
-      const f = fragments[i];
-
-      if (f[0] == 'i') {
+    for (let index = 0; index < fragments.length; index++) {
+      const fragment = fragments[index];
+      if (/^i\d+$/.test(fragment)) {
         if (!Array.isArray(data)) {
           return;
         }
 
-        for (let j = 0; j < data.length; j++) {
-          CoreSchemaRegistry._set(data[j], fragments.slice(i + 1), value, data, '' + j);
-        }
-
-        return;
-      }
-
-      if (f.startsWith('key')) {
-        if (typeof data !== 'object') {
-          return;
-        }
-
-        for (const property in data) {
-          CoreSchemaRegistry._set(data[property], fragments.slice(i + 1), value, data, property);
+        for (let dataIndex = 0; dataIndex < data.length; dataIndex++) {
+          CoreSchemaRegistry._set(
+            data[dataIndex],
+            fragments.slice(index + 1),
+            value,
+            data,
+            `${dataIndex}`,
+          );
         }
 
         return;
       }
 
-
-      // We know we need an object because the fragment is a property key.
       if (!data && parent !== null && parentProperty) {
         data = parent[parentProperty] = {};
       }
-      parent = data;
-      parentProperty = f;
 
-      data = data[f];
+      parent = data;
+      parentProperty = fragment;
+      data = data[fragment];
     }
 
     if (parent && parentProperty && (force || parent[parentProperty] === undefined)) {
@@ -625,7 +648,7 @@ export class CoreSchemaRegistry implements SchemaRegistry {
   ): Promise<void> {
     for (const [pointer, schema] of smartDefaults.entries()) {
       const fragments = JSON.parse(pointer);
-      const source = this._sourceMap.get((schema as JsonObject).$source as string);
+      const source = this._sourceMap.get(schema.$source as string);
       if (!source) {
         continue;
       }
@@ -644,7 +667,11 @@ export class CoreSchemaRegistry implements SchemaRegistry {
       keyword: 'x-deprecated',
       validate: (schema, _data, _parentSchema, dataCxt) => {
         if (schema) {
-          onUsage(`Option "${dataCxt?.parentDataProperty}" is deprecated${typeof schema == 'string' ? ': ' + schema : '.'}`);
+          onUsage(
+            `Option "${dataCxt?.parentDataProperty}" is deprecated${
+              typeof schema == 'string' ? ': ' + schema : '.'
+            }`,
+          );
         }
 
         return true;
@@ -662,8 +689,16 @@ export class CoreSchemaRegistry implements SchemaRegistry {
       schema.$id = schema.id;
       delete schema.id;
 
-      // tslint:disable-next-line:no-console
-      console.warn(`"${schema.$id}" schema is using the keyword "id" which its support is deprecated. Use "$id" for schema ID.`);
+      // eslint-disable-next-line no-console
+      console.warn(
+        `"${schema.$id}" schema is using the keyword "id" which its support is deprecated. Use "$id" for schema ID.`,
+      );
     }
   }
+
+  private normalizeDataPathArr(it: SchemaObjCxt): (number | string)[] {
+    return it.dataPathArr
+      .slice(1, it.dataLevel + 1)
+      .map((p) => (typeof p === 'number' ? p : p.str.replace(/\"/g, '')));
+  }
 }
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 5790bdce095a..aa9825585e66 100644
--- a/packages/angular_devkit/core/src/json/schema/registry_spec.ts
+++ b/packages/angular_devkit/core/src/json/schema/registry_spec.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
  */
-// tslint:disable:no-any non-null-operator no-big-function
-import { of as observableOf } from 'rxjs';
+
+/* eslint-disable @typescript-eslint/no-explicit-any */
 import { map, mergeMap } from 'rxjs/operators';
 import { SchemaFormat } from './interface';
-import { CoreSchemaRegistry } from './registry';
+import { CoreSchemaRegistry, SchemaValidationException } from './registry';
 import { addUndefinedDefaults } from './transforms';
 
-
 describe('CoreSchemaRegistry', () => {
-  it('works asynchronously', done => {
+  it('works asynchronously', (done) => {
     const registry = new CoreSchemaRegistry();
     registry.addPostTransform(addUndefinedDefaults);
-    const data: any = {};  // tslint:disable-line:no-any
+    const data: any = {};
 
     registry
       .compile({
@@ -31,25 +30,26 @@ describe('CoreSchemaRegistry', () => {
             },
           },
           tslint: {
-            $ref: 'https://json.schemastore.org/tslint#',
+            $ref: 'https://json.schemastore.org/npm-link-up#',
           },
         },
       })
       .pipe(
-        mergeMap(validator => validator(data)),
-        map(result => {
+        mergeMap((validator) => validator(data)),
+        map((result) => {
           expect(result.success).toBe(true);
           expect(data.obj.num).toBeUndefined();
           expect(data.tslint).not.toBeUndefined();
         }),
       )
-      .toPromise().then(done, done.fail);
+      .toPromise()
+      .then(done, done.fail);
   });
 
-  it('supports pre transforms', done => {
+  it('supports pre transforms', (done) => {
     const registry = new CoreSchemaRegistry();
     registry.addPostTransform(addUndefinedDefaults);
-    const data: any = {};  // tslint:disable-line:no-any
+    const data = {};
 
     registry.addPreTransform((data, ptr) => {
       if (ptr == '/') {
@@ -73,18 +73,19 @@ describe('CoreSchemaRegistry', () => {
         },
       })
       .pipe(
-        mergeMap(validator => validator(data)),
-        map(result => {
+        mergeMap((validator) => validator(data)),
+        map((result) => {
           const data = result.data as any;
           expect(result.success).toBe(true);
           expect(data.str).toBe('string');
           expect(data.obj.num).toBeUndefined();
         }),
       )
-      .toPromise().then(done, done.fail);
+      .toPromise()
+      .then(done, done.fail);
   });
 
-  it('supports local references', done => {
+  it('supports local references', (done) => {
     const registry = new CoreSchemaRegistry();
     registry.addPostTransform(addUndefinedDefaults);
     const data = { numbers: { one: 1 } };
@@ -102,16 +103,17 @@ describe('CoreSchemaRegistry', () => {
         },
       })
       .pipe(
-        mergeMap(validator => validator(data)),
-        map(result => {
+        mergeMap((validator) => validator(data)),
+        map((result) => {
           expect(result.success).toBe(true);
           expect(data.numbers.one).not.toBeUndefined();
         }),
-    )
-      .toPromise().then(done, done.fail);
+      )
+      .toPromise()
+      .then(done, done.fail);
   });
 
-  it('fails on invalid additionalProperties', done => {
+  it('fails on invalid additionalProperties', (done) => {
     const registry = new CoreSchemaRegistry();
     registry.addPostTransform(addUndefinedDefaults);
     const data = { notNum: 'foo' };
@@ -122,18 +124,46 @@ describe('CoreSchemaRegistry', () => {
           num: { type: 'number' },
         },
         additionalProperties: false,
-      }).pipe(
-        mergeMap(validator => validator(data)),
-        map(result => {
+      })
+      .pipe(
+        mergeMap((validator) => validator(data)),
+        map((result) => {
           expect(result.success).toBe(false);
           expect(result.errors && result.errors[0].message).toContain(
-            'should NOT have additional properties');
+            'must NOT have additional properties',
+          );
         }),
-    )
-      .toPromise().then(done, done.fail);
+      )
+      .toPromise()
+      .then(done, done.fail);
   });
 
-  it('fails on invalid additionalProperties async', done => {
+  it('fails on invalid enum value', (done) => {
+    const registry = new CoreSchemaRegistry();
+    registry.addPostTransform(addUndefinedDefaults);
+    const data = { packageManager: 'foo' };
+
+    registry
+      .compile({
+        properties: {
+          packageManager: { type: 'string', enum: ['npm', 'yarn', 'pnpm', 'cnpm'] },
+        },
+        additionalProperties: false,
+      })
+      .pipe(
+        mergeMap((validator) => validator(data)),
+        map((result) => {
+          expect(result.success).toBe(false);
+          expect(new SchemaValidationException(result.errors).message).toContain(
+            `Data path "/packageManager" must be equal to one of the allowed values. Allowed values are: "npm", "yarn", "pnpm", "cnpm".`,
+          );
+        }),
+      )
+      .toPromise()
+      .then(done, done.fail);
+  });
+
+  it('fails on invalid additionalProperties async', (done) => {
     const registry = new CoreSchemaRegistry();
     registry.addPostTransform(addUndefinedDefaults);
     const data = { notNum: 'foo' };
@@ -145,19 +175,20 @@ describe('CoreSchemaRegistry', () => {
           num: { type: 'number' },
         },
         additionalProperties: false,
-      }).pipe(
-        mergeMap(validator => validator(data)),
-        map(result => {
+      })
+      .pipe(
+        mergeMap((validator) => validator(data)),
+        map((result) => {
           expect(result.success).toBe(false);
-          expect(result.errors && result.errors[0].message).toContain(
-            'should NOT have additional properties');
-          expect(result.errors && result.errors[0].keyword).toBe('additionalProperties');
+          expect(result.errors?.[0].message).toContain('must NOT have additional properties');
+          expect(result.errors?.[0].keyword).toBe('additionalProperties');
         }),
       )
-      .toPromise().then(done, done.fail);
+      .toPromise()
+      .then(done, done.fail);
   });
 
-  it('supports sync format', done => {
+  it('supports sync format', (done) => {
     const registry = new CoreSchemaRegistry();
     const data = { str: 'hotdog' };
     const format = {
@@ -176,15 +207,16 @@ describe('CoreSchemaRegistry', () => {
         },
       })
       .pipe(
-        mergeMap(validator => validator(data)),
-        map(result => {
+        mergeMap((validator) => validator(data)),
+        map((result) => {
           expect(result.success).toBe(true);
         }),
       )
-      .toPromise().then(done, done.fail);
+      .toPromise()
+      .then(done, done.fail);
   });
 
-  it('supports async format', done => {
+  it('supports async format', (done) => {
     const registry = new CoreSchemaRegistry();
     const data = { str: 'hotdog' };
 
@@ -206,15 +238,16 @@ describe('CoreSchemaRegistry', () => {
         },
       })
       .pipe(
-        mergeMap(validator => validator(data)),
-        map(result => {
+        mergeMap((validator) => validator(data)),
+        map((result) => {
           expect(result.success).toBe(true);
         }),
       )
-      .toPromise().then(done, done.fail);
+      .toPromise()
+      .then(done, done.fail);
   });
 
-  it('shows dataPath and message on error', done => {
+  it('shows dataPath and message on error', async () => {
     const registry = new CoreSchemaRegistry();
     const data = { hotdot: 'hotdog', banana: 'banana' };
     const format: SchemaFormat = {
@@ -227,7 +260,7 @@ describe('CoreSchemaRegistry', () => {
 
     registry.addFormat(format);
 
-    registry
+    await registry
       .compile({
         properties: {
           hotdot: { type: 'string', format: 'is-hotdog' },
@@ -235,19 +268,19 @@ describe('CoreSchemaRegistry', () => {
         },
       })
       .pipe(
-        mergeMap(validator => validator(data)),
-        map(result => {
+        mergeMap((validator) => validator(data)),
+        map((result) => {
           expect(result.success).toBe(false);
           expect(result.errors && result.errors[0]).toBeTruthy();
           expect(result.errors && result.errors[0].keyword).toBe('format');
-          expect(result.errors && result.errors[0].instancePath).toBe('.banana');
+          expect(result.errors && result.errors[0].instancePath).toBe('/banana');
           expect(result.errors && (result.errors[0].params as any).format).toBe('is-hotdog');
         }),
       )
-      .toPromise().then(done, done.fail);
+      .toPromise();
   });
 
-  it('supports smart defaults', done => {
+  it('supports smart defaults', (done) => {
     const registry = new CoreSchemaRegistry();
     const data: any = {
       arr: [{}],
@@ -269,7 +302,7 @@ describe('CoreSchemaRegistry', () => {
       return schema['blue'];
     });
     registry.addSmartDefaultProvider('test3', () => {
-      return [ 1, 2, 3 ];
+      return [1, 2, 3];
     });
 
     registry
@@ -325,8 +358,8 @@ describe('CoreSchemaRegistry', () => {
         },
       })
       .pipe(
-        mergeMap(validator => validator(data)),
-        map(result => {
+        mergeMap((validator) => validator(data)),
+        map((result) => {
           expect(result.success).toBe(true);
           expect(data.bool).toBe(true);
           expect(data.arr[0].test).toBe('yep');
@@ -334,13 +367,14 @@ describe('CoreSchemaRegistry', () => {
           expect(data.obj.deep.arr).toEqual([1, 2, 3]);
         }),
       )
-      .toPromise().then(done, done.fail);
+      .toPromise()
+      .then(done, done.fail);
   });
 
   it('works with true as a schema and post-transforms', async () => {
     const registry = new CoreSchemaRegistry();
     registry.addPostTransform(addUndefinedDefaults);
-    const data: any = { a: 1, b: 2 };  // tslint:disable-line:no-any
+    const data = { a: 1, b: 2 };
 
     const validate = await registry.compile(true).toPromise();
     const result = await validate(data).toPromise();
@@ -349,10 +383,10 @@ describe('CoreSchemaRegistry', () => {
     expect(result.data).toBe(data);
   });
 
-  it('adds deprecated options usage', done => {
+  it('adds deprecated options usage', (done) => {
     const registry = new CoreSchemaRegistry();
     const deprecatedMessages: string[] = [];
-    registry.useXDeprecatedProvider(m => deprecatedMessages.push(m));
+    registry.useXDeprecatedProvider((m) => deprecatedMessages.push(m));
 
     const data = {
       foo: true,
@@ -370,14 +404,15 @@ describe('CoreSchemaRegistry', () => {
         },
       })
       .pipe(
-        mergeMap(validator => validator(data)),
-        map(result => {
+        mergeMap((validator) => validator(data)),
+        map((result) => {
           expect(deprecatedMessages.length).toBe(2);
           expect(deprecatedMessages[0]).toBe('Option "foo" is deprecated: Use bar instead.');
           expect(deprecatedMessages[1]).toBe('Option "bar" is deprecated.');
           expect(result.success).toBe(true, result.errors);
         }),
       )
-      .toPromise().then(done, done.fail);
+      .toPromise()
+      .then(done, done.fail);
   });
 });
diff --git a/packages/angular_devkit/core/src/json/schema/schema.ts b/packages/angular_devkit/core/src/json/schema/schema.ts
index fab3ff69e978..c0161d20ab8a 100644
--- a/packages/angular_devkit/core/src/json/schema/schema.ts
+++ b/packages/angular_devkit/core/src/json/schema/schema.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 { JsonObject, JsonValue, isJsonObject } from '../interface';
 
 /**
@@ -14,7 +15,6 @@ import { JsonObject, JsonValue, isJsonObject } from '../interface';
  */
 export type JsonSchema = JsonObject | boolean;
 
-
 export function isJsonSchema(value: unknown): value is JsonSchema {
   return isJsonObject(value as JsonValue) || value === false || value === 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..d207688a4b3d 100644
--- a/packages/angular_devkit/core/src/json/schema/transforms.ts
+++ b/packages/angular_devkit/core/src/json/schema/transforms.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 { JsonObject, JsonValue, isJsonArray, isJsonObject } from '../interface';
 import { JsonPointer } from './interface';
 import { JsonSchema } from './schema';
@@ -73,20 +74,22 @@ export function addUndefinedDefaults(
         const propertySchemas = schemaObject.oneOf || schemaObject.anyOf;
         const allProperties = Object.keys(value);
         // Locate a schema which declares all the properties that the object contains.
-        const adjustedSchema = isJsonArray(propertySchemas) && propertySchemas.find(s => {
-          if (!isJsonObject(s)) {
-            return false;
-          }
+        const adjustedSchema =
+          isJsonArray(propertySchemas) &&
+          propertySchemas.find((s) => {
+            if (!isJsonObject(s)) {
+              return false;
+            }
 
-          const schemaType = getTypesOfSchema(s);
-          if (schemaType.size === 1 && schemaType.has('object') && isJsonObject(s.properties)) {
-            const properties = Object.keys(s.properties);
+            const schemaType = getTypesOfSchema(s);
+            if (schemaType.size === 1 && schemaType.has('object') && isJsonObject(s.properties)) {
+              const properties = Object.keys(s.properties);
 
-            return allProperties.every(key => properties.includes(key));
-          }
+              return allProperties.every((key) => properties.includes(key));
+            }
 
-          return false;
-        });
+            return false;
+          });
 
         if (adjustedSchema && isJsonObject(adjustedSchema)) {
           newValue[propName] = addUndefinedDefaults(value, _pointer, adjustedSchema);
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..d9292a55a1ec 100644
--- a/packages/angular_devkit/core/src/json/schema/transforms_spec.ts
+++ b/packages/angular_devkit/core/src/json/schema/transforms_spec.ts
@@ -1,20 +1,20 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+
 import { mergeMap } from 'rxjs/operators';
 import { CoreSchemaRegistry } from './registry';
 import { addUndefinedDefaults } from './transforms';
 
-// tslint:disable-next-line: no-big-function
 describe('addUndefinedDefaults', () => {
   it('should add defaults to undefined properties (1)', async () => {
     const registry = new CoreSchemaRegistry();
     registry.addPreTransform(addUndefinedDefaults);
-    const data: any = {};  // tslint:disable-line:no-any
+    const data: any = {}; // eslint-disable-line @typescript-eslint/no-explicit-any
 
     const result = await registry
       .compile({
@@ -28,20 +28,13 @@ describe('addUndefinedDefaults', () => {
             },
           },
           objAllOk: {
-            allOf: [
-              { type: 'object' },
-            ],
+            allOf: [{ type: 'object' }],
           },
           objAllBad: {
-            allOf: [
-              { type: 'object' },
-              { type: 'number' },
-            ],
+            allOf: [{ type: 'object' }, { type: 'number' }],
           },
           objOne: {
-            oneOf: [
-              { type: 'object' },
-            ],
+            oneOf: [{ type: 'object' }],
           },
           objNotOk: {
             not: { not: { type: 'object' } },
@@ -52,12 +45,9 @@ describe('addUndefinedDefaults', () => {
           },
         },
       })
-      .pipe(
-        mergeMap(validator => validator(data)),
-      )
+      .pipe(mergeMap((validator) => validator(data)))
       .toPromise();
 
-
     expect(result.success).toBeTrue();
     expect(data.bool).toBeUndefined();
     expect(data.str).toBe('someString');
@@ -73,7 +63,7 @@ describe('addUndefinedDefaults', () => {
   it('should add defaults to undefined properties (2)', async () => {
     const registry = new CoreSchemaRegistry();
     registry.addPreTransform(addUndefinedDefaults);
-    // tslint:disable-next-line: no-any
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const data: any = {
       bool: undefined,
       str: undefined,
@@ -94,9 +84,8 @@ describe('addUndefinedDefaults', () => {
           },
         },
       })
-      .pipe(
-        mergeMap(validator => validator(data)),
-      ).toPromise();
+      .pipe(mergeMap((validator) => validator(data)))
+      .toPromise();
 
     expect(result.success).toBeTrue();
     expect(data.bool).toBeTrue();
@@ -107,11 +96,11 @@ describe('addUndefinedDefaults', () => {
   it('should add defaults to undefined properties when using oneOf', async () => {
     const registry = new CoreSchemaRegistry();
     registry.addPreTransform(addUndefinedDefaults);
-    // tslint:disable-next-line: no-any
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const dataNoObj: any = {
       bool: undefined,
     };
-    // tslint:disable-next-line: no-any
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const dataObj: any = {
       bool: undefined,
       obj: {
@@ -119,58 +108,51 @@ describe('addUndefinedDefaults', () => {
       },
     };
 
-    const validator = registry
-      .compile({
-        properties: {
-          bool: { type: 'boolean', default: true },
-          obj: {
-            default: true,
-            oneOf: [
-              {
-                type: 'object',
-                properties: {
-                  a: { type: 'boolean', default: true },
-                  b: { type: 'boolean', default: true },
-                  c: { type: 'boolean', default: false },
-                },
+    const validator = registry.compile({
+      properties: {
+        bool: { type: 'boolean', default: true },
+        obj: {
+          default: true,
+          oneOf: [
+            {
+              type: 'object',
+              properties: {
+                a: { type: 'boolean', default: true },
+                b: { type: 'boolean', default: true },
+                c: { type: 'boolean', default: false },
               },
-              {
-                type: 'boolean',
-              },
-            ],
-          },
-          noDefaultOneOf: {
-            oneOf: [
-              {
-                type: 'object',
-                properties: {
-                  a: { type: 'boolean', default: true },
-                  b: { type: 'boolean', default: true },
-                  c: { type: 'boolean', default: false },
-                },
-              },
-              {
-                type: 'boolean',
+            },
+            {
+              type: 'boolean',
+            },
+          ],
+        },
+        noDefaultOneOf: {
+          oneOf: [
+            {
+              type: 'object',
+              properties: {
+                a: { type: 'boolean', default: true },
+                b: { type: 'boolean', default: true },
+                c: { type: 'boolean', default: false },
               },
-            ],
-          },
+            },
+            {
+              type: 'boolean',
+            },
+          ],
         },
-      });
+      },
+    });
 
-    const result1 = await validator
-      .pipe(
-        mergeMap(validator => validator(dataNoObj)),
-      ).toPromise();
+    const result1 = await validator.pipe(mergeMap((validator) => validator(dataNoObj))).toPromise();
 
     expect(result1.success).toBeTrue();
     expect(dataNoObj.bool).toBeTrue();
     expect(dataNoObj.obj).toBeTrue();
     expect(dataNoObj.noDefaultOneOf).toBeUndefined();
 
-    const result2 = await validator
-      .pipe(
-        mergeMap(validator => validator(dataObj)),
-      ).toPromise();
+    const result2 = await validator.pipe(mergeMap((validator) => validator(dataObj))).toPromise();
 
     expect(result2.success).toBeTrue();
     expect(dataObj.bool).toBeTrue();
@@ -182,11 +164,11 @@ describe('addUndefinedDefaults', () => {
   it('should add defaults to undefined properties when using anyOf', async () => {
     const registry = new CoreSchemaRegistry();
     registry.addPreTransform(addUndefinedDefaults);
-    // tslint:disable-next-line: no-any
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const dataNoObj: any = {
       bool: undefined,
     };
-    // tslint:disable-next-line: no-any
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const dataObj: any = {
       bool: undefined,
       obj: {
@@ -194,48 +176,41 @@ describe('addUndefinedDefaults', () => {
       },
     };
 
-    const validator = registry
-      .compile({
-        properties: {
-          bool: { type: 'boolean', default: true },
-          obj: {
-            default: true,
-            anyOf: [
-              {
-                type: 'object',
-                properties: {
-                  d: { type: 'boolean', default: false },
-                },
+    const validator = registry.compile({
+      properties: {
+        bool: { type: 'boolean', default: true },
+        obj: {
+          default: true,
+          anyOf: [
+            {
+              type: 'object',
+              properties: {
+                d: { type: 'boolean', default: false },
               },
-              {
-                type: 'object',
-                properties: {
-                  a: { type: 'boolean', default: true },
-                  b: { type: 'boolean', default: true },
-                  c: { type: 'boolean', default: false },
-                },
-              },
-              {
-                type: 'boolean',
+            },
+            {
+              type: 'object',
+              properties: {
+                a: { type: 'boolean', default: true },
+                b: { type: 'boolean', default: true },
+                c: { type: 'boolean', default: false },
               },
-            ],
-          },
+            },
+            {
+              type: 'boolean',
+            },
+          ],
         },
-      });
+      },
+    });
 
-    const result1 = await validator
-      .pipe(
-        mergeMap(validator => validator(dataNoObj)),
-      ).toPromise();
+    const result1 = await validator.pipe(mergeMap((validator) => validator(dataNoObj))).toPromise();
 
     expect(result1.success).toBeTrue();
     expect(dataNoObj.bool).toBeTrue();
     expect(dataNoObj.obj).toBeTrue();
 
-    const result2 = await validator
-      .pipe(
-        mergeMap(validator => validator(dataObj)),
-      ).toPromise();
+    const result2 = await validator.pipe(mergeMap((validator) => validator(dataObj))).toPromise();
 
     expect(result2.success).toBeTrue();
     expect(dataObj.bool).toBeTrue();
diff --git a/packages/angular_devkit/core/src/json/schema/utility.ts b/packages/angular_devkit/core/src/json/schema/utility.ts
index 00b4a8278343..aadaed835bf5 100644
--- a/packages/angular_devkit/core/src/json/schema/utility.ts
+++ b/packages/angular_devkit/core/src/json/schema/utility.ts
@@ -1,14 +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 { JsonObject, isJsonArray, isJsonObject } from '../interface';
 import { JsonSchema } from './schema';
 
-
 const allTypes = ['string', 'integer', 'number', 'object', 'array', 'boolean', 'null'];
 
 export function getTypesOfSchema(schema: JsonSchema): Set<string> {
@@ -53,13 +53,13 @@ export function getTypesOfSchema(schema: JsonSchema): Set<string> {
 
   if (isJsonObject(schema.not)) {
     const notTypes = getTypesOfSchema(schema.not);
-    potentials = new Set([...potentials].filter(p => !notTypes.has(p)));
+    potentials = new Set([...potentials].filter((p) => !notTypes.has(p)));
   }
 
   if (Array.isArray(schema.allOf)) {
     for (const sub of schema.allOf) {
       const types = getTypesOfSchema(sub as JsonObject);
-      potentials = new Set([...types].filter(t => potentials.has(t)));
+      potentials = new Set([...types].filter((t) => potentials.has(t)));
     }
   }
 
@@ -69,7 +69,7 @@ export function getTypesOfSchema(schema: JsonSchema): Set<string> {
       const types = getTypesOfSchema(sub as JsonObject);
       options = new Set([...options, ...types]);
     }
-    potentials = new Set([...options].filter(o => potentials.has(o)));
+    potentials = new Set([...options].filter((o) => potentials.has(o)));
   }
 
   if (Array.isArray(schema.anyOf)) {
@@ -78,7 +78,7 @@ export function getTypesOfSchema(schema: JsonSchema): Set<string> {
       const types = getTypesOfSchema(sub as JsonObject);
       options = new Set([...options, ...types]);
     }
-    potentials = new Set([...options].filter(o => potentials.has(o)));
+    potentials = new Set([...options].filter((o) => potentials.has(o)));
   }
 
   if (schema.properties) {
diff --git a/packages/angular_devkit/core/src/json/schema/visitor.ts b/packages/angular_devkit/core/src/json/schema/visitor.ts
index 194c29eef4fe..be8471337b6c 100644
--- a/packages/angular_devkit/core/src/json/schema/visitor.ts
+++ b/packages/angular_devkit/core/src/json/schema/visitor.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 { Observable, concat, from, isObservable, of as observableOf } from 'rxjs';
 import { concatMap, ignoreElements, mergeMap, tap } from 'rxjs/operators';
 import { JsonArray, JsonObject, JsonValue } from '../interface';
@@ -57,9 +58,10 @@ function _visitJsonRecursive<ContextT>(
     // There's no schema definition, so just visit the JSON recursively.
     schema = undefined;
   }
+  // eslint-disable-next-line no-prototype-builtins
   if (schema && schema.hasOwnProperty('$ref') && typeof schema['$ref'] == 'string') {
     if (refResolver) {
-      const resolved = refResolver(schema['$ref'] as string, context);
+      const resolved = refResolver(schema['$ref'], context);
       schema = resolved.schema;
       context = resolved.context;
     }
@@ -68,7 +70,7 @@ function _visitJsonRecursive<ContextT>(
   const value = visitor(json, ptr, schema as JsonObject, root);
 
   return (isObservable<JsonValue>(value) ? value : observableOf(value)).pipe(
-    concatMap(value => {
+    concatMap((value) => {
       if (Array.isArray(value)) {
         return concat(
           from(value).pipe(
@@ -81,7 +83,7 @@ function _visitJsonRecursive<ContextT>(
                 refResolver,
                 context,
                 root || value,
-              ).pipe(tap<JsonValue>(x => (value[i] = x)));
+              ).pipe(tap<JsonValue>((x) => (value[i] = x)));
             }),
             ignoreElements(),
           ),
@@ -90,7 +92,7 @@ function _visitJsonRecursive<ContextT>(
       } else if (typeof value == 'object' && value !== null) {
         return concat(
           from(Object.getOwnPropertyNames(value)).pipe(
-            mergeMap(key => {
+            mergeMap((key) => {
               return _visitJsonRecursive(
                 value[key],
                 visitor,
@@ -100,7 +102,7 @@ function _visitJsonRecursive<ContextT>(
                 context,
                 root || value,
               ).pipe(
-                tap<JsonValue>(x => {
+                tap<JsonValue>((x) => {
                   const descriptor = Object.getOwnPropertyDescriptor(value, key);
                   if (descriptor && descriptor.writable && value[key] !== x) {
                     value[key] = x;
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..68a15f5f4758 100644
--- a/packages/angular_devkit/core/src/json/schema/visitor_spec.ts
+++ b/packages/angular_devkit/core/src/json/schema/visitor_spec.ts
@@ -1,37 +1,36 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+
 import { Observable, from } from 'rxjs';
 import { JsonObject, JsonValue } from '..';
 import { visitJson } from './visitor';
 
-
 function syncObs<T>(obs: Observable<T>): T {
   let value: T;
   let set = false;
 
   obs
-    .forEach(x => {
+    .forEach((x) => {
       if (set) {
         throw new Error('Multiple value.');
       }
       value = x;
       set = true;
     })
-    .catch(err => fail(err));
+    .catch((err) => fail(err));
 
   if (!set) {
     throw new Error('Async observable.');
   }
 
-  return value !;  // tslint:disable-line:no-non-null-assertion
+  return value!; // eslint-disable-line @typescript-eslint/no-non-null-assertion
 }
 
-
 describe('visitJson', () => {
   it('works to replace the root', () => {
     const json = { a: 1 };
@@ -45,13 +44,15 @@ describe('visitJson', () => {
     const json = { a: 1 };
     const newJson = { b: 'hello ' };
 
-    const result = syncObs(visitJson(json, value => {
-      if (typeof value == 'object') {
-        return newJson;
-      } else {
-        return value + 'world';
-      }
-    }));
+    const result = syncObs(
+      visitJson(json, (value) => {
+        if (typeof value == 'object') {
+          return newJson;
+        } else {
+          return value + 'world';
+        }
+      }),
+    );
     expect(result).toEqual({ b: 'hello world' });
     expect(newJson).toEqual({ b: 'hello world' });
   });
@@ -62,26 +63,28 @@ describe('visitJson', () => {
     const newJson2 = { c: [] };
     const newJson3 = [1, 2, 3];
 
-    const result = syncObs(visitJson(json, (value, ptr) => {
-      if (ptr.endsWith('a')) {
-        return newJson;
-      } else if (ptr.endsWith('b')) {
-        return newJson2;
-      } else if (ptr.endsWith('c')) {
-        return newJson3;
-      } else if (typeof value == 'number') {
-        return '_' + value;
-      } else if (ptr == '/') {
-        return value;
-      } else {
-        return 'abc';
-      }
-    }));
+    const result = syncObs(
+      visitJson(json, (value, ptr) => {
+        if (ptr.endsWith('a')) {
+          return newJson;
+        } else if (ptr.endsWith('b')) {
+          return newJson2;
+        } else if (ptr.endsWith('c')) {
+          return newJson3;
+        } else if (typeof value == 'number') {
+          return '_' + value;
+        } else if (ptr == '/') {
+          return value;
+        } else {
+          return 'abc';
+        }
+      }),
+    );
 
     expect(result).toEqual({ a: { b: { c: ['_1', '_2', '_3'] } } });
   });
 
-  it('goes through all replacements recursively (async)', done => {
+  it('goes through all replacements recursively (async)', (done) => {
     const json = { a: 1 };
     const newJson = { b: '' };
     const newJson2 = { c: [] };
@@ -101,13 +104,12 @@ describe('visitJson', () => {
       } else {
         return from(Promise.resolve('abc'));
       }
-    }).toPromise().then(
-      result => {
+    })
+      .toPromise()
+      .then((result) => {
         expect(result).toEqual({ a: { b: { c: ['_1', '_2', '_3'] } } });
         done();
-      },
-      done.fail,
-    );
+      }, done.fail);
   });
 
   it('works with schema', () => {
diff --git a/packages/angular_devkit/core/src/logger/indent.ts b/packages/angular_devkit/core/src/logger/indent.ts
index 7eb1958fc855..18c132de10b2 100644
--- a/packages/angular_devkit/core/src/logger/indent.ts
+++ b/packages/angular_devkit/core/src/logger/indent.ts
@@ -1,14 +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 { map } from 'rxjs/operators';
 import { Logger } from './logger';
 
-
 /**
  * Keep an map of indentation => array of indentations based on the level.
  * This is to optimize calculating the prefix based on the indentation itself. Since most logs
@@ -16,8 +16,7 @@ import { Logger } from './logger';
  * loggers. Also, string concatenation is expensive so performing concats for every log entries
  * is expensive; this alleviates it.
  */
-const indentationMap: {[indentationType: string]: string[]} = {};
-
+const indentationMap: { [indentationType: string]: string[] } = {};
 
 export class IndentLogger extends Logger {
   constructor(name: string, parent: Logger | null = null, indentation = '  ') {
@@ -26,19 +25,21 @@ export class IndentLogger extends Logger {
     indentationMap[indentation] = indentationMap[indentation] || [''];
     const indentMap = indentationMap[indentation];
 
-    this._observable = this._observable.pipe(map(entry => {
-      const l = entry.path.filter(x => !!x).length;
-      if (l >= indentMap.length) {
-        let current = indentMap[indentMap.length - 1];
-        while (l >= indentMap.length) {
-          current += indentation;
-          indentMap.push(current);
+    this._observable = this._observable.pipe(
+      map((entry) => {
+        const l = entry.path.filter((x) => !!x).length;
+        if (l >= indentMap.length) {
+          let current = indentMap[indentMap.length - 1];
+          while (l >= indentMap.length) {
+            current += indentation;
+            indentMap.push(current);
+          }
         }
-      }
 
-      entry.message = indentMap[l] + entry.message.split(/\n/).join('\n' + indentMap[l]);
+        entry.message = indentMap[l] + entry.message.split(/\n/).join('\n' + indentMap[l]);
 
-      return entry;
-    }));
+        return entry;
+      }),
+    );
   }
 }
diff --git a/packages/angular_devkit/core/src/logger/indent_spec.ts b/packages/angular_devkit/core/src/logger/indent_spec.ts
index a35ed3307a96..3d1f922dce92 100644
--- a/packages/angular_devkit/core/src/logger/indent_spec.ts
+++ b/packages/angular_devkit/core/src/logger/indent_spec.ts
@@ -1,20 +1,21 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-// tslint:disable:no-any
+
+/* eslint-disable @typescript-eslint/no-explicit-any */
 import { toArray } from 'rxjs/operators';
 import { IndentLogger } from './indent';
 import { LogEntry, Logger } from './logger';
 
-
 describe('IndentSpec', () => {
   it('works', (done: DoneFn) => {
     const logger = new IndentLogger('test');
-    logger.pipe(toArray())
+    logger
+      .pipe(toArray())
       .toPromise()
       .then((observed: LogEntry[]) => {
         expect(observed).toEqual([
@@ -25,7 +26,10 @@ describe('IndentSpec', () => {
           jasmine.objectContaining({ message: 'test5', level: 'info', name: 'test' }) as any,
         ]);
       })
-      .then(() => done(), err => done.fail(err));
+      .then(
+        () => done(),
+        (err) => done.fail(err),
+      );
     const logger2 = new Logger('test2', logger);
     const logger3 = new Logger('test3', logger2);
     const logger4 = new Logger('test4', logger);
diff --git a/packages/angular_devkit/core/src/logger/index.ts b/packages/angular_devkit/core/src/logger/index.ts
index 63bc0860b0c8..02fb1e32bd1c 100644
--- a/packages/angular_devkit/core/src/logger/index.ts
+++ b/packages/angular_devkit/core/src/logger/index.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
  */
+
 export * from './indent';
 export * from './level';
 export * from './logger';
diff --git a/packages/angular_devkit/core/src/logger/level.ts b/packages/angular_devkit/core/src/logger/level.ts
index 7de3255d90c5..b5094ed42b52 100644
--- a/packages/angular_devkit/core/src/logger/level.ts
+++ b/packages/angular_devkit/core/src/logger/level.ts
@@ -1,33 +1,34 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+
 import { JsonObject } from '../json/interface';
 import { LogLevel, Logger } from './logger';
 
 export class LevelTransformLogger extends Logger {
   constructor(
-    public readonly name: string,
-    public readonly parent: Logger | null = null,
+    public override readonly name: string,
+    public override readonly parent: Logger | null = null,
     public readonly levelTransform: (level: LogLevel) => LogLevel,
   ) {
     super(name, parent);
   }
 
-  log(level: LogLevel, message: string, metadata: JsonObject = {}): void {
+  override log(level: LogLevel, message: string, metadata: JsonObject = {}): void {
     return super.log(this.levelTransform(level), message, metadata);
   }
 
-  createChild(name: string): Logger {
+  override createChild(name: string): Logger {
     return new LevelTransformLogger(name, this, this.levelTransform);
   }
 }
 
 export class LevelCapLogger extends LevelTransformLogger {
-  static levelMap: {[cap: string]: {[level: string]: string}} = {
+  static levelMap: { [cap: string]: { [level: string]: string } } = {
     debug: { debug: 'debug', info: 'debug', warn: 'debug', error: 'debug', fatal: 'debug' },
     info: { debug: 'debug', info: 'info', warn: 'info', error: 'info', fatal: 'info' },
     warn: { debug: 'debug', info: 'info', warn: 'warn', error: 'warn', fatal: 'warn' },
@@ -36,8 +37,8 @@ export class LevelCapLogger extends LevelTransformLogger {
   };
 
   constructor(
-    public readonly name: string,
-    public readonly parent: Logger | null = null,
+    public override readonly name: string,
+    public override readonly parent: Logger | null = null,
     public readonly levelCap: LogLevel,
   ) {
     super(name, parent, (level: LogLevel) => {
diff --git a/packages/angular_devkit/core/src/logger/logger.ts b/packages/angular_devkit/core/src/logger/logger.ts
index f684b2427299..4a00cb6c19f6 100644
--- a/packages/angular_devkit/core/src/logger/logger.ts
+++ b/packages/angular_devkit/core/src/logger/logger.ts
@@ -1,14 +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 { Observable, Operator, PartialObserver, Subject, Subscription, empty } from 'rxjs';
 import { JsonObject } from '../json/interface';
 
-
 export interface LoggerMetadata extends JsonObject {
   name: string;
   path: string[];
@@ -30,7 +30,6 @@ export interface LoggerApi {
 
 export type LogLevel = 'debug' | 'info' | 'warn' | 'error' | 'fatal';
 
-
 export class Logger extends Observable<LogEntry> implements LoggerApi {
   protected readonly _subject: Subject<LogEntry> = new Subject<LogEntry>();
   protected _metadata: LoggerMetadata;
@@ -38,27 +37,33 @@ export class Logger extends Observable<LogEntry> implements LoggerApi {
   private _obs: Observable<LogEntry> = empty();
   private _subscription: Subscription | null = null;
 
-  protected get _observable() { return this._obs; }
+  protected get _observable() {
+    return this._obs;
+  }
   protected set _observable(v: Observable<LogEntry>) {
     if (this._subscription) {
       this._subscription.unsubscribe();
     }
     this._obs = v;
     if (this.parent) {
-      this._subscription = this.subscribe((value: LogEntry) => {
-        if (this.parent) {
-          this.parent._subject.next(value);
-        }
-      }, (error: Error) => {
-        if (this.parent) {
-          this.parent._subject.error(error);
-        }
-      }, () => {
-        if (this._subscription) {
-          this._subscription.unsubscribe();
-        }
-        this._subscription = null;
-      });
+      this._subscription = this.subscribe(
+        (value: LogEntry) => {
+          if (this.parent) {
+            this.parent._subject.next(value);
+          }
+        },
+        (error: Error) => {
+          if (this.parent) {
+            this.parent._subject.error(error);
+          }
+        },
+        () => {
+          if (this._subscription) {
+            this._subscription.unsubscribe();
+          }
+          this._subscription = null;
+        },
+      );
     }
   }
 
@@ -103,7 +108,9 @@ export class Logger extends Observable<LogEntry> implements LoggerApi {
 
   log(level: LogLevel, message: string, metadata: JsonObject = {}): void {
     const entry: LogEntry = Object.assign({}, metadata, this._metadata, {
-      level, message, timestamp: +Date.now(),
+      level,
+      message,
+      timestamp: +Date.now(),
     });
     this._subject.next(entry);
   }
@@ -127,27 +134,34 @@ export class Logger extends Observable<LogEntry> implements LoggerApi {
     return this.log('fatal', message, metadata);
   }
 
-  toString() {
+  override toString() {
     return `<Logger(${this.name})>`;
   }
 
-  lift<R>(operator: Operator<LogEntry, R>): Observable<R> {
+  override lift<R>(operator: Operator<LogEntry, R>): Observable<R> {
     return this._observable.lift(operator);
   }
 
-  subscribe(): Subscription;
-  subscribe(observer: PartialObserver<LogEntry>): Subscription;
-  subscribe(next?: (value: LogEntry) => void, error?: (error: Error) => void,
-            complete?: () => void): Subscription;
-  subscribe(_observerOrNext?: PartialObserver<LogEntry> | ((value: LogEntry) => void),
-            _error?: (error: Error) => void,
-            _complete?: () => void): Subscription {
+  override subscribe(): Subscription;
+  override subscribe(observer: PartialObserver<LogEntry>): Subscription;
+  override subscribe(
+    next?: (value: LogEntry) => void,
+    error?: (error: Error) => void,
+    complete?: () => void,
+  ): Subscription;
+  override subscribe(
+    _observerOrNext?: PartialObserver<LogEntry> | ((value: LogEntry) => void),
+    _error?: (error: Error) => void,
+    _complete?: () => void,
+  ): Subscription {
+    // eslint-disable-next-line prefer-spread
     return this._observable.subscribe.apply(
       this._observable,
-      (arguments as unknown) as Parameters<Observable<LogEntry>['subscribe']>,
+      // eslint-disable-next-line prefer-rest-params
+      arguments as unknown as Parameters<Observable<LogEntry>['subscribe']>,
     );
   }
-  forEach(next: (value: LogEntry) => void, PromiseCtor?: typeof Promise): Promise<void> {
+  override forEach(next: (value: LogEntry) => void, PromiseCtor?: typeof Promise): Promise<void> {
     return this._observable.forEach(next, PromiseCtor);
   }
 }
diff --git a/packages/angular_devkit/core/src/logger/logger_spec.ts b/packages/angular_devkit/core/src/logger/logger_spec.ts
index 50439ca9a452..fe68b4cdaa5a 100644
--- a/packages/angular_devkit/core/src/logger/logger_spec.ts
+++ b/packages/angular_devkit/core/src/logger/logger_spec.ts
@@ -1,20 +1,21 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-// tslint:disable:no-any
+
+/* eslint-disable @typescript-eslint/no-explicit-any */
 import { toArray } from 'rxjs/operators';
 import { JsonValue } from '../json/interface';
 import { Logger } from './logger';
 
-
 describe('Logger', () => {
   it('works', (done: DoneFn) => {
     const logger = new Logger('test');
-    logger.pipe(toArray())
+    logger
+      .pipe(toArray())
       .toPromise()
       .then((observed: JsonValue[]) => {
         expect(observed).toEqual([
@@ -22,7 +23,10 @@ describe('Logger', () => {
           jasmine.objectContaining({ message: 'world', level: 'info', name: 'test' }) as any,
         ]);
       })
-      .then(() => done(), err => done.fail(err));
+      .then(
+        () => done(),
+        (err) => done.fail(err),
+      );
 
     logger.debug('hello');
     logger.info('world');
@@ -32,7 +36,8 @@ describe('Logger', () => {
   it('works with children', (done: DoneFn) => {
     const logger = new Logger('test');
     let hasCompleted = false;
-    logger.pipe(toArray())
+    logger
+      .pipe(toArray())
       .toPromise()
       .then((observed: JsonValue[]) => {
         expect(observed).toEqual([
@@ -41,10 +46,13 @@ describe('Logger', () => {
         ]);
         expect(hasCompleted).toBe(true);
       })
-      .then(() => done(), err => done.fail(err));
+      .then(
+        () => done(),
+        (err) => done.fail(err),
+      );
 
     const childLogger = new Logger('child', logger);
-    childLogger.subscribe(undefined, undefined, () => hasCompleted = true);
+    childLogger.subscribe(undefined, undefined, () => (hasCompleted = true));
     childLogger.debug('hello');
     childLogger.info('world');
     logger.complete();
@@ -54,14 +62,18 @@ describe('Logger', () => {
     const logger = new Logger('test');
     logger.debug('woah');
 
-    logger.pipe(toArray())
+    logger
+      .pipe(toArray())
       .toPromise()
       .then((observed: JsonValue[]) => {
         expect(observed).toEqual([
           jasmine.objectContaining({ message: 'hello', level: 'debug', name: 'test' }) as any,
         ]);
       })
-      .then(() => done(), err => done.fail(err));
+      .then(
+        () => done(),
+        (err) => done.fail(err),
+      );
 
     logger.debug('hello');
     logger.complete();
diff --git a/packages/angular_devkit/core/src/logger/null-logger.ts b/packages/angular_devkit/core/src/logger/null-logger.ts
index 4a687840a1c3..4ca51bb73a9a 100644
--- a/packages/angular_devkit/core/src/logger/null-logger.ts
+++ b/packages/angular_devkit/core/src/logger/null-logger.ts
@@ -1,21 +1,21 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+
 import { EMPTY } from 'rxjs';
 import { Logger, LoggerApi } from './logger';
 
-
 export class NullLogger extends Logger {
   constructor(parent: Logger | null = null) {
     super('', parent);
     this._observable = EMPTY;
   }
 
-  asApi(): LoggerApi {
+  override asApi(): LoggerApi {
     return {
       createChild: () => new NullLogger(this),
       log() {},
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..f7639f6c254d 100644
--- a/packages/angular_devkit/core/src/logger/null-logger_spec.ts
+++ b/packages/angular_devkit/core/src/logger/null-logger_spec.ts
@@ -1,24 +1,28 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+
 import { toArray } from 'rxjs/operators';
 import { LogEntry, Logger } from './logger';
 import { NullLogger } from './null-logger';
 
-
 describe('NullLogger', () => {
   it('works', (done: DoneFn) => {
     const logger = new NullLogger();
-    logger.pipe(toArray())
+    logger
+      .pipe(toArray())
       .toPromise()
       .then((observed: LogEntry[]) => {
         expect(observed).toEqual([]);
       })
-      .then(() => done(), err => done.fail(err));
+      .then(
+        () => done(),
+        (err) => done.fail(err),
+      );
 
     logger.debug('hello');
     logger.info('world');
@@ -27,12 +31,16 @@ describe('NullLogger', () => {
 
   it('nullifies children', (done: DoneFn) => {
     const logger = new Logger('test');
-    logger.pipe(toArray())
+    logger
+      .pipe(toArray())
       .toPromise()
       .then((observed: LogEntry[]) => {
         expect(observed).toEqual([]);
       })
-      .then(() => done(), err => done.fail(err));
+      .then(
+        () => done(),
+        (err) => done.fail(err),
+      );
 
     const nullLogger = new NullLogger(logger);
     const child = new Logger('test', nullLogger);
diff --git a/packages/angular_devkit/core/src/logger/transform-logger.ts b/packages/angular_devkit/core/src/logger/transform-logger.ts
index 4d024fd2ffb2..2e4fd9c4d4e8 100644
--- a/packages/angular_devkit/core/src/logger/transform-logger.ts
+++ b/packages/angular_devkit/core/src/logger/transform-logger.ts
@@ -1,18 +1,20 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+
 import { Observable } from 'rxjs';
 import { LogEntry, Logger } from './logger';
 
-
 export class TransformLogger extends Logger {
-  constructor(name: string,
-              transform: (stream: Observable<LogEntry>) => Observable<LogEntry>,
-              parent: Logger | null = null) {
+  constructor(
+    name: string,
+    transform: (stream: Observable<LogEntry>) => Observable<LogEntry>,
+    parent: Logger | null = null,
+  ) {
     super(name, parent);
     this._observable = transform(this._observable);
   }
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..f7b1268ece32 100644
--- a/packages/angular_devkit/core/src/logger/transform-logger_spec.ts
+++ b/packages/angular_devkit/core/src/logger/transform-logger_spec.ts
@@ -1,31 +1,36 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-// tslint:disable:no-any
+
+/* eslint-disable @typescript-eslint/no-explicit-any */
 import { filter, map, toArray } from 'rxjs/operators';
 import { LogEntry } from './logger';
 import { TransformLogger } from './transform-logger';
 
-
 describe('TransformLogger', () => {
   it('works', (done: DoneFn) => {
-    const logger = new TransformLogger('test', stream => {
+    const logger = new TransformLogger('test', (stream) => {
       return stream.pipe(
-        filter(entry => entry.message != 'hello'),
-        map(entry => (entry.message += '1', entry)));
+        filter((entry) => entry.message != 'hello'),
+        map((entry) => ((entry.message += '1'), entry)),
+      );
     });
-    logger.pipe(toArray())
+    logger
+      .pipe(toArray())
       .toPromise()
       .then((observed: LogEntry[]) => {
         expect(observed).toEqual([
           jasmine.objectContaining({ message: 'world1', level: 'info', name: 'test' }) as any,
         ]);
       })
-      .then(() => done(), err => done.fail(err));
+      .then(
+        () => done(),
+        (err) => done.fail(err),
+      );
 
     logger.debug('hello');
     logger.info('world');
diff --git a/packages/angular_devkit/core/src/utils/array.ts b/packages/angular_devkit/core/src/utils/array.ts
index adb896d69cfb..20f0d29f0d7b 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
@@ -8,5 +8,5 @@
 
 /** @deprecated Since v12.0, unused by the Angular tooling */
 export function clean<T>(array: Array<T | undefined>): Array<T> {
-  return array.filter(x => x !== undefined) as Array<T>;
+  return array.filter((x) => x !== undefined) as Array<T>;
 }
diff --git a/packages/angular_devkit/core/src/utils/index.ts b/packages/angular_devkit/core/src/utils/index.ts
index 5e6749ee9b95..d32b7c0ba06d 100644
--- a/packages/angular_devkit/core/src/utils/index.ts
+++ b/packages/angular_devkit/core/src/utils/index.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 * as tags from './literals';
 import * as strings from './strings';
 
@@ -17,13 +18,16 @@ export * from './lang';
 
 export { tags, strings };
 
-export type DeepReadonly<T> =
-  T extends (infer R)[] ? DeepReadonlyArray<R> :
-    T extends Function ? T :
-      T extends object ? DeepReadonlyObject<T> :
-        T;
+export type DeepReadonly<T> = T extends (infer R)[]
+  ? DeepReadonlyArray<R>
+  : T extends Function
+  ? T
+  : T extends object
+  ? DeepReadonlyObject<T>
+  : T;
 
 // This should be ReadonlyArray but it has implications.
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
 export interface DeepReadonlyArray<T> extends Array<DeepReadonly<T>> {}
 
 export type DeepReadonlyObject<T> = {
diff --git a/packages/angular_devkit/core/src/utils/lang.ts b/packages/angular_devkit/core/src/utils/lang.ts
index 032010566a7a..ecefcd0acd3d 100644
--- a/packages/angular_devkit/core/src/utils/lang.ts
+++ b/packages/angular_devkit/core/src/utils/lang.ts
@@ -1,16 +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
  */
+
 // Borrowed from @angular/core
 
 /**
  * Determine if the argument is shaped like a Promise
  */
-// tslint:disable-next-line:no-any
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function isPromise(obj: any): obj is Promise<any> {
   // allow any Promise/A+ compliant thenable.
   // It's up to the caller to ensure that obj.then conforms to the spec
diff --git a/packages/angular_devkit/core/src/utils/literals.ts b/packages/angular_devkit/core/src/utils/literals.ts
index bfa16c201c98..8b18251967f4 100644
--- a/packages/angular_devkit/core/src/utils/literals.ts
+++ b/packages/angular_devkit/core/src/utils/literals.ts
@@ -1,18 +1,18 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+
 export interface TemplateTag<R = string> {
   // Any is the only way here.
-  // tslint:disable-next-line:no-any
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   (template: TemplateStringsArray, ...substitutions: any[]): R;
 }
 
-
-// tslint:disable-next-line:no-any
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function oneLine(strings: TemplateStringsArray, ...values: any[]) {
   const endResult = String.raw(strings, ...values);
 
@@ -30,8 +30,7 @@ export function indentBy(indentations: number): TemplateTag {
   };
 }
 
-
-// tslint:disable-next-line:no-any
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function stripIndent(strings: TemplateStringsArray, ...values: any[]) {
   const endResult = String.raw(strings, ...values);
 
@@ -43,29 +42,30 @@ export function stripIndent(strings: TemplateStringsArray, ...values: any[]) {
     return endResult;
   }
 
-  const indent = Math.min(...match.map(el => el.length));
+  const indent = Math.min(...match.map((el) => el.length));
   const regexp = new RegExp('^[ \\t]{' + indent + '}', 'gm');
 
   return (indent > 0 ? endResult.replace(regexp, '') : endResult).trim();
 }
 
-
-// tslint:disable-next-line:no-any
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function stripIndents(strings: TemplateStringsArray, ...values: any[]) {
   return String.raw(strings, ...values)
     .split('\n')
-    .map(line => line.trim())
+    .map((line) => line.trim())
     .join('\n')
     .trim();
 }
 
-// tslint:disable-next-line:no-any
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function trimNewlines(strings: TemplateStringsArray, ...values: any[]) {
   const endResult = String.raw(strings, ...values);
 
-  return endResult
-    // Remove the newline at the start.
-    .replace(/^(?:\r?\n)+/, '')
-    // Remove the newline at the end and following whitespace.
-    .replace(/(?:\r?\n(?:\s*))$/, '');
+  return (
+    endResult
+      // Remove the newline at the start.
+      .replace(/^(?:\r?\n)+/, '')
+      // Remove the newline at the end and following whitespace.
+      .replace(/(?:\r?\n(?:\s*))$/, '')
+  );
 }
diff --git a/packages/angular_devkit/core/src/utils/literals_spec.ts b/packages/angular_devkit/core/src/utils/literals_spec.ts
index 0883eb685535..c88978434d61 100644
--- a/packages/angular_devkit/core/src/utils/literals_spec.ts
+++ b/packages/angular_devkit/core/src/utils/literals_spec.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 { oneLine, stripIndent, stripIndents, trimNewlines } from './literals';
 
 describe('literals', () => {
diff --git a/packages/angular_devkit/core/src/utils/object.ts b/packages/angular_devkit/core/src/utils/object.ts
index ee5523d8a4b0..76af545985d2 100644
--- a/packages/angular_devkit/core/src/utils/object.ts
+++ b/packages/angular_devkit/core/src/utils/object.ts
@@ -1,14 +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
  */
 
 /** @deprecated Since v12.0, unused by the Angular tooling */
-export function mapObject<T, V>(obj: { [k: string]: T },
-                                mapper: (k: string, v: T) => V): { [k: string]: V } {
+export function mapObject<T, V>(
+  obj: { [k: string]: T },
+  mapper: (k: string, v: T) => V,
+): { [k: string]: V } {
   return Object.keys(obj).reduce((acc: { [k: string]: V }, k: string) => {
     acc[k] = mapper(k, obj[k]);
 
@@ -16,20 +18,19 @@ export function mapObject<T, V>(obj: { [k: string]: T },
   }, {});
 }
 
-
 const copySymbol = Symbol();
 
-// tslint:disable-next-line:no-any
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function deepCopy<T extends any>(value: T): T {
   if (Array.isArray(value)) {
-    // tslint:disable-next-line:no-any
-    return value.map((o: any) => deepCopy(o)) as unknown as T;
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    return (value.map((o: any) => deepCopy(o)) as unknown) as T;
   } else if (value && typeof value === 'object') {
     const valueCasted = value as {
-      [copySymbol]?: T,
-      toJSON?: () => string,
-      // tslint:disable-next-line:no-any
-      [key: string]: any,
+      [copySymbol]?: T;
+      toJSON?: () => string;
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      [key: string]: any;
     };
 
     if (valueCasted[copySymbol]) {
diff --git a/packages/angular_devkit/core/src/utils/object_spec.ts b/packages/angular_devkit/core/src/utils/object_spec.ts
index 67756e5f31b7..ac8d4ce7bcbc 100644
--- a/packages/angular_devkit/core/src/utils/object_spec.ts
+++ b/packages/angular_devkit/core/src/utils/object_spec.ts
@@ -1,11 +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
  */
-// tslint:disable:no-any
+
+/* eslint-disable @typescript-eslint/no-explicit-any */
 import { deepCopy } from './object';
 
 describe('object', () => {
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..0640c7dc4de1 100644
--- a/packages/angular_devkit/core/src/utils/partially-ordered-set.ts
+++ b/packages/angular_devkit/core/src/utils/partially-ordered-set.ts
@@ -1,17 +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 { BaseException } from '../exception';
 
 export class DependencyNotFoundException extends BaseException {
-  constructor() { super('One of the dependencies is not part of the set.'); }
+  constructor() {
+    super('One of the dependencies is not part of the set.');
+  }
 }
 export class CircularDependencyFoundException extends BaseException {
-  constructor() { super('Circular dependencies found.'); }
+  constructor() {
+    super('Circular dependencies found.');
+  }
 }
 
 export class PartiallyOrderedSet<T> implements Set<T> {
@@ -22,7 +27,7 @@ export class PartiallyOrderedSet<T> implements Set<T> {
       throw new CircularDependencyFoundException();
     }
 
-    deps.forEach(dep => this._checkCircularDependencies(item, this._items.get(dep) || new Set()));
+    deps.forEach((dep) => this._checkCircularDependencies(item, this._items.get(dep) || new Set()));
   }
 
   clear() {
@@ -36,7 +41,7 @@ export class PartiallyOrderedSet<T> implements Set<T> {
   }
   forEach(
     callbackfn: (value: T, value2: T, set: PartiallyOrderedSet<T>) => void,
-    thisArg?: any,  // tslint:disable-line:no-any
+    thisArg?: any, // eslint-disable-line @typescript-eslint/no-explicit-any
   ): void {
     for (const x of this) {
       callbackfn.call(thisArg, x, x, this);
@@ -66,8 +71,7 @@ export class PartiallyOrderedSet<T> implements Set<T> {
     return this[Symbol.iterator]();
   }
 
-
-  add(item: T, deps: (Set<T> | T[]) = new Set()) {
+  add(item: T, deps: Set<T> | T[] = new Set()) {
     if (Array.isArray(deps)) {
       deps = new Set(deps);
     }
@@ -121,7 +125,7 @@ export class PartiallyOrderedSet<T> implements Set<T> {
     }
 
     // Remove it from all dependencies if force == true.
-    this._items.forEach(value => value.delete(item));
+    this._items.forEach((value) => value.delete(item));
 
     return this._items.delete(item);
   }
@@ -143,7 +147,7 @@ export class PartiallyOrderedSet<T> implements Set<T> {
       }
 
       for (const item of run) {
-        copy.forEach(s => s.delete(item));
+        copy.forEach((s) => s.delete(item));
         copy.delete(item);
         yield item;
       }
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..6fdaf470466d 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,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 { PartiallyOrderedSet } from './partially-ordered-set';
 
 describe('PartiallyOrderedSet', () => {
diff --git a/packages/angular_devkit/core/src/utils/priority-queue.ts b/packages/angular_devkit/core/src/utils/priority-queue.ts
index 9d5008487d47..58d2f355a62d 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
@@ -17,7 +17,7 @@ export class PriorityQueue<T> {
   }
 
   push(item: T) {
-    const index = this._items.findIndex(existing => this._comparator(item, existing) <= 0);
+    const index = this._items.findIndex((existing) => this._comparator(item, existing) <= 0);
 
     if (index === -1) {
       this._items.push(item);
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..b6b6c16582df 100644
--- a/packages/angular_devkit/core/src/utils/priority-queue_spec.ts
+++ b/packages/angular_devkit/core/src/utils/priority-queue_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 { PriorityQueue } from './priority-queue';
 
+import { PriorityQueue } from './priority-queue';
 
 describe('PriorityQueue', () => {
   it('adds an item', () => {
diff --git a/packages/angular_devkit/core/src/utils/strings.ts b/packages/angular_devkit/core/src/utils/strings.ts
index ff3c0ce7cec3..9313f2b2799f 100644
--- a/packages/angular_devkit/core/src/utils/strings.ts
+++ b/packages/angular_devkit/core/src/utils/strings.ts
@@ -1,15 +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
  */
-const STRING_DASHERIZE_REGEXP = (/[ _]/g);
-const STRING_DECAMELIZE_REGEXP = (/([a-z\d])([A-Z])/g);
-const STRING_CAMELIZE_REGEXP = (/(-|_|\.|\s)+(.)?/g);
-const STRING_UNDERSCORE_REGEXP_1 = (/([a-z\d])([A-Z]+)/g);
-const STRING_UNDERSCORE_REGEXP_2 = (/-|\s+/g);
+
+const STRING_DASHERIZE_REGEXP = /[ _]/g;
+const STRING_DECAMELIZE_REGEXP = /([a-z\d])([A-Z])/g;
+const STRING_CAMELIZE_REGEXP = /(-|_|\.|\s)+(.)?/g;
+const STRING_UNDERSCORE_REGEXP_1 = /([a-z\d])([A-Z]+)/g;
+const STRING_UNDERSCORE_REGEXP_2 = /-|\s+/g;
 
 /**
  * Converts a camelized string into all lower case separated by underscores.
@@ -85,7 +86,10 @@ export function camelize(str: string): string {
  @return {String} the classified string
  */
 export function classify(str: string): string {
-  return str.split('.').map(part => capitalize(camelize(part))).join('.');
+  return str
+    .split('.')
+    .map((part) => capitalize(camelize(part)))
+    .join('.');
 }
 
 /**
diff --git a/packages/angular_devkit/core/src/utils/template.ts b/packages/angular_devkit/core/src/utils/template.ts
index 1ed86bd81098..389938eb66cf 100644
--- a/packages/angular_devkit/core/src/utils/template.ts
+++ b/packages/angular_devkit/core/src/utils/template.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 { Position, SourceNode } from 'source-map';
 
 // Matches <%= expr %>. This does not support structural JavaScript (for/if/...).
@@ -19,7 +20,7 @@ const kEscapeRe = /<%-([\s\S]+?)%>/g;
 const kEvaluateRe = /<%([\s\S]+?)%>/g;
 
 /** Used to map characters to HTML entities. */
-const kHtmlEscapes: {[char: string]: string} = {
+const kHtmlEscapes: { [char: string]: string } = {
   '&': '&amp;',
   '<': '&lt;',
   '>': '&gt;',
@@ -40,7 +41,6 @@ export interface TemplateOptions {
   fileName?: string;
 }
 
-
 function _positionFor(content: string, offset: number): Position {
   let line = 1;
   let column = 0;
@@ -117,11 +117,12 @@ export interface TemplateAstInterpolate extends TemplateAstBase {
   expression: string;
 }
 
-export type TemplateAstNode = TemplateAstContent
-                            | TemplateAstEvaluate
-                            | TemplateAstComment
-                            | TemplateAstEscape
-                            | TemplateAstInterpolate;
+export type TemplateAstNode =
+  | TemplateAstContent
+  | TemplateAstEvaluate
+  | TemplateAstComment
+  | TemplateAstEscape
+  | TemplateAstInterpolate;
 
 /**
  * Given a source text (and a fileName), returns a TemplateAst.
@@ -131,7 +132,7 @@ export function templateParser(sourceText: string, fileName: string): TemplateAs
 
   // Compile the regexp to match each delimiter.
   const reExpressions = [kEscapeRe, kCommentRe, kInterpolateRe, kEvaluateRe];
-  const reDelimiters = RegExp(reExpressions.map(x => x.source).join('|') + '|$', 'g');
+  const reDelimiters = RegExp(reExpressions.map((x) => x.source).join('|') + '|$', 'g');
 
   const parsed = sourceText.split(reDelimiters);
   let offset = 0;
@@ -193,7 +194,7 @@ export function templateParser(sourceText: string, fileName: string): TemplateAs
  */
 function templateFast(ast: TemplateAst, options?: TemplateOptions): string {
   const module = options && options.module ? 'module.exports.default =' : '';
-  const reHtmlEscape = reUnescapedHtml.source.replace(/[']/g, '\\\\\\\'');
+  const reHtmlEscape = reUnescapedHtml.source.replace(/[']/g, "\\\\\\'");
 
   return `
     return ${module} function(obj) {
@@ -207,7 +208,8 @@ function templateFast(ast: TemplateAst, options?: TemplateOptions): string {
         return s ? s.replace(__escapesre, function(key) { return __escapes[key]; }) : '';
       };
       with (obj) {
-        ${ast.children.map(node => {
+        ${ast.children
+          .map((node) => {
             switch (node.kind) {
               case 'content':
                 return `__p += ${JSON.stringify(node.content)};`;
@@ -218,8 +220,8 @@ function templateFast(ast: TemplateAst, options?: TemplateOptions): string {
               case 'evaluate':
                 return node.expression;
             }
-          }).join('\n')
-        }
+          })
+          .join('\n')}
       }
 
       return __p;
@@ -233,10 +235,10 @@ function templateFast(ast: TemplateAst, options?: TemplateOptions): string {
 function templateWithSourceMap(ast: TemplateAst, options?: TemplateOptions): string {
   const sourceUrl = ast.fileName;
   const module = options && options.module ? 'module.exports.default =' : '';
-  const reHtmlEscape = reUnescapedHtml.source.replace(/[']/g, '\\\\\\\'');
+  const reHtmlEscape = reUnescapedHtml.source.replace(/[']/g, "\\\\\\'");
 
-  const preamble = (new SourceNode(1, 0, sourceUrl, ''))
-    .add(new SourceNode(1, 0, sourceUrl, [
+  const preamble = new SourceNode(1, 0, sourceUrl, '').add(
+    new SourceNode(1, 0, sourceUrl, [
       `return ${module} function(obj) {\n`,
       '  obj || (obj = {});\n',
       '  let __t;\n',
@@ -248,96 +250,95 @@ function templateWithSourceMap(ast: TemplateAst, options?: TemplateOptions): str
       `    return s ? s.replace(__escapesre, function(key) { return __escapes[key]; }) : '';`,
       `  };\n`,
       `  with (obj) {\n`,
-    ]));
+    ]),
+  );
 
   const end = ast.children.length
     ? ast.children[ast.children.length - 1].end
     : { line: 0, column: 0 };
-  const nodes = ast.children.reduce((chunk, node) => {
-    let code: string | SourceNode | (SourceNode | string)[] = '';
-    switch (node.kind) {
-      case 'content':
-        code = [
-          new SourceNode(node.start.line, node.start.column, sourceUrl, '__p = __p'),
-          ...node.content.split('\n').map((line, i, arr) => {
-            return new SourceNode(
-              node.start.line + i,
-              i == 0 ? node.start.column : 0,
-              sourceUrl,
-              '\n    + '
-              + JSON.stringify(line + (i == arr.length - 1 ? '' : '\n')),
-            );
-          }),
-          new SourceNode(node.end.line, node.end.column, sourceUrl, ';\n'),
-        ];
-        break;
-      case 'interpolate':
-        code = [
-          new SourceNode(node.start.line, node.start.column, sourceUrl, '__p += ((__t = '),
-          ...node.expression.split('\n').map((line, i, arr) => {
-            return new SourceNode(
-              node.start.line + i,
-              i == 0 ? node.start.column : 0,
-              sourceUrl,
-              line + ((i == arr.length - 1) ? '' : '\n'),
-            );
-          }),
-          new SourceNode(node.end.line, node.end.column, sourceUrl, ') == null ? "" : __t);\n'),
-        ];
-        break;
-      case 'escape':
-        code = [
-          new SourceNode(node.start.line, node.start.column, sourceUrl, '__p += __e('),
-          ...node.expression.split('\n').map((line, i, arr) => {
-            return new SourceNode(
-              node.start.line + i,
-              i == 0 ? node.start.column : 0,
-              sourceUrl,
-              line + ((i == arr.length - 1) ? '' : '\n'),
-            );
-          }),
-          new SourceNode(node.end.line, node.end.column, sourceUrl, ');\n'),
-        ];
-        break;
-      case 'evaluate':
-        code = [
-          ...node.expression.split('\n').map((line, i, arr) => {
-            return new SourceNode(
-              node.start.line + i,
-              i == 0 ? node.start.column : 0,
-              sourceUrl,
-              line + ((i == arr.length - 1) ? '' : '\n'),
-            );
-          }),
-          new SourceNode(node.end.line, node.end.column, sourceUrl, '\n'),
-        ];
-        break;
-    }
+  const nodes = ast.children
+    .reduce((chunk, node) => {
+      let code: string | SourceNode | (SourceNode | string)[] = '';
+      switch (node.kind) {
+        case 'content':
+          code = [
+            new SourceNode(node.start.line, node.start.column, sourceUrl, '__p = __p'),
+            ...node.content.split('\n').map((line, i, arr) => {
+              return new SourceNode(
+                node.start.line + i,
+                i == 0 ? node.start.column : 0,
+                sourceUrl,
+                '\n    + ' + JSON.stringify(line + (i == arr.length - 1 ? '' : '\n')),
+              );
+            }),
+            new SourceNode(node.end.line, node.end.column, sourceUrl, ';\n'),
+          ];
+          break;
+        case 'interpolate':
+          code = [
+            new SourceNode(node.start.line, node.start.column, sourceUrl, '__p += ((__t = '),
+            ...node.expression.split('\n').map((line, i, arr) => {
+              return new SourceNode(
+                node.start.line + i,
+                i == 0 ? node.start.column : 0,
+                sourceUrl,
+                line + (i == arr.length - 1 ? '' : '\n'),
+              );
+            }),
+            new SourceNode(node.end.line, node.end.column, sourceUrl, ') == null ? "" : __t);\n'),
+          ];
+          break;
+        case 'escape':
+          code = [
+            new SourceNode(node.start.line, node.start.column, sourceUrl, '__p += __e('),
+            ...node.expression.split('\n').map((line, i, arr) => {
+              return new SourceNode(
+                node.start.line + i,
+                i == 0 ? node.start.column : 0,
+                sourceUrl,
+                line + (i == arr.length - 1 ? '' : '\n'),
+              );
+            }),
+            new SourceNode(node.end.line, node.end.column, sourceUrl, ');\n'),
+          ];
+          break;
+        case 'evaluate':
+          code = [
+            ...node.expression.split('\n').map((line, i, arr) => {
+              return new SourceNode(
+                node.start.line + i,
+                i == 0 ? node.start.column : 0,
+                sourceUrl,
+                line + (i == arr.length - 1 ? '' : '\n'),
+              );
+            }),
+            new SourceNode(node.end.line, node.end.column, sourceUrl, '\n'),
+          ];
+          break;
+      }
 
-    return chunk.add(new SourceNode(node.start.line, node.start.column, sourceUrl, code));
-  }, preamble)
-  .add(new SourceNode(end.line, end.column, sourceUrl, [
-    '  };\n',
-    '\n',
-    '  return __p;\n',
-    '}\n',
-  ]));
+      return chunk.add(new SourceNode(node.start.line, node.start.column, sourceUrl, code));
+    }, preamble)
+    .add(
+      new SourceNode(end.line, end.column, sourceUrl, ['  };\n', '\n', '  return __p;\n', '}\n']),
+    );
 
   const code = nodes.toStringWithSourceMap({
     file: sourceUrl,
-    sourceRoot: options && options.sourceRoot || '.',
+    sourceRoot: (options && options.sourceRoot) || '.',
   });
 
   // Set the source content in the source map, otherwise the sourceUrl is not enough
   // to find the content.
   code.map.setSourceContent(sourceUrl, ast.content);
 
-  return code.code
-       + '\n//# sourceMappingURL=data:application/json;base64,'
-       + Buffer.from(code.map.toString()).toString('base64');
+  return (
+    code.code +
+    '\n//# sourceMappingURL=data:application/json;base64,' +
+    Buffer.from(code.map.toString()).toString('base64')
+  );
 }
 
-
 /**
  * An equivalent of EJS templates, which is based on John Resig's `tmpl` implementation
  * (http://ejohn.org/blog/javascript-micro-templating/) and Laura Doktorova's doT.js
@@ -354,7 +355,7 @@ function templateWithSourceMap(ast: TemplateAst, options?: TemplateOptions): str
  *         of the template with the input applied.
  */
 export function template<T>(content: string, options?: TemplateOptions): (input: T) => string {
-  const sourceUrl = options && options.sourceURL || 'ejs';
+  const sourceUrl = (options && options.sourceURL) || 'ejs';
   const ast = templateParser(content, sourceUrl);
 
   let source: string;
@@ -369,9 +370,8 @@ export function template<T>(content: string, options?: TemplateOptions): (input:
   // need to only use the source, not the function itself. Otherwise expect a module object to be
   // passed, and we use that one.
   const fn = Function('module', source);
-  const module = options && options.module
-               ? (options.module === true ? { exports: {} } : options.module)
-               : null;
+  const module =
+    options && options.module ? (options.module === true ? { exports: {} } : options.module) : null;
   const result = fn(module);
 
   // Provide the compiled function's source by its `toString` method or
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..f51de0a3ff71 100644
--- a/packages/angular_devkit/core/src/virtual-fs/host/alias.ts
+++ b/packages/angular_devkit/core/src/virtual-fs/host/alias.ts
@@ -1,14 +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 { NormalizedRoot, Path, PathFragment, join, split } from '../path';
 import { ResolverHost } from './resolver';
 
-
 /**
  * A Virtual Host that allow to alias some paths to other paths.
  *
@@ -74,11 +74,13 @@ export class AliasHost<StatsT extends object = {}> extends ResolverHost<StatsT>
         maybeAlias = join(maybeAlias, ...remaining);
       }
       // Allow non-null-operator because we know sp.length > 0 (condition on while).
-      remaining.unshift(sp.pop() !);  // tslint:disable-line:no-non-null-assertion
+      remaining.unshift(sp.pop()!); // eslint-disable-line @typescript-eslint/no-non-null-assertion
     }
 
     return maybeAlias || path;
   }
 
-  get aliases(): Map<Path, Path> { return this._aliases; }
+  get aliases(): Map<Path, Path> {
+    return this._aliases;
+  }
 }
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..6f6f92c05964 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,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 { normalize } from '..';
 import { AliasHost } from './alias';
 import { stringToFileBuffer } from './buffer';
@@ -18,16 +19,14 @@ describe('AliasHost', () => {
     host.write(normalize('/some/file'), content).subscribe();
 
     const aHost = new AliasHost(host);
-    aHost.read(normalize('/some/file'))
-      .subscribe(x => expect(x).toBe(content));
+    aHost.read(normalize('/some/file')).subscribe((x) => expect(x).toBe(content));
     aHost.aliases.set(normalize('/some/file'), normalize('/other/path'));
 
     // This file will not exist because /other/path does not exist.
     try {
-      aHost.read(normalize('/some/file'))
-        .subscribe(undefined, err => {
-          expect(err.message).toMatch(/does not exist/);
-        });
+      aHost.read(normalize('/some/file')).subscribe(undefined, (err) => {
+        expect(err.message).toMatch(/does not exist/);
+      });
     } catch {
       // Ignore it. RxJS <6 still throw errors when they happen synchronously.
     }
@@ -41,19 +40,18 @@ describe('AliasHost', () => {
     host.write(normalize('/some/folder/file'), content).subscribe();
 
     const aHost = new AliasHost(host);
-    aHost.read(normalize('/some/folder/file'))
-        .subscribe(x => expect(x).toBe(content));
+    aHost.read(normalize('/some/folder/file')).subscribe((x) => expect(x).toBe(content));
     aHost.aliases.set(normalize('/some'), normalize('/other'));
 
     // This file will not exist because /other/path does not exist.
     try {
-      aHost.read(normalize('/some/folder/file'))
-        .subscribe(undefined, err => expect(err.message).toMatch(/does not exist/));
+      aHost
+        .read(normalize('/some/folder/file'))
+        .subscribe(undefined, (err) => expect(err.message).toMatch(/does not exist/));
     } catch {}
 
     // Create the file with new content and verify that this has the new content.
     aHost.write(normalize('/other/folder/file'), content2).subscribe();
-    aHost.read(normalize('/some/folder/file'))
-        .subscribe(x => expect(x).toBe(content2));
+    aHost.read(normalize('/some/folder/file')).subscribe((x) => expect(x).toBe(content2));
   });
 });
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..515e89926533 100644
--- a/packages/angular_devkit/core/src/virtual-fs/host/buffer.ts
+++ b/packages/angular_devkit/core/src/virtual-fs/host/buffer.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 { TemplateTag } from '../../utils/literals';
 import { FileBuffer } from './interface';
 
@@ -15,7 +16,7 @@ declare const TextEncoder: {
 };
 
 declare const TextDecoder: {
-  new(encoding: string): {
+  new (encoding: string): {
     decode(bytes: Uint8Array): string;
   };
 };
@@ -33,7 +34,7 @@ export function stringToFileBuffer(str: string): FileBuffer {
     return ab;
   } else if (typeof TextEncoder !== 'undefined') {
     // Modern browsers implement TextEncode.
-    return new TextEncoder('utf-8').encode(str).buffer as ArrayBuffer;
+    return new TextEncoder('utf-8').encode(str).buffer;
   } else {
     // Slowest method but sure to be compatible with every platform.
     const buf = new ArrayBuffer(str.length * 2); // 2 bytes for each char
@@ -46,12 +47,10 @@ export function stringToFileBuffer(str: string): FileBuffer {
   }
 }
 
-
 export const fileBuffer: TemplateTag<FileBuffer> = (strings, ...values) => {
   return stringToFileBuffer(String.raw(strings, ...values));
 };
 
-
 export function fileBufferToString(fileBuffer: FileBuffer): string {
   if (fileBuffer.toString.length == 1) {
     return (fileBuffer.toString as (enc: string) => string)('utf-8');
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..5e8e3cd38148 100644
--- a/packages/angular_devkit/core/src/virtual-fs/host/create.ts
+++ b/packages/angular_devkit/core/src/virtual-fs/host/create.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 { Observable } from 'rxjs';
 import { Path, PathFragment } from '../path';
 import { FileBuffer, FileBufferLike, Host, HostCapabilities, Stats } from './interface';
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..3a9a20a2ef11 100644
--- a/packages/angular_devkit/core/src/virtual-fs/host/empty.ts
+++ b/packages/angular_devkit/core/src/virtual-fs/host/empty.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 { Observable, of, throwError } from 'rxjs';
 import { FileDoesNotExistException } from '../../exception';
 import { Path, PathFragment } from '../path';
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..1682584ff677 100644
--- a/packages/angular_devkit/core/src/virtual-fs/host/interface.ts
+++ b/packages/angular_devkit/core/src/virtual-fs/host/interface.ts
@@ -1,14 +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 { Observable } from 'rxjs';
 import { Path, PathFragment } from '../path';
 
-
 export type FileBuffer = ArrayBuffer;
 export type FileBufferLike = ArrayBufferLike;
 
@@ -17,12 +17,11 @@ export interface HostWatchOptions {
   readonly recursive?: boolean;
 }
 
-
 export const enum HostWatchEventType {
   Changed = 0,
   Created = 1,
   Deleted = 2,
-  Renamed = 3,  // Applied to the original file path.
+  Renamed = 3, // Applied to the original file path.
 }
 
 export type Stats<T extends object = {}> = T & {
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..33c210b638eb 100644
--- a/packages/angular_devkit/core/src/virtual-fs/host/memory.ts
+++ b/packages/angular_devkit/core/src/virtual-fs/host/memory.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 { Observable, Subject } from 'rxjs';
 import {
   FileAlreadyExistException,
@@ -33,7 +34,6 @@ import {
   Stats,
 } from './interface';
 
-
 export interface SimpleMemoryHostStats {
   readonly content: FileBuffer | null;
 }
@@ -44,10 +44,16 @@ export class SimpleMemoryHost implements Host<{}> {
 
   protected _newDirStats() {
     return {
-      inspect() { return '<Directory>'; },
-
-      isFile() { return false; },
-      isDirectory() { return true; },
+      inspect() {
+        return '<Directory>';
+      },
+
+      isFile() {
+        return false;
+      },
+      isDirectory() {
+        return true;
+      },
       size: 0,
 
       atime: new Date(),
@@ -60,10 +66,16 @@ export class SimpleMemoryHost implements Host<{}> {
   }
   protected _newFileStats(content: FileBuffer, oldStats?: Stats<SimpleMemoryHostStats>) {
     return {
-      inspect() { return `<File size(${content.byteLength})>`; },
-
-      isFile() { return true; },
-      isDirectory() { return false; },
+      inspect() {
+        return `<File size(${content.byteLength})>`;
+      },
+
+      isFile() {
+        return true;
+      },
+      isDirectory() {
+        return false;
+      },
       size: content.byteLength,
 
       atime: oldStats ? oldStats.atime : new Date(),
@@ -95,7 +107,7 @@ export class SimpleMemoryHost implements Host<{}> {
 
     const maybeWatcher = this._watchers.get(currentPath);
     if (maybeWatcher) {
-      maybeWatcher.forEach(watcher => {
+      maybeWatcher.forEach((watcher) => {
         const [options, subject] = watcher;
         subject.next({ path, time, type });
 
@@ -112,7 +124,7 @@ export class SimpleMemoryHost implements Host<{}> {
 
       const maybeWatcher = this._watchers.get(currentPath);
       if (maybeWatcher) {
-        maybeWatcher.forEach(watcher => {
+        maybeWatcher.forEach((watcher) => {
           const [options, subject] = watcher;
           if (!options.recursive) {
             return;
@@ -301,7 +313,7 @@ export class SimpleMemoryHost implements Host<{}> {
   }
 
   write(path: Path, content: FileBuffer): Observable<void> {
-    return new Observable<void>(obs => {
+    return new Observable<void>((obs) => {
       this._write(path, content);
       obs.next();
       obs.complete();
@@ -309,7 +321,7 @@ export class SimpleMemoryHost implements Host<{}> {
   }
 
   read(path: Path): Observable<FileBuffer> {
-    return new Observable<FileBuffer>(obs => {
+    return new Observable<FileBuffer>((obs) => {
       const content = this._read(path);
       obs.next(content);
       obs.complete();
@@ -317,7 +329,7 @@ export class SimpleMemoryHost implements Host<{}> {
   }
 
   delete(path: Path): Observable<void> {
-    return new Observable<void>(obs => {
+    return new Observable<void>((obs) => {
       this._delete(path);
       obs.next();
       obs.complete();
@@ -325,7 +337,7 @@ export class SimpleMemoryHost implements Host<{}> {
   }
 
   rename(from: Path, to: Path): Observable<void> {
-    return new Observable<void>(obs => {
+    return new Observable<void>((obs) => {
       this._rename(from, to);
       obs.next();
       obs.complete();
@@ -333,28 +345,28 @@ export class SimpleMemoryHost implements Host<{}> {
   }
 
   list(path: Path): Observable<PathFragment[]> {
-    return new Observable<PathFragment[]>(obs => {
+    return new Observable<PathFragment[]>((obs) => {
       obs.next(this._list(path));
       obs.complete();
     });
   }
 
   exists(path: Path): Observable<boolean> {
-    return new Observable<boolean>(obs => {
+    return new Observable<boolean>((obs) => {
       obs.next(this._exists(path));
       obs.complete();
     });
   }
 
   isDirectory(path: Path): Observable<boolean> {
-    return new Observable<boolean>(obs => {
+    return new Observable<boolean>((obs) => {
       obs.next(this._isDirectory(path));
       obs.complete();
     });
   }
 
   isFile(path: Path): Observable<boolean> {
-    return new Observable<boolean>(obs => {
+    return new Observable<boolean>((obs) => {
       obs.next(this._isFile(path));
       obs.complete();
     });
@@ -362,7 +374,7 @@ export class SimpleMemoryHost implements Host<{}> {
 
   // Some hosts may not support stat.
   stat(path: Path): Observable<Stats<{}> | null> | null {
-    return new Observable<Stats<{}> | null>(obs => {
+    return new Observable<Stats<{}> | null>((obs) => {
       obs.next(this._stat(path));
       obs.complete();
     });
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..08cd4cf1db80 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,19 +1,18 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use 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
-// tslint:disable:no-non-null-assertion
-import { fragment, normalize } from '@angular-devkit/core';
+
+/* eslint-disable @typescript-eslint/no-non-null-assertion */
+import { fragment, normalize } from '../path';
 import { stringToFileBuffer } from './buffer';
 import { SimpleMemoryHost } from './memory';
 import { SyncDelegateHost } from './sync';
 
 describe('SimpleMemoryHost', () => {
-
   it('can watch', () => {
     const host = new SyncDelegateHost(new SimpleMemoryHost());
 
@@ -24,10 +23,10 @@ describe('SimpleMemoryHost', () => {
     let noRecursiveFileCalled = 0;
     let diffFile = 0;
 
-    host.watch(normalize('/sub'), { recursive: true }) !.subscribe(() => recursiveCalled++);
-    host.watch(normalize('/sub')) !.subscribe(() => noRecursiveCalled++);
-    host.watch(normalize('/sub/file2')) !.subscribe(() => noRecursiveFileCalled++);
-    host.watch(normalize('/sub/file3')) !.subscribe(() => diffFile++);
+    host.watch(normalize('/sub'), { recursive: true })!.subscribe(() => recursiveCalled++);
+    host.watch(normalize('/sub'))!.subscribe(() => noRecursiveCalled++);
+    host.watch(normalize('/sub/file2'))!.subscribe(() => noRecursiveFileCalled++);
+    host.watch(normalize('/sub/file3'))!.subscribe(() => diffFile++);
 
     host.write(normalize('/sub/file2'), stringToFileBuffer(''));
 
@@ -105,10 +104,12 @@ describe('SimpleMemoryHost', () => {
     host.write(normalize('/sub/sub1/file3'), buffer);
     host.write(normalize('/file4'), buffer);
 
-    expect(host.list(normalize('/sub')))
-      .toEqual([fragment('file1'), fragment('file2'), fragment('sub1')]);
-    expect(host.list(normalize('/')))
-      .toEqual([fragment('sub'), fragment('file4')]);
+    expect(host.list(normalize('/sub'))).toEqual([
+      fragment('file1'),
+      fragment('file2'),
+      fragment('sub1'),
+    ]);
+    expect(host.list(normalize('/'))).toEqual([fragment('sub'), fragment('file4')]);
     expect(host.list(normalize('/inexistent'))).toEqual([]);
   });
 
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..803644c1f538 100644
--- a/packages/angular_devkit/core/src/virtual-fs/host/pattern.ts
+++ b/packages/angular_devkit/core/src/virtual-fs/host/pattern.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 } from '../path';
 import { ResolverHost } from './resolver';
 
-
 export type ReplacementFunction = (path: Path) => Path;
 
-
 /**
  */
 export class PatternMatchingHost<StatsT extends object = {}> extends ResolverHost<StatsT> {
@@ -19,17 +18,25 @@ export class PatternMatchingHost<StatsT extends object = {}> extends ResolverHos
 
   addPattern(pattern: string | string[], replacementFn: ReplacementFunction) {
     // Simple GLOB pattern replacement.
-    const reString = '^('
-      + (Array.isArray(pattern) ? pattern : [pattern])
-        .map(ex => '('
-          + ex.split(/[\/\\]/g).map(f => f
-            .replace(/[\-\[\]{}()+?.^$|]/g, '\\$&')
-            .replace(/^\*\*/g, '(.+?)?')
-            .replace(/\*/g, '[^/\\\\]*'))
-            .join('[\/\\\\]')
-          + ')')
-        .join('|')
-      + ')($|/|\\\\)';
+    const reString =
+      '^(' +
+      (Array.isArray(pattern) ? pattern : [pattern])
+        .map(
+          (ex) =>
+            '(' +
+            ex
+              .split(/[\/\\]/g)
+              .map((f) =>
+                f
+                  .replace(/[\-\[\]{}()+?.^$|]/g, '\\$&')
+                  .replace(/^\*\*/g, '(.+?)?')
+                  .replace(/\*/g, '[^/\\\\]*'),
+              )
+              .join('[/\\\\]') +
+            ')',
+        )
+        .join('|') +
+      ')($|/|\\\\)';
 
     this._patterns.set(new RegExp(reString), replacementFn);
   }
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..55b779d06c49 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,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 { normalize } from '..';
 import { stringToFileBuffer } from './buffer';
 import { SimpleMemoryHost } from './memory';
@@ -19,26 +20,23 @@ describe('PatternMatchingHost', () => {
     host.write(normalize('/some/file.tns.ts'), content).subscribe();
 
     const pHost = new PatternMatchingHost(host);
-    pHost.read(normalize('/some/file.tns.ts'))
-      .subscribe(x => expect(x).toBe(content));
+    pHost.read(normalize('/some/file.tns.ts')).subscribe((x) => expect(x).toBe(content));
 
-    pHost.addPattern('**/*.tns.ts', path => {
+    pHost.addPattern('**/*.tns.ts', (path) => {
       return normalize(path.replace(/\.tns\.ts$/, '.ts'));
     });
 
     // This file will not exist because /some/file.ts does not exist.
     try {
-      pHost.read(normalize('/some/file.tns.ts'))
-        .subscribe(undefined, err => {
-          expect(err.message).toMatch(/does not exist/);
-        });
+      pHost.read(normalize('/some/file.tns.ts')).subscribe(undefined, (err) => {
+        expect(err.message).toMatch(/does not exist/);
+      });
     } catch {
       // Ignore it. RxJS <6 still throw errors when they happen synchronously.
     }
 
     // Create the file, it should exist now.
     pHost.write(normalize('/some/file.ts'), content2).subscribe();
-    pHost.read(normalize('/some/file.tns.ts'))
-      .subscribe(x => expect(x).toBe(content2));
+    pHost.read(normalize('/some/file.tns.ts')).subscribe((x) => expect(x).toBe(content2));
   });
 });
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..037789f4bdd9 100644
--- a/packages/angular_devkit/core/src/virtual-fs/host/record.ts
+++ b/packages/angular_devkit/core/src/virtual-fs/host/record.ts
@@ -1,18 +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 {
-  EMPTY,
-  Observable,
-  concat,
-  from as observableFrom,
-  of,
-  throwError,
-} from 'rxjs';
+
+import { EMPTY, Observable, concat, from as observableFrom, of, throwError } from 'rxjs';
 import { concatMap, map, reduce, switchMap, toArray } from 'rxjs/operators';
 import {
   FileAlreadyExistException,
@@ -31,7 +25,6 @@ import {
 } from './interface';
 import { SimpleMemoryHost } from './memory';
 
-
 export interface CordHostCreate {
   kind: 'create';
   path: Path;
@@ -51,11 +44,7 @@ export interface CordHostDelete {
   kind: 'delete';
   path: Path;
 }
-export type CordHostRecord = CordHostCreate
-                           | CordHostOverwrite
-                           | CordHostRename
-                           | CordHostDelete;
-
+export type CordHostRecord = CordHostCreate | CordHostOverwrite | CordHostRename | CordHostDelete;
 
 /**
  * A Host that records changes to the underlying Host, while keeping a record of Create, Overwrite,
@@ -74,10 +63,14 @@ export class CordHost extends SimpleMemoryHost {
   protected _filesToDelete = new Set<Path>();
   protected _filesToOverwrite = new Set<Path>();
 
-  constructor(protected _back: ReadonlyHost) { super(); }
+  constructor(protected _back: ReadonlyHost) {
+    super();
+  }
 
-  get backend(): ReadonlyHost { return this._back; }
-  get capabilities(): HostCapabilities {
+  get backend(): ReadonlyHost {
+    return this._back;
+  }
+  override get capabilities(): HostCapabilities {
     // Our own host is always Synchronous, but the backend might not be.
     return {
       synchronous: this._back.capabilities.synchronous,
@@ -113,13 +106,15 @@ export class CordHost extends SimpleMemoryHost {
   commit(host: Host, force = false): Observable<void> {
     // Really commit everything to the actual host.
     return observableFrom(this.records()).pipe(
-      concatMap(record => {
+      concatMap((record) => {
         switch (record.kind) {
-          case 'delete': return host.delete(record.path);
-          case 'rename': return host.rename(record.from, record.to);
+          case 'delete':
+            return host.delete(record.path);
+          case 'rename':
+            return host.rename(record.from, record.to);
           case 'create':
             return host.exists(record.path).pipe(
-              switchMap(exists => {
+              switchMap((exists) => {
                 if (exists && !force) {
                   return throwError(new FileAlreadyExistException(record.path));
                 } else {
@@ -129,7 +124,7 @@ export class CordHost extends SimpleMemoryHost {
             );
           case 'overwrite':
             return host.exists(record.path).pipe(
-              switchMap(exists => {
+              switchMap((exists) => {
                 if (!exists && !force) {
                   return throwError(new FileDoesNotExistException(record.path));
                 } else {
@@ -145,18 +140,37 @@ export class CordHost extends SimpleMemoryHost {
 
   records(): CordHostRecord[] {
     return [
-      ...[...this._filesToDelete.values()].map(path => ({
-        kind: 'delete', path,
-      }) as CordHostRecord),
-      ...[...this._filesToRename.entries()].map(([from, to]) => ({
-        kind: 'rename', from, to,
-      }) as CordHostRecord),
-      ...[...this._filesToCreate.values()].map(path => ({
-        kind: 'create', path, content: this._read(path),
-      }) as CordHostRecord),
-      ...[...this._filesToOverwrite.values()].map(path => ({
-        kind: 'overwrite', path, content: this._read(path),
-      }) as CordHostRecord),
+      ...[...this._filesToDelete.values()].map(
+        (path) =>
+          ({
+            kind: 'delete',
+            path,
+          } as CordHostRecord),
+      ),
+      ...[...this._filesToRename.entries()].map(
+        ([from, to]) =>
+          ({
+            kind: 'rename',
+            from,
+            to,
+          } as CordHostRecord),
+      ),
+      ...[...this._filesToCreate.values()].map(
+        (path) =>
+          ({
+            kind: 'create',
+            path,
+            content: this._read(path),
+          } as CordHostRecord),
+      ),
+      ...[...this._filesToOverwrite.values()].map(
+        (path) =>
+          ({
+            kind: 'overwrite',
+            path,
+            content: this._read(path),
+          } as CordHostRecord),
+      ),
     ];
   }
 
@@ -184,14 +198,14 @@ export class CordHost extends SimpleMemoryHost {
 
   overwrite(path: Path, content: FileBuffer): Observable<void> {
     return this.isDirectory(path).pipe(
-      switchMap(isDir => {
+      switchMap((isDir) => {
         if (isDir) {
           return throwError(new PathIsDirectoryException(path));
         }
 
         return this.exists(path);
       }),
-      switchMap(exists => {
+      switchMap((exists) => {
         if (!exists) {
           return throwError(new FileDoesNotExistException(path));
         }
@@ -205,9 +219,9 @@ export class CordHost extends SimpleMemoryHost {
     );
   }
 
-  write(path: Path, content: FileBuffer): Observable<void> {
+  override write(path: Path, content: FileBuffer): Observable<void> {
     return this.exists(path).pipe(
-      switchMap(exists => {
+      switchMap((exists) => {
         if (exists) {
           // It exists, but might be being renamed or deleted. In that case we want to create it.
           if (this.willRename(path) || this.willDelete(path)) {
@@ -222,7 +236,7 @@ export class CordHost extends SimpleMemoryHost {
     );
   }
 
-  read(path: Path): Observable<FileBuffer> {
+  override read(path: Path): Observable<FileBuffer> {
     if (this._exists(path)) {
       return super.read(path);
     }
@@ -230,7 +244,7 @@ export class CordHost extends SimpleMemoryHost {
     return this._back.read(path);
   }
 
-  delete(path: Path): Observable<void> {
+  override delete(path: Path): Observable<void> {
     if (this._exists(path)) {
       if (this._filesToCreate.has(path)) {
         this._filesToCreate.delete(path);
@@ -253,7 +267,7 @@ export class CordHost extends SimpleMemoryHost {
       return super.delete(path);
     } else {
       return this._back.exists(path).pipe(
-        switchMap(exists => {
+        switchMap((exists) => {
           if (exists) {
             this._filesToDelete.add(path);
 
@@ -266,11 +280,8 @@ export class CordHost extends SimpleMemoryHost {
     }
   }
 
-  rename(from: Path, to: Path): Observable<void> {
-    return concat(
-      this.exists(to),
-      this.exists(from),
-    ).pipe(
+  override rename(from: Path, to: Path): Observable<void> {
+    return concat(this.exists(to), this.exists(from)).pipe(
       toArray(),
       switchMap(([existTo, existFrom]) => {
         if (!existFrom) {
@@ -298,7 +309,7 @@ export class CordHost extends SimpleMemoryHost {
           // if will be by-passed because we just deleted the `from` path from files to overwrite.
           return concat(
             this.rename(from, to),
-            new Observable<never>(x => {
+            new Observable<never>((x) => {
               this._filesToOverwrite.add(to);
               x.complete();
             }),
@@ -310,9 +321,7 @@ export class CordHost extends SimpleMemoryHost {
           this._filesToOverwrite.add(to);
 
           // We need to delete the original and write the new one.
-          return this.read(from).pipe(
-            map(content => this._write(to, content)),
-          );
+          return this.read(from).pipe(map((content) => this._write(to, content)));
         }
 
         const maybeTo1 = this._filesToRenameRevert.get(from);
@@ -332,49 +341,50 @@ export class CordHost extends SimpleMemoryHost {
           return super.rename(from, to);
         } else {
           // Create a file with the same content.
-          return this._back.read(from).pipe(
-            switchMap(content => super.write(to, content)),
-          );
+          return this._back.read(from).pipe(switchMap((content) => super.write(to, content)));
         }
       }),
     );
   }
 
-  list(path: Path): Observable<PathFragment[]> {
-    return concat(
-      super.list(path),
-      this._back.list(path),
-    ).pipe(
+  override list(path: Path): Observable<PathFragment[]> {
+    return concat(super.list(path), this._back.list(path)).pipe(
       reduce((list: Set<PathFragment>, curr: PathFragment[]) => {
-        curr.forEach(elem => list.add(elem));
+        curr.forEach((elem) => list.add(elem));
 
         return list;
       }, new Set<PathFragment>()),
-      map(set => [...set]),
+      map((set) => [...set]),
     );
   }
 
-  exists(path: Path): Observable<boolean> {
+  override exists(path: Path): Observable<boolean> {
     return this._exists(path)
       ? of(true)
-      : ((this.willDelete(path) || this.willRename(path)) ? of(false) : this._back.exists(path));
+      : this.willDelete(path) || this.willRename(path)
+      ? of(false)
+      : this._back.exists(path);
   }
-  isDirectory(path: Path): Observable<boolean> {
+  override isDirectory(path: Path): Observable<boolean> {
     return this._exists(path) ? super.isDirectory(path) : this._back.isDirectory(path);
   }
-  isFile(path: Path): Observable<boolean> {
+  override isFile(path: Path): Observable<boolean> {
     return this._exists(path)
       ? super.isFile(path)
-      : ((this.willDelete(path) || this.willRename(path)) ? of(false) : this._back.isFile(path));
+      : this.willDelete(path) || this.willRename(path)
+      ? of(false)
+      : this._back.isFile(path);
   }
 
-  stat(path: Path): Observable<Stats | null> | null {
+  override stat(path: Path): Observable<Stats | null> | null {
     return this._exists(path)
       ? super.stat(path)
-      : ((this.willDelete(path) || this.willRename(path)) ? of(null) : this._back.stat(path));
+      : this.willDelete(path) || this.willRename(path)
+      ? of(null)
+      : this._back.stat(path);
   }
 
-  watch(path: Path, options?: HostWatchOptions) {
+  override watch(path: Path, options?: HostWatchOptions) {
     // Watching not supported.
     return null;
   }
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..72cb494ee159 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,22 +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
  */
-// tslint:disable:no-any no-big-function
+
+/* eslint-disable @typescript-eslint/no-explicit-any */
 import { path } from '../path';
 import { fileBuffer } from './buffer';
 import { CordHost } from './record';
 import { test } from './test';
 
-
 describe('CordHost', () => {
   const TestHost = test.TestHost;
   const mutatingTestRecord = ['write', 'delete', 'rename'];
 
-  it('works (create)', done => {
+  it('works (create)', (done) => {
     const base = new TestHost({
       '/hello': 'world',
     });
@@ -27,7 +27,7 @@ describe('CordHost', () => {
     const target = new TestHost();
     host.commit(target).subscribe(undefined, done.fail);
 
-    expect(target.records.filter(x => mutatingTestRecord.includes(x.kind))).toEqual([
+    expect(target.records.filter((x) => mutatingTestRecord.includes(x.kind))).toEqual([
       { kind: 'write', path: path`/blue` },
     ]);
 
@@ -36,7 +36,7 @@ describe('CordHost', () => {
     done();
   });
 
-  it('works (create -> create)', done => {
+  it('works (create -> create)', (done) => {
     const base = new TestHost({
       '/hello': 'world',
     });
@@ -48,7 +48,7 @@ describe('CordHost', () => {
     const target = new TestHost();
     host.commit(target).subscribe(undefined, done.fail);
 
-    expect(target.records.filter(x => mutatingTestRecord.includes(x.kind))).toEqual([
+    expect(target.records.filter((x) => mutatingTestRecord.includes(x.kind))).toEqual([
       { kind: 'write', path: path`/blue` },
     ]);
 
@@ -58,7 +58,7 @@ describe('CordHost', () => {
     done();
   });
 
-  it('works (create -> delete)', done => {
+  it('works (create -> delete)', (done) => {
     const base = new TestHost({
       '/hello': 'world',
     });
@@ -70,15 +70,14 @@ describe('CordHost', () => {
     const target = new TestHost();
     host.commit(target).subscribe(undefined, done.fail);
 
-    expect(target.records.filter(x => mutatingTestRecord.includes(x.kind))).toEqual([
-    ]);
+    expect(target.records.filter((x) => mutatingTestRecord.includes(x.kind))).toEqual([]);
 
     expect(target.$exists('/hello')).toBe(false);
     expect(target.$exists('/blue')).toBe(false);
     done();
   });
 
-  it('works (create -> rename)', done => {
+  it('works (create -> rename)', (done) => {
     const base = new TestHost({
       '/hello': 'world',
     });
@@ -91,7 +90,7 @@ describe('CordHost', () => {
     host.commit(target).subscribe(undefined, done.fail);
 
     // Check that there's only 1 write done.
-    expect(target.records.filter(x => mutatingTestRecord.includes(x.kind))).toEqual([
+    expect(target.records.filter((x) => mutatingTestRecord.includes(x.kind))).toEqual([
       { kind: 'write', path: path`/red` },
     ]);
 
@@ -102,7 +101,7 @@ describe('CordHost', () => {
     done();
   });
 
-  it('works (create -> rename (identity))', done => {
+  it('works (create -> rename (identity))', (done) => {
     const base = new TestHost({
       '/hello': 'world',
     });
@@ -115,7 +114,7 @@ describe('CordHost', () => {
     host.commit(target).subscribe(undefined, done.fail);
 
     // Check that there's only 1 write done.
-    expect(target.records.filter(x => mutatingTestRecord.includes(x.kind))).toEqual([
+    expect(target.records.filter((x) => mutatingTestRecord.includes(x.kind))).toEqual([
       { kind: 'write', path: path`/blue` },
     ]);
 
@@ -125,7 +124,7 @@ describe('CordHost', () => {
     done();
   });
 
-  it('works (create -> rename -> rename)', done => {
+  it('works (create -> rename -> rename)', (done) => {
     const base = new TestHost({
       '/hello': 'world',
     });
@@ -139,7 +138,7 @@ describe('CordHost', () => {
     host.commit(target).subscribe(undefined, done.fail);
 
     // Check that there's only 1 write done.
-    expect(target.records.filter(x => mutatingTestRecord.includes(x.kind))).toEqual([
+    expect(target.records.filter((x) => mutatingTestRecord.includes(x.kind))).toEqual([
       { kind: 'write', path: path`/yellow` },
     ]);
 
@@ -151,7 +150,7 @@ describe('CordHost', () => {
     done();
   });
 
-  it('works (rename)', done => {
+  it('works (rename)', (done) => {
     const base = new TestHost({
       '/hello': 'world',
     });
@@ -163,7 +162,7 @@ describe('CordHost', () => {
     host.commit(target).subscribe(undefined, done.fail);
 
     // Check that there's only 1 write done.
-    expect(target.records.filter(x => mutatingTestRecord.includes(x.kind))).toEqual([
+    expect(target.records.filter((x) => mutatingTestRecord.includes(x.kind))).toEqual([
       { kind: 'rename', from: path`/hello`, to: path`/blue` },
     ]);
 
@@ -173,7 +172,7 @@ describe('CordHost', () => {
     done();
   });
 
-  it('works (rename -> rename)', done => {
+  it('works (rename -> rename)', (done) => {
     const base = new TestHost({
       '/hello': 'world',
     });
@@ -186,7 +185,7 @@ describe('CordHost', () => {
     host.commit(target).subscribe(undefined, done.fail);
 
     // Check that there's only 1 write done.
-    expect(target.records.filter(x => mutatingTestRecord.includes(x.kind))).toEqual([
+    expect(target.records.filter((x) => mutatingTestRecord.includes(x.kind))).toEqual([
       { kind: 'rename', from: path`/hello`, to: path`/red` },
     ]);
 
@@ -197,7 +196,7 @@ describe('CordHost', () => {
     done();
   });
 
-  it('works (rename -> create)', done => {
+  it('works (rename -> create)', (done) => {
     const base = new TestHost({
       '/hello': 'world',
     });
@@ -210,7 +209,7 @@ describe('CordHost', () => {
     host.commit(target).subscribe(undefined, done.fail);
 
     // Check that there's only 1 write done.
-    expect(target.records.filter(x => mutatingTestRecord.includes(x.kind))).toEqual([
+    expect(target.records.filter((x) => mutatingTestRecord.includes(x.kind))).toEqual([
       { kind: 'rename', from: path`/hello`, to: path`/blue` },
       { kind: 'write', path: path`/hello` },
     ]);
@@ -221,7 +220,7 @@ describe('CordHost', () => {
     done();
   });
 
-  it('works (overwrite)', done => {
+  it('works (overwrite)', (done) => {
     const base = new TestHost({
       '/hello': 'world',
     });
@@ -233,7 +232,7 @@ describe('CordHost', () => {
     host.commit(target).subscribe(undefined, done.fail);
 
     // Check that there's only 1 write done.
-    expect(target.records.filter(x => mutatingTestRecord.includes(x.kind))).toEqual([
+    expect(target.records.filter((x) => mutatingTestRecord.includes(x.kind))).toEqual([
       { kind: 'write', path: path`/hello` },
     ]);
 
@@ -243,7 +242,7 @@ describe('CordHost', () => {
     done();
   });
 
-  it('works (overwrite -> overwrite)', done => {
+  it('works (overwrite -> overwrite)', (done) => {
     const base = new TestHost({
       '/hello': 'world',
     });
@@ -256,7 +255,7 @@ describe('CordHost', () => {
     host.commit(target).subscribe(undefined, done.fail);
 
     // Check that there's only 1 write done.
-    expect(target.records.filter(x => mutatingTestRecord.includes(x.kind))).toEqual([
+    expect(target.records.filter((x) => mutatingTestRecord.includes(x.kind))).toEqual([
       { kind: 'write', path: path`/hello` },
     ]);
 
@@ -266,7 +265,7 @@ describe('CordHost', () => {
     done();
   });
 
-  it('works (overwrite -> rename)', done => {
+  it('works (overwrite -> rename)', (done) => {
     const base = new TestHost({
       '/hello': 'world',
     });
@@ -278,7 +277,7 @@ describe('CordHost', () => {
     const target = base.clone();
     host.commit(target).subscribe(undefined, done.fail);
 
-    expect(target.records.filter(x => mutatingTestRecord.includes(x.kind))).toEqual([
+    expect(target.records.filter((x) => mutatingTestRecord.includes(x.kind))).toEqual([
       { kind: 'rename', from: path`/hello`, to: path`/blue` },
       { kind: 'write', path: path`/blue` },
     ]);
@@ -290,7 +289,7 @@ describe('CordHost', () => {
     done();
   });
 
-  it('works (overwrite -> delete)', done => {
+  it('works (overwrite -> delete)', (done) => {
     const base = new TestHost({
       '/hello': 'world',
     });
@@ -302,7 +301,7 @@ describe('CordHost', () => {
     const target = base.clone();
     host.commit(target).subscribe(undefined, done.fail);
 
-    expect(target.records.filter(x => mutatingTestRecord.includes(x.kind))).toEqual([
+    expect(target.records.filter((x) => mutatingTestRecord.includes(x.kind))).toEqual([
       { kind: 'delete', path: path`/hello` },
     ]);
 
@@ -310,7 +309,7 @@ describe('CordHost', () => {
     done();
   });
 
-  it('works (rename -> overwrite)', done => {
+  it('works (rename -> overwrite)', (done) => {
     const base = new TestHost({
       '/hello': 'world',
     });
@@ -322,7 +321,7 @@ describe('CordHost', () => {
     const target = base.clone();
     host.commit(target).subscribe(undefined, done.fail);
 
-    expect(target.records.filter(x => mutatingTestRecord.includes(x.kind))).toEqual([
+    expect(target.records.filter((x) => mutatingTestRecord.includes(x.kind))).toEqual([
       { kind: 'rename', from: path`/hello`, to: path`/blue` },
       { kind: 'write', path: path`/blue` },
     ]);
@@ -334,7 +333,7 @@ describe('CordHost', () => {
     done();
   });
 
-  it('works (delete)', done => {
+  it('works (delete)', (done) => {
     const base = new TestHost({
       '/hello': 'world',
     });
@@ -345,7 +344,7 @@ describe('CordHost', () => {
     const target = new TestHost();
     host.commit(target).subscribe(undefined, done.fail);
 
-    expect(target.records.filter(x => mutatingTestRecord.includes(x.kind))).toEqual([
+    expect(target.records.filter((x) => mutatingTestRecord.includes(x.kind))).toEqual([
       { kind: 'delete', path: path`/hello` },
     ]);
 
@@ -353,7 +352,7 @@ describe('CordHost', () => {
     done();
   });
 
-  it('works (delete -> create)', done => {
+  it('works (delete -> create)', (done) => {
     const base = new TestHost({
       '/hello': 'world',
     });
@@ -365,7 +364,7 @@ describe('CordHost', () => {
     const target = base.clone();
     host.commit(target).subscribe(undefined, done.fail);
 
-    expect(target.records.filter(x => mutatingTestRecord.includes(x.kind))).toEqual([
+    expect(target.records.filter((x) => mutatingTestRecord.includes(x.kind))).toEqual([
       { kind: 'write', path: path`/hello` },
     ]);
 
@@ -374,7 +373,7 @@ describe('CordHost', () => {
     done();
   });
 
-  it('works (rename -> delete)', done => {
+  it('works (rename -> delete)', (done) => {
     const base = new TestHost({
       '/hello': 'world',
     });
@@ -386,7 +385,7 @@ describe('CordHost', () => {
     const target = base.clone();
     host.commit(target).subscribe(undefined, done.fail);
 
-    expect(target.records.filter(x => mutatingTestRecord.includes(x.kind))).toEqual([
+    expect(target.records.filter((x) => mutatingTestRecord.includes(x.kind))).toEqual([
       { kind: 'delete', path: path`/hello` },
     ]);
 
@@ -394,7 +393,7 @@ describe('CordHost', () => {
     done();
   });
 
-  it('works (delete -> rename)', done => {
+  it('works (delete -> rename)', (done) => {
     const base = new TestHost({
       '/hello': 'world',
       '/blue': 'foo',
@@ -406,7 +405,7 @@ describe('CordHost', () => {
 
     const target = base.clone();
     host.commit(target).subscribe(undefined, done.fail);
-    expect(target.records.filter(x => mutatingTestRecord.includes(x.kind))).toEqual([
+    expect(target.records.filter((x) => mutatingTestRecord.includes(x.kind))).toEqual([
       { kind: 'delete', path: path`/hello` },
       { kind: 'write', path: path`/blue` },
     ]);
@@ -429,7 +428,11 @@ describe('CordHost', () => {
     });
 
     let error = false;
-    host.commit(target).subscribe(undefined, () => error = true, () => error = false);
+    host.commit(target).subscribe(
+      undefined,
+      () => (error = true),
+      () => (error = false),
+    );
     expect(error).toBe(true);
   });
 
@@ -444,7 +447,11 @@ describe('CordHost', () => {
     const target = new TestHost({});
 
     let error = false;
-    host.commit(target).subscribe(undefined, () => error = true, () => error = false);
+    host.commit(target).subscribe(
+      undefined,
+      () => (error = true),
+      () => (error = false),
+    );
     expect(error).toBe(true);
   });
 
@@ -459,7 +466,11 @@ describe('CordHost', () => {
     const target = new TestHost({});
 
     let error = false;
-    host.commit(target).subscribe(undefined, () => error = true, () => error = false);
+    host.commit(target).subscribe(
+      undefined,
+      () => (error = true),
+      () => (error = false),
+    );
     expect(error).toBe(true);
   });
 
@@ -476,7 +487,11 @@ describe('CordHost', () => {
     });
 
     let error = false;
-    host.commit(target).subscribe(undefined, () => error = true, () => error = false);
+    host.commit(target).subscribe(
+      undefined,
+      () => (error = true),
+      () => (error = false),
+    );
     expect(error).toBe(true);
   });
 
@@ -487,20 +502,25 @@ describe('CordHost', () => {
 
     const host = new CordHost(base);
     let error = false;
-    host.write(path`/dir`, fileBuffer`beautiful world`)
-      .subscribe(undefined, () => error = true, () => error = false);
+    host.write(path`/dir`, fileBuffer`beautiful world`).subscribe(
+      undefined,
+      () => (error = true),
+      () => (error = false),
+    );
 
     expect(error).toBe(true);
   });
 
   it('errors (delete: not exist)', () => {
-    const base = new TestHost({
-    });
+    const base = new TestHost({});
 
     const host = new CordHost(base);
     let error = false;
-    host.delete(path`/hello`)
-      .subscribe(undefined, () => error = true, () => error = false);
+    host.delete(path`/hello`).subscribe(
+      undefined,
+      () => (error = true),
+      () => (error = false),
+    );
 
     expect(error).toBe(true);
   });
@@ -513,20 +533,25 @@ describe('CordHost', () => {
 
     const host = new CordHost(base);
     let error = false;
-    host.rename(path`/hello`, path`/blue`)
-      .subscribe(undefined, () => error = true, () => error = false);
+    host.rename(path`/hello`, path`/blue`).subscribe(
+      undefined,
+      () => (error = true),
+      () => (error = false),
+    );
 
     expect(error).toBe(true);
   });
 
   it('errors (rename: not exist)', () => {
-    const base = new TestHost({
-    });
+    const base = new TestHost({});
 
     const host = new CordHost(base);
     let error = false;
-    host.rename(path`/hello`, path`/blue`)
-      .subscribe(undefined, () => error = true, () => error = false);
+    host.rename(path`/hello`, path`/blue`).subscribe(
+      undefined,
+      () => (error = true),
+      () => (error = false),
+    );
 
     expect(error).toBe(true);
   });
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..054f678e3349 100644
--- a/packages/angular_devkit/core/src/virtual-fs/host/resolver.ts
+++ b/packages/angular_devkit/core/src/virtual-fs/host/resolver.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 { Observable } from 'rxjs';
 import { Path, PathFragment } from '../path';
 import {
@@ -25,7 +26,9 @@ export abstract class ResolverHost<T extends object> implements Host<T> {
 
   constructor(protected _delegate: Host<T>) {}
 
-  get capabilities(): HostCapabilities { return this._delegate.capabilities; }
+  get capabilities(): HostCapabilities {
+    return this._delegate.capabilities;
+  }
 
   write(path: Path, content: FileBuffer): Observable<void> {
     return this._delegate.write(this._resolve(path), content);
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..c39362033ab2 100644
--- a/packages/angular_devkit/core/src/virtual-fs/host/safe.ts
+++ b/packages/angular_devkit/core/src/virtual-fs/host/safe.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 { Observable, of } from 'rxjs';
 import { catchError } from 'rxjs/operators';
 import { Path, PathFragment } from '../path';
@@ -26,31 +27,23 @@ export class SafeReadonlyHost<StatsT extends object = {}> implements ReadonlyHos
   }
 
   list(path: Path): Observable<PathFragment[]> {
-    return this._delegate.list(path).pipe(
-      catchError(() => of([])),
-    );
+    return this._delegate.list(path).pipe(catchError(() => of([])));
   }
 
   exists(path: Path): Observable<boolean> {
     return this._delegate.exists(path);
   }
   isDirectory(path: Path): Observable<boolean> {
-    return this._delegate.isDirectory(path).pipe(
-      catchError(() => of(false)),
-    );
+    return this._delegate.isDirectory(path).pipe(catchError(() => of(false)));
   }
   isFile(path: Path): Observable<boolean> {
-    return this._delegate.isFile(path).pipe(
-      catchError(() => of(false)),
-    );
+    return this._delegate.isFile(path).pipe(catchError(() => of(false)));
   }
 
   // Some hosts may not support stats.
   stat(path: Path): Observable<Stats<StatsT> | null> | null {
     const maybeStat = this._delegate.stat(path);
 
-    return maybeStat && maybeStat.pipe(
-      catchError(() => of(null)),
-    );
+    return maybeStat && maybeStat.pipe(catchError(() => of(null)));
   }
 }
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..0dfe6a26ad51 100644
--- a/packages/angular_devkit/core/src/virtual-fs/host/scoped.ts
+++ b/packages/angular_devkit/core/src/virtual-fs/host/scoped.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 { NormalizedRoot, Path, join } from '../path';
 import { Host } from './interface';
 import { ResolverHost } from './resolver';
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..e3548b707034 100644
--- a/packages/angular_devkit/core/src/virtual-fs/host/sync.ts
+++ b/packages/angular_devkit/core/src/virtual-fs/host/sync.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 { Observable } from 'rxjs';
 import { BaseException } from '../../exception';
 import { Path, PathFragment } from '../path';
@@ -18,9 +19,10 @@ import {
   Stats,
 } from './interface';
 
-
 export class SynchronousDelegateExpectedException extends BaseException {
-  constructor() { super(`Expected a synchronous delegate but got an asynchronous one.`); }
+  constructor() {
+    super(`Expected a synchronous delegate but got an asynchronous one.`);
+  }
 }
 
 /**
@@ -40,9 +42,9 @@ export class SyncDelegateHost<T extends object = {}> {
     // Perf note: this is not using an observer object to avoid a performance penalty in RxJS.
     // See https://github.com/ReactiveX/rxjs/pull/5646 for details.
     observable.subscribe(
-      (x: ResultT) => result = x,
-      (err: Error) => errorResult = err,
-      () => completed = true,
+      (x: ResultT) => (result = x),
+      (err: Error) => (errorResult = err),
+      () => (completed = true),
     );
 
     if (errorResult !== undefined) {
@@ -55,8 +57,8 @@ export class SyncDelegateHost<T extends object = {}> {
     // The non-null operation is to work around `void` type. We don't allow to return undefined
     // but ResultT could be void, which is undefined in JavaScript, so this doesn't change the
     // behaviour.
-    // tslint:disable-next-line:no-non-null-assertion
-    return result !;
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    return result!;
   }
 
   get capabilities(): HostCapabilities {
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..b8c407b79fd4 100644
--- a/packages/angular_devkit/core/src/virtual-fs/host/test.ts
+++ b/packages/angular_devkit/core/src/virtual-fs/host/test.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 { Observable } from 'rxjs';
 import { Path, PathFragment, join, normalize } from '../path';
 import { fileBufferToString, stringToFileBuffer } from './buffer';
@@ -12,22 +13,31 @@ import { FileBuffer, HostWatchEvent, HostWatchOptions, Stats } from './interface
 import { SimpleMemoryHost, SimpleMemoryHostStats } from './memory';
 import { SyncDelegateHost } from './sync';
 
+// eslint-disable-next-line @typescript-eslint/no-namespace
 export namespace test {
-
-  export type TestLogRecord = {
-    kind: 'write' | 'read' | 'delete' | 'list' | 'exists' | 'isDirectory' | 'isFile' | 'stat'
-    | 'watch';
-    path: Path;
-  } | {
-    kind: 'rename';
-    from: Path;
-    to: Path;
-  };
-
+  export type TestLogRecord =
+    | {
+        kind:
+          | 'write'
+          | 'read'
+          | 'delete'
+          | 'list'
+          | 'exists'
+          | 'isDirectory'
+          | 'isFile'
+          | 'stat'
+          | 'watch';
+        path: Path;
+      }
+    | {
+        kind: 'rename';
+        from: Path;
+        to: Path;
+      };
 
   export class TestHost extends SimpleMemoryHost {
     protected _records: TestLogRecord[] = [];
-    protected _sync: SyncDelegateHost<{}>|null = null;
+    protected _sync: SyncDelegateHost<{}> | null = null;
 
     constructor(map: { [path: string]: string } = {}) {
       super();
@@ -47,8 +57,9 @@ export namespace test {
     get files(): Path[] {
       const sync = this.sync;
       function _visit(p: Path): Path[] {
-        return sync.list(p)
-          .map(fragment => join(p, fragment))
+        return sync
+          .list(p)
+          .map((fragment) => join(p, fragment))
           .reduce((files, path) => {
             if (sync.isDirectory(path)) {
               return files.concat(_visit(path));
@@ -77,52 +88,52 @@ export namespace test {
     }
 
     // Override parents functions to keep a record of all operators that were done.
-    protected _write(path: Path, content: FileBuffer) {
+    protected override _write(path: Path, content: FileBuffer) {
       this._records.push({ kind: 'write', path });
 
       return super._write(path, content);
     }
-    protected _read(path: Path) {
+    protected override _read(path: Path) {
       this._records.push({ kind: 'read', path });
 
       return super._read(path);
     }
-    protected _delete(path: Path) {
+    protected override _delete(path: Path) {
       this._records.push({ kind: 'delete', path });
 
       return super._delete(path);
     }
-    protected _rename(from: Path, to: Path) {
+    protected override _rename(from: Path, to: Path) {
       this._records.push({ kind: 'rename', from, to });
 
       return super._rename(from, to);
     }
-    protected _list(path: Path): PathFragment[] {
+    protected override _list(path: Path): PathFragment[] {
       this._records.push({ kind: 'list', path });
 
       return super._list(path);
     }
-    protected _exists(path: Path) {
+    protected override _exists(path: Path) {
       this._records.push({ kind: 'exists', path });
 
       return super._exists(path);
     }
-    protected _isDirectory(path: Path) {
+    protected override _isDirectory(path: Path) {
       this._records.push({ kind: 'isDirectory', path });
 
       return super._isDirectory(path);
     }
-    protected _isFile(path: Path) {
+    protected override _isFile(path: Path) {
       this._records.push({ kind: 'isFile', path });
 
       return super._isFile(path);
     }
-    protected _stat(path: Path): Stats<SimpleMemoryHostStats> | null {
+    protected override _stat(path: Path): Stats<SimpleMemoryHostStats> | null {
       this._records.push({ kind: 'stat', path });
 
       return super._stat(path);
     }
-    protected _watch(path: Path, options?: HostWatchOptions): Observable<HostWatchEvent> {
+    protected override _watch(path: Path, options?: HostWatchOptions): Observable<HostWatchEvent> {
       this._records.push({ kind: 'watch', path });
 
       return super._watch(path, options);
@@ -152,5 +163,4 @@ export namespace test {
       return super._isFile(normalize(path));
     }
   }
-
 }
diff --git a/packages/angular_devkit/core/src/virtual-fs/host/test_spec.ts b/packages/angular_devkit/core/src/virtual-fs/host/test_spec.ts
index 4e0cb296a155..c1930ce0d6a2 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,16 +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 { test } from './test';
 
+import { test } from './test';
 
 // Yes, we realize the irony of testing a test host.
 describe('TestHost', () => {
-
   it('can list files', () => {
     const files = {
       '/x/y/z': '',
@@ -22,5 +21,4 @@ describe('TestHost', () => {
     const host = new test.TestHost(files);
     expect(host.files.sort() as string[]).toEqual(Object.keys(files).sort());
   });
-
 });
diff --git a/packages/angular_devkit/core/src/virtual-fs/index.ts b/packages/angular_devkit/core/src/virtual-fs/index.ts
index 988c3b40d449..2eb9af9490e3 100644
--- a/packages/angular_devkit/core/src/virtual-fs/index.ts
+++ b/packages/angular_devkit/core/src/virtual-fs/index.ts
@@ -1,11 +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
  */
-export * from './path';
 
 import * as virtualFs from './host/index';
+
+export * from './path';
 export { virtualFs };
diff --git a/packages/angular_devkit/core/src/virtual-fs/path.ts b/packages/angular_devkit/core/src/virtual-fs/path.ts
index d5edd6da300a..4aba24d5c3bf 100644
--- a/packages/angular_devkit/core/src/virtual-fs/path.ts
+++ b/packages/angular_devkit/core/src/virtual-fs/path.ts
@@ -1,25 +1,30 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+
 import { BaseException } from '../exception';
 import { TemplateTag } from '../utils/literals';
 
-
 export class InvalidPathException extends BaseException {
-  constructor(path: string) { super(`Path ${JSON.stringify(path)} is invalid.`); }
+  constructor(path: string) {
+    super(`Path ${JSON.stringify(path)} is invalid.`);
+  }
 }
 export class PathMustBeAbsoluteException extends BaseException {
-  constructor(path: string) { super(`Path ${JSON.stringify(path)} must be absolute.`); }
+  constructor(path: string) {
+    super(`Path ${JSON.stringify(path)} must be absolute.`);
+  }
 }
 export class PathCannotBeFragmentException extends BaseException {
-  constructor(path: string) { super(`Path ${JSON.stringify(path)} cannot be made a fragment.`); }
+  constructor(path: string) {
+    super(`Path ${JSON.stringify(path)} cannot be made a fragment.`);
+  }
 }
 
-
 /**
  * A Path recognized by most methods in the DevKit.
  */
@@ -34,20 +39,17 @@ export type PathFragment = Path & {
   __PRIVATE_DEVKIT_PATH_FRAGMENT: void;
 };
 
-
 /**
  * The Separator for normalized path.
  * @type {Path}
  */
 export const NormalizedSep = '/' as Path;
 
-
 /**
  * The root of a normalized path.
  * @type {Path}
  */
-export const NormalizedRoot = NormalizedSep as Path;
-
+export const NormalizedRoot = NormalizedSep;
 
 /**
  * Split a path into multiple path fragments. Each fragments except the last one will end with
@@ -56,7 +58,7 @@ export const NormalizedRoot = NormalizedSep as Path;
  * @returns {Path[]} An array of path fragments.
  */
 export function split(path: Path): PathFragment[] {
-  const fragments = path.split(NormalizedSep).map(x => fragment(x));
+  const fragments = path.split(NormalizedSep).map((x) => fragment(x));
   if (fragments[fragments.length - 1].length === 0) {
     fragments.pop();
   }
@@ -77,7 +79,6 @@ export function extname(path: Path): string {
   }
 }
 
-
 /**
  * Return the basename of the path, as a Path. See path.basename
  */
@@ -90,7 +91,6 @@ export function basename(path: Path): PathFragment {
   }
 }
 
-
 /**
  * Return the dirname of the path, as a Path. See path.dirname
  */
@@ -105,7 +105,6 @@ export function dirname(path: Path): Path {
   return normalize(path.substr(0, endIndex));
 }
 
-
 /**
  * Join multiple paths together, and normalize the result. Accepts strings that will be
  * normalized as well (but the original must be a path).
@@ -118,7 +117,6 @@ export function join(p1: Path, ...others: string[]): Path {
   }
 }
 
-
 /**
  * Returns true if a path is absolute.
  */
@@ -126,7 +124,6 @@ export function isAbsolute(p: Path) {
   return p.startsWith(NormalizedSep);
 }
 
-
 /**
  * Returns a path such that `join(from, relative(from, to)) == to`.
  * Both paths must be absolute, otherwise it does not make much sense.
@@ -155,14 +152,16 @@ export function relative(from: Path, to: Path): Path {
     if (splitFrom.length == 0) {
       p = splitTo.join(NormalizedSep);
     } else {
-      p = splitFrom.map(_ => '..').concat(splitTo).join(NormalizedSep);
+      p = splitFrom
+        .map(() => '..')
+        .concat(splitTo)
+        .join(NormalizedSep);
     }
   }
 
   return normalize(p);
 }
 
-
 /**
  * Returns a Path that is the resolution of p2, from p1. If p2 is absolute, it will return p2,
  * otherwise will join both p1 and p2.
@@ -175,7 +174,6 @@ export function resolve(p1: Path, p2: Path) {
   }
 }
 
-
 export function fragment(path: string): PathFragment {
   if (path.indexOf(NormalizedSep) != -1) {
     throw new PathCannotBeFragmentException(path);
@@ -184,14 +182,12 @@ export function fragment(path: string): PathFragment {
   return path as PathFragment;
 }
 
-
 /**
  * normalize() cache to reduce computation. For now this grows and we never flush it, but in the
  * future we might want to add a few cache flush to prevent this from growing too large.
  */
 let normalizedCache = new Map<string, Path>();
 
-
 /**
  * Reset the cache. This is only useful for testing.
  * @private
@@ -200,7 +196,6 @@ export function resetNormalizeCache() {
   normalizedCache = new Map<string, Path>();
 }
 
-
 /**
  * Normalize a string into a Path. This is the only mean to get a Path type from a string that
  * represents a system path. This method cache the results as real world paths tend to be
@@ -225,7 +220,6 @@ export function normalize(path: string): Path {
   return maybePath;
 }
 
-
 /**
  * The no cache version of the normalize() function. Used for benchmarking and testing.
  */
@@ -273,7 +267,7 @@ export function noCacheNormalize(path: string): Path {
   }
 
   if (p.length == 1) {
-    return p[0] == '' ? NormalizedSep : '' as Path;
+    return p[0] == '' ? NormalizedSep : ('' as Path);
   } else {
     if (p[0] == '.') {
       p.shift();
@@ -283,12 +277,10 @@ export function noCacheNormalize(path: string): Path {
   }
 }
 
-
 export const path: TemplateTag<Path> = (strings, ...values) => {
   return normalize(String.raw(strings, ...values));
 };
 
-
 // Platform-specific paths.
 export type WindowsPath = string & {
   __PRIVATE_DEVKIT_WINDOWS_PATH: void;
@@ -309,7 +301,7 @@ export function asWindowsPath(path: Path): WindowsPath {
 }
 
 export function asPosixPath(path: Path): PosixPath {
-  return path as string as PosixPath;
+  return (path as string) as PosixPath;
 }
 
 export function getSystemPath(path: Path): string {
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..034733b2ac05 100644
--- a/packages/angular_devkit/core/src/virtual-fs/path_spec.ts
+++ b/packages/angular_devkit/core/src/virtual-fs/path_spec.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 {
   InvalidPathException,
   Path,
@@ -18,7 +19,6 @@ import {
   split,
 } from './path';
 
-
 describe('path', () => {
   it('normalize', () => {
     expect(normalize('////')).toBe('/');
@@ -58,12 +58,13 @@ describe('path', () => {
     expect(normalize('./a/../../a/b/c')).toBe('../a/b/c');
 
     // Invalid use cases.
-    expect(() => normalize('/./././../././/'))
-      .toThrow(new InvalidPathException('/./././../././/'));
-    expect(() => normalize('/./././../././/../'))
-      .toThrow(new InvalidPathException('/./././../././/../'));
-    expect(() => normalize('/./././../././a/.'))
-      .toThrow(new InvalidPathException('/./././../././a/.'));
+    expect(() => normalize('/./././../././/')).toThrow(new InvalidPathException('/./././../././/'));
+    expect(() => normalize('/./././../././/../')).toThrow(
+      new InvalidPathException('/./././../././/../'),
+    );
+    expect(() => normalize('/./././../././a/.')).toThrow(
+      new InvalidPathException('/./././../././a/.'),
+    );
 
     expect(() => normalize('/c/../../')).toThrow(new InvalidPathException('/c/../../'));
 
@@ -74,8 +75,7 @@ describe('path', () => {
     expect(normalize('C:\\a\\b\\c')).toBe('/C/a/b/c');
     expect(normalize('c:\\a\\b\\c')).toBe('/c/a/b/c');
     expect(normalize('A:\\a\\b\\c')).toBe('/A/a/b/c');
-    expect(() => normalize('A:\\..\\..'))
-      .toThrow(new InvalidPathException('A:\\..\\..'));
+    expect(() => normalize('A:\\..\\..')).toThrow(new InvalidPathException('A:\\..\\..'));
     expect(normalize('\\.\\a\\b\\c')).toBe('/a/b/c');
     expect(normalize('\\.\\a\\b\\.\\c')).toBe('/a/b/c');
     expect(normalize('\\.\\a\\b\\d\\..\\c')).toBe('/a/b/c');
@@ -112,7 +112,7 @@ describe('path', () => {
     ];
 
     for (const [input, result] of tests) {
-      const args = input.map(x => normalize(x)) as [Path, ...Path[]];
+      const args = input.map((x) => normalize(x)) as [Path, ...Path[]];
 
       it(`(${JSON.stringify(args)}) == "${result}"`, () => {
         expect(join(...args)).toBe(result);
@@ -128,10 +128,7 @@ describe('path', () => {
       ['/a/b/c', '/a/b', '..'],
       ['/a/b/c', '/a/b/d', '../d'],
       ['/a/b/c/d/e', '/a/f/g', '../../../../f/g'],
-      [
-        '/src/app/sub1/test1', '/src/app/sub2/test2',
-        '../../sub2/test2',
-      ],
+      ['/src/app/sub1/test1', '/src/app/sub2/test2', '../../sub2/test2'],
       ['/', '/a/b/c', 'a/b/c'],
       ['/a/b/c', '/d', '../../../d'],
     ];
@@ -168,5 +165,4 @@ describe('path', () => {
     expect(asWindowsPath(normalize('c:/b/'))).toBe('c:\\b');
     expect(asWindowsPath(normalize('c:/b/c'))).toBe('c:\\b\\c');
   });
-
 });
diff --git a/packages/angular_devkit/core/src/workspace/core.ts b/packages/angular_devkit/core/src/workspace/core.ts
index ad5ae8be981f..ddb7dc515a74 100644
--- a/packages/angular_devkit/core/src/workspace/core.ts
+++ b/packages/angular_devkit/core/src/workspace/core.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, getSystemPath, join, normalize } from '../virtual-fs';
 import { WorkspaceDefinition } from './definitions';
 import { WorkspaceHost } from './host';
diff --git a/packages/angular_devkit/core/src/workspace/core_spec.ts b/packages/angular_devkit/core/src/workspace/core_spec.ts
index f92170be2586..932970f84cb6 100644
--- a/packages/angular_devkit/core/src/workspace/core_spec.ts
+++ b/packages/angular_devkit/core/src/workspace/core_spec.ts
@@ -1,11 +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
  */
-// tslint:disable:no-big-function
+
+/* eslint-disable @typescript-eslint/no-empty-function */
 import { getSystemPath, join, normalize } from '../virtual-fs';
 import {
   WorkspaceFormat,
@@ -17,9 +18,8 @@ import {
 import { WorkspaceDefinition } from './definitions';
 import { WorkspaceHost } from './host';
 
-
 describe('readWorkspace', () => {
-  it('attempts to read from specified file path [angular.json]', async (done) => {
+  it('attempts to read from specified file path [angular.json]', async () => {
     const requestedPath = '/path/to/workspace/angular.json';
 
     const host: WorkspaceHost = {
@@ -42,11 +42,9 @@ describe('readWorkspace', () => {
     };
 
     await readWorkspace(requestedPath, host);
-
-    done();
   });
 
-  it('attempts to read from specified file path [.angular.json]', async (done) => {
+  it('attempts to read from specified file path [.angular.json]', async () => {
     const requestedPath = '/path/to/workspace/.angular.json';
 
     const host: WorkspaceHost = {
@@ -69,11 +67,9 @@ describe('readWorkspace', () => {
     };
 
     await readWorkspace(requestedPath, host);
-
-    done();
   });
 
-  it('attempts to read from specified non-standard file path with format', async (done) => {
+  it('attempts to read from specified non-standard file path with format', async () => {
     const requestedPath = '/path/to/workspace/abc.json';
 
     const host: WorkspaceHost = {
@@ -96,11 +92,9 @@ describe('readWorkspace', () => {
     };
 
     await readWorkspace(requestedPath, host, WorkspaceFormat.JSON);
-
-    done();
   });
 
-  it('errors when reading from specified non-standard file path without format', async (done) => {
+  it('errors when reading from specified non-standard file path without format', async () => {
     const requestedPath = '/path/to/workspace/abc.json';
 
     const host: WorkspaceHost = {
@@ -128,11 +122,9 @@ describe('readWorkspace', () => {
     } catch (e) {
       expect(e.message).toContain('Unable to determine format for workspace path');
     }
-
-    done();
   });
 
-  it('errors when reading from specified file path with invalid specified format', async (done) => {
+  it('errors when reading from specified file path with invalid specified format', async () => {
     const requestedPath = '/path/to/workspace/angular.json';
 
     const host: WorkspaceHost = {
@@ -160,11 +152,9 @@ describe('readWorkspace', () => {
     } catch (e) {
       expect(e.message).toContain('Unsupported workspace format');
     }
-
-    done();
   });
 
-  it('attempts to find/read from directory path', async (done) => {
+  it('attempts to find/read from directory path', async () => {
     const requestedPath = getSystemPath(normalize('/path/to/workspace'));
     const expectedFile = getSystemPath(join(normalize(requestedPath), '.angular.json'));
 
@@ -195,15 +185,15 @@ describe('readWorkspace', () => {
 
     await readWorkspace(requestedPath, host);
     isFileChecks.sort();
-    expect(isFileChecks).toEqual([
-      getSystemPath(join(normalize(requestedPath), 'angular.json')),
-      getSystemPath(join(normalize(requestedPath), '.angular.json')),
-    ].sort());
-
-    done();
+    expect(isFileChecks).toEqual(
+      [
+        getSystemPath(join(normalize(requestedPath), 'angular.json')),
+        getSystemPath(join(normalize(requestedPath), '.angular.json')),
+      ].sort(),
+    );
   });
 
-  it('attempts to find/read only files for specified format from directory path', async (done) => {
+  it('attempts to find/read only files for specified format from directory path', async () => {
     const requestedPath = '/path/to/workspace';
 
     const isFileChecks: string[] = [];
@@ -240,19 +230,13 @@ describe('readWorkspace', () => {
     }
 
     isFileChecks.sort();
-    expect(isFileChecks).toEqual([
-      getSystemPath(join(normalize(requestedPath), 'angular.json')),
-    ]);
+    expect(isFileChecks).toEqual([getSystemPath(join(normalize(requestedPath), 'angular.json'))]);
 
     readFileChecks.sort();
-    expect(readFileChecks).toEqual([
-      getSystemPath(join(normalize(requestedPath), 'angular.json')),
-    ]);
-
-    done();
+    expect(readFileChecks).toEqual([getSystemPath(join(normalize(requestedPath), 'angular.json'))]);
   });
 
-  it('errors when no file found from specified directory path', async (done) => {
+  it('errors when no file found from specified directory path', async () => {
     const requestedPath = '/path/to/workspace';
 
     const host: WorkspaceHost = {
@@ -282,14 +266,11 @@ describe('readWorkspace', () => {
     } catch (e) {
       expect(e.message).toContain('Unable to locate a workspace file');
     }
-
-    done();
   });
-
 });
 
 describe('writeWorkspace', () => {
-  it('attempts to write to specified file path', async (done) => {
+  it('attempts to write to specified file path', async () => {
     const requestedPath = '/path/to/workspace/angular.json';
 
     let writtenPath: string | undefined;
@@ -317,11 +298,9 @@ describe('writeWorkspace', () => {
 
     await writeWorkspace({} as WorkspaceDefinition, host, requestedPath, WorkspaceFormat.JSON);
     expect(writtenPath).toBe(requestedPath);
-
-    done();
   });
 
-  it('errors when writing to specified file path with invalid specified format', async (done) => {
+  it('errors when writing to specified file path with invalid specified format', async () => {
     const requestedPath = '/path/to/workspace/angular.json';
 
     const host: WorkspaceHost = {
@@ -330,16 +309,18 @@ describe('writeWorkspace', () => {
 
         return '';
       },
-      async writeFile() { fail(); },
+      async writeFile() {
+        fail();
+      },
       async isFile() {
         fail();
 
         return false;
       },
       async isDirectory() {
-          fail();
+        fail();
 
-          return false;
+        return false;
       },
     };
 
@@ -349,11 +330,9 @@ describe('writeWorkspace', () => {
     } catch (e) {
       expect(e.message).toContain('Unsupported workspace format');
     }
-
-    done();
   });
 
-  it('errors when writing custom workspace without specified format', async (done) => {
+  it('errors when writing custom workspace without specified format', async () => {
     const requestedPath = '/path/to/workspace/angular.json';
 
     const host: WorkspaceHost = {
@@ -362,16 +341,18 @@ describe('writeWorkspace', () => {
 
         return '';
       },
-      async writeFile() { fail(); },
+      async writeFile() {
+        fail();
+      },
       async isFile() {
         fail();
 
         return false;
       },
       async isDirectory() {
-          fail();
+        fail();
 
-          return false;
+        return false;
       },
     };
 
@@ -381,8 +362,5 @@ describe('writeWorkspace', () => {
     } catch (e) {
       expect(e.message).toContain('A format is required');
     }
-
-    done();
   });
-
 });
diff --git a/packages/angular_devkit/core/src/workspace/definitions.ts b/packages/angular_devkit/core/src/workspace/definitions.ts
index f27b1b5af1af..c01d86dd8308 100644
--- a/packages/angular_devkit/core/src/workspace/definitions.ts
+++ b/packages/angular_devkit/core/src/workspace/definitions.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 { JsonValue } from '../json';
 
 export interface WorkspaceDefinition {
@@ -40,10 +41,7 @@ export type DefinitionCollectionListener<V extends object> = (
 class DefinitionCollection<V extends object> implements ReadonlyMap<string, V> {
   private _map: Map<string, V>;
 
-  constructor(
-    initial?: Record<string, V>,
-    private _listener?: DefinitionCollectionListener<V>,
-  ) {
+  constructor(initial?: Record<string, V>, private _listener?: DefinitionCollectionListener<V>) {
     this._map = new Map(initial && Object.entries(initial));
   }
 
@@ -133,7 +131,6 @@ function isJsonValue(value: unknown): value is JsonValue {
 }
 
 export class ProjectDefinitionCollection extends DefinitionCollection<ProjectDefinition> {
-
   constructor(
     initial?: Record<string, ProjectDefinition>,
     listener?: DefinitionCollectionListener<ProjectDefinition>,
@@ -141,16 +138,14 @@ export class ProjectDefinitionCollection extends DefinitionCollection<ProjectDef
     super(initial, listener);
   }
 
-  add(
-    definition: {
-      name: string,
-      root: string,
-      sourceRoot?: string,
-      prefix?: string,
-      targets?: Record<string, TargetDefinition | undefined>,
-      [key: string]: unknown,
-    },
-  ): ProjectDefinition {
+  add(definition: {
+    name: string;
+    root: string;
+    sourceRoot?: string;
+    prefix?: string;
+    targets?: Record<string, TargetDefinition | undefined>;
+    [key: string]: unknown;
+  }): ProjectDefinition {
     if (this.has(definition.name)) {
       throw new Error('Project name already exists.');
     }
@@ -195,7 +190,7 @@ export class ProjectDefinitionCollection extends DefinitionCollection<ProjectDef
     return project;
   }
 
-  set(name: string, value: ProjectDefinition): this {
+  override set(name: string, value: ProjectDefinition): this {
     this._validateName(name);
 
     super.set(name, value);
@@ -208,11 +203,9 @@ export class ProjectDefinitionCollection extends DefinitionCollection<ProjectDef
       throw new Error('Project name must be a valid npm package name.');
     }
   }
-
 }
 
 export class TargetDefinitionCollection extends DefinitionCollection<TargetDefinition> {
-
   constructor(
     initial?: Record<string, TargetDefinition>,
     listener?: DefinitionCollectionListener<TargetDefinition>,
@@ -222,7 +215,7 @@ export class TargetDefinitionCollection extends DefinitionCollection<TargetDefin
 
   add(
     definition: {
-      name: string,
+      name: string;
     } & TargetDefinition,
   ): TargetDefinition {
     if (this.has(definition.name)) {
@@ -242,7 +235,7 @@ export class TargetDefinitionCollection extends DefinitionCollection<TargetDefin
     return target;
   }
 
-  set(name: string, value: TargetDefinition): this {
+  override set(name: string, value: TargetDefinition): this {
     this._validateName(name);
 
     super.set(name, value);
@@ -255,5 +248,4 @@ export class TargetDefinitionCollection extends DefinitionCollection<TargetDefin
       throw new TypeError('Target name must be a string.');
     }
   }
-
 }
diff --git a/packages/angular_devkit/core/src/workspace/definitions_spec.ts b/packages/angular_devkit/core/src/workspace/definitions_spec.ts
index 9c640e2f5eb6..da263d361f90 100644
--- a/packages/angular_devkit/core/src/workspace/definitions_spec.ts
+++ b/packages/angular_devkit/core/src/workspace/definitions_spec.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
  */
-// tslint:disable:no-big-function
+
 import {
   ProjectDefinition,
   ProjectDefinitionCollection,
@@ -14,7 +14,6 @@ import {
 } from './definitions';
 
 describe('ProjectDefinitionCollection', () => {
-
   it('can be created without initial values or a listener', () => {
     const collection = new ProjectDefinitionCollection();
 
@@ -54,7 +53,9 @@ describe('ProjectDefinitionCollection', () => {
   });
 
   it('can be created with a listener', () => {
-    const listener = () => { fail('listener should not execute on initialization'); };
+    const listener = () => {
+      fail('listener should not execute on initialization');
+    };
 
     const collection = new ProjectDefinitionCollection(undefined, listener);
 
@@ -72,7 +73,9 @@ describe('ProjectDefinitionCollection', () => {
       builder: 'build-builder',
     });
 
-    const listener = () => { fail('listener should not execute on initialization'); };
+    const listener = () => {
+      fail('listener should not execute on initialization');
+    };
 
     const collection = new ProjectDefinitionCollection(initial, listener);
 
@@ -103,10 +106,11 @@ describe('ProjectDefinitionCollection', () => {
 
     const collection = new ProjectDefinitionCollection(undefined, listener);
 
-    collection.set(
-      'my-app',
-      { root: 'src/my-app', extensions: {}, targets: new TargetDefinitionCollection() },
-    );
+    collection.set('my-app', {
+      root: 'src/my-app',
+      extensions: {},
+      targets: new TargetDefinitionCollection(),
+    });
   });
 
   it('listens to an addition via add', () => {
@@ -167,16 +171,15 @@ describe('ProjectDefinitionCollection', () => {
 
     const collection = new ProjectDefinitionCollection(initial, listener);
 
-    collection.set(
-      'my-app',
-      { root: 'src/my-app2', extensions: {}, targets: new TargetDefinitionCollection() },
-    );
+    collection.set('my-app', {
+      root: 'src/my-app2',
+      extensions: {},
+      targets: new TargetDefinitionCollection(),
+    });
   });
-
 });
 
 describe('TargetDefinitionCollection', () => {
-
   it('can be created without initial values or a listener', () => {
     const collection = new TargetDefinitionCollection();
 
@@ -206,7 +209,9 @@ describe('TargetDefinitionCollection', () => {
   });
 
   it('can be created with a listener', () => {
-    const listener = () => { fail('listener should not execute on initialization'); };
+    const listener = () => {
+      fail('listener should not execute on initialization');
+    };
 
     const collection = new TargetDefinitionCollection(undefined, listener);
 
@@ -219,7 +224,9 @@ describe('TargetDefinitionCollection', () => {
       'test': { builder: 'builder:test' },
     };
 
-    const listener = () => { fail('listener should not execute on initialization'); };
+    const listener = () => {
+      fail('listener should not execute on initialization');
+    };
 
     const collection = new TargetDefinitionCollection(initial, listener);
 
@@ -245,10 +252,7 @@ describe('TargetDefinitionCollection', () => {
 
     const collection = new TargetDefinitionCollection(undefined, listener);
 
-    collection.set(
-      'build',
-      { builder: 'builder:build' },
-    );
+    collection.set('build', { builder: 'builder:build' });
   });
 
   it('listens to an addition via add', () => {
@@ -309,10 +313,6 @@ describe('TargetDefinitionCollection', () => {
 
     const collection = new TargetDefinitionCollection(initial, listener);
 
-    collection.set(
-      'build',
-      { builder: 'builder:test' },
-    );
+    collection.set('build', { builder: 'builder:test' });
   });
-
 });
diff --git a/packages/angular_devkit/core/src/workspace/host.ts b/packages/angular_devkit/core/src/workspace/host.ts
index d9d75c0cf171..e0c84b789a76 100644
--- a/packages/angular_devkit/core/src/workspace/host.ts
+++ b/packages/angular_devkit/core/src/workspace/host.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 { normalize, virtualFs } from '../virtual-fs';
 
 export interface WorkspaceHost {
diff --git a/packages/angular_devkit/core/src/workspace/host_spec.ts b/packages/angular_devkit/core/src/workspace/host_spec.ts
index 079885b60d25..2985e85bf360 100644
--- a/packages/angular_devkit/core/src/workspace/host_spec.ts
+++ b/packages/angular_devkit/core/src/workspace/host_spec.ts
@@ -1,14 +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 { test } from '../virtual-fs/host';
 import { WorkspaceHost, createWorkspaceHost } from './host';
 
-
 describe('createWorkspaceHost', () => {
   let testHost: test.TestHost;
   let workspaceHost: WorkspaceHost;
@@ -21,18 +21,16 @@ describe('createWorkspaceHost', () => {
     workspaceHost = createWorkspaceHost(testHost);
   });
 
-  it('supports isFile', async (done) => {
+  it('supports isFile', async () => {
     expect(await workspaceHost.isFile('abc.txt')).toBeTruthy();
     expect(await workspaceHost.isFile('foo/bar.json')).toBeTruthy();
     expect(await workspaceHost.isFile('foo\\bar.json')).toBeTruthy();
 
     expect(await workspaceHost.isFile('foo')).toBeFalsy();
     expect(await workspaceHost.isFile('not.there')).toBeFalsy();
-
-    done();
   });
 
-  it('supports isDirectory', async (done) => {
+  it('supports isDirectory', async () => {
     expect(await workspaceHost.isDirectory('foo')).toBeTruthy();
     expect(await workspaceHost.isDirectory('foo/')).toBeTruthy();
     expect(await workspaceHost.isDirectory('foo\\')).toBeTruthy();
@@ -40,27 +38,16 @@ describe('createWorkspaceHost', () => {
     expect(await workspaceHost.isDirectory('abc.txt')).toBeFalsy();
     expect(await workspaceHost.isDirectory('foo/bar.json')).toBeFalsy();
     expect(await workspaceHost.isDirectory('not.there')).toBeFalsy();
-
-    done();
   });
 
-  it('supports readFile', async (done) => {
+  it('supports readFile', async () => {
     expect(await workspaceHost.readFile('abc.txt')).toBe('abcdefg');
-
-    done();
   });
 
-  it('supports writeFile', async (done) => {
+  it('supports writeFile', async () => {
     await workspaceHost.writeFile('newfile', 'baz');
-    expect(testHost.files.sort() as string[]).toEqual([
-      '/abc.txt',
-      '/foo/bar.json',
-      '/newfile',
-    ]);
+    expect(testHost.files.sort() as string[]).toEqual(['/abc.txt', '/foo/bar.json', '/newfile']);
 
     expect(testHost.$read('newfile')).toBe('baz');
-
-    done();
   });
-
 });
diff --git a/packages/angular_devkit/core/src/workspace/index.ts b/packages/angular_devkit/core/src/workspace/index.ts
index 88c1071ae2f7..395a411dbba3 100644
--- a/packages/angular_devkit/core/src/workspace/index.ts
+++ b/packages/angular_devkit/core/src/workspace/index.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
  */
+
 export * from './definitions';
 export { WorkspaceHost, createWorkspaceHost } from './host';
 export { WorkspaceFormat, readWorkspace, writeWorkspace } from './core';
diff --git a/packages/angular_devkit/core/src/workspace/json/metadata.ts b/packages/angular_devkit/core/src/workspace/json/metadata.ts
index bc7d2c58bd5d..a9886176b991 100644
--- a/packages/angular_devkit/core/src/workspace/json/metadata.ts
+++ b/packages/angular_devkit/core/src/workspace/json/metadata.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 { JsonAstArray, JsonAstKeyValue, JsonAstNode, JsonAstObject, JsonValue } from '../../json';
 import { ProjectDefinition, TargetDefinition, WorkspaceDefinition } from '../definitions';
 
@@ -34,7 +35,7 @@ export interface JsonChange<T extends keyof ChangeValues = keyof ChangeValues> {
 export class JsonWorkspaceMetadata {
   readonly changes: JsonChange[] = [];
 
-  constructor(readonly filePath: string, readonly ast: JsonAstObject, readonly raw: string) { }
+  constructor(readonly filePath: string, readonly ast: JsonAstObject, readonly raw: string) {}
 
   get hasChanges(): boolean {
     return this.changes.length > 0;
@@ -45,7 +46,7 @@ export class JsonWorkspaceMetadata {
   }
 
   findChangesForPath(path: string): JsonChange[] {
-    return this.changes.filter(c => c.path === path);
+    return this.changes.filter((c) => c.path === path);
   }
 
   addChange<T extends keyof ChangeValues = keyof ChangeValues>(
diff --git a/packages/angular_devkit/core/src/workspace/json/reader.ts b/packages/angular_devkit/core/src/workspace/json/reader.ts
index 42b410f8e8dd..927fb0fba0c0 100644
--- a/packages/angular_devkit/core/src/workspace/json/reader.ts
+++ b/packages/angular_devkit/core/src/workspace/json/reader.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 {
   JsonAstKeyValue,
   JsonAstNode,
@@ -49,7 +50,7 @@ export async function readJsonWorkspace(
   }
 
   // Version check
-  const versionNode = ast.properties.find(pair => pair.key.value === 'version');
+  const versionNode = ast.properties.find((pair) => pair.key.value === 'version');
   if (!versionNode) {
     throw new Error('Unknown format - version specifier not found.');
   }
@@ -294,7 +295,7 @@ function parseTargetsObject(
     const name = key.value;
     if (context.trackChanges) {
       targets[name] = createVirtualAstObject<TargetDefinition>(value, {
-        include: [ 'builder', 'options', 'configurations', 'defaultConfiguration' ],
+        include: ['builder', 'options', 'configurations', 'defaultConfiguration'],
         listener(op, path, node, value) {
           jsonMetadata.addChange(
             op,
@@ -305,7 +306,7 @@ function parseTargetsObject(
         },
       });
     } else {
-      targets[name] = value.value as unknown as TargetDefinition;
+      targets[name] = (value.value as unknown) as TargetDefinition;
     }
   }
 
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..423051cbcc62 100644
--- a/packages/angular_devkit/core/src/workspace/json/reader_spec.ts
+++ b/packages/angular_devkit/core/src/workspace/json/reader_spec.ts
@@ -1,11 +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
  */
-// tslint:disable:no-non-null-assertion no-big-function
+
+/* eslint-disable @typescript-eslint/no-non-null-assertion */
 import { readFileSync } from 'fs';
 import { JsonObject } from '../../json';
 import { stripIndent } from '../../utils/literals';
@@ -89,7 +90,8 @@ describe('readJsonWorkpace Parsing', () => {
   it(`doesn't remove falsy values when using the spread operator`, async () => {
     const host = createTestHost(representativeFile);
     const workspace = await readJsonWorkspace('', host);
-    const prodConfig = workspace.projects.get('my-app')!.targets.get('build')!.configurations!.production!;
+    const prodConfig = workspace.projects.get('my-app')!.targets.get('build')!.configurations!
+      .production!;
     expect({ ...prodConfig }).toEqual(prodConfig);
   });
 
@@ -99,13 +101,13 @@ describe('readJsonWorkpace Parsing', () => {
     const workspace = await readJsonWorkspace('', host);
 
     expect(workspace.extensions['newProjectRoot']).toBe('projects');
-    // tslint:disable-next-line:no-any
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     expect((workspace as any)['newProjectRoot']).toBeUndefined();
 
     expect(workspace.projects.get('my-app')!.extensions['schematics']).toEqual({
       '@schematics/angular:component': { styleext: 'scss' },
     });
-    // tslint:disable-next-line:no-any
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     expect((workspace.projects.get('my-app') as any)['schematics']).toBeUndefined();
   });
 
@@ -200,8 +202,14 @@ describe('JSON WorkspaceDefinition Tracks Workspace Changes', () => {
     expect(workspace.extensions['x-baz']).toEqual({ a: 1, b: 2, c: { d: 'abc' } });
 
     Object.assign(value, { x: 9, y: 8, z: 7 });
-    expect(workspace.extensions['x-baz'])
-      .toEqual({ a: 1, b: 2, c: { d: 'abc' }, x: 9, y: 8, z: 7 });
+    expect(workspace.extensions['x-baz']).toEqual({
+      a: 1,
+      b: 2,
+      c: { d: 'abc' },
+      x: 9,
+      y: 8,
+      z: 7,
+    });
 
     const metadata = getMetadata(workspace);
 
@@ -226,8 +234,14 @@ describe('JSON WorkspaceDefinition Tracks Workspace Changes', () => {
     expect(workspace.extensions['x-baz']).toEqual({ a: 1, b: 2, c: { d: 'abc' } });
 
     workspace.extensions['x-baz'] = Object.assign(value, { x: 9, y: 8, z: 7 });
-    expect(workspace.extensions['x-baz'])
-      .toEqual({ a: 1, b: 2, c: { d: 'abc' }, x: 9, y: 8, z: 7 });
+    expect(workspace.extensions['x-baz']).toEqual({
+      a: 1,
+      b: 2,
+      c: { d: 'abc' },
+      x: 9,
+      y: 8,
+      z: 7,
+    });
 
     const metadata = getMetadata(workspace);
 
@@ -252,8 +266,14 @@ describe('JSON WorkspaceDefinition Tracks Workspace Changes', () => {
     expect(workspace.extensions['x-baz']).toEqual({ a: 1, b: 2, c: { d: 'abc' } });
 
     workspace.extensions['x-baz'] = { ...value, ...{ x: 9, y: 8 }, z: 7 };
-    expect(workspace.extensions['x-baz'])
-      .toEqual({ a: 1, b: 2, c: { d: 'abc' }, x: 9, y: 8, z: 7 });
+    expect(workspace.extensions['x-baz']).toEqual({
+      a: 1,
+      b: 2,
+      c: { d: 'abc' },
+      x: 9,
+      y: 8,
+      z: 7,
+    });
 
     const metadata = getMetadata(workspace);
 
@@ -274,10 +294,16 @@ describe('JSON WorkspaceDefinition Tracks Workspace Changes', () => {
     const workspace = await readJsonWorkspace('', host);
 
     workspace.extensions['x-foo'] = {
-      ...workspace.extensions['x-foo'] as JsonObject,
-      ...{ x: 9, y: 8 }, z: 7 };
-    expect(workspace.extensions['x-foo'])
-      .toEqual({ is: ['good', 'great', 'awesome'], x: 9, y: 8, z: 7 });
+      ...(workspace.extensions['x-foo'] as JsonObject),
+      ...{ x: 9, y: 8 },
+      z: 7,
+    };
+    expect(workspace.extensions['x-foo']).toEqual({
+      is: ['good', 'great', 'awesome'],
+      x: 9,
+      y: 8,
+      z: 7,
+    });
 
     const metadata = getMetadata(workspace);
 
@@ -297,13 +323,13 @@ describe('JSON WorkspaceDefinition Tracks Workspace Changes', () => {
 
     const workspace = await readJsonWorkspace('', host);
 
-    Object.assign(
-      workspace.extensions['x-foo'],
-      { x: 9, y: 8 },
-      { z: 7 },
-    );
-    expect(workspace.extensions['x-foo'])
-      .toEqual({ is: ['good', 'great', 'awesome'], x: 9, y: 8, z: 7 });
+    Object.assign(workspace.extensions['x-foo'], { x: 9, y: 8 }, { z: 7 });
+    expect(workspace.extensions['x-foo']).toEqual({
+      is: ['good', 'great', 'awesome'],
+      x: 9,
+      y: 8,
+      z: 7,
+    });
 
     const metadata = getMetadata(workspace);
 
@@ -342,8 +368,12 @@ describe('JSON WorkspaceDefinition Tracks Workspace Changes', () => {
       { x: 9, y: 8 },
       { z: 7 },
     );
-    expect(workspace.extensions['x-foo'])
-      .toEqual({ is: ['good', 'great', 'awesome'], x: 9, y: 8, z: 7 });
+    expect(workspace.extensions['x-foo']).toEqual({
+      is: ['good', 'great', 'awesome'],
+      x: 9,
+      y: 8,
+      z: 7,
+    });
 
     const metadata = getMetadata(workspace);
 
diff --git a/packages/angular_devkit/core/src/workspace/json/utilities.ts b/packages/angular_devkit/core/src/workspace/json/utilities.ts
index df25d3bc064b..157d9ef44933 100644
--- a/packages/angular_devkit/core/src/workspace/json/utilities.ts
+++ b/packages/angular_devkit/core/src/workspace/json/utilities.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 {
   JsonAstArray,
   JsonAstKeyValue,
@@ -14,7 +15,7 @@ import {
   JsonValue,
 } from '../../json';
 
-import stableStringify = require('fast-json-stable-stringify');
+const stableStringify = require('fast-json-stable-stringify');
 
 interface CacheEntry {
   value?: JsonValue;
@@ -46,7 +47,7 @@ function findNode(
   p: ProxyPropertyKey,
 ): { node?: JsonAstNode; parent: JsonAstArray | JsonAstKeyValue | JsonAstObject } {
   if (parent.kind === 'object') {
-    const entry = parent.properties.find(entry => entry.key.value === p);
+    const entry = parent.properties.find((entry) => entry.key.value === p);
     if (entry) {
       return { node: entry.value, parent: entry };
     }
@@ -101,12 +102,7 @@ export function createVirtualAstObject<T extends object = JsonObject>(
       }
 
       const op = old === undefined ? 'add' : current === undefined ? 'remove' : 'replace';
-      options.listener(
-        op,
-        path,
-        parent,
-        current,
-      );
+      options.listener(op, path, parent, current);
     }
   };
 
@@ -192,15 +188,11 @@ function create(
       let value;
       if (node) {
         if (node.kind === 'object' || node.kind === 'array') {
-          value = create(
-            node,
-            propertyPath,
-            (path, parent, vnode, old, current) => {
-              if (!alteredNodes.has(node)) {
-                reporter(path, parent, vnode, old, current);
-              }
-            },
-          );
+          value = create(node, propertyPath, (path, parent, vnode, old, current) => {
+            if (!alteredNodes.has(node)) {
+              reporter(path, parent, vnode, old, current);
+            }
+          });
         } else {
           value = node.value;
         }
@@ -213,7 +205,7 @@ function create(
     set(target: {}, p: ProxyPropertyKey, value: unknown): boolean {
       if (value === undefined) {
         // setting to undefined is equivalent to a delete
-        // tslint:disable-next-line: no-non-null-assertion
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         return this.deleteProperty!(target, p);
       }
 
@@ -294,8 +286,8 @@ function create(
       let keys: ProxyPropertyKey[];
       if (ast.kind === 'object') {
         keys = ast.properties
-          .map(entry => entry.key.value)
-          .filter(p => !excluded.has(p) && (!included || included.has(p)));
+          .map((entry) => entry.key.value)
+          .filter((p) => !excluded.has(p) && (!included || included.has(p)));
       } else {
         keys = [];
       }
diff --git a/packages/angular_devkit/core/src/workspace/json/writer.ts b/packages/angular_devkit/core/src/workspace/json/writer.ts
index 0b253f917a53..8968c34b42d1 100644
--- a/packages/angular_devkit/core/src/workspace/json/writer.ts
+++ b/packages/angular_devkit/core/src/workspace/json/writer.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 MagicString from 'magic-string';
 import { JsonAstKeyValue, JsonAstNode, JsonObject, JsonValue } from '../../json';
 import { ProjectDefinition, TargetDefinition, WorkspaceDefinition } from '../definitions';
@@ -110,9 +111,7 @@ function convertJsonTarget(target: TargetDefinition): JsonObject {
   };
 }
 
-function convertJsonTargetCollection(
-  collection: Iterable<[string, TargetDefinition]>,
-): JsonObject {
+function convertJsonTargetCollection(collection: Iterable<[string, TargetDefinition]>): JsonObject {
   const targets = Object.create(null) as JsonObject;
 
   for (const [projectName, target] of collection) {
@@ -208,8 +207,10 @@ function updateJsonWorkspace(metadata: JsonWorkspaceMetadata): string {
   const data = new MagicString(metadata.raw);
   const indent = data.getIndentString();
   const removedCommas = new Set<number>();
-  const nodeChanges =
-    new Map<JsonAstNode | JsonAstKeyValue, (JsonAstNode | JsonAstKeyValue | string)[]>();
+  const nodeChanges = new Map<
+    JsonAstNode | JsonAstKeyValue,
+    (JsonAstNode | JsonAstKeyValue | string)[]
+  >();
 
   for (const { op, path, node, value, type } of metadata.changes) {
     // targets/projects are typically large objects so always use multiline
@@ -268,7 +269,7 @@ function updateJsonWorkspace(metadata: JsonWorkspaceMetadata): string {
       case 'remove':
         let removalIndex = -1;
         if (node.kind === 'object') {
-          removalIndex = elements.findIndex(e => {
+          removalIndex = elements.findIndex((e) => {
             return typeof e != 'string' && e.kind === 'keyvalue' && e.key.value === propertyOrIndex;
           });
         } else if (node.kind === 'array') {
@@ -325,14 +326,12 @@ function updateJsonWorkspace(metadata: JsonWorkspaceMetadata): string {
   }
 
   for (const [node, elements] of nodeChanges.entries()) {
-    let parentPoint = 1 + data.original.indexOf(
-      node.kind === 'array' ? '[' : '{',
-      node.start.offset,
-    );
+    let parentPoint =
+      1 + data.original.indexOf(node.kind === 'array' ? '[' : '{', node.start.offset);
 
     // Short-circuit for simple case
     if (elements.length === 1 && typeof elements[0] === 'string') {
-      data.appendRight(parentPoint, elements[0] as string);
+      data.appendRight(parentPoint, elements[0]);
       continue;
     }
 
@@ -350,16 +349,12 @@ function updateJsonWorkspace(metadata: JsonWorkspaceMetadata): string {
     let prefixComma = false;
     for (const element of optimizedElements) {
       if (typeof element === 'string') {
-        data.appendRight(
-          parentPoint,
-          (prefixComma ? ',' : '') + element,
-        );
+        data.appendRight(parentPoint, (prefixComma ? ',' : '') + element);
       } else {
         parentPoint = findFullEnd(element, data.original);
         prefixComma = data.original[parentPoint - 1] !== ',' || removedCommas.has(parentPoint - 1);
       }
     }
-
   }
 
   const result = data.toString();
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..e16d27549971 100644
--- a/packages/angular_devkit/core/src/workspace/json/writer_spec.ts
+++ b/packages/angular_devkit/core/src/workspace/json/writer_spec.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
  */
-// tslint:disable:no-big-function
+
 import { readFileSync } from 'fs';
 import { join } from 'path';
 import { JsonArray, JsonObject } from '../../json';
@@ -40,7 +40,9 @@ function createTestCaseHost(inputData = '') {
     async writeFile(path: string, data: string) {
       try {
         const testCase = readFileSync(
-          require.resolve(join(__dirname, 'test', 'cases', path) + '.json'), 'utf8');
+          require.resolve(join(__dirname, 'test', 'cases', path) + '.json'),
+          'utf8',
+        );
         expect(data).toEqual(testCase);
       } catch (e) {
         fail(`Unable to load test case '${path}': ${e.message || e}`);
@@ -60,7 +62,7 @@ function createTestCaseHost(inputData = '') {
 describe('writeJsonWorkpaceFile', () => {
   it('does not modify a file without changes', async () => {
     const host = {
-      async readFile(path: string) {
+      async readFile() {
         return representativeFile;
       },
       async writeFile() {
@@ -274,7 +276,7 @@ describe('writeJsonWorkpaceFile', () => {
     await writeJsonWorkspace(workspace, host, 'AddProjectWithTargets');
   });
 
-  it('modifies a project\'s properties', async () => {
+  it("modifies a project's properties", async () => {
     const host = createTestCaseHost(representativeFile);
 
     const workspace = await readJsonWorkspace('', host);
@@ -291,7 +293,7 @@ describe('writeJsonWorkpaceFile', () => {
     await writeJsonWorkspace(workspace, host, 'ProjectModifyProperties');
   });
 
-  it('sets a project\'s properties', async () => {
+  it("sets a project's properties", async () => {
     const host = createTestCaseHost(representativeFile);
 
     const workspace = await readJsonWorkspace('', host);
@@ -578,7 +580,7 @@ describe('writeJsonWorkpaceFile', () => {
 
     const workspace = await readJsonWorkspace('', host);
 
-    workspace.extensions['x-foo'] = { };
+    workspace.extensions['x-foo'] = {};
 
     await writeJsonWorkspace(workspace, host, 'ObjectReplace2');
   });
diff --git a/packages/angular_devkit/schematics/BUILD.bazel b/packages/angular_devkit/schematics/BUILD.bazel
index 6715950a2b93..a71c8d45a3a9 100644
--- a/packages/angular_devkit/schematics/BUILD.bazel
+++ b/packages/angular_devkit/schematics/BUILD.bazel
@@ -4,6 +4,7 @@ load("//tools:defaults.bzl", "ts_library")
 # @external_begin
 load("@bazel_tools//tools/build_defs/pkg:pkg.bzl", "pkg_tar")
 load("@build_bazel_rules_nodejs//:index.bzl", "pkg_npm")
+load("@npm//@angular/dev-infra-private/bazel/api-golden:index.bzl", "api_golden_test_npm_package")
 # @external_end
 
 # Copyright Google Inc. All Rights Reserved.
@@ -84,4 +85,15 @@ pkg_tar(
     strip_prefix = "./npm_package",
     tags = ["manual"],
 )
+
+api_golden_test_npm_package(
+    name = "schematics_api",
+    data = [
+        ":npm_package",
+        "//goldens:public-api",
+    ],
+    golden_dir = "angular_cli/goldens/public-api/angular_devkit/schematics",
+    npm_package = "angular_cli/packages/angular_devkit/schematics/npm_package",
+    types = ["@npm//@types/node"],
+)
 # @external_end
diff --git a/packages/angular_devkit/schematics/README.md b/packages/angular_devkit/schematics/README.md
index 76e9fa6e8f78..4ef2d45c4eb5 100644
--- a/packages/angular_devkit/schematics/README.md
+++ b/packages/angular_devkit/schematics/README.md
@@ -1,25 +1,28 @@
 # Schematics
+
 > A scaffolding library for the modern web.
 
 ## Description
+
 Schematics are generators that transform an existing filesystem. They can create files, refactor existing files, or move files around.
 
 What distinguishes Schematics from other generators, such as Yeoman or Yarn Create, is that schematics are purely descriptive; no changes are applied to the actual filesystem until everything is ready to be committed. There is no side effect, by design, in Schematics.
 
 # Glossary
 
-| Term | Description |
-|------|-------------|
-| **Schematics** | A generator that executes descriptive code without side effects on an existing file system. |
-| **Collection** | A list of schematics metadata. Schematics can be referred by name inside a collection. |
-| **Tool**       | The code using the Schematics library. |
-| **Tree**       | A staging area for changes, containing the original file system, and a list of changes to apply to it. |
-| **Rule**       | A function that applies actions to a `Tree`. It returns a new `Tree` that will contain all transformations to be applied. |
-| **Source**     | A function that creates an entirely new `Tree` from an empty filesystem. For example, a file source could read files from disk and create a Create Action for each of those.
-| **Action**     | An atomic operation to be validated and committed to a filesystem or a `Tree`. Actions are created by schematics. |
-| **Sink**       | The final destination of all `Action`s. |
+| Term           | Description                                                                                                                                                                  |
+| -------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| **Schematics** | A generator that executes descriptive code without side effects on an existing file system.                                                                                  |
+| **Collection** | A list of schematics metadata. Schematics can be referred by name inside a collection.                                                                                       |
+| **Tool**       | The code using the Schematics library.                                                                                                                                       |
+| **Tree**       | A staging area for changes, containing the original file system, and a list of changes to apply to it.                                                                       |
+| **Rule**       | A function that applies actions to a `Tree`. It returns a new `Tree` that will contain all transformations to be applied.                                                    |
+| **Source**     | A function that creates an entirely new `Tree` from an empty filesystem. For example, a file source could read files from disk and create a Create Action for each of those. |
+| **Action**     | An atomic operation to be validated and committed to a filesystem or a `Tree`. Actions are created by schematics.                                                            |
+| **Sink**       | The final destination of all `Action`s.                                                                                                                                      |
 
 # Tooling
+
 Schematics is a library, and does not work by itself. A [reference CLI](https://github.com/angular/angular-cli/blob/master/packages/angular_devkit/schematics_cli/bin/schematics.ts) is available on this repository, and is published on NPM at [@angular-devkit/schematics-cli](https://www.npmjs.com/package/@angular-devkit/schematics-cli). This document explains the library usage and the tooling API, but does not go into the tool implementation itself.
 
 The tooling is responsible for the following tasks:
@@ -27,7 +30,7 @@ The tooling is responsible for the following tasks:
 1. Create the Schematic Engine, and pass in a Collection and Schematic loader.
 1. Understand and respect the Schematics metadata and dependencies between collections. Schematics can refer to dependencies, and it's the responsibility of the tool to honor those dependencies. The reference CLI uses NPM packages for its collections.
 1. Create the Options object. Options can be anything, but the schematics can specify a JSON Schema that should be respected. The reference CLI, for example, parses the arguments as a JSON object and validates it with the Schema specified by the collection.
-  1. Schematics provides some JSON Schema formats for validation that tooling should add. These validate paths, html selectors and app names. Please check the reference CLI for how these can be added.
+1. Schematics provides some JSON Schema formats for validation that tooling should add. These validate paths, html selectors and app names. Please check the reference CLI for how these can be added.
 1. Call the schematics with the original Tree. The tree should represent the initial state of the filesystem. The reference CLI uses the current directory for this.
 1. Create a Sink and commit the result of the schematics to the Sink. Many sinks are provided by the library; FileSystemSink and DryRunSink are examples.
 1. Output any logs propagated by the library, including debugging information.
@@ -35,25 +38,30 @@ The tooling is responsible for the following tasks:
 The tooling API is composed of the following pieces:
 
 ## Engine
+
 The `SchematicEngine` is responsible for loading and constructing `Collection`s and `Schematics`. When creating an engine, the tooling provides an `EngineHost` interface that understands how to create a `CollectionDescription` from a name, and how to create a `SchematicDescription`.
 
 # Schematics (Generators)
+
 Schematics are generators and part of a `Collection`.
 
 ## Collection
+
 A Collection is defined by a `collection.json` file (in the reference CLI). This JSON defines the following properties:
 
-| Prop Name | Type | Description |
-|---|---|---|
-| **name** | `string` | The name of the collection. |
-| **version** | `string` | Unused field. |
+| Prop Name   | Type     | Description                 |
+| ----------- | -------- | --------------------------- |
+| **name**    | `string` | The name of the collection. |
+| **version** | `string` | Unused field.               |
 
 ## Schematic
 
 # Operators, Sources and Rules
+
 A `Source` is a generator of a `Tree`; it creates an entirely new root tree from nothing. A `Rule` is a transformation from one `Tree` to another. A `Schematic` (at the root) is a `Rule` that is normally applied on the filesystem.
 
 ## Operators
+
 `FileOperator`s apply changes to a single `FileEntry` and return a new `FileEntry`. The result follows these rules:
 
 1. If the `FileEntry` returned is null, a `DeleteAction` will be added to the action list.
@@ -63,66 +71,71 @@ A `Source` is a generator of a `Tree`; it creates an entirely new root tree from
 It is impossible to create files using a `FileOperator`.
 
 ## Provided Operators
+
 The Schematics library provides multiple `Operator` factories by default that cover basic use cases:
 
-| FileOperator | Description |
-|---|---|
-| `contentTemplate<T>(options: T)` | Apply a content template (see the Template section) |
-| `pathTemplate<T>(options: T)` | Apply a path template (see the Template section) |
+| FileOperator                     | Description                                                          |
+| -------------------------------- | -------------------------------------------------------------------- |
+| `contentTemplate<T>(options: T)` | Apply a content template (see the [Templating](#templating) section) |
+| `pathTemplate<T>(options: T)`    | Apply a path template (see the [Templating](#templating) section)    |
 
 ## Provided Sources
+
 The Schematics library additionally provides multiple `Source` factories by default:
 
-| Source | Description |
-|---|---|
-| `empty()` | Creates a source that returns an empty `Tree`. |
-| `source(tree: Tree)` | Creates a `Source` that returns the `Tree` passed in as argument. |
-| `url(url: string)` | Loads a list of files from the given URL and returns a `Tree` with the files as `CreateAction` applied to an empty `Tree`. |
-| `apply(source: Source, rules: Rule[])` | Apply a list of `Rule`s to a source, and return the resulting `Source`. |
+| Source                                 | Description                                                                                                                |
+| -------------------------------------- | -------------------------------------------------------------------------------------------------------------------------- |
+| `empty()`                              | Creates a source that returns an empty `Tree`.                                                                             |
+| `source(tree: Tree)`                   | Creates a `Source` that returns the `Tree` passed in as argument.                                                          |
+| `url(url: string)`                     | Loads a list of files from the given URL and returns a `Tree` with the files as `CreateAction` applied to an empty `Tree`. |
+| `apply(source: Source, rules: Rule[])` | Apply a list of `Rule`s to a source, and return the resulting `Source`.                                                    |
 
 ## Provided Rules
-The schematics library also provides `Rule` factories by default:
 
-| Rule | Description |
-|---|---|
-| `noop()` | Returns the input `Tree` as is. |
-| `chain(rules: Rule[])` | Returns a `Rule` that's the concatenation of other `Rule`s. |
-| `forEach(op: FileOperator)` | Returns a `Rule` that applies an operator to every file of the input `Tree`. |
-| `move(root: string)` | Moves all the files from the input to a subdirectory. |
-| `merge(other: Tree)` | Merge the input `Tree` with the other `Tree`. |
-| `contentTemplate<T>(options: T)` | Apply a content template (see the Template section) to the entire `Tree`. |
-| `pathTemplate<T>(options: T)` | Apply a path template (see the Template section) to the entire `Tree`. |
-| `template<T>(options: T)` | Apply both path and content templates (see the Template section) to the entire `Tree`. |
-| `filter(predicate: FilePredicate<boolean>)` | Returns the input `Tree` with files that do not pass the `FilePredicate`. |
+The schematics library also provides `Rule` factories by default:
 
+| Rule                                        | Description                                                                            |
+| ------------------------------------------- | -------------------------------------------------------------------------------------- |
+| `noop()`                                    | Returns the input `Tree` as is.                                                        |
+| `chain(rules: Rule[])`                      | Returns a `Rule` that's the concatenation of other `Rule`s.                            |
+| `forEach(op: FileOperator)`                 | Returns a `Rule` that applies an operator to every file of the input `Tree`.           |
+| `move(root: string)`                        | Moves all the files from the input to a subdirectory.                                  |
+| `merge(other: Tree)`                        | Merge the input `Tree` with the other `Tree`.                                          |
+| `contentTemplate<T>(options: T)`            | Apply a content template (see the Template section) to the entire `Tree`.              |
+| `pathTemplate<T>(options: T)`               | Apply a path template (see the Template section) to the entire `Tree`.                 |
+| `template<T>(options: T)`                   | Apply both path and content templates (see the Template section) to the entire `Tree`. |
+| `filter(predicate: FilePredicate<boolean>)` | Returns the input `Tree` with files that do not pass the `FilePredicate`.              |
 
 # Templating
+
 As referenced above, some functions are based upon a file templating system, which consists of path and content templating.
 
 The system operates on placeholders defined inside files or their paths as loaded in the `Tree` and fills these in as defined in the following, using values passed into the `Rule` which applies the templating (i.e. `template<T>(options: T)`).
 
 ## Path Templating
-| Placeholder | Description |
-|---|---|
-| __variable__ | Replaced with the value of `variable`. |
-| __variable@function__ | Replaced with the result of the call `function(variable)`. Can be chained to the left (`__variable@function1@function2__ ` etc).  |
+
+| Placeholder             | Description                                                                                                                      |
+| ----------------------- | -------------------------------------------------------------------------------------------------------------------------------- |
+| `__variable__`          | Replaced with the value of `variable`.                                                                                           |
+| `__variable@function__` | Replaced with the result of the call `function(variable)`. Can be chained to the left (`__variable@function1@function2__ ` etc). |
 
 ## Content Templating
-| Placeholder | Description |
-|---|---|
-| <%= expression %> | Replaced with the result of the call of the given expression. This only supports direct expressions, no structural (for/if/...) JavaScript. |
-| <%- expression %> | Same as above, but the value of the result will be escaped for HTML when inserted (i.e. replacing '<' with '&lt;') |
-| <% inline code %> | Inserts the given code into the template structure, allowing to insert structural JavaScript. |
-| <%# text %> | A comment, which gets entirely dropped. |
 
+| Placeholder         | Description                                                                                                                                 |
+| ------------------- | ------------------------------------------------------------------------------------------------------------------------------------------- |
+| `<%= expression %>` | Replaced with the result of the call of the given expression. This only supports direct expressions, no structural (for/if/...) JavaScript. |
+| `<%- expression %>` | Same as above, but the value of the result will be escaped for HTML when inserted (i.e. replacing '<' with '&lt;')                          |
+| `<% inline code %>` | Inserts the given code into the template structure, allowing to insert structural JavaScript.                                               |
+| `<%# text %>`       | A comment, which gets entirely dropped.                                                                                                     |
 
 # Examples
 
 ## Simple
+
 An example of a simple Schematics which creates a "hello world" file, using an option to determine its path:
 
 ```typescript
-import {Tree} from '@angular-devkit/schematics';
+import { Tree } from '@angular-devkit/schematics';
 
 export default function MySchematic(options: any) {
   return (tree: Tree) => {
@@ -138,6 +151,7 @@ A few things from this example:
 1. It returns a [`Rule`](src/engine/interface.ts#L73), which is a transformation from a `Tree` to another `Tree`.
 
 ## Templating
+
 A simplified example of a Schematics which creates a file containing a new Class, using an option to determine its name:
 
 ```typescript
@@ -152,8 +166,15 @@ export class <%= classify(name) %> {
 
 import { strings } from '@angular-devkit/core';
 import {
-  Rule, SchematicContext, SchematicsException, Tree,
-  apply, branchAndMerge, mergeWith, template, url,
+  Rule,
+  SchematicContext,
+  SchematicsException,
+  Tree,
+  apply,
+  branchAndMerge,
+  mergeWith,
+  template,
+  url,
 } from '@angular-devkit/schematics';
 import { Schema as ClassOptions } from './schema';
 
@@ -163,15 +184,12 @@ export default function (options: ClassOptions): Rule {
       throw new SchematicsException('Option (name) is required.');
     }
 
-    const templateSource = apply(
-      url('./files'),
-      [
-        template({
-          ...strings,
-          ...options,
-        }),
-      ]
-    );
+    const templateSource = apply(url('./files'), [
+      template({
+        ...strings,
+        ...options,
+      }),
+    ]);
 
     return branchAndMerge(mergeWith(templateSource));
   };
@@ -179,14 +197,8 @@ export default function (options: ClassOptions): Rule {
 ```
 
 Additional things from this example:
+
 1. `strings` provides the used `dasherize` and `classify` functions, among others.
 1. The files are on-disk in the same root directory as the `index.ts` and loaded into a `Tree`.
 1. Then the `template` `Rule` fills in the specified templating placeholders. For this, it only knows about the variables and functions passed to it via the options-object.
 1. Finally, the resulting `Tree`, containing the new file, is merged with the existing files of the project which the Schematic is run on.
-
-# Future Work
-Schematics is not done yet. Here's a list of things we are considering:
-
-* Smart defaults for Options. Having a JavaScript function for default values based on other default values.
-* Prompt for input options. This should only be prompted for the original schematics, dependencies to other schematics should not trigger another prompting.
-* Tasks for running tooling-specific jobs before and after a schematics has been scaffolded. Such tasks can involve initialize git, or npm install. A specific list of tasks should be provided by the tool, with unsupported tasks generating an error.
diff --git a/packages/angular_devkit/schematics/collection-schema.json b/packages/angular_devkit/schematics/collection-schema.json
index c390eaa8d771..6489280417e2 100644
--- a/packages/angular_devkit/schematics/collection-schema.json
+++ b/packages/angular_devkit/schematics/collection-schema.json
@@ -59,17 +59,12 @@
             "description": "Whether or not this schematic can be called from an external schematic, or a tool. This implies hidden: true."
           }
         },
-        "required": [
-          "factory",
-          "description"
-        ]
+        "required": ["factory", "description"]
       }
     },
     "version": {
       "type": "string"
     }
   },
-  "required": [
-    "schematics"
-  ]
+  "required": ["schematics"]
 }
diff --git a/packages/angular_devkit/schematics/package.json b/packages/angular_devkit/schematics/package.json
index 39bfb63c111f..1556fca42172 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.4.0",
+    "ora": "5.4.1",
     "rxjs": "6.6.7"
   }
 }
diff --git a/packages/angular_devkit/schematics/src/_golden-api.ts b/packages/angular_devkit/schematics/src/_golden-api.ts
deleted file mode 100644
index 9d9ea4ddacbe..000000000000
--- a/packages/angular_devkit/schematics/src/_golden-api.ts
+++ /dev/null
@@ -1,13 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-
-export * from './index';
-
-export * from './formats/index';
-
-export * from './workflow/index';
diff --git a/packages/angular_devkit/schematics/src/engine/engine.ts b/packages/angular_devkit/schematics/src/engine/engine.ts
index a3ca4caa515e..1e97ec1975de 100644
--- a/packages/angular_devkit/schematics/src/engine/engine.ts
+++ b/packages/angular_devkit/schematics/src/engine/engine.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 { BaseException, PriorityQueue, logging } from '@angular-devkit/core';
 import { Observable, from as observableFrom } from 'rxjs';
 import { concatMap } from 'rxjs/operators';
@@ -32,13 +33,16 @@ import {
 } from './interface';
 import { SchematicImpl } from './schematic';
 
-
 export class UnknownUrlSourceProtocol extends BaseException {
-  constructor(url: string) { super(`Unknown Protocol on url "${url}".`); }
+  constructor(url: string) {
+    super(`Unknown Protocol on url "${url}".`);
+  }
 }
 
 export class UnknownCollectionException extends BaseException {
-  constructor(name: string) { super(`Unknown collection "${name}".`); }
+  constructor(name: string) {
+    super(`Unknown collection "${name}".`);
+  }
 }
 
 export class CircularCollectionException extends BaseException {
@@ -60,7 +64,9 @@ export class PrivateSchematicException extends BaseException {
 }
 
 export class SchematicEngineConflictingException extends BaseException {
-  constructor() { super(`A schematic was called from a different engine as its parent.`); }
+  constructor() {
+    super(`A schematic was called from a different engine as its parent.`);
+  }
 }
 
 export class UnregisteredTaskException extends BaseException {
@@ -78,13 +84,18 @@ export class UnknownTaskDependencyException extends BaseException {
 
 export class CollectionImpl<CollectionT extends object, SchematicT extends object>
   implements Collection<CollectionT, SchematicT> {
-  constructor(private _description: CollectionDescription<CollectionT>,
-              private _engine: SchematicEngine<CollectionT, SchematicT>,
-              public readonly baseDescriptions?: Array<CollectionDescription<CollectionT>>) {
+  constructor(
+    private _description: CollectionDescription<CollectionT>,
+    private _engine: SchematicEngine<CollectionT, SchematicT>,
+    public readonly baseDescriptions?: Array<CollectionDescription<CollectionT>>,
+  ) {}
+
+  get description() {
+    return this._description;
+  }
+  get name() {
+    return this.description.name || '<unknown>';
   }
-
-  get description() { return this._description; }
-  get name() { return this.description.name || '<unknown>'; }
 
   createSchematic(name: string, allowPrivate = false): Schematic<CollectionT, SchematicT> {
     return this._engine.createSchematic(name, this, allowPrivate);
@@ -117,7 +128,7 @@ export class TaskScheduler {
       return new Set();
     }
 
-    const tasks = dependencies.map(dep => {
+    const tasks = dependencies.map((dep) => {
       const task = this._taskIds.get(dep);
       if (!task) {
         throw new UnknownTaskDependencyException(dep);
@@ -155,23 +166,25 @@ export class TaskScheduler {
 
     return tasks;
   }
-
 }
 
-
 export class SchematicEngine<CollectionT extends object, SchematicT extends object>
-    implements Engine<CollectionT, SchematicT> {
-
+  implements Engine<CollectionT, SchematicT> {
   private _collectionCache = new Map<string, CollectionImpl<CollectionT, SchematicT>>();
-  private _schematicCache
-    = new WeakMap<Collection<CollectionT, SchematicT>, Map<string, SchematicImpl<CollectionT, SchematicT>>>();
+  private _schematicCache = new WeakMap<
+    Collection<CollectionT, SchematicT>,
+    Map<string, SchematicImpl<CollectionT, SchematicT>>
+  >();
   private _taskSchedulers = new Array<TaskScheduler>();
 
-  constructor(private _host: EngineHost<CollectionT, SchematicT>, protected _workflow?: Workflow) {
-  }
+  constructor(private _host: EngineHost<CollectionT, SchematicT>, protected _workflow?: Workflow) {}
 
-  get workflow() { return this._workflow || null; }
-  get defaultMergeStrategy() { return this._host.defaultMergeStrategy || MergeStrategy.Default; }
+  get workflow() {
+    return this._workflow || null;
+  }
+  get defaultMergeStrategy() {
+    return this._host.defaultMergeStrategy || MergeStrategy.Default;
+  }
 
   createCollection(
     name: string,
@@ -239,13 +252,14 @@ export class SchematicEngine<CollectionT extends object, SchematicT extends obje
     }
 
     let context: TypedSchematicContext<CollectionT, SchematicT> = {
-      debug: parent && parent.debug || false,
+      debug: (parent && parent.debug) || false,
       engine: this,
-      logger: (parent && parent.logger && parent.logger.createChild(schematic.description.name))
-              || new logging.NullLogger(),
+      logger:
+        (parent && parent.logger && parent.logger.createChild(schematic.description.name)) ||
+        new logging.NullLogger(),
       schematic,
-      strategy: (parent && parent.strategy !== undefined)
-        ? parent.strategy : this.defaultMergeStrategy,
+      strategy:
+        parent && parent.strategy !== undefined ? parent.strategy : this.defaultMergeStrategy,
       interactive,
       addTask,
     };
@@ -259,10 +273,7 @@ export class SchematicEngine<CollectionT extends object, SchematicT extends obje
     const host = this._host;
     this._taskSchedulers.push(taskScheduler);
 
-    function addTask<T>(
-      task: TaskConfigurationGenerator<T>,
-      dependencies?: Array<TaskId>,
-    ): TaskId {
+    function addTask<T>(task: TaskConfigurationGenerator<T>, dependencies?: Array<TaskId>): TaskId {
       const config = task.toConfiguration();
 
       if (!host.hasTaskExecutor(config.name)) {
@@ -345,8 +356,10 @@ export class SchematicEngine<CollectionT extends object, SchematicT extends obje
 
   createSourceFromUrl(url: Url, context: TypedSchematicContext<CollectionT, SchematicT>): Source {
     switch (url.protocol) {
-      case 'null:': return () => new NullTree();
-      case 'empty:': return () => empty();
+      case 'null:':
+        return () => new NullTree();
+      case 'empty:':
+        return () => empty();
       default:
         const hostSource = this._host.createSourceFromUrl(url, context);
         if (!hostSource) {
@@ -360,25 +373,25 @@ export class SchematicEngine<CollectionT extends object, SchematicT extends obje
   executePostTasks(): Observable<void> {
     const executors = new Map<string, TaskExecutor>();
 
-    const taskObservable = observableFrom(this._taskSchedulers)
-      .pipe(
-        concatMap(scheduler => scheduler.finalize()),
-        concatMap(task => {
-          const { name, options } = task.configuration;
+    const taskObservable = observableFrom(this._taskSchedulers).pipe(
+      concatMap((scheduler) => scheduler.finalize()),
+      concatMap((task) => {
+        const { name, options } = task.configuration;
 
-          const executor = executors.get(name);
-          if (executor) {
-            return executor(options, task.context);
-          }
+        const executor = executors.get(name);
+        if (executor) {
+          return executor(options, task.context);
+        }
 
-          return this._host.createTaskExecutor(name)
-            .pipe(concatMap(executor => {
-              executors.set(name, executor);
+        return this._host.createTaskExecutor(name).pipe(
+          concatMap((executor) => {
+            executors.set(name, executor);
 
-              return executor(options, task.context);
-            }));
-        }),
-      );
+            return executor(options, task.context);
+          }),
+        );
+      }),
+    );
 
     return taskObservable;
   }
diff --git a/packages/angular_devkit/schematics/src/engine/index.ts b/packages/angular_devkit/schematics/src/engine/index.ts
index 9f8b476cc297..28afcc8f9f2f 100644
--- a/packages/angular_devkit/schematics/src/engine/index.ts
+++ b/packages/angular_devkit/schematics/src/engine/index.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
  */
+
 export * from './engine';
 export * from './interface';
 export * from './schematic';
diff --git a/packages/angular_devkit/schematics/src/engine/interface.ts b/packages/angular_devkit/schematics/src/engine/interface.ts
index dea18164acac..26f78f0f5d18 100644
--- a/packages/angular_devkit/schematics/src/engine/interface.ts
+++ b/packages/angular_devkit/schematics/src/engine/interface.ts
@@ -1,17 +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 { analytics, logging } from '@angular-devkit/core';
 import { Observable } from 'rxjs';
 import { Url } from 'url';
 import { FileEntry, MergeStrategy, Tree } from '../tree/interface';
 import { Workflow } from '../workflow/interface';
 
-
 export interface TaskConfiguration<T = {}> {
   name: string;
   dependencies?: Array<TaskId>;
@@ -22,8 +22,10 @@ export interface TaskConfigurationGenerator<T = {}> {
   toConfiguration(): TaskConfiguration<T>;
 }
 
-export type TaskExecutor<T = {}>
-  = (options: T | undefined, context: SchematicContext) => Promise<void> | Observable<void>;
+export type TaskExecutor<T = {}> = (
+  options: T | undefined,
+  context: SchematicContext,
+) => Promise<void> | Observable<void>;
 
 export interface TaskExecutorFactory<T> {
   readonly name: string;
@@ -36,7 +38,7 @@ export interface TaskId {
 
 export interface TaskInfo {
   readonly id: number;
-  readonly priority:  number;
+  readonly priority: number;
   readonly configuration: TaskConfiguration;
   readonly context: SchematicContext;
 }
@@ -61,15 +63,16 @@ export type CollectionDescription<CollectionMetadataT extends object> = Collecti
  * needs to run. The SchematicMetadataT and CollectionMetadataT type parameters contain additional
  * metadata that you want to store while remaining type-safe.
  */
-export type SchematicDescription<CollectionMetadataT extends object,
-                                 SchematicMetadataT extends object> = SchematicMetadataT & {
+export type SchematicDescription<
+  CollectionMetadataT extends object,
+  SchematicMetadataT extends object
+> = SchematicMetadataT & {
   readonly collection: CollectionDescription<CollectionMetadataT>;
   readonly name: string;
   readonly private?: boolean;
   readonly hidden?: boolean;
 };
 
-
 /**
  * The Host for the Engine. Specifically, the piece of the tooling responsible for resolving
  * collections and schematics descriptions. The SchematicMetadataT and CollectionMetadataT type
@@ -83,12 +86,13 @@ export interface EngineHost<CollectionMetadataT extends object, SchematicMetadat
   listSchematicNames(collection: CollectionDescription<CollectionMetadataT>): string[];
 
   createSchematicDescription(
-      name: string,
-      collection: CollectionDescription<CollectionMetadataT>):
-        SchematicDescription<CollectionMetadataT, SchematicMetadataT> | null;
+    name: string,
+    collection: CollectionDescription<CollectionMetadataT>,
+  ): SchematicDescription<CollectionMetadataT, SchematicMetadataT> | null;
   getSchematicRuleFactory<OptionT extends object>(
-      schematic: SchematicDescription<CollectionMetadataT, SchematicMetadataT>,
-      collection: CollectionDescription<CollectionMetadataT>): RuleFactory<OptionT>;
+    schematic: SchematicDescription<CollectionMetadataT, SchematicMetadataT>,
+    collection: CollectionDescription<CollectionMetadataT>,
+  ): RuleFactory<OptionT>;
   createSourceFromUrl(
     url: Url,
     context: TypedSchematicContext<CollectionMetadataT, SchematicMetadataT>,
@@ -107,7 +111,6 @@ export interface EngineHost<CollectionMetadataT extends object, SchematicMetadat
   readonly defaultMergeStrategy?: MergeStrategy;
 }
 
-
 /**
  * The root Engine for creating and running schematics and collections. Everything related to
  * a schematic execution starts from this interface.
@@ -147,7 +150,6 @@ export interface Engine<CollectionMetadataT extends object, SchematicMetadataT e
   readonly workflow: Workflow | null;
 }
 
-
 /**
  * A Collection as created by the Engine. This should be used by the tool to create schematics,
  * or by rules to create other schematics as well.
@@ -163,7 +165,6 @@ export interface Collection<CollectionMetadataT extends object, SchematicMetadat
   listSchematicNames(): string[];
 }
 
-
 /**
  * A Schematic as created by the Engine. This should be used by the tool to execute the main
  * schematics, or by rules to execute other schematics as well.
@@ -180,13 +181,14 @@ export interface Schematic<CollectionMetadataT extends object, SchematicMetadata
   ): Observable<Tree>;
 }
 
-
 /**
  * A SchematicContext. Contains information necessary for Schematics to execute some rules, for
  * example when using another schematics, as we need the engine and collection.
  */
-export interface TypedSchematicContext<CollectionMetadataT extends object,
-                                       SchematicMetadataT extends object> {
+export interface TypedSchematicContext<
+  CollectionMetadataT extends object,
+  SchematicMetadataT extends object
+> {
   readonly debug: boolean;
   readonly engine: Engine<CollectionMetadataT, SchematicMetadataT>;
   readonly logger: logging.LoggerApi;
@@ -200,21 +202,18 @@ export interface TypedSchematicContext<CollectionMetadataT extends object,
   readonly analytics?: analytics.Analytics;
 }
 
-
 /**
  * This is used by the Schematics implementations in order to avoid needing to have typing from
  * the tooling. Schematics are not specific to a tool.
  */
 export type SchematicContext = TypedSchematicContext<{}, {}>;
 
-
 /**
  * A rule factory, which is normally the way schematics are implemented. Returned by the tooling
  * after loading a schematic description.
  */
 export type RuleFactory<T extends object> = (options: T) => Rule;
 
-
 /**
  * A FileOperator applies changes synchronously to a FileEntry. An async operator returns
  * asynchronously. We separate them so that the type system can catch early errors.
@@ -222,7 +221,6 @@ export type RuleFactory<T extends object> = (options: T) => Rule;
 export type FileOperator = (entry: FileEntry) => FileEntry | null;
 export type AsyncFileOperator = (tree: FileEntry) => Observable<FileEntry | null>;
 
-
 /**
  * A source is a function that generates a Tree from a specific context. A rule transforms a tree
  * into another tree from a specific context. In both cases, an Observable can be returned if
@@ -233,5 +231,7 @@ export type AsyncFileOperator = (tree: FileEntry) => Observable<FileEntry | null
  * know which types is the schematic or collection metadata, as they are both tooling specific.
  */
 export type Source = (context: SchematicContext) => Tree | Observable<Tree>;
-export type Rule = (tree: Tree, context: SchematicContext) =>
-  Tree | Observable<Tree> | Rule | Promise<void | Rule> | void;
+export type Rule = (
+  tree: Tree,
+  context: SchematicContext,
+) => Tree | Observable<Tree> | Rule | Promise<void | Rule> | void;
diff --git a/packages/angular_devkit/schematics/src/engine/schematic.ts b/packages/angular_devkit/schematics/src/engine/schematic.ts
index ba16af352624..8984d341b04a 100644
--- a/packages/angular_devkit/schematics/src/engine/schematic.ts
+++ b/packages/angular_devkit/schematics/src/engine/schematic.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 { BaseException } from '@angular-devkit/core';
 import { Observable, of as observableOf } from 'rxjs';
 import { concatMap, first, map } from 'rxjs/operators';
@@ -21,28 +22,31 @@ import {
   TypedSchematicContext,
 } from './interface';
 
-
 export class InvalidSchematicsNameException extends BaseException {
   constructor(name: string) {
     super(`Schematics has invalid name: "${name}".`);
   }
 }
 
-
 export class SchematicImpl<CollectionT extends object, SchematicT extends object>
-    implements Schematic<CollectionT, SchematicT> {
-
-  constructor(private _description: SchematicDescription<CollectionT, SchematicT>,
-              private _factory: RuleFactory<{}>,
-              private _collection: Collection<CollectionT, SchematicT>,
-              private _engine: Engine<CollectionT, SchematicT>) {
+  implements Schematic<CollectionT, SchematicT> {
+  constructor(
+    private _description: SchematicDescription<CollectionT, SchematicT>,
+    private _factory: RuleFactory<{}>,
+    private _collection: Collection<CollectionT, SchematicT>,
+    private _engine: Engine<CollectionT, SchematicT>,
+  ) {
     if (!_description.name.match(/^[-@/_.a-zA-Z0-9]+$/)) {
       throw new InvalidSchematicsNameException(_description.name);
     }
   }
 
-  get description() { return this._description; }
-  get collection() { return this._collection; }
+  get description() {
+    return this._description;
+  }
+  get collection() {
+    return this._collection;
+  }
 
   call<OptionT extends object>(
     options: OptionT,
@@ -52,36 +56,37 @@ export class SchematicImpl<CollectionT extends object, SchematicT extends object
   ): Observable<Tree> {
     const context = this._engine.createContext(this, parentContext, executionOptions);
 
-    return host
-      .pipe(
-        first(),
-        concatMap(tree => this._engine.transformOptions(this, options, context).pipe(
-          map(o => [tree, o] as [Tree, OptionT]),
-        )),
-        concatMap(([tree, transformedOptions]) => {
-          let input: Tree;
-          let scoped = false;
-          if (executionOptions && executionOptions.scope) {
-            scoped = true;
-            input = new ScopedTree(tree, executionOptions.scope);
-          } else {
-            input = tree;
-          }
+    return host.pipe(
+      first(),
+      concatMap((tree) =>
+        this._engine
+          .transformOptions(this, options, context)
+          .pipe(map((o) => [tree, o] as [Tree, OptionT])),
+      ),
+      concatMap(([tree, transformedOptions]) => {
+        let input: Tree;
+        let scoped = false;
+        if (executionOptions && executionOptions.scope) {
+          scoped = true;
+          input = new ScopedTree(tree, executionOptions.scope);
+        } else {
+          input = tree;
+        }
 
-          return callRule(this._factory(transformedOptions), observableOf(input), context).pipe(
-            map(output => {
-              if (output === input) {
-                return tree;
-              } else if (scoped) {
-                tree.merge(output);
+        return callRule(this._factory(transformedOptions), observableOf(input), context).pipe(
+          map((output) => {
+            if (output === input) {
+              return tree;
+            } else if (scoped) {
+              tree.merge(output);
 
-                return tree;
-              } else {
-                return output;
-              }
-            }),
-          );
-        }),
-      );
+              return tree;
+            } else {
+              return output;
+            }
+          }),
+        );
+      }),
+    );
   }
 }
diff --git a/packages/angular_devkit/schematics/src/engine/schematic_spec.ts b/packages/angular_devkit/schematics/src/engine/schematic_spec.ts
index 5f16ed347644..4d69673f4e5d 100644
--- a/packages/angular_devkit/schematics/src/engine/schematic_spec.ts
+++ b/packages/angular_devkit/schematics/src/engine/schematic_spec.ts
@@ -1,11 +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
  */
-// tslint:disable:no-non-null-assertion
+
+/* eslint-disable @typescript-eslint/no-non-null-assertion */
 import { logging } from '@angular-devkit/core';
 import { of as observableOf } from 'rxjs';
 import { chain } from '../rules/base';
@@ -14,7 +15,6 @@ import { branch, empty } from '../tree/static';
 import { CollectionDescription, Engine, Rule, Schematic, SchematicDescription } from './interface';
 import { SchematicImpl } from './schematic';
 
-
 type CollectionT = {
   description: string;
 };
@@ -30,27 +30,25 @@ const context = {
   logger: new logging.NullLogger(),
   strategy: MergeStrategy.Default,
 };
-const engine: Engine<CollectionT, SchematicT> = {
+const engine: Engine<CollectionT, SchematicT> = ({
   createContext: (schematic: Schematic<{}, {}>) => ({ engine, schematic, ...context }),
   transformOptions: (_: {}, options: {}) => observableOf(options),
   defaultMergeStrategy: MergeStrategy.Default,
-} as {} as Engine<CollectionT, SchematicT>;
+} as {}) as Engine<CollectionT, SchematicT>;
 const collection = {
   name: 'collection',
   description: 'description',
 } as CollectionDescription<CollectionT>;
 
-
 function files(tree: Tree) {
   const files: string[] = [];
-  tree.visit(x => files.push(x));
+  tree.visit((x) => files.push(x));
 
   return files;
 }
 
-
 describe('Schematic', () => {
-  it('works with a rule', done => {
+  it('works with a rule', (done) => {
     let inner: Tree | null = null;
     const desc: SchematicDescription<CollectionT, SchematicT> = {
       collection,
@@ -65,17 +63,18 @@ describe('Schematic', () => {
       },
     };
 
-    const schematic = new SchematicImpl(desc, desc.factory, null !, engine);
-    schematic.call({}, observableOf(empty()))
+    const schematic = new SchematicImpl(desc, desc.factory, null!, engine);
+    schematic
+      .call({}, observableOf(empty()))
       .toPromise()
-      .then(x => {
-        expect(files(inner !)).toEqual([]);
+      .then((x) => {
+        expect(files(inner!)).toEqual([]);
         expect(files(x)).toEqual(['/a/b/c']);
       })
       .then(done, done.fail);
   });
 
-  it('works with a rule that returns an observable', done => {
+  it('works with a rule that returns an observable', (done) => {
     let inner: Tree | null = null;
     const desc: SchematicDescription<CollectionT, SchematicT> = {
       collection,
@@ -89,31 +88,35 @@ describe('Schematic', () => {
       },
     };
 
-
-    const schematic = new SchematicImpl(desc, desc.factory, null !, engine);
-    schematic.call({}, observableOf(empty()))
+    const schematic = new SchematicImpl(desc, desc.factory, null!, engine);
+    schematic
+      .call({}, observableOf(empty()))
       .toPromise()
-      .then(x => {
-        expect(files(inner !)).toEqual([]);
+      .then((x) => {
+        expect(files(inner!)).toEqual([]);
         expect(files(x)).toEqual([]);
         expect(inner).not.toBe(x);
       })
       .then(done, done.fail);
   });
 
-  it('works with nested chained function rules', done => {
+  it('works with nested chained function rules', (done) => {
     let chainCount = 0;
     let oneCount = 0;
     let twoCount = 0;
     let threeCount = 0;
     const one = () => {
       return chain([
-        () => { oneCount++; },
+        () => {
+          oneCount++;
+        },
       ]);
     };
     const two = () => {
       return chain([
-        () => { twoCount++; },
+        () => {
+          twoCount++;
+        },
       ]);
     };
     const three = () => {
@@ -127,7 +130,9 @@ describe('Schematic', () => {
       path: '/a/b/c',
       factory: () => {
         return chain([
-          () => { chainCount++; },
+          () => {
+            chainCount++;
+          },
           one,
           two,
           three,
@@ -135,10 +140,11 @@ describe('Schematic', () => {
       },
     };
 
-    const schematic = new SchematicImpl(desc, desc.factory, null !, engine);
-    schematic.call({}, observableOf(empty()))
+    const schematic = new SchematicImpl(desc, desc.factory, null!, engine);
+    schematic
+      .call({}, observableOf(empty()))
       .toPromise()
-      .then(_x => {
+      .then((_x) => {
         expect(chainCount).toBe(1);
         expect(oneCount).toBe(1);
         expect(twoCount).toBe(1);
@@ -147,7 +153,7 @@ describe('Schematic', () => {
       .then(done, done.fail);
   });
 
-  it('can be called with a scope', done => {
+  it('can be called with a scope', (done) => {
     const desc: SchematicDescription<CollectionT, SchematicT> = {
       collection,
       name: 'test',
@@ -158,13 +164,13 @@ describe('Schematic', () => {
       },
     };
 
-    const schematic = new SchematicImpl(desc, desc.factory, null !, engine);
-    schematic.call({}, observableOf(empty()), {}, { scope: 'base' })
+    const schematic = new SchematicImpl(desc, desc.factory, null!, engine);
+    schematic
+      .call({}, observableOf(empty()), {}, { scope: 'base' })
       .toPromise()
-      .then(x => {
+      .then((x) => {
         expect(files(x)).toEqual(['/base/a/b/c']);
       })
       .then(done, done.fail);
   });
-
 });
diff --git a/packages/angular_devkit/schematics/src/exception/exception.ts b/packages/angular_devkit/schematics/src/exception/exception.ts
index f7f419bfc145..29f3a418918a 100644
--- a/packages/angular_devkit/schematics/src/exception/exception.ts
+++ b/packages/angular_devkit/schematics/src/exception/exception.ts
@@ -1,23 +1,26 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import { BaseException } from '@angular-devkit/core';
 
+import { BaseException } from '@angular-devkit/core';
 
 // Used by schematics to throw exceptions.
 export class SchematicsException extends BaseException {}
 
-
 // Exceptions
 export class FileDoesNotExistException extends BaseException {
-  constructor(path: string) { super(`Path "${path}" does not exist.`); }
+  constructor(path: string) {
+    super(`Path "${path}" does not exist.`);
+  }
 }
 export class FileAlreadyExistException extends BaseException {
-  constructor(path: string) { super(`Path "${path}" already exist.`); }
+  constructor(path: string) {
+    super(`Path "${path}" already exist.`);
+  }
 }
 export class ContentHasMutatedException extends BaseException {
   constructor(path: string) {
@@ -25,7 +28,9 @@ export class ContentHasMutatedException extends BaseException {
   }
 }
 export class InvalidUpdateRecordException extends BaseException {
-  constructor() { super(`Invalid record instance.`); }
+  constructor() {
+    super(`Invalid record instance.`);
+  }
 }
 export class MergeConflictException extends BaseException {
   constructor(path: string) {
@@ -40,5 +45,7 @@ export class UnsuccessfulWorkflowExecution extends BaseException {
 }
 
 export class UnimplementedException extends BaseException {
-  constructor() { super('This function is unimplemented.'); }
+  constructor() {
+    super('This function is unimplemented.');
+  }
 }
diff --git a/packages/angular_devkit/schematics/src/formats/format-validator.ts b/packages/angular_devkit/schematics/src/formats/format-validator.ts
index 863a5b3e214a..6879f58d9b4d 100644
--- a/packages/angular_devkit/schematics/src/formats/format-validator.ts
+++ b/packages/angular_devkit/schematics/src/formats/format-validator.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 { JsonObject, JsonValue, schema } from '@angular-devkit/core';
 import { Observable } from 'rxjs';
 import { mergeMap } from 'rxjs/operators';
 
-
 export function formatValidator(
   data: JsonValue,
   dataSchema: JsonObject,
@@ -21,7 +21,5 @@ export function formatValidator(
     registry.addFormat(format);
   }
 
-  return registry
-    .compile(dataSchema)
-    .pipe(mergeMap(validator => validator(data)));
+  return registry.compile(dataSchema).pipe(mergeMap((validator) => validator(data)));
 }
diff --git a/packages/angular_devkit/schematics/src/formats/html-selector.ts b/packages/angular_devkit/schematics/src/formats/html-selector.ts
index dbea9afbb627..aede3534799d 100644
--- a/packages/angular_devkit/schematics/src/formats/html-selector.ts
+++ b/packages/angular_devkit/schematics/src/formats/html-selector.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 { schema } from '@angular-devkit/core';
 
 // As per https://html.spec.whatwg.org/multipage/custom-elements.html#valid-custom-element-name
@@ -14,18 +15,18 @@ import { schema } from '@angular-devkit/core';
 // NOTE: This should eventually be broken out into two formats: full and partial (allows for prefix)
 
 const unicodeRanges = [
-  [0xC0, 0xD6],
-  [0xD8, 0xF6],
-  [0xF8, 0x37D],
-  [0x37F, 0x1FFF],
-  [0x200C, 0x200D],
-  [0x203F, 0x2040],
-  [0x2070, 0x218F],
-  [0x2C00, 0x2FEF],
-  [0x3001, 0xD7FF],
-  [0xF900, 0xFDCF],
-  [0xFDF0, 0xFFFD],
-  [0x10000, 0xEFFFF],
+  [0xc0, 0xd6],
+  [0xd8, 0xf6],
+  [0xf8, 0x37d],
+  [0x37f, 0x1fff],
+  [0x200c, 0x200d],
+  [0x203f, 0x2040],
+  [0x2070, 0x218f],
+  [0x2c00, 0x2fef],
+  [0x3001, 0xd7ff],
+  [0xf900, 0xfdcf],
+  [0xfdf0, 0xfffd],
+  [0x10000, 0xeffff],
 ];
 
 function isValidElementName(name: string) {
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..492521ab0fef 100644
--- a/packages/angular_devkit/schematics/src/formats/html-selector_spec.ts
+++ b/packages/angular_devkit/schematics/src/formats/html-selector_spec.ts
@@ -1,67 +1,73 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+
 import { map } from 'rxjs/operators';
 import { formatValidator } from './format-validator';
 import { htmlSelectorFormat } from './html-selector';
 
 describe('Schematics HTML selector format', () => {
-  it('accepts correct selectors', done => {
+  it('accepts correct selectors', (done) => {
     const data = { selector: 'my-selector' };
     const dataSchema = {
       properties: { selector: { type: 'string', format: 'html-selector' } },
     };
 
     formatValidator(data, dataSchema, [htmlSelectorFormat])
-      .pipe(map(result => expect(result.success).toBe(true)))
-      .toPromise().then(done, done.fail);
+      .pipe(map((result) => expect(result.success).toBe(true)))
+      .toPromise()
+      .then(done, done.fail);
   });
 
-  it('rejects selectors starting with invalid characters', done => {
+  it('rejects selectors starting with invalid characters', (done) => {
     const data = { selector: 'my-selector$' };
     const dataSchema = {
       properties: { selector: { type: 'string', format: 'html-selector' } },
     };
 
     formatValidator(data, dataSchema, [htmlSelectorFormat])
-      .pipe(map(result => expect(result.success).toBe(false)))
-      .toPromise().then(done, done.fail);
+      .pipe(map((result) => expect(result.success).toBe(false)))
+      .toPromise()
+      .then(done, done.fail);
   });
 
-  it('rejects selectors starting with number', done => {
+  it('rejects selectors starting with number', (done) => {
     const data = { selector: '1selector' };
     const dataSchema = {
       properties: { selector: { type: 'string', format: 'html-selector' } },
     };
 
     formatValidator(data, dataSchema, [htmlSelectorFormat])
-      .pipe(map(result => expect(result.success).toBe(false)))
-      .toPromise().then(done, done.fail);
+      .pipe(map((result) => expect(result.success).toBe(false)))
+      .toPromise()
+      .then(done, done.fail);
   });
 
-  it('accepts selectors with non-letter after dash', done => {
+  it('accepts selectors with non-letter after dash', (done) => {
     const data = { selector: 'my-1selector' };
     const dataSchema = {
       properties: { selector: { type: 'string', format: 'html-selector' } },
     };
 
     formatValidator(data, dataSchema, [htmlSelectorFormat])
-      .pipe(map(result => expect(result.success).toBe(true)))
-      .toPromise().then(done, done.fail);
+      .pipe(map((result) => expect(result.success).toBe(true)))
+      .toPromise()
+      .then(done, done.fail);
   });
 
-  it('accepts selectors with unicode', done => {
+  it('accepts selectors with unicode', (done) => {
     const data = { selector: 'app-root😀' };
     const dataSchema = {
       properties: { selector: { type: 'string', format: 'html-selector' } },
     };
 
     formatValidator(data, dataSchema, [htmlSelectorFormat])
-      .pipe(map(result => expect(result.success).toBe(true)))
-      .toPromise().then(done, done.fail);
+      .pipe(map((result) => expect(result.success).toBe(true)))
+      .toPromise()
+      .then(done, done.fail);
   });
 });
diff --git a/packages/angular_devkit/schematics/src/formats/index.ts b/packages/angular_devkit/schematics/src/formats/index.ts
index 2cfab19db670..ed061076c784 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
@@ -8,11 +8,9 @@
 
 import { schema } from '@angular-devkit/core';
 import { htmlSelectorFormat } from './html-selector';
-export { htmlSelectorFormat } from './html-selector';
 import { pathFormat } from './path';
+
+export { htmlSelectorFormat } from './html-selector';
 export { pathFormat } from './path';
 
-export const standardFormats: schema.SchemaFormat[] = [
-  htmlSelectorFormat,
-  pathFormat,
-];
+export const standardFormats: schema.SchemaFormat[] = [htmlSelectorFormat, pathFormat];
diff --git a/packages/angular_devkit/schematics/src/formats/path.ts b/packages/angular_devkit/schematics/src/formats/path.ts
index 0c854957f15a..30b103da325b 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
@@ -8,7 +8,6 @@
 
 import { normalize, schema } from '@angular-devkit/core';
 
-
 export const pathFormat: schema.SchemaFormat = {
   name: 'path',
   formatter: {
diff --git a/packages/angular_devkit/schematics/src/formats/path_spec.ts b/packages/angular_devkit/schematics/src/formats/path_spec.ts
index 24901f08a72f..17aeaf806cd0 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
@@ -10,27 +10,28 @@ import { map } from 'rxjs/operators';
 import { formatValidator } from './format-validator';
 import { pathFormat } from './path';
 
-
 describe('Schematics Path format', () => {
-  it('accepts correct Paths', done => {
+  it('accepts correct Paths', (done) => {
     const data = { path: 'a/b/c' };
     const dataSchema = {
       properties: { path: { type: 'string', format: 'path' } },
     };
 
     formatValidator(data, dataSchema, [pathFormat])
-      .pipe(map(result => expect(result.success).toBe(true)))
-      .toPromise().then(done, done.fail);
+      .pipe(map((result) => expect(result.success).toBe(true)))
+      .toPromise()
+      .then(done, done.fail);
   });
 
-  it('rejects Paths that are not normalized', done => {
+  it('rejects Paths that are not normalized', (done) => {
     const data = { path: 'a/b/c/../' };
     const dataSchema = {
       properties: { path: { type: 'string', format: 'path' } },
     };
 
     formatValidator(data, dataSchema, [pathFormat])
-      .pipe(map(result => expect(result.success).toBe(false)))
-      .toPromise().then(done, done.fail);
+      .pipe(map((result) => expect(result.success).toBe(false)))
+      .toPromise()
+      .then(done, done.fail);
   });
 });
diff --git a/packages/angular_devkit/schematics/src/index.ts b/packages/angular_devkit/schematics/src/index.ts
index d0951eb363ad..91809ee84802 100644
--- a/packages/angular_devkit/schematics/src/index.ts
+++ b/packages/angular_devkit/schematics/src/index.ts
@@ -1,13 +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 formats from './formats/index';
 import { FilePredicate, MergeStrategy, Tree as TreeInterface } from './tree/interface';
 import { branch, empty, merge, partition } from './tree/static';
 
+import * as workflow from './workflow/index';
 
 export { SchematicsException } from './exception/exception';
 
@@ -30,11 +33,7 @@ export * from './engine/schematic';
 export * from './sink/dryrun';
 export * from './sink/host';
 export * from './sink/sink';
-
-import * as formats from './formats/index';
 export { formats };
-
-import * as workflow from './workflow/index';
 export { workflow };
 
 export interface TreeConstructor {
@@ -47,15 +46,23 @@ export interface TreeConstructor {
 
 export type Tree = TreeInterface;
 export const Tree: TreeConstructor = {
-  empty() { return empty(); },
-  branch(tree: TreeInterface) { return branch(tree); },
-  merge(tree: TreeInterface,
-        other: TreeInterface,
-        strategy: MergeStrategy = MergeStrategy.Default) {
+  empty() {
+    return empty();
+  },
+  branch(tree: TreeInterface) {
+    return branch(tree);
+  },
+  merge(
+    tree: TreeInterface,
+    other: TreeInterface,
+    strategy: MergeStrategy = MergeStrategy.Default,
+  ) {
     return merge(tree, other, strategy);
   },
   partition(tree: TreeInterface, predicate: FilePredicate<boolean>) {
     return partition(tree, predicate);
   },
-  optimize(tree: TreeInterface) { return tree; },
+  optimize(tree: TreeInterface) {
+    return tree;
+  },
 };
diff --git a/packages/angular_devkit/schematics/src/rules/base.ts b/packages/angular_devkit/schematics/src/rules/base.ts
index d5c390026145..a52dda34f6ee 100644
--- a/packages/angular_devkit/schematics/src/rules/base.ts
+++ b/packages/angular_devkit/schematics/src/rules/base.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 { Observable, concat } from 'rxjs';
 import { map, mapTo, toArray } from 'rxjs/operators';
 import { FileOperator, Rule, Source } from '../engine/interface';
@@ -12,7 +13,7 @@ import { SchematicsException } from '../exception/exception';
 import { FilterHostTree, HostTree } from '../tree/host-tree';
 import { FileEntry, FilePredicate, MergeStrategy, Tree } from '../tree/interface';
 import { ScopedTree } from '../tree/scoped';
-import { empty as staticEmpty, partition } from '../tree/static';
+import { partition, empty as staticEmpty } from '../tree/static';
 import { callRule, callSource } from './call';
 
 /**
@@ -42,7 +43,7 @@ export function chain(rules: Rule[]): Rule {
  * Apply multiple rules to a source, and returns the source transformed.
  */
 export function apply(source: Source, rules: Rule[]): Source {
-  return context => callRule(chain(rules), callSource(source, context), context);
+  return (context) => callRule(chain(rules), callSource(source, context), context);
 }
 
 /**
@@ -51,7 +52,7 @@ export function apply(source: Source, rules: Rule[]): Source {
 export function mergeWith(source: Source, strategy: MergeStrategy = MergeStrategy.Default): Rule {
   return (tree, context) => {
     return callSource(source, context).pipe(
-      map(sourceTree => tree.merge(sourceTree, strategy || context.strategy)),
+      map((sourceTree) => tree.merge(sourceTree, strategy || context.strategy)),
       mapTo(tree),
     );
   };
@@ -62,23 +63,23 @@ export function noop(): Rule {
 }
 
 export function filter(predicate: FilePredicate<boolean>): Rule {
-  return ((tree: Tree) => {
+  return (tree: Tree) => {
     if (HostTree.isHostTree(tree)) {
       return new FilterHostTree(tree, predicate);
     } else {
       throw new SchematicsException('Tree type is not supported.');
     }
-  });
+  };
 }
 
 export function asSource(rule: Rule): Source {
-  return context => callRule(rule, staticEmpty(), context);
+  return (context) => callRule(rule, staticEmpty(), context);
 }
 
 export function branchAndMerge(rule: Rule, strategy = MergeStrategy.Default): Rule {
   return (tree, context) => {
     return callRule(rule, tree.branch(), context).pipe(
-      map(branch => tree.merge(branch, strategy || context.strategy)),
+      map((branch) => tree.merge(branch, strategy || context.strategy)),
       mapTo(tree),
     );
   };
@@ -102,10 +103,7 @@ export function partitionApplyMerge(
   return (tree, context) => {
     const [yes, no] = partition(tree, predicate);
 
-    return concat(
-      callRule(ruleYes, yes, context),
-      callRule(ruleNo || noop(), no, context),
-    ).pipe(
+    return concat(callRule(ruleYes, yes, context), callRule(ruleNo || noop(), no, context)).pipe(
       toArray(),
       map(([yesTree, noTree]) => {
         yesTree.merge(noTree, context.strategy);
@@ -162,7 +160,7 @@ export function applyToSubtree(path: string, rules: Rule[]): Rule {
     const scoped = new ScopedTree(tree, path);
 
     return callRule(chain(rules), scoped, context).pipe(
-      map(result => {
+      map((result) => {
         if (result === scoped) {
           return tree;
         } else {
diff --git a/packages/angular_devkit/schematics/src/rules/base_spec.ts b/packages/angular_devkit/schematics/src/rules/base_spec.ts
index 3f199ab9dbef..8adf8c503851 100644
--- a/packages/angular_devkit/schematics/src/rules/base_spec.ts
+++ b/packages/angular_devkit/schematics/src/rules/base_spec.ts
@@ -1,18 +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
  */
-// tslint:disable:no-implicit-dependencies
-// tslint:disable:no-non-null-assertion
+
+/* eslint-disable @typescript-eslint/no-non-null-assertion */
 import { Path, virtualFs } from '@angular-devkit/core';
-import {
-  HostTree,
-  MergeStrategy,
-  partitionApplyMerge,
-} from '@angular-devkit/schematics';
+import { HostTree, MergeStrategy, partitionApplyMerge } from '@angular-devkit/schematics';
 import { of as observableOf } from 'rxjs';
 import { Rule, SchematicContext, Source } from '../engine/interface';
 import { Tree } from '../tree/interface';
@@ -21,16 +17,14 @@ import { apply, applyToSubtree, chain } from './base';
 import { callRule, callSource } from './call';
 import { move } from './move';
 
-
-const context: SchematicContext = {
+const context: SchematicContext = ({
   engine: null,
   debug: false,
   strategy: MergeStrategy.Default,
-} as {} as SchematicContext;
-
+} as {}) as SchematicContext;
 
 describe('chain', () => {
-  it('works with simple rules', done => {
+  it('works with simple rules', (done) => {
     const rulesCalled: Tree[] = [];
 
     const tree0 = empty();
@@ -38,13 +32,13 @@ describe('chain', () => {
     const tree2 = empty();
     const tree3 = empty();
 
-    const rule0: Rule = (tree: Tree) => (rulesCalled[0] = tree, tree1);
-    const rule1: Rule = (tree: Tree) => (rulesCalled[1] = tree, tree2);
-    const rule2: Rule = (tree: Tree) => (rulesCalled[2] = tree, tree3);
+    const rule0: Rule = (tree: Tree) => ((rulesCalled[0] = tree), tree1);
+    const rule1: Rule = (tree: Tree) => ((rulesCalled[1] = tree), tree2);
+    const rule2: Rule = (tree: Tree) => ((rulesCalled[2] = tree), tree3);
 
-    callRule(chain([ rule0, rule1, rule2 ]), observableOf(tree0), context)
+    callRule(chain([rule0, rule1, rule2]), observableOf(tree0), context)
       .toPromise()
-      .then(result => {
+      .then((result) => {
         expect(result).not.toBe(tree0);
         expect(rulesCalled[0]).toBe(tree0);
         expect(rulesCalled[1]).toBe(tree1);
@@ -54,7 +48,7 @@ describe('chain', () => {
       .then(done, done.fail);
   });
 
-  it('works with observable rules', done => {
+  it('works with observable rules', (done) => {
     const rulesCalled: Tree[] = [];
 
     const tree0 = empty();
@@ -62,13 +56,13 @@ describe('chain', () => {
     const tree2 = empty();
     const tree3 = empty();
 
-    const rule0: Rule = (tree: Tree) => (rulesCalled[0] = tree, observableOf(tree1));
-    const rule1: Rule = (tree: Tree) => (rulesCalled[1] = tree, observableOf(tree2));
-    const rule2: Rule = (tree: Tree) => (rulesCalled[2] = tree, tree3);
+    const rule0: Rule = (tree: Tree) => ((rulesCalled[0] = tree), observableOf(tree1));
+    const rule1: Rule = (tree: Tree) => ((rulesCalled[1] = tree), observableOf(tree2));
+    const rule2: Rule = (tree: Tree) => ((rulesCalled[2] = tree), tree3);
 
-    callRule(chain([ rule0, rule1, rule2 ]), observableOf(tree0), context)
+    callRule(chain([rule0, rule1, rule2]), observableOf(tree0), context)
       .toPromise()
-      .then(result => {
+      .then((result) => {
         expect(result).not.toBe(tree0);
         expect(rulesCalled[0]).toBe(tree0);
         expect(rulesCalled[1]).toBe(tree1);
@@ -80,7 +74,7 @@ describe('chain', () => {
 });
 
 describe('apply', () => {
-  it('works with simple rules', done => {
+  it('works with simple rules', (done) => {
     const rulesCalled: Tree[] = [];
     const tree0 = empty();
     const tree1 = empty();
@@ -88,13 +82,13 @@ describe('apply', () => {
     const tree3 = empty();
 
     const source: Source = () => tree0;
-    const rule0: Rule = (tree: Tree) => (rulesCalled[0] = tree, tree1);
-    const rule1: Rule = (tree: Tree) => (rulesCalled[1] = tree, tree2);
-    const rule2: Rule = (tree: Tree) => (rulesCalled[2] = tree, tree3);
+    const rule0: Rule = (tree: Tree) => ((rulesCalled[0] = tree), tree1);
+    const rule1: Rule = (tree: Tree) => ((rulesCalled[1] = tree), tree2);
+    const rule2: Rule = (tree: Tree) => ((rulesCalled[2] = tree), tree3);
 
-    callSource(apply(source, [ rule0, rule1, rule2 ]), context)
+    callSource(apply(source, [rule0, rule1, rule2]), context)
       .toPromise()
-      .then(result => {
+      .then((result) => {
         expect(result).not.toBe(tree0);
         expect(rulesCalled[0]).toBe(tree0);
         expect(rulesCalled[1]).toBe(tree1);
@@ -104,7 +98,7 @@ describe('apply', () => {
       .then(done, done.fail);
   });
 
-  it('works with observable rules', done => {
+  it('works with observable rules', (done) => {
     const rulesCalled: Tree[] = [];
     const tree0 = empty();
     const tree1 = empty();
@@ -112,13 +106,13 @@ describe('apply', () => {
     const tree3 = empty();
 
     const source: Source = () => tree0;
-    const rule0: Rule = (tree: Tree) => (rulesCalled[0] = tree, observableOf(tree1));
-    const rule1: Rule = (tree: Tree) => (rulesCalled[1] = tree, observableOf(tree2));
-    const rule2: Rule = (tree: Tree) => (rulesCalled[2] = tree, tree3);
+    const rule0: Rule = (tree: Tree) => ((rulesCalled[0] = tree), observableOf(tree1));
+    const rule1: Rule = (tree: Tree) => ((rulesCalled[1] = tree), observableOf(tree2));
+    const rule2: Rule = (tree: Tree) => ((rulesCalled[2] = tree), tree3);
 
-    callSource(apply(source, [ rule0, rule1, rule2 ]), context)
+    callSource(apply(source, [rule0, rule1, rule2]), context)
       .toPromise()
-      .then(result => {
+      .then((result) => {
         expect(result).not.toBe(tree0);
         expect(rulesCalled[0]).toBe(tree0);
         expect(rulesCalled[1]).toBe(tree1);
@@ -130,7 +124,7 @@ describe('apply', () => {
 });
 
 describe('partitionApplyMerge', () => {
-  it('works with simple rules', done => {
+  it('works with simple rules', (done) => {
     const host = new virtualFs.test.TestHost({
       '/test1': '',
       '/test2': '',
@@ -153,7 +147,7 @@ describe('partitionApplyMerge', () => {
 
     callRule(partitionApplyMerge(predicate, ruleYes, ruleNo), observableOf(tree), context)
       .toPromise()
-      .then(result => {
+      .then((result) => {
         expect(result.exists('/test1')).toBe(false);
         expect(result.exists('/test2')).toBe(false);
       })
@@ -162,7 +156,7 @@ describe('partitionApplyMerge', () => {
 });
 
 describe('applyToSubtree', () => {
-  it('works', done => {
+  it('works', (done) => {
     const tree = new HostTree();
     tree.create('a/b/file1', 'hello world');
     tree.create('a/b/file2', 'hello world');
@@ -170,7 +164,7 @@ describe('applyToSubtree', () => {
 
     callRule(applyToSubtree('a/b', [move('x')]), observableOf(tree), context)
       .toPromise()
-      .then(result => {
+      .then((result) => {
         expect(result.exists('a/b/x/file1')).toBe(true);
         expect(result.exists('a/b/x/file2')).toBe(true);
         expect(result.exists('a/c/file3')).toBe(true);
diff --git a/packages/angular_devkit/schematics/src/rules/call.ts b/packages/angular_devkit/schematics/src/rules/call.ts
index a9f2762e3c96..d2cb1ba4c9ae 100644
--- a/packages/angular_devkit/schematics/src/rules/call.ts
+++ b/packages/angular_devkit/schematics/src/rules/call.ts
@@ -1,17 +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 { BaseException, isPromise } from '@angular-devkit/core';
 import { Observable, from, isObservable, of as observableOf, throwError } from 'rxjs';
 import { defaultIfEmpty, last, mergeMap, tap } from 'rxjs/operators';
 import { Rule, SchematicContext, Source } from '../engine/interface';
 import { Tree, TreeSymbol } from '../tree/interface';
 
-
 function _getTypeOfResult(value?: {}): string {
   if (value === undefined) {
     return 'undefined';
@@ -32,7 +32,6 @@ function _getTypeOfResult(value?: {}): string {
   }
 }
 
-
 /**
  * When a rule or source returns an invalid value.
  */
@@ -42,14 +41,12 @@ export class InvalidRuleResultException extends BaseException {
   }
 }
 
-
 export class InvalidSourceResultException extends BaseException {
   constructor(value?: {}) {
     super(`Invalid source result: ${_getTypeOfResult(value)}.`);
   }
 }
 
-
 export function callSource(source: Source, context: SchematicContext): Observable<Tree> {
   const result = source(context);
 
@@ -58,7 +55,7 @@ export function callSource(source: Source, context: SchematicContext): Observabl
     return result.pipe(
       defaultIfEmpty(),
       last(),
-      tap(inner => {
+      tap((inner) => {
         if (!inner || !(TreeSymbol in inner)) {
           throw new InvalidSourceResultException(inner);
         }
@@ -71,46 +68,47 @@ export function callSource(source: Source, context: SchematicContext): Observabl
   }
 }
 
-
 export function callRule(
   rule: Rule,
   input: Tree | Observable<Tree>,
   context: SchematicContext,
 ): Observable<Tree> {
-  return (isObservable(input) ? input : observableOf(input)).pipe(mergeMap(inputTree => {
-    const result = rule(inputTree, context);
+  return (isObservable(input) ? input : observableOf(input)).pipe(
+    mergeMap((inputTree) => {
+      const result = rule(inputTree, context);
 
-    if (!result) {
-      return observableOf(inputTree);
-    } else if (typeof result == 'function') {
-      // This is considered a Rule, chain the rule and return its output.
-      return callRule(result, inputTree, context);
-    } else if (isObservable(result)) {
-      // Only return the last Tree, and make sure it's a Tree.
-      return result.pipe(
-        defaultIfEmpty(),
-        last(),
-        tap(inner => {
-          if (!inner || !(TreeSymbol in inner)) {
-            throw new InvalidRuleResultException(inner);
-          }
-        }),
-      );
-    } else if (isPromise(result)) {
-      return from(result).pipe(
-        mergeMap(inner => {
-          if (typeof inner === 'function') {
-            // This is considered a Rule, chain the rule and return its output.
-            return callRule(inner, inputTree, context);
-          } else {
-            return observableOf(inputTree);
-          }
-        }),
-      );
-    } else if (TreeSymbol in result) {
-      return observableOf(result);
-    } else {
-      return throwError(new InvalidRuleResultException(result));
-    }
-  }));
+      if (!result) {
+        return observableOf(inputTree);
+      } else if (typeof result == 'function') {
+        // This is considered a Rule, chain the rule and return its output.
+        return callRule(result, inputTree, context);
+      } else if (isObservable(result)) {
+        // Only return the last Tree, and make sure it's a Tree.
+        return result.pipe(
+          defaultIfEmpty(),
+          last(),
+          tap((inner) => {
+            if (!inner || !(TreeSymbol in inner)) {
+              throw new InvalidRuleResultException(inner);
+            }
+          }),
+        );
+      } else if (isPromise(result)) {
+        return from(result).pipe(
+          mergeMap((inner) => {
+            if (typeof inner === 'function') {
+              // This is considered a Rule, chain the rule and return its output.
+              return callRule(inner, inputTree, context);
+            } else {
+              return observableOf(inputTree);
+            }
+          }),
+        );
+      } else if (TreeSymbol in result) {
+        return observableOf(result);
+      } else {
+        return throwError(new InvalidRuleResultException(result));
+      }
+    }),
+  );
 }
diff --git a/packages/angular_devkit/schematics/src/rules/call_spec.ts b/packages/angular_devkit/schematics/src/rules/call_spec.ts
index b4ec2d4b43e5..283dcd68aea0 100644
--- a/packages/angular_devkit/schematics/src/rules/call_spec.ts
+++ b/packages/angular_devkit/schematics/src/rules/call_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-non-null-assertion
-// tslint:disable:no-any
-// tslint:disable:no-implicit-dependencies
+
+/* eslint-disable @typescript-eslint/no-non-null-assertion */
+/* eslint-disable @typescript-eslint/no-explicit-any */
 import { MergeStrategy } from '@angular-devkit/schematics';
 import { of as observableOf } from 'rxjs';
 import { Rule, SchematicContext, Source } from '../engine/interface';
@@ -20,67 +20,74 @@ import {
   callSource,
 } from './call';
 
-
-const context: SchematicContext = {
+const context: SchematicContext = ({
   engine: null,
   debug: false,
   strategy: MergeStrategy.Default,
-} as {} as SchematicContext;
-
+} as {}) as SchematicContext;
 
 describe('callSource', () => {
-  it('errors if undefined source', done => {
+  it('errors if undefined source', (done) => {
     const source0: any = () => undefined;
 
     callSource(source0, context)
       .toPromise()
-      .then(() => done.fail(), err => {
-        expect(err).toEqual(new InvalidSourceResultException());
-      })
+      .then(
+        () => done.fail(),
+        (err) => {
+          expect(err).toEqual(new InvalidSourceResultException());
+        },
+      )
       .then(done, done.fail);
   });
 
-  it('errors if invalid source object', done => {
+  it('errors if invalid source object', (done) => {
     const source0: Source = () => ({} as Tree);
 
     callSource(source0, context)
       .toPromise()
-      .then(() => done.fail(), err => {
-        expect(err).toEqual(new InvalidSourceResultException({}));
-      })
+      .then(
+        () => done.fail(),
+        (err) => {
+          expect(err).toEqual(new InvalidSourceResultException({}));
+        },
+      )
       .then(done, done.fail);
   });
 
-  it('errors if Observable of invalid source object', done => {
+  it('errors if Observable of invalid source object', (done) => {
     const source0: Source = () => observableOf({} as Tree);
 
     callSource(source0, context)
       .toPromise()
-      .then(() => done.fail(), err => {
-        expect(err).toEqual(new InvalidSourceResultException({}));
-      })
+      .then(
+        () => done.fail(),
+        (err) => {
+          expect(err).toEqual(new InvalidSourceResultException({}));
+        },
+      )
       .then(done, done.fail);
   });
 
-  it('works with a Tree', done => {
+  it('works with a Tree', (done) => {
     const tree0 = empty();
     const source0: Source = () => tree0;
 
     callSource(source0, context)
       .toPromise()
-      .then(tree => {
+      .then((tree) => {
         expect(tree).toBe(tree0);
       })
       .then(done, done.fail);
   });
 
-  it('works with an Observable', done => {
+  it('works with an Observable', (done) => {
     const tree0 = empty();
     const source0: Source = () => observableOf(tree0);
 
     callSource(source0, context)
       .toPromise()
-      .then(tree => {
+      .then((tree) => {
         expect(tree).toBe(tree0);
       })
       .then(done, done.fail);
@@ -88,61 +95,67 @@ describe('callSource', () => {
 });
 
 describe('callRule', () => {
-  it('errors if invalid source object', done => {
+  it('errors if invalid source object', (done) => {
     const tree0 = observableOf(empty());
     const rule0: Rule = () => ({} as Tree);
 
     callRule(rule0, tree0, context)
       .toPromise()
-      .then(() => done.fail(), err => {
-        expect(err).toEqual(new InvalidRuleResultException({}));
-      })
+      .then(
+        () => done.fail(),
+        (err) => {
+          expect(err).toEqual(new InvalidRuleResultException({}));
+        },
+      )
       .then(done, done.fail);
   });
 
-  it('errors if Observable of invalid source object', done => {
+  it('errors if Observable of invalid source object', (done) => {
     const tree0 = observableOf(empty());
     const rule0: Rule = () => observableOf({} as Tree);
 
     callRule(rule0, tree0, context)
       .toPromise()
-      .then(() => done.fail(), err => {
-        expect(err).toEqual(new InvalidRuleResultException({}));
-      })
+      .then(
+        () => done.fail(),
+        (err) => {
+          expect(err).toEqual(new InvalidRuleResultException({}));
+        },
+      )
       .then(done, done.fail);
   });
 
-  it('works with undefined result', done => {
+  it('works with undefined result', (done) => {
     const tree0 = empty();
     const rule0: Rule = () => undefined;
 
     callRule(rule0, observableOf(tree0), context)
       .toPromise()
-      .then(tree => {
+      .then((tree) => {
         expect(tree).toBe(tree0);
       })
       .then(done, done.fail);
   });
 
-  it('works with a Tree', done => {
+  it('works with a Tree', (done) => {
     const tree0 = empty();
     const rule0: Rule = () => tree0;
 
     callRule(rule0, observableOf(tree0), context)
       .toPromise()
-      .then(tree => {
+      .then((tree) => {
         expect(tree).toBe(tree0);
       })
       .then(done, done.fail);
   });
 
-  it('works with an Observable', done => {
+  it('works with an Observable', (done) => {
     const tree0 = empty();
     const rule0: Rule = () => observableOf(tree0);
 
     callRule(rule0, observableOf(tree0), context)
       .toPromise()
-      .then(tree => {
+      .then((tree) => {
         expect(tree).toBe(tree0);
       })
       .then(done, done.fail);
diff --git a/packages/angular_devkit/schematics/src/rules/move.ts b/packages/angular_devkit/schematics/src/rules/move.ts
index 211d00f01837..5d115f4e06d8 100644
--- a/packages/angular_devkit/schematics/src/rules/move.ts
+++ b/packages/angular_devkit/schematics/src/rules/move.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 { join, normalize } from '@angular-devkit/core';
 import { Rule } from '../engine/interface';
 import { noop } from './base';
 
-
 export function move(from: string, to?: string): Rule {
   if (to === undefined) {
     to = from;
@@ -23,13 +23,13 @@ export function move(from: string, to?: string): Rule {
     return noop;
   }
 
-  return tree => {
+  return (tree) => {
     if (tree.exists(fromPath)) {
       // fromPath is a file
       tree.rename(fromPath, toPath);
     } else {
       // fromPath is a directory
-      tree.getDir(fromPath).visit(path => {
+      tree.getDir(fromPath).visit((path) => {
         tree.rename(path, join(toPath, path.substr(fromPath.length)));
       });
     }
diff --git a/packages/angular_devkit/schematics/src/rules/move_spec.ts b/packages/angular_devkit/schematics/src/rules/move_spec.ts
index 96bfcc896331..7854eb050b43 100644
--- a/packages/angular_devkit/schematics/src/rules/move_spec.ts
+++ b/packages/angular_devkit/schematics/src/rules/move_spec.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
  */
-// tslint:disable:no-non-null-assertion
+
+/* eslint-disable @typescript-eslint/no-non-null-assertion */
 import { of as observableOf } from 'rxjs';
 import { SchematicContext } from '../engine/interface';
 import { HostTree } from '../tree/host-tree';
 import { callRule } from './call';
 import { move } from './move';
 
-
-const context: SchematicContext = null !;
-
+const context: SchematicContext = null!;
 
 describe('move', () => {
-  it('works on moving the whole structure', done => {
+  it('works on moving the whole structure', (done) => {
     const tree = new HostTree();
     tree.create('a/b/file1', 'hello world');
     tree.create('a/b/file2', 'hello world');
@@ -25,7 +24,7 @@ describe('move', () => {
 
     callRule(move('sub'), observableOf(tree), context)
       .toPromise()
-      .then(result => {
+      .then((result) => {
         expect(result.exists('sub/a/b/file1')).toBe(true);
         expect(result.exists('sub/a/b/file2')).toBe(true);
         expect(result.exists('sub/a/c/file3')).toBe(true);
@@ -33,7 +32,7 @@ describe('move', () => {
       .then(done, done.fail);
   });
 
-  it('works on moving a subdirectory structure', done => {
+  it('works on moving a subdirectory structure', (done) => {
     const tree = new HostTree();
     tree.create('a/b/file1', 'hello world');
     tree.create('a/b/file2', 'hello world');
@@ -41,7 +40,7 @@ describe('move', () => {
 
     callRule(move('a/b', 'sub'), observableOf(tree), context)
       .toPromise()
-      .then(result => {
+      .then((result) => {
         expect(result.exists('sub/file1')).toBe(true);
         expect(result.exists('sub/file2')).toBe(true);
         expect(result.exists('a/c/file3')).toBe(true);
@@ -49,7 +48,7 @@ describe('move', () => {
       .then(done, done.fail);
   });
 
-  it('works on moving a directory into a subdirectory of itself', done => {
+  it('works on moving a directory into a subdirectory of itself', (done) => {
     const tree = new HostTree();
     tree.create('a/b/file1', 'hello world');
     tree.create('a/b/file2', 'hello world');
@@ -57,7 +56,7 @@ describe('move', () => {
 
     callRule(move('a/b', 'a/b/c'), observableOf(tree), context)
       .toPromise()
-      .then(result => {
+      .then((result) => {
         expect(result.exists('a/b/c/file1')).toBe(true);
         expect(result.exists('a/b/c/file2')).toBe(true);
         expect(result.exists('a/c/file3')).toBe(true);
@@ -65,7 +64,7 @@ describe('move', () => {
       .then(done, done.fail);
   });
 
-  it('works on moving a directory into a parent of itself', done => {
+  it('works on moving a directory into a parent of itself', (done) => {
     const tree = new HostTree();
     tree.create('a/b/file1', 'hello world');
     tree.create('a/b/file2', 'hello world');
@@ -73,7 +72,7 @@ describe('move', () => {
 
     callRule(move('a/b', 'a'), observableOf(tree), context)
       .toPromise()
-      .then(result => {
+      .then((result) => {
         expect(result.exists('file1')).toBe(false);
         expect(result.exists('file2')).toBe(false);
         expect(result.exists('a/file1')).toBe(true);
@@ -83,7 +82,7 @@ describe('move', () => {
       .then(done, done.fail);
   });
 
-  it('becomes a noop with identical from and to', done => {
+  it('becomes a noop with identical from and to', (done) => {
     const tree = new HostTree();
     tree.create('a/b/file1', 'hello world');
     tree.create('a/b/file2', 'hello world');
@@ -91,7 +90,7 @@ describe('move', () => {
 
     callRule(move(''), observableOf(tree), context)
       .toPromise()
-      .then(result => {
+      .then((result) => {
         expect(result.exists('a/b/file1')).toBe(true);
         expect(result.exists('a/b/file2')).toBe(true);
         expect(result.exists('a/c/file3')).toBe(true);
diff --git a/packages/angular_devkit/schematics/src/rules/random.ts b/packages/angular_devkit/schematics/src/rules/random.ts
index a2575f57a5b0..13dac8b40a58 100644
--- a/packages/angular_devkit/schematics/src/rules/random.ts
+++ b/packages/angular_devkit/schematics/src/rules/random.ts
@@ -1,41 +1,44 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+
 import { Source } from '../engine/interface';
 import { HostTree } from '../tree/host-tree';
 
-
 function generateStringOfLength(l: number) {
-  return new Array(l).fill(0).map(_x => {
-    return 'abcdefghijklmnopqrstuvwxyz'[Math.floor(Math.random() * 26)];
-  }).join('');
+  return new Array(l)
+    .fill(0)
+    .map((_x) => {
+      return 'abcdefghijklmnopqrstuvwxyz'[Math.floor(Math.random() * 26)];
+    })
+    .join('');
 }
 
-
 function random(from: number, to: number) {
   return Math.floor(Math.random() * (to - from)) + from;
 }
 
-
 export interface RandomOptions {
   root?: string;
   multi?: boolean | number;
   multiFiles?: boolean | number;
 }
 
-
-export default function(options: RandomOptions): Source {
+export default function (options: RandomOptions): Source {
   return () => {
-    const root = ('root' in options) ? options.root : '/';
+    const root = 'root' in options ? options.root : '/';
 
     const map = new HostTree();
-    const nbFiles = ('multiFiles' in options)
-                  ? (typeof options.multiFiles == 'number' ? options.multiFiles : random(2, 12))
-                  : 1;
+    const nbFiles =
+      'multiFiles' in options
+        ? typeof options.multiFiles == 'number'
+          ? options.multiFiles
+          : random(2, 12)
+        : 1;
 
     for (let i = 0; i < nbFiles; i++) {
       const path = 'a/b/c/d/e/f'.slice(Math.random() * 10);
diff --git a/packages/angular_devkit/schematics/src/rules/rename.ts b/packages/angular_devkit/schematics/src/rules/rename.ts
index 2405d5302273..ff04b5580197 100644
--- a/packages/angular_devkit/schematics/src/rules/rename.ts
+++ b/packages/angular_devkit/schematics/src/rules/rename.ts
@@ -1,18 +1,18 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+
 import { normalize } from '@angular-devkit/core';
 import { Rule } from '../engine/interface';
 import { FilePredicate } from '../tree/interface';
 import { forEach } from './base';
 
-
 export function rename(match: FilePredicate<boolean>, to: FilePredicate<string>): Rule {
-  return forEach(entry => {
+  return forEach((entry) => {
     if (match(entry.path, entry)) {
       return {
         content: entry.content,
diff --git a/packages/angular_devkit/schematics/src/rules/rename_spec.ts b/packages/angular_devkit/schematics/src/rules/rename_spec.ts
index c9fdda3cdd4a..1d72125d8326 100644
--- a/packages/angular_devkit/schematics/src/rules/rename_spec.ts
+++ b/packages/angular_devkit/schematics/src/rules/rename_spec.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
  */
-// tslint:disable:no-non-null-assertion
+
+/* eslint-disable @typescript-eslint/no-non-null-assertion */
 import { of as observableOf } from 'rxjs';
 import { SchematicContext } from '../engine/interface';
 import { HostTree } from '../tree/host-tree';
 import { callRule } from './call';
 import { rename } from './rename';
 
-
-const context: SchematicContext = null !;
-
+const context: SchematicContext = null!;
 
 describe('rename', () => {
-  it('works', done => {
+  it('works', (done) => {
     const tree = new HostTree();
     tree.create('a/b/file1', 'hello world');
     tree.create('a/b/file2', 'hello world');
@@ -26,9 +25,16 @@ describe('rename', () => {
     let i = 0;
 
     // Rename all files that contain 'b' to 'hello'.
-    callRule(rename(x => !!x.match(/b/), () => 'hello' + (i++)), observableOf(tree), context)
+    callRule(
+      rename(
+        (x) => !!x.match(/b/),
+        () => 'hello' + i++,
+      ),
+      observableOf(tree),
+      context,
+    )
       .toPromise()
-      .then(result => {
+      .then((result) => {
         expect(result.exists('a/b/file1')).toBe(false);
         expect(result.exists('a/b/file2')).toBe(false);
         expect(result.exists('hello0')).toBe(true);
@@ -38,7 +44,7 @@ describe('rename', () => {
       .then(done, done.fail);
   });
 
-  it('works (2)', done => {
+  it('works (2)', (done) => {
     const tree = new HostTree();
     tree.create('a/b/file1', 'hello world');
     tree.create('a/b/file2', 'hello world');
@@ -47,9 +53,16 @@ describe('rename', () => {
     let i = 0;
 
     // Rename all files that contain 'b' to 'hello'.
-    callRule(rename(x => !!x.match(/b/), x => x + (i++)), observableOf(tree), context)
+    callRule(
+      rename(
+        (x) => !!x.match(/b/),
+        (x) => x + i++,
+      ),
+      observableOf(tree),
+      context,
+    )
       .toPromise()
-      .then(result => {
+      .then((result) => {
         expect(result.exists('a/b/file1')).toBe(false);
         expect(result.exists('a/b/file2')).toBe(false);
         expect(result.exists('a/b/file10')).toBe(true);
diff --git a/packages/angular_devkit/schematics/src/rules/schematic.ts b/packages/angular_devkit/schematics/src/rules/schematic.ts
index 22002c131ff6..f7f2deb75319 100644
--- a/packages/angular_devkit/schematics/src/rules/schematic.ts
+++ b/packages/angular_devkit/schematics/src/rules/schematic.ts
@@ -1,17 +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 { of as observableOf } from 'rxjs';
 import { last, map } from 'rxjs/operators';
 import { ExecutionOptions, Rule, SchematicContext } from '../engine/interface';
 import { MergeStrategy, Tree } from '../tree/interface';
 import { branch } from '../tree/static';
 
-
 /**
  * Run a schematic from a separate collection.
  *
@@ -26,12 +26,15 @@ export function externalSchematic<OptionT extends object>(
   executionOptions?: Partial<ExecutionOptions>,
 ): Rule {
   return (input: Tree, context: SchematicContext) => {
-    const collection = context.engine.createCollection(collectionName, context.schematic.collection);
+    const collection = context.engine.createCollection(
+      collectionName,
+      context.schematic.collection,
+    );
     const schematic = collection.createSchematic(schematicName);
 
     return schematic.call(options, observableOf(branch(input)), context, executionOptions).pipe(
       last(),
-      map(x => {
+      map((x) => {
         input.merge(x, MergeStrategy.AllowOverwriteConflict);
 
         return input;
@@ -40,7 +43,6 @@ export function externalSchematic<OptionT extends object>(
   };
 }
 
-
 /**
  * Run a schematic from the same collection.
  *
@@ -58,7 +60,7 @@ export function schematic<OptionT extends object>(
 
     return schematic.call(options, observableOf(branch(input)), context, executionOptions).pipe(
       last(),
-      map(x => {
+      map((x) => {
         // We allow overwrite conflict here because they're the only merge conflict we particularly
         // don't want to deal with; the input tree might have an OVERWRITE which the sub
         input.merge(x, MergeStrategy.AllowOverwriteConflict);
diff --git a/packages/angular_devkit/schematics/src/rules/template.ts b/packages/angular_devkit/schematics/src/rules/template.ts
index 5b34acf90444..681e6bfe82d6 100644
--- a/packages/angular_devkit/schematics/src/rules/template.ts
+++ b/packages/angular_devkit/schematics/src/rules/template.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 { BaseException, normalize, template as templateImpl } from '@angular-devkit/core';
 import { TextDecoder } from 'util';
 import { FileOperator, Rule } from '../engine/interface';
@@ -12,32 +13,32 @@ import { FileEntry } from '../tree/interface';
 import { chain, composeFileOperators, forEach, when } from './base';
 import { rename } from './rename';
 
-
 export const TEMPLATE_FILENAME_RE = /\.template$/;
 
-
 export class OptionIsNotDefinedException extends BaseException {
-  constructor(name: string) { super(`Option "${name}" is not defined.`); }
+  constructor(name: string) {
+    super(`Option "${name}" is not defined.`);
+  }
 }
 
-
 export class UnknownPipeException extends BaseException {
-  constructor(name: string) { super(`Pipe "${name}" is not defined.`); }
+  constructor(name: string) {
+    super(`Pipe "${name}" is not defined.`);
+  }
 }
 
-
 export class InvalidPipeException extends BaseException {
-  constructor(name: string) { super(`Pipe "${name}" is invalid.`); }
+  constructor(name: string) {
+    super(`Pipe "${name}" is invalid.`);
+  }
 }
 
-
 export type PathTemplateValue = boolean | string | number | undefined;
 export type PathTemplatePipeFunction = (x: string) => PathTemplateValue;
 export type PathTemplateData = {
-  [key: string]: PathTemplateValue | PathTemplateData | PathTemplatePipeFunction,
+  [key: string]: PathTemplateValue | PathTemplateData | PathTemplatePipeFunction;
 };
 
-
 export interface PathTemplateOptions {
   // Interpolation start and end strings.
   interpolationStart: string;
@@ -71,12 +72,10 @@ export function applyContentTemplate<T>(options: T): FileOperator {
   };
 }
 
-
 export function contentTemplate<T>(options: T): Rule {
   return forEach(applyContentTemplate(options));
 }
 
-
 export function applyPathTemplate<T extends PathTemplateData>(
   data: T,
   options: PathTemplateOptions = {
@@ -150,43 +149,39 @@ export function applyPathTemplate<T extends PathTemplateData>(
   };
 }
 
-
 export function pathTemplate<T extends PathTemplateData>(options: T): Rule {
   return forEach(applyPathTemplate(options));
 }
 
-
 /**
  * Remove every `.template` suffix from file names.
  */
 export function renameTemplateFiles(): Rule {
   return rename(
-    path => !!path.match(TEMPLATE_FILENAME_RE),
-    path => path.replace(TEMPLATE_FILENAME_RE, ''),
+    (path) => !!path.match(TEMPLATE_FILENAME_RE),
+    (path) => path.replace(TEMPLATE_FILENAME_RE, ''),
   );
 }
 
-
 export function template<T>(options: T): Rule {
   return chain([
     contentTemplate(options),
     // Force cast to PathTemplateData. We need the type for the actual pathTemplate() call,
     // but in this case we cannot do anything as contentTemplate are more permissive.
     // Since values are coerced to strings in PathTemplates it will be fine in the end.
-    pathTemplate(options as {} as PathTemplateData),
+    pathTemplate((options as {}) as PathTemplateData),
   ]);
 }
 
-
 export function applyTemplates<T>(options: T): Rule {
   return forEach(
     when(
-      path => path.endsWith('.template'),
+      (path) => path.endsWith('.template'),
       composeFileOperators([
         applyContentTemplate(options),
         // See above for this weird cast.
-        applyPathTemplate(options as {} as PathTemplateData),
-        entry => {
+        applyPathTemplate((options as {}) as PathTemplateData),
+        (entry) => {
           return {
             content: entry.content,
             path: entry.path.replace(TEMPLATE_FILENAME_RE, ''),
diff --git a/packages/angular_devkit/schematics/src/rules/template_spec.ts b/packages/angular_devkit/schematics/src/rules/template_spec.ts
index 56e99f9a90dd..2bafab94dd9c 100644
--- a/packages/angular_devkit/schematics/src/rules/template_spec.ts
+++ b/packages/angular_devkit/schematics/src/rules/template_spec.ts
@@ -1,11 +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
  */
-// tslint:disable:no-implicit-dependencies
+
+/* eslint-disable import/no-extraneous-dependencies */
 import { normalize } from '@angular-devkit/core';
 import { UnitTestTree } from '@angular-devkit/schematics/testing';
 import { of as observableOf } from 'rxjs';
@@ -22,7 +23,6 @@ import {
   applyTemplates,
 } from './template';
 
-
 function _entry(path?: string, content?: string): FileEntry {
   if (!path) {
     path = 'a/b/c';
@@ -37,7 +37,6 @@ function _entry(path?: string, content?: string): FileEntry {
   };
 }
 
-
 describe('applyPathTemplate', () => {
   function _applyPathTemplate(path: string, options: {}): string | null {
     const newEntry = applyPathTemplate(options)(_entry(path));
@@ -61,26 +60,29 @@ describe('applyPathTemplate', () => {
   });
 
   it('works with complex _________...', () => {
-    expect(_applyPathTemplate(
-      '/_____' + 'a' + '___a__' + '_/' + '__a___/__b___',
-      { _a: 0, a: 1, b: 2, _: '.' },
-    )).toBe('/.a0_/1_/2_');
-
-    expect(_applyPathTemplate(
-      '_____' + '_____' + '_____' + '___',
-      { _: '.' },
-    )).toBe('...___');
+    expect(
+      _applyPathTemplate('/_____' + 'a' + '___a__' + '_/' + '__a___/__b___', {
+        _a: 0,
+        a: 1,
+        b: 2,
+        _: '.',
+      }),
+    ).toBe('/.a0_/1_/2_');
+
+    expect(_applyPathTemplate('_____' + '_____' + '_____' + '___', { _: '.' })).toBe('...___');
   });
 
   it('works with functions', () => {
     let arg = '';
-    expect(_applyPathTemplate('/a__c__b', {
-      c: (x: string) => {
-        arg = x;
-
-        return 'hello';
-      },
-    })).toBe('/ahellob');
+    expect(
+      _applyPathTemplate('/a__c__b', {
+        c: (x: string) => {
+          arg = x;
+
+          return 'hello';
+        },
+      }),
+    ).toBe('/ahellob');
     expect(arg).toBe('/a__c__b');
   });
 
@@ -88,17 +90,21 @@ describe('applyPathTemplate', () => {
     let called = '';
     let called2 = '';
 
-    expect(_applyPathTemplate('/a__c@d__b', {
-      c: 1,
-      d: (x: string) => (called = x, 2),
-    })).toBe('/a2b');
+    expect(
+      _applyPathTemplate('/a__c@d__b', {
+        c: 1,
+        d: (x: string) => ((called = x), 2),
+      }),
+    ).toBe('/a2b');
     expect(called).toBe('1');
 
-    expect(_applyPathTemplate('/a__c@d@e__b', {
-      c: 10,
-      d: (x: string) => (called = x, 20),
-      e: (x: string) => (called2 = x, 30),
-    })).toBe('/a30b');
+    expect(
+      _applyPathTemplate('/a__c@d@e__b', {
+        c: 10,
+        d: (x: string) => ((called = x), 20),
+        e: (x: string) => ((called2 = x), 30),
+      }),
+    ).toBe('/a30b');
     expect(called).toBe('10');
     expect(called2).toBe('20');
   });
@@ -109,12 +115,12 @@ describe('applyPathTemplate', () => {
 
   it('errors out on undefined or invalid pipes', () => {
     expect(() => _applyPathTemplate('/a__b@d__c', { b: 1 })).toThrow(new UnknownPipeException('d'));
-    expect(() => _applyPathTemplate('/a__b@d__c', { b: 1, d: 1 }))
-      .toThrow(new InvalidPipeException('d'));
+    expect(() => _applyPathTemplate('/a__b@d__c', { b: 1, d: 1 })).toThrow(
+      new InvalidPipeException('d'),
+    );
   });
 });
 
-
 describe('contentTemplate', () => {
   function _applyContentTemplate(content: string, options: {}) {
     const newEntry = applyContentTemplate(options)(_entry('', content));
@@ -130,38 +136,45 @@ describe('contentTemplate', () => {
   });
 
   it('works with if', () => {
-    expect(_applyContentTemplate('a<% if (a) { %>b<% } %>c', {
-      value: 123,
-      a: true,
-    })).toBe('abc');
-    expect(_applyContentTemplate('a<% if (a) { %>b<% } %>c', {
-      value: 123,
-      a: false,
-    })).toBe('ac');
+    expect(
+      _applyContentTemplate('a<% if (a) { %>b<% } %>c', {
+        value: 123,
+        a: true,
+      }),
+    ).toBe('abc');
+    expect(
+      _applyContentTemplate('a<% if (a) { %>b<% } %>c', {
+        value: 123,
+        a: false,
+      }),
+    ).toBe('ac');
   });
 
   it('works with for', () => {
-    expect(_applyContentTemplate('a<% for (let i = 0; i < value; i++) { %>1<% } %>b', {
-      value: 5,
-    })).toBe('a11111b');
+    expect(
+      _applyContentTemplate('a<% for (let i = 0; i < value; i++) { %>1<% } %>b', {
+        value: 5,
+      }),
+    ).toBe('a11111b');
   });
 
   it('escapes HTML', () => {
-    expect(_applyContentTemplate('a<%- html %>b', {
-      html: '<script>',
-    })).toBe('a&lt;script&gt;b');
+    expect(
+      _applyContentTemplate('a<%- html %>b', {
+        html: '<script>',
+      }),
+    ).toBe('a&lt;script&gt;b');
   });
 
   it('escapes strings properly', () => {
-    expect(_applyContentTemplate('a<%= value %>b', { value: `'abc'` })).toBe('a\'abc\'b');
+    expect(_applyContentTemplate('a<%= value %>b', { value: `'abc'` })).toBe("a'abc'b");
     expect(_applyContentTemplate('a<%= \'a\' + "b" %>b', {})).toBe('aabb');
     expect(_applyContentTemplate('a<%= "\\n" + "b" %>b', {})).toBe('a\nbb');
   });
 });
 
-
 describe('applyTemplateFiles', () => {
-  it('works with template files exclusively', done => {
+  it('works with template files exclusively', (done) => {
     const tree = new UnitTestTree(new HostTree());
     tree.create('a/b/file1', 'hello world');
     tree.create('a/b/file2', 'hello world');
diff --git a/packages/angular_devkit/schematics/src/rules/url.ts b/packages/angular_devkit/schematics/src/rules/url.ts
index 027bf62a4f90..78f02c67d51d 100644
--- a/packages/angular_devkit/schematics/src/rules/url.ts
+++ b/packages/angular_devkit/schematics/src/rules/url.ts
@@ -1,14 +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 { parse } from 'url';
 import { SchematicContext, Source } from '../engine/interface';
 
-
 export function url(urlString: string): Source {
   const url = parse(urlString);
 
diff --git a/packages/angular_devkit/schematics/src/sink/dryrun.ts b/packages/angular_devkit/schematics/src/sink/dryrun.ts
index b17ddff12aa9..33799f2ddf2c 100644
--- a/packages/angular_devkit/schematics/src/sink/dryrun.ts
+++ b/packages/angular_devkit/schematics/src/sink/dryrun.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
  */
+
 import { normalize, virtualFs } from '@angular-devkit/core';
 import { NodeJsSyncHost } from '@angular-devkit/core/node';
 import { Observable, Subject, of } from 'rxjs';
 import { HostSink } from './host';
 
-
 export interface DryRunErrorEvent {
   kind: 'error';
   description: 'alreadyExist' | 'doesNotExist';
@@ -36,12 +36,12 @@ export interface DryRunRenameEvent {
   to: string;
 }
 
-export type DryRunEvent = DryRunErrorEvent
-                        | DryRunDeleteEvent
-                        | DryRunCreateEvent
-                        | DryRunUpdateEvent
-                        | DryRunRenameEvent;
-
+export type DryRunEvent =
+  | DryRunErrorEvent
+  | DryRunDeleteEvent
+  | DryRunCreateEvent
+  | DryRunUpdateEvent
+  | DryRunRenameEvent;
 
 export class DryRunSink extends HostSink {
   protected _subject = new Subject<DryRunEvent>();
@@ -57,29 +57,30 @@ export class DryRunSink extends HostSink {
   constructor(host: virtualFs.Host, force?: boolean);
 
   constructor(host: virtualFs.Host | string, force = false) {
-    super(typeof host == 'string'
-      ? new virtualFs.ScopedHost(new NodeJsSyncHost(), normalize(host))
-      : host,
+    super(
+      typeof host == 'string'
+        ? new virtualFs.ScopedHost(new NodeJsSyncHost(), normalize(host))
+        : host,
       force,
     );
   }
 
-  protected _fileAlreadyExistException(path: string): void {
+  protected override _fileAlreadyExistException(path: string): void {
     this._fileAlreadyExistExceptionSet.add(path);
   }
-  protected _fileDoesNotExistException(path: string): void {
+  protected override _fileDoesNotExistException(path: string): void {
     this._fileDoesNotExistExceptionSet.add(path);
   }
 
-  _done() {
-    this._fileAlreadyExistExceptionSet.forEach(path => {
+  override _done() {
+    this._fileAlreadyExistExceptionSet.forEach((path) => {
       this._subject.next({
         kind: 'error',
         description: 'alreadyExist',
         path,
       });
     });
-    this._fileDoesNotExistExceptionSet.forEach(path => {
+    this._fileDoesNotExistExceptionSet.forEach((path) => {
       this._subject.next({
         kind: 'error',
         description: 'doesNotExist',
@@ -87,7 +88,7 @@ export class DryRunSink extends HostSink {
       });
     });
 
-    this._filesToDelete.forEach(path => {
+    this._filesToDelete.forEach((path) => {
       // Check if this is a renaming.
       for (const [from] of this._filesToRename) {
         if (from == path) {
@@ -109,8 +110,10 @@ export class DryRunSink extends HostSink {
           return;
         }
       }
-      if (this._fileAlreadyExistExceptionSet.has(path)
-          || this._fileDoesNotExistExceptionSet.has(path)) {
+      if (
+        this._fileAlreadyExistExceptionSet.has(path) ||
+        this._fileDoesNotExistExceptionSet.has(path)
+      ) {
         return;
       }
 
diff --git a/packages/angular_devkit/schematics/src/sink/dryrun_spec.ts b/packages/angular_devkit/schematics/src/sink/dryrun_spec.ts
index 9f624137865e..7766a2e5d1c7 100644
--- a/packages/angular_devkit/schematics/src/sink/dryrun_spec.ts
+++ b/packages/angular_devkit/schematics/src/sink/dryrun_spec.ts
@@ -1,26 +1,24 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use 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 { Path, normalize, virtualFs } from '@angular-devkit/core';
 import { toArray } from 'rxjs/operators';
 import { HostCreateTree, HostTree } from '../tree/host-tree';
 import { DryRunSink } from './dryrun';
 
-
 const host = new virtualFs.test.TestHost({
   '/hello': '',
   '/sub/file1': '',
   '/sub/directory/file2': '',
 });
 
-
 describe('DryRunSink', () => {
-  it('works when creating everything', done => {
+  it('works when creating everything', (done) => {
     const tree = new HostCreateTree(host);
 
     tree.create('/test', 'testing 1 2');
@@ -31,14 +29,15 @@ describe('DryRunSink', () => {
 
     const files = ['/hello', '/sub/directory/file2', '/sub/file1', '/test'];
     const treeFiles: Path[] = [];
-    tree.visit(path => treeFiles.push(path));
+    tree.visit((path) => treeFiles.push(path));
     treeFiles.sort();
     expect(treeFiles).toEqual(files.map(normalize));
 
     const sink = new DryRunSink(new virtualFs.SimpleMemoryHost());
-    sink.reporter.pipe(toArray())
+    sink.reporter
+      .pipe(toArray())
       .toPromise()
-      .then(infos => {
+      .then((infos) => {
         expect(infos.length).toBe(4);
         for (const info of infos) {
           expect(info.kind).toBe('create');
@@ -46,11 +45,10 @@ describe('DryRunSink', () => {
       })
       .then(done, done.fail);
 
-    sink.commit(tree)
-      .toPromise().then(done, done.fail);
+    sink.commit(tree).toPromise().then(done, done.fail);
   });
 
-  it('works with root', done => {
+  it('works with root', (done) => {
     const tree = new HostTree(host);
 
     tree.create('/test', 'testing 1 2');
@@ -61,7 +59,7 @@ describe('DryRunSink', () => {
 
     const files = ['/hello', '/sub/directory/file2', '/sub/file1', '/test'];
     const treeFiles: Path[] = [];
-    tree.visit(path => treeFiles.push(path));
+    tree.visit((path) => treeFiles.push(path));
     treeFiles.sort();
     expect(treeFiles).toEqual(files.map(normalize));
 
@@ -70,14 +68,14 @@ describe('DryRunSink', () => {
     outputHost.write(normalize('/hello'), virtualFs.stringToFileBuffer('')).subscribe();
 
     const sink = new DryRunSink(outputHost);
-    sink.reporter.pipe(toArray())
+    sink.reporter
+      .pipe(toArray())
       .toPromise()
-      .then(infos => {
-        expect(infos.map(x => x.kind)).toEqual(['create', 'update']);
+      .then((infos) => {
+        expect(infos.map((x) => x.kind)).toEqual(['create', 'update']);
       })
       .then(done, done.fail);
 
-    sink.commit(tree)
-      .toPromise().then(done, done.fail);
+    sink.commit(tree).toPromise().then(done, done.fail);
   });
 });
diff --git a/packages/angular_devkit/schematics/src/sink/host.ts b/packages/angular_devkit/schematics/src/sink/host.ts
index aa498ea2a60a..970156211bdd 100644
--- a/packages/angular_devkit/schematics/src/sink/host.ts
+++ b/packages/angular_devkit/schematics/src/sink/host.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 { Path, virtualFs } from '@angular-devkit/core';
 import {
   EMPTY,
@@ -18,29 +19,39 @@ import { CreateFileAction } from '../tree/action';
 import { UpdateBuffer } from '../utility/update-buffer';
 import { SimpleSinkBase } from './sink';
 
-
 export class HostSink extends SimpleSinkBase {
   protected _filesToDelete = new Set<Path>();
   protected _filesToRename = new Set<[Path, Path]>();
   protected _filesToCreate = new Map<Path, UpdateBuffer>();
   protected _filesToUpdate = new Map<Path, UpdateBuffer>();
 
-  constructor(protected _host: virtualFs.Host, protected _force = false) { super(); }
+  constructor(protected _host: virtualFs.Host, protected _force = false) {
+    super();
+  }
 
-  protected _validateCreateAction(action: CreateFileAction): Observable<void> {
+  protected override _validateCreateAction(action: CreateFileAction): Observable<void> {
     return this._force ? EMPTY : super._validateCreateAction(action);
   }
 
   protected _validateFileExists(p: Path): Observable<boolean> {
     if (this._filesToCreate.has(p) || this._filesToUpdate.has(p)) {
       return observableOf(true);
-    } else if (this._filesToDelete.has(p)) {
-      return observableOf(false);
-    } else if ([...this._filesToRename.values()].some(([from]) => from == p)) {
+    }
+
+    if (this._filesToDelete.has(p)) {
       return observableOf(false);
-    } else {
-      return this._host.exists(p);
     }
+
+    for (const [from, to] of this._filesToRename.values()) {
+      switch (p) {
+        case from:
+          return observableOf(false);
+        case to:
+          return observableOf(true);
+      }
+    }
+
+    return this._host.exists(p);
   }
 
   protected _overwriteFile(path: Path, content: Buffer): Observable<void> {
@@ -73,7 +84,7 @@ export class HostSink extends SimpleSinkBase {
     // Really commit everything to the actual filesystem.
     return concatObservables(
       observableFrom([...this._filesToDelete.values()]).pipe(
-        concatMap(path => this._host.delete(path)),
+        concatMap((path) => this._host.delete(path)),
       ),
       observableFrom([...this._filesToRename.entries()]).pipe(
         concatMap(([_, [path, to]]) => this._host.rename(path, to)),
@@ -81,11 +92,13 @@ export class HostSink extends SimpleSinkBase {
       observableFrom([...this._filesToCreate.entries()]).pipe(
         concatMap(([path, buffer]) => {
           return this._host.write(path, buffer.generate() as {} as virtualFs.FileBuffer);
-        })),
+        }),
+      ),
       observableFrom([...this._filesToUpdate.entries()]).pipe(
         concatMap(([path, buffer]) => {
           return this._host.write(path, buffer.generate() as {} as virtualFs.FileBuffer);
-        })),
+        }),
+      ),
     ).pipe(reduce(() => {}));
   }
 }
diff --git a/packages/angular_devkit/schematics/src/sink/host_spec.ts b/packages/angular_devkit/schematics/src/sink/host_spec.ts
index 8ad2ef8c8cbb..a5dc5e057431 100644
--- a/packages/angular_devkit/schematics/src/sink/host_spec.ts
+++ b/packages/angular_devkit/schematics/src/sink/host_spec.ts
@@ -1,18 +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
  */
-// tslint:disable:no-implicit-dependencies
+
 import { normalize, virtualFs } from '@angular-devkit/core';
 import { HostSink } from '@angular-devkit/schematics';
 import { HostCreateTree, HostTree } from '../tree/host-tree';
 
-
 describe('FileSystemSink', () => {
-  it('works', done => {
+  it('works', (done) => {
     const host = new virtualFs.test.TestHost({
       '/hello': 'world',
       '/sub/directory/file2': '',
@@ -27,25 +26,25 @@ describe('FileSystemSink', () => {
 
     const files = ['/hello', '/sub/directory/file2', '/sub/file1', '/test'];
     const treeFiles: string[] = [];
-    tree.visit(path => treeFiles.push(path));
+    tree.visit((path) => treeFiles.push(path));
     treeFiles.sort();
     expect(treeFiles).toEqual(files);
 
     const outputHost = new virtualFs.test.TestHost();
     const sink = new HostSink(outputHost);
-    sink.commit(tree)
-        .toPromise()
-        .then(() => {
-          const tmpFiles = outputHost.files.sort();
-          expect(tmpFiles as string[]).toEqual(files);
-          expect(outputHost.sync.read(normalize('/test')).toString())
-            .toBe('testing testing 1 2');
-        })
-        .then(done, done.fail);
+    sink
+      .commit(tree)
+      .toPromise()
+      .then(() => {
+        const tmpFiles = outputHost.files.sort();
+        expect(tmpFiles as string[]).toEqual(files);
+        expect(outputHost.sync.read(normalize('/test')).toString()).toBe('testing testing 1 2');
+      })
+      .then(done, done.fail);
   });
 
   describe('complex tests', () => {
-    beforeEach(done => {
+    beforeEach((done) => {
       // Commit a version of the tree.
       const host = new virtualFs.test.TestHost({
         '/file0': '/file0',
@@ -56,12 +55,10 @@ describe('FileSystemSink', () => {
 
       const outputHost = new virtualFs.test.TestHost();
       const sink = new HostSink(outputHost);
-      sink.commit(tree)
-          .toPromise()
-          .then(done, done.fail);
+      sink.commit(tree).toPromise().then(done, done.fail);
     });
 
-    it('can rename files', done => {
+    it('can rename files', (done) => {
       const host = new virtualFs.test.TestHost({
         '/file0': '/file0',
       });
@@ -69,17 +66,17 @@ describe('FileSystemSink', () => {
       tree.rename('/file0', '/file1');
 
       const sink = new HostSink(host);
-      sink.commit(tree)
-          .toPromise()
-          .then(() => {
-            expect(host.sync.exists(normalize('/file0'))).toBe(false);
-            expect(host.sync.exists(normalize('/file1'))).toBe(true);
-          })
-          .then(done, done.fail);
+      sink
+        .commit(tree)
+        .toPromise()
+        .then(() => {
+          expect(host.sync.exists(normalize('/file0'))).toBe(false);
+          expect(host.sync.exists(normalize('/file1'))).toBe(true);
+        })
+        .then(done, done.fail);
     });
 
-
-    it('can rename nested files', done => {
+    it('can rename nested files', (done) => {
       const host = new virtualFs.test.TestHost({
         '/sub/directory/file2': '',
       });
@@ -87,16 +84,17 @@ describe('FileSystemSink', () => {
       tree.rename('/sub/directory/file2', '/another-directory/file2');
 
       const sink = new HostSink(host);
-      sink.commit(tree)
-          .toPromise()
-          .then(() => {
-            expect(host.sync.exists(normalize('/sub/directory/file2'))).toBe(false);
-            expect(host.sync.exists(normalize('/another-directory/file2'))).toBe(true);
-          })
-          .then(done, done.fail);
+      sink
+        .commit(tree)
+        .toPromise()
+        .then(() => {
+          expect(host.sync.exists(normalize('/sub/directory/file2'))).toBe(false);
+          expect(host.sync.exists(normalize('/another-directory/file2'))).toBe(true);
+        })
+        .then(done, done.fail);
     });
 
-    it('can delete and create the same file', done => {
+    it('can delete and create the same file', (done) => {
       const host = new virtualFs.test.TestHost({
         '/file0': 'world',
       });
@@ -105,15 +103,16 @@ describe('FileSystemSink', () => {
       tree.create('/file0', 'hello');
 
       const sink = new HostSink(host);
-      sink.commit(tree)
-          .toPromise()
-          .then(() => {
-            expect(host.sync.read(normalize('/file0')).toString()).toBe('hello');
-          })
-          .then(done, done.fail);
+      sink
+        .commit(tree)
+        .toPromise()
+        .then(() => {
+          expect(host.sync.read(normalize('/file0')).toString()).toBe('hello');
+        })
+        .then(done, done.fail);
     });
 
-    it('can rename then create the same file', done => {
+    it('can rename then create the same file', (done) => {
       const host = new virtualFs.test.TestHost({
         '/file0': 'world',
       });
@@ -127,13 +126,31 @@ describe('FileSystemSink', () => {
       expect(tree.exists('/file0')).toBeTruthy();
 
       const sink = new HostSink(host);
-      sink.commit(tree)
-          .toPromise()
-          .then(() => {
-            expect(host.sync.read(normalize('/file0')).toString()).toBe('hello');
-            expect(virtualFs.fileBufferToString(host.sync.read(normalize('/file1')))).toBe('world');
-          })
-          .then(done, done.fail);
+      sink
+        .commit(tree)
+        .toPromise()
+        .then(() => {
+          expect(host.sync.read(normalize('/file0')).toString()).toBe('hello');
+          expect(virtualFs.fileBufferToString(host.sync.read(normalize('/file1')))).toBe('world');
+        })
+        .then(done, done.fail);
+    });
+
+    it('can rename then modify the same file', async () => {
+      const host = new virtualFs.test.TestHost({
+        '/file0': 'world',
+      });
+      const tree = new HostTree(host);
+
+      tree.rename('/file0', '/file1');
+      expect(tree.exists('/file0')).toBeFalsy();
+      expect(tree.exists('/file1')).toBeTruthy();
+
+      tree.overwrite('/file1', 'hello');
+
+      const sink = new HostSink(host);
+      await sink.commit(tree).toPromise();
+      expect(virtualFs.fileBufferToString(host.sync.read(normalize('/file1')))).toBe('hello');
     });
   });
 });
diff --git a/packages/angular_devkit/schematics/src/sink/sink.ts b/packages/angular_devkit/schematics/src/sink/sink.ts
index fe0c2d5adff6..2d02c6d9dc88 100644
--- a/packages/angular_devkit/schematics/src/sink/sink.ts
+++ b/packages/angular_devkit/schematics/src/sink/sink.ts
@@ -1,24 +1,20 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+
 import {
   Observable,
   concat,
   defer as deferObservable,
-  from as observableFrom,
   isObservable,
+  from as observableFrom,
   of as observableOf,
 } from 'rxjs';
-import {
-  concatMap,
-  ignoreElements,
-  map,
-  mergeMap,
-} from 'rxjs/operators';
+import { concatMap, ignoreElements, map, mergeMap } from 'rxjs/operators';
 import { FileAlreadyExistException, FileDoesNotExistException } from '../exception/exception';
 import {
   Action,
@@ -30,20 +26,16 @@ import {
 } from '../tree/action';
 import { Tree } from '../tree/interface';
 
-
 export interface Sink {
   commit(tree: Tree): Observable<void>;
 }
 
-
-const Noop = function() {};
-
+const Noop = function () {};
 
 export abstract class SimpleSinkBase implements Sink {
-  preCommitAction: (action: Action) => void
-                                     | Action
-                                     | PromiseLike<Action>
-                                     | Observable<Action> = Noop;
+  preCommitAction: (
+    action: Action,
+  ) => void | Action | PromiseLike<Action> | Observable<Action> = Noop;
   postCommitAction: (action: Action) => void | Observable<void> = Noop;
   preCommit: () => void | Observable<void> = Noop;
   postCommit: () => void | Observable<void> = Noop;
@@ -65,44 +57,81 @@ export abstract class SimpleSinkBase implements Sink {
   }
 
   protected _validateOverwriteAction(action: OverwriteFileAction): Observable<void> {
-    return this._validateFileExists(action.path)
-      .pipe(map(b => { if (!b) { this._fileDoesNotExistException(action.path); } }));
+    return this._validateFileExists(action.path).pipe(
+      map((b) => {
+        if (!b) {
+          this._fileDoesNotExistException(action.path);
+        }
+      }),
+    );
   }
   protected _validateCreateAction(action: CreateFileAction): Observable<void> {
-    return this._validateFileExists(action.path)
-      .pipe(map(b => { if (b) { this._fileAlreadyExistException(action.path); } }));
+    return this._validateFileExists(action.path).pipe(
+      map((b) => {
+        if (b) {
+          this._fileAlreadyExistException(action.path);
+        }
+      }),
+    );
   }
   protected _validateRenameAction(action: RenameFileAction): Observable<void> {
     return this._validateFileExists(action.path).pipe(
-      map(b => { if (!b) { this._fileDoesNotExistException(action.path); } }),
+      map((b) => {
+        if (!b) {
+          this._fileDoesNotExistException(action.path);
+        }
+      }),
       mergeMap(() => this._validateFileExists(action.to)),
-      map(b => { if (b) { this._fileAlreadyExistException(action.to); } }));
+      map((b) => {
+        if (b) {
+          this._fileAlreadyExistException(action.to);
+        }
+      }),
+    );
   }
   protected _validateDeleteAction(action: DeleteFileAction): Observable<void> {
-    return this._validateFileExists(action.path)
-      .pipe(map(b => { if (!b) { this._fileDoesNotExistException(action.path); } }));
+    return this._validateFileExists(action.path).pipe(
+      map((b) => {
+        if (!b) {
+          this._fileDoesNotExistException(action.path);
+        }
+      }),
+    );
   }
 
   validateSingleAction(action: Action): Observable<void> {
     switch (action.kind) {
-      case 'o': return this._validateOverwriteAction(action);
-      case 'c': return this._validateCreateAction(action);
-      case 'r': return this._validateRenameAction(action);
-      case 'd': return this._validateDeleteAction(action);
-      default: throw new UnknownActionException(action);
+      case 'o':
+        return this._validateOverwriteAction(action);
+      case 'c':
+        return this._validateCreateAction(action);
+      case 'r':
+        return this._validateRenameAction(action);
+      case 'd':
+        return this._validateDeleteAction(action);
+      default:
+        throw new UnknownActionException(action);
     }
   }
 
   commitSingleAction(action: Action): Observable<void> {
     return concat(
       this.validateSingleAction(action),
-      new Observable<void>(observer => {
+      new Observable<void>((observer) => {
         let committed = null;
         switch (action.kind) {
-          case 'o': committed = this._overwriteFile(action.path, action.content); break;
-          case 'c': committed = this._createFile(action.path, action.content); break;
-          case 'r': committed = this._renameFile(action.path, action.to); break;
-          case 'd': committed = this._deleteFile(action.path); break;
+          case 'o':
+            committed = this._overwriteFile(action.path, action.content);
+            break;
+          case 'c':
+            committed = this._createFile(action.path, action.content);
+            break;
+          case 'r':
+            committed = this._renameFile(action.path, action.to);
+            break;
+          case 'd':
+            committed = this._deleteFile(action.path);
+            break;
         }
 
         if (committed) {
@@ -118,9 +147,9 @@ export abstract class SimpleSinkBase implements Sink {
     const actions = observableFrom(tree.actions);
 
     return concat(
-      (this.preCommit() || observableOf(null)),
+      this.preCommit() || observableOf(null),
       deferObservable(() => actions).pipe(
-        concatMap(action => {
+        concatMap((action) => {
           const maybeAction = this.preCommitAction(action);
 
           if (isObservable(maybeAction) || isPromiseLike(maybeAction)) {
@@ -129,13 +158,13 @@ export abstract class SimpleSinkBase implements Sink {
 
           return observableOf(maybeAction || action);
         }),
-        concatMap(action => {
+        concatMap((action) => {
           return concat(
             this.commitSingleAction(action).pipe(ignoreElements()),
             observableOf(action),
           );
         }),
-        concatMap(action => this.postCommitAction(action) || observableOf(null)),
+        concatMap((action) => this.postCommitAction(action) || observableOf(null)),
       ),
       deferObservable(() => this._done()),
       deferObservable(() => this.postCommit() || observableOf(null)),
diff --git a/packages/angular_devkit/schematics/src/tree/action.ts b/packages/angular_devkit/schematics/src/tree/action.ts
index 30dace1305db..0b2084d33c82 100644
--- a/packages/angular_devkit/schematics/src/tree/action.ts
+++ b/packages/angular_devkit/schematics/src/tree/action.ts
@@ -1,23 +1,20 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of 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, Path } from '@angular-devkit/core';
 
+import { BaseException, Path } from '@angular-devkit/core';
 
 export class UnknownActionException extends BaseException {
-  constructor(action: Action) { super(`Unknown action: "${action.kind}".`); }
+  constructor(action: Action) {
+    super(`Unknown action: "${action.kind}".`);
+  }
 }
 
-
-export type Action = CreateFileAction
-                   | OverwriteFileAction
-                   | RenameFileAction
-                   | DeleteFileAction;
-
+export type Action = CreateFileAction | OverwriteFileAction | RenameFileAction | DeleteFileAction;
 
 export interface ActionBase {
   readonly id: number;
@@ -25,7 +22,6 @@ export interface ActionBase {
   readonly path: Path;
 }
 
-
 let _id = 1;
 
 export class ActionList implements Iterable<Action> {
@@ -33,7 +29,7 @@ export class ActionList implements Iterable<Action> {
 
   protected _action(action: Partial<Action>) {
     this._actions.push({
-      ...action as Action,
+      ...(action as Action),
       id: _id++,
       parent: this._actions[this._actions.length - 1]?.id ?? 0,
     });
@@ -52,7 +48,6 @@ export class ActionList implements Iterable<Action> {
     this._action({ kind: 'd', path });
   }
 
-
   optimize() {
     const toCreate = new Map<Path, Buffer>();
     const toRename = new Map<Path, Path>();
@@ -109,7 +104,7 @@ export class ActionList implements Iterable<Action> {
     }
 
     this._actions = [];
-    toDelete.forEach(x => {
+    toDelete.forEach((x) => {
       this.delete(x);
     });
 
@@ -126,8 +121,12 @@ export class ActionList implements Iterable<Action> {
     });
   }
 
-  push(action: Action) { this._actions.push(action); }
-  get(i: number) { return this._actions[i]; }
+  push(action: Action) {
+    this._actions.push(action);
+  }
+  get(i: number) {
+    return this._actions[i];
+  }
   has(action: Action) {
     for (let i = 0; i < this._actions.length; i++) {
       const a = this._actions[i];
@@ -147,11 +146,14 @@ export class ActionList implements Iterable<Action> {
   forEach(fn: (value: Action, index: number, array: Action[]) => void, thisArg?: {}) {
     this._actions.forEach(fn, thisArg);
   }
-  get length() { return this._actions.length; }
-  [Symbol.iterator]() { return this._actions[Symbol.iterator](); }
+  get length() {
+    return this._actions.length;
+  }
+  [Symbol.iterator]() {
+    return this._actions[Symbol.iterator]();
+  }
 }
 
-
 export function isContentAction(action: Action): action is CreateFileAction | OverwriteFileAction {
   return action.kind == 'c' || action.kind == 'o';
 }
@@ -159,16 +161,18 @@ export function isContentAction(action: Action): action is CreateFileAction | Ov
 /**
  * @deprecated since version 11.0. not used anymore can be removed in future version.
  */
-export function isAction(action: any): action is Action {  // tslint:disable-line:no-any
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+export function isAction(action: any): action is Action {
   const kind = action && action.kind;
 
-  return action !== null
-      && typeof action.id == 'number'
-      && typeof action.path == 'string'
-      && (kind == 'c' || kind == 'o' || kind == 'r' || kind == 'd');
+  return (
+    action !== null &&
+    typeof action.id == 'number' &&
+    typeof action.path == 'string' &&
+    (kind == 'c' || kind == 'o' || kind == 'r' || kind == 'd')
+  );
 }
 
-
 // Create a file. If the file already exists then this is an error.
 export interface CreateFileAction extends ActionBase {
   readonly kind: 'c';
diff --git a/packages/angular_devkit/schematics/src/tree/action_spec.ts b/packages/angular_devkit/schematics/src/tree/action_spec.ts
index 20c76278a026..21fcb3ef2f3b 100644
--- a/packages/angular_devkit/schematics/src/tree/action_spec.ts
+++ b/packages/angular_devkit/schematics/src/tree/action_spec.ts
@@ -1,17 +1,18 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+
 import { normalize } from '@angular-devkit/core';
 import { Action, ActionList } from './action';
 
 describe('Action', () => {
   describe('optimize', () => {
     it('works with create', () => {
-      const actions = new ActionList;
+      const actions = new ActionList();
 
       actions.create(normalize('/a/b'), Buffer.from('1'));
       actions.create(normalize('/a/c'), Buffer.from('2'));
@@ -22,7 +23,7 @@ describe('Action', () => {
       expect(actions.length).toBe(2);
     });
     it('works with overwrite', () => {
-      const actions = new ActionList;
+      const actions = new ActionList();
 
       actions.create(normalize('/a/b'), Buffer.from('1'));
       actions.create(normalize('/a/c'), Buffer.from('2'));
@@ -35,7 +36,7 @@ describe('Action', () => {
     });
 
     it('works with cloning a list', () => {
-      const actions = new ActionList;
+      const actions = new ActionList();
 
       actions.create(normalize('/a/b'), Buffer.from('1'));
       actions.create(normalize('/a/c'), Buffer.from('2'));
@@ -43,8 +44,8 @@ describe('Action', () => {
       actions.overwrite(normalize('/a/b'), Buffer.from('4'));
       actions.create(normalize('/a/d'), Buffer.from('5'));
 
-      const actions2 = new ActionList;
-      actions.forEach(x => actions2.push(x));
+      const actions2 = new ActionList();
+      actions.forEach((x) => actions2.push(x));
 
       expect(actions.length).toBe(5);
       expect(actions2.length).toBe(5);
@@ -56,15 +57,15 @@ describe('Action', () => {
     });
 
     it('handles edge cases (1)', () => {
-      const actions = new ActionList;
+      const actions = new ActionList();
 
       actions.create(normalize('/test'), Buffer.from('1'));
       actions.overwrite(normalize('/test'), Buffer.from('3'));
       actions.overwrite(normalize('/hello'), Buffer.from('2'));
       actions.overwrite(normalize('/test'), Buffer.from('4'));
 
-      const actions2 = new ActionList;
-      actions.forEach(x => actions2.push(x));
+      const actions2 = new ActionList();
+      actions.forEach((x) => actions2.push(x));
 
       expect(actions.length).toBe(4);
       expect(actions2.length).toBe(4);
@@ -76,7 +77,7 @@ describe('Action', () => {
     });
 
     it('handles edge cases (2)', () => {
-      const actions = new ActionList;
+      const actions = new ActionList();
 
       actions.create(normalize('/test'), Buffer.from('1'));
       actions.rename(normalize('/test'), normalize('/test1'));
@@ -91,7 +92,7 @@ describe('Action', () => {
     });
 
     it('handles edge cases (3)', () => {
-      const actions = new ActionList;
+      const actions = new ActionList();
 
       actions.rename(normalize('/test'), normalize('/test1'));
       actions.overwrite(normalize('/test1'), Buffer.from('2'));
@@ -99,11 +100,15 @@ describe('Action', () => {
 
       actions.optimize();
       expect(actions.length).toBe(2);
-      expect(actions.get(0)).toEqual(jasmine.objectContaining<Action>({
-        kind: 'r', path: normalize('/test'), to: normalize('/test2'),
-      }));
+      expect(actions.get(0)).toEqual(
+        jasmine.objectContaining<Action>({
+          kind: 'r',
+          path: normalize('/test'),
+          to: normalize('/test2'),
+        }),
+      );
       expect(actions.get(1)).toEqual(
-        jasmine.objectContaining<Action>({kind: 'o', path: normalize('/test2') }),
+        jasmine.objectContaining<Action>({ kind: 'o', path: normalize('/test2') }),
       );
     });
   });
diff --git a/packages/angular_devkit/schematics/src/tree/common_spec.ts b/packages/angular_devkit/schematics/src/tree/common_spec.ts
index 141a744a24a6..2e2ae83d082c 100644
--- a/packages/angular_devkit/schematics/src/tree/common_spec.ts
+++ b/packages/angular_devkit/schematics/src/tree/common_spec.ts
@@ -1,19 +1,18 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-// tslint:disable:no-non-null-assertion
+
 import { normalize } from '@angular-devkit/core';
 import { Tree } from './interface';
 
-
 export interface VisitTestVisitSpec {
   root: string;
   expected?: string[];
-  exception?: (spec: {path: string}) => Error;
+  exception?: (spec: { path: string }) => Error;
   focus?: boolean;
 }
 
@@ -29,10 +28,12 @@ export interface VisitTestSpec {
   sets: VisitTestSet[];
 }
 
-export function testTreeVisit({createTree, sets}: VisitTestSpec) {
-  sets.forEach(({name, files: paths, visits, focus: focusSet}) => {
-    visits.forEach(({root, expected, exception, focus}) => {
-      if (expected == null) { expected = paths; }
+export function testTreeVisit({ createTree, sets }: VisitTestSpec) {
+  sets.forEach(({ name, files: paths, visits, focus: focusSet }) => {
+    visits.forEach(({ root, expected, exception, focus }) => {
+      if (expected == null) {
+        expected = paths;
+      }
 
       const that = focusSet || focus ? fit : it;
       that(`can visit: ${name} from ${root}`, () => {
@@ -41,20 +42,23 @@ export function testTreeVisit({createTree, sets}: VisitTestSpec) {
         const normalizedRoot = normalize(root);
 
         if (exception != null) {
-          expect(() => tree.getDir(normalizedRoot).visit(() => {}))
-          .toThrow(exception({path: normalizedRoot}));
+          // eslint-disable-next-line @typescript-eslint/no-empty-function
+          expect(() => tree.getDir(normalizedRoot).visit(() => {})).toThrow(
+            exception({ path: normalizedRoot }),
+          );
 
           return;
         }
 
         const allPaths: string[] = [];
-        tree.getDir(normalizedRoot)
-          .visit((path, entry) => {
-            expect(entry).not.toBeNull();
-            expect(entry!.content.toString()).toEqual(path);
-            allPaths.push(path);
-          });
+        tree.getDir(normalizedRoot).visit((path, entry) => {
+          expect(entry).not.toBeNull();
+          // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+          expect(entry!.content.toString()).toEqual(path);
+          allPaths.push(path);
+        });
 
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         expect(allPaths).toEqual(expected!);
       });
     });
diff --git a/packages/angular_devkit/schematics/src/tree/delegate.ts b/packages/angular_devkit/schematics/src/tree/delegate.ts
index 5e51ac7b1547..147997964d59 100644
--- a/packages/angular_devkit/schematics/src/tree/delegate.ts
+++ b/packages/angular_devkit/schematics/src/tree/delegate.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 { Action } from './action';
 import {
   DirEntry,
@@ -19,36 +20,62 @@ import {
 export class DelegateTree implements Tree {
   constructor(protected _other: Tree) {}
 
-  branch(): Tree { return this._other.branch(); }
-  merge(other: Tree, strategy?: MergeStrategy): void { this._other.merge(other, strategy); }
+  branch(): Tree {
+    return this._other.branch();
+  }
+  merge(other: Tree, strategy?: MergeStrategy): void {
+    this._other.merge(other, strategy);
+  }
 
-  get root(): DirEntry { return this._other.root; }
+  get root(): DirEntry {
+    return this._other.root;
+  }
 
   // Readonly.
-  read(path: string): Buffer | null { return this._other.read(path); }
-  exists(path: string): boolean { return this._other.exists(path); }
-  get(path: string): FileEntry | null { return this._other.get(path); }
-  getDir(path: string): DirEntry { return this._other.getDir(path); }
-  visit(visitor: FileVisitor): void { return this._other.visit(visitor); }
+  read(path: string): Buffer | null {
+    return this._other.read(path);
+  }
+  exists(path: string): boolean {
+    return this._other.exists(path);
+  }
+  get(path: string): FileEntry | null {
+    return this._other.get(path);
+  }
+  getDir(path: string): DirEntry {
+    return this._other.getDir(path);
+  }
+  visit(visitor: FileVisitor): void {
+    return this._other.visit(visitor);
+  }
 
   // Change content of host files.
   overwrite(path: string, content: Buffer | string): void {
     return this._other.overwrite(path, content);
   }
-  beginUpdate(path: string): UpdateRecorder { return this._other.beginUpdate(path); }
-  commitUpdate(record: UpdateRecorder): void { return this._other.commitUpdate(record); }
+  beginUpdate(path: string): UpdateRecorder {
+    return this._other.beginUpdate(path);
+  }
+  commitUpdate(record: UpdateRecorder): void {
+    return this._other.commitUpdate(record);
+  }
 
   // Structural methods.
   create(path: string, content: Buffer | string): void {
     return this._other.create(path, content);
   }
-  delete(path: string): void { return this._other.delete(path); }
-  rename(from: string, to: string): void { return this._other.rename(from, to); }
+  delete(path: string): void {
+    return this._other.delete(path);
+  }
+  rename(from: string, to: string): void {
+    return this._other.rename(from, to);
+  }
 
   apply(action: Action, strategy?: MergeStrategy): void {
     return this._other.apply(action, strategy);
   }
-  get actions(): Action[] { return this._other.actions; }
+  get actions(): Action[] {
+    return this._other.actions;
+  }
 
   [TreeSymbol]() {
     return this;
diff --git a/packages/angular_devkit/schematics/src/tree/empty.ts b/packages/angular_devkit/schematics/src/tree/empty.ts
index 04f598841368..4e8521ee460d 100644
--- a/packages/angular_devkit/schematics/src/tree/empty.ts
+++ b/packages/angular_devkit/schematics/src/tree/empty.ts
@@ -1,13 +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 { HostTree } from './host-tree';
 
+import { HostTree } from './host-tree';
 
 export class EmptyTree extends HostTree {
-  constructor() { super(); }
+  constructor() {
+    super();
+  }
 }
diff --git a/packages/angular_devkit/schematics/src/tree/entry.ts b/packages/angular_devkit/schematics/src/tree/entry.ts
index a4dd2c02d723..19bcb64d5a29 100644
--- a/packages/angular_devkit/schematics/src/tree/entry.ts
+++ b/packages/angular_devkit/schematics/src/tree/entry.ts
@@ -1,27 +1,34 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+
 import { Path } from '@angular-devkit/core';
 import { FileEntry } from './interface';
 
-
 export class SimpleFileEntry implements FileEntry {
   constructor(private _path: Path, private _content: Buffer) {}
 
-  get path() { return this._path; }
-  get content() { return this._content; }
+  get path() {
+    return this._path;
+  }
+  get content() {
+    return this._content;
+  }
 }
 
-
 export class LazyFileEntry implements FileEntry {
   private _content: Buffer | null = null;
 
   constructor(private _path: Path, private _load: (path?: Path) => Buffer) {}
 
-  get path() { return this._path; }
-  get content() { return this._content || (this._content = this._load(this._path)); }
+  get path() {
+    return this._path;
+  }
+  get content() {
+    return this._content || (this._content = this._load(this._path));
+  }
 }
diff --git a/packages/angular_devkit/schematics/src/tree/host-tree.ts b/packages/angular_devkit/schematics/src/tree/host-tree.ts
index f6cd47f88850..ba5b6b75f8fb 100644
--- a/packages/angular_devkit/schematics/src/tree/host-tree.ts
+++ b/packages/angular_devkit/schematics/src/tree/host-tree.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 {
   Path,
   PathFragment,
@@ -48,25 +49,25 @@ import {
 import { UpdateRecorderBase } from './recorder';
 import { ScopedTree } from './scoped';
 
-
 let _uniqueId = 0;
 
-
 export class HostDirEntry implements DirEntry {
   constructor(
     readonly parent: DirEntry | null,
     readonly path: Path,
     protected _host: virtualFs.SyncDelegateHost,
     protected _tree: Tree,
-  ) { }
+  ) {}
 
   get subdirs(): PathFragment[] {
-    return this._host.list(this.path)
-      .filter(fragment => this._host.isDirectory(join(this.path, fragment)));
+    return this._host
+      .list(this.path)
+      .filter((fragment) => this._host.isDirectory(join(this.path, fragment)));
   }
   get subfiles(): PathFragment[] {
-    return this._host.list(this.path)
-      .filter(fragment => this._host.isFile(join(this.path, fragment)));
+    return this._host
+      .list(this.path)
+      .filter((fragment) => this._host.isFile(join(this.path, fragment)));
   }
 
   dir(name: PathFragment): DirEntry {
@@ -78,7 +79,7 @@ export class HostDirEntry implements DirEntry {
 
   visit(visitor: FileVisitor): void {
     try {
-      this.getSubfilesRecursively().forEach(file => visitor(file.path, file));
+      this.getSubfilesRecursively().forEach((file) => visitor(file.path, file));
     } catch (e) {
       if (e !== FileVisitorCancelToken) {
         throw e;
@@ -88,17 +89,16 @@ export class HostDirEntry implements DirEntry {
 
   private getSubfilesRecursively() {
     function _recurse(entry: DirEntry): FileEntry[] {
-      return entry.subdirs.reduce((files, subdir) => [
-        ...files,
-        ..._recurse(entry.dir(subdir)),
-      ], entry.subfiles.map(subfile => entry.file(subfile) as FileEntry));
+      return entry.subdirs.reduce(
+        (files, subdir) => [...files, ..._recurse(entry.dir(subdir))],
+        entry.subfiles.map((subfile) => entry.file(subfile) as FileEntry),
+      );
     }
 
     return _recurse(this);
   }
 }
 
-
 export class HostTree implements Tree {
   private readonly _id = --_uniqueId;
   private _record: virtualFs.CordHost;
@@ -107,7 +107,6 @@ export class HostTree implements Tree {
 
   private _dirCache = new Map<Path, HostDirEntry>();
 
-
   [TreeSymbol]() {
     return this;
   }
@@ -163,10 +162,10 @@ export class HostTree implements Tree {
       return tree._ancestry.has(this._id);
     }
     if (tree instanceof DelegateTree) {
-      return this.isAncestorOf((tree as unknown as { _other: Tree})._other);
+      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 this.isAncestorOf(((tree as unknown) as { _base: Tree })._base);
     }
 
     return false;
@@ -191,7 +190,7 @@ export class HostTree implements Tree {
     const deleteConflictAllowed =
       (strategy & MergeStrategy.AllowDeleteConflict) == MergeStrategy.AllowDeleteConflict;
 
-    other.actions.forEach(action => {
+    other.actions.forEach((action) => {
       switch (action.kind) {
         case 'c': {
           const { path, content } = action;
@@ -207,9 +206,9 @@ export class HostTree implements Tree {
               throw new MergeConflictException(path);
             }
 
-            this._record.overwrite(path, content as {} as virtualFs.FileBuffer).subscribe();
+            this._record.overwrite(path, (content as {}) as virtualFs.FileBuffer).subscribe();
           } else {
-            this._record.create(path, content as {} as virtualFs.FileBuffer).subscribe();
+            this._record.create(path, (content as {}) as virtualFs.FileBuffer).subscribe();
           }
 
           return;
@@ -235,7 +234,7 @@ export class HostTree implements Tree {
           }
           // We use write here as merge validation has already been done, and we want to let
           // the CordHost do its job.
-          this._record.write(path, content as {} as virtualFs.FileBuffer).subscribe();
+          this._record.write(path, (content as {}) as virtualFs.FileBuffer).subscribe();
 
           return;
         }
@@ -338,7 +337,7 @@ export class HostTree implements Tree {
       throw new FileDoesNotExistException(p);
     }
     const c = typeof content == 'string' ? Buffer.from(content) : content;
-    this._record.overwrite(p, c as {} as virtualFs.FileBuffer).subscribe();
+    this._record.overwrite(p, (c as {}) as virtualFs.FileBuffer).subscribe();
   }
   beginUpdate(path: string): UpdateRecorder {
     const entry = this.get(path);
@@ -372,7 +371,7 @@ export class HostTree implements Tree {
       throw new FileAlreadyExistException(p);
     }
     const c = typeof content == 'string' ? Buffer.from(content) : content;
-    this._record.create(p, c as {} as virtualFs.FileBuffer).subscribe();
+    this._record.create(p, (c as {}) as virtualFs.FileBuffer).subscribe();
   }
   delete(path: string): void {
     this._recordSync.delete(this._normalizePath(path));
@@ -439,7 +438,7 @@ export class HostCreateTree extends HostTree {
     super();
 
     const tempHost = new HostTree(host);
-    tempHost.visit(path => {
+    tempHost.visit((path) => {
       const content = tempHost.read(path);
       if (content) {
         this.create(path, content);
@@ -454,33 +453,32 @@ export class FilterHostTree extends HostTree {
     // cast to allow access
     const originalBackend = (tree as FilterHostTree)._backend;
 
-    const recurse: (base: Path) => Observable<void> = base => {
-      return originalBackend.list(base)
-        .pipe(
-          mergeMap(x => x),
-          map(path => join(base, path)),
-          concatMap(path => {
-            let isDirectory = false;
-            originalBackend.isDirectory(path).subscribe(val => isDirectory = val);
-            if (isDirectory) {
-              return recurse(path);
-            }
+    const recurse: (base: Path) => Observable<void> = (base) => {
+      return originalBackend.list(base).pipe(
+        mergeMap((x) => x),
+        map((path) => join(base, path)),
+        concatMap((path) => {
+          let isDirectory = false;
+          originalBackend.isDirectory(path).subscribe((val) => (isDirectory = val));
+          if (isDirectory) {
+            return recurse(path);
+          }
 
-            let isFile = false;
-            originalBackend.isFile(path).subscribe(val => isFile = val);
-            if (!isFile || !filter(path)) {
-              return EMPTY;
-            }
+          let isFile = false;
+          originalBackend.isFile(path).subscribe((val) => (isFile = val));
+          if (!isFile || !filter(path)) {
+            return EMPTY;
+          }
 
-            let content: ArrayBuffer | null = null;
-            originalBackend.read(path).subscribe(val => content = val);
-            if (!content) {
-              return EMPTY;
-            }
+          let content: ArrayBuffer | null = null;
+          originalBackend.read(path).subscribe((val) => (content = val));
+          if (!content) {
+            return EMPTY;
+          }
 
-            return newBackend.write(path, content as {} as virtualFs.FileBuffer);
-          }),
-        );
+          return newBackend.write(path, (content as {}) as virtualFs.FileBuffer);
+        }),
+      );
     };
 
     recurse(normalize('/')).subscribe();
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 a6d0c6c231cf..9c1a499fd8e3 100644
--- a/packages/angular_devkit/schematics/src/tree/host-tree_spec.ts
+++ b/packages/angular_devkit/schematics/src/tree/host-tree_spec.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 { normalize, virtualFs } from '@angular-devkit/core';
 import { FilterHostTree, HostTree } from './host-tree';
 import { MergeStrategy } from './interface';
@@ -57,9 +58,9 @@ describe('FilterHostTree', () => {
     tree.create('/file2', '');
     tree.create('/file3', '');
 
-    const filtered = new FilterHostTree(tree, p => p != '/file2');
+    const filtered = new FilterHostTree(tree, (p) => p != '/file2');
     const filteredFiles: string[] = [];
-    filtered.visit(path => filteredFiles.push(path));
+    filtered.visit((path) => filteredFiles.push(path));
     filteredFiles.sort();
     expect(filteredFiles).toEqual(['/file1', '/file3'].map(normalize));
     expect(filtered.actions.length).toEqual(2);
@@ -71,13 +72,13 @@ describe('FilterHostTree', () => {
     tree.create('/file2', '');
     tree.create('/file3', '');
 
-    const filtered = new FilterHostTree(tree, p => p != '/file2');
-    const filtered2 = new FilterHostTree(filtered, p => p != '/file3');
+    const filtered = new FilterHostTree(tree, (p) => p != '/file2');
+    const filtered2 = new FilterHostTree(filtered, (p) => p != '/file3');
     const filteredFiles: string[] = [];
-    filtered2.visit(path => filteredFiles.push(path));
+    filtered2.visit((path) => filteredFiles.push(path));
     filteredFiles.sort();
     expect(filteredFiles).toEqual(['/file1'].map(normalize));
-    expect(filtered2.actions.map(a => a.kind)).toEqual(['c']);
+    expect(filtered2.actions.map((a) => a.kind)).toEqual(['c']);
   });
 
   it('works with underlying files', () => {
@@ -88,13 +89,13 @@ describe('FilterHostTree', () => {
     tree.create('/file2', '');
     tree.create('/file3', '');
 
-    const filtered = new FilterHostTree(tree, p => p != '/file2');
-    const filtered2 = new FilterHostTree(filtered, p => p != '/file3');
+    const filtered = new FilterHostTree(tree, (p) => p != '/file2');
+    const filtered2 = new FilterHostTree(filtered, (p) => p != '/file3');
     const filteredFiles: string[] = [];
-    filtered2.visit(path => filteredFiles.push(path));
+    filtered2.visit((path) => filteredFiles.push(path));
     filteredFiles.sort();
     expect(filteredFiles).toEqual(['/file1'].map(normalize));
-    expect(filtered2.actions.map(a => a.kind)).toEqual([]);
+    expect(filtered2.actions.map((a) => a.kind)).toEqual([]);
   });
 
   it('works with created paths and files', () => {
@@ -103,13 +104,13 @@ describe('FilterHostTree', () => {
     tree.create('/dir2/file2', '');
     tree.create('/file3', '');
 
-    const filtered = new FilterHostTree(tree, p => p != '/dir2/file2');
-    const filtered2 = new FilterHostTree(filtered, p => p != '/file3');
+    const filtered = new FilterHostTree(tree, (p) => p != '/dir2/file2');
+    const filtered2 = new FilterHostTree(filtered, (p) => p != '/file3');
     const filteredFiles: string[] = [];
-    filtered2.visit(path => filteredFiles.push(path));
+    filtered2.visit((path) => filteredFiles.push(path));
     filteredFiles.sort();
     expect(filteredFiles).toEqual(['/dir1/file1'].map(normalize));
-    expect(filtered2.actions.map(a => a.kind)).toEqual(['c']);
+    expect(filtered2.actions.map((a) => a.kind)).toEqual(['c']);
   });
 
   it('works with underlying paths and files', () => {
@@ -120,13 +121,13 @@ describe('FilterHostTree', () => {
     const tree = new HostTree(fs);
     tree.create('/file3', '');
 
-    const filtered = new FilterHostTree(tree, p => p != '/dir2/file2');
-    const filtered2 = new FilterHostTree(filtered, p => p != '/file3');
+    const filtered = new FilterHostTree(tree, (p) => p != '/dir2/file2');
+    const filtered2 = new FilterHostTree(filtered, (p) => p != '/file3');
     const filteredFiles: string[] = [];
-    filtered2.visit(path => filteredFiles.push(path));
+    filtered2.visit((path) => filteredFiles.push(path));
     filteredFiles.sort();
     expect(filteredFiles).toEqual(['/dir1/file1'].map(normalize));
-    expect(filtered2.actions.map(a => a.kind)).toEqual([]);
+    expect(filtered2.actions.map((a) => a.kind)).toEqual([]);
   });
 
   it('subdirs only contains directories', () => {
diff --git a/packages/angular_devkit/schematics/src/tree/interface.ts b/packages/angular_devkit/schematics/src/tree/interface.ts
index df763916b351..e05be51aa6a3 100644
--- a/packages/angular_devkit/schematics/src/tree/interface.ts
+++ b/packages/angular_devkit/schematics/src/tree/interface.ts
@@ -1,36 +1,34 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+
 import { Path, PathFragment } from '@angular-devkit/core';
 import { Action } from './action';
 
-
 export enum MergeStrategy {
-  AllowOverwriteConflict    = 1 << 1,
-  AllowCreationConflict     = 1 << 2,
-  AllowDeleteConflict       = 1 << 3,
+  AllowOverwriteConflict = 1 << 1,
+  AllowCreationConflict = 1 << 2,
+  AllowDeleteConflict = 1 << 3,
 
   // Uses the default strategy.
-  Default                   = 0,
+  Default = 0,
 
   // Error out if 2 files have the same path. It is useful to have a different value than
   // Default in this case as the tooling Default might differ.
-  Error                     = 1 << 0,
+  Error = 1 << 0,
 
   // Only content conflicts are overwritten.
-  ContentOnly               = AllowOverwriteConflict,
+  ContentOnly = AllowOverwriteConflict,
 
   // Overwrite everything with the latest change.
-  Overwrite                 = AllowOverwriteConflict
-                            + AllowCreationConflict
-                            + AllowDeleteConflict,
+  Overwrite = AllowOverwriteConflict + AllowCreationConflict + AllowDeleteConflict,
 }
 
-
+// eslint-disable-next-line @typescript-eslint/no-inferrable-types
 export const FileVisitorCancelToken: symbol = Symbol();
 export type FileVisitor = FilePredicate<void>;
 
@@ -56,14 +54,15 @@ export interface FilePredicate<T> {
   (path: Path, entry?: Readonly<FileEntry> | null): T;
 }
 
-declare const window: { Symbol: { schematicTree: symbol }, window: {} };
-declare const self: { Symbol: { schematicTree: symbol }, self: {} };
-declare const global: { Symbol: { schematicTree: symbol }, global: {} };
+declare const window: { Symbol: { schematicTree: symbol }; window: {} };
+declare const self: { Symbol: { schematicTree: symbol }; self: {} };
+declare const global: { Symbol: { schematicTree: symbol }; global: {} };
 
-export const TreeSymbol: symbol = (function() {
-  const globalSymbol = (typeof window == 'object' && window.window === window && window.Symbol)
-                    || (typeof self == 'object' && self.self === self && self.Symbol)
-                    || (typeof global == 'object' && global.global === global && global.Symbol);
+export const TreeSymbol: symbol = (function () {
+  const globalSymbol =
+    (typeof window == 'object' && window.window === window && window.Symbol) ||
+    (typeof self == 'object' && self.self === self && self.Symbol) ||
+    (typeof global == 'object' && global.global === global && global.Symbol);
 
   if (!globalSymbol) {
     return Symbol('schematic-tree');
@@ -76,7 +75,6 @@ export const TreeSymbol: symbol = (function() {
   return globalSymbol.schematicTree;
 })();
 
-
 export interface Tree {
   branch(): Tree;
   merge(other: Tree, strategy?: MergeStrategy): void;
@@ -104,14 +102,13 @@ export interface Tree {
   readonly actions: Action[];
 }
 
-
+// eslint-disable-next-line @typescript-eslint/no-namespace
 namespace Tree {
   export function isTree(maybeTree: object): maybeTree is Tree {
     return TreeSymbol in maybeTree;
   }
 }
 
-
 export interface UpdateRecorder {
   // These just record changes.
   insertLeft(index: number, content: Buffer | string): UpdateRecorder;
diff --git a/packages/angular_devkit/schematics/src/tree/null.ts b/packages/angular_devkit/schematics/src/tree/null.ts
index cd0a9ba535d4..48469a3c3370 100644
--- a/packages/angular_devkit/schematics/src/tree/null.ts
+++ b/packages/angular_devkit/schematics/src/tree/null.ts
@@ -1,29 +1,23 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of 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,
-  Path,
-  PathFragment,
-  dirname,
-  join,
-  normalize,
-} from '@angular-devkit/core';
+
+import { BaseException, Path, PathFragment, dirname, join, normalize } from '@angular-devkit/core';
 import { FileDoesNotExistException } from '../exception/exception';
 import { Action } from './action';
 import { DirEntry, MergeStrategy, Tree, TreeSymbol, UpdateRecorder } from './interface';
 import { UpdateRecorderBase } from './recorder';
 
-
 export class CannotCreateFileException extends BaseException {
-  constructor(path: string) { super(`Cannot create file "${path}".`); }
+  constructor(path: string) {
+    super(`Cannot create file "${path}".`);
+  }
 }
 
-
 export class NullTreeDirEntry implements DirEntry {
   get parent(): DirEntry | null {
     return this.path == '/' ? null : new NullTreeDirEntry(dirname(this.path));
@@ -37,12 +31,13 @@ export class NullTreeDirEntry implements DirEntry {
   dir(name: PathFragment): DirEntry {
     return new NullTreeDirEntry(join(this.path, name));
   }
-  file(_name: PathFragment) { return null; }
+  file(_name: PathFragment) {
+    return null;
+  }
 
   visit() {}
 }
 
-
 export class NullTree implements Tree {
   [TreeSymbol]() {
     return this;
@@ -56,10 +51,18 @@ export class NullTree implements Tree {
   readonly root: DirEntry = new NullTreeDirEntry(normalize('/'));
 
   // Simple readonly file system operations.
-  exists(_path: string) { return false; }
-  read(_path: string) { return null; }
-  get(_path: string) { return null; }
-  getDir(path: string) { return new NullTreeDirEntry(normalize('/' + path)); }
+  exists(_path: string) {
+    return false;
+  }
+  read(_path: string) {
+    return null;
+  }
+  get(_path: string) {
+    return null;
+  }
+  getDir(path: string) {
+    return new NullTreeDirEntry(normalize('/' + path));
+  }
   visit() {}
 
   // Change content of host files.
@@ -67,9 +70,9 @@ export class NullTree implements Tree {
     throw new FileDoesNotExistException(path);
   }
   commitUpdate(record: UpdateRecorder): never {
-    throw new FileDoesNotExistException(record instanceof UpdateRecorderBase
-      ? record.path
-      : '<unknown>');
+    throw new FileDoesNotExistException(
+      record instanceof UpdateRecorderBase ? record.path : '<unknown>',
+    );
   }
 
   // Change structure of the host.
diff --git a/packages/angular_devkit/schematics/src/tree/recorder.ts b/packages/angular_devkit/schematics/src/tree/recorder.ts
index 8b18b8182e55..9eb4b4da5805 100644
--- a/packages/angular_devkit/schematics/src/tree/recorder.ts
+++ b/packages/angular_devkit/schematics/src/tree/recorder.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 { ContentHasMutatedException } from '../exception/exception';
 import { UpdateBuffer } from '../utility/update-buffer';
 import { FileEntry, UpdateRecorder } from './interface';
 
-
 export class UpdateRecorderBase implements UpdateRecorder {
   protected _path: string;
   protected _original: Buffer;
@@ -27,18 +27,20 @@ export class UpdateRecorderBase implements UpdateRecorder {
     const c2 = entry.content.byteLength > 2 && entry.content.readUInt8(2);
 
     // Check if we're BOM.
-    if (c0 == 0xEF && c1 == 0xBB && c2 == 0xBF) {
+    if (c0 == 0xef && c1 == 0xbb && c2 == 0xbf) {
       return new UpdateRecorderBom(entry);
-    } else if (c0 === 0xFF && c1 == 0xFE) {
+    } else if (c0 === 0xff && c1 == 0xfe) {
       return new UpdateRecorderBom(entry);
-    } else if (c0 === 0xFE && c1 == 0xFF) {
+    } else if (c0 === 0xfe && c1 == 0xff) {
       return new UpdateRecorderBom(entry);
     }
 
     return new UpdateRecorderBase(entry);
   }
 
-  get path() { return this._path; }
+  get path() {
+    return this._path;
+  }
 
   // These just record changes.
   insertLeft(index: number, content: Buffer | string): UpdateRecorder {
@@ -68,21 +70,20 @@ export class UpdateRecorderBase implements UpdateRecorder {
   }
 }
 
-
 export class UpdateRecorderBom extends UpdateRecorderBase {
   constructor(entry: FileEntry, private _delta = 1) {
     super(entry);
   }
 
-  insertLeft(index: number, content: Buffer | string) {
+  override insertLeft(index: number, content: Buffer | string) {
     return super.insertLeft(index + this._delta, content);
   }
 
-  insertRight(index: number, content: Buffer | string) {
+  override insertRight(index: number, content: Buffer | string) {
     return super.insertRight(index + this._delta, content);
   }
 
-  remove(index: number, length: number) {
+  override remove(index: number, length: number) {
     return super.remove(index + this._delta, length);
   }
 }
diff --git a/packages/angular_devkit/schematics/src/tree/recorder_spec.ts b/packages/angular_devkit/schematics/src/tree/recorder_spec.ts
index 0840191ceb1c..1b3140c74ebc 100644
--- a/packages/angular_devkit/schematics/src/tree/recorder_spec.ts
+++ b/packages/angular_devkit/schematics/src/tree/recorder_spec.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 { normalize } from '@angular-devkit/core';
 import { SimpleFileEntry } from './entry';
 import { UpdateRecorderBase, UpdateRecorderBom } from './recorder';
@@ -31,7 +32,7 @@ describe('UpdateRecorderBase', () => {
   });
 
   it('can create the proper recorder', () => {
-    const e = new SimpleFileEntry(normalize('/some/path'),  Buffer.from('hello'));
+    const e = new SimpleFileEntry(normalize('/some/path'), Buffer.from('hello'));
     expect(UpdateRecorderBase.createFromFileEntry(e) instanceof UpdateRecorderBase).toBe(true);
     expect(UpdateRecorderBase.createFromFileEntry(e) instanceof UpdateRecorderBom).toBe(false);
   });
@@ -43,7 +44,7 @@ describe('UpdateRecorderBase', () => {
   });
 
   it('supports empty files', () => {
-    const e = new SimpleFileEntry(normalize('/some/path'),  Buffer.from(''));
+    const e = new SimpleFileEntry(normalize('/some/path'), Buffer.from(''));
     expect(UpdateRecorderBase.createFromFileEntry(e) instanceof UpdateRecorderBase).toBe(true);
   });
 
diff --git a/packages/angular_devkit/schematics/src/tree/scoped.ts b/packages/angular_devkit/schematics/src/tree/scoped.ts
index e503d76878f1..f77af03635a1 100644
--- a/packages/angular_devkit/schematics/src/tree/scoped.ts
+++ b/packages/angular_devkit/schematics/src/tree/scoped.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 {
   NormalizedRoot,
   Path,
@@ -32,7 +33,9 @@ class ScopedFileEntry implements FileEntry {
     return join(NormalizedRoot, relative(this.scope, this._base.path));
   }
 
-  get content(): Buffer { return this._base.content; }
+  get content(): Buffer {
+    return this._base.content;
+  }
 }
 
 class ScopedDirEntry implements DirEntry {
@@ -87,23 +90,32 @@ export class ScopedTree implements Tree {
     this._root = new ScopedDirEntry(this._base.getDir(normalizedScope), normalizedScope);
   }
 
-  get root(): DirEntry { return this._root; }
+  get root(): DirEntry {
+    return this._root;
+  }
 
-  branch(): Tree { return new ScopedTree(this._base.branch(), this._root.scope); }
+  branch(): Tree {
+    return new ScopedTree(this._base.branch(), this._root.scope);
+  }
   merge(other: Tree, strategy?: MergeStrategy): void {
+    // eslint-disable-next-line @typescript-eslint/no-this-alias
     const self = this;
-    const delegate = new class extends DelegateTree {
-      get actions(): Action[] {
-        return other.actions.map(action => self._fullPathAction(action));
+    const delegate = new (class extends DelegateTree {
+      override get actions(): Action[] {
+        return other.actions.map((action) => self._fullPathAction(action));
       }
-    }(other);
+    })(other);
 
     this._base.merge(delegate, strategy);
   }
 
   // Readonly.
-  read(path: string): Buffer | null { return this._base.read(this._fullPath(path)); }
-  exists(path: string): boolean { return this._base.exists(this._fullPath(path)); }
+  read(path: string): Buffer | null {
+    return this._base.read(this._fullPath(path));
+  }
+  exists(path: string): boolean {
+    return this._base.exists(this._fullPath(path));
+  }
   get(path: string): FileEntry | null {
     const entry = this._base.get(this._fullPath(path));
 
@@ -114,7 +126,9 @@ export class ScopedTree implements Tree {
 
     return entry && new ScopedDirEntry(entry, this._root.scope);
   }
-  visit(visitor: FileVisitor): void { return this._root.visit(visitor); }
+  visit(visitor: FileVisitor): void {
+    return this._root.visit(visitor);
+  }
 
   // Change content of host files.
   overwrite(path: string, content: Buffer | string): void {
@@ -123,13 +137,17 @@ export class ScopedTree implements Tree {
   beginUpdate(path: string): UpdateRecorder {
     return this._base.beginUpdate(this._fullPath(path));
   }
-  commitUpdate(record: UpdateRecorder): void { return this._base.commitUpdate(record); }
+  commitUpdate(record: UpdateRecorder): void {
+    return this._base.commitUpdate(record);
+  }
 
   // Structural methods.
   create(path: string, content: Buffer | string): void {
     return this._base.create(this._fullPath(path), content);
   }
-  delete(path: string): void { return this._base.delete(this._fullPath(path)); }
+  delete(path: string): void {
+    return this._base.delete(this._fullPath(path));
+  }
   rename(from: string, to: string): void {
     return this._base.rename(this._fullPath(from), this._fullPath(to));
   }
diff --git a/packages/angular_devkit/schematics/src/tree/scoped_spec.ts b/packages/angular_devkit/schematics/src/tree/scoped_spec.ts
index 35fb3ae3a83e..cb55cea5a2a1 100644
--- a/packages/angular_devkit/schematics/src/tree/scoped_spec.ts
+++ b/packages/angular_devkit/schematics/src/tree/scoped_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 { UnitTestTree } from '../../testing';
 import { HostTree } from './host-tree';
 import { ScopedTree } from './scoped';
 
-
 describe('ScopedTree', () => {
   let base: HostTree;
   let scoped: ScopedTree;
@@ -97,7 +97,7 @@ describe('ScopedTree', () => {
     expect(scoped.get('/file-1-1')).not.toBeNull();
 
     const file = scoped.get('file-1-1');
-    expect(file && file.path as string).toBe('/file-1-1');
+    expect(file && (file.path as string)).toBe('/file-1-1');
 
     expect(scoped.get('/file-0-1')).toBeNull();
     expect(scoped.get('file-0-1')).toBeNull();
@@ -110,18 +110,14 @@ describe('ScopedTree', () => {
     expect(dir.path as string).toBe('/level-2');
     expect(dir.parent).not.toBeNull();
     const files: string[] = [];
-    dir.visit(path => files.push(path));
+    dir.visit((path) => files.push(path));
     files.sort();
-    expect(files).toEqual([
-      '/level-2/file-2-1',
-      '/level-2/file-2-2',
-      '/level-2/file-2-3',
-    ]);
+    expect(files).toEqual(['/level-2/file-2-1', '/level-2/file-2-2', '/level-2/file-2-3']);
   });
 
   it('supports visit', () => {
     const files: string[] = [];
-    scoped.visit(path => files.push(path));
+    scoped.visit((path) => files.push(path));
     files.sort();
     expect(files).toEqual([
       '/file-1-1',
diff --git a/packages/angular_devkit/schematics/src/tree/static.ts b/packages/angular_devkit/schematics/src/tree/static.ts
index 516169abee24..7d69623c098f 100644
--- a/packages/angular_devkit/schematics/src/tree/static.ts
+++ b/packages/angular_devkit/schematics/src/tree/static.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 { SchematicsException } from '../exception/exception';
 import { FilterHostTree, HostTree } from './host-tree';
 import { FilePredicate, MergeStrategy, Tree } from './interface';
 
-
 export function empty() {
   return new HostTree();
 }
diff --git a/packages/angular_devkit/schematics/src/utility/linked-list.ts b/packages/angular_devkit/schematics/src/utility/linked-list.ts
index 39b57a4a69ab..8e4b20681ee1 100644
--- a/packages/angular_devkit/schematics/src/utility/linked-list.ts
+++ b/packages/angular_devkit/schematics/src/utility/linked-list.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
  */
 
-export class LinkedList<T extends {next: T | null}> {
+export class LinkedList<T extends { next: T | null }> {
   constructor(private _head: T) {}
 
   get(l: number) {
@@ -19,7 +19,9 @@ export class LinkedList<T extends {next: T | null}> {
     return c;
   }
 
-  get head() { return this._head; }
+  get head() {
+    return this._head;
+  }
   get length() {
     let c: T | null = this._head;
     let i = 0;
diff --git a/packages/angular_devkit/schematics/src/utility/update-buffer.ts b/packages/angular_devkit/schematics/src/utility/update-buffer.ts
index 4389f8ab2471..000434c9a847 100644
--- a/packages/angular_devkit/schematics/src/utility/update-buffer.ts
+++ b/packages/angular_devkit/schematics/src/utility/update-buffer.ts
@@ -1,14 +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 { BaseException } from '@angular-devkit/core';
 import { LinkedList } from './linked-list';
 
-
 export class IndexOutOfBoundException extends BaseException {
   constructor(index: number, min: number, max = Infinity) {
     super(`Index ${index} outside of range [${min}, ${max}].`);
@@ -20,7 +20,6 @@ export class ContentCannotBeRemovedException extends BaseException {
   }
 }
 
-
 /**
  * A Chunk description, including left/right content that has been inserted.
  * If _left/_right is null, this means that content was deleted. If the _content is null,
@@ -43,14 +42,18 @@ export class Chunk {
   }
 
   get length() {
-    return (this._left ? this._left.length : 0)
-         + (this._content ? this._content.length : 0)
-         + (this._right ? this._right.length : 0);
+    return (
+      (this._left ? this._left.length : 0) +
+      (this._content ? this._content.length : 0) +
+      (this._right ? this._right.length : 0)
+    );
   }
-  toString(encoding = 'utf-8') {
-    return (this._left ? this._left.toString(encoding) : '')
-         + (this._content ? this._content.toString(encoding) : '')
-         + (this._right ? this._right.toString(encoding) : '');
+  toString(encoding: BufferEncoding = 'utf-8') {
+    return (
+      (this._left ? this._left.toString(encoding) : '') +
+      (this._content ? this._content.toString(encoding) : '') +
+      (this._right ? this._right.toString(encoding) : '')
+    );
   }
 
   slice(start: number) {
@@ -173,7 +176,6 @@ export class Chunk {
   }
 }
 
-
 /**
  * An utility class that allows buffers to be inserted to the _right or _left, or deleted, while
  * keeping indices to the original buffer.
@@ -204,7 +206,7 @@ export class UpdateBuffer {
     this._assertIndex(index);
 
     // Find the chunk by going through the list.
-    const h = this._linkedList.find(chunk => index <= chunk.end);
+    const h = this._linkedList.find((chunk) => index <= chunk.end);
     if (!h) {
       throw Error('Chunk cannot be found.');
     }
@@ -232,13 +234,13 @@ export class UpdateBuffer {
     return this._originalContent;
   }
 
-  toString(encoding = 'utf-8'): string {
+  toString(encoding: BufferEncoding = 'utf-8'): string {
     return this._linkedList.reduce((acc, chunk) => acc + chunk.toString(encoding), '');
   }
   generate(): Buffer {
     const result = Buffer.allocUnsafe(this.length);
     let i = 0;
-    this._linkedList.forEach(chunk => {
+    this._linkedList.forEach((chunk) => {
       chunk.copy(result, i);
       i += chunk.length;
     });
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..9b8c7a343919 100644
--- a/packages/angular_devkit/schematics/src/utility/update-buffer_spec.ts
+++ b/packages/angular_devkit/schematics/src/utility/update-buffer_spec.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 { UpdateBuffer } from './update-buffer';
 
 describe('UpdateBuffer', () => {
diff --git a/packages/angular_devkit/schematics/src/workflow/base.ts b/packages/angular_devkit/schematics/src/workflow/base.ts
index 54d58d00e08f..1ae31f823416 100644
--- a/packages/angular_devkit/schematics/src/workflow/base.ts
+++ b/packages/angular_devkit/schematics/src/workflow/base.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 { logging, schema, virtualFs } from '@angular-devkit/core';
 import { EMPTY, Observable, Subject, concat, from, of, throwError } from 'rxjs';
 import { concatMap, defaultIfEmpty, ignoreElements, last, tap } from 'rxjs/operators';
@@ -23,7 +24,6 @@ import {
   WorkflowExecutionContext,
 } from './interface';
 
-
 export interface BaseWorkflowOptions {
   host: virtualFs.Host;
   engineHost: EngineHost<{}, {}>;
@@ -106,9 +106,9 @@ export abstract class BaseWorkflow implements Workflow {
     let error = false;
 
     const dryRunSink = new DryRunSink(this._host, this._force);
-    const dryRunSubscriber = dryRunSink.reporter.subscribe(event => {
+    const dryRunSubscriber = dryRunSink.reporter.subscribe((event) => {
       this._reporter.next(event);
-      error = error || (event.kind == 'error');
+      error = error || event.kind == 'error';
     });
 
     // We need two sinks if we want to output what will happen, and actually do the work.
@@ -143,8 +143,8 @@ export abstract class BaseWorkflow implements Workflow {
     /** Create the collection and the schematic. */
     const collection = this._engine.createCollection(options.collection);
     // Only allow private schematics if called from the same collection.
-    const allowPrivate = options.allowPrivate
-      || (parentContext && parentContext.collection === options.collection);
+    const allowPrivate =
+      options.allowPrivate || (parentContext && parentContext.collection === options.collection);
     const schematic = collection.createSchematic(options.schematic, allowPrivate);
 
     const sinks = this._createSinks();
@@ -159,43 +159,44 @@ export abstract class BaseWorkflow implements Workflow {
     };
     this._context.push(context);
 
-    return schematic.call(
-      options.options,
-      of(new HostTree(this._host)),
-      { logger: context.logger },
-    ).pipe(
-      concatMap((tree: Tree) => {
-        // Process all sinks.
-        return concat(
-          from(sinks).pipe(
-            concatMap(sink => sink.commit(tree)),
-            ignoreElements(),
-          ),
-          of(tree),
-        );
-      }),
-      concatMap(() => {
-        if (this._dryRun) {
-          return EMPTY;
-        }
-
-        this._lifeCycle.next({ kind: 'post-tasks-start' });
-
-        return this._engine.executePostTasks()
-          .pipe(
-            tap({ complete: () => this._lifeCycle.next({ kind: 'post-tasks-end' }) }),
-            defaultIfEmpty(),
-            last(),
+    return schematic
+      .call(options.options, of(new HostTree(this._host)), { logger: context.logger })
+      .pipe(
+        concatMap((tree: Tree) => {
+          // Process all sinks.
+          return concat(
+            from(sinks).pipe(
+              concatMap((sink) => sink.commit(tree)),
+              ignoreElements(),
+            ),
+            of(tree),
           );
-      }),
-      tap({ complete: () => {
-          this._lifeCycle.next({ kind: 'workflow-end' });
-          this._context.pop();
-
-          if (this._context.length == 0) {
-            this._lifeCycle.next({ kind: 'end' });
+        }),
+        concatMap(() => {
+          if (this._dryRun) {
+            return EMPTY;
           }
-        }}),
-    );
+
+          this._lifeCycle.next({ kind: 'post-tasks-start' });
+
+          return this._engine
+            .executePostTasks()
+            .pipe(
+              tap({ complete: () => this._lifeCycle.next({ kind: 'post-tasks-end' }) }),
+              defaultIfEmpty(),
+              last(),
+            );
+        }),
+        tap({
+          complete: () => {
+            this._lifeCycle.next({ kind: 'workflow-end' });
+            this._context.pop();
+
+            if (this._context.length == 0) {
+              this._lifeCycle.next({ kind: 'end' });
+            }
+          },
+        }),
+      );
   }
 }
diff --git a/packages/angular_devkit/schematics/src/workflow/index.ts b/packages/angular_devkit/schematics/src/workflow/index.ts
index bec7bf5d64d4..8acc747621df 100644
--- a/packages/angular_devkit/schematics/src/workflow/index.ts
+++ b/packages/angular_devkit/schematics/src/workflow/index.ts
@@ -1,9 +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
  */
+
 export * from './base';
 export * from './interface';
diff --git a/packages/angular_devkit/schematics/src/workflow/interface.ts b/packages/angular_devkit/schematics/src/workflow/interface.ts
index 01de696707ce..966857b2915f 100644
--- a/packages/angular_devkit/schematics/src/workflow/interface.ts
+++ b/packages/angular_devkit/schematics/src/workflow/interface.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 { logging } from '@angular-devkit/core';
 import { Observable } from 'rxjs';
 
@@ -22,9 +23,13 @@ export interface WorkflowExecutionContext extends RequiredWorkflowExecutionConte
 }
 
 export interface LifeCycleEvent {
-  kind: 'start' | 'end'  // Start and end of the full workflow execution.
-    | 'workflow-start' | 'workflow-end'  // Start and end of a workflow execution. Can be more.
-    | 'post-tasks-start' | 'post-tasks-end';  // Start and end of the post tasks execution.
+  kind:
+    | 'start'
+    | 'end' // Start and end of the full workflow execution.
+    | 'workflow-start'
+    | 'workflow-end' // Start and end of a workflow execution. Can be more.
+    | 'post-tasks-start'
+    | 'post-tasks-end'; // Start and end of the post tasks execution.
 }
 
 export interface Workflow {
diff --git a/packages/angular_devkit/schematics/tasks/BUILD.bazel b/packages/angular_devkit/schematics/tasks/BUILD.bazel
index ac7594a3330a..0630b90f45ef 100644
--- a/packages/angular_devkit/schematics/tasks/BUILD.bazel
+++ b/packages/angular_devkit/schematics/tasks/BUILD.bazel
@@ -20,6 +20,7 @@ ts_library(
             "tslint-fix/test/**/*",
         ],
     ),
+    data = ["package.json"],
     module_name = "@angular-devkit/schematics/tasks",
     module_root = "index.d.ts",
     # The attribute below is needed in g3 to turn off strict typechecking
diff --git a/packages/angular_devkit/schematics/tasks/index.ts b/packages/angular_devkit/schematics/tasks/index.ts
index 893b35b83e4a..1f0b22aef666 100644
--- a/packages/angular_devkit/schematics/tasks/index.ts
+++ b/packages/angular_devkit/schematics/tasks/index.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
  */
+
 export { NodePackageInstallTask } from './package-manager/install-task';
 export { NodePackageLinkTask } from './package-manager/link-task';
 export { RepositoryInitializerTask } from './repo-init/init-task';
diff --git a/packages/angular_devkit/schematics/tasks/node/index.ts b/packages/angular_devkit/schematics/tasks/node/index.ts
index d711d291803b..99d669e01b2f 100644
--- a/packages/angular_devkit/schematics/tasks/node/index.ts
+++ b/packages/angular_devkit/schematics/tasks/node/index.ts
@@ -1,36 +1,40 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+
 import { TaskExecutor, TaskExecutorFactory } from '../../src';
 import { NodePackageName, NodePackageTaskFactoryOptions } from '../package-manager/options';
 import {
   RepositoryInitializerName,
   RepositoryInitializerTaskFactoryOptions,
- } from '../repo-init/options';
+} from '../repo-init/options';
 import { RunSchematicName } from '../run-schematic/options';
 import { TslintFixName } from '../tslint-fix/options';
 
 export class BuiltinTaskExecutor {
   static readonly NodePackage: TaskExecutorFactory<NodePackageTaskFactoryOptions> = {
     name: NodePackageName,
-    create: (options) => import('../package-manager/executor').then(mod => mod.default(options)) as Promise<TaskExecutor<{}>>,
+    create: (options) =>
+      import('../package-manager/executor').then((mod) => mod.default(options)) as Promise<
+        TaskExecutor<{}>
+      >,
   };
-  static readonly RepositoryInitializer:
-    TaskExecutorFactory<RepositoryInitializerTaskFactoryOptions> = {
+  static readonly RepositoryInitializer: TaskExecutorFactory<RepositoryInitializerTaskFactoryOptions> = {
     name: RepositoryInitializerName,
-    create: (options) => import('../repo-init/executor').then(mod => mod.default(options)),
+    create: (options) => import('../repo-init/executor').then((mod) => mod.default(options)),
   };
   static readonly RunSchematic: TaskExecutorFactory<{}> = {
     name: RunSchematicName,
-    create: () => import('../run-schematic/executor').then(mod => mod.default()) as Promise<TaskExecutor<{}>>,
+    create: () =>
+      import('../run-schematic/executor').then((mod) => mod.default()) as Promise<TaskExecutor<{}>>,
   };
   /** @deprecated since version 11. Use `ng lint --fix` directly instead. */
   static readonly TslintFix: TaskExecutorFactory<{}> = {
     name: TslintFixName,
-    create: () => import('../tslint-fix/executor').then(mod => mod.default()),
+    create: () => import('../tslint-fix/executor').then((mod) => mod.default()),
   };
 }
diff --git a/packages/angular_devkit/schematics/tasks/package-manager/executor.ts b/packages/angular_devkit/schematics/tasks/package-manager/executor.ts
index fa6d199949fb..6a4f83f18c98 100644
--- a/packages/angular_devkit/schematics/tasks/package-manager/executor.ts
+++ b/packages/angular_devkit/schematics/tasks/package-manager/executor.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 { BaseException } from '@angular-devkit/core';
 import { SpawnOptions, spawn } from 'child_process';
-import * as ora from 'ora';
+import ora from 'ora';
 import * as path from 'path';
 import { Observable } from 'rxjs';
 import { TaskExecutor, UnsuccessfulWorkflowExecution } from '../../src';
@@ -34,7 +35,7 @@ const packageManagers: { [name: string]: PackageManagerProfile } = {
       installAll: 'install',
       installPackage: 'install',
     },
-   },
+  },
   'yarn': {
     quietArgument: '--silent',
     commands: {
@@ -56,7 +57,7 @@ export class UnknownPackageManagerException extends BaseException {
   }
 }
 
-export default function(
+export default function (
   factoryOptions: NodePackageTaskFactoryOptions = {},
 ): TaskExecutor<NodePackageTaskOptions> {
   const packageManagerName = factoryOptions.packageManager || 'npm';
@@ -78,9 +79,9 @@ export default function(
       taskPackageManagerName = options.packageManager;
     }
 
-    const bufferedOutput: {stream: NodeJS.WriteStream, data: Buffer}[] = [];
+    const bufferedOutput: { stream: NodeJS.WriteStream; data: Buffer }[] = [];
     const spawnOptions: SpawnOptions = {
-      stdio: !!options.hideOutput ? 'pipe' : 'inherit',
+      stdio: options.hideOutput ? 'pipe' : 'inherit',
       shell: true,
       cwd: path.join(rootDirectory, options.workingDirectory || ''),
     };
@@ -103,14 +104,19 @@ export default function(
       args.push(`--registry="${factoryOptions.registry}"`);
     }
 
-    return new Observable(obs => {
+    if (factoryOptions.force) {
+      args.push('--force');
+    }
+
+    return new Observable((obs) => {
       const spinner = ora({
         text: `Installing packages (${taskPackageManagerName})...`,
         // Workaround for https://github.com/sindresorhus/ora/issues/136.
         discardStdin: process.platform != 'win32',
       }).start();
-      const childProcess = spawn(taskPackageManagerName, args, spawnOptions)
-        .on('close', (code: number) => {
+      const childProcess = spawn(taskPackageManagerName, args, spawnOptions).on(
+        'close',
+        (code: number) => {
           if (code === 0) {
             spinner.succeed('Packages installed successfully.');
             spinner.stop();
@@ -123,14 +129,16 @@ export default function(
             spinner.fail('Package install failed, see above.');
             obs.error(new UnsuccessfulWorkflowExecution());
           }
-      });
+        },
+      );
       if (options.hideOutput) {
         childProcess.stdout?.on('data', (data: Buffer) =>
-          bufferedOutput.push({ stream: process.stdout, data: data }));
+          bufferedOutput.push({ stream: process.stdout, data: data }),
+        );
         childProcess.stderr?.on('data', (data: Buffer) =>
-          bufferedOutput.push({ stream: process.stderr, data: data }));
+          bufferedOutput.push({ stream: process.stderr, data: data }),
+        );
       }
     });
-
   };
 }
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 028e6da74f9a..fcd0da21d215 100644
--- a/packages/angular_devkit/schematics/tasks/package-manager/install-task.ts
+++ b/packages/angular_devkit/schematics/tasks/package-manager/install-task.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 { TaskConfiguration, TaskConfigurationGenerator } from '../../src';
 import { NodePackageName, NodePackageTaskOptions } from './options';
 
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..114aa8658813 100644
--- a/packages/angular_devkit/schematics/tasks/package-manager/link-task.ts
+++ b/packages/angular_devkit/schematics/tasks/package-manager/link-task.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 { TaskConfiguration, TaskConfigurationGenerator } from '../../src';
 import { NodePackageName, NodePackageTaskOptions } from './options';
 
diff --git a/packages/angular_devkit/schematics/tasks/package-manager/options.ts b/packages/angular_devkit/schematics/tasks/package-manager/options.ts
index e9a665424d90..07727bacb03f 100644
--- a/packages/angular_devkit/schematics/tasks/package-manager/options.ts
+++ b/packages/angular_devkit/schematics/tasks/package-manager/options.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
  */
+
 export const NodePackageName = 'node-package';
 
 export interface NodePackageTaskFactoryOptions {
@@ -12,6 +13,7 @@ export interface NodePackageTaskFactoryOptions {
   packageManager?: string;
   allowPackageManagerOverride?: boolean;
   registry?: string;
+  force?: boolean;
 }
 
 export interface NodePackageTaskOptions {
diff --git a/packages/angular_devkit/schematics/tasks/package.json b/packages/angular_devkit/schematics/tasks/package.json
new file mode 100644
index 000000000000..075ac40ada71
--- /dev/null
+++ b/packages/angular_devkit/schematics/tasks/package.json
@@ -0,0 +1,5 @@
+{
+  "name": "@angular-devkit/schematics/tasks",
+  "main": "index.js",
+  "typings": "index.d.ts"
+}
diff --git a/packages/angular_devkit/schematics/tasks/repo-init/executor.ts b/packages/angular_devkit/schematics/tasks/repo-init/executor.ts
index de1ef00933f2..b9c9b33d8dbf 100644
--- a/packages/angular_devkit/schematics/tasks/repo-init/executor.ts
+++ b/packages/angular_devkit/schematics/tasks/repo-init/executor.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 { SpawnOptions, spawn } from 'child_process';
 import * as path from 'path';
@@ -14,8 +15,7 @@ import {
   RepositoryInitializerTaskOptions,
 } from './options';
 
-
-export default function(
+export default function (
   factoryOptions: RepositoryInitializerTaskFactoryOptions = {},
 ): TaskExecutor<RepositoryInitializerTaskOptions> {
   const rootDirectory = factoryOptions.rootDirectory || process.cwd();
@@ -28,42 +28,41 @@ export default function(
       const outputStream = 'ignore';
       const errorStream = ignoreErrorStream ? 'ignore' : process.stderr;
       const spawnOptions: SpawnOptions = {
-        stdio:  [ process.stdin, outputStream, errorStream ],
+        stdio: [process.stdin, outputStream, errorStream],
         shell: true,
         cwd: path.join(rootDirectory, options.workingDirectory || ''),
         env: {
           ...process.env,
-          ...(authorName
-            ? { GIT_AUTHOR_NAME: authorName, GIT_COMMITTER_NAME: authorName }
-            : {}
-          ),
+          ...(authorName ? { GIT_AUTHOR_NAME: authorName, GIT_COMMITTER_NAME: authorName } : {}),
           ...(authorEmail
             ? { GIT_AUTHOR_EMAIL: authorEmail, GIT_COMMITTER_EMAIL: authorEmail }
-            : {}
-          ),
+            : {}),
         },
       };
 
       return new Promise<void>((resolve, reject) => {
-        spawn('git', args, spawnOptions)
-          .on('close', (code: number) => {
-            if (code === 0) {
-              resolve();
-            } else {
-              reject(code);
-            }
+        spawn('git', args, spawnOptions).on('close', (code: number) => {
+          if (code === 0) {
+            resolve();
+          } else {
+            reject(code);
+          }
         });
       });
     };
 
-    const hasCommand = await execute(['--version'])
-      .then(() => true, () => false);
+    const hasCommand = await execute(['--version']).then(
+      () => true,
+      () => false,
+    );
     if (!hasCommand) {
       return;
     }
 
-    const insideRepo = await execute(['rev-parse', '--is-inside-work-tree'], true)
-      .then(() => true, () => false);
+    const insideRepo = await execute(['rev-parse', '--is-inside-work-tree'], true).then(
+      () => true,
+      () => false,
+    );
     if (insideRepo) {
       context.logger.info(tags.oneLine`
         Directory is already under version control.
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..d6bedcab673f 100644
--- a/packages/angular_devkit/schematics/tasks/repo-init/init-task.ts
+++ b/packages/angular_devkit/schematics/tasks/repo-init/init-task.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 { TaskConfiguration, TaskConfigurationGenerator } from '../../src';
 import { RepositoryInitializerName, RepositoryInitializerTaskOptions } from './options';
 
@@ -16,7 +17,6 @@ export interface CommitOptions {
 
 export class RepositoryInitializerTask
   implements TaskConfigurationGenerator<RepositoryInitializerTaskOptions> {
-
   constructor(public workingDirectory?: string, public commitOptions?: CommitOptions) {}
 
   toConfiguration(): TaskConfiguration<RepositoryInitializerTaskOptions> {
diff --git a/packages/angular_devkit/schematics/tasks/repo-init/options.ts b/packages/angular_devkit/schematics/tasks/repo-init/options.ts
index 8153764058f8..beab8ed5ac78 100644
--- a/packages/angular_devkit/schematics/tasks/repo-init/options.ts
+++ b/packages/angular_devkit/schematics/tasks/repo-init/options.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
  */
+
 export const RepositoryInitializerName = 'repo-init';
 
 export interface RepositoryInitializerTaskFactoryOptions {
diff --git a/packages/angular_devkit/schematics/tasks/run-schematic/executor.ts b/packages/angular_devkit/schematics/tasks/run-schematic/executor.ts
index 4aae9a071c8e..f07ef9216d08 100644
--- a/packages/angular_devkit/schematics/tasks/run-schematic/executor.ts
+++ b/packages/angular_devkit/schematics/tasks/run-schematic/executor.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 { SchematicContext, TaskExecutor } from '../../src';
 import { RunSchematicTaskOptions } from './options';
 
-
-export default function(): TaskExecutor<RunSchematicTaskOptions<{}>> {
+export default function (): TaskExecutor<RunSchematicTaskOptions<{}>> {
   return (options: RunSchematicTaskOptions<{}> | undefined, context: SchematicContext) => {
     if (!options?.name) {
       throw new Error(
diff --git a/packages/angular_devkit/schematics/tasks/run-schematic/options.ts b/packages/angular_devkit/schematics/tasks/run-schematic/options.ts
index a7d90f632755..8034753f266a 100644
--- a/packages/angular_devkit/schematics/tasks/run-schematic/options.ts
+++ b/packages/angular_devkit/schematics/tasks/run-schematic/options.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
  */
+
 export const RunSchematicName = 'run-schematic';
 
 export interface RunSchematicTaskOptions<T> {
diff --git a/packages/angular_devkit/schematics/tasks/run-schematic/task.ts b/packages/angular_devkit/schematics/tasks/run-schematic/task.ts
index b8f17d307802..a51e8bddf223 100644
--- a/packages/angular_devkit/schematics/tasks/run-schematic/task.ts
+++ b/packages/angular_devkit/schematics/tasks/run-schematic/task.ts
@@ -1,14 +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 { TaskConfiguration, TaskConfigurationGenerator } from '../../src';
 import { RunSchematicName, RunSchematicTaskOptions } from './options';
 
-
 export class RunSchematicTask<T> implements TaskConfigurationGenerator<RunSchematicTaskOptions<T>> {
   protected _collection: string | null;
   protected _schematic: string;
@@ -25,7 +25,7 @@ export class RunSchematicTask<T> implements TaskConfigurationGenerator<RunSchema
     }
 
     this._collection = c;
-    this._schematic = s as string;
+    this._schematic = s;
     this._options = o as T;
   }
 
diff --git a/packages/angular_devkit/schematics/tasks/tslint-fix/executor.ts b/packages/angular_devkit/schematics/tasks/tslint-fix/executor.ts
index 793b19a5756f..970b2be39308 100644
--- a/packages/angular_devkit/schematics/tasks/tslint-fix/executor.ts
+++ b/packages/angular_devkit/schematics/tasks/tslint-fix/executor.ts
@@ -1,18 +1,18 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of 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';
-import * as tsLint from 'tslint';  // tslint:disable-line:no-implicit-dependencies
-import * as ts from 'typescript';  // tslint:disable-line:no-implicit-dependencies
+import * as tsLint from 'tslint'; // eslint-disable-line import/no-extraneous-dependencies
+import * as ts from 'typescript'; // eslint-disable-line import/no-extraneous-dependencies
 import { SchematicContext, TaskExecutor } from '../../src';
 import { TslintFixTaskOptions } from './options';
 
-
 function _loadConfiguration(
   Configuration: typeof tsLint.Configuration,
   options: TslintFixTaskOptions,
@@ -30,7 +30,6 @@ function _loadConfiguration(
   }
 }
 
-
 function _getFileContent(
   file: string,
   options: TslintFixTaskOptions,
@@ -40,8 +39,7 @@ function _getFileContent(
   if (program) {
     const source = program.getSourceFile(file);
     if (!source) {
-      const message
-        = `File '${file}' is not part of the TypeScript project '${options.tsConfigPath}'.`;
+      const message = `File '${file}' is not part of the TypeScript project '${options.tsConfigPath}'.`;
       throw new Error(message);
     }
 
@@ -58,14 +56,13 @@ function _getFileContent(
   }
 }
 
-
 function _listAllFiles(root: string): string[] {
   const result: string[] = [];
 
   function _recurse(location: string) {
     const dir = fs.readdirSync(path.join(root, location));
 
-    dir.forEach(name => {
+    dir.forEach((name) => {
       const loc = path.join(location, name);
       if (fs.statSync(path.join(root, loc)).isDirectory()) {
         _recurse(loc);
@@ -83,18 +80,18 @@ function _listAllFiles(root: string): string[] {
 export default function (): TaskExecutor<TslintFixTaskOptions> {
   return async (options: TslintFixTaskOptions = {}, context: SchematicContext) => {
     const root = process.cwd();
-    const tslint = await import('tslint'); // tslint:disable-line:no-implicit-dependencies
-
-    const includes = (
-      Array.isArray(options.includes)
-        ? options.includes
-        : (options.includes ? [options.includes] : [])
-    );
-    const files = (
-      Array.isArray(options.files)
-        ? options.files
-        : (options.files ? [options.files] : [])
-    );
+    const tslint = await import('tslint'); // eslint-disable-line import/no-extraneous-dependencies
+
+    const includes = Array.isArray(options.includes)
+      ? options.includes
+      : options.includes
+      ? [options.includes]
+      : [];
+    const files = Array.isArray(options.files)
+      ? options.files
+      : options.files
+      ? [options.files]
+      : [];
 
     const Linter = tslint.Linter;
     const Configuration = tslint.Configuration;
@@ -114,23 +111,28 @@ export default function (): TaskExecutor<TslintFixTaskOptions> {
 
     if (includes.length > 0) {
       const allFilesRel = _listAllFiles(root);
-      const pattern = '^('
-        + (includes as string[])
-          .map(ex => '('
-            + ex.split(/[\/\\]/g).map(f => f
-              .replace(/[\-\[\]{}()+?.^$|]/g, '\\$&')
-              .replace(/^\*\*/g, '(.+?)?')
-              .replace(/\*/g, '[^/\\\\]*'))
-              .join('[\/\\\\]')
-            + ')')
-          .join('|')
-        + ')($|/|\\\\)';
+      const pattern =
+        '^(' +
+        includes
+          .map(
+            (ex) =>
+              '(' +
+              ex
+                .split(/[\/\\]/g)
+                .map((f) =>
+                  f
+                    .replace(/[\-\[\]{}()+?.^$|]/g, '\\$&')
+                    .replace(/^\*\*/g, '(.+?)?')
+                    .replace(/\*/g, '[^/\\\\]*'),
+                )
+                .join('[/\\\\]') +
+              ')',
+          )
+          .join('|') +
+        ')($|/|\\\\)';
       const re = new RegExp(pattern);
 
-      filesToLint.push(...allFilesRel
-        .filter(x => re.test(x))
-        .map(x => path.join(root, x)),
-      );
+      filesToLint.push(...allFilesRel.filter((x) => re.test(x)).map((x) => path.join(root, x)));
     }
 
     const lintOptions = {
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..3b663fb5db2e 100644
--- a/packages/angular_devkit/schematics/tasks/tslint-fix/executor_spec.ts
+++ b/packages/angular_devkit/schematics/tasks/tslint-fix/executor_spec.ts
@@ -1,11 +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
  */
-// tslint:disable:no-implicit-dependencies
+
+/* eslint-disable import/no-extraneous-dependencies */
 import { getSystemPath, normalize, virtualFs } from '@angular-devkit/core';
 import { TempScopedNodeJsSyncHost } from '@angular-devkit/core/node/testing';
 import { HostTree } from '@angular-devkit/schematics';
@@ -14,38 +15,46 @@ import * as path from 'path';
 import { Observable, concat } from 'rxjs';
 import { catchError } from 'rxjs/operators';
 
-const isWindowsBazel = process.env.RUNFILES_MANIFEST_ONLY === '1'
-  && process.env.RUNFILES_MANIFEST_FILE;
+const isWindowsBazel =
+  process.env.RUNFILES_MANIFEST_ONLY === '1' && process.env.RUNFILES_MANIFEST_FILE;
 
 describe('TsLintTaskExecutor', () => {
-
-  it('works with config object', done => {
+  it('works with config object', (done) => {
     const testRunner = new SchematicTestRunner(
       '@_/test',
       require.resolve('./test/collection.json'),
     );
 
     const host = new TempScopedNodeJsSyncHost();
-    host.write(normalize('/file.ts'), virtualFs.stringToFileBuffer(`
+    host
+      .write(
+        normalize('/file.ts'),
+        virtualFs.stringToFileBuffer(`
       export function() { console.log(1); }
-    `)).subscribe();
+    `),
+      )
+      .subscribe();
     const tree = new UnitTestTree(new HostTree(host));
 
-    testRunner.runSchematicAsync('run-task', null, tree)
-      .toPromise().then(done, done.fail);
+    testRunner.runSchematicAsync('run-task', null, tree).toPromise().then(done, done.fail);
   });
 
-  it('shows errors with config object', done => {
+  it('shows errors with config object', (done) => {
     const testRunner = new SchematicTestRunner(
       '@_/test',
       require.resolve('./test/collection.json'),
     );
 
     const host = new TempScopedNodeJsSyncHost();
-    host.write(normalize('/file.ts'), virtualFs.stringToFileBuffer(`
+    host
+      .write(
+        normalize('/file.ts'),
+        virtualFs.stringToFileBuffer(`
       // ${'...MORE_THAN_100'.repeat(10)}
       export function() { console.log(1); }
-    `)).subscribe();
+    `),
+      )
+      .subscribe();
     const tree = new UnitTestTree(new HostTree(host));
 
     const messages: string[] = [];
@@ -53,9 +62,9 @@ describe('TsLintTaskExecutor', () => {
 
     concat(
       testRunner.runSchematicAsync('run-task', null, tree),
-      new Observable<void>(obs => {
+      new Observable<void>((obs) => {
         process.chdir(getSystemPath(host.root));
-        testRunner.logger.subscribe(x => messages.push(x.message));
+        testRunner.logger.subscribe((x) => messages.push(x.message));
         testRunner.engine.executePostTasks().subscribe(obs);
       }).pipe(
         catchError(() => {
@@ -64,16 +73,18 @@ describe('TsLintTaskExecutor', () => {
           return [];
         }),
       ),
-      new Observable<void>(obs => {
-        expect(messages.find(msg => /\b80\b/.test(msg))).not.toBeUndefined();
+      new Observable<void>((obs) => {
+        expect(messages.find((msg) => /\b80\b/.test(msg))).not.toBeUndefined();
         expect(error).toBe(true);
 
         obs.complete();
       }),
-    ).toPromise().then(done, done.fail);
+    )
+      .toPromise()
+      .then(done, done.fail);
   });
 
-  it('supports custom rules in the project (pass)', done => {
+  it('supports custom rules in the project (pass)', (done) => {
     // This test is disabled on Windows Bazel runs because it relies on TSLint custom rule
     // loading behavior, which doesn't work with runfile resolution.
     if (isWindowsBazel) {
@@ -88,24 +99,31 @@ describe('TsLintTaskExecutor', () => {
     );
 
     const host = new TempScopedNodeJsSyncHost();
-    host.write(normalize('/file.ts'), virtualFs.stringToFileBuffer(`
+    host
+      .write(
+        normalize('/file.ts'),
+        virtualFs.stringToFileBuffer(`
       console.log('hello world');
-    `)).subscribe();
+    `),
+      )
+      .subscribe();
     const tree = new UnitTestTree(new HostTree(host));
 
     const messages: string[] = [];
 
     concat(
       testRunner.runSchematicAsync('custom-rule', { shouldPass: true }, tree),
-      new Observable<void>(obs => {
+      new Observable<void>((obs) => {
         process.chdir(getSystemPath(host.root));
-        testRunner.logger.subscribe(x => messages.push(x.message));
+        testRunner.logger.subscribe((x) => messages.push(x.message));
         testRunner.engine.executePostTasks().subscribe(obs);
       }),
-    ).toPromise().then(done, done.fail);
+    )
+      .toPromise()
+      .then(done, done.fail);
   });
 
-  it('supports custom rules in the project (fail)', done => {
+  it('supports custom rules in the project (fail)', (done) => {
     // This test is disabled on Windows Bazel runs because it relies on TSLint custom rule
     // loading behavior, which doesn't work with runfile resolution.
     if (isWindowsBazel) {
@@ -120,9 +138,14 @@ describe('TsLintTaskExecutor', () => {
     );
 
     const host = new TempScopedNodeJsSyncHost();
-    host.write(normalize('/file.ts'), virtualFs.stringToFileBuffer(`
+    host
+      .write(
+        normalize('/file.ts'),
+        virtualFs.stringToFileBuffer(`
       console.log('hello world');
-    `)).subscribe();
+    `),
+      )
+      .subscribe();
     const tree = new UnitTestTree(new HostTree(host));
 
     const messages: string[] = [];
@@ -130,9 +153,9 @@ describe('TsLintTaskExecutor', () => {
 
     concat(
       testRunner.runSchematicAsync('custom-rule', { shouldPass: false }, tree),
-      new Observable<void>(obs => {
+      new Observable<void>((obs) => {
         process.chdir(getSystemPath(host.root));
-        testRunner.logger.subscribe(x => messages.push(x.message));
+        testRunner.logger.subscribe((x) => messages.push(x.message));
         testRunner.engine.executePostTasks().subscribe(obs);
       }).pipe(
         catchError(() => {
@@ -141,13 +164,14 @@ describe('TsLintTaskExecutor', () => {
           return [];
         }),
       ),
-      new Observable<void>(obs => {
-        expect(messages.find(msg => /\bcustom-rule fail\b/.test(msg))).not.toBeUndefined();
+      new Observable<void>((obs) => {
+        expect(messages.find((msg) => /\bcustom-rule fail\b/.test(msg))).not.toBeUndefined();
         expect(error).toBe(true);
 
         obs.complete();
       }),
-    ).toPromise().then(done, done.fail);
+    )
+      .toPromise()
+      .then(done, done.fail);
   });
-
 });
diff --git a/packages/angular_devkit/schematics/tasks/tslint-fix/options.ts b/packages/angular_devkit/schematics/tasks/tslint-fix/options.ts
index 5071dc305c8e..707e9686d03c 100644
--- a/packages/angular_devkit/schematics/tasks/tslint-fix/options.ts
+++ b/packages/angular_devkit/schematics/tasks/tslint-fix/options.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 { JsonObject } from '@angular-devkit/core';
 
 /** @deprecated since version 11. Use `ng lint --fix` directly instead. */
diff --git a/packages/angular_devkit/schematics/tasks/tslint-fix/task.ts b/packages/angular_devkit/schematics/tasks/tslint-fix/task.ts
index 12ad5c4e1e20..89b26211c6ee 100644
--- a/packages/angular_devkit/schematics/tasks/tslint-fix/task.ts
+++ b/packages/angular_devkit/schematics/tasks/tslint-fix/task.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 { JsonObject } from '@angular-devkit/core';
 import { TaskConfiguration, TaskConfigurationGenerator } from '../../src';
 import { TslintFixName, TslintFixTaskOptions, TslintFixTaskOptionsBase } from './options';
 
-
 /** @deprecated since version 11. Use `ng lint --fix` directly instead. */
 export class TslintFixTask implements TaskConfigurationGenerator<TslintFixTaskOptions> {
   protected _configOrPath: null | string | JsonObject;
@@ -33,9 +33,10 @@ export class TslintFixTask implements TaskConfigurationGenerator<TslintFixTaskOp
 
   toConfiguration(): TaskConfiguration<TslintFixTaskOptions> {
     const path = typeof this._configOrPath == 'string' ? { tslintPath: this._configOrPath } : {};
-    const config = typeof this._configOrPath == 'object' && this._configOrPath !== null
-                 ? { tslintConfig: this._configOrPath }
-                 : {};
+    const config =
+      typeof this._configOrPath == 'object' && this._configOrPath !== null
+        ? { tslintConfig: this._configOrPath }
+        : {};
     const options = {
       ...this._options,
       ...path,
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..76bd8deccb90 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,30 +1,30 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import {
-  Rule,
-  SchematicContext,
-  Tree,
-} from '@angular-devkit/schematics';  // tslint:disable-line:no-implicit-dependencies
-import {
-  TslintFixTask,
-} from '@angular-devkit/schematics/tasks';  // tslint:disable-line:no-implicit-dependencies
+
+import { Rule, SchematicContext, Tree } from '@angular-devkit/schematics';
+import { TslintFixTask } from '@angular-devkit/schematics/tasks'; // eslint-disable-line import/no-extraneous-dependencies
 import * as path from 'path';
 
-export default function(options: { shouldPass: boolean }): Rule {
+export default function (options: { shouldPass: boolean }): Rule {
   return (_: Tree, context: SchematicContext) => {
-    context.addTask(new TslintFixTask({
-      rulesDirectory: path.join(__dirname, 'rules'),
-      rules: {
-        'custom-rule': [true, options.shouldPass],
-      },
-    }, {
-      includes: '*.ts',
-      silent: false,
-    }));
+    context.addTask(
+      new TslintFixTask(
+        {
+          rulesDirectory: path.join(__dirname, 'rules'),
+          rules: {
+            'custom-rule': [true, options.shouldPass],
+          },
+        },
+        {
+          includes: '*.ts',
+          silent: false,
+        },
+      ),
+    );
   };
 }
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..104d230c40b6 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,20 +1,20 @@
-"use strict";
+'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
  */
-Object.defineProperty(exports, "__esModule", { value: true });
-const Lint = require('tslint');
 
+Object.defineProperty(exports, '__esModule', { value: true });
+const Lint = require('tslint');
 
 class Rule extends Lint.Rules.AbstractRule {
   apply(sourceFile) {
     const shouldPass = this.getOptions().ruleArguments[0];
     if (!shouldPass) {
-      return [ new Lint.RuleFailure(sourceFile, 0, 0, 'custom-rule fail', this.ruleName) ];
+      return [new Lint.RuleFailure(sourceFile, 0, 0, 'custom-rule fail', this.ruleName)];
     } else {
       return [];
     }
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..e705667df5de 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,28 +1,28 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-import {
-  Rule,
-  SchematicContext,
-  Tree,
-} from '@angular-devkit/schematics';  // tslint:disable-line:no-implicit-dependencies
-import {
-  TslintFixTask,
-} from '@angular-devkit/schematics/tasks';  // tslint:disable-line:no-implicit-dependencies
 
-export default function(): Rule {
+import { Rule, SchematicContext, Tree } from '@angular-devkit/schematics';
+import { TslintFixTask } from '@angular-devkit/schematics/tasks'; // eslint-disable-line import/no-extraneous-dependencies
+
+export default function (): Rule {
   return (_: Tree, context: SchematicContext) => {
-    context.addTask(new TslintFixTask({
-      rules: {
-        'max-line-length': [true, 80],
-      },
-    }, {
-      includes: '*.ts',
-      silent: false,
-    }));
+    context.addTask(
+      new TslintFixTask(
+        {
+          rules: {
+            'max-line-length': [true, 80],
+          },
+        },
+        {
+          includes: '*.ts',
+          silent: false,
+        },
+      ),
+    );
   };
 }
diff --git a/packages/angular_devkit/schematics/testing/BUILD.bazel b/packages/angular_devkit/schematics/testing/BUILD.bazel
index 2990cad98620..5442ff4b5890 100644
--- a/packages/angular_devkit/schematics/testing/BUILD.bazel
+++ b/packages/angular_devkit/schematics/testing/BUILD.bazel
@@ -13,6 +13,7 @@ ts_library(
     srcs = glob(
         include = ["**/*.ts"],
     ),
+    data = ["package.json"],
     module_name = "@angular-devkit/schematics/testing",
     module_root = "index.d.ts",
     deps = [
diff --git a/packages/angular_devkit/schematics/testing/index.ts b/packages/angular_devkit/schematics/testing/index.ts
index 05ba43117ca3..10c31ba36626 100644
--- a/packages/angular_devkit/schematics/testing/index.ts
+++ b/packages/angular_devkit/schematics/testing/index.ts
@@ -1,8 +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
  */
+
 export * from './schematic-test-runner';
diff --git a/packages/angular_devkit/schematics/testing/package.json b/packages/angular_devkit/schematics/testing/package.json
new file mode 100644
index 000000000000..05a248263ea7
--- /dev/null
+++ b/packages/angular_devkit/schematics/testing/package.json
@@ -0,0 +1,5 @@
+{
+  "name": "@angular-devkit/schematics/testing",
+  "main": "index.js",
+  "typings": "index.d.ts"
+}
diff --git a/packages/angular_devkit/schematics/testing/schematic-test-runner.ts b/packages/angular_devkit/schematics/testing/schematic-test-runner.ts
index bae056e799f4..bd3030eb3974 100644
--- a/packages/angular_devkit/schematics/testing/schematic-test-runner.ts
+++ b/packages/angular_devkit/schematics/testing/schematic-test-runner.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 { logging, schema } from '@angular-devkit/core';
 import { Observable, of as observableOf } from 'rxjs';
 import { map } from 'rxjs/operators';
@@ -22,16 +23,12 @@ import {
 } from '../src';
 import { callRule } from '../src/rules/call';
 import { BuiltinTaskExecutor } from '../tasks/node';
-import {
-  NodeModulesTestEngineHost,
-  validateOptionsWithSchema,
-} from '../tools';
-
+import { NodeModulesTestEngineHost, validateOptionsWithSchema } from '../tools';
 
 export class UnitTestTree extends DelegateTree {
   get files() {
     const result: string[] = [];
-    this.visit(path => result.push(path));
+    this.visit((path) => result.push(path));
 
     return result;
   }
@@ -68,9 +65,15 @@ export class SchematicTestRunner {
     this._collection = this._engine.createCollection(this._collectionName);
   }
 
-  get engine() { return this._engine; }
-  get logger(): logging.Logger { return this._logger; }
-  get tasks(): TaskConfiguration[] { return [...this._engineHost.tasks]; }
+  get engine() {
+    return this._engine;
+  }
+  get logger(): logging.Logger {
+    return this._logger;
+  }
+  get tasks(): TaskConfiguration[] {
+    return [...this._engineHost.tasks];
+  }
 
   registerCollection(collectionName: string, collectionPath: string) {
     this._engineHost.registerCollection(collectionName, collectionPath);
@@ -82,11 +85,12 @@ export class SchematicTestRunner {
     tree?: Tree,
   ): Observable<UnitTestTree> {
     const schematic = this._collection.createSchematic(schematicName, true);
-    const host = observableOf(tree || new HostTree);
+    const host = observableOf(tree || new HostTree());
     this._engineHost.clearTasks();
 
-    return schematic.call(opts || {}, host, { logger: this._logger })
-      .pipe(map(tree => new UnitTestTree(tree)));
+    return schematic
+      .call(opts || {}, host, { logger: this._logger })
+      .pipe(map((tree) => new UnitTestTree(tree)));
   }
 
   runExternalSchematicAsync<SchematicSchemaT>(
@@ -97,11 +101,12 @@ export class SchematicTestRunner {
   ): Observable<UnitTestTree> {
     const externalCollection = this._engine.createCollection(collectionName);
     const schematic = externalCollection.createSchematic(schematicName, true);
-    const host = observableOf(tree || new HostTree);
+    const host = observableOf(tree || new HostTree());
     this._engineHost.clearTasks();
 
-    return schematic.call(opts || {}, host, { logger: this._logger })
-      .pipe(map(tree => new UnitTestTree(tree)));
+    return schematic
+      .call(opts || {}, host, { logger: this._logger })
+      .pipe(map((tree) => new UnitTestTree(tree)));
   }
 
   callRule(rule: Rule, tree: Tree, parentContext?: Partial<SchematicContext>): Observable<Tree> {
diff --git a/packages/angular_devkit/schematics/tools/BUILD.bazel b/packages/angular_devkit/schematics/tools/BUILD.bazel
index 941337939038..56a3203f06a1 100644
--- a/packages/angular_devkit/schematics/tools/BUILD.bazel
+++ b/packages/angular_devkit/schematics/tools/BUILD.bazel
@@ -19,6 +19,7 @@ ts_library(
             "test/**/*.ts",
         ],
     ),
+    data = ["package.json"],
     module_name = "@angular-devkit/schematics/tools",
     module_root = "index.d.ts",
     # The attribute below is needed in g3 to turn off strict typechecking
diff --git a/packages/angular_devkit/schematics/tools/description.ts b/packages/angular_devkit/schematics/tools/description.ts
index 52ee09d13f7c..536de01d4876 100644
--- a/packages/angular_devkit/schematics/tools/description.ts
+++ b/packages/angular_devkit/schematics/tools/description.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 { JsonObject } from '@angular-devkit/core';
 import {
   Collection,
@@ -17,7 +18,6 @@ import {
   TypedSchematicContext,
 } from '../src';
 
-
 export interface FileSystemCollectionDescription {
   readonly name: string;
   readonly path: string;
@@ -25,7 +25,6 @@ export interface FileSystemCollectionDescription {
   readonly schematics: { [name: string]: FileSystemSchematicDesc };
 }
 
-
 export interface FileSystemSchematicJsonDescription {
   readonly aliases?: string[];
   readonly factory: string;
@@ -45,21 +44,31 @@ export interface FileSystemSchematicDescription extends FileSystemSchematicJsonD
   readonly factoryFn: RuleFactory<{}>;
 }
 
-
 /**
  * Used to simplify typings.
  */
-export declare type FileSystemEngine
-  = Engine<FileSystemCollectionDescription, FileSystemSchematicDescription>;
-export declare type FileSystemEngineHost
-  = EngineHost<FileSystemCollectionDescription, FileSystemSchematicDescription>;
-export declare type FileSystemCollection
-  = Collection<FileSystemCollectionDescription, FileSystemSchematicDescription>;
-export declare type FileSystemSchematic
-  = Schematic<FileSystemCollectionDescription, FileSystemSchematicDescription>;
-export declare type FileSystemCollectionDesc
-  = CollectionDescription<FileSystemCollectionDescription>;
-export declare type FileSystemSchematicDesc
-  = SchematicDescription<FileSystemCollectionDescription, FileSystemSchematicDescription>;
-export declare type FileSystemSchematicContext
-  = TypedSchematicContext<FileSystemCollectionDescription, FileSystemSchematicDescription>;
+export declare type FileSystemEngine = Engine<
+  FileSystemCollectionDescription,
+  FileSystemSchematicDescription
+>;
+export declare type FileSystemEngineHost = EngineHost<
+  FileSystemCollectionDescription,
+  FileSystemSchematicDescription
+>;
+export declare type FileSystemCollection = Collection<
+  FileSystemCollectionDescription,
+  FileSystemSchematicDescription
+>;
+export declare type FileSystemSchematic = Schematic<
+  FileSystemCollectionDescription,
+  FileSystemSchematicDescription
+>;
+export declare type FileSystemCollectionDesc = CollectionDescription<FileSystemCollectionDescription>;
+export declare type FileSystemSchematicDesc = SchematicDescription<
+  FileSystemCollectionDescription,
+  FileSystemSchematicDescription
+>;
+export declare type FileSystemSchematicContext = TypedSchematicContext<
+  FileSystemCollectionDescription,
+  FileSystemSchematicDescription
+>;
diff --git a/packages/angular_devkit/schematics/tools/export-ref.ts b/packages/angular_devkit/schematics/tools/export-ref.ts
index a4bf7b89e759..e72b67b46df2 100644
--- a/packages/angular_devkit/schematics/tools/export-ref.ts
+++ b/packages/angular_devkit/schematics/tools/export-ref.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 { dirname, resolve } from 'path';
 
+import { dirname, resolve } from 'path';
 
 export class ExportStringRef<T> {
   private _ref?: T;
@@ -26,7 +26,13 @@ export class ExportStringRef<T> {
     }
   }
 
-  get ref() { return this._ref; }
-  get module() { return this._module; }
-  get path() { return this._path; }
+  get ref() {
+    return this._ref;
+  }
+  get module() {
+    return this._module;
+  }
+  get path() {
+    return this._path;
+  }
 }
diff --git a/packages/angular_devkit/schematics/tools/export-ref_spec.ts b/packages/angular_devkit/schematics/tools/export-ref_spec.ts
index 782464c65cce..26d2c08c5655 100644
--- a/packages/angular_devkit/schematics/tools/export-ref_spec.ts
+++ b/packages/angular_devkit/schematics/tools/export-ref_spec.ts
@@ -1,14 +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 * as path from 'path';
-import { CollectionCannotBeResolvedException } from '.';
 import { ExportStringRef } from './export-ref';
-
+import { CollectionCannotBeResolvedException } from '.';
 
 describe('ExportStringRef', () => {
   // Depending on how the package is built the module might be either .js or .ts.
diff --git a/packages/angular_devkit/schematics/tools/fallback-engine-host.ts b/packages/angular_devkit/schematics/tools/fallback-engine-host.ts
index d6d0c61eeb22..3af0fd2a841c 100644
--- a/packages/angular_devkit/schematics/tools/fallback-engine-host.ts
+++ b/packages/angular_devkit/schematics/tools/fallback-engine-host.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 { Observable, of as observableOf, throwError } from 'rxjs';
 import { mergeMap } from 'rxjs/operators';
 import { Url } from 'url';
@@ -20,7 +21,6 @@ import {
   UnregisteredTaskException,
 } from '../src';
 
-
 export type FallbackCollectionDescription = {
   host: EngineHost<{}, {}>;
   description: CollectionDescription<{}>;
@@ -28,9 +28,10 @@ export type FallbackCollectionDescription = {
 export type FallbackSchematicDescription = {
   description: SchematicDescription<{}, {}>;
 };
-export type FallbackContext =
-  TypedSchematicContext<FallbackCollectionDescription, FallbackSchematicDescription>;
-
+export type FallbackContext = TypedSchematicContext<
+  FallbackCollectionDescription,
+  FallbackSchematicDescription
+>;
 
 /**
  * An EngineHost that support multiple hosts in a fallback configuration. If a host does not
@@ -39,22 +40,22 @@ export type FallbackContext =
 export class FallbackEngineHost implements EngineHost<{}, {}> {
   private _hosts: EngineHost<{}, {}>[] = [];
 
-  constructor() {}
-
   addHost<CollectionT extends object, SchematicT extends object>(
     host: EngineHost<CollectionT, SchematicT>,
   ) {
     this._hosts.push(host);
   }
 
-  createCollectionDescription(name: string, requester?: CollectionDescription<{}>): CollectionDescription<FallbackCollectionDescription> {
+  createCollectionDescription(
+    name: string,
+    requester?: CollectionDescription<{}>,
+  ): CollectionDescription<FallbackCollectionDescription> {
     for (const host of this._hosts) {
       try {
         const description = host.createCollectionDescription(name, requester);
 
         return { name, host, description };
-      } catch (_) {
-      }
+      } catch (_) {}
     }
 
     throw new UnknownCollectionException(name);
@@ -74,14 +75,12 @@ export class FallbackEngineHost implements EngineHost<{}, {}> {
 
   getSchematicRuleFactory<OptionT extends object>(
     schematic: SchematicDescription<FallbackCollectionDescription, FallbackSchematicDescription>,
-    collection: CollectionDescription<FallbackCollectionDescription>): RuleFactory<OptionT> {
+    collection: CollectionDescription<FallbackCollectionDescription>,
+  ): RuleFactory<OptionT> {
     return collection.host.getSchematicRuleFactory(schematic.description, collection.description);
   }
 
-  createSourceFromUrl(
-    url: Url,
-    context: FallbackContext,
-  ): Source | null {
+  createSourceFromUrl(url: Url, context: FallbackContext): Source | null {
     return context.schematic.collection.description.host.createSourceFromUrl(url, context);
   }
 
@@ -90,18 +89,18 @@ export class FallbackEngineHost implements EngineHost<{}, {}> {
     options: OptionT,
     context?: FallbackContext,
   ): Observable<ResultT> {
-    // tslint:disable-next-line:no-any https://github.com/ReactiveX/rxjs/issues/3989
-    return ((observableOf(options) as any)
-      .pipe(...this._hosts
-        .map(host => mergeMap((opt: {}) => host.transformOptions(schematic, opt, context))),
-      )
-    ) as {} as Observable<ResultT>;
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    return ((observableOf(options) as any).pipe(
+      ...this._hosts.map((host) =>
+        mergeMap((opt: {}) => host.transformOptions(schematic, opt, context)),
+      ),
+    ) as {}) as Observable<ResultT>;
   }
 
   transformContext(context: FallbackContext): FallbackContext {
     let result = context;
 
-    this._hosts.forEach(host => {
+    this._hosts.forEach((host) => {
       result = (host.transformContext(result) || result) as FallbackContext;
     });
 
@@ -110,9 +109,9 @@ export class FallbackEngineHost implements EngineHost<{}, {}> {
 
   listSchematicNames(collection: CollectionDescription<FallbackCollectionDescription>): string[] {
     const allNames = new Set<string>();
-    this._hosts.forEach(host => {
+    this._hosts.forEach((host) => {
       try {
-        host.listSchematicNames(collection.description).forEach(name => allNames.add(name));
+        host.listSchematicNames(collection.description).forEach((name) => allNames.add(name));
       } catch (_) {}
     });
 
@@ -138,5 +137,4 @@ export class FallbackEngineHost implements EngineHost<{}, {}> {
 
     return false;
   }
-
 }
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 bae042aa74d8..c2b8a8f656e5 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,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 {
   BaseException,
   InvalidJsonCharacterException,
@@ -16,12 +17,7 @@ import {
 import { NodeJsSyncHost } from '@angular-devkit/core/node';
 import { existsSync, statSync } from 'fs';
 import { dirname, isAbsolute, join, resolve } from 'path';
-import {
-  Observable,
-  from as observableFrom,
-  isObservable,
-  throwError,
-} from 'rxjs';
+import { Observable, isObservable, from as observableFrom, throwError } from 'rxjs';
 import { Url } from 'url';
 import {
   HostCreateTree,
@@ -40,16 +36,14 @@ import {
 } from './description';
 import { readJsonFile } from './file-system-utility';
 
-
-export declare type OptionTransform<T extends object, R extends object>
-    = (
-      schematic: FileSystemSchematicDescription,
-      options: T,
-      context?: FileSystemSchematicContext,
-    ) => Observable<R> | PromiseLike<R> | R;
-export declare type ContextTransform
-    = (context: FileSystemSchematicContext) => FileSystemSchematicContext;
-
+export declare type OptionTransform<T extends object, R extends object> = (
+  schematic: FileSystemSchematicDescription,
+  options: T,
+  context?: FileSystemSchematicContext,
+) => Observable<R> | PromiseLike<R> | R;
+export declare type ContextTransform = (
+  context: FileSystemSchematicContext,
+) => FileSystemSchematicContext;
 
 export class CollectionCannotBeResolvedException extends BaseException {
   constructor(name: string) {
@@ -82,25 +76,34 @@ export class FactoryCannotBeResolvedException extends BaseException {
   }
 }
 export class CollectionMissingSchematicsMapException extends BaseException {
-  constructor(name: string) { super(`Collection "${name}" does not have a schematics map.`); }
+  constructor(name: string) {
+    super(`Collection "${name}" does not have a schematics map.`);
+  }
 }
 export class CollectionMissingFieldsException extends BaseException {
-  constructor(name: string) { super(`Collection "${name}" is missing fields.`); }
+  constructor(name: string) {
+    super(`Collection "${name}" is missing fields.`);
+  }
 }
 export class SchematicMissingFieldsException extends BaseException {
-  constructor(name: string) { super(`Schematic "${name}" is missing fields.`); }
+  constructor(name: string) {
+    super(`Schematic "${name}" is missing fields.`);
+  }
 }
 export class SchematicMissingDescriptionException extends BaseException {
-  constructor(name: string) { super(`Schematics "${name}" does not have a description.`); }
+  constructor(name: string) {
+    super(`Schematics "${name}" does not have a description.`);
+  }
 }
 export class SchematicNameCollisionException extends BaseException {
   constructor(name: string) {
-    super(`Schematics/alias ${JSON.stringify(name)} collides with another alias or schematic`
-          + ' name.');
+    super(
+      `Schematics/alias ${JSON.stringify(name)} collides with another alias or schematic` +
+        ' name.',
+    );
   }
 }
 
-
 /**
  * A EngineHost base class that uses the file system to resolve collections. This is the base of
  * all other EngineHost provided by the tooling part of the Schematics library.
@@ -108,15 +111,20 @@ export class SchematicNameCollisionException extends BaseException {
 export abstract class FileSystemEngineHostBase implements FileSystemEngineHost {
   protected abstract _resolveCollectionPath(name: string, requester?: string): string;
   protected abstract _resolveReferenceString(
-      name: string, parentPath: string): { ref: RuleFactory<{}>, path: string } | null;
+    name: string,
+    parentPath: string,
+  ): { ref: RuleFactory<{}>; path: string } | null;
   protected abstract _transformCollectionDescription(
-      name: string, desc: Partial<FileSystemCollectionDesc>): FileSystemCollectionDesc;
+    name: string,
+    desc: Partial<FileSystemCollectionDesc>,
+  ): FileSystemCollectionDesc;
   protected abstract _transformSchematicDescription(
-      name: string,
-      collection: FileSystemCollectionDesc,
-      desc: Partial<FileSystemSchematicDesc>): FileSystemSchematicDesc;
+    name: string,
+    collection: FileSystemCollectionDesc,
+    desc: Partial<FileSystemSchematicDesc>,
+  ): FileSystemSchematicDesc;
 
-  // tslint:disable-next-line:no-any
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   private _transforms: OptionTransform<any, any>[] = [];
   private _contextTransforms: ContextTransform[] = [];
   private _taskFactories = new Map<string, () => Observable<TaskExecutor>>();
@@ -221,8 +229,8 @@ export abstract class FileSystemEngineHostBase implements FileSystemEngineHost {
     if (partialDesc.extends) {
       const index = partialDesc.extends.indexOf(':');
       const collectionName = index !== -1 ? partialDesc.extends.substr(0, index) : null;
-      const schematicName = index === -1 ?
-        partialDesc.extends : partialDesc.extends.substr(index + 1);
+      const schematicName =
+        index === -1 ? partialDesc.extends : partialDesc.extends.substr(index + 1);
 
       if (collectionName !== null) {
         const extendCollection = this.createCollectionDescription(collectionName);
@@ -257,8 +265,8 @@ export abstract class FileSystemEngineHostBase implements FileSystemEngineHost {
     // This is needed because on Bazel under Windows the data files (such as the collection or
     // url files) are not in the same place as the compiled JS.
     const maybePath = join(collectionPath, partialDesc.factory);
-    const path = existsSync(maybePath) && statSync(maybePath).isDirectory()
-      ? maybePath : dirname(maybePath);
+    const path =
+      existsSync(maybePath) && statSync(maybePath).isDirectory() ? maybePath : dirname(maybePath);
 
     return this._transformSchematicDescription(name, collection, {
       ...partialDesc,
@@ -279,7 +287,9 @@ export abstract class FileSystemEngineHostBase implements FileSystemEngineHost {
           // Check if context has necessary FileSystemSchematicContext path property
           const fileDescription = context.schematic.description as { path?: string };
           if (fileDescription.path === undefined) {
-            throw new Error('Unsupported schematic context. Expected a FileSystemSchematicContext.');
+            throw new Error(
+              'Unsupported schematic context. Expected a FileSystemSchematicContext.',
+            );
           }
 
           // Resolve all file:///a/b/c/d from the schematic's own path, and not the current
@@ -302,23 +312,25 @@ export abstract class FileSystemEngineHostBase implements FileSystemEngineHost {
       let transformedOptions = options;
       for (const transformer of this._transforms) {
         const transformerResult = transformer(schematic, transformedOptions, context);
-        transformedOptions = await (isObservable(transformerResult) ? transformerResult.toPromise() : transformerResult);
+        transformedOptions = await (isObservable(transformerResult)
+          ? transformerResult.toPromise()
+          : transformerResult);
       }
 
       return transformedOptions;
     };
 
-    return observableFrom(transform()) as unknown as Observable<ResultT>;
+    return (observableFrom(transform()) as unknown) as Observable<ResultT>;
   }
 
   transformContext(context: FileSystemSchematicContext): FileSystemSchematicContext {
-    // tslint:disable-next-line:no-any https://github.com/ReactiveX/rxjs/issues/3989
     return this._contextTransforms.reduce((acc, curr) => curr(acc), context);
   }
 
   getSchematicRuleFactory<OptionT extends object>(
     schematic: FileSystemSchematicDesc,
-    _collection: FileSystemCollectionDesc): RuleFactory<OptionT> {
+    _collection: FileSystemCollectionDesc,
+  ): RuleFactory<OptionT> {
     return schematic.factoryFn;
   }
 
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..e4087a544e9b 100644
--- a/packages/angular_devkit/schematics/tools/file-system-engine-host.ts
+++ b/packages/angular_devkit/schematics/tools/file-system-engine-host.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 { existsSync } from 'fs';
 import { join } from 'path';
 import { Observable, from, throwError } from 'rxjs';
@@ -19,13 +20,14 @@ import {
   SchematicMissingFieldsException,
 } from './file-system-engine-host-base';
 
-
 /**
  * A simple EngineHost that uses a root with one directory per collection inside of it. The
  * collection declaration follows the same rules as the regular FileSystemEngineHostBase.
  */
 export class FileSystemEngineHost extends FileSystemEngineHostBase {
-  constructor(protected _root: string) { super(); }
+  constructor(protected _root: string) {
+    super();
+  }
 
   protected _resolveCollectionPath(name: string): string {
     try {
@@ -34,7 +36,7 @@ export class FileSystemEngineHost extends FileSystemEngineHostBase {
       if (existsSync(maybePath)) {
         return maybePath;
       }
-    } catch (error) { }
+    } catch (error) {}
 
     try {
       // Allow `${_root}/${name}/collection.json.
@@ -42,8 +44,7 @@ export class FileSystemEngineHost extends FileSystemEngineHostBase {
       if (existsSync(maybePath)) {
         return maybePath;
       }
-    } catch (error) { }
-
+    } catch (error) {}
 
     throw new CollectionCannotBeResolvedException(name);
   }
@@ -84,7 +85,7 @@ export class FileSystemEngineHost extends FileSystemEngineHostBase {
     return desc as FileSystemSchematicDesc;
   }
 
-  hasTaskExecutor(name: string): boolean {
+  override hasTaskExecutor(name: string): boolean {
     if (super.hasTaskExecutor(name)) {
       return true;
     }
@@ -99,12 +100,13 @@ export class FileSystemEngineHost extends FileSystemEngineHostBase {
     return false;
   }
 
-  createTaskExecutor(name: string): Observable<TaskExecutor> {
+  override createTaskExecutor(name: string): Observable<TaskExecutor> {
     if (!super.hasTaskExecutor(name)) {
       try {
         const path = require.resolve(join(this._root, name));
 
-        return from(import(path).then(mod => mod.default())).pipe(
+        // Default handling code is for old tasks that incorrectly export `default` with non-ESM module
+        return from(import(path).then((mod) => (mod.default?.default || mod.default)())).pipe(
           catchError(() => throwError(new UnregisteredTaskException(name))),
         );
       } catch {}
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..feeba0c803cc 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,22 +1,24 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-// tslint:disable:no-any no-big-function no-implicit-dependencies
+
+/* eslint-disable @typescript-eslint/no-explicit-any, import/no-extraneous-dependencies */
 import { normalize, virtualFs } from '@angular-devkit/core';
 import { HostSink, HostTree, SchematicEngine } from '@angular-devkit/schematics';
 import { FileSystemEngineHost } from '@angular-devkit/schematics/tools';
 import * as path from 'path';
 import { from, of as observableOf } from 'rxjs';
 
-
 describe('FileSystemEngineHost', () => {
   // We need to resolve a file that actually exists, and not just a folder.
-  // tslint:disable-next-line:max-line-length
-  const root = path.join(path.dirname(require.resolve(__filename)), '../../../../tests/angular_devkit/schematics/tools/file-system-engine-host');
+  const root = path.join(
+    path.dirname(require.resolve(__filename)),
+    '../../../../tests/angular_devkit/schematics/tools/file-system-engine-host',
+  );
 
   it('works', () => {
     const engineHost = new FileSystemEngineHost(root);
@@ -58,7 +60,6 @@ describe('FileSystemEngineHost', () => {
     expect(schematic3.description.name).toBe('schematic1');
   });
 
-
   it('allows dupe aliases for a single schematic', () => {
     const engineHost = new FileSystemEngineHost(root);
     const engine = new SchematicEngine(engineHost);
@@ -97,8 +98,7 @@ describe('FileSystemEngineHost', () => {
     const testCollection = engine.createCollection('extends-basic-string');
 
     expect(testCollection.baseDescriptions).not.toBeUndefined();
-    expect(testCollection.baseDescriptions
-           && testCollection.baseDescriptions.length).toBe(1);
+    expect(testCollection.baseDescriptions && testCollection.baseDescriptions.length).toBe(1);
 
     const schematic1 = engine.createSchematic('schematic1', testCollection);
 
@@ -122,8 +122,7 @@ describe('FileSystemEngineHost', () => {
     const testCollection = engine.createCollection('extends-basic');
 
     expect(testCollection.baseDescriptions).not.toBeUndefined();
-    expect(testCollection.baseDescriptions
-           && testCollection.baseDescriptions.length).toBe(1);
+    expect(testCollection.baseDescriptions && testCollection.baseDescriptions.length).toBe(1);
 
     const schematic1 = engine.createSchematic('schematic1', testCollection);
 
@@ -147,8 +146,7 @@ describe('FileSystemEngineHost', () => {
     const testCollection = engine.createCollection('extends-deep');
 
     expect(testCollection.baseDescriptions).not.toBeUndefined();
-    expect(testCollection.baseDescriptions
-           && testCollection.baseDescriptions.length).toBe(2);
+    expect(testCollection.baseDescriptions && testCollection.baseDescriptions.length).toBe(2);
 
     const schematic1 = engine.createSchematic('schematic1', testCollection);
 
@@ -172,8 +170,7 @@ describe('FileSystemEngineHost', () => {
     const testCollection = engine.createCollection('extends-replace');
 
     expect(testCollection.baseDescriptions).not.toBeUndefined();
-    expect(testCollection.baseDescriptions
-           && testCollection.baseDescriptions.length).toBe(1);
+    expect(testCollection.baseDescriptions && testCollection.baseDescriptions.length).toBe(1);
 
     const schematic1 = engine.createSchematic('schematic1', testCollection);
 
@@ -194,8 +191,7 @@ describe('FileSystemEngineHost', () => {
     const testCollection = engine.createCollection('extends-multiple');
 
     expect(testCollection.baseDescriptions).not.toBeUndefined();
-    expect(testCollection.baseDescriptions
-           && testCollection.baseDescriptions.length).toBe(4);
+    expect(testCollection.baseDescriptions && testCollection.baseDescriptions.length).toBe(4);
 
     const schematic1 = engine.createSchematic('schematic1', testCollection);
 
@@ -254,10 +250,7 @@ describe('FileSystemEngineHost', () => {
     const engine = new SchematicEngine(engineHost);
     const collection = engine.createCollection('hidden-schematics');
 
-    expect(collection.listSchematicNames()).toEqual([
-      'schematic-1',
-      'schematic-2',
-    ]);
+    expect(collection.listSchematicNames()).toEqual(['schematic-1', 'schematic-2']);
   });
 
   it('does not list private schematics', () => {
@@ -265,10 +258,7 @@ describe('FileSystemEngineHost', () => {
     const engine = new SchematicEngine(engineHost);
     const collection = engine.createCollection('private-schematics');
 
-    expect(collection.listSchematicNames()).toEqual([
-      'schematic-1',
-      'schematic-2',
-    ]);
+    expect(collection.listSchematicNames()).toEqual(['schematic-1', 'schematic-2']);
   });
 
   it('cannot instanciate a private schematic', () => {
@@ -281,7 +271,7 @@ describe('FileSystemEngineHost', () => {
     expect(() => collection.createSchematic('private-schematic')).toThrow();
   });
 
-  it('allows extra properties on schema', done => {
+  it('allows extra properties on schema', (done) => {
     const engineHost = new FileSystemEngineHost(root);
     const engine = new SchematicEngine(engineHost);
     const host = new virtualFs.test.TestHost();
@@ -289,14 +279,17 @@ describe('FileSystemEngineHost', () => {
     const collection = engine.createCollection('extra-properties');
     const schematic = collection.createSchematic('schematic1');
 
-    schematic.call({}, observableOf(new HostTree(host))).toPromise()
-      .then(tree => {
+    schematic
+      .call({}, observableOf(new HostTree(host)))
+      .toPromise()
+      .then((tree) => {
         return new HostSink(host).commit(tree).toPromise();
       })
       .then(() => {
         expect(host.files as string[]).toEqual(['/extra-schematic']);
-        expect(host.sync.read(normalize('/extra-schematic')).toString())
-          .toEqual('extra-collection');
+        expect(host.sync.read(normalize('/extra-schematic')).toString()).toEqual(
+          'extra-collection',
+        );
       })
       .then(done, done.fail);
   });
@@ -307,16 +300,21 @@ describe('FileSystemEngineHost', () => {
     expect(engineHost.hasTaskExecutor('file-tasks/file-task.js')).toBeTruthy();
   });
 
-  it('creates a file-based task', done => {
+  it('creates a file-based task', (done) => {
     const engineHost = new FileSystemEngineHost(root);
 
-    engineHost.createTaskExecutor('file-tasks/file-task.js').subscribe(executor => {
+    engineHost.createTaskExecutor('file-tasks/file-task.js').subscribe((executor) => {
       expect(executor).toBeTruthy();
-      from(executor(undefined, undefined as any)).toPromise().then(() => done.fail, () => done());
+      from(executor(undefined, undefined as any))
+        .toPromise()
+        .then(
+          () => done.fail,
+          () => done(),
+        );
     }, done.fail);
   });
 
-  it('allows executing a schematic with a file-based task', done => {
+  it('allows executing a schematic with a file-based task', (done) => {
     const engineHost = new FileSystemEngineHost(root);
     const engine = new SchematicEngine(engineHost);
     const host = new virtualFs.test.TestHost();
@@ -324,11 +322,13 @@ describe('FileSystemEngineHost', () => {
     const collection = engine.createCollection('file-tasks');
     const schematic = collection.createSchematic('schematic-1');
 
-    schematic.call({}, observableOf(new HostTree(host))).toPromise()
-      .then(tree => new HostSink(host).commit(tree).toPromise())
+    schematic
+      .call({}, observableOf(new HostTree(host)))
+      .toPromise()
+      .then((tree) => new HostSink(host).commit(tree).toPromise())
       .then(() => engine.executePostTasks().toPromise())
       .then(() => done.fail())
-      .catch(reason => {
+      .catch((reason) => {
         if (reason.message === 'task exception') {
           done();
         } else {
diff --git a/packages/angular_devkit/schematics/tools/file-system-utility.ts b/packages/angular_devkit/schematics/tools/file-system-utility.ts
index 06784b347254..dc21f3d66762 100644
--- a/packages/angular_devkit/schematics/tools/file-system-utility.ts
+++ b/packages/angular_devkit/schematics/tools/file-system-utility.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 {
   FileDoesNotExistException,
   JsonParseMode,
@@ -13,7 +14,6 @@ import {
 } from '@angular-devkit/core';
 import { existsSync, readFileSync } from 'fs';
 
-
 /**
  * Read a file and returns its content. This supports different file encoding.
  */
@@ -23,7 +23,7 @@ export function readFile(fileName: string): string {
   }
   const buffer = readFileSync(fileName);
   let len = buffer.length;
-  if (len >= 2 && buffer[0] === 0xFE && buffer[1] === 0xFF) {
+  if (len >= 2 && buffer[0] === 0xfe && buffer[1] === 0xff) {
     // Big endian UTF-16 byte order mark detected. Since big endian is not supported by node.js,
     // flip all byte pairs and treat as little endian.
     len &= ~1;
@@ -35,11 +35,11 @@ export function readFile(fileName: string): string {
 
     return buffer.toString('utf16le', 2);
   }
-  if (len >= 2 && buffer[0] === 0xFF && buffer[1] === 0xFE) {
+  if (len >= 2 && buffer[0] === 0xff && buffer[1] === 0xfe) {
     // Little endian UTF-16 byte order mark detected
     return buffer.toString('utf16le', 2);
   }
-  if (len >= 3 && buffer[0] === 0xEF && buffer[1] === 0xBB && buffer[2] === 0xBF) {
+  if (len >= 3 && buffer[0] === 0xef && buffer[1] === 0xbb && buffer[2] === 0xbf) {
     // UTF-8 byte order mark detected
     return buffer.toString('utf8', 3);
   }
@@ -48,7 +48,6 @@ export function readFile(fileName: string): string {
   return buffer.toString('utf8');
 }
 
-
 export function readJsonFile(path: string): JsonValue {
   return parseJson(readFile(path), JsonParseMode.Loose);
 }
diff --git a/packages/angular_devkit/schematics/tools/index.ts b/packages/angular_devkit/schematics/tools/index.ts
index 97c7b85d7338..0b982b87f6f0 100644
--- a/packages/angular_devkit/schematics/tools/index.ts
+++ b/packages/angular_devkit/schematics/tools/index.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
  */
+
 export * from './description';
 export * from './export-ref';
 export * from './file-system-engine-host-base';
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..d2a745a16e9d 100644
--- a/packages/angular_devkit/schematics/tools/node-module-engine-host.ts
+++ b/packages/angular_devkit/schematics/tools/node-module-engine-host.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 {
   BaseException,
   InvalidJsonCharacterException,
@@ -12,10 +13,7 @@ import {
 } from '@angular-devkit/core';
 import { dirname, join, resolve } from 'path';
 import { RuleFactory } from '../src';
-import {
-  FileSystemCollectionDesc,
-  FileSystemSchematicDesc,
-} from './description';
+import { FileSystemCollectionDesc, FileSystemSchematicDesc } from './description';
 import { ExportStringRef } from './export-ref';
 import {
   CollectionCannotBeResolvedException,
@@ -32,12 +30,13 @@ export class NodePackageDoesNotSupportSchematics extends BaseException {
   }
 }
 
-
 /**
  * A simple EngineHost that uses NodeModules to resolve collections.
  */
 export class NodeModulesEngineHost extends FileSystemEngineHostBase {
-  constructor(private readonly paths?: string[]) { super(); }
+  constructor(private readonly paths?: string[]) {
+    super();
+  }
 
   private resolve(name: string, requester?: string, references = new Set<string>()): string {
     if (requester) {
@@ -106,7 +105,8 @@ export class NodeModulesEngineHost extends FileSystemEngineHostBase {
       return collectionPath;
     } catch (e) {
       if (
-        e instanceof InvalidJsonCharacterException || e instanceof UnexpectedEndOfInputException
+        e instanceof InvalidJsonCharacterException ||
+        e instanceof UnexpectedEndOfInputException
       ) {
         throw new InvalidCollectionJsonException(name, collectionPath, e);
       } else {
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..6523368e713b 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,13 +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
  */
 
-// tslint:disable:no-implicit-dependencies
-
 import { SchematicEngine } from '@angular-devkit/schematics';
 import * as fs from 'fs';
 import * as os from 'os';
@@ -21,8 +19,9 @@ describe('NodeModulesEngineHost', () => {
   let previousDir!: string;
 
   beforeEach(() => {
-    tmpDir = fs.mkdtempSync(path.join(TMP_DIR,
-        'angular-devkit-schematics-tools-node-module-engine-host'));
+    tmpDir = fs.mkdtempSync(
+      path.join(TMP_DIR, 'angular-devkit-schematics-tools-node-module-engine-host'),
+    );
     previousDir = process.cwd();
     process.chdir(tmpDir);
   });
@@ -35,10 +34,14 @@ describe('NodeModulesEngineHost', () => {
     fs.mkdirSync(path.join(tmpDir, 'node_modules/@angular/'));
     fs.mkdirSync(path.join(tmpDir, 'node_modules/@angular/core'));
     fs.mkdirSync(path.join(tmpDir, 'node_modules/@angular/core/schematics'));
-    fs.writeFileSync(path.join(tmpDir, 'node_modules/@angular/core/package.json'),
-      JSON.stringify({name: '@angular/core'}));
-    fs.writeFileSync(path.join(tmpDir, 'node_modules/@angular/core/schematics/migrations.json'),
-      JSON.stringify({schematics: {}}));
+    fs.writeFileSync(
+      path.join(tmpDir, 'node_modules/@angular/core/package.json'),
+      JSON.stringify({ name: '@angular/core' }),
+    );
+    fs.writeFileSync(
+      path.join(tmpDir, 'node_modules/@angular/core/schematics/migrations.json'),
+      JSON.stringify({ schematics: {} }),
+    );
   }
 
   it('should properly create collections with explicit collection path', () => {
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..45fbad7a9c10 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,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 { TaskConfiguration, TaskConfigurationGenerator, TaskId } from '../src/engine';
 import { FileSystemSchematicContext } from './description';
 import { NodeModulesEngineHost } from './node-module-engine-host';
 
-
 /**
  * An EngineHost that uses a registry to super seed locations of collection.json files, but
  * revert back to using node modules resolution. This is done for testing.
@@ -18,15 +18,19 @@ export class NodeModulesTestEngineHost extends NodeModulesEngineHost {
   private _collections = new Map<string, string>();
   private _tasks = [] as TaskConfiguration[];
 
-  get tasks() { return this._tasks; }
+  get tasks() {
+    return this._tasks;
+  }
 
-  clearTasks() { this._tasks = []; }
+  clearTasks() {
+    this._tasks = [];
+  }
 
   registerCollection(name: string, path: string) {
     this._collections.set(name, path);
   }
 
-  transformContext(context: FileSystemSchematicContext): FileSystemSchematicContext {
+  override transformContext(context: FileSystemSchematicContext): FileSystemSchematicContext {
     const oldAddTask = context.addTask;
     context.addTask = (task: TaskConfigurationGenerator<{}>, dependencies?: Array<TaskId>) => {
       this._tasks.push(task.toConfiguration());
@@ -37,7 +41,7 @@ export class NodeModulesTestEngineHost extends NodeModulesEngineHost {
     return context;
   }
 
-  protected _resolveCollectionPath(name: string, requester?: string): string {
+  protected override _resolveCollectionPath(name: string, requester?: string): string {
     const maybePath = this._collections.get(name);
     if (maybePath) {
       return maybePath;
diff --git a/packages/angular_devkit/schematics/tools/package.json b/packages/angular_devkit/schematics/tools/package.json
new file mode 100644
index 000000000000..e82f12c24b8b
--- /dev/null
+++ b/packages/angular_devkit/schematics/tools/package.json
@@ -0,0 +1,5 @@
+{
+  "name": "@angular-devkit/schematics/tools",
+  "main": "index.js",
+  "typings": "index.d.ts"
+}
diff --git a/packages/angular_devkit/schematics/tools/schema-option-transform.ts b/packages/angular_devkit/schematics/tools/schema-option-transform.ts
index 1c7491ecb60a..d3f05c47dc87 100644
--- a/packages/angular_devkit/schematics/tools/schema-option-transform.ts
+++ b/packages/angular_devkit/schematics/tools/schema-option-transform.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 { deepCopy, schema } from '@angular-devkit/core';
 import { Observable, of as observableOf } from 'rxjs';
 import { first, map, mergeMap } from 'rxjs/operators';
@@ -33,19 +34,17 @@ export function validateOptionsWithSchema(registry: schema.SchemaRegistry) {
 
     if (schematic.schema && schematic.schemaJson) {
       // Make a deep copy of options.
-      return registry
-        .compile(schematic.schemaJson)
-        .pipe(
-          mergeMap(validator => validator(options, { withPrompts })),
-          first(),
-          map(result => {
-            if (!result.success) {
-              throw new InvalidInputOptions(options, result.errors || []);
-            }
+      return registry.compile(schematic.schemaJson).pipe(
+        mergeMap((validator) => validator(options, { withPrompts })),
+        first(),
+        map((result) => {
+          if (!result.success) {
+            throw new InvalidInputOptions(options, result.errors || []);
+          }
 
-            return options;
-          }),
-        );
+          return options;
+        }),
+      );
     }
 
     return observableOf(options);
diff --git a/packages/angular_devkit/schematics/tools/workflow/node-workflow.ts b/packages/angular_devkit/schematics/tools/workflow/node-workflow.ts
index 8f20d6ccd71f..2b6086e200fd 100644
--- a/packages/angular_devkit/schematics/tools/workflow/node-workflow.ts
+++ b/packages/angular_devkit/schematics/tools/workflow/node-workflow.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 { Path, getSystemPath, normalize, schema, virtualFs } from '@angular-devkit/core';
 import { NodeJsSyncHost } from '@angular-devkit/core/node';
-import {
-  workflow,
-} from '@angular-devkit/schematics';  // tslint:disable-line:no-implicit-dependencies
+import { workflow } from '@angular-devkit/schematics';
 import { BuiltinTaskExecutor } from '../../tasks/node';
 import { FileSystemEngine } from '../description';
 import { OptionTransform } from '../file-system-engine-host-base';
@@ -20,6 +19,7 @@ export interface NodeWorkflowOptions {
   force?: boolean;
   dryRun?: boolean;
   packageManager?: string;
+  packageManagerForce?: boolean;
   packageRegistry?: string;
   registry?: schema.CoreSchemaRegistry;
   resolvePaths?: string[];
@@ -61,6 +61,7 @@ export class NodeWorkflow extends workflow.BaseWorkflow {
     engineHost.registerTaskExecutor(BuiltinTaskExecutor.NodePackage, {
       allowPackageManagerOverride: true,
       packageManager: options.packageManager,
+      force: options.packageManagerForce,
       rootDirectory: root && getSystemPath(root),
       registry: options.packageRegistry,
     });
@@ -83,10 +84,10 @@ export class NodeWorkflow extends workflow.BaseWorkflow {
     this._context = [];
   }
 
-  get engine(): FileSystemEngine {
+  override get engine(): FileSystemEngine {
     return this._engine as FileSystemEngine;
   }
-  get engineHost(): NodeModulesEngineHost {
+  override get engineHost(): NodeModulesEngineHost {
     return this._engineHost as NodeModulesEngineHost;
   }
 }
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..fd9d298c57ab 100644
--- a/packages/angular_devkit/schematics/tools/workflow/node-workflow_spec.ts
+++ b/packages/angular_devkit/schematics/tools/workflow/node-workflow_spec.ts
@@ -1,26 +1,29 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use 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
+
+/* eslint-disable import/no-extraneous-dependencies */
 import { NodeJsSyncHost } from '@angular-devkit/core/node';
 import { NodeWorkflow } from '@angular-devkit/schematics/tools';
 import * as path from 'path';
 
-
 describe('NodeWorkflow', () => {
   // TODO: this test seems to either not work on windows or on linux.
-  xit('works', done => {
+  xit('works', (done) => {
     const workflow = new NodeWorkflow(new NodeJsSyncHost(), { dryRun: true });
     const collection = path.join(__dirname, '../../../../schematics/angular/package.json');
 
-    workflow.execute({
-      collection,
-      schematic: 'ng-new',
-      options: { name: 'workflow-test', version: '6.0.0-rc.4' },
-    }).toPromise().then(done, done.fail);
+    workflow
+      .execute({
+        collection,
+        schematic: 'ng-new',
+        options: { name: 'workflow-test', version: '6.0.0-rc.4' },
+      })
+      .toPromise()
+      .then(done, done.fail);
   });
 });
diff --git a/packages/angular_devkit/schematics_cli/bin/schematics.ts b/packages/angular_devkit/schematics_cli/bin/schematics.ts
index fb0d19bfb1a2..31619a0f6ddc 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
@@ -9,15 +9,13 @@
 
 // symbol polyfill must go first
 import 'symbol-observable';
-// tslint:disable-next-line:ordered-imports import-groups
 import { logging, schema, tags } from '@angular-devkit/core';
 import { ProcessOutput, createConsoleLogger } from '@angular-devkit/core/node';
 import { UnsuccessfulWorkflowExecution } from '@angular-devkit/schematics';
 import { NodeWorkflow } from '@angular-devkit/schematics/tools';
 import * as ansiColors from 'ansi-colors';
 import * as inquirer from 'inquirer';
-import * as minimist from 'minimist';
-
+import minimist from 'minimist';
 
 /**
  * Parse the name of schematic passed in argument, and return a {collection, schematic} named
@@ -33,25 +31,26 @@ import * as minimist from 'minimist';
  * @param str The argument to parse.
  * @return {{collection: string, schematic: (string)}}
  */
-function parseSchematicName(str: string | null): { collection: string, schematic: string | null } {
+function parseSchematicName(str: string | null): { collection: string; schematic: string | null } {
   let collection = '@angular-devkit/schematics-cli';
 
   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 };
 }
 
-
 export interface MainOptions {
   args: string[];
   stdout?: ProcessOutput;
   stderr?: ProcessOutput;
 }
 
-
 function _listSchematics(workflow: NodeWorkflow, collectionName: string, logger: logging.Logger) {
   try {
     const collection = workflow.engine.createCollection(collectionName);
@@ -67,7 +66,7 @@ function _listSchematics(workflow: NodeWorkflow, collectionName: string, logger:
 
 function _createPromptProvider(): schema.PromptProvider {
   return (definitions) => {
-    const questions: inquirer.QuestionCollection = definitions.map(definition => {
+    const questions: inquirer.QuestionCollection = definitions.map((definition) => {
       const question: inquirer.Question = {
         name: definition.id,
         message: definition.message,
@@ -76,7 +75,7 @@ function _createPromptProvider(): schema.PromptProvider {
 
       const validator = definition.validator;
       if (validator) {
-        question.validate = input => validator(input);
+        question.validate = (input) => validator(input);
       }
 
       switch (definition.type) {
@@ -85,17 +84,19 @@ function _createPromptProvider(): schema.PromptProvider {
         case 'list':
           return {
             ...question,
-            type: !!definition.multiselect ? 'checkbox' : 'list',
-            choices: definition.items && definition.items.map(item => {
-              if (typeof item == 'string') {
-                return item;
-              } else {
-                return {
-                  name: item.label,
-                  value: item.value,
-                };
-              }
-            }),
+            type: definition.multiselect ? 'checkbox' : 'list',
+            choices:
+              definition.items &&
+              definition.items.map((item) => {
+                if (typeof item == 'string') {
+                  return item;
+                } else {
+                  return {
+                    name: item.label,
+                    value: item.value,
+                  };
+                }
+              }),
           };
         default:
           return { ...question, type: definition.type };
@@ -106,7 +107,7 @@ function _createPromptProvider(): schema.PromptProvider {
   };
 }
 
-// tslint:disable-next-line: no-big-function
+// eslint-disable-next-line max-lines-per-function
 export async function main({
   args,
   stdout = process.stdout,
@@ -120,11 +121,11 @@ export async function main({
 
   /** Create the DevKit Logger used through the CLI. */
   const logger = createConsoleLogger(argv['verbose'], stdout, stderr, {
-    info: s => s,
-    debug: s => s,
-    warn: s => colors.bold.yellow(s),
-    error: s => colors.bold.red(s),
-    fatal: s => colors.bold.red(s),
+    info: (s) => s,
+    debug: (s) => s,
+    warn: (s) => colors.bold.yellow(s),
+    error: (s) => colors.bold.red(s),
+    fatal: (s) => colors.bold.red(s),
   });
 
   if (argv.help) {
@@ -134,16 +135,17 @@ export async function main({
   }
 
   /** Get the collection an schematic name from the first argument. */
-  const {
-    collection: collectionName,
-    schematic: schematicName,
-  } = parseSchematicName(argv._.shift() || null);
+  const { collection: collectionName, schematic: schematicName } = parseSchematicName(
+    argv._.shift() || null,
+  );
 
   const isLocalCollection = collectionName.startsWith('.') || collectionName.startsWith('/');
 
   /** Gather the arguments for later use. */
-  const debug: boolean = argv.debug === null ? isLocalCollection : argv.debug;
-  const dryRun: boolean = argv['dry-run'] === null ? debug : argv['dry-run'];
+  const debugPresent = argv['debug'] !== null;
+  const debug = debugPresent ? !!argv['debug'] : isLocalCollection;
+  const dryRunPresent = argv['dry-run'] !== null;
+  const dryRun = dryRunPresent ? !!argv['dry-run'] : debug;
   const force = argv['force'];
   const allowPrivate = argv['allow-private'];
 
@@ -166,6 +168,12 @@ export async function main({
     return 1;
   }
 
+  if (debug) {
+    logger.info(
+      `Debug mode enabled${isLocalCollection ? ' by default for local collections' : ''}.`,
+    );
+  }
+
   // Indicate to the user when nothing has been done. This is automatically set to off when there's
   // a new DryRunEvent.
   let nothingDone = true;
@@ -213,15 +221,14 @@ export async function main({
     }
   });
 
-
   /**
    * Listen to lifecycle events of the workflow to flush the logs between each phases.
    */
-  workflow.lifeCycle.subscribe(event => {
+  workflow.lifeCycle.subscribe((event) => {
     if (event.kind == 'workflow-end' || event.kind == 'post-tasks-start') {
       if (!error) {
         // Flush the log queue and clean the error state.
-        loggingQueue.forEach(log => logger.info(log));
+        loggingQueue.forEach((log) => logger.info(log));
       }
 
       loggingQueue = [];
@@ -229,7 +236,6 @@ export async function main({
     }
   });
 
-
   /**
    * Remove every options from argv that we support in schematics itself.
    */
@@ -248,7 +254,7 @@ export async function main({
   }
 
   // Show usage of deprecated options
-  workflow.registry.useXDeprecatedProvider(msg => logger.warn(msg));
+  workflow.registry.useXDeprecatedProvider((msg) => logger.warn(msg));
 
   // Pass the rest of the arguments as the smart default "argv". Then delete it.
   workflow.registry.addSmartDefaultProvider('argv', (schema) => {
@@ -275,22 +281,28 @@ export async function main({
    *  when everything is done.
    */
   try {
-    await workflow.execute({
-      collection: collectionName,
-      schematic: schematicName,
-      options: parsedArgs,
-      allowPrivate: allowPrivate,
-      debug: debug,
-      logger: logger,
-    })
+    await workflow
+      .execute({
+        collection: collectionName,
+        schematic: schematicName,
+        options: parsedArgs,
+        allowPrivate: allowPrivate,
+        debug: debug,
+        logger: logger,
+      })
       .toPromise();
 
     if (nothingDone) {
       logger.info('Nothing to be done.');
+    } else if (dryRun) {
+      logger.info(
+        `Dry run enabled${
+          dryRunPresent ? '' : ' by default in debug mode'
+        }. No files written to disk.`,
+      );
     }
 
     return 0;
-
   } catch (err) {
     if (err instanceof UnsuccessfulWorkflowExecution) {
       // "See above" because we already printed the error.
@@ -305,7 +317,7 @@ export async function main({
   }
 }
 
- /**
+/**
  * Get usage of the CLI tool.
  */
 function getUsage(): string {
@@ -356,20 +368,20 @@ const booleanArgs = [
 ];
 
 function parseArgs(args: string[] | undefined): minimist.ParsedArgs {
-    return minimist(args, {
-      boolean: booleanArgs,
-      alias: {
-        'dryRun': 'dry-run',
-        'listSchematics': 'list-schematics',
-        'allowPrivate': 'allow-private',
-      },
-      default: {
-        'interactive': true,
-        'debug': null,
-        'dryRun': null,
-      },
-      '--': true,
-    });
+  return minimist(args, {
+    boolean: booleanArgs,
+    alias: {
+      'dryRun': 'dry-run',
+      'listSchematics': 'list-schematics',
+      'allowPrivate': 'allow-private',
+    },
+    default: {
+      'interactive': true,
+      'debug': null,
+      'dryRun': null,
+    },
+    '--': true,
+  });
 }
 
 function isTTY(): boolean {
@@ -390,6 +402,8 @@ function isTTY(): boolean {
 if (require.main === module) {
   const args = process.argv.slice(2);
   main({ args })
-    .then(exitCode => process.exitCode = exitCode)
-    .catch(e => { throw (e); });
+    .then((exitCode) => (process.exitCode = exitCode))
+    .catch((e) => {
+      throw e;
+    });
 }
diff --git a/packages/angular_devkit/schematics_cli/bin/schematics_spec.ts b/packages/angular_devkit/schematics_cli/bin/schematics_spec.ts
index 1955aac0777f..2055d474333e 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
@@ -50,16 +50,19 @@ describe('schematics-cli binary', () => {
     expect(stdout.lines).toMatch(/CREATE foo\/.gitignore/);
     expect(stdout.lines).toMatch(/CREATE foo\/src\/foo\/index.ts/);
     expect(stdout.lines).toMatch(/CREATE foo\/src\/foo\/index_spec.ts/);
+    expect(stdout.lines).toMatch(/Dry run enabled./);
     expect(res).toEqual(0);
   });
 
   it('dry-run is default when debug mode', async () => {
     const args = ['blank', 'foo', '--debug'];
     const res = await main({ args, stdout, stderr });
+    expect(stdout.lines).toMatch(/Debug mode enabled./);
     expect(stdout.lines).toMatch(/CREATE foo\/README.md/);
     expect(stdout.lines).toMatch(/CREATE foo\/.gitignore/);
     expect(stdout.lines).toMatch(/CREATE foo\/src\/foo\/index.ts/);
     expect(stdout.lines).toMatch(/CREATE foo\/src\/foo\/index_spec.ts/);
+    expect(stdout.lines).toMatch(/Dry run enabled by default in debug mode./);
     expect(res).toEqual(0);
   });
 
diff --git a/packages/angular_devkit/schematics_cli/blank/factory.ts b/packages/angular_devkit/schematics_cli/blank/factory.ts
index 996b0522e217..3911d70ee70e 100644
--- a/packages/angular_devkit/schematics_cli/blank/factory.ts
+++ b/packages/angular_devkit/schematics_cli/blank/factory.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 {
   JsonAstObject,
   JsonObject,
@@ -21,16 +22,15 @@ import {
   Tree,
   UpdateRecorder,
   apply,
-  applyTemplates,
   chain,
   mergeWith,
   move,
+  template,
   url,
 } from '@angular-devkit/schematics';
 import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
 import { Schema } from './schema';
 
-
 function appendPropertyInAstObject(
   recorder: UpdateRecorder,
   node: JsonAstObject,
@@ -48,9 +48,9 @@ function appendPropertyInAstObject(
 
   recorder.insertLeft(
     node.end.offset - 1,
-    '  '
-    + `"${propertyName}": ${JSON.stringify(value, null, 2).replace(/\n/g, indentStr)}`
-    + indentStr.slice(0, -2),
+    '  ' +
+      `"${propertyName}": ${JSON.stringify(value, null, 2).replace(/\n/g, indentStr)}` +
+      indentStr.slice(0, -2),
   );
 }
 
@@ -87,7 +87,6 @@ function addSchematicToCollectionJson(
   };
 }
 
-
 export default function (options: Schema): Rule {
   const schematicsVersion = require('@angular-devkit/schematics/package.json').version;
   const coreVersion = require('@angular-devkit/core/package.json').version;
@@ -104,7 +103,9 @@ export default function (options: Schema): Rule {
       if (packageJsonContent) {
         // In google3 the return value of JSON.parse() must be immediately typed,
         // otherwise it defaults to `any`, which is prohibited.
-        const packageJson = JSON.parse(packageJsonContent.toString('utf-8')) as { schematics: unknown };
+        const packageJson = JSON.parse(packageJsonContent.toString('utf-8')) as {
+          schematics: unknown;
+        };
         if (typeof packageJson.schematics === 'string') {
           const p = normalize(packageJson.schematics);
           if (tree.exists(p)) {
@@ -115,22 +116,22 @@ export default function (options: Schema): Rule {
     } catch {}
 
     let source = apply(url('./schematic-files'), [
-        applyTemplates({
-          ...options,
-          coreVersion,
-          schematicsVersion,
-          dot: '.',
-          camelize: strings.camelize,
-          dasherize: strings.dasherize,
-        }),
-      ]);
+      template({
+        ...options,
+        coreVersion,
+        schematicsVersion,
+        dot: '.',
+        camelize: strings.camelize,
+        dasherize: strings.dasherize,
+      }),
+    ]);
 
     // Simply create a new schematic project.
     if (!collectionPath) {
       collectionPath = normalize('/' + options.name + '/src/collection.json');
       source = apply(url('./project-files'), [
-        applyTemplates({
-          ...options as object,
+        template({
+          ...(options as object),
           coreVersion,
           schematicsVersion,
           dot: '.',
@@ -148,8 +149,8 @@ export default function (options: Schema): Rule {
       mergeWith(source),
       addSchematicToCollectionJson(collectionPath, strings.dasherize(options.name), {
         description: 'A blank schematic.',
-        factory: './' + strings.dasherize(options.name) + '/index#' +
-          strings.camelize(options.name),
+        factory:
+          './' + strings.dasherize(options.name) + '/index#' + strings.camelize(options.name),
       }),
     ]);
   };
diff --git a/packages/angular_devkit/schematics_cli/blank/project-files/README.md.template b/packages/angular_devkit/schematics_cli/blank/project-files/README.md
similarity index 99%
rename from packages/angular_devkit/schematics_cli/blank/project-files/README.md.template
rename to packages/angular_devkit/schematics_cli/blank/project-files/README.md
index 7854bc97d952..1784a81768c2 100644
--- a/packages/angular_devkit/schematics_cli/blank/project-files/README.md.template
+++ b/packages/angular_devkit/schematics_cli/blank/project-files/README.md
@@ -7,6 +7,7 @@ This repository is a basic Schematic implementation that serves as a starting po
 To test locally, install `@angular-devkit/schematics-cli` globally and use the `schematics` command line tool. That tool acts the same as the `generate` command of the Angular CLI, but also has a debug mode.
 
 Check the documentation with
+
 ```bash
 schematics --help
 ```
@@ -25,4 +26,3 @@ npm publish
 ```
 
 That's it!
- 
\ No newline at end of file
diff --git a/packages/angular_devkit/schematics_cli/blank/project-files/__dot__gitignore.template b/packages/angular_devkit/schematics_cli/blank/project-files/__dot__gitignore
similarity index 99%
rename from packages/angular_devkit/schematics_cli/blank/project-files/__dot__gitignore.template
rename to packages/angular_devkit/schematics_cli/blank/project-files/__dot__gitignore
index 82677b588411..d4b3bf2873e8 100644
--- a/packages/angular_devkit/schematics_cli/blank/project-files/__dot__gitignore.template
+++ b/packages/angular_devkit/schematics_cli/blank/project-files/__dot__gitignore
@@ -1,3 +1,4 @@
+
 # Outputs
 src/**/*.js
 src/**/*.js.map
diff --git a/packages/angular_devkit/schematics_cli/blank/project-files/__dot__npmignore.template b/packages/angular_devkit/schematics_cli/blank/project-files/__dot__npmignore
similarity index 98%
rename from packages/angular_devkit/schematics_cli/blank/project-files/__dot__npmignore.template
rename to packages/angular_devkit/schematics_cli/blank/project-files/__dot__npmignore
index c55ccfc3f5f9..7c31f4692f1e 100644
--- a/packages/angular_devkit/schematics_cli/blank/project-files/__dot__npmignore.template
+++ b/packages/angular_devkit/schematics_cli/blank/project-files/__dot__npmignore
@@ -1,3 +1,4 @@
+
 # Ignores TypeScript files, but keeps definitions.
 *.ts
 !*.d.ts
diff --git a/packages/angular_devkit/schematics_cli/blank/project-files/package.json.template b/packages/angular_devkit/schematics_cli/blank/project-files/package.json
similarity index 90%
rename from packages/angular_devkit/schematics_cli/blank/project-files/package.json.template
rename to packages/angular_devkit/schematics_cli/blank/project-files/package.json
index ef854f034ffe..a1eae47367a2 100644
--- a/packages/angular_devkit/schematics_cli/blank/project-files/package.json.template
+++ b/packages/angular_devkit/schematics_cli/blank/project-files/package.json
@@ -15,11 +15,11 @@
   "dependencies": {
     "@angular-devkit/core": "^<%= coreVersion %>",
     "@angular-devkit/schematics": "^<%= schematicsVersion %>",
-    "typescript": "~4.1.2"
+    "typescript": "~4.3.2"
   },
   "devDependencies": {
     "@types/node": "^12.11.1",
-    "@types/jasmine": "~3.5.0",
+    "@types/jasmine": "~3.8.0",
     "jasmine": "^3.5.0"
   }
 }
diff --git a/packages/angular_devkit/schematics_cli/blank/project-files/src/collection.json.template b/packages/angular_devkit/schematics_cli/blank/project-files/src/collection.json
similarity index 79%
rename from packages/angular_devkit/schematics_cli/blank/project-files/src/collection.json.template
rename to packages/angular_devkit/schematics_cli/blank/project-files/src/collection.json
index 272c195ad411..2651cd0f839d 100644
--- a/packages/angular_devkit/schematics_cli/blank/project-files/src/collection.json.template
+++ b/packages/angular_devkit/schematics_cli/blank/project-files/src/collection.json
@@ -1,5 +1,4 @@
 {
   "$schema": "../node_modules/@angular-devkit/schematics/collection-schema.json",
-  "schematics": {
-  }
+  "schematics": {}
 }
diff --git a/packages/angular_devkit/schematics_cli/blank/project-files/tsconfig.json.template b/packages/angular_devkit/schematics_cli/blank/project-files/tsconfig.json
similarity index 73%
rename from packages/angular_devkit/schematics_cli/blank/project-files/tsconfig.json.template
rename to packages/angular_devkit/schematics_cli/blank/project-files/tsconfig.json
index c294d9b63384..75cf15fa8e3c 100644
--- a/packages/angular_devkit/schematics_cli/blank/project-files/tsconfig.json.template
+++ b/packages/angular_devkit/schematics_cli/blank/project-files/tsconfig.json
@@ -1,10 +1,7 @@
 {
   "compilerOptions": {
     "baseUrl": "tsconfig",
-    "lib": [
-      "es2018",
-      "dom"
-    ],
+    "lib": ["es2018", "dom"],
     "declaration": true,
     "module": "commonjs",
     "moduleResolution": "node",
@@ -20,15 +17,8 @@
     "sourceMap": true,
     "strictNullChecks": true,
     "target": "es6",
-    "types": [
-      "jasmine",
-      "node"
-    ]
+    "types": ["jasmine", "node"]
   },
-  "include": [
-    "src/**/*"
-  ],
-  "exclude": [
-    "src/*/files/**/*"
-  ]
+  "include": ["src/**/*"],
+  "exclude": ["src/*/files/**/*"]
 }
diff --git a/packages/angular_devkit/schematics_cli/blank/schematic-files/src/__name@dasherize__/index.ts.template b/packages/angular_devkit/schematics_cli/blank/schematic-files/src/__name@dasherize__/index.ts
similarity index 100%
rename from packages/angular_devkit/schematics_cli/blank/schematic-files/src/__name@dasherize__/index.ts.template
rename to packages/angular_devkit/schematics_cli/blank/schematic-files/src/__name@dasherize__/index.ts
diff --git a/packages/angular_devkit/schematics_cli/blank/schematic-files/src/__name@dasherize__/index_spec.ts.template b/packages/angular_devkit/schematics_cli/blank/schematic-files/src/__name@dasherize__/index_spec.ts
similarity index 77%
rename from packages/angular_devkit/schematics_cli/blank/schematic-files/src/__name@dasherize__/index_spec.ts.template
rename to packages/angular_devkit/schematics_cli/blank/schematic-files/src/__name@dasherize__/index_spec.ts
index 8d794c1cdced..6583dd811719 100644
--- a/packages/angular_devkit/schematics_cli/blank/schematic-files/src/__name@dasherize__/index_spec.ts.template
+++ b/packages/angular_devkit/schematics_cli/blank/schematic-files/src/__name@dasherize__/index_spec.ts
@@ -2,14 +2,14 @@ import { Tree } from '@angular-devkit/schematics';
 import { SchematicTestRunner } from '@angular-devkit/schematics/testing';
 import * as path from 'path';
 
-
 const collectionPath = path.join(__dirname, '../collection.json');
 
-
 describe('<%= dasherize(name) %>', () => {
   it('works', async () => {
     const runner = new SchematicTestRunner('schematics', collectionPath);
-    const tree = await runner.runSchematicAsync('<%= dasherize(name) %>', {}, Tree.empty()).toPromise();
+    const tree = await runner
+      .runSchematicAsync('<%= dasherize(name) %>', {}, Tree.empty())
+      .toPromise();
 
     expect(tree.files).toEqual([]);
   });
diff --git a/packages/angular_devkit/schematics_cli/package.json b/packages/angular_devkit/schematics_cli/package.json
index 2f03a7af432c..3e6713267669 100644
--- a/packages/angular_devkit/schematics_cli/package.json
+++ b/packages/angular_devkit/schematics_cli/package.json
@@ -19,8 +19,8 @@
     "@angular-devkit/core": "0.0.0",
     "@angular-devkit/schematics": "0.0.0",
     "ansi-colors": "4.1.1",
-    "inquirer": "8.0.0",
-    "minimist": "1.2.5",
-    "symbol-observable": "3.0.0"
+    "inquirer": "8.1.2",
+    "minimist": "1.2.6",
+    "symbol-observable": "4.0.0"
   }
 }
diff --git a/packages/angular_devkit/schematics_cli/schematic/factory.ts b/packages/angular_devkit/schematics_cli/schematic/factory.ts
index 46fedd3a11d6..f3da26cca2cb 100644
--- a/packages/angular_devkit/schematics_cli/schematic/factory.ts
+++ b/packages/angular_devkit/schematics_cli/schematic/factory.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 { strings } from '@angular-devkit/core';
 import {
   Rule,
@@ -18,7 +19,6 @@ import {
 import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
 import { Schema } from './schema';
 
-
 export default function (options: Schema): Rule {
   const schematicsVersion = require('@angular-devkit/schematics/package.json').version;
   const coreVersion = require('@angular-devkit/core/package.json').version;
@@ -26,18 +26,20 @@ export default function (options: Schema): Rule {
   return (_, context) => {
     context.addTask(new NodePackageInstallTask(options.name));
 
-    return mergeWith(apply(url('./files'), [
-      partitionApplyMerge(
-        (p) => !/\/src\/.*?\/files\//.test(p),
-        template({
-          ...options,
-          coreVersion,
-          schematicsVersion,
-          dot: '.',
-          dasherize: strings.dasherize,
-        }),
-      ),
-      move(options.name),
-    ]));
+    return mergeWith(
+      apply(url('./files'), [
+        partitionApplyMerge(
+          (p) => !/\/src\/.*?\/files\//.test(p),
+          template({
+            ...options,
+            coreVersion,
+            schematicsVersion,
+            dot: '.',
+            dasherize: strings.dasherize,
+          }),
+        ),
+        move(options.name),
+      ]),
+    );
   };
 }
diff --git a/packages/angular_devkit/schematics_cli/schematic/files/README.md b/packages/angular_devkit/schematics_cli/schematic/files/README.md
index 7854bc97d952..1784a81768c2 100644
--- a/packages/angular_devkit/schematics_cli/schematic/files/README.md
+++ b/packages/angular_devkit/schematics_cli/schematic/files/README.md
@@ -7,6 +7,7 @@ This repository is a basic Schematic implementation that serves as a starting po
 To test locally, install `@angular-devkit/schematics-cli` globally and use the `schematics` command line tool. That tool acts the same as the `generate` command of the Angular CLI, but also has a debug mode.
 
 Check the documentation with
+
 ```bash
 schematics --help
 ```
@@ -25,4 +26,3 @@ npm publish
 ```
 
 That's it!
- 
\ No newline at end of file
diff --git a/packages/angular_devkit/schematics_cli/schematic/files/package.json b/packages/angular_devkit/schematics_cli/schematic/files/package.json
index 77a126faeb96..c37f5a5b6ba4 100644
--- a/packages/angular_devkit/schematics_cli/schematic/files/package.json
+++ b/packages/angular_devkit/schematics_cli/schematic/files/package.json
@@ -15,11 +15,11 @@
   "dependencies": {
     "@angular-devkit/core": "^<%= coreVersion %>",
     "@angular-devkit/schematics": "^<%= schematicsVersion %>",
-    "typescript": "~4.2.3"
+    "typescript": "~4.3.2"
   },
   "devDependencies": {
     "@types/node": "^12.11.1",
-    "@types/jasmine": "~3.6.0",
-    "jasmine": "^3.5.0"
+    "@types/jasmine": "~3.8.0",
+    "jasmine": "~3.8.0"
   }
 }
diff --git a/packages/angular_devkit/schematics_cli/schematic/files/src/my-full-schematic/index.ts b/packages/angular_devkit/schematics_cli/schematic/files/src/my-full-schematic/index.ts
index f4a84c125c35..118b3771830d 100644
--- a/packages/angular_devkit/schematics_cli/schematic/files/src/my-full-schematic/index.ts
+++ b/packages/angular_devkit/schematics_cli/schematic/files/src/my-full-schematic/index.ts
@@ -10,7 +10,6 @@ import {
   url,
 } from '@angular-devkit/schematics';
 
-
 // Instead of `any`, it would make sense here to get a schema-to-dts package and output the
 // interfaces so you get type-safe options.
 export default function (options: any): Rule {
@@ -42,11 +41,13 @@ export default function (options: any): Rule {
     //                     extension), does not support additional functions if you don't pass
     //                     them in, and only work on text files (we use an algorithm to detect
     //                     if a file is binary or not).
-    mergeWith(apply(url('./files'), [
-      template({
-        INDEX: options.index,
-        name: options.name,
-      }),
-    ])),
+    mergeWith(
+      apply(url('./files'), [
+        template({
+          INDEX: options.index,
+          name: options.name,
+        }),
+      ]),
+    ),
   ]);
 }
diff --git a/packages/angular_devkit/schematics_cli/schematic/files/src/my-full-schematic/index_spec.ts b/packages/angular_devkit/schematics_cli/schematic/files/src/my-full-schematic/index_spec.ts
index 4c0d13db872c..ed68aa713cbe 100644
--- a/packages/angular_devkit/schematics_cli/schematic/files/src/my-full-schematic/index_spec.ts
+++ b/packages/angular_devkit/schematics_cli/schematic/files/src/my-full-schematic/index_spec.ts
@@ -2,21 +2,23 @@ import { Tree } from '@angular-devkit/schematics';
 import { SchematicTestRunner } from '@angular-devkit/schematics/testing';
 import * as path from 'path';
 
-
 // SchematicTestRunner needs an absolute path to the collection to test.
 const collectionPath = path.join(__dirname, '../collection.json');
 
-
 describe('my-full-schematic', () => {
   it('requires required option', async () => {
     // We test that
     const runner = new SchematicTestRunner('schematics', collectionPath);
-    await expectAsync(runner.runSchematicAsync('my-full-schematic', {}, Tree.empty()).toPromise()).toBeRejected();
+    await expectAsync(
+      runner.runSchematicAsync('my-full-schematic', {}, Tree.empty()).toPromise(),
+    ).toBeRejected();
   });
 
   it('works', async () => {
     const runner = new SchematicTestRunner('schematics', collectionPath);
-    const tree = await runner.runSchematicAsync('my-full-schematic', { name: 'str' }, Tree.empty()).toPromise();
+    const tree = await runner
+      .runSchematicAsync('my-full-schematic', { name: 'str' }, Tree.empty())
+      .toPromise();
 
     // Listing files
     expect(tree.files.sort()).toEqual(['/allo', '/hola', '/test1', '/test2']);
diff --git a/packages/angular_devkit/schematics_cli/schematic/files/src/my-full-schematic/schema.json b/packages/angular_devkit/schematics_cli/schematic/files/src/my-full-schematic/schema.json
index 3454c9092430..736889e208d5 100644
--- a/packages/angular_devkit/schematics_cli/schematic/files/src/my-full-schematic/schema.json
+++ b/packages/angular_devkit/schematics_cli/schematic/files/src/my-full-schematic/schema.json
@@ -12,7 +12,5 @@
       "type": "string"
     }
   },
-  "required": [
-    "name"
-  ]
+  "required": ["name"]
 }
diff --git a/packages/angular_devkit/schematics_cli/schematic/files/src/my-other-schematic/index.ts b/packages/angular_devkit/schematics_cli/schematic/files/src/my-other-schematic/index.ts
index 0291cd6d5228..de2712b752c2 100644
--- a/packages/angular_devkit/schematics_cli/schematic/files/src/my-other-schematic/index.ts
+++ b/packages/angular_devkit/schematics_cli/schematic/files/src/my-other-schematic/index.ts
@@ -1,11 +1,4 @@
-import {
-  Rule,
-  SchematicContext,
-  Tree,
-  chain,
-  schematic,
-} from '@angular-devkit/schematics';
-
+import { Rule, SchematicContext, Tree, chain, schematic } from '@angular-devkit/schematics';
 
 // A factory is a RuleFactory. It takes the options that might have been coming from the command
 // line or another schematic. These can be defined in a schema.json, which will validate
@@ -29,6 +22,6 @@ export default function (options: any): Rule {
       // But since we're working off the same staging area, we can move the file created
       // by the schematic above.
       tree.rename('hello', 'allo');
-    }
+    },
   ]);
 }
diff --git a/packages/angular_devkit/schematics_cli/schematic/files/src/my-other-schematic/index_spec.ts b/packages/angular_devkit/schematics_cli/schematic/files/src/my-other-schematic/index_spec.ts
index 9507d5c10889..a558c4e55d56 100644
--- a/packages/angular_devkit/schematics_cli/schematic/files/src/my-other-schematic/index_spec.ts
+++ b/packages/angular_devkit/schematics_cli/schematic/files/src/my-other-schematic/index_spec.ts
@@ -2,10 +2,8 @@ import { Tree } from '@angular-devkit/schematics';
 import { SchematicTestRunner } from '@angular-devkit/schematics/testing';
 import * as path from 'path';
 
-
 const collectionPath = path.join(__dirname, '../collection.json');
 
-
 describe('my-other-schematic', () => {
   it('works', async () => {
     const runner = new SchematicTestRunner('schematics', collectionPath);
diff --git a/packages/angular_devkit/schematics_cli/schematic/files/src/my-schematic/index.ts b/packages/angular_devkit/schematics_cli/schematic/files/src/my-schematic/index.ts
index d3462e6f57b1..c22ce56e1894 100644
--- a/packages/angular_devkit/schematics_cli/schematic/files/src/my-schematic/index.ts
+++ b/packages/angular_devkit/schematics_cli/schematic/files/src/my-schematic/index.ts
@@ -1,6 +1,5 @@
 import { Rule, SchematicContext, Tree } from '@angular-devkit/schematics';
 
-
 // You don't have to export the function as default. You can also have more than one rule factory
 // per file.
 export function mySchematic(options: any): Rule {
diff --git a/packages/angular_devkit/schematics_cli/schematic/files/src/my-schematic/index_spec.ts b/packages/angular_devkit/schematics_cli/schematic/files/src/my-schematic/index_spec.ts
index c0683b7a9d9f..7a2fc52cf632 100644
--- a/packages/angular_devkit/schematics_cli/schematic/files/src/my-schematic/index_spec.ts
+++ b/packages/angular_devkit/schematics_cli/schematic/files/src/my-schematic/index_spec.ts
@@ -2,10 +2,8 @@ import { Tree } from '@angular-devkit/schematics';
 import { SchematicTestRunner } from '@angular-devkit/schematics/testing';
 import * as path from 'path';
 
-
 const collectionPath = path.join(__dirname, '../collection.json');
 
-
 describe('my-schematic', () => {
   it('works', async () => {
     const runner = new SchematicTestRunner('schematics', collectionPath);
diff --git a/packages/angular_devkit/schematics_cli/schematic/files/tsconfig.json b/packages/angular_devkit/schematics_cli/schematic/files/tsconfig.json
index eaf639af3937..ae3b3e55e6a3 100644
--- a/packages/angular_devkit/schematics_cli/schematic/files/tsconfig.json
+++ b/packages/angular_devkit/schematics_cli/schematic/files/tsconfig.json
@@ -1,10 +1,7 @@
 {
   "compilerOptions": {
     "baseUrl": "tsconfig",
-    "lib": [
-      "es2018",
-      "dom"
-    ],
+    "lib": ["es2018", "dom"],
     "module": "commonjs",
     "moduleResolution": "node",
     "noEmitOnError": true,
@@ -19,15 +16,8 @@
     "sourceMap": true,
     "strictNullChecks": true,
     "target": "es6",
-    "types": [
-      "jasmine",
-      "node"
-    ]
+    "types": ["jasmine", "node"]
   },
-  "include": [
-    "src/**/*"
-  ],
-  "exclude": [
-    "src/*/files/**/*"
-  ]
+  "include": ["src/**/*"],
+  "exclude": ["src/*/files/**/*"]
 }
diff --git a/packages/angular_devkit/schematics_cli/schematic/schema.json b/packages/angular_devkit/schematics_cli/schematic/schema.json
index ac64089e9330..2169f0227799 100644
--- a/packages/angular_devkit/schematics_cli/schematic/schema.json
+++ b/packages/angular_devkit/schematics_cli/schematic/schema.json
@@ -13,7 +13,5 @@
       "description": "Author for the new schematic."
     }
   },
-  "required": [
-    "name"
-  ]
+  "required": ["name"]
 }
diff --git a/packages/circular-deps-test.conf.js b/packages/circular-deps-test.conf.js
new file mode 100644
index 000000000000..fd4f8e9093d5
--- /dev/null
+++ b/packages/circular-deps-test.conf.js
@@ -0,0 +1,71 @@
+/**
+ * @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
+ */
+
+const path = require('path');
+const fs = require('fs');
+
+module.exports = {
+  baseDir: '../',
+  goldenFile: '../goldens/circular-deps/packages.json',
+  glob: './**/*.ts',
+  // Command that will be displayed if the golden needs to be updated.
+  approveCommand: 'yarn ts-circular-deps:approve',
+  resolveModule: resolveModule,
+};
+
+/**
+ * Custom module resolver that maps specifiers for local packages folder.
+ * This ensures that cross package/entry-point dependencies can be detected.
+ */
+
+const LOCAL_MAPPINGS = [
+  ['@angular-devkit/build-angular', 'angular_devkit/build_angular'],
+  ['@angular-devkit/architect', 'angular_devkit/architect'],
+  ['@angular-devkit/architect-cli', 'angular_devkit/architect_cli'],
+  ['@angular-devkit/benchmark', 'angular_devkit/benchmark'],
+  ['@angular-devkit/build-optimizer', 'angular_devkit/build_optimizer'],
+  ['@angular-devkit/build-webpack', 'angular_devkit/build_webpack'],
+  ['@angular-devkit/core', 'angular_devkit/core'],
+  ['@angular-devkit/schematics', 'angular_devkit/schematics'],
+  ['@angular-devkit/schematics-cli', 'angular_devkit/schematics_cli'],
+  ['@angular/cli', 'angular/cli'],
+  ['@schematics/angular', 'schematics/angular'],
+  ['@ngtools/webpack', 'ngtools/webpack'],
+];
+
+function resolveModule(specifier) {
+  let localSpecifierPath;
+
+  for (const [key, value] of LOCAL_MAPPINGS) {
+    if (specifier.startsWith(key)) {
+      localSpecifierPath = path.join(__dirname, specifier.replace(key, value));
+      break;
+    }
+  }
+
+  if (!localSpecifierPath) {
+    return null;
+  }
+
+  const lookups = [
+    localSpecifierPath,
+    `${localSpecifierPath}.ts`,
+    path.join(localSpecifierPath, 'src/index.ts'),
+    path.join(localSpecifierPath, 'index.ts'),
+  ];
+
+  for (const lookup of lookups) {
+    try {
+      if (fs.statSync(lookup).isFile()) {
+        return lookup;
+      }
+    } catch {}
+  }
+
+  return null;
+}
diff --git a/packages/ngtools/webpack/BUILD.bazel b/packages/ngtools/webpack/BUILD.bazel
index d9f0075b9b46..2ef7e20f7007 100644
--- a/packages/ngtools/webpack/BUILD.bazel
+++ b/packages/ngtools/webpack/BUILD.bazel
@@ -9,6 +9,7 @@ load("//tools:defaults.bzl", "ts_library")
 # @external_begin
 load("@bazel_tools//tools/build_defs/pkg:pkg.bzl", "pkg_tar")
 load("@build_bazel_rules_nodejs//:index.bzl", "pkg_npm")
+load("@npm//@angular/dev-infra-private/bazel/api-golden:index.bzl", "api_golden_test_npm_package")
 # @external_end
 
 licenses(["notice"])  # MIT
@@ -37,7 +38,6 @@ ts_library(
     deps = [
         "@npm//@angular/compiler-cli",
         "@npm//@types/node",
-        "@npm//enhanced-resolve",
         "@npm//typescript",
         "@npm//webpack",
     ],
@@ -67,6 +67,7 @@ jasmine_node_test(
     deps = [
         "@npm//jasmine",
         "@npm//source-map",
+        "@npm//tslib",
     ],
 )
 
@@ -85,4 +86,14 @@ pkg_tar(
     strip_prefix = "./npm_package",
     tags = ["manual"],
 )
+
+api_golden_test_npm_package(
+    name = "ngtools_webpack_api",
+    data = [
+        ":npm_package",
+        "//goldens:public-api",
+    ],
+    golden_dir = "angular_cli/goldens/public-api/ngtools/webpack",
+    npm_package = "angular_cli/packages/ngtools/webpack/npm_package",
+)
 # @external_end
diff --git a/packages/ngtools/webpack/README.md b/packages/ngtools/webpack/README.md
index 8f32c335f2a4..db044e1d1646 100644
--- a/packages/ngtools/webpack/README.md
+++ b/packages/ngtools/webpack/README.md
@@ -9,21 +9,22 @@ In your webpack config, add the following plugin and loader.
 ```typescript
 import { AngularWebpackPlugin } from '@ngtools/webpack';
 
-exports = { /* ... */
+exports = {
+  /* ... */
   module: {
     rules: [
       {
         test: /\.[jt]sx?$/,
-        loader: '@ngtools/webpack'
-      }
-    ]
+        loader: '@ngtools/webpack',
+      },
+    ],
   },
 
   plugins: [
     new AngularWebpackPlugin({
       tsconfig: 'path/to/tsconfig.json',
-    })
-  ]
+    }),
+  ],
 };
 ```
 
@@ -31,9 +32,9 @@ The loader works with webpack plugin to compile the application's TypeScript. It
 
 ## Options
 
-* `tsconfig` [default: `tsconfig.json`] - The path to the application's TypeScript Configuration file. In the `tsconfig.json`, you can pass options to the Angular Compiler with `angularCompilerOptions`. Relative paths will be resolved from the Webpack compilation's context.
-* `compilerOptions` [default: none] - Overrides options in the application's TypeScript Configuration file (`tsconfig.json`).
-* `jitMode` [default: `false`] - Enables JIT compilation and do not refactor the code to bootstrap. This replaces `templateUrl: "string"` with `template: require("string")` (and similar for styles) to allow for webpack to properly link the resources.
-* `directTemplateLoading` [default: `true`] - Causes the plugin to load component templates (HTML) directly from the filesystem.  This is more efficient if only using the `raw-loader` to load component templates.  Do not enable this option if additional loaders are configured for component templates.
-* `fileReplacements` [default: none] - Allows replacing TypeScript files with other TypeScript files in the build. This option acts on fully resolved file paths.
-* `inlineStyleMimeType` [default: none] - When set to a valid MIME type, enables conversion of an Angular Component's inline styles into data URIs.  This allows a Webpack 5 configuration rule to use the `mimetype` condition to process the inline styles. A valid MIME type is a string starting with `text/` (Example for CSS: `text/css`).
+- `tsconfig` [default: `tsconfig.json`] - The path to the application's TypeScript Configuration file. In the `tsconfig.json`, you can pass options to the Angular Compiler with `angularCompilerOptions`. Relative paths will be resolved from the Webpack compilation's context.
+- `compilerOptions` [default: none] - Overrides options in the application's TypeScript Configuration file (`tsconfig.json`).
+- `jitMode` [default: `false`] - Enables JIT compilation and do not refactor the code to bootstrap. This replaces `templateUrl: "string"` with `template: require("string")` (and similar for styles) to allow for webpack to properly link the resources.
+- `directTemplateLoading` [default: `true`] - Causes the plugin to load component templates (HTML) directly from the filesystem. This is more efficient if only using the `raw-loader` to load component templates. Do not enable this option if additional loaders are configured for component templates.
+- `fileReplacements` [default: none] - Allows replacing TypeScript files with other TypeScript files in the build. This option acts on fully resolved file paths.
+- `inlineStyleFileExtension` [default: none] - When set inline component styles will be processed by Webpack as files with the provided extension.
diff --git a/packages/ngtools/webpack/package.json b/packages/ngtools/webpack/package.json
index ad9e35311494..6ac66b63bd30 100644
--- a/packages/ngtools/webpack/package.json
+++ b/packages/ngtools/webpack/package.json
@@ -20,19 +20,17 @@
     "url": "https://github.com/angular/angular-cli/issues"
   },
   "homepage": "https://github.com/angular/angular-cli/tree/master/packages/@ngtools/webpack",
-  "dependencies": {
-    "enhanced-resolve": "5.7.0"
-  },
+  "dependencies": {},
   "peerDependencies": {
-    "@angular/compiler-cli": "^12.0.0-next",
-    "typescript": "~4.2.3",
+    "@angular/compiler-cli": "^12.0.0",
+    "typescript": "~4.2.3 || ~4.3.2",
     "webpack": "^5.30.0"
   },
   "devDependencies": {
     "@angular-devkit/core": "0.0.0",
-    "@angular/compiler": "12.0.0-next.8",
-    "@angular/compiler-cli": "12.0.0-next.8",
-    "typescript": "4.2.4",
-    "webpack": "5.32.0"
+    "@angular/compiler": "12.2.1",
+    "@angular/compiler-cli": "12.2.1",
+    "typescript": "4.3.5",
+    "webpack": "5.50.0"
   }
 }
diff --git a/packages/ngtools/webpack/src/benchmark.ts b/packages/ngtools/webpack/src/benchmark.ts
index b54f5d39f5fb..6f881a2f3346 100644
--- a/packages/ngtools/webpack/src/benchmark.ts
+++ b/packages/ngtools/webpack/src/benchmark.ts
@@ -1,15 +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
  */
+
 // Internal benchmark reporting flag.
 // Use with CLI --no-progress flag for best results.
 // This should be false for commited code.
 const _benchmark = false;
-// tslint:disable:no-console
+/* eslint-disable no-console */
 export function time(label: string) {
   if (_benchmark) {
     console.time(label);
diff --git a/packages/ngtools/webpack/src/index.ts b/packages/ngtools/webpack/src/index.ts
index 9d7da50295de..0d93f5aad6b4 100644
--- a/packages/ngtools/webpack/src/index.ts
+++ b/packages/ngtools/webpack/src/index.ts
@@ -1,11 +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 * as ivyInternal from './ivy';
+
 export {
   AngularWebpackLoaderPath,
   AngularWebpackPlugin,
@@ -16,6 +18,7 @@ export {
 /** @deprecated Deprecated as of v12, please use the direct exports
  * (`AngularWebpackPlugin` instead of `ivy.AngularWebpackPlugin`)
  */
+// eslint-disable-next-line @typescript-eslint/no-namespace
 export namespace ivy {
   export const AngularWebpackLoaderPath = ivyInternal.AngularWebpackLoaderPath;
   export const AngularWebpackPlugin = ivyInternal.AngularWebpackPlugin;
diff --git a/packages/ngtools/webpack/src/ivy/cache.ts b/packages/ngtools/webpack/src/ivy/cache.ts
index 1b3856b238c0..0448906aa87c 100644
--- a/packages/ngtools/webpack/src/ivy/cache.ts
+++ b/packages/ngtools/webpack/src/ivy/cache.ts
@@ -1,46 +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 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, 'ignore' | number | { safeTime: number } | null>,
-    buildTimestamp: number,
-  ): Set<string> {
-    const changedFiles = new Set<string>();
-    for (const [file, timeOrEntry] of fileTimestamps) {
-      if (timeOrEntry === 'ignore') {
-        continue;
-      }
-
-      let time;
-      if (typeof timeOrEntry === 'number') {
-        time = timeOrEntry;
-      } else if (timeOrEntry) {
-        time = timeOrEntry.safeTime;
-      }
-
-      if (!time || time >= buildTimestamp) {
-        // 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);
-      }
+  invalidate(file: string): void {
+    const sourceFile = this.get(file);
+    if (sourceFile) {
+      this.delete(file);
+      this.angularDiagnostics.delete(sourceFile);
     }
-
-    return changedFiles;
   }
 
   updateAngularDiagnostics(sourceFile: ts.SourceFile, diagnostics: ts.Diagnostic[]): void {
diff --git a/packages/ngtools/webpack/src/ivy/diagnostics.ts b/packages/ngtools/webpack/src/ivy/diagnostics.ts
index 6146fc13326e..76a322c91d23 100644
--- a/packages/ngtools/webpack/src/ivy/diagnostics.ts
+++ b/packages/ngtools/webpack/src/ivy/diagnostics.ts
@@ -1,20 +1,18 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of 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 { Compilation } from 'webpack';
-import { addError, addWarning } from '../webpack-diagnostics';
+import type { Compilation } from 'webpack';
 
 export type DiagnosticsReporter = (diagnostics: Diagnostics) => void;
 
-export function createDiagnosticsReporter(
-  compilation: Compilation,
-): DiagnosticsReporter {
+export function createDiagnosticsReporter(compilation: Compilation): DiagnosticsReporter {
   return (diagnostics) => {
     for (const diagnostic of diagnostics) {
       const text = formatDiagnostics([diagnostic]);
@@ -26,3 +24,11 @@ export function createDiagnosticsReporter(
     }
   };
 }
+
+export function addWarning(compilation: Compilation, message: string): void {
+  compilation.warnings.push(new compilation.compiler.webpack.WebpackError(message));
+}
+
+export function addError(compilation: Compilation, message: string): void {
+  compilation.errors.push(new compilation.compiler.webpack.WebpackError(message));
+}
diff --git a/packages/ngtools/webpack/src/ivy/host.ts b/packages/ngtools/webpack/src/ivy/host.ts
index 8dbb9e818810..3a7f3783bfb4 100644
--- a/packages/ngtools/webpack/src/ivy/host.ts
+++ b/packages/ngtools/webpack/src/ivy/host.ts
@@ -1,23 +1,28 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+
+/* eslint-disable @typescript-eslint/unbound-method */
 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 { WebpackResourceLoader } from '../resource_loader';
-import { workaroundStylePreprocessing } from '../transformers';
 import { normalizePath } from './paths';
 
 export function augmentHostWithResources(
   host: ts.CompilerHost,
   resourceLoader: WebpackResourceLoader,
-  options: { directTemplateLoading?: boolean, inlineStyleMimeType?: string } = {},
+  options: {
+    directTemplateLoading?: boolean;
+    inlineStyleMimeType?: string;
+    inlineStyleFileExtension?: string;
+  } = {},
 ) {
   const resourceHost = host as CompilerHost;
 
@@ -55,10 +60,13 @@ export function augmentHostWithResources(
       return null;
     }
 
-    if (options.inlineStyleMimeType) {
+    if (options.inlineStyleMimeType || options.inlineStyleFileExtension) {
       const content = await resourceLoader.process(
         data,
         options.inlineStyleMimeType,
+        options.inlineStyleFileExtension,
+        context.type,
+        context.containingFile,
       );
 
       return { content };
@@ -130,7 +138,11 @@ export function augmentHostWithDependencyCollection(
 ): void {
   if (host.resolveModuleNames) {
     const baseResolveModuleNames = host.resolveModuleNames;
-    host.resolveModuleNames = function (moduleNames: string[], containingFile: string, ...parameters) {
+    host.resolveModuleNames = function (
+      moduleNames: string[],
+      containingFile: string,
+      ...parameters
+    ) {
       const results = baseResolveModuleNames.call(host, moduleNames, containingFile, ...parameters);
 
       const containingFilePath = normalizePath(containingFile);
@@ -334,7 +346,6 @@ export function augmentHostWithCaching(
     languageVersion,
     onError,
     shouldCreateNewSourceFile,
-    // tslint:disable-next-line: trailing-comma
     ...parameters
   ) {
     if (!shouldCreateNewSourceFile && cache.has(fileName)) {
@@ -351,11 +362,6 @@ export function augmentHostWithCaching(
     );
 
     if (file) {
-      // Temporary workaround for upstream transform resource defect
-      if (file && !file.isDeclarationFile && file.text.includes('@Component')) {
-        workaroundStylePreprocessing(file);
-      }
-
       cache.set(fileName, file);
     }
 
diff --git a/packages/ngtools/webpack/src/ivy/index.ts b/packages/ngtools/webpack/src/ivy/index.ts
index 132e9f84c75d..bf7595bd847e 100644
--- a/packages/ngtools/webpack/src/ivy/index.ts
+++ b/packages/ngtools/webpack/src/ivy/index.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
  */
+
 export { angularWebpackLoader as default } from './loader';
 export { AngularWebpackPluginOptions, AngularWebpackPlugin } from './plugin';
 
diff --git a/packages/ngtools/webpack/src/ivy/loader.ts b/packages/ngtools/webpack/src/ivy/loader.ts
index a69412294929..682b87d651b7 100644
--- a/packages/ngtools/webpack/src/ivy/loader.ts
+++ b/packages/ngtools/webpack/src/ivy/loader.ts
@@ -1,28 +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
  */
+
 import * as path from 'path';
+import type { LoaderContext } from 'webpack';
 import { AngularPluginSymbol, FileEmitterCollection } from './symbol';
 
-export function angularWebpackLoader(
-  // tslint:disable-next-line: no-any
-  this: any,
-  content: string,
-  // Source map types are broken in the webpack type definitions
-  // tslint:disable-next-line: no-any
-  map: any,
-) {
+export function angularWebpackLoader(this: LoaderContext<unknown>, content: string, map: string) {
   const callback = this.async();
   if (!callback) {
     throw new Error('Invalid webpack version');
   }
 
-  const fileEmitter = this._compilation[AngularPluginSymbol] as FileEmitterCollection;
-  if (typeof fileEmitter !== 'object') {
+  const fileEmitter = (
+    this as LoaderContext<unknown> & { [AngularPluginSymbol]?: FileEmitterCollection }
+  )[AngularPluginSymbol];
+  if (!fileEmitter || typeof fileEmitter !== 'object') {
     if (this.resourcePath.endsWith('.js')) {
       // Passthrough for JS files when no plugin is used
       this.callback(undefined, content, map);
@@ -35,7 +32,8 @@ export function angularWebpackLoader(
     return;
   }
 
-  fileEmitter.emit(this.resourcePath)
+  fileEmitter
+    .emit(this.resourcePath)
     .then((result) => {
       if (!result) {
         if (this.resourcePath.endsWith('.js')) {
diff --git a/packages/ngtools/webpack/src/ivy/paths.ts b/packages/ngtools/webpack/src/ivy/paths.ts
index ff3b9e1b2800..bddc20ce306f 100644
--- a/packages/ngtools/webpack/src/ivy/paths.ts
+++ b/packages/ngtools/webpack/src/ivy/paths.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 * as nodePath from 'path';
 
 const normalizationCache = new Map<string, string>();
diff --git a/packages/ngtools/webpack/src/ivy/plugin.ts b/packages/ngtools/webpack/src/ivy/plugin.ts
index 3c4a65f2c152..b1013d1b2f85 100644
--- a/packages/ngtools/webpack/src/ivy/plugin.ts
+++ b/packages/ngtools/webpack/src/ivy/plugin.ts
@@ -1,21 +1,26 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of 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 ts from 'typescript';
-import { Compilation, Compiler, Module, NormalModuleReplacementPlugin, util } from 'webpack';
+import type { Compilation, Compiler, Module, NormalModule } from 'webpack';
 import { NgccProcessor } from '../ngcc_processor';
 import { TypeScriptPathsPlugin } from '../paths-plugin';
 import { WebpackResourceLoader } from '../resource_loader';
-import { addError, addWarning } from '../webpack-diagnostics';
 import { SourceFileCache } from './cache';
-import { DiagnosticsReporter, createDiagnosticsReporter } from './diagnostics';
+import {
+  DiagnosticsReporter,
+  addError,
+  addWarning,
+  createDiagnosticsReporter,
+} from './diagnostics';
 import {
   augmentHostWithCaching,
   augmentHostWithDependencyCollection,
@@ -46,12 +51,9 @@ export interface AngularWebpackPluginOptions {
   emitClassMetadata: boolean;
   emitNgModuleScope: boolean;
   jitMode: boolean;
+  /** @deprecated use `inlineStyleFileExtension` instead. */
   inlineStyleMimeType?: string;
-}
-
-// Add support for missing properties in Webpack types as well as the loader's file emitter
-interface WebpackCompilation extends Compilation {
-  [AngularPluginSymbol]: FileEmitterCollection;
+  inlineStyleFileExtension?: string;
 }
 
 function initializeNgccProcessor(
@@ -59,10 +61,16 @@ function initializeNgccProcessor(
   tsconfig: string,
 ): { processor: NgccProcessor; errors: string[]; warnings: string[] } {
   const { inputFileSystem, options: webpackOptions } = compiler;
-  const mainFields = ([] as string[]).concat(...(webpackOptions.resolve?.mainFields || []));
+  const mainFields = webpackOptions.resolve?.mainFields?.flat() ?? [];
 
   const errors: string[] = [];
   const warnings: string[] = [];
+  const resolver = compiler.resolverFactory.get('normal', {
+    // Caching must be disabled because it causes the resolver to become async after a rebuild
+    cache: false,
+    extensions: ['.json'],
+    useSyncFileSystemCalls: true,
+  });
   const processor = new NgccProcessor(
     mainFields,
     warnings,
@@ -70,7 +78,7 @@ function initializeNgccProcessor(
     compiler.context,
     tsconfig,
     inputFileSystem,
-    webpackOptions.resolve?.symlinks,
+    resolver,
   );
 
   return { processor, errors, warnings };
@@ -81,6 +89,7 @@ function hashContent(content: string): Uint8Array {
 }
 
 const PLUGIN_NAME = 'angular-compiler';
+const compilationFileEmitters = new WeakMap<Compilation, FileEmitterCollection>();
 
 export class AngularWebpackPlugin {
   private readonly pluginOptions: AngularWebpackPluginOptions;
@@ -88,7 +97,6 @@ export class AngularWebpackPlugin {
   private ngtscNextProgram?: NgtscProgram;
   private builder?: ts.EmitAndSemanticDiagnosticsBuilderProgram;
   private sourceFileCache?: SourceFileCache;
-  private buildTimestamp!: number;
   private readonly fileDependencies = new Map<string, Set<string>>();
   private readonly requiredFilesToEmit = new Set<string>();
   private readonly requiredFilesToEmitCache = new Map<string, EmitFileResult | undefined>();
@@ -111,8 +119,9 @@ export class AngularWebpackPlugin {
     return this.pluginOptions;
   }
 
-  apply(webpackCompiler: Compiler): void {
-    const compiler = webpackCompiler as Compiler & { watchMode?: boolean };
+  apply(compiler: Compiler): void {
+    const { NormalModuleReplacementPlugin, util } = compiler.webpack;
+
     // Setup file replacements with webpack
     for (const [key, value] of Object.entries(this.pluginOptions.fileReplacements)) {
       new NormalModuleReplacementPlugin(
@@ -123,46 +132,38 @@ export class AngularWebpackPlugin {
 
     // 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;
-
+    compiler.hooks.afterResolvers.tap(PLUGIN_NAME, (compiler) => {
       // 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
+      compiler.resolverFactory.hooks.resolveOptions
         .for('normal')
-        .tap(PLUGIN_NAME, (resolveOptions: { mainFields: string[]; plugins: unknown[] }) => {
+        .tap(PLUGIN_NAME, (resolveOptions) => {
           const originalMainFields = resolveOptions.mainFields;
-          const ivyMainFields = originalMainFields.map((f) => `${f}_ivy_ngcc`);
+          const ivyMainFields = originalMainFields?.flat().map((f) => `${f}_ivy_ngcc`) ?? [];
 
-          if (!resolveOptions.plugins) {
-            resolveOptions.plugins = [];
-          }
+          resolveOptions.plugins ??= [];
           resolveOptions.plugins.push(pathsPlugin);
 
           // https://github.com/webpack/webpack/issues/11635#issuecomment-707016779
           return util.cleverMerge(resolveOptions, { mainFields: [...ivyMainFields, '...'] });
-
         });
     });
 
     let ngccProcessor: NgccProcessor | undefined;
-    const resourceLoader = new WebpackResourceLoader();
+    let resourceLoader: WebpackResourceLoader | undefined;
     let previousUnused: Set<string> | undefined;
-    compiler.hooks.thisCompilation.tap(PLUGIN_NAME, (thisCompilation) => {
-      const compilation = thisCompilation as WebpackCompilation;
-
+    compiler.hooks.thisCompilation.tap(PLUGIN_NAME, (compilation) => {
       // Register plugin to ensure deterministic emit order in multi-plugin usage
-      if (!compilation[AngularPluginSymbol]) {
-        compilation[AngularPluginSymbol] = new FileEmitterCollection();
-      }
-      const emitRegistration = compilation[AngularPluginSymbol].register();
+      const emitRegistration = this.registerWithCompilation(compilation);
 
-      // Store watch mode; assume true if not present (webpack < 4.23.0)
-      this.watchMode = compiler.watchMode ?? true;
+      this.watchMode = compiler.watchMode;
+
+      // Initialize the resource loader if not already setup
+      if (!resourceLoader) {
+        resourceLoader = new WebpackResourceLoader(this.watchMode);
+      }
 
       // Initialize and process eager ngcc if not already setup
       if (!ngccProcessor) {
@@ -179,7 +180,7 @@ export class AngularWebpackPlugin {
       }
 
       // Setup and read TypeScript and Angular compiler configuration
-      const { compilerOptions, rootNames, errors } = this.loadConfiguration(compilation);
+      const { compilerOptions, rootNames, errors } = this.loadConfiguration();
 
       // Create diagnostics reporter and report configuration file errors
       const diagnosticsReporter = createDiagnosticsReporter(compilation);
@@ -200,12 +201,15 @@ export class AngularWebpackPlugin {
       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));
+        changedFiles = new Set<string>();
+        for (const changedFile of [...compiler.modifiedFiles, ...compiler.removedFiles]) {
+          const normalizedChangedFile = normalizePath(changedFile);
+          // Invalidate file dependencies
+          this.fileDependencies.delete(normalizedChangedFile);
+          // Invalidate existing cache
+          cache.invalidate(normalizedChangedFile);
+
+          changedFiles.add(normalizedChangedFile);
         }
       } else {
         // Initialize a new cache
@@ -215,7 +219,6 @@ export class AngularWebpackPlugin {
           this.sourceFileCache = cache;
         }
       }
-      this.buildTimestamp = Date.now();
       augmentHostWithCaching(host, cache);
 
       const moduleResolutionCache = ts.createModuleResolutionCache(
@@ -235,6 +238,7 @@ export class AngularWebpackPlugin {
       augmentHostWithResources(host, resourceLoader, {
         directTemplateLoading: this.pluginOptions.directTemplateLoading,
         inlineStyleMimeType: this.pluginOptions.inlineStyleMimeType,
+        inlineStyleFileExtension: this.pluginOptions.inlineStyleFileExtension,
       });
 
       // Setup source file adjustment options
@@ -252,34 +256,44 @@ export class AngularWebpackPlugin {
             resourceLoader,
           );
 
-      const allProgramFiles = builder
-        .getSourceFiles()
-        .filter((sourceFile) => !internalFiles?.has(sourceFile));
+      // Set of files used during the unused TypeScript file analysis
+      const currentUnused = new Set<string>();
 
-      // Ensure all program files are considered part of the compilation and will be watched
-      allProgramFiles.forEach((sourceFile) =>
-        compilation.fileDependencies.add(sourceFile.fileName),
-      );
+      for (const sourceFile of builder.getSourceFiles()) {
+        if (internalFiles?.has(sourceFile)) {
+          continue;
+        }
+
+        // Ensure all program files are considered part of the compilation and will be watched.
+        // Webpack does not normalize paths. Therefore, we need to normalize the path with FS seperators.
+        compilation.fileDependencies.add(externalizePath(sourceFile.fileName));
+
+        // Add all non-declaration files to the initial set of unused files. The set will be
+        // analyzed and pruned after all Webpack modules are finished building.
+        if (!sourceFile.isDeclarationFile) {
+          currentUnused.add(normalizePath(sourceFile.fileName));
+        }
+      }
 
       compilation.hooks.finishModules.tapPromise(PLUGIN_NAME, async (modules) => {
         // Rebuild any remaining AOT required modules
         await this.rebuildRequiredFiles(modules, compilation, fileEmitter);
 
+        // Clear out the Webpack compilation to avoid an extra retaining reference
+        resourceLoader?.clearParentCompilation();
+
         // 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)),
-        );
-        Array.from(modules).forEach(({ resource }: Module & { resource?: string }) => {
+        for (const webpackModule of modules) {
+          const resource = (webpackModule as NormalModule).resource;
           if (resource) {
             this.markResourceUsed(normalizePath(resource), currentUnused);
           }
-        });
+        }
+
         for (const unused of currentUnused) {
           if (previousUnused && previousUnused.has(unused)) {
             continue;
@@ -298,6 +312,23 @@ export class AngularWebpackPlugin {
     });
   }
 
+  private registerWithCompilation(compilation: Compilation) {
+    let fileEmitters = compilationFileEmitters.get(compilation);
+    if (!fileEmitters) {
+      fileEmitters = new FileEmitterCollection();
+      compilationFileEmitters.set(compilation, fileEmitters);
+      compilation.compiler.webpack.NormalModule.getCompilationHooks(compilation).loader.tap(
+        PLUGIN_NAME,
+        (loaderContext: { [AngularPluginSymbol]?: FileEmitterCollection }) => {
+          loaderContext[AngularPluginSymbol] = fileEmitters;
+        },
+      );
+    }
+    const emitRegistration = fileEmitters.register();
+
+    return emitRegistration;
+  }
+
   private markResourceUsed(normalizedResourcePath: string, currentUnused: Set<string>): void {
     if (!currentUnused.has(normalizedResourcePath)) {
       return;
@@ -315,16 +346,13 @@ export class AngularWebpackPlugin {
 
   private async rebuildRequiredFiles(
     modules: Iterable<Module>,
-    compilation: WebpackCompilation,
+    compilation: Compilation,
     fileEmitter: FileEmitter,
   ): Promise<void> {
     if (this.requiredFilesToEmit.size === 0) {
       return;
     }
 
-    const rebuild = (webpackModule: 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);
@@ -347,23 +375,29 @@ export class AngularWebpackPlugin {
     }
 
     if (filesToRebuild.size > 0) {
-      for (const webpackModule of [...modules]) {
-        const resource = (webpackModule as Module & { resource?: string }).resource;
+      const rebuild = (webpackModule: Module) =>
+        new Promise<void>((resolve) => compilation.rebuildModule(webpackModule, () => resolve()));
+
+      const modulesToRebuild = [];
+      for (const webpackModule of modules) {
+        const resource = (webpackModule as NormalModule).resource;
         if (resource && filesToRebuild.has(normalizePath(resource))) {
-          await rebuild(webpackModule);
+          modulesToRebuild.push(webpackModule);
         }
       }
+      await Promise.all(modulesToRebuild.map((webpackModule) => rebuild(webpackModule)));
     }
 
     this.requiredFilesToEmit.clear();
     this.requiredFilesToEmitCache.clear();
   }
 
-  private loadConfiguration(compilation: WebpackCompilation) {
-    const { options: compilerOptions, rootNames, errors } = readConfiguration(
-      this.pluginOptions.tsconfig,
-      this.pluginOptions.compilerOptions,
-    );
+  private loadConfiguration() {
+    const {
+      options: compilerOptions,
+      rootNames,
+      errors,
+    } = readConfiguration(this.pluginOptions.tsconfig, this.pluginOptions.compilerOptions);
     compilerOptions.enableIvy = true;
     compilerOptions.noEmitOnError = false;
     compilerOptions.suppressOutputPathCheck = true;
@@ -408,64 +442,71 @@ export class AngularWebpackPlugin {
     const typeScriptProgram = angularProgram.getTsProgram();
     augmentProgramWithVersioning(typeScriptProgram);
 
-    const builder = ts.createEmitAndSemanticDiagnosticsBuilderProgram(
-      typeScriptProgram,
-      host,
-      this.builder,
-    );
-
-    // Save for next rebuild
+    let builder: ts.BuilderProgram | ts.EmitAndSemanticDiagnosticsBuilderProgram;
     if (this.watchMode) {
-      this.builder = builder;
+      builder = this.builder = ts.createEmitAndSemanticDiagnosticsBuilderProgram(
+        typeScriptProgram,
+        host,
+        this.builder,
+      );
       this.ngtscNextProgram = angularProgram;
+    } else {
+      // When not in watch mode, the startup cost of the incremental analysis can be avoided by
+      // using an abstract builder that only wraps a TypeScript program.
+      builder = ts.createAbstractBuilder(typeScriptProgram, host);
     }
 
     // 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);
+
+    // Analyze affected files when in watch mode for incremental type checking
+    if ('getSemanticDiagnosticsOfNextAffectedFile' in builder) {
+      // eslint-disable-next-line no-constant-condition
+      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 true;
-        }
+          return false;
+        });
 
-        return false;
-      });
+        if (!result) {
+          break;
+        }
 
-      if (!result) {
-        break;
+        affectedFiles.add(result.affected as ts.SourceFile);
       }
-
-      affectedFiles.add(result.affected as ts.SourceFile);
     }
 
-    // Collect non-semantic diagnostics
+    // Collect program level diagnostics
     const diagnostics = [
       ...angularCompiler.getOptionDiagnostics(),
       ...builder.getOptionsDiagnostics(),
       ...builder.getGlobalDiagnostics(),
-      ...builder.getSyntacticDiagnostics(),
     ];
     diagnosticsReporter(diagnostics);
 
-    // Collect semantic diagnostics
+    // Collect source file specific diagnostics
     for (const sourceFile of builder.getSourceFiles()) {
       if (!ignoreForDiagnostics.has(sourceFile)) {
+        diagnosticsReporter(builder.getSyntacticDiagnostics(sourceFile));
         diagnosticsReporter(builder.getSemanticDiagnostics(sourceFile));
       }
     }
@@ -534,12 +575,6 @@ export class AngularWebpackPlugin {
         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 =
-        // tslint:disable-next-line: no-any
-        angularCompiler.getNextProgram?.() || (angularCompiler as any).getCurrentProgram?.();
-
       return this.createFileEmitter(
         builder,
         mergeTransformers(angularCompiler.prepareEmit().transformers, transformers),
@@ -569,16 +604,18 @@ export class AngularWebpackPlugin {
     host: CompilerHost,
     diagnosticsReporter: DiagnosticsReporter,
   ) {
-    const builder = ts.createEmitAndSemanticDiagnosticsBuilderProgram(
-      rootNames,
-      compilerOptions,
-      host,
-      this.builder,
-    );
-
-    // Save for next rebuild
+    let builder;
     if (this.watchMode) {
-      this.builder = builder;
+      builder = this.builder = ts.createEmitAndSemanticDiagnosticsBuilderProgram(
+        rootNames,
+        compilerOptions,
+        host,
+        this.builder,
+      );
+    } else {
+      // When not in watch mode, the startup cost of the incremental analysis can be avoided by
+      // using an abstract builder that only wraps a TypeScript program.
+      builder = ts.createAbstractBuilder(rootNames, compilerOptions, host);
     }
 
     const diagnostics = [
diff --git a/packages/ngtools/webpack/src/ivy/symbol.ts b/packages/ngtools/webpack/src/ivy/symbol.ts
index 451946ff52ca..f44777a3a638 100644
--- a/packages/ngtools/webpack/src/ivy/symbol.ts
+++ b/packages/ngtools/webpack/src/ivy/symbol.ts
@@ -1,11 +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
  */
-export const AngularPluginSymbol = Symbol.for('@angular-devkit/build-angular[angular-compiler]');
+
+export const AngularPluginSymbol = Symbol.for('@ngtools/webpack[angular-compiler]');
 
 export interface EmitFileResult {
   content?: string;
diff --git a/packages/ngtools/webpack/src/ivy/system.ts b/packages/ngtools/webpack/src/ivy/system.ts
index 811ec369360f..27ca17942d82 100644
--- a/packages/ngtools/webpack/src/ivy/system.ts
+++ b/packages/ngtools/webpack/src/ivy/system.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 * as ts from 'typescript';
 import { Compiler } from 'webpack';
 import { externalizePath } from './paths';
diff --git a/packages/ngtools/webpack/src/ivy/transformation.ts b/packages/ngtools/webpack/src/ivy/transformation.ts
index 1e34732564cc..8a635a976946 100644
--- a/packages/ngtools/webpack/src/ivy/transformation.ts
+++ b/packages/ngtools/webpack/src/ivy/transformation.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 { constructorParametersDownlevelTransform } from '@angular/compiler-cli';
 import * as ts from 'typescript';
 import { elideImports } from '../transformers/elide_imports';
@@ -24,7 +25,7 @@ export function createAotTransformers(
   const removeClassMetadata = !options.emitClassMetadata;
   const removeNgModuleScope = !options.emitNgModuleScope;
   if (removeClassMetadata || removeNgModuleScope) {
-    // tslint:disable-next-line: no-non-null-assertion
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     transformers.before!.push(
       removeIvyJitSupportCalls(removeClassMetadata, removeNgModuleScope, getTypeChecker),
     );
@@ -35,7 +36,11 @@ export function createAotTransformers(
 
 export function createJitTransformers(
   builder: ts.BuilderProgram,
-  options: { directTemplateLoading?: boolean; inlineStyleMimeType?: string },
+  options: {
+    directTemplateLoading?: boolean;
+    inlineStyleMimeType?: string;
+    inlineStyleFileExtension?: string;
+  },
 ): ts.CustomTransformers {
   const getTypeChecker = () => builder.getProgram().getTypeChecker();
 
@@ -46,6 +51,7 @@ export function createJitTransformers(
         getTypeChecker,
         options.directTemplateLoading,
         options.inlineStyleMimeType,
+        options.inlineStyleFileExtension,
       ),
       constructorParametersDownlevelTransform(builder.getProgram()),
     ],
@@ -126,11 +132,11 @@ export function replaceBootstrap(
           replacedNodes,
           getTypeChecker,
           context.getCompilerOptions(),
-        ).map((op) => op.target);
-        if (removals.length > 0) {
+        );
+        if (removals.size > 0) {
           updatedSourceFile = ts.visitEachChild(
             updatedSourceFile,
-            (node) => (removals.includes(node) ? undefined : node),
+            (node) => (removals.has(node) ? undefined : node),
             context,
           );
         }
diff --git a/packages/ngtools/webpack/src/loaders/direct-resource.ts b/packages/ngtools/webpack/src/loaders/direct-resource.ts
new file mode 100644
index 000000000000..b6f2a2cae111
--- /dev/null
+++ b/packages/ngtools/webpack/src/loaders/direct-resource.ts
@@ -0,0 +1,13 @@
+/**
+ * @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 DirectAngularResourceLoaderPath = __filename;
+
+export default function (content: string) {
+  return `export default ${JSON.stringify(content)};`;
+}
diff --git a/packages/ngtools/webpack/src/loaders/inline-resource.ts b/packages/ngtools/webpack/src/loaders/inline-resource.ts
new file mode 100644
index 000000000000..de224a3a4ac0
--- /dev/null
+++ b/packages/ngtools/webpack/src/loaders/inline-resource.ts
@@ -0,0 +1,31 @@
+/**
+ * @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 type { Compilation, LoaderContext } from 'webpack';
+
+export const InlineAngularResourceLoaderPath = __filename;
+
+export const InlineAngularResourceSymbol = Symbol('@ngtools/webpack[angular-resource]');
+
+export interface CompilationWithInlineAngularResource extends Compilation {
+  [InlineAngularResourceSymbol]: string;
+}
+
+export default function (this: LoaderContext<{ data?: string }>) {
+  const callback = this.async();
+  const { data } = this.getOptions();
+
+  if (data) {
+    callback(undefined, Buffer.from(data, 'base64').toString());
+  } else {
+    const content = (this._compilation as CompilationWithInlineAngularResource)[
+      InlineAngularResourceSymbol
+    ];
+    callback(undefined, content);
+  }
+}
diff --git a/packages/ngtools/webpack/src/ngcc_processor.ts b/packages/ngtools/webpack/src/ngcc_processor.ts
index cf0ca3df4b06..7648d3248df9 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,13 +9,16 @@
 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 type { Compiler } from 'webpack';
 import { time, timeEnd } from './benchmark';
 import { InputFileSystem } from './ivy/system';
 
+// Extract Resolver type from Webpack types since it is not directly exported
+type ResolverWithOptions = ReturnType<Compiler['resolverFactory']['get']>;
+
 // We cannot create a plugin for this, because NGTSC requires addition type
 // information which ngcc creates when processing a package which was compiled with NGC.
 
@@ -30,7 +33,6 @@ export class NgccProcessor {
   private _processedModules = new Set<string>();
   private _logger: NgccLogger;
   private _nodeModulesDirectory: string;
-  private _resolver: Resolver;
 
   constructor(
     private readonly propertiesToConsider: string[],
@@ -39,19 +41,10 @@ export class NgccProcessor {
     private readonly basePath: string,
     private readonly tsConfigPath: string,
     private readonly inputFileSystem: InputFileSystem,
-    private readonly symlinks: boolean | undefined,
+    private readonly resolver: ResolverWithOptions,
   ) {
     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. */
@@ -131,14 +124,14 @@ export class NgccProcessor {
       process.execPath,
       [
         require.resolve('@angular/compiler-cli/ngcc/main-ngcc.js'),
-        '--source', /** basePath */
+        '--source' /** basePath */,
         this._nodeModulesDirectory,
-        '--properties', /** propertiesToConsider */
+        '--properties' /** propertiesToConsider */,
         ...this.propertiesToConsider,
-        '--first-only', /** compileAllFormats */
-        '--create-ivy-entry-points', /** createNewEntryPointFormats */
+        '--first-only' /** compileAllFormats */,
+        '--create-ivy-entry-points' /** createNewEntryPointFormats */,
         '--async',
-        '--tsconfig', /** tsConfigPath */
+        '--tsconfig' /** tsConfigPath */,
         this.tsConfigPath,
         '--use-program-dependencies',
       ],
@@ -173,8 +166,11 @@ export class NgccProcessor {
     resolvedModule: ts.ResolvedModule | ts.ResolvedTypeReferenceDirective,
   ): void {
     const resolvedFileName = resolvedModule.resolvedFileName;
-    if (!resolvedFileName || moduleName.startsWith('.')
-      || this._processedModules.has(resolvedFileName)) {
+    if (
+      !resolvedFileName ||
+      moduleName.startsWith('.') ||
+      this._processedModules.has(resolvedFileName)
+    ) {
       // Skip when module is unknown, relative or NGCC compiler is not found or already processed.
       return;
     }
@@ -204,10 +200,7 @@ export class NgccProcessor {
 
     // Purge this file from cache, since NGCC add new mainFields. Ex: module_ivy_ngcc
     // which are unknown in the cached file.
-    if (this.inputFileSystem.purge) {
-      // tslint:disable-next-line: no-any
-      (this.inputFileSystem.purge as any)(packageJsonPath);
-    }
+    this.inputFileSystem.purge?.(packageJsonPath);
 
     this._processedModules.add(resolvedFileName);
   }
@@ -221,7 +214,11 @@ export class NgccProcessor {
    */
   private tryResolvePackage(moduleName: string, resolvedFileName: string): string | undefined {
     try {
-      const resolvedPath = this._resolver.resolveSync({}, resolvedFileName, `${moduleName}/package.json`);
+      const resolvedPath = this.resolver.resolveSync(
+        {},
+        resolvedFileName,
+        `${moduleName}/package.json`,
+      );
 
       return resolvedPath || undefined;
     } catch {
@@ -254,9 +251,10 @@ class NgccLogger implements Logger {
   constructor(
     private readonly compilationWarnings: (Error | string)[],
     private readonly compilationErrors: (Error | string)[],
-  ) { }
+  ) {}
 
-  debug(..._args: string[]) { }
+  // eslint-disable-next-line @typescript-eslint/no-empty-function
+  debug() {}
 
   info(...args: string[]) {
     // Log to stderr because it's a progress-like info message.
diff --git a/packages/ngtools/webpack/src/paths-plugin.ts b/packages/ngtools/webpack/src/paths-plugin.ts
index f802cf698138..e9aab5831f24 100644
--- a/packages/ngtools/webpack/src/paths-plugin.ts
+++ b/packages/ngtools/webpack/src/paths-plugin.ts
@@ -1,25 +1,20 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of 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 { CompilerOptions, MapLike } from 'typescript';
+import type { Configuration } from 'webpack';
 
-const getInnerRequest = require('enhanced-resolve/lib/getInnerRequest');
-
-interface NormalModuleFactoryRequest {
-  request: string;
-  context: { issuer: string };
-  contextInfo: { issuer: string };
-  typescriptPathMapped?: boolean;
-}
+// eslint-disable-next-line @typescript-eslint/no-empty-interface
+export interface TypeScriptPathsPluginOptions extends Pick<CompilerOptions, 'paths' | 'baseUrl'> {}
 
-export interface TypeScriptPathsPluginOptions extends Pick<CompilerOptions, 'paths' | 'baseUrl'> {
-
-}
+// Extract Resolver type from Webpack types since it is not directly exported
+type Resolver = Exclude<Exclude<Configuration['resolve'], undefined>['resolver'], undefined>;
 
 export class TypeScriptPathsPlugin {
   constructor(private options?: TypeScriptPathsPluginOptions) {}
@@ -28,80 +23,94 @@ export class TypeScriptPathsPlugin {
     this.options = options;
   }
 
-  // tslint:disable-next-line:no-any
-  apply(resolver: any) {
+  apply(resolver: Resolver): void {
     const target = resolver.ensureHook('resolve');
-    const resolveAsync = (request: NormalModuleFactoryRequest, requestContext: {}) => {
-      return new Promise<NormalModuleFactoryRequest | undefined>((resolve, reject) => {
-        resolver.doResolve(
-          target,
-          request,
-          '',
-          requestContext,
-          (error: Error | null, result: NormalModuleFactoryRequest | undefined) => {
-            if (error) {
-              reject(error);
-            } else {
-              resolve(result);
-            }
-          },
-        );
-      });
-    };
 
-    resolver.getHook('described-resolve').tapPromise(
+    resolver.getHook('described-resolve').tapAsync(
       'TypeScriptPathsPlugin',
-      async (request: NormalModuleFactoryRequest, resolveContext: {}) => {
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
+      (request: any, resolveContext, callback) => {
         if (!this.options) {
-          throw new Error('TypeScriptPathsPlugin options were not provided.');
+          callback();
+
+          return;
         }
 
         if (!request || request.typescriptPathMapped) {
+          callback();
+
           return;
         }
 
-        const originalRequest = getInnerRequest(resolver, request);
+        const originalRequest = request.request || request.path;
         if (!originalRequest) {
+          callback();
+
           return;
         }
 
         // Only work on Javascript/TypeScript issuers.
         if (!request.context.issuer || !request.context.issuer.match(/\.[jt]sx?$/)) {
+          callback();
+
           return;
         }
 
         // Relative or absolute requests are not mapped
         if (originalRequest.startsWith('.') || originalRequest.startsWith('/')) {
+          callback();
+
           return;
         }
 
         // Ignore all webpack special requests
         if (originalRequest.startsWith('!!')) {
+          callback();
+
           return;
         }
 
         const replacements = findReplacements(originalRequest, this.options.paths || {});
-        for (const potential of replacements) {
+
+        const tryResolve = () => {
+          const potential = replacements.shift();
+          if (!potential) {
+            callback();
+
+            return;
+          }
+
           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);
 
-          if (result) {
-            return result;
-          }
-        }
+          resolver.doResolve(
+            target,
+            potentialRequest,
+            '',
+            resolveContext,
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
+            (error: Error | null, result: any) => {
+              if (error) {
+                callback(error);
+              } else if (result) {
+                callback(undefined, result);
+              } else {
+                tryResolve();
+              }
+            },
+          );
+        };
+
+        tryResolve();
       },
     );
   }
 }
 
-function findReplacements(
-  originalRequest: string,
-  paths: MapLike<string[]>,
-): Iterable<string> {
+function findReplacements(originalRequest: string, paths: MapLike<string[]>): string[] {
   // check if any path mapping rules are relevant
   const pathMapOptions = [];
   for (const pattern in paths) {
@@ -168,7 +177,7 @@ function findReplacements(
   });
 
   const replacements: string[] = [];
-  pathMapOptions.forEach(option => {
+  pathMapOptions.forEach((option) => {
     for (const potential of option.potentials) {
       let replacement;
       const starIndex = potential.indexOf('*');
diff --git a/packages/ngtools/webpack/src/resource_loader.ts b/packages/ngtools/webpack/src/resource_loader.ts
index eddf2e770aaa..5aa58749223c 100644
--- a/packages/ngtools/webpack/src/resource_loader.ts
+++ b/packages/ngtools/webpack/src/resource_loader.ts
@@ -1,13 +1,21 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+
+import { createHash } from 'crypto';
+import * as path from 'path';
 import * as vm from 'vm';
-import { Compilation, EntryPlugin, NormalModule, library, node, sources } from 'webpack';
+import type { Asset, Compilation } from 'webpack';
 import { normalizePath } from './ivy/paths';
+import {
+  CompilationWithInlineAngularResource,
+  InlineAngularResourceLoaderPath,
+  InlineAngularResourceSymbol,
+} from './loaders/inline-resource';
 
 interface CompilationOutput {
   content: string;
@@ -20,30 +28,61 @@ export class WebpackResourceLoader {
   private _fileDependencies = new Map<string, Set<string>>();
   private _reverseDependencies = new Map<string, Set<string>>();
 
-  private cache = new Map<string, CompilationOutput>();
+  private fileCache?: Map<string, CompilationOutput>;
+  private assetCache?: Map<string, Asset>;
+
   private modifiedResources = new Set<string>();
   private outputPathCounter = 1;
 
-  update(
-    parentCompilation: Compilation,
-    changedFiles?: Iterable<string>,
-  ) {
+  private readonly inlineDataLoaderPath = InlineAngularResourceLoaderPath;
+
+  constructor(shouldCache: boolean) {
+    if (shouldCache) {
+      this.fileCache = new Map();
+      this.assetCache = new Map();
+    }
+  }
+
+  update(parentCompilation: Compilation, changedFiles?: Iterable<string>) {
     this._parentCompilation = parentCompilation;
 
     // Update resource cache and modified resources
     this.modifiedResources.clear();
+
     if (changedFiles) {
       for (const changedFile of changedFiles) {
+        const changedFileNormalized = normalizePath(changedFile);
+        this.assetCache?.delete(changedFileNormalized);
+
         for (const affectedResource of this.getAffectedResources(changedFile)) {
-          this.cache.delete(normalizePath(affectedResource));
+          const affectedResourceNormalized = normalizePath(affectedResource);
+          this.fileCache?.delete(affectedResourceNormalized);
           this.modifiedResources.add(affectedResource);
+
+          for (const effectedDependencies of this.getResourceDependencies(
+            affectedResourceNormalized,
+          )) {
+            this.assetCache?.delete(normalizePath(effectedDependencies));
+          }
         }
       }
     } else {
-      this.cache.clear();
+      this.fileCache?.clear();
+      this.assetCache?.clear();
+    }
+
+    // Re-emit all assets for un-effected files
+    if (this.assetCache) {
+      for (const [, { name, source, info }] of this.assetCache) {
+        this._parentCompilation.emitAsset(name, source, info);
+      }
     }
   }
 
+  clearParentCompilation() {
+    this._parentCompilation = undefined;
+  }
+
   getModifiedResourceFiles() {
     return this.modifiedResources;
   }
@@ -64,23 +103,38 @@ export class WebpackResourceLoader {
     filePath?: string,
     data?: string,
     mimeType?: string,
+    fileExtension?: string,
+    resourceType?: 'style' | 'template',
+    containingFile?: string,
   ): Promise<CompilationOutput> {
     if (!this._parentCompilation) {
       throw new Error('WebpackResourceLoader cannot be used without parentCompilation');
     }
 
     // Create a special URL for reading the resource from memory
-    const entry = data ? 'angular-resource://' : filePath;
+    const entry =
+      filePath ||
+      (resourceType
+        ? `${containingFile}-${this.outputPathCounter}.${fileExtension}!=!${this.inlineDataLoaderPath}!${containingFile}`
+        : // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+          `angular-resource:${resourceType},${createHash('md5').update(data!).digest('hex')}`);
+
     if (!entry) {
       throw new Error(`"filePath" or "data" must be specified.`);
     }
 
     // Simple sanity check.
     if (filePath?.match(/\.[jt]s$/)) {
-      throw new Error(`Cannot use a JavaScript or TypeScript file (${filePath}) in a component's styleUrls or templateUrl.`);
+      throw new Error(
+        `Cannot use a JavaScript or TypeScript file (${filePath}) in a component's styleUrls or templateUrl.`,
+      );
     }
 
-    const outputFilePath = filePath || `angular-resource-output-${this.outputPathCounter++}.css`;
+    const outputFilePath =
+      filePath ||
+      `${containingFile}-angular-inline--${this.outputPathCounter++}.${
+        resourceType === 'template' ? 'html' : 'css'
+      }`;
     const outputOptions = {
       filename: outputFilePath,
       library: {
@@ -89,7 +143,8 @@ export class WebpackResourceLoader {
       },
     };
 
-    const context = this._parentCompilation.compiler.context;
+    const { context, webpack } = this._parentCompilation.compiler;
+    const { EntryPlugin, NormalModule, library, node, sources } = webpack;
     const childCompiler = this._parentCompilation.createChildCompiler(
       'angular-compiler:resource',
       outputOptions,
@@ -123,6 +178,8 @@ export class WebpackResourceLoader {
           NormalModule.getCompilationHooks(compilation)
             .readResourceForScheme.for('angular-resource')
             .tap('angular-compiler', () => data);
+
+          (compilation as CompilationWithInlineAngularResource)[InlineAngularResourceSymbol] = data;
         }
 
         compilation.hooks.additionalAssets.tap('angular-compiler', () => {
@@ -146,13 +203,11 @@ export class WebpackResourceLoader {
     );
 
     let finalContent: string | undefined;
-    let finalMap: string | undefined;
     childCompiler.hooks.compilation.tap('angular-compiler', (childCompilation) => {
       childCompilation.hooks.processAssets.tap(
-        { name: 'angular-compiler', stage: Compilation.PROCESS_ASSETS_STAGE_REPORT },
+        { name: 'angular-compiler', stage: webpack.Compilation.PROCESS_ASSETS_STAGE_REPORT },
         () => {
           finalContent = childCompilation.assets[outputFilePath]?.source().toString();
-          finalMap = childCompilation.assets[outputFilePath + '.map']?.source().toString();
 
           delete childCompilation.assets[outputFilePath];
           delete childCompilation.assets[outputFilePath + '.map'];
@@ -172,23 +227,68 @@ export class WebpackResourceLoader {
           return;
         }
 
-        // Save the dependencies for this resource.
-        if (filePath) {
-          this._fileDependencies.set(filePath, new Set(childCompilation.fileDependencies));
-          for (const file of childCompilation.fileDependencies) {
-            const resolvedFile = normalizePath(file);
-            const entry = this._reverseDependencies.get(resolvedFile);
-            if (entry) {
-              entry.add(filePath);
+        // Workaround to attempt to reduce memory usage of child compilations.
+        // This removes the child compilation from the main compilation and manually propagates
+        // all dependencies, warnings, and errors.
+        const parent = childCompiler.parentCompilation;
+        if (parent) {
+          parent.children = parent.children.filter((child) => child !== childCompilation);
+          let fileDependencies: Set<string> | undefined;
+
+          for (const dependency of childCompilation.fileDependencies) {
+            // Skip paths that do not appear to be files (have no extension).
+            // `fileDependencies` can contain directories and not just files which can
+            // cause incorrect cache invalidation on rebuilds.
+            if (!path.extname(dependency)) {
+              continue;
+            }
+
+            if (data && containingFile && dependency.endsWith(entry)) {
+              // use containing file if the resource was inline
+              parent.fileDependencies.add(containingFile);
             } else {
-              this._reverseDependencies.set(resolvedFile, new Set([filePath]));
+              parent.fileDependencies.add(dependency);
+            }
+
+            // Save the dependencies for this resource.
+            if (filePath) {
+              const resolvedFile = normalizePath(dependency);
+              const entry = this._reverseDependencies.get(resolvedFile);
+              if (entry) {
+                entry.add(filePath);
+              } else {
+                this._reverseDependencies.set(resolvedFile, new Set([filePath]));
+              }
+
+              if (fileDependencies) {
+                fileDependencies.add(dependency);
+              } else {
+                fileDependencies = new Set([dependency]);
+                this._fileDependencies.set(filePath, fileDependencies);
+              }
+            }
+          }
+
+          parent.contextDependencies.addAll(childCompilation.contextDependencies);
+          parent.missingDependencies.addAll(childCompilation.missingDependencies);
+          parent.buildDependencies.addAll(childCompilation.buildDependencies);
+
+          parent.warnings.push(...childCompilation.warnings);
+          parent.errors.push(...childCompilation.errors);
+
+          if (this.assetCache) {
+            for (const { info, name, source } of childCompilation.getAssets()) {
+              // Use the originating file as the cache key if present
+              // Otherwise, generate a cache key based on the generated name
+              const cacheKey = info.sourceFilename ?? `!![GENERATED]:${name}`;
+
+              this.assetCache.set(cacheKey, { info, name, source });
             }
           }
         }
 
         resolve({
           content: finalContent ?? '',
-          map: finalMap,
           success: childCompilation.errors?.length === 0,
         });
       });
@@ -217,27 +317,40 @@ export class WebpackResourceLoader {
 
   async get(filePath: string): Promise<string> {
     const normalizedFile = normalizePath(filePath);
-    let compilationResult = this.cache.get(normalizedFile);
+    let compilationResult = this.fileCache?.get(normalizedFile);
 
     if (compilationResult === undefined) {
       // cache miss so compile resource
       compilationResult = await this._compile(filePath);
 
       // Only cache if compilation was successful
-      if (compilationResult.success) {
-        this.cache.set(normalizedFile, compilationResult);
+      if (this.fileCache && compilationResult.success) {
+        this.fileCache.set(normalizedFile, compilationResult);
       }
     }
 
     return compilationResult.content;
   }
 
-  async process(data: string, mimeType: string): Promise<string> {
+  async process(
+    data: string,
+    mimeType: string | undefined,
+    fileExtension: string | undefined,
+    resourceType: 'template' | 'style',
+    containingFile?: string,
+  ): Promise<string> {
     if (data.trim().length === 0) {
       return '';
     }
 
-    const compilationResult = await this._compile(undefined, data, mimeType);
+    const compilationResult = await this._compile(
+      undefined,
+      data,
+      mimeType,
+      fileExtension,
+      resourceType,
+      containingFile,
+    );
 
     return compilationResult.content;
   }
diff --git a/packages/ngtools/webpack/src/transformers/ast_helpers.ts b/packages/ngtools/webpack/src/transformers/ast_helpers.ts
deleted file mode 100644
index 75dd12d729ac..000000000000
--- a/packages/ngtools/webpack/src/transformers/ast_helpers.ts
+++ /dev/null
@@ -1,43 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-import * as ts from 'typescript';
-
-
-// Find all nodes from the AST in the subtree of node of SyntaxKind kind.
-export function collectDeepNodes<T extends ts.Node>(
-  node: ts.Node,
-  kind: ts.SyntaxKind | ts.SyntaxKind[],
-): T[] {
-  const kinds = Array.isArray(kind) ? kind : [kind];
-  const nodes: T[] = [];
-  const helper = (child: ts.Node) => {
-    if (kinds.includes(child.kind)) {
-      nodes.push(child as T);
-    }
-    ts.forEachChild(child, helper);
-  };
-  ts.forEachChild(node, helper);
-
-  return nodes;
-}
-
-export function getFirstNode(sourceFile: ts.SourceFile): ts.Node {
-  if (sourceFile.statements.length > 0) {
-    return sourceFile.statements[0];
-  }
-
-  return sourceFile.getChildAt(0);
-}
-
-export function getLastNode(sourceFile: ts.SourceFile): ts.Node | null {
-  if (sourceFile.statements.length > 0) {
-    return sourceFile.statements[sourceFile.statements.length - 1] || null;
-  }
-
-  return null;
-}
diff --git a/packages/ngtools/webpack/src/transformers/elide_imports.ts b/packages/ngtools/webpack/src/transformers/elide_imports.ts
index 5a1daa6292a9..9bafe3a26f92 100644
--- a/packages/ngtools/webpack/src/transformers/elide_imports.ts
+++ b/packages/ngtools/webpack/src/transformers/elide_imports.ts
@@ -1,13 +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 ts from 'typescript';
-import { RemoveNodeOperation, TransformOperation } from './interfaces';
 
+import * as ts from 'typescript';
 
 // Remove imports for which all identifiers have been removed.
 // Needs type checker, and works even if it's not the first transformer.
@@ -20,11 +19,11 @@ export function elideImports(
   removedNodes: ts.Node[],
   getTypeChecker: () => ts.TypeChecker,
   compilerOptions: ts.CompilerOptions,
-): TransformOperation[] {
-  const ops: TransformOperation[] = [];
+): Set<ts.Node> {
+  const importNodeRemovals = new Set<ts.Node>();
 
   if (removedNodes.length === 0) {
-    return [];
+    return importNodeRemovals;
   }
 
   const typeChecker = getTypeChecker();
@@ -75,9 +74,12 @@ export function elideImports(
           // - A constructor parameter can be decorated or the class itself is decorated.
           // - The parent of the parameter is decorated example a method declaration or a set accessor.
           // In all cases we need the type reference not to be elided.
-          isTypeReferenceForDecoratoredNode = !!(parent.decorators?.length ||
+          isTypeReferenceForDecoratoredNode = !!(
+            parent.decorators?.length ||
             (ts.isSetAccessor(parent.parent) && !!parent.parent.decorators?.length) ||
-            (ts.isConstructorDeclaration(parent.parent) && !!parent.parent.parent.decorators?.length));
+            (ts.isConstructorDeclaration(parent.parent) &&
+              !!parent.parent.parent.decorators?.length)
+          );
           break;
       }
 
@@ -114,7 +116,7 @@ export function elideImports(
   });
 
   if (imports.length === 0) {
-    return [];
+    return importNodeRemovals;
   }
 
   const isUnused = (node: ts.Identifier) => {
@@ -139,10 +141,10 @@ export function elideImports(
     if (namedBindings && ts.isNamespaceImport(namedBindings)) {
       // "import * as XYZ from 'abc';"
       if (isUnused(namedBindings.name)) {
-        ops.push(new RemoveNodeOperation(sourceFile, node));
+        importNodeRemovals.add(node);
       }
     } else {
-      const specifierOps = [];
+      const specifierNodeRemovals = [];
       let clausesCount = 0;
 
       // "import { XYZ, ... } from 'abc';"
@@ -154,11 +156,10 @@ export function elideImports(
           if (isUnused(specifier.name)) {
             removedClausesCount++;
             // in case we don't have any more namedImports we should remove the parent ie the {}
-            const nodeToRemove = clausesCount === removedClausesCount
-              ? specifier.parent
-              : specifier;
+            const nodeToRemove =
+              clausesCount === removedClausesCount ? specifier.parent : specifier;
 
-            specifierOps.push(new RemoveNodeOperation(sourceFile, nodeToRemove));
+            specifierNodeRemovals.push(nodeToRemove);
           }
         }
       }
@@ -168,17 +169,19 @@ export function elideImports(
         clausesCount++;
 
         if (isUnused(node.importClause.name)) {
-          specifierOps.push(new RemoveNodeOperation(sourceFile, node.importClause.name));
+          specifierNodeRemovals.push(node.importClause.name);
         }
       }
 
-      if (specifierOps.length === clausesCount) {
-        ops.push(new RemoveNodeOperation(sourceFile, node));
+      if (specifierNodeRemovals.length === clausesCount) {
+        importNodeRemovals.add(node);
       } else {
-        ops.push(...specifierOps);
+        for (const specifierNodeRemoval of specifierNodeRemovals) {
+          importNodeRemovals.add(specifierNodeRemoval);
+        }
       }
     }
   }
 
-  return ops;
+  return importNodeRemovals;
 }
diff --git a/packages/ngtools/webpack/src/transformers/elide_imports_spec.ts b/packages/ngtools/webpack/src/transformers/elide_imports_spec.ts
index 997e60ec8af6..7d0e497d57cd 100644
--- a/packages/ngtools/webpack/src/transformers/elide_imports_spec.ts
+++ b/packages/ngtools/webpack/src/transformers/elide_imports_spec.ts
@@ -1,30 +1,56 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-// tslint:disable:no-big-function
-import { tags } from '@angular-devkit/core';  // tslint:disable-line:no-implicit-dependencies
+
+/* eslint-disable max-len */
+import { tags } from '@angular-devkit/core';
 import * as ts from 'typescript';
-import { getLastNode } from './ast_helpers';
-import { RemoveNodeOperation } from './interfaces';
-import { makeTransform } from './make_transform';
+import { elideImports } from './elide_imports';
 import { createTypescriptContext, transformTypescript } from './spec_helpers';
 
 describe('@ngtools/webpack transformers', () => {
   describe('elide_imports', () => {
-
     const dummyNode = `const remove = ''`;
 
-    const transformer = (program: ts.Program) => (
-      makeTransform(
-        (sourceFile: ts.SourceFile) =>
-          [new RemoveNodeOperation(sourceFile, getLastNode(sourceFile) as ts.Node)],
-        () => program.getTypeChecker(),
-      )
-    );
+    // Transformer that removes the last node and then elides unused imports
+    const transformer = (program: ts.Program) => {
+      return (context: ts.TransformationContext) => {
+        return (sourceFile: ts.SourceFile) => {
+          const lastNode = sourceFile.statements[sourceFile.statements.length - 1];
+          const updatedSourceFile = context.factory.updateSourceFile(
+            sourceFile,
+            ts.setTextRange(
+              context.factory.createNodeArray(sourceFile.statements.slice(0, -1)),
+              sourceFile.statements,
+            ),
+          );
+
+          const importRemovals = elideImports(
+            updatedSourceFile,
+            [lastNode],
+            () => program.getTypeChecker(),
+            context.getCompilerOptions(),
+          );
+          if (importRemovals.size > 0) {
+            return ts.visitEachChild(
+              updatedSourceFile,
+              function visitForRemoval(node): ts.Node | undefined {
+                return importRemovals.has(node)
+                  ? undefined
+                  : ts.visitEachChild(node, visitForRemoval, context);
+              },
+              context,
+            );
+          }
+
+          return updatedSourceFile;
+        };
+      };
+    };
 
     const additionalFiles: Record<string, string> = {
       'const.ts': `
@@ -344,8 +370,18 @@ describe('@ngtools/webpack transformers', () => {
           export { Foo };
         `;
 
-        const { program, compilerHost } = createTypescriptContext(input, additionalFiles, true, extraCompilerOptions);
-        const result = transformTypescript(undefined, [transformer(program)], program, compilerHost);
+        const { program, compilerHost } = createTypescriptContext(
+          input,
+          additionalFiles,
+          true,
+          extraCompilerOptions,
+        );
+        const result = transformTypescript(
+          undefined,
+          [transformer(program)],
+          program,
+          compilerHost,
+        );
 
         expect(tags.oneLine`${result}`).toEqual(tags.oneLine`${output}`);
       });
@@ -386,7 +422,13 @@ describe('@ngtools/webpack transformers', () => {
         export { Foo };
       `;
 
-      const { program, compilerHost } = createTypescriptContext(input, additionalFiles, true, extraCompilerOptions, true);
+      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}`);
@@ -394,8 +436,8 @@ describe('@ngtools/webpack transformers', () => {
 
     describe('should not elide imports decorator type references when emitDecoratorMetadata is true', () => {
       const extraCompilerOptions: ts.CompilerOptions = {
-         emitDecoratorMetadata: true,
-         experimentalDecorators: true,
+        emitDecoratorMetadata: true,
+        experimentalDecorators: true,
       };
 
       it('should not remove ctor parameter type reference', () => {
@@ -422,8 +464,18 @@ describe('@ngtools/webpack transformers', () => {
           export { Foo };
         `;
 
-        const { program, compilerHost } = createTypescriptContext(input, additionalFiles, true, extraCompilerOptions);
-        const result = transformTypescript(undefined, [transformer(program)], program, compilerHost);
+        const { program, compilerHost } = createTypescriptContext(
+          input,
+          additionalFiles,
+          true,
+          extraCompilerOptions,
+        );
+        const result = transformTypescript(
+          undefined,
+          [transformer(program)],
+          program,
+          compilerHost,
+        );
 
         expect(tags.oneLine`${result}`).toEqual(tags.oneLine`${output}`);
       });
@@ -450,8 +502,18 @@ describe('@ngtools/webpack transformers', () => {
           __decorate([ Decorator(), __metadata("design:type", Service) ], Foo.prototype, "foo", void 0);
         `;
 
-        const { program, compilerHost } = createTypescriptContext(input, additionalFiles, true, extraCompilerOptions);
-        const result = transformTypescript(undefined, [transformer(program)], program, compilerHost);
+        const { program, compilerHost } = createTypescriptContext(
+          input,
+          additionalFiles,
+          true,
+          extraCompilerOptions,
+        );
+        const result = transformTypescript(
+          undefined,
+          [transformer(program)],
+          program,
+          compilerHost,
+        );
 
         expect(tags.oneLine`${result}`).toEqual(tags.oneLine`${output}`);
       });
@@ -482,8 +544,18 @@ describe('@ngtools/webpack transformers', () => {
           __decorate([ Decorator(), __metadata("design:type", Service), __metadata("design:paramtypes", [Service]) ], Foo.prototype, "name", null);
         `;
 
-        const { program, compilerHost } = createTypescriptContext(input, additionalFiles, true, extraCompilerOptions);
-        const result = transformTypescript(undefined, [transformer(program)], program, compilerHost);
+        const { program, compilerHost } = createTypescriptContext(
+          input,
+          additionalFiles,
+          true,
+          extraCompilerOptions,
+        );
+        const result = transformTypescript(
+          undefined,
+          [transformer(program)],
+          program,
+          compilerHost,
+        );
 
         expect(tags.oneLine`${result}`).toEqual(tags.oneLine`${output}`);
       });
@@ -514,8 +586,18 @@ describe('@ngtools/webpack transformers', () => {
          __decorate([ Decorator(), __metadata("design:type", Service), __metadata("design:paramtypes", []) ], Foo.prototype, "name", null);
         `;
 
-        const { program, compilerHost } = createTypescriptContext(input, additionalFiles, true, extraCompilerOptions);
-        const result = transformTypescript(undefined, [transformer(program)], program, compilerHost);
+        const { program, compilerHost } = createTypescriptContext(
+          input,
+          additionalFiles,
+          true,
+          extraCompilerOptions,
+        );
+        const result = transformTypescript(
+          undefined,
+          [transformer(program)],
+          program,
+          compilerHost,
+        );
 
         expect(tags.oneLine`${result}`).toEqual(tags.oneLine`${output}`);
       });
@@ -545,8 +627,18 @@ describe('@ngtools/webpack transformers', () => {
           __metadata("design:paramtypes", []), __metadata("design:returntype", Service) ], Foo.prototype, "name", null);
         `;
 
-        const { program, compilerHost } = createTypescriptContext(input, additionalFiles, true, extraCompilerOptions);
-        const result = transformTypescript(undefined, [transformer(program)], program, compilerHost);
+        const { program, compilerHost } = createTypescriptContext(
+          input,
+          additionalFiles,
+          true,
+          extraCompilerOptions,
+        );
+        const result = transformTypescript(
+          undefined,
+          [transformer(program)],
+          program,
+          compilerHost,
+        );
 
         expect(tags.oneLine`${result}`).toEqual(tags.oneLine`${output}`);
       });
@@ -577,8 +669,18 @@ describe('@ngtools/webpack transformers', () => {
           __metadata("design:returntype", void 0) ], Foo.prototype, "name", null);
         `;
 
-        const { program, compilerHost } = createTypescriptContext(input, additionalFiles, true, extraCompilerOptions);
-        const result = transformTypescript(undefined, [transformer(program)], program, compilerHost);
+        const { program, compilerHost } = createTypescriptContext(
+          input,
+          additionalFiles,
+          true,
+          extraCompilerOptions,
+        );
+        const result = transformTypescript(
+          undefined,
+          [transformer(program)],
+          program,
+          compilerHost,
+        );
 
         expect(tags.oneLine`${result}`).toEqual(tags.oneLine`${output}`);
       });
@@ -611,23 +713,35 @@ describe('@ngtools/webpack transformers', () => {
           Foo = __decorate([ Decorator(), __metadata("design:paramtypes", [Service]) ], Foo);
         `;
 
-        const { program, compilerHost } = createTypescriptContext(input, additionalFiles, true, extraCompilerOptions);
-        const result = transformTypescript(undefined, [transformer(program)], program, compilerHost);
+        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 => {
+        const transformShorthandPropertyAssignment = (
+          context: ts.TransformationContext,
+        ): ts.Transformer<ts.SourceFile> => {
+          const visit: ts.Visitor = (node) => {
             if (ts.isShorthandPropertyAssignment(node)) {
               return ts.createPropertyAssignment(node.name, node.name);
             }
 
-            return ts.visitEachChild(node, child => visit(child), context);
+            return ts.visitEachChild(node, (child) => visit(child), context);
           };
 
-          return node => ts.visitNode(node, visit);
+          return (node) => ts.visitNode(node, visit);
         };
 
         it('should not elide import when ShorthandPropertyAssignment is transformed to PropertyAssignment', () => {
@@ -646,10 +760,12 @@ describe('@ngtools/webpack transformers', () => {
           `;
 
           const { program, compilerHost } = createTypescriptContext(input, additionalFiles);
-          const result = transformTypescript(undefined, [
-            transformShorthandPropertyAssignment,
-            transformer(program),
-          ], program, compilerHost);
+          const result = transformTypescript(
+            undefined,
+            [transformShorthandPropertyAssignment, transformer(program)],
+            program,
+            compilerHost,
+          );
 
           expect(tags.oneLine`${result}`).toEqual(tags.oneLine`${output}`);
         });
diff --git a/packages/ngtools/webpack/src/transformers/index.ts b/packages/ngtools/webpack/src/transformers/index.ts
index 7531574fff7e..9c7be8001baf 100644
--- a/packages/ngtools/webpack/src/transformers/index.ts
+++ b/packages/ngtools/webpack/src/transformers/index.ts
@@ -1,12 +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
  */
-export * from './interfaces';
-export * from './ast_helpers';
-export * from './make_transform';
+
 export * from './elide_imports';
 export * from './replace_resources';
diff --git a/packages/ngtools/webpack/src/transformers/interfaces.ts b/packages/ngtools/webpack/src/transformers/interfaces.ts
deleted file mode 100644
index 4eb35afcae88..000000000000
--- a/packages/ngtools/webpack/src/transformers/interfaces.ts
+++ /dev/null
@@ -1,45 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-import * as ts from 'typescript';
-
-export enum OPERATION_KIND {
-  Remove,
-  Add,
-  Replace,
-}
-
-export interface StandardTransform {
-  (sourceFile: ts.SourceFile): TransformOperation[];
-}
-
-export abstract class TransformOperation {
-  constructor(
-    public kind: OPERATION_KIND,
-    public sourceFile: ts.SourceFile,
-    public target: ts.Node,
-  ) { }
-}
-
-export class RemoveNodeOperation extends TransformOperation {
-  constructor(sourceFile: ts.SourceFile, target: ts.Node) {
-    super(OPERATION_KIND.Remove, sourceFile, target);
-  }
-}
-
-export class AddNodeOperation extends TransformOperation {
-  constructor(sourceFile: ts.SourceFile, target: ts.Node,
-              public before?: ts.Node, public after?: ts.Node) {
-    super(OPERATION_KIND.Add, sourceFile, target);
-  }
-}
-
-export class ReplaceNodeOperation extends TransformOperation {
-  constructor(sourceFile: ts.SourceFile, target: ts.Node, public replacement: ts.Node) {
-    super(OPERATION_KIND.Replace, sourceFile, target);
-  }
-}
diff --git a/packages/ngtools/webpack/src/transformers/make_transform.ts b/packages/ngtools/webpack/src/transformers/make_transform.ts
deleted file mode 100644
index 2541d231b4f2..000000000000
--- a/packages/ngtools/webpack/src/transformers/make_transform.ts
+++ /dev/null
@@ -1,108 +0,0 @@
-/**
- * @license
- * Copyright Google Inc. All Rights Reserved.
- *
- * Use of this source code is governed by an MIT-style license that can be
- * found in the LICENSE file at https://angular.io/license
- */
-import * as ts from 'typescript';
-import { elideImports } from './elide_imports';
-import {
-  AddNodeOperation,
-  OPERATION_KIND,
-  RemoveNodeOperation,
-  ReplaceNodeOperation,
-  StandardTransform,
-  TransformOperation,
-} from './interfaces';
-
-export function makeTransform(
-  standardTransform: StandardTransform,
-  getTypeChecker?: () => ts.TypeChecker,
-): ts.TransformerFactory<ts.SourceFile> {
-  return (context: ts.TransformationContext): ts.Transformer<ts.SourceFile> => {
-    const transformer: ts.Transformer<ts.SourceFile> = (sf: ts.SourceFile) => {
-      const ops: TransformOperation[] = standardTransform(sf);
-      const removeOps = ops.filter(
-        op => op.kind === OPERATION_KIND.Remove,
-      ) as RemoveNodeOperation[];
-      const addOps = ops.filter(op => op.kind === OPERATION_KIND.Add) as AddNodeOperation[];
-      const replaceOps = ops.filter(
-        op => op.kind === OPERATION_KIND.Replace,
-      ) as ReplaceNodeOperation[];
-
-      // If nodes are removed, elide the imports as well.
-      // Mainly a workaround for https://github.com/Microsoft/TypeScript/issues/17552.
-      // WARNING: this assumes that replaceOps DO NOT reuse any of the nodes they are replacing.
-      // This is currently true for transforms that use replaceOps (replace_bootstrap and
-      // replace_resources), but may not be true for new transforms.
-      if (getTypeChecker && removeOps.length + replaceOps.length > 0) {
-        const removedNodes = removeOps.concat(replaceOps).map(op => op.target);
-        removeOps.push(...elideImports(sf, removedNodes, getTypeChecker, context.getCompilerOptions()));
-      }
-
-      const visitor: ts.Visitor = node => {
-        let modified = false;
-        let modifiedNodes = [node];
-        // Check if node should be dropped.
-        if (removeOps.find(op => op.target === node)) {
-          modifiedNodes = [];
-          modified = true;
-        }
-
-        // Check if node should be replaced (only replaces with first op found).
-        const replace = replaceOps.find(op => op.target === node);
-        if (replace) {
-          modifiedNodes = [replace.replacement];
-          modified = true;
-        }
-
-        // Check if node should be added to.
-        const add = addOps.filter(op => op.target === node);
-        if (add.length > 0) {
-          modifiedNodes = [
-            ...add.filter(op => op.before).map(op => op.before),
-            ...modifiedNodes,
-            ...add.filter(op => op.after).map(op => op.after),
-          ] as ts.Node[];
-          modified = true;
-        }
-
-        // If we changed anything, return modified nodes without visiting further.
-        if (modified) {
-          return modifiedNodes;
-        } else {
-          // Otherwise return node as is and visit children.
-          return ts.visitEachChild(node, visitor, context);
-        }
-      };
-
-      // Don't visit the sourcefile at all if we don't have ops for it.
-      if (ops.length === 0) {
-        return sf;
-      }
-
-      const result = ts.visitNode(sf, visitor);
-
-      // If we removed any decorators, we need to clean up the decorator arrays.
-      if (removeOps.some(op => op.target.kind === ts.SyntaxKind.Decorator)) {
-        cleanupDecorators(result);
-      }
-
-      return result;
-    };
-
-    return transformer;
-  };
-}
-
-// If TS sees an empty decorator array, it will still emit a `__decorate` call.
-//    This seems to be a TS bug.
-function cleanupDecorators(node: ts.Node) {
-  if (node.decorators?.length === 0) {
-    // tslint:disable-next-line:no-any
-    (node as any).decorators = undefined;
-  }
-
-  ts.forEachChild(node, node => cleanupDecorators(node));
-}
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..c3d0060fb3ef 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,61 +1,77 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+
 import * as ts from 'typescript';
-import { collectDeepNodes } from './ast_helpers';
-import { RemoveNodeOperation, StandardTransform, TransformOperation } from './interfaces';
-import { makeTransform } from './make_transform';
+import { elideImports } from './elide_imports';
 
 export function removeIvyJitSupportCalls(
   classMetadata: boolean,
   ngModuleScope: boolean,
   getTypeChecker: () => ts.TypeChecker,
 ): ts.TransformerFactory<ts.SourceFile> {
-  const standardTransform: StandardTransform = function(sourceFile: ts.SourceFile) {
-    const ops: TransformOperation[] = [];
-
-    collectDeepNodes<ts.ExpressionStatement>(sourceFile, ts.SyntaxKind.ExpressionStatement)
-      .filter(statement => {
-        const innerStatement = getIifeStatement(statement);
-        if (!innerStatement) {
-          return false;
+  return (context: ts.TransformationContext) => {
+    const removedNodes: ts.Node[] = [];
+
+    const visitNode: ts.Visitor = (node: ts.Node) => {
+      const innerStatement = ts.isExpressionStatement(node) && getIifeStatement(node);
+      if (innerStatement) {
+        if (
+          ngModuleScope &&
+          ts.isBinaryExpression(innerStatement.expression) &&
+          isIvyPrivateCallExpression(innerStatement.expression.right, 'ɵɵsetNgModuleScope')
+        ) {
+          removedNodes.push(innerStatement);
+
+          return undefined;
         }
 
-        let shouldRemove = false;
-
-        if (ngModuleScope && ts.isBinaryExpression(innerStatement.expression)) {
-          shouldRemove = isIvyPrivateCallExpression(
-            innerStatement.expression.right,
-            'ɵɵsetNgModuleScope',
-          );
-        }
+        if (classMetadata) {
+          const expression = ts.isBinaryExpression(innerStatement.expression)
+            ? innerStatement.expression.right
+            : innerStatement.expression;
+          if (isIvyPrivateCallExpression(expression, 'ɵsetClassMetadata')) {
+            removedNodes.push(innerStatement);
 
-        if (classMetadata && !shouldRemove) {
-          if (ts.isBinaryExpression(innerStatement.expression)) {
-            shouldRemove = isIvyPrivateCallExpression(
-              innerStatement.expression.right,
-              'ɵsetClassMetadata',
-            );
-          } else {
-            shouldRemove = isIvyPrivateCallExpression(
-              innerStatement.expression,
-              'ɵsetClassMetadata',
-            );
+            return undefined;
           }
         }
+      }
+
+      return ts.visitEachChild(node, visitNode, context);
+    };
+
+    return (sourceFile: ts.SourceFile) => {
+      let updatedSourceFile = ts.visitEachChild(sourceFile, visitNode, context);
+
+      if (removedNodes.length > 0) {
+        // Remove any unused imports
+        const importRemovals = elideImports(
+          updatedSourceFile,
+          removedNodes,
+          getTypeChecker,
+          context.getCompilerOptions(),
+        );
+        if (importRemovals.size > 0) {
+          updatedSourceFile = ts.visitEachChild(
+            updatedSourceFile,
+            function visitForRemoval(node): ts.Node | undefined {
+              return importRemovals.has(node)
+                ? undefined
+                : ts.visitEachChild(node, visitForRemoval, context);
+            },
+            context,
+          );
+        }
+      }
 
-        return shouldRemove;
-      })
-      .forEach(statement => ops.push(new RemoveNodeOperation(sourceFile, statement)));
-
-    return ops;
+      return updatedSourceFile;
+    };
   };
-
-  return makeTransform(standardTransform, getTypeChecker);
 }
 
 // Each Ivy private call expression is inside an IIFE
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..cbc678762e78 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,11 +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 { tags } from '@angular-devkit/core';  // tslint:disable-line:no-implicit-dependencies
+
+/* eslint-disable max-len */
+import { tags } from '@angular-devkit/core';
 import * as ts from 'typescript';
 import { removeIvyJitSupportCalls } from './remove-ivy-jit-support-calls';
 import { createTypescriptContext, transformTypescript } from './spec_helpers';
@@ -79,9 +81,7 @@ const inputNoPure = tags.stripIndent`
       }], null, null); })();
 `;
 
-// tslint:disable-next-line: no-big-function
 describe('@ngtools/webpack transformers', () => {
-  // tslint:disable-next-line: no-big-function
   describe('remove-ivy-dev-calls', () => {
     it('should allow removing only set class metadata with pure annotation', () => {
       const output = tags.stripIndent`
@@ -97,7 +97,7 @@ describe('@ngtools/webpack transformers', () => {
                 AppRoutingModule] }); })();
       `;
 
-      const result = transform(input, getTypeChecker =>
+      const result = transform(input, (getTypeChecker) =>
         removeIvyJitSupportCalls(true, false, getTypeChecker),
       );
 
@@ -118,7 +118,7 @@ describe('@ngtools/webpack transformers', () => {
                 AppRoutingModule] }); })();
       `;
 
-      const result = transform(inputNoPure, getTypeChecker =>
+      const result = transform(inputNoPure, (getTypeChecker) =>
         removeIvyJitSupportCalls(true, false, getTypeChecker),
       );
 
@@ -151,7 +151,7 @@ describe('@ngtools/webpack transformers', () => {
             }], null, null); })();
       `;
 
-      const result = transform(input, getTypeChecker =>
+      const result = transform(input, (getTypeChecker) =>
         removeIvyJitSupportCalls(false, true, getTypeChecker),
       );
 
@@ -184,7 +184,7 @@ describe('@ngtools/webpack transformers', () => {
             }], null, null); })();
       `;
 
-      const result = transform(inputNoPure, getTypeChecker =>
+      const result = transform(inputNoPure, (getTypeChecker) =>
         removeIvyJitSupportCalls(false, true, getTypeChecker),
       );
 
@@ -202,7 +202,7 @@ describe('@ngtools/webpack transformers', () => {
                 ]] });
       `;
 
-      const result = transform(input, getTypeChecker =>
+      const result = transform(input, (getTypeChecker) =>
         removeIvyJitSupportCalls(true, true, getTypeChecker),
       );
 
@@ -220,7 +220,7 @@ describe('@ngtools/webpack transformers', () => {
                 ]] });
       `;
 
-      const result = transform(inputNoPure, getTypeChecker =>
+      const result = transform(inputNoPure, (getTypeChecker) =>
         removeIvyJitSupportCalls(true, true, getTypeChecker),
       );
 
@@ -228,7 +228,7 @@ describe('@ngtools/webpack transformers', () => {
     });
 
     it('should allow removing neither set class metadata nor ng module scope with pure annotation', () => {
-      const result = transform(input, getTypeChecker =>
+      const result = transform(input, (getTypeChecker) =>
         removeIvyJitSupportCalls(false, false, getTypeChecker),
       );
 
@@ -236,7 +236,7 @@ describe('@ngtools/webpack transformers', () => {
     });
 
     it('should allow removing neither set class metadata nor ng module scope', () => {
-      const result = transform(inputNoPure, getTypeChecker =>
+      const result = transform(inputNoPure, (getTypeChecker) =>
         removeIvyJitSupportCalls(false, false, getTypeChecker),
       );
 
@@ -267,7 +267,7 @@ describe('@ngtools/webpack transformers', () => {
                 ]] });
       `;
 
-      const result = transform(imports + input, getTypeChecker =>
+      const result = transform(imports + input, (getTypeChecker) =>
         removeIvyJitSupportCalls(true, true, getTypeChecker),
       );
 
@@ -298,7 +298,7 @@ describe('@ngtools/webpack transformers', () => {
                 ]] });
       `;
 
-      const result = transform(imports + inputNoPure, getTypeChecker =>
+      const result = transform(imports + inputNoPure, (getTypeChecker) =>
         removeIvyJitSupportCalls(true, true, getTypeChecker),
       );
 
diff --git a/packages/ngtools/webpack/src/transformers/replace_resources.ts b/packages/ngtools/webpack/src/transformers/replace_resources.ts
index 200b4e928e92..bc231be73a12 100644
--- a/packages/ngtools/webpack/src/transformers/replace_resources.ts
+++ b/packages/ngtools/webpack/src/transformers/replace_resources.ts
@@ -1,17 +1,21 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of 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 { DirectAngularResourceLoaderPath } from '../loaders/direct-resource';
+import { InlineAngularResourceLoaderPath } from '../loaders/inline-resource';
 
 export function replaceResources(
   shouldTransform: (fileName: string) => boolean,
   getTypeChecker: () => ts.TypeChecker,
   directTemplateLoading = false,
   inlineStyleMimeType?: string,
+  inlineStyleFileExtension?: string,
 ): ts.TransformerFactory<ts.SourceFile> {
   if (inlineStyleMimeType && !/^text\/[-.\w]+$/.test(inlineStyleMimeType)) {
     throw new Error('Invalid inline style MIME type.');
@@ -35,6 +39,7 @@ export function replaceResources(
                 resourceImportDeclarations,
                 moduleKind,
                 inlineStyleMimeType,
+                inlineStyleFileExtension,
               )
             : node,
         );
@@ -86,6 +91,7 @@ function visitDecorator(
   resourceImportDeclarations: ts.ImportDeclaration[],
   moduleKind?: ts.ModuleKind,
   inlineStyleMimeType?: string,
+  inlineStyleFileExtension?: string,
 ): ts.Decorator {
   if (!isComponentDecorator(node, typeChecker)) {
     return node;
@@ -116,6 +122,7 @@ function visitDecorator(
           resourceImportDeclarations,
           moduleKind,
           inlineStyleMimeType,
+          inlineStyleFileExtension,
         )
       : node,
   );
@@ -132,9 +139,12 @@ function visitDecorator(
 
   return nodeFactory.updateDecorator(
     node,
-    nodeFactory.updateCallExpression(decoratorFactory, decoratorFactory.expression, decoratorFactory.typeArguments, [
-      nodeFactory.updateObjectLiteralExpression(objectExpression, properties),
-    ]),
+    nodeFactory.updateCallExpression(
+      decoratorFactory,
+      decoratorFactory.expression,
+      decoratorFactory.typeArguments,
+      [nodeFactory.updateObjectLiteralExpression(objectExpression, properties)],
+    ),
   );
 }
 
@@ -146,6 +156,7 @@ function visitComponentMetadata(
   resourceImportDeclarations: ts.ImportDeclaration[],
   moduleKind?: ts.ModuleKind,
   inlineStyleMimeType?: string,
+  inlineStyleFileExtension?: string,
 ): ts.ObjectLiteralElementLike | undefined {
   if (!ts.isPropertyAssignment(node) || ts.isComputedPropertyName(node.name)) {
     return node;
@@ -157,7 +168,10 @@ function visitComponentMetadata(
       return undefined;
 
     case 'templateUrl':
-      const url = getResourceUrl(node.initializer, directTemplateLoading ? '!raw-loader!' : '');
+      const url = getResourceUrl(
+        node.initializer,
+        directTemplateLoading ? `!${DirectAngularResourceLoaderPath}!` : '',
+      );
       if (!url) {
         return node;
       }
@@ -184,7 +198,7 @@ function visitComponentMetadata(
       }
 
       const isInlineStyle = name === 'styles';
-      const styles = ts.visitNodes(node.initializer.elements, node => {
+      const styles = ts.visitNodes(node.initializer.elements, (node) => {
         if (!ts.isStringLiteral(node) && !ts.isNoSubstitutionTemplateLiteral(node)) {
           return node;
         }
@@ -194,6 +208,12 @@ function visitComponentMetadata(
           if (inlineStyleMimeType) {
             const data = Buffer.from(node.text).toString('base64');
             url = `data:${inlineStyleMimeType};charset=utf-8;base64,${data}`;
+          } else if (inlineStyleFileExtension) {
+            const data = Buffer.from(node.text).toString('base64');
+            const containingFile = node.getSourceFile().fileName;
+            url = `${containingFile}.${inlineStyleFileExtension}!=!${InlineAngularResourceLoaderPath}?data=${encodeURIComponent(
+              data,
+            )}!${containingFile}`;
           } else {
             return nodeFactory.createStringLiteral(node.text);
           }
@@ -253,21 +273,21 @@ function createResourceImport(
 
   if (moduleKind < ts.ModuleKind.ES2015) {
     return nodeFactory.createPropertyAccessExpression(
-      nodeFactory.createCallExpression(
-        nodeFactory.createIdentifier('require'),
-        [],
-        [urlLiteral],
-      ),
+      nodeFactory.createCallExpression(nodeFactory.createIdentifier('require'), [], [urlLiteral]),
       'default',
     );
   } else {
-    const importName = nodeFactory.createIdentifier(`__NG_CLI_RESOURCE__${resourceImportDeclarations.length}`);
-    resourceImportDeclarations.push(nodeFactory.createImportDeclaration(
-      undefined,
-      undefined,
-      nodeFactory.createImportClause(false, importName, undefined),
-      urlLiteral,
-    ));
+    const importName = nodeFactory.createIdentifier(
+      `__NG_CLI_RESOURCE__${resourceImportDeclarations.length}`,
+    );
+    resourceImportDeclarations.push(
+      nodeFactory.createImportDeclaration(
+        undefined,
+        undefined,
+        nodeFactory.createImportClause(false, importName, undefined),
+        urlLiteral,
+      ),
+    );
 
     return importName;
   }
@@ -322,75 +342,3 @@ function getDecoratorOrigin(
 
   return null;
 }
-
-export function workaroundStylePreprocessing(sourceFile: ts.SourceFile): void {
-  const visitNode: ts.Visitor = (node: ts.Node) => {
-    if (ts.isClassDeclaration(node) && node.decorators?.length) {
-      for (const decorator of node.decorators) {
-        visitDecoratorWorkaround(decorator);
-      }
-    }
-
-    return ts.forEachChild(node, visitNode);
-  };
-
-  ts.forEachChild(sourceFile, visitNode);
-}
-
-function visitDecoratorWorkaround(node: ts.Decorator): void {
-  if (!ts.isCallExpression(node.expression)) {
-    return;
-  }
-
-  const decoratorFactory = node.expression;
-  if (
-    !ts.isIdentifier(decoratorFactory.expression) ||
-    decoratorFactory.expression.text !== 'Component'
-  ) {
-    return;
-  }
-
-  const args = decoratorFactory.arguments;
-  if (args.length !== 1 || !ts.isObjectLiteralExpression(args[0])) {
-    // Unsupported component metadata
-    return;
-  }
-
-  const objectExpression = args[0] as ts.ObjectLiteralExpression;
-
-  // check if a `styles` property is present
-  let hasStyles = false;
-  for (const element of objectExpression.properties) {
-    if (!ts.isPropertyAssignment(element) || ts.isComputedPropertyName(element.name)) {
-      continue;
-    }
-
-    if (element.name.text === 'styles') {
-      hasStyles = true;
-      break;
-    }
-  }
-
-  if (hasStyles) {
-    return;
-  }
-
-  const nodeFactory = ts.factory;
-
-  // add a `styles` property to workaround upstream compiler defect
-  const emptyArray = nodeFactory.createArrayLiteralExpression();
-  const stylePropertyName = nodeFactory.createIdentifier('styles');
-  const styleProperty = nodeFactory.createPropertyAssignment(stylePropertyName, emptyArray);
-  // tslint:disable-next-line: no-any
-  (stylePropertyName.parent as any) = styleProperty;
-  // tslint:disable-next-line: no-any
-  (emptyArray.parent as any) = styleProperty;
-  // tslint:disable-next-line: no-any
-  (styleProperty.parent as any) = objectExpression;
-
-  // tslint:disable-next-line: no-any
-  (objectExpression.properties as any) = nodeFactory.createNodeArray([
-    ...objectExpression.properties,
-    styleProperty,
-  ]);
-}
diff --git a/packages/ngtools/webpack/src/transformers/replace_resources_spec.ts b/packages/ngtools/webpack/src/transformers/replace_resources_spec.ts
index b34f458c8a73..9da2981eb064 100644
--- a/packages/ngtools/webpack/src/transformers/replace_resources_spec.ts
+++ b/packages/ngtools/webpack/src/transformers/replace_resources_spec.ts
@@ -1,12 +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 { tags } from '@angular-devkit/core';  // tslint:disable-line:no-implicit-dependencies
+
+import { tags } from '@angular-devkit/core';
 import * as ts from 'typescript';
+import { DirectAngularResourceLoaderPath } from '../loaders/direct-resource';
 import { replaceResources } from './replace_resources';
 import { createTypescriptContext, transformTypescript } from './spec_helpers';
 
@@ -15,21 +17,26 @@ function transform(
   shouldTransform = true,
   directTemplateLoading = true,
   importHelpers = true,
-  module: ts.ModuleKind = ts.ModuleKind.ESNext,
+  module: ts.ModuleKind = ts.ModuleKind.ES2020,
   inlineStyleMimeType?: string,
 ) {
-  const { program, compilerHost } = createTypescriptContext(input, undefined, undefined, { importHelpers, module });
+  const { program, compilerHost } = createTypescriptContext(input, undefined, undefined, {
+    importHelpers,
+    module,
+  });
   const getTypeChecker = () => program.getTypeChecker();
   const transformer = replaceResources(
-    () => shouldTransform, getTypeChecker, directTemplateLoading, inlineStyleMimeType);
+    () => shouldTransform,
+    getTypeChecker,
+    directTemplateLoading,
+    inlineStyleMimeType,
+  );
 
   return transformTypescript(input, [transformer], program, compilerHost);
 }
 
-// tslint:disable-next-line:no-big-function
 describe('@ngtools/webpack transformers', () => {
-  // tslint:disable:max-line-length
-  // tslint:disable-next-line:no-big-function
+  /* eslint-disable max-len */
   describe('find_resources', () => {
     it('should replace resources', () => {
       const input = tags.stripIndent`
@@ -46,7 +53,7 @@ describe('@ngtools/webpack transformers', () => {
       `;
       const output = tags.stripIndent`
         import { __decorate } from "tslib";
-        import __NG_CLI_RESOURCE__0 from "!raw-loader!./app.component.html";
+        import __NG_CLI_RESOURCE__0 from "!${DirectAngularResourceLoaderPath}!./app.component.html";
         import __NG_CLI_RESOURCE__1 from "./app.component.css";
         import __NG_CLI_RESOURCE__2 from "./app.component.2.css";
         import { Component } from '@angular/core';
@@ -96,7 +103,7 @@ describe('@ngtools/webpack transformers', () => {
         AppComponent = tslib_1.__decorate([
           core_1.Component({
             selector: 'app-root',
-            template: require("!raw-loader!./app.component.html").default,
+            template: require("!${DirectAngularResourceLoaderPath}!./app.component.html").default,
             styles: [require("./app.component.css").default, require("./app.component.2.css").default] }) ], AppComponent);
         exports.AppComponent = AppComponent;
       `;
@@ -106,7 +113,7 @@ describe('@ngtools/webpack transformers', () => {
     });
 
     it('should not replace resources when directTemplateLoading is false', () => {
-        const input = tags.stripIndent`
+      const input = tags.stripIndent`
           import { Component } from '@angular/core';
 
           @Component({
@@ -121,7 +128,7 @@ describe('@ngtools/webpack transformers', () => {
             title = 'app';
           }
         `;
-        const output = tags.stripIndent`
+      const output = tags.stripIndent`
           import { __decorate } from "tslib";
           import __NG_CLI_RESOURCE__0 from "./app.component.html";
           import __NG_CLI_RESOURCE__1 from "./app.component.css";
@@ -142,10 +149,9 @@ describe('@ngtools/webpack transformers', () => {
           export { AppComponent };
         `;
 
-        const result = transform(input, true, false);
-        expect(tags.oneLine`${result}`).toEqual(tags.oneLine`${output}`);
-      });
-
+      const result = transform(input, true, false);
+      expect(tags.oneLine`${result}`).toEqual(tags.oneLine`${output}`);
+    });
 
     it('should should support svg as templates', () => {
       const input = tags.stripIndent`
@@ -161,7 +167,7 @@ describe('@ngtools/webpack transformers', () => {
       `;
       const output = tags.stripIndent`
         import { __decorate } from "tslib";
-        import __NG_CLI_RESOURCE__0 from "!raw-loader!./app.component.svg";
+        import __NG_CLI_RESOURCE__0 from "!${DirectAngularResourceLoaderPath}!./app.component.svg";
         import { Component } from '@angular/core';
         let AppComponent = class AppComponent {
             constructor() {
@@ -197,7 +203,7 @@ describe('@ngtools/webpack transformers', () => {
       `;
       const output = tags.stripIndent`
         import { __decorate } from "tslib";
-        import __NG_CLI_RESOURCE__0 from "!raw-loader!./app.component.html";
+        import __NG_CLI_RESOURCE__0 from "!${DirectAngularResourceLoaderPath}!./app.component.html";
         import __NG_CLI_RESOURCE__1 from "./app.component.css";
         import { Component } from '@angular/core';
 
@@ -235,7 +241,7 @@ describe('@ngtools/webpack transformers', () => {
       `;
       const output = tags.stripIndent`
         import { __decorate } from "tslib";
-        import __NG_CLI_RESOURCE__0 from "!raw-loader!./app.component.html";
+        import __NG_CLI_RESOURCE__0 from "!${DirectAngularResourceLoaderPath}!./app.component.html";
         import __NG_CLI_RESOURCE__1 from "data:text/css;charset=utf-8;base64,YSB7IGNvbG9yOiByZWQgfQ==";
         import { Component } from '@angular/core';
 
@@ -279,7 +285,7 @@ describe('@ngtools/webpack transformers', () => {
       `;
       const output = `
         import { __decorate } from "tslib";
-        import __NG_CLI_RESOURCE__0 from "!raw-loader!./app.component.html";
+        import __NG_CLI_RESOURCE__0 from "!${DirectAngularResourceLoaderPath}!./app.component.html";
         import __NG_CLI_RESOURCE__1 from "./app.component.css";
         import __NG_CLI_RESOURCE__2 from "./app.component.2.css";
 
@@ -318,7 +324,7 @@ describe('@ngtools/webpack transformers', () => {
       `;
       const output = tags.stripIndent`
         import { __decorate } from "tslib";
-        import __NG_CLI_RESOURCE__0 from "!raw-loader!./app.component.html";
+        import __NG_CLI_RESOURCE__0 from "!${DirectAngularResourceLoaderPath}!./app.component.html";
         import __NG_CLI_RESOURCE__1 from "./app.component.css";
         import __NG_CLI_RESOURCE__2 from "./app.component.2.css";
         import { Component as NgComponent } from '@angular/core';
@@ -361,7 +367,7 @@ describe('@ngtools/webpack transformers', () => {
       `;
       const output = tags.stripIndent`
         import { __decorate } from "tslib";
-        import __NG_CLI_RESOURCE__0 from "!raw-loader!./app.component.html";
+        import __NG_CLI_RESOURCE__0 from "!${DirectAngularResourceLoaderPath}!./app.component.html";
         import __NG_CLI_RESOURCE__1 from "./app.component.css";
         import __NG_CLI_RESOURCE__2 from "./app.component.2.css";
 
@@ -406,7 +412,7 @@ describe('@ngtools/webpack transformers', () => {
 
       const output = tags.stripIndent`
         import { __decorate } from "tslib";
-        import __NG_CLI_RESOURCE__0 from "!raw-loader!./app.component.html";
+        import __NG_CLI_RESOURCE__0 from "!${DirectAngularResourceLoaderPath}!./app.component.html";
         import __NG_CLI_RESOURCE__1 from "./app.component.css";
 
         import { Component } from '@angular/core';
diff --git a/packages/ngtools/webpack/src/transformers/spec_helpers.ts b/packages/ngtools/webpack/src/transformers/spec_helpers.ts
index 674d809c068e..9fea6da3b10b 100644
--- a/packages/ngtools/webpack/src/transformers/spec_helpers.ts
+++ b/packages/ngtools/webpack/src/transformers/spec_helpers.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 ts from 'typescript';
 
@@ -25,8 +26,8 @@ export function createTypescriptContext(
     allowJs: true,
     newLine: ts.NewLineKind.LineFeed,
     moduleResolution: ts.ModuleResolutionKind.NodeJs,
-    module: ts.ModuleKind.ESNext,
-    target: ts.ScriptTarget.ESNext,
+    module: ts.ModuleKind.ES2020,
+    target: ts.ScriptTarget.ES2020,
     skipLibCheck: true,
     sourceMap: false,
     importHelpers: true,
@@ -36,10 +37,7 @@ export function createTypescriptContext(
   };
 
   // Create compiler host.
-  const compilerHost = ts.createCompilerHost(
-    compilerOptions,
-    true,
-  );
+  const compilerHost = ts.createCompilerHost(compilerOptions, true);
 
   const baseFileExists = compilerHost.fileExists;
   compilerHost.fileExists = function (compilerFileName: string) {
@@ -51,7 +49,7 @@ export function createTypescriptContext(
   };
 
   const baseReadFile = compilerHost.readFile;
-  compilerHost.readFile = function(compilerFileName: string) {
+  compilerHost.readFile = function (compilerFileName: string) {
     if (compilerFileName === fileName) {
       return content;
     } else if (additionalFiles?.[basename(compilerFileName)]) {
@@ -90,11 +88,15 @@ export function transformTypescript(
   let outputContent;
   // Emit.
   const { emitSkipped, diagnostics } = program.emit(
-    undefined, (filename, data) => {
+    undefined,
+    (filename, data) => {
       if (filename === outputFileName) {
         outputContent = data;
       }
-    }, undefined, undefined, { before: transformers },
+    },
+    undefined,
+    undefined,
+    { before: transformers },
   );
 
   // Throw error with diagnostics if emit wasn't successfull.
diff --git a/packages/ngtools/webpack/src/webpack-diagnostics.ts b/packages/ngtools/webpack/src/webpack-diagnostics.ts
deleted file mode 100644
index ac9b5cbc7c38..000000000000
--- a/packages/ngtools/webpack/src/webpack-diagnostics.ts
+++ /dev/null
@@ -1,16 +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 { Compilation, WebpackError } from 'webpack';
-
-export function addWarning(compilation: Compilation, message: string): void {
-  compilation.warnings.push(new WebpackError(message));
-}
-
-export function addError(compilation: Compilation, message: string): void {
-  compilation.errors.push(new WebpackError(message));
-}
diff --git a/packages/schematics/angular/BUILD.bazel b/packages/schematics/angular/BUILD.bazel
index e3e3eb731e21..1626e8b3c7bb 100644
--- a/packages/schematics/angular/BUILD.bazel
+++ b/packages/schematics/angular/BUILD.bazel
@@ -64,6 +64,7 @@ ts_library(
         include = [
             "collection.json",
             "package.json",
+            "utility/latest-versions/package.json",
             "migrations/migration-collection.json",
             "*/schema.json",
             "*/files/**/*",
diff --git a/packages/schematics/angular/README.md b/packages/schematics/angular/README.md
new file mode 100644
index 000000000000..4bc9a31e9987
--- /dev/null
+++ b/packages/schematics/angular/README.md
@@ -0,0 +1,31 @@
+# @schematics/angular
+
+This package contains a collection of [schematics](/packages/angular_devkit/schematics/README.md)
+for generating an Angular application.
+
+## Schematics
+
+| Name           | Description                                                                                           |
+| -------------- | ----------------------------------------------------------------------------------------------------- |
+| app-shell      | Generates an app shell for running a server-side version of an app                                    |
+| application    | Generates a new basic app definition in the "projects" subfolder of the workspace                     |
+| class          | Creates a new, generic class definition in the given or default project                               |
+| component      | Creates a new, generic component definition in the given or default project                           |
+| directive      | Creates a new, generic directive definition in the given or default project                           |
+| enum           | Generates a new, generic enum definition for the given or default project                             |
+| guard          | Generates a new, generic route guard definition in the given or default project                       |
+| interceptor    | Creates a new, generic interceptor definition in the given or default project                         |
+| interface      | Creates a new, generic interface definition in the given or default project                           |
+| library        | Creates a new, generic library project in the current workspace                                       |
+| module         | Creates a new, generic NgModule definition in the given or default project                            |
+| ng-new         | Creates a new project by combining the workspace and application schematics                           |
+| pipe           | Creates a new, generic pipe definition in the given or default project                                |
+| resolver       | Creates a new, generic resolver definition in the given or default project                            |
+| service        | Creates a new, generic service definition in the given or default project                             |
+| service-worker | Pass this schematic to the "run" command to create a service worker                                   |
+| web-worker     | Creates a new, generic web worker definition in the given or default project                          |
+| workspace      | Initializes an empty workspace and adds the necessary dependencies required by an Angular application |
+
+## Disclaimer
+
+While the schematics 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.
diff --git a/packages/schematics/angular/app-shell/app-shell-long.md b/packages/schematics/angular/app-shell/app-shell-long.md
index dc4555b74a01..c85988337b24 100644
--- a/packages/schematics/angular/app-shell/app-shell-long.md
+++ b/packages/schematics/angular/app-shell/app-shell-long.md
@@ -10,8 +10,8 @@ To create an app shell, use the following command.
  ng generate app-shell my-app
 </code-example>
 
-* `my-app` is the name of your client application
-* `server-app` is the name of the Universal (server) application
+- `my-app` is the name of your client application
+- `server-app` is the name of the Universal (server) application
 
 The command adds two new architect build targets to your `angular.json` configuration file (along with a few other changes).
 
diff --git a/packages/schematics/angular/app-shell/index.ts b/packages/schematics/angular/app-shell/index.ts
index 8a1fc629af56..64c48a66ec57 100644
--- a/packages/schematics/angular/app-shell/index.ts
+++ b/packages/schematics/angular/app-shell/index.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 { dirname, join, normalize } from '@angular-devkit/core';
 import {
   Rule,
@@ -44,14 +45,10 @@ function getSourceFile(host: Tree, path: string): ts.SourceFile {
   return source;
 }
 
-function getServerModulePath(
-  host: Tree,
-  sourceRoot: string,
-  mainPath: string,
-): string | null {
+function getServerModulePath(host: Tree, sourceRoot: string, mainPath: string): string | null {
   const mainSource = getSourceFile(host, join(normalize(sourceRoot), mainPath));
   const allNodes = getSourceNodes(mainSource);
-  const expNode = allNodes.find(node => ts.isExportDeclaration(node));
+  const expNode = allNodes.find((node) => ts.isExportDeclaration(node));
   if (!expNode) {
     return null;
   }
@@ -94,27 +91,23 @@ function getComponentTemplate(host: Tree, compPath: string, tmplInfo: TemplateIn
   return template;
 }
 
-function getBootstrapComponentPath(
-  host: Tree,
-  mainPath: string,
-): string {
+function getBootstrapComponentPath(host: Tree, mainPath: string): string {
   const modulePath = getAppModulePath(host, mainPath);
   const moduleSource = getSourceFile(host, modulePath);
 
   const metadataNode = getDecoratorMetadata(moduleSource, 'NgModule', '@angular/core')[0];
   const bootstrapProperty = getMetadataProperty(metadataNode, 'bootstrap');
 
-  const arrLiteral = (bootstrapProperty as ts.PropertyAssignment)
-    .initializer as ts.ArrayLiteralExpression;
+  const arrLiteral = bootstrapProperty.initializer as ts.ArrayLiteralExpression;
 
   const componentSymbol = arrLiteral.elements[0].getText();
 
   const relativePath = getSourceNodes(moduleSource)
     .filter(ts.isImportDeclaration)
-    .filter(imp => {
+    .filter((imp) => {
       return findNode(imp, ts.SyntaxKind.Identifier, componentSymbol);
     })
-    .map(imp => {
+    .map((imp) => {
       const pathStringLiteral = imp.moduleSpecifier as ts.StringLiteral;
 
       return pathStringLiteral.text;
@@ -132,8 +125,7 @@ function validateProject(mainPath: string): Rule {
     const tmpl = getComponentTemplateInfo(host, componentPath);
     const template = getComponentTemplate(host, componentPath, tmpl);
     if (!routerOutletCheckRegex.test(template)) {
-      const errorMsg =
-        `Prerequisite for app shell is to define a router-outlet in your root component.`;
+      const errorMsg = `Prerequisite for app shell is to define a router-outlet in your root component.`;
       context.logger.error(errorMsg);
       throw new SchematicsException(errorMsg);
     }
@@ -160,8 +152,8 @@ function addAppShellConfigToWorkspace(options: AppShellOptions): Rule {
       throw new SchematicsException(`Route is not defined`);
     }
 
-    return updateWorkspace(workspace => {
-      const project = workspace.projects.get(options.clientProject);
+    return updateWorkspace((workspace) => {
+      const project = workspace.projects.get(options.project);
       if (!project) {
         return;
       }
@@ -179,20 +171,24 @@ function addAppShellConfigToWorkspace(options: AppShellOptions): Rule {
       const configurations: Record<string, {}> = {};
       for (const key of configurationNames) {
         if (!serverConfigKeys[key]) {
-          context.logger.warn(`Skipped adding "${key}" configuration to "app-shell" target as it's missing from "server" target.`);
+          context.logger.warn(
+            `Skipped adding "${key}" configuration to "app-shell" target as it's missing from "server" target.`,
+          );
 
           continue;
         }
 
         if (!buildConfigKeys[key]) {
-          context.logger.warn(`Skipped adding "${key}" configuration to "app-shell" target as it's missing from "build" target.`);
+          context.logger.warn(
+            `Skipped adding "${key}" configuration to "app-shell" target as it's missing from "build" target.`,
+          );
 
           continue;
         }
 
         configurations[key] = {
-          browserTarget: `${options.clientProject}:build:${key}`,
-          serverTarget: `${options.clientProject}:server:${key}`,
+          browserTarget: `${options.project}:build:${key}`,
+          serverTarget: `${options.project}:server:${key}`,
         };
       }
 
@@ -224,28 +220,26 @@ function addRouterModule(mainPath: string): Rule {
 
 function getMetadataProperty(metadata: ts.Node, propertyName: string): ts.PropertyAssignment {
   const properties = (metadata as ts.ObjectLiteralExpression).properties;
-  const property = properties
-    .filter(ts.isPropertyAssignment)
-    .filter((prop) => {
-      const name = prop.name;
-      switch (name.kind) {
-        case ts.SyntaxKind.Identifier:
-          return (name as ts.Identifier).getText() === propertyName;
-        case ts.SyntaxKind.StringLiteral:
-          return (name as ts.StringLiteral).text === propertyName;
-      }
+  const property = properties.filter(ts.isPropertyAssignment).filter((prop) => {
+    const name = prop.name;
+    switch (name.kind) {
+      case ts.SyntaxKind.Identifier:
+        return name.getText() === propertyName;
+      case ts.SyntaxKind.StringLiteral:
+        return name.text === propertyName;
+    }
 
-      return false;
-    })[0];
+    return false;
+  })[0];
 
-  return property as ts.PropertyAssignment;
+  return property;
 }
 
 function addServerRoutes(options: AppShellOptions): Rule {
   return async (host: Tree) => {
     // The workspace gets updated so this needs to be reloaded
     const workspace = await getWorkspace(host);
-    const clientProject = workspace.projects.get(options.clientProject);
+    const clientProject = workspace.projects.get(options.project);
     if (!clientProject) {
       throw new Error('Universal schematic removed client project.');
     }
@@ -253,11 +247,15 @@ function addServerRoutes(options: AppShellOptions): Rule {
     if (!clientServerTarget) {
       throw new Error('Universal schematic did not add server target to client project.');
     }
-    const clientServerOptions = clientServerTarget.options as unknown as ServerBuilderOptions;
+    const clientServerOptions = (clientServerTarget.options as unknown) as ServerBuilderOptions;
     if (!clientServerOptions) {
       throw new SchematicsException('Server target does not contain options.');
     }
-    const modulePath = getServerModulePath(host, clientProject.sourceRoot || 'src', options.main as string);
+    const modulePath = getServerModulePath(
+      host,
+      clientProject.sourceRoot || 'src',
+      options.main as string,
+    );
     if (modulePath === null) {
       throw new SchematicsException('Universal/server module not found.');
     }
@@ -265,20 +263,16 @@ function addServerRoutes(options: AppShellOptions): Rule {
     let moduleSource = getSourceFile(host, modulePath);
     if (!isImported(moduleSource, 'Routes', '@angular/router')) {
       const recorder = host.beginUpdate(modulePath);
-      const routesChange = insertImport(moduleSource,
-        modulePath,
-        'Routes',
-        '@angular/router');
+      const routesChange = insertImport(moduleSource, modulePath, 'Routes', '@angular/router');
       if (routesChange) {
         applyToUpdateRecorder(recorder, [routesChange]);
       }
 
       const imports = getSourceNodes(moduleSource)
-        .filter(node => node.kind === ts.SyntaxKind.ImportDeclaration)
+        .filter((node) => node.kind === ts.SyntaxKind.ImportDeclaration)
         .sort((a, b) => a.getStart() - b.getStart());
       const insertPosition = imports[imports.length - 1].getEnd();
-      const routeText =
-        `\n\nconst routes: Routes = [ { path: '${options.route}', component: AppShellComponent }];`;
+      const routeText = `\n\nconst routes: Routes = [ { path: '${options.route}', component: AppShellComponent }];`;
       recorder.insertRight(insertPosition, routeText);
       host.commitUpdate(recorder);
     }
@@ -286,17 +280,23 @@ function addServerRoutes(options: AppShellOptions): Rule {
     moduleSource = getSourceFile(host, modulePath);
     if (!isImported(moduleSource, 'RouterModule', '@angular/router')) {
       const recorder = host.beginUpdate(modulePath);
-      const routerModuleChange = insertImport(moduleSource,
+      const routerModuleChange = insertImport(
+        moduleSource,
         modulePath,
         'RouterModule',
-        '@angular/router');
+        '@angular/router',
+      );
 
       if (routerModuleChange) {
         applyToUpdateRecorder(recorder, [routerModuleChange]);
       }
 
       const metadataChange = addSymbolToNgModuleMetadata(
-        moduleSource, modulePath, 'imports', 'RouterModule.forRoot(routes)');
+        moduleSource,
+        modulePath,
+        'imports',
+        'RouterModule.forRoot(routes)',
+      );
       if (metadataChange) {
         applyToUpdateRecorder(recorder, metadataChange);
       }
@@ -309,16 +309,16 @@ function addShellComponent(options: AppShellOptions): Rule {
   const componentOptions: ComponentOptions = {
     name: 'app-shell',
     module: options.rootModuleFileName,
-    project: options.clientProject,
+    project: options.project,
   };
 
   return schematic('component', componentOptions);
 }
 
 export default function (options: AppShellOptions): Rule {
-  return async tree => {
+  return async (tree) => {
     const workspace = await getWorkspace(tree);
-    const clientProject = workspace.projects.get(options.clientProject);
+    const clientProject = workspace.projects.get(options.project);
     if (!clientProject || clientProject.extensions.projectType !== 'application') {
       throw new SchematicsException(`A client project type of "application" is required.`);
     }
@@ -326,8 +326,8 @@ export default function (options: AppShellOptions): Rule {
     if (!clientBuildTarget) {
       throw targetBuildNotFoundError();
     }
-    const clientBuildOptions =
-      (clientBuildTarget.options || {}) as unknown as BrowserBuilderOptions;
+    const clientBuildOptions = ((clientBuildTarget.options ||
+      {}) as unknown) as BrowserBuilderOptions;
 
     return chain([
       validateProject(clientBuildOptions.main),
diff --git a/packages/schematics/angular/app-shell/index_spec.ts b/packages/schematics/angular/app-shell/index_spec.ts
index 25227f0ddb68..f18882ebdde7 100644
--- a/packages/schematics/angular/app-shell/index_spec.ts
+++ b/packages/schematics/angular/app-shell/index_spec.ts
@@ -1,23 +1,23 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+
 import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
 import { Schema as ApplicationOptions } from '../application/schema';
 import { Schema as WorkspaceOptions } from '../workspace/schema';
 import { Schema as AppShellOptions } from './schema';
 
-
 describe('App Shell Schematic', () => {
   const schematicRunner = new SchematicTestRunner(
     '@schematics/angular',
     require.resolve('../collection.json'),
   );
   const defaultOptions: AppShellOptions = {
-    clientProject: 'bar',
+    project: 'bar',
   };
 
   const workspaceOptions: WorkspaceOptions = {
@@ -38,31 +38,32 @@ describe('App Shell Schematic', () => {
 
   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 ensure the client app has a router-outlet', async () => {
     appTree = await schematicRunner.runSchematicAsync('workspace', workspaceOptions).toPromise();
-    appTree = await schematicRunner.runSchematicAsync(
-      'application',
-      {...appOptions, routing: false},
-      appTree,
-    ).toPromise();
+    appTree = await schematicRunner
+      .runSchematicAsync('application', { ...appOptions, routing: false }, appTree)
+      .toPromise();
     await expectAsync(
       schematicRunner.runSchematicAsync('appShell', defaultOptions, appTree).toPromise(),
     ).toBeRejected();
   });
 
   it('should add a universal app', async () => {
-    const tree = await schematicRunner.runSchematicAsync('appShell', defaultOptions, appTree)
+    const tree = await schematicRunner
+      .runSchematicAsync('appShell', defaultOptions, appTree)
       .toPromise();
     const filePath = '/projects/bar/src/app/app.server.module.ts';
     expect(tree.exists(filePath)).toEqual(true);
   });
 
   it('should add app shell configuration', async () => {
-    const tree = await schematicRunner.runSchematicAsync('appShell', defaultOptions, appTree)
+    const tree = await schematicRunner
+      .runSchematicAsync('appShell', defaultOptions, appTree)
       .toPromise();
     const filePath = '/angular.json';
     const content = tree.readContent(filePath);
@@ -76,7 +77,8 @@ describe('App Shell Schematic', () => {
   });
 
   it('should add router module to client app module', async () => {
-    const tree = await schematicRunner.runSchematicAsync('appShell', defaultOptions, appTree)
+    const tree = await schematicRunner
+      .runSchematicAsync('appShell', defaultOptions, appTree)
       .toPromise();
     const filePath = '/projects/bar/src/app/app.module.ts';
     const content = tree.readContent(filePath);
@@ -85,10 +87,11 @@ describe('App Shell Schematic', () => {
 
   it('should not fail when AppModule have imported RouterModule already', async () => {
     const updateRecorder = appTree.beginUpdate('/projects/bar/src/app/app.module.ts');
-    updateRecorder.insertLeft(0, 'import { RouterModule } from \'@angular/router\';');
+    updateRecorder.insertLeft(0, "import { RouterModule } from '@angular/router';");
     appTree.commitUpdate(updateRecorder);
 
-    const tree = await schematicRunner.runSchematicAsync('appShell', defaultOptions, appTree)
+    const tree = await schematicRunner
+      .runSchematicAsync('appShell', defaultOptions, appTree)
       .toPromise();
     const filePath = '/projects/bar/src/app/app.module.ts';
     const content = tree.readContent(filePath);
@@ -97,7 +100,9 @@ describe('App Shell Schematic', () => {
 
   describe('Add router-outlet', () => {
     function makeInlineTemplate(tree: UnitTestTree, template?: string): void {
-      template = template || `
+      template =
+        template ||
+        `
       <p>
         App works!
       </p>`;
@@ -128,7 +133,8 @@ describe('App Shell Schematic', () => {
     it('should not re-add the router outlet (external template)', async () => {
       const htmlPath = '/projects/bar/src/app/app.component.html';
       appTree.overwrite(htmlPath, '<router-outlet></router-outlet>');
-      const tree = await schematicRunner.runSchematicAsync('appShell', defaultOptions, appTree)
+      const tree = await schematicRunner
+        .runSchematicAsync('appShell', defaultOptions, appTree)
         .toPromise();
 
       const content = tree.readContent(htmlPath);
@@ -139,7 +145,8 @@ describe('App Shell Schematic', () => {
 
     it('should not re-add the router outlet (inline template)', async () => {
       makeInlineTemplate(appTree, '<router-outlet></router-outlet>');
-      const tree = await schematicRunner.runSchematicAsync('appShell', defaultOptions, appTree)
+      const tree = await schematicRunner
+        .runSchematicAsync('appShell', defaultOptions, appTree)
         .toPromise();
       const content = tree.readContent('/projects/bar/src/app/app.component.ts');
       const matches = content.match(/<router\-outlet><\/router\-outlet>/g);
@@ -149,7 +156,8 @@ describe('App Shell Schematic', () => {
   });
 
   it('should add router imports to server module', async () => {
-    const tree = await schematicRunner.runSchematicAsync('appShell', defaultOptions, appTree)
+    const tree = await schematicRunner
+      .runSchematicAsync('appShell', defaultOptions, appTree)
       .toPromise();
     const filePath = '/projects/bar/src/app/app.server.module.ts';
     const content = tree.readContent(filePath);
@@ -157,7 +165,8 @@ describe('App Shell Schematic', () => {
   });
 
   it('should work after adding nguniversal', async () => {
-    let tree = await schematicRunner.runSchematicAsync('universal', defaultOptions, appTree)
+    let tree = await schematicRunner
+      .runSchematicAsync('universal', defaultOptions, appTree)
       .toPromise();
 
     // change main tsconfig to mimic ng add for nguniveral
@@ -165,15 +174,15 @@ describe('App Shell Schematic', () => {
     workspace.projects.bar.architect.server.options.main = 'server.ts';
     appTree.overwrite('angular.json', JSON.stringify(workspace, undefined, 2));
 
-    tree = await schematicRunner.runSchematicAsync('appShell', defaultOptions, tree)
-      .toPromise();
+    tree = await schematicRunner.runSchematicAsync('appShell', defaultOptions, tree).toPromise();
     const filePath = '/projects/bar/src/app/app.server.module.ts';
     const content = tree.readContent(filePath);
     expect(content).toMatch(/import { Routes, RouterModule } from \'@angular\/router\';/);
   });
 
   it('should define a server route', async () => {
-    const tree = await schematicRunner.runSchematicAsync('appShell', defaultOptions, appTree)
+    const tree = await schematicRunner
+      .runSchematicAsync('appShell', defaultOptions, appTree)
       .toPromise();
     const filePath = '/projects/bar/src/app/app.server.module.ts';
     const content = tree.readContent(filePath);
@@ -181,18 +190,20 @@ describe('App Shell Schematic', () => {
   });
 
   it('should import RouterModule with forRoot', async () => {
-    const tree = await schematicRunner.runSchematicAsync('appShell', defaultOptions, appTree)
+    const tree = await schematicRunner
+      .runSchematicAsync('appShell', defaultOptions, appTree)
       .toPromise();
     const filePath = '/projects/bar/src/app/app.server.module.ts';
     const content = tree.readContent(filePath);
-    expect(content)
-      .toMatch(/const routes: Routes = \[ { path: 'shell', component: AppShellComponent }\];/);
-    expect(content)
-      .toMatch(/ServerModule,\r?\n\s*RouterModule\.forRoot\(routes\),/);
+    expect(content).toMatch(
+      /const routes: Routes = \[ { path: 'shell', component: AppShellComponent }\];/,
+    );
+    expect(content).toMatch(/ServerModule,\r?\n\s*RouterModule\.forRoot\(routes\),/);
   });
 
   it('should create the shell component', async () => {
-    const tree = await schematicRunner.runSchematicAsync('appShell', defaultOptions, appTree)
+    const tree = await schematicRunner
+      .runSchematicAsync('appShell', defaultOptions, appTree)
       .toPromise();
     expect(tree.exists('/projects/bar/src/app/app-shell/app-shell.component.ts')).toBe(true);
     const content = tree.readContent('/projects/bar/src/app/app.server.module.ts');
diff --git a/packages/schematics/angular/app-shell/schema.json b/packages/schematics/angular/app-shell/schema.json
index 39edc11cc553..6b231b8b46d7 100644
--- a/packages/schematics/angular/app-shell/schema.json
+++ b/packages/schematics/angular/app-shell/schema.json
@@ -7,7 +7,7 @@
   "additionalProperties": false,
   "long-description": "./app-shell-long.md",
   "properties": {
-    "clientProject": {
+    "project": {
       "type": "string",
       "description": "The name of the related client app.",
       "$default": {
@@ -50,7 +50,5 @@
       "default": "AppServerModule"
     }
   },
-  "required": [
-    "clientProject"
-  ]
+  "required": ["project"]
 }
diff --git a/packages/schematics/angular/application/files/src/test.ts.template b/packages/schematics/angular/application/files/src/test.ts.template
index 2042356408ff..b4dd6032fa21 100644
--- a/packages/schematics/angular/application/files/src/test.ts.template
+++ b/packages/schematics/angular/application/files/src/test.ts.template
@@ -17,8 +17,10 @@ declare const require: {
 // First, initialize the Angular testing environment.
 getTestBed().initTestEnvironment(
   BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting()
+  platformBrowserDynamicTesting(),
+  { teardown: { destroyAfterEach: true }},
 );
+
 // Then we find all the tests.
 const context = require.context('./', true, /\.spec\.ts$/);
 // And load the modules.
diff --git a/packages/schematics/angular/application/index.ts b/packages/schematics/angular/application/index.ts
index 97cc8b66cae4..cd599cdb404c 100644
--- a/packages/schematics/angular/application/index.ts
+++ b/packages/schematics/angular/application/index.ts
@@ -1,16 +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 {
-  JsonObject,
-  join,
-  normalize,
-  strings,
-} from '@angular-devkit/core';
+
+import { JsonObject, join, normalize, strings } from '@angular-devkit/core';
 import {
   MergeStrategy,
   Rule,
@@ -29,7 +25,6 @@ import {
 } from '@angular-devkit/schematics';
 import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
 import { Schema as ComponentOptions } from '../component/schema';
-import { Schema as E2eOptions } from '../e2e/schema';
 import { NodeDependencyType, addPackageJsonDependency } from '../utility/dependencies';
 import { latestVersions } from '../utility/latest-versions';
 import { applyLintFix } from '../utility/lint-fix';
@@ -55,9 +50,9 @@ function addDependenciesToPackageJson(options: ApplicationOptions) {
       {
         type: NodeDependencyType.Dev,
         name: 'typescript',
-        version: latestVersions.TypeScript,
+        version: latestVersions['typescript'],
       },
-    ].forEach(dependency => addPackageJsonDependency(host, dependency));
+    ].forEach((dependency) => addPackageJsonDependency(host, dependency));
 
     if (!options.skipInstall) {
       context.addTask(new NodePackageInstallTask());
@@ -75,10 +70,12 @@ function addAppToWorkspaceFile(options: ApplicationOptions, appDir: string): Rul
 
   const schematics: JsonObject = {};
 
-  if (options.inlineTemplate
-    || options.inlineStyle
-    || options.minimal
-    || options.style !== Style.Css) {
+  if (
+    options.inlineTemplate ||
+    options.inlineStyle ||
+    options.minimal ||
+    options.style !== Style.Css
+  ) {
     const componentSchematicsOptions: JsonObject = {};
     if (options.inlineTemplate ?? options.minimal) {
       componentSchematicsOptions.inlineTemplate = true;
@@ -94,12 +91,14 @@ function addAppToWorkspaceFile(options: ApplicationOptions, appDir: string): Rul
   }
 
   if (options.skipTests || options.minimal) {
-    ['class', 'component', 'directive', 'guard', 'interceptor', 'module', 'pipe', 'service'].forEach((type) => {
-      if (!(`@schematics/angular:${type}` in schematics)) {
-        schematics[`@schematics/angular:${type}`] = {};
-      }
-      (schematics[`@schematics/angular:${type}`] as JsonObject).skipTests = true;
-    });
+    ['class', 'component', 'directive', 'guard', 'interceptor', 'pipe', 'service'].forEach(
+      (type) => {
+        if (!(`@schematics/angular:${type}` in schematics)) {
+          schematics[`@schematics/angular:${type}`] = {};
+        }
+        (schematics[`@schematics/angular:${type}`] as JsonObject).skipTests = true;
+      },
+    );
   }
 
   if (options.strict) {
@@ -140,6 +139,8 @@ function addAppToWorkspaceFile(options: ApplicationOptions, appDir: string): Rul
     ];
   }
 
+  const inlineStyleLanguage = options?.style !== Style.Css ? options.style : undefined;
+
   const project = {
     root: normalize(projectRoot),
     sourceRoot,
@@ -156,33 +157,29 @@ function addAppToWorkspaceFile(options: ApplicationOptions, appDir: string): Rul
           main: `${sourceRoot}/main.ts`,
           polyfills: `${sourceRoot}/polyfills.ts`,
           tsConfig: `${projectRoot}tsconfig.app.json`,
-          aot: true,
-          assets: [
-            `${sourceRoot}/favicon.ico`,
-            `${sourceRoot}/assets`,
-          ],
-          styles: [
-            `${sourceRoot}/styles.${options.style}`,
-          ],
+          inlineStyleLanguage,
+          assets: [`${sourceRoot}/favicon.ico`, `${sourceRoot}/assets`],
+          styles: [`${sourceRoot}/styles.${options.style}`],
           scripts: [],
         },
         configurations: {
           production: {
             budgets,
-            fileReplacements: [{
-              replace: `${sourceRoot}/environments/environment.ts`,
-              with: `${sourceRoot}/environments/environment.prod.ts`,
-            }],
-            buildOptimizer: true,
-            optimization: true,
+            fileReplacements: [
+              {
+                replace: `${sourceRoot}/environments/environment.ts`,
+                with: `${sourceRoot}/environments/environment.prod.ts`,
+              },
+            ],
             outputHashing: 'all',
-            sourceMap: false,
-            namedChunks: false,
-            extractLicenses: true,
-            vendorChunk: false,
           },
           development: {
+            buildOptimizer: false,
+            optimization: false,
             vendorChunk: true,
+            extractLicenses: false,
+            sourceMap: true,
+            namedChunks: true,
           },
         },
       },
@@ -205,27 +202,25 @@ function addAppToWorkspaceFile(options: ApplicationOptions, appDir: string): Rul
           browserTarget: `${options.name}:build`,
         },
       },
-      test: options.minimal ? undefined : {
-        builder: Builders.Karma,
-        options: {
-          main: `${sourceRoot}/test.ts`,
-          polyfills: `${sourceRoot}/polyfills.ts`,
-          tsConfig: `${projectRoot}tsconfig.spec.json`,
-          karmaConfig: `${projectRoot}karma.conf.js`,
-          assets: [
-            `${sourceRoot}/favicon.ico`,
-            `${sourceRoot}/assets`,
-          ],
-          styles: [
-            `${sourceRoot}/styles.${options.style}`,
-          ],
-          scripts: [],
-        },
-      },
+      test: options.minimal
+        ? undefined
+        : {
+            builder: Builders.Karma,
+            options: {
+              main: `${sourceRoot}/test.ts`,
+              polyfills: `${sourceRoot}/polyfills.ts`,
+              tsConfig: `${projectRoot}tsconfig.spec.json`,
+              karmaConfig: `${projectRoot}karma.conf.js`,
+              inlineStyleLanguage,
+              assets: [`${sourceRoot}/favicon.ico`, `${sourceRoot}/assets`],
+              styles: [`${sourceRoot}/styles.${options.style}`],
+              scripts: [],
+            },
+          },
     },
   };
 
-  return updateWorkspace(workspace => {
+  return updateWorkspace((workspace) => {
     if (workspace.projects.size === 0) {
       workspace.extensions.defaultProject = options.name;
     }
@@ -251,35 +246,30 @@ export default function (options: ApplicationOptions): Rule {
     validateProjectName(options.name);
 
     const appRootSelector = `${options.prefix}-root`;
-    const componentOptions: Partial<ComponentOptions> = !options.minimal ?
-      {
-        inlineStyle: options.inlineStyle,
-        inlineTemplate: options.inlineTemplate,
-        skipTests: options.skipTests,
-        style: options.style,
-        viewEncapsulation: options.viewEncapsulation,
-      } :
-      {
-        inlineStyle: options.inlineStyle ?? true,
-        inlineTemplate: options.inlineTemplate ?? true,
-        skipTests: true,
-        style: options.style,
-        viewEncapsulation: options.viewEncapsulation,
-      };
+    const componentOptions: Partial<ComponentOptions> = !options.minimal
+      ? {
+          inlineStyle: options.inlineStyle,
+          inlineTemplate: options.inlineTemplate,
+          skipTests: options.skipTests,
+          style: options.style,
+          viewEncapsulation: options.viewEncapsulation,
+        }
+      : {
+          inlineStyle: options.inlineStyle ?? true,
+          inlineTemplate: options.inlineTemplate ?? true,
+          skipTests: true,
+          style: options.style,
+          viewEncapsulation: options.viewEncapsulation,
+        };
 
     const workspace = await getWorkspace(host);
-    const newProjectRoot = workspace.extensions.newProjectRoot as (string | undefined) || '';
+    const newProjectRoot = (workspace.extensions.newProjectRoot as string | undefined) || '';
     const isRootApp = options.projectRoot !== undefined;
     const appDir = isRootApp
       ? normalize(options.projectRoot || '')
       : join(normalize(newProjectRoot), strings.dasherize(options.name));
     const sourceDir = `${appDir}/src/app`;
 
-    const e2eOptions: E2eOptions = {
-      relatedAppName: options.name,
-      rootSelector: appRootSelector,
-    };
-
     return chain([
       addAppToWorkspaceFile(options, appDir),
       mergeWith(
@@ -293,7 +283,9 @@ export default function (options: ApplicationOptions): Rule {
             isRootApp,
           }),
           move(appDir),
-        ]), MergeStrategy.Overwrite),
+        ]),
+        MergeStrategy.Overwrite,
+      ),
       schematic('module', {
         name: 'app',
         commonModule: false,
@@ -314,14 +306,12 @@ export default function (options: ApplicationOptions): Rule {
       }),
       mergeWith(
         apply(url('./other-files'), [
-          options.strict
-            ? noop()
-            : filter(path => path !== '/package.json.template'),
+          options.strict ? noop() : filter((path) => path !== '/package.json.template'),
           componentOptions.inlineTemplate
-            ? filter(path => !path.endsWith('.html.template'))
+            ? filter((path) => !path.endsWith('.html.template'))
             : noop(),
           componentOptions.skipTests
-            ? filter(path => !path.endsWith('.spec.ts.template'))
+            ? filter((path) => !path.endsWith('.spec.ts.template'))
             : noop(),
           applyTemplates({
             utils: strings,
@@ -330,8 +320,9 @@ export default function (options: ApplicationOptions): Rule {
             ...componentOptions,
           }),
           move(sourceDir),
-        ]), MergeStrategy.Overwrite),
-      options.minimal ? noop() : schematic('e2e', e2eOptions),
+        ]),
+        MergeStrategy.Overwrite,
+      ),
       options.skipPackageJson ? noop() : addDependenciesToPackageJson(options),
       options.lintFix ? applyLintFix(appDir) : noop(),
     ]);
diff --git a/packages/schematics/angular/application/index_spec.ts b/packages/schematics/angular/application/index_spec.ts
index c32467e0f8aa..213f38683380 100644
--- a/packages/schematics/angular/application/index_spec.ts
+++ b/packages/schematics/angular/application/index_spec.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
  */
-// tslint:disable:no-big-function
+
 import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
 import { parse as parseJson } from 'jsonc-parser';
 import { latestVersions } from '../utility/latest-versions';
@@ -13,7 +13,7 @@ import { getFileContent } from '../utility/test';
 import { Schema as WorkspaceOptions } from '../workspace/schema';
 import { Schema as ApplicationOptions, Style, ViewEncapsulation } from './schema';
 
-// tslint:disable-next-line: no-any
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 function readJsonFile(tree: UnitTestTree, path: string): any {
   return parseJson(tree.readContent(path).toString());
 }
@@ -38,39 +38,45 @@ describe('Application Schematic', () => {
 
   let workspaceTree: UnitTestTree;
   beforeEach(async () => {
-    workspaceTree = await schematicRunner.runSchematicAsync('workspace', workspaceOptions).toPromise();
+    workspaceTree = await schematicRunner
+      .runSchematicAsync('workspace', workspaceOptions)
+      .toPromise();
   });
 
   it('should create all files of an application', async () => {
     const options = { ...defaultOptions };
 
-    const tree = await schematicRunner.runSchematicAsync('application', options, workspaceTree)
+    const tree = await schematicRunner
+      .runSchematicAsync('application', options, workspaceTree)
       .toPromise();
     const files = tree.files;
-    expect(files).toEqual(jasmine.arrayContaining([
-      '/projects/foo/karma.conf.js',
-      '/projects/foo/tsconfig.app.json',
-      '/projects/foo/tsconfig.spec.json',
-      '/projects/foo/src/environments/environment.ts',
-      '/projects/foo/src/environments/environment.prod.ts',
-      '/projects/foo/src/favicon.ico',
-      '/projects/foo/src/index.html',
-      '/projects/foo/src/main.ts',
-      '/projects/foo/src/polyfills.ts',
-      '/projects/foo/src/styles.css',
-      '/projects/foo/src/test.ts',
-      '/projects/foo/src/app/app.module.ts',
-      '/projects/foo/src/app/app.component.css',
-      '/projects/foo/src/app/app.component.html',
-      '/projects/foo/src/app/app.component.spec.ts',
-      '/projects/foo/src/app/app.component.ts',
-    ]));
+    expect(files).toEqual(
+      jasmine.arrayContaining([
+        '/projects/foo/karma.conf.js',
+        '/projects/foo/tsconfig.app.json',
+        '/projects/foo/tsconfig.spec.json',
+        '/projects/foo/src/environments/environment.ts',
+        '/projects/foo/src/environments/environment.prod.ts',
+        '/projects/foo/src/favicon.ico',
+        '/projects/foo/src/index.html',
+        '/projects/foo/src/main.ts',
+        '/projects/foo/src/polyfills.ts',
+        '/projects/foo/src/styles.css',
+        '/projects/foo/src/test.ts',
+        '/projects/foo/src/app/app.module.ts',
+        '/projects/foo/src/app/app.component.css',
+        '/projects/foo/src/app/app.component.html',
+        '/projects/foo/src/app/app.component.spec.ts',
+        '/projects/foo/src/app/app.component.ts',
+      ]),
+    );
   });
 
   it('should add the application to the workspace', async () => {
     const options = { ...defaultOptions };
 
-    const tree = await schematicRunner.runSchematicAsync('application', options, workspaceTree)
+    const tree = await schematicRunner
+      .runSchematicAsync('application', options, workspaceTree)
       .toPromise();
     const workspace = JSON.parse(tree.readContent('/angular.json'));
     expect(workspace.projects.foo).toBeDefined();
@@ -80,7 +86,8 @@ describe('Application Schematic', () => {
   it('should set the prefix to app if none is set', async () => {
     const options = { ...defaultOptions };
 
-    const tree = await schematicRunner.runSchematicAsync('application', options, workspaceTree)
+    const tree = await schematicRunner
+      .runSchematicAsync('application', options, workspaceTree)
       .toPromise();
     const workspace = JSON.parse(tree.readContent('/angular.json'));
     expect(workspace.projects.foo.prefix).toEqual('app');
@@ -89,7 +96,8 @@ describe('Application Schematic', () => {
   it('should set the prefix correctly', async () => {
     const options = { ...defaultOptions, prefix: 'pre' };
 
-    const tree = await schematicRunner.runSchematicAsync('application', options, workspaceTree)
+    const tree = await schematicRunner
+      .runSchematicAsync('application', options, workspaceTree)
       .toPromise();
     const workspace = JSON.parse(tree.readContent('/angular.json'));
     expect(workspace.projects.foo.prefix).toEqual('pre');
@@ -98,7 +106,8 @@ describe('Application Schematic', () => {
   it('should handle the routing flag', async () => {
     const options = { ...defaultOptions, routing: true };
 
-    const tree = await schematicRunner.runSchematicAsync('application', options, workspaceTree)
+    const tree = await schematicRunner
+      .runSchematicAsync('application', options, workspaceTree)
       .toPromise();
     const files = tree.files;
     expect(files).toContain('/projects/foo/src/app/app.module.ts');
@@ -110,7 +119,8 @@ describe('Application Schematic', () => {
   });
 
   it('should import BrowserModule in the app module', async () => {
-    const tree = await schematicRunner.runSchematicAsync('application', defaultOptions, workspaceTree)
+    const tree = await schematicRunner
+      .runSchematicAsync('application', defaultOptions, workspaceTree)
       .toPromise();
     const path = '/projects/foo/src/app/app.module.ts';
     const content = tree.readContent(path);
@@ -118,7 +128,8 @@ describe('Application Schematic', () => {
   });
 
   it('should declare app component in the app module', async () => {
-    const tree = await schematicRunner.runSchematicAsync('application', defaultOptions, workspaceTree)
+    const tree = await schematicRunner
+      .runSchematicAsync('application', defaultOptions, workspaceTree)
       .toPromise();
     const path = '/projects/foo/src/app/app.module.ts';
     const content = tree.readContent(path);
@@ -126,10 +137,16 @@ describe('Application Schematic', () => {
   });
 
   it(`should set 'defaultEncapsulation' in main.ts when 'ViewEncapsulation' is provided`, async () => {
-    const tree = await schematicRunner.runSchematicAsync('application', {
-      ...defaultOptions,
-      viewEncapsulation: ViewEncapsulation.ShadowDom,
-    }, workspaceTree).toPromise();
+    const tree = await schematicRunner
+      .runSchematicAsync(
+        'application',
+        {
+          ...defaultOptions,
+          viewEncapsulation: ViewEncapsulation.ShadowDom,
+        },
+        workspaceTree,
+      )
+      .toPromise();
     const path = '/projects/foo/src/main.ts';
     const content = tree.readContent(path);
     expect(content).toContain('defaultEncapsulation: ViewEncapsulation.ShadowDom');
@@ -137,7 +154,8 @@ describe('Application Schematic', () => {
   });
 
   it('should set the right paths in the tsconfig.app.json', async () => {
-    const tree = await schematicRunner.runSchematicAsync('application', defaultOptions, workspaceTree)
+    const tree = await schematicRunner
+      .runSchematicAsync('application', defaultOptions, workspaceTree)
       .toPromise();
     const { files, extends: _extends } = readJsonFile(tree, '/projects/foo/tsconfig.app.json');
     expect(files).toEqual(['src/main.ts', 'src/polyfills.ts']);
@@ -145,7 +163,8 @@ describe('Application Schematic', () => {
   });
 
   it('should set the right paths in the tsconfig.spec.json', async () => {
-    const tree = await schematicRunner.runSchematicAsync('application', defaultOptions, workspaceTree)
+    const tree = await schematicRunner
+      .runSchematicAsync('application', defaultOptions, workspaceTree)
       .toPromise();
     const { files, extends: _extends } = readJsonFile(tree, '/projects/foo/tsconfig.spec.json');
     expect(files).toEqual(['src/test.ts', 'src/polyfills.ts']);
@@ -153,7 +172,8 @@ describe('Application Schematic', () => {
   });
 
   it('should set the right coverage folder in the karma.json file', async () => {
-    const tree = await schematicRunner.runSchematicAsync('application', defaultOptions, workspaceTree)
+    const tree = await schematicRunner
+      .runSchematicAsync('application', defaultOptions, workspaceTree)
       .toPromise();
     const karmaConf = getFileContent(tree, '/projects/foo/karma.conf.js');
     expect(karmaConf).toContain(`dir: require('path').join(__dirname, '../../coverage/foo')`);
@@ -161,7 +181,8 @@ describe('Application Schematic', () => {
 
   it('minimal=true should not create e2e and test targets', async () => {
     const options = { ...defaultOptions, minimal: true };
-    const tree = await schematicRunner.runSchematicAsync('application', options, workspaceTree)
+    const tree = await schematicRunner
+      .runSchematicAsync('application', options, workspaceTree)
       .toPromise();
     const config = JSON.parse(tree.readContent('/angular.json'));
     const architect = config.projects.foo.architect;
@@ -171,7 +192,8 @@ describe('Application Schematic', () => {
 
   it('minimal=true should configure the schematics options for components', async () => {
     const options = { ...defaultOptions, minimal: true };
-    const tree = await schematicRunner.runSchematicAsync('application', options, workspaceTree)
+    const tree = await schematicRunner
+      .runSchematicAsync('application', options, workspaceTree)
       .toPromise();
     const config = JSON.parse(tree.readContent('/angular.json'));
     const schematics = config.projects.foo.schematics;
@@ -184,7 +206,8 @@ 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)
+    const tree = await schematicRunner
+      .runSchematicAsync('application', options, workspaceTree)
       .toPromise();
     const config = JSON.parse(tree.readContent('/angular.json'));
     const schematics = config.projects.foo.schematics;
@@ -196,7 +219,8 @@ describe('Application Schematic', () => {
 
   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)
+    const tree = await schematicRunner
+      .runSchematicAsync('application', options, workspaceTree)
       .toPromise();
     const config = JSON.parse(tree.readContent('/angular.json'));
     const schematics = config.projects.foo.schematics;
@@ -208,7 +232,8 @@ describe('Application Schematic', () => {
 
   it('should create correct files when using minimal', async () => {
     const options = { ...defaultOptions, minimal: true };
-    const tree = await schematicRunner.runSchematicAsync('application', options, workspaceTree)
+    const tree = await schematicRunner
+      .runSchematicAsync('application', options, workspaceTree)
       .toPromise();
     const files = tree.files;
     [
@@ -218,25 +243,28 @@ describe('Application Schematic', () => {
       '/projects/foo/src/app/app.component.css',
       '/projects/foo/src/app/app.component.html',
       '/projects/foo/src/app/app.component.spec.ts',
-    ].forEach(x => expect(files).not.toContain(x));
-
-    expect(files).toEqual(jasmine.arrayContaining([
-      '/projects/foo/tsconfig.app.json',
-      '/projects/foo/src/environments/environment.ts',
-      '/projects/foo/src/environments/environment.prod.ts',
-      '/projects/foo/src/favicon.ico',
-      '/projects/foo/src/index.html',
-      '/projects/foo/src/main.ts',
-      '/projects/foo/src/polyfills.ts',
-      '/projects/foo/src/styles.css',
-      '/projects/foo/src/app/app.module.ts',
-      '/projects/foo/src/app/app.component.ts',
-    ]));
+    ].forEach((x) => expect(files).not.toContain(x));
+
+    expect(files).toEqual(
+      jasmine.arrayContaining([
+        '/projects/foo/tsconfig.app.json',
+        '/projects/foo/src/environments/environment.ts',
+        '/projects/foo/src/environments/environment.prod.ts',
+        '/projects/foo/src/favicon.ico',
+        '/projects/foo/src/index.html',
+        '/projects/foo/src/main.ts',
+        '/projects/foo/src/polyfills.ts',
+        '/projects/foo/src/styles.css',
+        '/projects/foo/src/app/app.module.ts',
+        '/projects/foo/src/app/app.component.ts',
+      ]),
+    );
   });
 
   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)
+    const tree = await schematicRunner
+      .runSchematicAsync('application', options, workspaceTree)
       .toPromise();
     const files = tree.files;
     [
@@ -245,26 +273,29 @@ describe('Application Schematic', () => {
       '/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',
-    ]));
+    ].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)
+    const tree = await schematicRunner
+      .runSchematicAsync('application', options, workspaceTree)
       .toPromise();
     const files = tree.files;
     [
@@ -273,59 +304,74 @@ describe('Application Schematic', () => {
       '/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',
-    ]));
+    ].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)
+      const tree = await schematicRunner
+        .runSchematicAsync('application', defaultOptions, workspaceTree)
         .toPromise();
 
       const packageJson = JSON.parse(tree.readContent('package.json'));
-      expect(packageJson.devDependencies['@angular-devkit/build-angular'])
-        .toEqual(latestVersions.DevkitBuildAngular);
+      expect(packageJson.devDependencies['@angular-devkit/build-angular']).toEqual(
+        latestVersions.DevkitBuildAngular,
+      );
     });
 
     it('should use the latest known versions in package.json', async () => {
-      const tree = await schematicRunner.runSchematicAsync('application', defaultOptions, workspaceTree)
+      const tree = await schematicRunner
+        .runSchematicAsync('application', defaultOptions, workspaceTree)
         .toPromise();
       const pkg = JSON.parse(tree.readContent('/package.json'));
       expect(pkg.devDependencies['@angular/compiler-cli']).toEqual(latestVersions.Angular);
-      expect(pkg.devDependencies['typescript']).toEqual(latestVersions.TypeScript);
+      expect(pkg.devDependencies['typescript']).toEqual(latestVersions['typescript']);
     });
 
     it(`should not override existing users dependencies`, async () => {
       const oldPackageJson = workspaceTree.readContent('package.json');
-      workspaceTree.overwrite('package.json', oldPackageJson.replace(
-        `"typescript": "${latestVersions.TypeScript}"`,
-        `"typescript": "~2.5.2"`,
-      ));
-
-      const tree = await schematicRunner.runSchematicAsync('application', defaultOptions, workspaceTree)
+      workspaceTree.overwrite(
+        'package.json',
+        oldPackageJson.replace(
+          `"typescript": "${latestVersions['typescript']}"`,
+          `"typescript": "~2.5.2"`,
+        ),
+      );
+
+      const tree = await schematicRunner
+        .runSchematicAsync('application', defaultOptions, workspaceTree)
         .toPromise();
       const packageJson = JSON.parse(tree.readContent('package.json'));
       expect(packageJson.devDependencies.typescript).toEqual('~2.5.2');
     });
 
     it(`should not modify the file when --skipPackageJson`, async () => {
-      const tree = await schematicRunner.runSchematicAsync('application', {
-        name: 'foo',
-        skipPackageJson: true,
-      }, workspaceTree).toPromise();
+      const tree = await schematicRunner
+        .runSchematicAsync(
+          'application',
+          {
+            name: 'foo',
+            skipPackageJson: true,
+          },
+          workspaceTree,
+        )
+        .toPromise();
 
       const packageJson = JSON.parse(tree.readContent('package.json'));
       expect(packageJson.devDependencies['@angular-devkit/build-angular']).toBeUndefined();
@@ -336,33 +382,37 @@ describe('Application Schematic', () => {
     it('should put app files in the right spot', async () => {
       const options = { ...defaultOptions, projectRoot: '' };
 
-      const tree = await schematicRunner.runSchematicAsync('application', options, workspaceTree)
+      const tree = await schematicRunner
+        .runSchematicAsync('application', options, workspaceTree)
         .toPromise();
       const files = tree.files;
-      expect(files).toEqual(jasmine.arrayContaining([
-        '/karma.conf.js',
-        '/tsconfig.app.json',
-        '/tsconfig.spec.json',
-        '/src/environments/environment.ts',
-        '/src/environments/environment.prod.ts',
-        '/src/favicon.ico',
-        '/src/index.html',
-        '/src/main.ts',
-        '/src/polyfills.ts',
-        '/src/styles.css',
-        '/src/test.ts',
-        '/src/app/app.module.ts',
-        '/src/app/app.component.css',
-        '/src/app/app.component.html',
-        '/src/app/app.component.spec.ts',
-        '/src/app/app.component.ts',
-      ]));
+      expect(files).toEqual(
+        jasmine.arrayContaining([
+          '/karma.conf.js',
+          '/tsconfig.app.json',
+          '/tsconfig.spec.json',
+          '/src/environments/environment.ts',
+          '/src/environments/environment.prod.ts',
+          '/src/favicon.ico',
+          '/src/index.html',
+          '/src/main.ts',
+          '/src/polyfills.ts',
+          '/src/styles.css',
+          '/src/test.ts',
+          '/src/app/app.module.ts',
+          '/src/app/app.component.css',
+          '/src/app/app.component.html',
+          '/src/app/app.component.spec.ts',
+          '/src/app/app.component.ts',
+        ]),
+      );
     });
 
     it('should set values in angular.json correctly', async () => {
       const options = { ...defaultOptions, projectRoot: '' };
 
-      const tree = await schematicRunner.runSchematicAsync('application', options, workspaceTree)
+      const tree = await schematicRunner
+        .runSchematicAsync('application', options, workspaceTree)
         .toPromise();
       const config = JSON.parse(tree.readContent('/angular.json'));
       const prj = config.projects.foo;
@@ -377,31 +427,72 @@ describe('Application Schematic', () => {
       expect(testOpt.main).toEqual('src/test.ts');
       expect(testOpt.tsConfig).toEqual('tsconfig.spec.json');
       expect(testOpt.karmaConfig).toEqual('karma.conf.js');
-      expect(testOpt.styles).toEqual([
-        'src/styles.css',
-      ]);
+      expect(testOpt.styles).toEqual(['src/styles.css']);
     });
 
     it('should set values in angular.json correctly when using a style preprocessor', async () => {
       const options = { ...defaultOptions, projectRoot: '', style: Style.Sass };
-      const tree = await schematicRunner.runSchematicAsync('application', options, workspaceTree)
+      const tree = await schematicRunner
+        .runSchematicAsync('application', options, workspaceTree)
         .toPromise();
       const config = JSON.parse(tree.readContent('/angular.json'));
       const prj = config.projects.foo;
       const buildOpt = prj.architect.build.options;
-      expect(buildOpt.styles).toEqual([
-        'src/styles.sass',
-      ]);
+      expect(buildOpt.styles).toEqual(['src/styles.sass']);
       const testOpt = prj.architect.test.options;
-      expect(testOpt.styles).toEqual([
-        'src/styles.sass',
-      ]);
+      expect(testOpt.styles).toEqual(['src/styles.sass']);
       expect(tree.exists('src/styles.sass')).toBe(true);
     });
 
+    it('sets "inlineStyleLanguage" in angular.json when using a style preprocessor', async () => {
+      const options = { ...defaultOptions, projectRoot: '', style: Style.Sass };
+      const tree = await schematicRunner
+        .runSchematicAsync('application', options, workspaceTree)
+        .toPromise();
+      const config = JSON.parse(tree.readContent('/angular.json'));
+      const prj = config.projects.foo;
+
+      const buildOpt = prj.architect.build.options;
+      expect(buildOpt.inlineStyleLanguage).toBe('sass');
+
+      const testOpt = prj.architect.test.options;
+      expect(testOpt.inlineStyleLanguage).toBe('sass');
+    });
+
+    it('does not set "inlineStyleLanguage" in angular.json when not using a style preprocessor', async () => {
+      const options = { ...defaultOptions, projectRoot: '' };
+      const tree = await schematicRunner
+        .runSchematicAsync('application', options, workspaceTree)
+        .toPromise();
+      const config = JSON.parse(tree.readContent('/angular.json'));
+      const prj = config.projects.foo;
+
+      const buildOpt = prj.architect.build.options;
+      expect(buildOpt.inlineStyleLanguage).toBeUndefined();
+
+      const testOpt = prj.architect.test.options;
+      expect(testOpt.inlineStyleLanguage).toBeUndefined();
+    });
+
+    it('does not set "inlineStyleLanguage" in angular.json when using CSS styles', async () => {
+      const options = { ...defaultOptions, projectRoot: '', style: Style.Css };
+      const tree = await schematicRunner
+        .runSchematicAsync('application', options, workspaceTree)
+        .toPromise();
+      const config = JSON.parse(tree.readContent('/angular.json'));
+      const prj = config.projects.foo;
+
+      const buildOpt = prj.architect.build.options;
+      expect(buildOpt.inlineStyleLanguage).toBeUndefined();
+
+      const testOpt = prj.architect.test.options;
+      expect(testOpt.inlineStyleLanguage).toBeUndefined();
+    });
+
     it('should set the relative tsconfig paths', async () => {
       const options = { ...defaultOptions, projectRoot: '' };
-      const tree = await schematicRunner.runSchematicAsync('application', options, workspaceTree)
+      const tree = await schematicRunner
+        .runSchematicAsync('application', options, workspaceTree)
         .toPromise();
       const appTsConfig = readJsonFile(tree, '/tsconfig.app.json');
       expect(appTsConfig.extends).toEqual('./tsconfig.json');
@@ -411,9 +502,12 @@ describe('Application Schematic', () => {
     });
 
     it(`should create correct paths when 'newProjectRoot' is blank`, async () => {
-      const workspaceTree = await schematicRunner.runSchematicAsync('workspace', { ...workspaceOptions, newProjectRoot: '' }).toPromise();
+      const workspaceTree = await schematicRunner
+        .runSchematicAsync('workspace', { ...workspaceOptions, newProjectRoot: '' })
+        .toPromise();
       const options = { ...defaultOptions, projectRoot: undefined };
-      const tree = await schematicRunner.runSchematicAsync('application', options, workspaceTree)
+      const tree = await schematicRunner
+        .runSchematicAsync('application', options, workspaceTree)
         .toPromise();
       const config = JSON.parse(tree.readContent('/angular.json'));
       const project = config.projects.foo;
@@ -433,7 +527,8 @@ describe('Application Schematic', () => {
 
   it(`should add support for IE 11 in '.browserslistrc' when 'legacyBrowsers' is true`, async () => {
     const options: ApplicationOptions = { ...defaultOptions, legacyBrowsers: true };
-    const tree = await schematicRunner.runSchematicAsync('application', options, workspaceTree)
+    const tree = await schematicRunner
+      .runSchematicAsync('application', options, workspaceTree)
       .toPromise();
     const content = tree.readContent('/projects/foo/.browserslistrc');
     expect(content).not.toContain('not IE 11');
@@ -442,7 +537,8 @@ describe('Application Schematic', () => {
 
   it(`should not add support for IE 11 in '.browserslistrc' when 'legacyBrowsers' is false`, async () => {
     const options: ApplicationOptions = { ...defaultOptions, legacyBrowsers: false };
-    const tree = await schematicRunner.runSchematicAsync('application', options, workspaceTree)
+    const tree = await schematicRunner
+      .runSchematicAsync('application', options, workspaceTree)
       .toPromise();
     const content = tree.readContent('/projects/foo/.browserslistrc');
     expect(content).toContain('not IE 11');
@@ -450,7 +546,8 @@ describe('Application Schematic', () => {
 
   it(`should create kebab-case project folder names with camelCase project name`, async () => {
     const options: ApplicationOptions = { ...defaultOptions, name: 'myCool' };
-    const tree = await schematicRunner.runSchematicAsync('application', options, workspaceTree)
+    const tree = await schematicRunner
+      .runSchematicAsync('application', options, workspaceTree)
       .toPromise();
     const exists = tree.exists('/projects/my-cool/.browserslistrc');
     expect(exists).toBeTrue();
@@ -458,7 +555,8 @@ describe('Application Schematic', () => {
 
   it(`should create kebab-case project folder names with PascalCase project name`, async () => {
     const options: ApplicationOptions = { ...defaultOptions, name: 'MyCool' };
-    const tree = await schematicRunner.runSchematicAsync('application', options, workspaceTree)
+    const tree = await schematicRunner
+      .runSchematicAsync('application', options, workspaceTree)
       .toPromise();
     const exists = tree.exists('/projects/my-cool/.browserslistrc');
     expect(exists).toBeTrue();
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 ad1a25a2782e..5efae6bc8c46 100644
--- a/packages/schematics/angular/application/other-files/app.component.html.template
+++ b/packages/schematics/angular/application/other-files/app.component.html.template
@@ -96,6 +96,7 @@
   }
 
   .card {
+    all: unset;
     border-radius: 4px;
     border: 1px solid #eee;
     background-color: #fafafa;
@@ -249,7 +250,6 @@
     background-image: linear-gradient(-180deg,#fafbfc,#eff3f6 90%);
     margin-left: 4px;
     font-weight: 600;
-    font-family: -apple-system,BlinkMacSystemFont,Segoe UI,Helvetica,Arial,sans-serif,Apple Color Emoji,Segoe UI Emoji,Segoe UI Symbol;
   }
 
   .github-star-badge:hover {
@@ -272,10 +272,8 @@
     width: 1920px;
   }
 
-
   /* Responsive Styles */
   @media screen and (max-width: 767px) {
-
     .card-container > *:not(.circle-link) ,
     .terminal {
       width: 100%;
@@ -359,24 +357,24 @@
   <div class="card-container">
     <a class="card" target="_blank" rel="noopener" href="https://angular.io/tutorial">
       <svg class="material-icons" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M5 13.18v4L12 21l7-3.82v-4L12 17l-7-3.82zM12 3L1 9l11 6 9-4.91V17h2V9L12 3z"/></svg>
-
       <span>Learn Angular</span>
-
       <svg class="material-icons" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M10 6L8.59 7.41 13.17 12l-4.58 4.59L10 18l6-6z"/></svg>    </a>
 
     <a class="card" target="_blank" rel="noopener" href="https://angular.io/cli">
       <svg class="material-icons" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M9.4 16.6L4.8 12l4.6-4.6L8 6l-6 6 6 6 1.4-1.4zm5.2 0l4.6-4.6-4.6-4.6L16 6l6 6-6 6-1.4-1.4z"/></svg>
-
       <span>CLI Documentation</span>
-
       <svg class="material-icons" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M10 6L8.59 7.41 13.17 12l-4.58 4.59L10 18l6-6z"/></svg>
     </a>
 
     <a class="card" target="_blank" rel="noopener" href="https://blog.angular.io/">
       <svg class="material-icons" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M13.5.67s.74 2.65.74 4.8c0 2.06-1.35 3.73-3.41 3.73-2.07 0-3.63-1.67-3.63-3.73l.03-.36C5.21 7.51 4 10.62 4 14c0 4.42 3.58 8 8 8s8-3.58 8-8C20 8.61 17.41 3.8 13.5.67zM11.71 19c-1.78 0-3.22-1.4-3.22-3.14 0-1.62 1.05-2.76 2.81-3.12 1.77-.36 3.6-1.21 4.62-2.58.39 1.29.59 2.65.59 4.04 0 2.65-2.15 4.8-4.8 4.8z"/></svg>
-
       <span>Angular Blog</span>
+      <svg class="material-icons" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M10 6L8.59 7.41 13.17 12l-4.58 4.59L10 18l6-6z"/></svg>
+    </a>
 
+    <a class="card" target="_blank" rel="noopener" href="https://angular.io/devtools/">
+      <svg class="material-icons" xmlns="http://www.w3.org/2000/svg" enable-background="new 0 0 24 24" height="24px" viewBox="0 0 24 24" width="24px" fill="#000000"><g><rect fill="none" height="24" width="24"/></g><g><g><path d="M14.73,13.31C15.52,12.24,16,10.93,16,9.5C16,5.91,13.09,3,9.5,3S3,5.91,3,9.5C3,13.09,5.91,16,9.5,16 c1.43,0,2.74-0.48,3.81-1.27L19.59,21L21,19.59L14.73,13.31z M9.5,14C7.01,14,5,11.99,5,9.5S7.01,5,9.5,5S14,7.01,14,9.5 S11.99,14,9.5,14z"/><polygon points="10.29,8.44 9.5,6 8.71,8.44 6.25,8.44 8.26,10.03 7.49,12.5 9.5,10.97 11.51,12.5 10.74,10.03 12.75,8.44"/></g></g></svg>
+      <span>Angular DevTools</span>
       <svg class="material-icons" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M10 6L8.59 7.41 13.17 12l-4.58 4.59L10 18l6-6z"/></svg>
     </a>
 
@@ -389,41 +387,35 @@
   <input type="hidden" #selection>
 
   <div class="card-container">
-    <div class="card card-small" (click)="selection.value = 'component'" tabindex="0">
-        <svg class="material-icons" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/></svg>
-
+    <button class="card card-small" (click)="selection.value = 'component'" tabindex="0">
+      <svg class="material-icons" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/></svg>
       <span>New Component</span>
-    </div>
-
-    <div class="card card-small" (click)="selection.value = 'material'" tabindex="0">
-        <svg class="material-icons" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/></svg>
+    </button>
 
+    <button class="card card-small" (click)="selection.value = 'material'" tabindex="0">
+      <svg class="material-icons" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/></svg>
       <span>Angular Material</span>
-    </div>
-
-    <div class="card card-small" (click)="selection.value = 'pwa'" tabindex="0">
-        <svg class="material-icons" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/></svg>
+    </button>
 
+    <button class="card card-small" (click)="selection.value = 'pwa'" tabindex="0">
+      <svg class="material-icons" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/></svg>
       <span>Add PWA Support</span>
-    </div>
+    </button>
 
-    <div class="card card-small" (click)="selection.value = 'dependency'" tabindex="0">
+    <button class="card card-small" (click)="selection.value = 'dependency'" tabindex="0">
       <svg class="material-icons" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/></svg>
-
       <span>Add Dependency</span>
-    </div>
+    </button>
 
-    <div class="card card-small" (click)="selection.value = 'test'" tabindex="0">
+    <button class="card card-small" (click)="selection.value = 'test'" tabindex="0">
       <svg class="material-icons" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/></svg>
-
       <span>Run and Watch Tests</span>
-    </div>
+    </button>
 
-    <div class="card card-small" (click)="selection.value = 'build'" tabindex="0">
+    <button class="card card-small" (click)="selection.value = 'build'" tabindex="0">
       <svg class="material-icons" xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24"><path d="M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/></svg>
-
       <span>Build for Production</span>
-    </div>
+    </button>
   </div>
 
   <!-- Terminal -->
@@ -461,17 +453,6 @@
       </svg>
     </a>
 
-    <a class="circle-link" title="Protractor" href="https://www.protractortest.org/" target="_blank" rel="noopener">
-      <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"/>
-          <path id="Path_30" data-name="Path 30" d="M4651.044,369.58v-.421h1.483a7.6,7.6,0,0,0-2.106-5.052l-1.123,1.123-.3-.3,1.122-1.121a7.588,7.588,0,0,0-4.946-2.055v1.482h-.421v-1.485a7.589,7.589,0,0,0-5.051,2.058l1.122,1.121-.3.3-1.123-1.123a7.591,7.591,0,0,0-2.106,5.052h1.482v.421h-1.489v1.734h15.241V369.58Zm-10.966-.263a4.835,4.835,0,0,1,9.67,0Z" transform="translate(-4634.008 -355.852)" fill="#fff"/>
-        </g>
-      </svg>
-    </a>
-
     <a class="circle-link" title="Find a Local Meetup" href="https://www.meetup.com/find/?keywords=angular" target="_blank" rel="noopener">
       <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>
diff --git a/packages/schematics/angular/application/other-files/app.component.spec.ts.template b/packages/schematics/angular/application/other-files/app.component.spec.ts.template
index fcdf822fb55b..8eda79d528db 100644
--- a/packages/schematics/angular/application/other-files/app.component.spec.ts.template
+++ b/packages/schematics/angular/application/other-files/app.component.spec.ts.template
@@ -29,7 +29,7 @@ describe('AppComponent', () => {
   it('should render title', () => {
     const fixture = TestBed.createComponent(AppComponent);
     fixture.detectChanges();
-    const compiled = fixture.nativeElement;
-    expect(compiled.querySelector('.content span').textContent).toContain('<%= name %> app is running!');
+    const compiled = fixture.nativeElement as HTMLElement;
+    expect(compiled.querySelector('.content span')?.textContent).toContain('<%= name %> app is running!');
   });
 });
diff --git a/packages/schematics/angular/application/schema.json b/packages/schematics/angular/application/schema.json
index f5ad1e57dbd1..afee0fb74a2c 100644
--- a/packages/schematics/angular/application/schema.json
+++ b/packages/schematics/angular/application/schema.json
@@ -33,7 +33,7 @@
       "x-user-analytics": 10
     },
     "viewEncapsulation": {
-      "description": "The view encapsulation strategy to use in the new app.",
+      "description": "The view encapsulation strategy to use in the new application.",
       "enum": ["Emulated", "None", "ShadowDom"],
       "type": "string",
       "x-user-analytics": 11
@@ -56,22 +56,24 @@
       "description": "The file extension or preprocessor to use for style files.",
       "type": "string",
       "default": "css",
-      "enum": [
-        "css",
-        "scss",
-        "sass",
-        "less",
-        "styl"
-      ],
+      "enum": ["css", "scss", "sass", "less"],
       "x-prompt": {
         "message": "Which stylesheet format would you like to use?",
         "type": "list",
         "items": [
-          { "value": "css",  "label": "CSS" },
-          { "value": "scss", "label": "SCSS   [ https://sass-lang.com/documentation/syntax#scss                ]" },
-          { "value": "sass", "label": "Sass   [ https://sass-lang.com/documentation/syntax#the-indented-syntax ]" },
-          { "value": "less", "label": "Less   [ http://lesscss.org                                             ]" },
-          { "value": "styl", "label": "Stylus [ https://stylus-lang.com                                        ]" }
+          { "value": "css", "label": "CSS" },
+          {
+            "value": "scss",
+            "label": "SCSS   [ https://sass-lang.com/documentation/syntax#scss                ]"
+          },
+          {
+            "value": "sass",
+            "label": "Sass   [ https://sass-lang.com/documentation/syntax#the-indented-syntax ]"
+          },
+          {
+            "value": "less",
+            "label": "Less   [ http://lesscss.org                                             ]"
+          }
         ]
       },
       "x-user-analytics": 5
@@ -118,7 +120,5 @@
       "x-deprecated": "Legacy browsers support is deprecated since version 12. For more information, see https://angular.io/guide/browser-support"
     }
   },
-  "required": [
-    "name"
-  ]
+  "required": ["name"]
 }
diff --git a/packages/schematics/angular/class/index.ts b/packages/schematics/angular/class/index.ts
index d01184b655a8..306e8f965310 100644
--- a/packages/schematics/angular/class/index.ts
+++ b/packages/schematics/angular/class/index.ts
@@ -1,52 +1,17 @@
 /**
-* @license
-* Copyright Google Inc. All Rights Reserved.
-*
-* Use of this source code is governed by an MIT-style license that can be
-* found in the LICENSE file at https://angular.io/license
-*/
-import { strings } from '@angular-devkit/core';
-import {
-  Rule,
-  Tree,
-  apply,
-  applyTemplates,
-  chain,
-  filter,
-  mergeWith,
-  move,
-  noop,
-  url,
-} from '@angular-devkit/schematics';
-import { applyLintFix } from '../utility/lint-fix';
-import { parseName } from '../utility/parse-name';
-import { createDefaultPath } from '../utility/workspace';
+ * @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 { generateFromFiles } from '../utility/generate-from-files';
 import { Schema as ClassOptions } from './schema';
 
 export default function (options: ClassOptions): Rule {
-  return async (host: Tree) => {
-    if (options.path === undefined) {
-      options.path = await createDefaultPath(host, options.project as string);
-    }
-
-    options.type = !!options.type ? `.${options.type}` : '';
-
-    const parsedPath = parseName(options.path, options.name);
-    options.name = parsedPath.name;
-    options.path = parsedPath.path;
-
-    const templateSource = apply(url('./files'), [
-      options.skipTests ? filter(path => !path.endsWith('.spec.ts.template')) : noop(),
-      applyTemplates({
-        ...strings,
-        ...options,
-      }),
-      move(parsedPath.path),
-    ]);
+  options.type = options.type ? `.${options.type}` : '';
 
-    return chain([
-      mergeWith(templateSource),
-      options.lintFix ? applyLintFix(options.path) : noop(),
-    ]);
-  };
+  return generateFromFiles(options);
 }
diff --git a/packages/schematics/angular/class/index_spec.ts b/packages/schematics/angular/class/index_spec.ts
index 674d083d759d..39afc6741181 100644
--- a/packages/schematics/angular/class/index_spec.ts
+++ b/packages/schematics/angular/class/index_spec.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
  */
+
 import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
 import { Schema as ApplicationOptions } from '../application/schema';
 import { Schema as WorkspaceOptions } from '../workspace/schema';
 import { Schema as ClassOptions } from './schema';
 
-
 describe('Class Schematic', () => {
   const schematicRunner = new SchematicTestRunner(
     '@schematics/angular',
@@ -23,7 +23,6 @@ describe('Class Schematic', () => {
     project: 'bar',
   };
 
-
   const workspaceOptions: WorkspaceOptions = {
     name: 'workspace',
     newProjectRoot: 'projects',
@@ -41,12 +40,14 @@ describe('Class 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 just the class file', async () => {
-    const tree = await schematicRunner.runSchematicAsync('class', defaultOptions, appTree)
+    const tree = await schematicRunner
+      .runSchematicAsync('class', defaultOptions, appTree)
       .toPromise();
     expect(tree.files).toContain('/projects/bar/src/app/foo.ts');
     expect(tree.files).not.toContain('/projects/bar/src/app/foo.spec.ts');
@@ -57,14 +58,14 @@ describe('Class Schematic', () => {
       ...defaultOptions,
       skipTests: false,
     };
-    const tree = await schematicRunner.runSchematicAsync('class', options, appTree)
-      .toPromise();
+    const tree = await schematicRunner.runSchematicAsync('class', options, appTree).toPromise();
     expect(tree.files).toContain('/projects/bar/src/app/foo.ts');
     expect(tree.files).toContain('/projects/bar/src/app/foo.spec.ts');
   });
 
   it('should create an class named "Foo"', async () => {
-    const tree = await schematicRunner.runSchematicAsync('class', defaultOptions, appTree)
+    const tree = await schematicRunner
+      .runSchematicAsync('class', defaultOptions, appTree)
       .toPromise();
     const fileContent = tree.readContent('/projects/bar/src/app/foo.ts');
     expect(fileContent).toMatch(/export class Foo/);
@@ -73,15 +74,13 @@ describe('Class Schematic', () => {
   it('should put type in the file name', async () => {
     const options = { ...defaultOptions, type: 'model' };
 
-    const tree = await schematicRunner.runSchematicAsync('class', options, appTree)
-      .toPromise();
+    const tree = await schematicRunner.runSchematicAsync('class', options, appTree).toPromise();
     expect(tree.files).toContain('/projects/bar/src/app/foo.model.ts');
   });
 
   it('should split the name to name & type with split on "."', async () => {
-    const options = {...defaultOptions, name: 'foo.model' };
-    const tree = await schematicRunner.runSchematicAsync('class', options, appTree)
-      .toPromise();
+    const options = { ...defaultOptions, name: 'foo.model' };
+    const tree = await schematicRunner.runSchematicAsync('class', options, appTree).toPromise();
     const classPath = '/projects/bar/src/app/foo.model.ts';
     const content = tree.readContent(classPath);
     expect(content).toMatch(/export class Foo/);
@@ -89,8 +88,7 @@ describe('Class Schematic', () => {
 
   it('should respect the path option', async () => {
     const options = { ...defaultOptions, path: 'zzz' };
-    const tree = await schematicRunner.runSchematicAsync('class', options, appTree)
-      .toPromise();
+    const tree = await schematicRunner.runSchematicAsync('class', options, appTree).toPromise();
     expect(tree.files).toContain('/zzz/foo.ts');
   });
 
@@ -98,8 +96,17 @@ describe('Class 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('class', defaultOptions, appTree)
-      .toPromise();
+    appTree = await schematicRunner.runSchematicAsync('class', defaultOptions, appTree).toPromise();
     expect(appTree.files).toContain('/projects/bar/custom/app/foo.ts');
   });
+
+  it('should respect the skipTests flag', async () => {
+    const options = {
+      ...defaultOptions,
+      skipTests: true,
+    };
+    const tree = await schematicRunner.runSchematicAsync('class', options, appTree).toPromise();
+    expect(tree.files).toContain('/projects/bar/src/app/foo.ts');
+    expect(tree.files).not.toContain('/projects/bar/src/app/foo.spec.ts');
+  });
 });
diff --git a/packages/schematics/angular/class/schema.json b/packages/schematics/angular/class/schema.json
index fec7d348a8a6..d5a6a24c4b30 100644
--- a/packages/schematics/angular/class/schema.json
+++ b/packages/schematics/angular/class/schema.json
@@ -3,7 +3,7 @@
   "$id": "SchematicsAngularClass",
   "title": "Angular Class Options Schema",
   "type": "object",
-  "description": "Creates a new generic class definition in the given or default project.",
+  "description": "Creates a new, generic class definition in the given or default project.",
   "additionalProperties": false,
   "properties": {
     "name": {
@@ -47,7 +47,5 @@
       "x-deprecated": "Use \"ng lint --fix\" directly instead."
     }
   },
-  "required": [
-    "name"
-  ]
+  "required": ["name"]
 }
diff --git a/packages/schematics/angular/collection.json b/packages/schematics/angular/collection.json
index 13e656267c61..aa8acf318481 100755
--- a/packages/schematics/angular/collection.json
+++ b/packages/schematics/angular/collection.json
@@ -13,13 +13,13 @@
       "hidden": true
     },
     "service-worker": {
-      "aliases": [ "serviceWorker" ],
+      "aliases": ["serviceWorker"],
       "factory": "./service-worker",
       "description": "Initializes a service worker setup.",
       "schema": "./service-worker/schema.json"
     },
     "application": {
-      "aliases": [ "app" ],
+      "aliases": ["app"],
       "factory": "./application",
       "schema": "./application/schema.json",
       "description": "Create an Angular application."
@@ -31,37 +31,37 @@
       "hidden": true
     },
     "class": {
-      "aliases": [ "cl" ],
+      "aliases": ["cl"],
       "factory": "./class",
       "description": "Create a class.",
       "schema": "./class/schema.json"
     },
     "component": {
-      "aliases": [ "c" ],
+      "aliases": ["c"],
       "factory": "./component",
       "description": "Create an Angular component.",
       "schema": "./component/schema.json"
     },
     "directive": {
-      "aliases": [ "d" ],
+      "aliases": ["d"],
       "factory": "./directive",
       "description": "Create an Angular directive.",
       "schema": "./directive/schema.json"
     },
     "enum": {
-      "aliases": [ "e" ],
+      "aliases": ["e"],
       "factory": "./enum",
       "description": "Create an enumeration.",
       "schema": "./enum/schema.json"
     },
     "guard": {
-      "aliases": [ "g" ],
+      "aliases": ["g"],
       "factory": "./guard",
       "description": "Create a guard.",
       "schema": "./guard/schema.json"
     },
     "resolver": {
-      "aliases": [ "r" ],
+      "aliases": ["r"],
       "factory": "./resolver",
       "description": "Create a resolver.",
       "schema": "./resolver/schema.json"
@@ -72,25 +72,25 @@
       "schema": "./interceptor/schema.json"
     },
     "interface": {
-      "aliases": [ "i" ],
+      "aliases": ["i"],
       "factory": "./interface",
       "description": "Create an interface.",
       "schema": "./interface/schema.json"
     },
     "module": {
-      "aliases": [ "m" ],
+      "aliases": ["m"],
       "factory": "./module",
       "description": "Create an Angular module.",
       "schema": "./module/schema.json"
     },
     "pipe": {
-      "aliases": [ "p" ],
+      "aliases": ["p"],
       "factory": "./pipe",
       "description": "Create an Angular pipe.",
       "schema": "./pipe/schema.json"
     },
     "service": {
-      "aliases": [ "s" ],
+      "aliases": ["s"],
       "factory": "./service",
       "description": "Create an Angular service.",
       "schema": "./service/schema.json"
@@ -102,7 +102,7 @@
       "hidden": true
     },
     "app-shell": {
-      "aliases": [ "appShell" ],
+      "aliases": ["appShell"],
       "factory": "./app-shell",
       "description": "Create an app shell.",
       "schema": "./app-shell/schema.json"
diff --git a/packages/schematics/angular/component/files/__name@dasherize@if-flat__/__name@dasherize__.__type@dasherize__.ts.template b/packages/schematics/angular/component/files/__name@dasherize@if-flat__/__name@dasherize__.__type@dasherize__.ts.template
index ad67867d3348..e972ffdcb2b2 100644
--- a/packages/schematics/angular/component/files/__name@dasherize@if-flat__/__name@dasherize__.__type@dasherize__.ts.template
+++ b/packages/schematics/angular/component/files/__name@dasherize@if-flat__/__name@dasherize__.__type@dasherize__.ts.template
@@ -14,7 +14,7 @@ import { Component, OnInit<% if(!!viewEncapsulation) { %>, ViewEncapsulation<% }
         display: block;
       }
     `<% } %>
-  ]<% } else { %>
+  ]<% } else if (style !== 'none') { %>
   styleUrls: ['./<%= dasherize(name) %><%= type ? '.' + dasherize(type): '' %>.<%= style %>']<% } %><% if(!!viewEncapsulation) { %>,
   encapsulation: ViewEncapsulation.<%= viewEncapsulation %><% } if (changeDetection !== 'Default') { %>,
   changeDetection: ChangeDetectionStrategy.<%= changeDetection %><% } %>
diff --git a/packages/schematics/angular/component/index.ts b/packages/schematics/angular/component/index.ts
index 0505fb1fd4e2..19a0599d0946 100644
--- a/packages/schematics/angular/component/index.ts
+++ b/packages/schematics/angular/component/index.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 { strings } from '@angular-devkit/core';
 import {
   FileOperator,
@@ -29,7 +30,7 @@ import { applyLintFix } from '../utility/lint-fix';
 import { parseName } from '../utility/parse-name';
 import { validateHtmlSelector, validateName } from '../utility/validation';
 import { buildDefaultPath, getWorkspace } from '../utility/workspace';
-import { Schema as ComponentOptions } from './schema';
+import { Schema as ComponentOptions, Style } from './schema';
 
 function readIntoSourceFile(host: Tree, modulePath: string): ts.SourceFile {
   const text = host.read(modulePath);
@@ -52,17 +53,20 @@ function addDeclarationToNgModule(options: ComponentOptions): Rule {
     const modulePath = options.module;
     const source = readIntoSourceFile(host, modulePath);
 
-    const componentPath = `/${options.path}/`
-                          + (options.flat ? '' : strings.dasherize(options.name) + '/')
-                          + strings.dasherize(options.name)
-                          + (options.type ? '.' : '')
-                          + strings.dasherize(options.type);
+    const componentPath =
+      `/${options.path}/` +
+      (options.flat ? '' : strings.dasherize(options.name) + '/') +
+      strings.dasherize(options.name) +
+      (options.type ? '.' : '') +
+      strings.dasherize(options.type);
     const relativePath = buildRelativePath(modulePath, componentPath);
     const classifiedName = strings.classify(options.name) + strings.classify(options.type);
-    const declarationChanges = addDeclarationToModule(source,
-                                                      modulePath,
-                                                      classifiedName,
-                                                      relativePath);
+    const declarationChanges = addDeclarationToModule(
+      source,
+      modulePath,
+      classifiedName,
+      relativePath,
+    );
 
     const declarationRecorder = host.beginUpdate(modulePath);
     for (const change of declarationChanges) {
@@ -77,9 +81,12 @@ function addDeclarationToNgModule(options: ComponentOptions): Rule {
       const source = readIntoSourceFile(host, modulePath);
 
       const exportRecorder = host.beginUpdate(modulePath);
-      const exportChanges = addExportToModule(source, modulePath,
-                                              strings.classify(options.name) + strings.classify(options.type),
-                                              relativePath);
+      const exportChanges = addExportToModule(
+        source,
+        modulePath,
+        strings.classify(options.name) + strings.classify(options.type),
+        relativePath,
+      );
 
       for (const change of exportChanges) {
         if (change instanceof InsertChange) {
@@ -93,7 +100,6 @@ function addDeclarationToNgModule(options: ComponentOptions): Rule {
   };
 }
 
-
 function buildSelector(options: ComponentOptions, projectPrefix: string) {
   let selector = strings.dasherize(options.name);
   if (options.prefix) {
@@ -105,13 +111,16 @@ function buildSelector(options: ComponentOptions, projectPrefix: string) {
   return selector;
 }
 
-
 export default function (options: ComponentOptions): Rule {
   return async (host: Tree) => {
     const workspace = await getWorkspace(host);
     const project = workspace.projects.get(options.project as string);
 
-    if (options.path === undefined && project) {
+    if (!project) {
+      throw new SchematicsException(`Project "${options.project}" does not exist.`);
+    }
+
+    if (options.path === undefined) {
       options.path = buildDefaultPath(project);
     }
 
@@ -120,28 +129,32 @@ export default function (options: ComponentOptions): Rule {
     const parsedPath = parseName(options.path as string, options.name);
     options.name = parsedPath.name;
     options.path = parsedPath.path;
-    options.selector = options.selector || buildSelector(options, project && project.prefix || '');
+    options.selector =
+      options.selector || buildSelector(options, (project && project.prefix) || '');
 
     validateName(options.name);
     validateHtmlSelector(options.selector);
 
+    const skipStyleFile = options.inlineStyle || options.style === Style.None;
     const templateSource = apply(url('./files'), [
-      options.skipTests ? filter(path => !path.endsWith('.spec.ts.template')) : noop(),
-      options.inlineStyle ? filter(path => !path.endsWith('.__style__.template')) : noop(),
-      options.inlineTemplate ? filter(path => !path.endsWith('.html.template')) : noop(),
+      options.skipTests ? filter((path) => !path.endsWith('.spec.ts.template')) : noop(),
+      skipStyleFile ? filter((path) => !path.endsWith('.__style__.template')) : noop(),
+      options.inlineTemplate ? filter((path) => !path.endsWith('.html.template')) : noop(),
       applyTemplates({
         ...strings,
-        'if-flat': (s: string) => options.flat ? '' : s,
+        'if-flat': (s: string) => (options.flat ? '' : s),
         ...options,
       }),
-      !options.type ? forEach((file => {
-        return file.path.includes('..')
-          ? {
-            content: file.content,
-            path: file.path.replace('..', '.'),
-          }
-          : file;
-      }) as FileOperator) : noop(),
+      !options.type
+        ? forEach(((file) => {
+            return file.path.includes('..')
+              ? {
+                  content: file.content,
+                  path: file.path.replace('..', '.'),
+                }
+              : 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 fa6e76b3628f..f0482f978858 100644
--- a/packages/schematics/angular/component/index_spec.ts
+++ b/packages/schematics/angular/component/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 { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
-import { Schema as ApplicationOptions } from '../application/schema';
+import { Style as AppStyle, Schema as ApplicationOptions } from '../application/schema';
 import { createAppModule } from '../utility/test';
 import { Schema as WorkspaceOptions } from '../workspace/schema';
 import { ChangeDetection, Schema as ComponentOptions, Style } from './schema';
@@ -43,7 +43,7 @@ describe('Component Schematic', () => {
     inlineStyle: false,
     inlineTemplate: false,
     routing: false,
-    style: Style.Css,
+    style: AppStyle.Css,
     skipTests: false,
     skipPackageJson: false,
   };
@@ -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: \[\n(\s*)  FooComponent\n\1\]/);
+    expect(appModuleContent).toMatch(/exports: \[\n(\s*) {2}FooComponent\n\1\]/);
   });
 
   it('should import into a specified module', async () => {
@@ -245,21 +245,21 @@ describe('Component Schematic', () => {
     const options = { ...defaultOptions, displayBlock: true };
     const tree = await schematicRunner.runSchematicAsync('component', options, appTree).toPromise();
     const content = tree.readContent('/projects/bar/src/app/foo/foo.component.css');
-    expect(content).toMatch(/:host {\r?\n  display: block;\r?\n}/);
+    expect(content).toMatch(/:host {\r?\n {2}display: block;\r?\n}/);
   });
 
   it('should respect the displayBlock option when inlineStyle is `false` and use correct syntax for `scss`', async () => {
     const options = { ...defaultOptions, displayBlock: true, style: 'scss' };
     const tree = await schematicRunner.runSchematicAsync('component', options, appTree).toPromise();
     const content = tree.readContent('/projects/bar/src/app/foo/foo.component.scss');
-    expect(content).toMatch(/:host {\r?\n  display: block;\r?\n}/);
+    expect(content).toMatch(/:host {\r?\n {2}display: block;\r?\n}/);
   });
 
   it('should respect the displayBlock option when inlineStyle is `false` and use correct syntax for `sass', async () => {
     const options = { ...defaultOptions, displayBlock: true, style: 'sass' };
     const tree = await schematicRunner.runSchematicAsync('component', options, appTree).toPromise();
     const content = tree.readContent('/projects/bar/src/app/foo/foo.component.sass');
-    expect(content).toMatch(/\\:host\r?\n  display: block;\r?\n/);
+    expect(content).toMatch(/\\:host\r?\n {2}display: block;\r?\n/);
   });
 
   it('should respect the displayBlock option when inlineStyle is `true`', async () => {
@@ -278,6 +278,15 @@ describe('Component Schematic', () => {
     expect(tree.files).not.toContain('/projects/bar/src/app/foo/foo.component.css');
   });
 
+  it('should respect the style=none option', async () => {
+    const options = { ...defaultOptions, style: Style.None };
+    const tree = await schematicRunner.runSchematicAsync('component', options, appTree).toPromise();
+    const content = tree.readContent('/projects/bar/src/app/foo/foo.component.ts');
+    expect(content).not.toMatch(/styleUrls: /);
+    expect(tree.files).not.toContain('/projects/bar/src/app/foo/foo.component.css');
+    expect(tree.files).not.toContain('/projects/bar/src/app/foo/foo.component.none');
+  });
+
   it('should respect the type option', async () => {
     const options = { ...defaultOptions, type: 'Route' };
     const tree = await schematicRunner.runSchematicAsync('component', options, appTree).toPromise();
@@ -365,4 +374,19 @@ describe('Component Schematic', () => {
       .toPromise();
     expect(appTree.files).toContain('/projects/bar/custom/app/foo/foo.component.ts');
   });
+
+  it('should respect the skipTests option', async () => {
+    const options = { ...defaultOptions, skipTests: true };
+    const tree = await schematicRunner.runSchematicAsync('component', options, appTree).toPromise();
+    const files = tree.files;
+
+    expect(files).toEqual(
+      jasmine.arrayContaining([
+        '/projects/bar/src/app/foo/foo.component.css',
+        '/projects/bar/src/app/foo/foo.component.html',
+        '/projects/bar/src/app/foo/foo.component.ts',
+      ]),
+    );
+    expect(tree.files).not.toContain('/projects/bar/src/app/foo/foo.component.spec.ts');
+  });
 });
diff --git a/packages/schematics/angular/component/schema.json b/packages/schematics/angular/component/schema.json
index 0693bdab7973..69ccab208465 100644
--- a/packages/schematics/angular/component/schema.json
+++ b/packages/schematics/angular/component/schema.json
@@ -3,7 +3,7 @@
   "$id": "SchematicsAngularComponent",
   "title": "Angular Component Options Schema",
   "type": "object",
-  "description": "Creates a new generic component definition in the given or default project.",
+  "description": "Creates a new, generic component definition in the given or default project.",
   "additionalProperties": false,
   "properties": {
     "path": {
@@ -77,16 +77,10 @@
       ]
     },
     "style": {
-      "description": "The file extension or preprocessor to use for style files.",
+      "description": "The file extension or preprocessor to use for style files, or 'none' to skip generating the style file.",
       "type": "string",
       "default": "css",
-      "enum": [
-        "css",
-        "scss",
-        "sass",
-        "less",
-        "styl"
-      ],
+      "enum": ["css", "scss", "sass", "less", "none"],
       "x-user-analytics": 5
     },
     "type": {
@@ -121,7 +115,7 @@
       "default": false,
       "description": "Specifies if the component should have a selector or not."
     },
-    "module":  {
+    "module": {
       "type": "string",
       "description": "The declaring NgModule.",
       "alias": "m"
@@ -139,7 +133,5 @@
       "x-deprecated": "Use \"ng lint --fix\" directly instead."
     }
   },
-  "required": [
-    "name"
-  ]
+  "required": ["name"]
 }
diff --git a/packages/schematics/angular/directive/index.ts b/packages/schematics/angular/directive/index.ts
index 056455fb6b3b..037c003de32a 100644
--- a/packages/schematics/angular/directive/index.ts
+++ b/packages/schematics/angular/directive/index.ts
@@ -1,10 +1,11 @@
 /**
-* @license
-* Copyright Google Inc. All Rights Reserved.
-*
-* Use of this source code is governed by an MIT-style license that can be
-* found in the LICENSE file at https://angular.io/license
-*/
+ * @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,
@@ -29,7 +30,6 @@ import { validateHtmlSelector } from '../utility/validation';
 import { buildDefaultPath, getWorkspace } from '../utility/workspace';
 import { Schema as DirectiveOptions } from './schema';
 
-
 function addDeclarationToNgModule(options: DirectiveOptions): Rule {
   return (host: Tree) => {
     if (options.skipImport || !options.module) {
@@ -44,16 +44,19 @@ function addDeclarationToNgModule(options: DirectiveOptions): Rule {
     const sourceText = text.toString('utf-8');
     const source = ts.createSourceFile(modulePath, sourceText, ts.ScriptTarget.Latest, true);
 
-    const directivePath = `/${options.path}/`
-                          + (options.flat ? '' : strings.dasherize(options.name) + '/')
-                          + strings.dasherize(options.name)
-                          + '.directive';
+    const directivePath =
+      `/${options.path}/` +
+      (options.flat ? '' : strings.dasherize(options.name) + '/') +
+      strings.dasherize(options.name) +
+      '.directive';
     const relativePath = buildRelativePath(modulePath, directivePath);
     const classifiedName = strings.classify(`${options.name}Directive`);
-    const declarationChanges = addDeclarationToModule(source,
-                                                      modulePath,
-                                                      classifiedName,
-                                                      relativePath);
+    const declarationChanges = addDeclarationToModule(
+      source,
+      modulePath,
+      classifiedName,
+      relativePath,
+    );
     const declarationRecorder = host.beginUpdate(modulePath);
     for (const change of declarationChanges) {
       if (change instanceof InsertChange) {
@@ -72,9 +75,12 @@ function addDeclarationToNgModule(options: DirectiveOptions): Rule {
       const source = ts.createSourceFile(modulePath, sourceText, ts.ScriptTarget.Latest, true);
 
       const exportRecorder = host.beginUpdate(modulePath);
-      const exportChanges = addExportToModule(source, modulePath,
-                                              strings.classify(`${options.name}Directive`),
-                                              relativePath);
+      const exportChanges = addExportToModule(
+        source,
+        modulePath,
+        strings.classify(`${options.name}Directive`),
+        relativePath,
+      );
 
       for (const change of exportChanges) {
         if (change instanceof InsertChange) {
@@ -88,7 +94,6 @@ function addDeclarationToNgModule(options: DirectiveOptions): Rule {
   };
 }
 
-
 function buildSelector(options: DirectiveOptions, projectPrefix: string) {
   let selector = options.name;
   if (options.prefix) {
@@ -105,7 +110,7 @@ export default function (options: DirectiveOptions): Rule {
     const workspace = await getWorkspace(host);
     const project = workspace.projects.get(options.project as string);
     if (!project) {
-      throw new SchematicsException(`Invalid project name (${options.project})`);
+      throw new SchematicsException(`Project "${options.project}" does not exist.`);
     }
 
     if (options.path === undefined) {
@@ -122,10 +127,10 @@ export default function (options: DirectiveOptions): Rule {
     validateHtmlSelector(options.selector);
 
     const templateSource = apply(url('./files'), [
-      options.skipTests ? filter(path => !path.endsWith('.spec.ts.template')) : noop(),
+      options.skipTests ? filter((path) => !path.endsWith('.spec.ts.template')) : noop(),
       applyTemplates({
         ...strings,
-        'if-flat': (s: string) => options.flat ? '' : s,
+        'if-flat': (s: string) => (options.flat ? '' : s),
         ...options,
       }),
       move(parsedPath.path),
diff --git a/packages/schematics/angular/directive/index_spec.ts b/packages/schematics/angular/directive/index_spec.ts
index b77e976340a1..157a2352cf4f 100644
--- a/packages/schematics/angular/directive/index_spec.ts
+++ b/packages/schematics/angular/directive/index_spec.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 { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
 import { Schema as ApplicationOptions } from '../application/schema';
 import { Schema as WorkspaceOptions } from '../workspace/schema';
@@ -41,15 +42,15 @@ describe('Directive 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 directive', async () => {
     const options = { ...defaultOptions };
 
-    const tree = await schematicRunner.runSchematicAsync('directive', options, appTree)
-      .toPromise();
+    const tree = await schematicRunner.runSchematicAsync('directive', options, appTree).toPromise();
     const files = tree.files;
     expect(files).toContain('/projects/bar/src/app/foo.directive.spec.ts');
     expect(files).toContain('/projects/bar/src/app/foo.directive.ts');
@@ -61,8 +62,7 @@ describe('Directive Schematic', () => {
   it('should create respect the flat flag', async () => {
     const options = { ...defaultOptions, flat: false };
 
-    const tree = await schematicRunner.runSchematicAsync('directive', options, appTree)
-      .toPromise();
+    const tree = await schematicRunner.runSchematicAsync('directive', options, appTree).toPromise();
     const files = tree.files;
     expect(files).toContain('/projects/bar/src/app/foo/foo.directive.spec.ts');
     expect(files).toContain('/projects/bar/src/app/foo/foo.directive.ts');
@@ -71,7 +71,9 @@ describe('Directive Schematic', () => {
   it('should find the closest module', async () => {
     const options = { ...defaultOptions, flat: false };
     const fooModule = '/projects/bar/src/app/foo/foo.module.ts';
-    appTree.create(fooModule, `
+    appTree.create(
+      fooModule,
+      `
       import { NgModule } from '@angular/core';
 
       @NgModule({
@@ -79,10 +81,10 @@ describe('Directive Schematic', () => {
         declarations: []
       })
       export class FooModule { }
-    `);
+    `,
+    );
 
-    const tree = await schematicRunner.runSchematicAsync('directive', options, appTree)
-      .toPromise();
+    const tree = await schematicRunner.runSchematicAsync('directive', options, appTree).toPromise();
     const fooModuleContent = tree.readContent(fooModule);
     expect(fooModuleContent).toMatch(/import { FooDirective } from '.\/foo.directive'/);
   });
@@ -90,17 +92,15 @@ describe('Directive Schematic', () => {
   it('should export the directive', async () => {
     const options = { ...defaultOptions, export: true };
 
-    const tree = await schematicRunner.runSchematicAsync('directive', options, appTree)
-      .toPromise();
+    const tree = await schematicRunner.runSchematicAsync('directive', options, appTree).toPromise();
     const appModuleContent = tree.readContent('/projects/bar/src/app/app.module.ts');
-    expect(appModuleContent).toMatch(/exports: \[\n(\s*)  FooDirective\n\1\]/);
+    expect(appModuleContent).toMatch(/exports: \[\n(\s*) {2}FooDirective\n\1\]/);
   });
 
   it('should import into a specified module', async () => {
     const options = { ...defaultOptions, module: 'app.module.ts' };
 
-    const tree = await schematicRunner.runSchematicAsync('directive', options, appTree)
-      .toPromise();
+    const tree = await schematicRunner.runSchematicAsync('directive', options, appTree).toPromise();
     const appModule = tree.readContent('/projects/bar/src/app/app.module.ts');
 
     expect(appModule).toMatch(/import { FooDirective } from '.\/foo.directive'/);
@@ -120,16 +120,14 @@ describe('Directive Schematic', () => {
   it('should converts dash-cased-name to a camelCasedSelector', async () => {
     const options = { ...defaultOptions, name: 'my-dir' };
 
-    const tree = await schematicRunner.runSchematicAsync('directive', options, appTree)
-      .toPromise();
+    const tree = await schematicRunner.runSchematicAsync('directive', options, appTree).toPromise();
     const content = tree.readContent('/projects/bar/src/app/my-dir.directive.ts');
     expect(content).toMatch(/selector: '\[appMyDir\]'/);
   });
 
   it('should create the right selector with a path in the name', async () => {
     const options = { ...defaultOptions, name: 'sub/test' };
-    appTree = await schematicRunner.runSchematicAsync('directive', options, appTree)
-      .toPromise();
+    appTree = await schematicRunner.runSchematicAsync('directive', options, appTree).toPromise();
 
     const content = appTree.readContent('/projects/bar/src/app/sub/test.directive.ts');
     expect(content).toMatch(/selector: '\[appTest\]'/);
@@ -137,8 +135,7 @@ describe('Directive Schematic', () => {
 
   it('should use the prefix', async () => {
     const options = { ...defaultOptions, prefix: 'pre' };
-    const tree = await schematicRunner.runSchematicAsync('directive', options, appTree)
-      .toPromise();
+    const tree = await schematicRunner.runSchematicAsync('directive', options, appTree).toPromise();
 
     const content = tree.readContent('/projects/bar/src/app/foo.directive.ts');
     expect(content).toMatch(/selector: '\[preFoo\]'/);
@@ -146,8 +143,7 @@ describe('Directive Schematic', () => {
 
   it('should use the default project prefix if none is passed', async () => {
     const options = { ...defaultOptions, prefix: undefined };
-    const tree = await schematicRunner.runSchematicAsync('directive', options, appTree)
-      .toPromise();
+    const tree = await schematicRunner.runSchematicAsync('directive', options, appTree).toPromise();
 
     const content = tree.readContent('/projects/bar/src/app/foo.directive.ts');
     expect(content).toMatch(/selector: '\[appFoo\]'/);
@@ -155,8 +151,7 @@ describe('Directive Schematic', () => {
 
   it('should use the supplied prefix if it is ""', async () => {
     const options = { ...defaultOptions, prefix: '' };
-    const tree = await schematicRunner.runSchematicAsync('directive', options, appTree)
-      .toPromise();
+    const tree = await schematicRunner.runSchematicAsync('directive', options, appTree).toPromise();
 
     const content = tree.readContent('/projects/bar/src/app/foo.directive.ts');
     expect(content).toMatch(/selector: '\[foo\]'/);
@@ -174,8 +169,18 @@ describe('Directive Schematic', () => {
 
     // move the module
     appTree.rename('/projects/bar/src/app/app.module.ts', '/projects/bar/custom/app/app.module.ts');
-    appTree = await schematicRunner.runSchematicAsync('directive', defaultOptions, appTree)
+    appTree = await schematicRunner
+      .runSchematicAsync('directive', defaultOptions, appTree)
       .toPromise();
     expect(appTree.files).toContain('/projects/bar/custom/app/foo.directive.ts');
   });
+
+  it('should respect skipTests flag', async () => {
+    const options = { ...defaultOptions, skipTests: true };
+
+    const tree = await schematicRunner.runSchematicAsync('directive', options, appTree).toPromise();
+    const files = tree.files;
+    expect(files).toContain('/projects/bar/src/app/foo.directive.ts');
+    expect(files).not.toContain('/projects/bar/src/app/foo.directive.spec.ts');
+  });
 });
diff --git a/packages/schematics/angular/directive/schema.json b/packages/schematics/angular/directive/schema.json
index 5b427521821a..e516ff259af0 100644
--- a/packages/schematics/angular/directive/schema.json
+++ b/packages/schematics/angular/directive/schema.json
@@ -3,7 +3,7 @@
   "$id": "SchematicsAngularDirective",
   "title": "Angular Directive Options Schema",
   "type": "object",
-  "description": "Creates a new generic directive definition in the given or default project.",
+  "description": "Creates a new, generic directive definition in the given or default project.",
   "additionalProperties": false,
   "properties": {
     "name": {
@@ -82,7 +82,5 @@
       "x-deprecated": "Use \"ng lint --fix\" directly instead."
     }
   },
-  "required": [
-    "name"
-  ]
+  "required": ["name"]
 }
diff --git a/packages/schematics/angular/e2e/e2e-long.md b/packages/schematics/angular/e2e/e2e-long.md
index 1831992c5512..13c83bd3bea8 100644
--- a/packages/schematics/angular/e2e/e2e-long.md
+++ b/packages/schematics/angular/e2e/e2e-long.md
@@ -1,2 +1,2 @@
 The e2e tests are created in a separate app in the `projects` folder of the workspace,
-next to the project being tested.
\ No newline at end of file
+next to the project being tested.
diff --git a/packages/schematics/angular/e2e/index.ts b/packages/schematics/angular/e2e/index.ts
index 292c918a9119..fdfeac0c829b 100644
--- a/packages/schematics/angular/e2e/index.ts
+++ b/packages/schematics/angular/e2e/index.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 { join, normalize, strings } from '@angular-devkit/core';
 import {
   Rule,
@@ -17,6 +18,7 @@ import {
   move,
   url,
 } from '@angular-devkit/schematics';
+import { NodeDependencyType, addPackageJsonDependency } from '../utility/dependencies';
 import { JSONFile } from '../utility/json-file';
 import { relativePathToWorkspaceRoot } from '../utility/paths';
 import { getWorkspace, updateWorkspace } from '../utility/workspace';
@@ -24,7 +26,7 @@ import { Builders } from '../utility/workspace-models';
 import { Schema as E2eOptions } from './schema';
 
 function addScriptsToPackageJson(): Rule {
-  return host => {
+  return (host) => {
     const pkgJson = new JSONFile(host, 'package.json');
     const e2eScriptPath = ['scripts', 'e2e'];
 
@@ -72,7 +74,26 @@ export default function (options: E2eOptions): Rule {
             relativePathToWorkspaceRoot: relativePathToWorkspaceRoot(root),
           }),
           move(root),
-        ])),
+        ]),
+      ),
+      (host) =>
+        [
+          {
+            type: NodeDependencyType.Dev,
+            name: 'protractor',
+            version: '~7.0.0',
+          },
+          {
+            type: NodeDependencyType.Dev,
+            name: 'jasmine-spec-reporter',
+            version: '~7.0.0',
+          },
+          {
+            type: NodeDependencyType.Dev,
+            name: 'ts-node',
+            version: '~9.1.1',
+          },
+        ].forEach((dep) => addPackageJsonDependency(host, dep)),
       addScriptsToPackageJson(),
     ]);
   };
diff --git a/packages/schematics/angular/e2e/index_spec.ts b/packages/schematics/angular/e2e/index_spec.ts
index d82b82c2af05..20b88d4d9022 100644
--- a/packages/schematics/angular/e2e/index_spec.ts
+++ b/packages/schematics/angular/e2e/index_spec.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 { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
 import { Schema as ApplicationOptions } from '../application/schema';
 import { Schema as WorkspaceOptions } from '../workspace/schema';
@@ -38,44 +39,50 @@ describe('Application Schematic', () => {
   let applicationTree: UnitTestTree;
 
   beforeEach(async () => {
-    const workspaceTree = await schematicRunner.runSchematicAsync('workspace', workspaceOptions).toPromise();
-    applicationTree = await schematicRunner.runSchematicAsync(
-      'application',
-      defaultAppOptions,
-      workspaceTree,
-    ).toPromise();
+    const workspaceTree = await schematicRunner
+      .runSchematicAsync('workspace', workspaceOptions)
+      .toPromise();
+    applicationTree = await schematicRunner
+      .runSchematicAsync('application', defaultAppOptions, workspaceTree)
+      .toPromise();
   });
 
   it('should create all files of e2e in an application', async () => {
-    const tree = await schematicRunner.runSchematicAsync('e2e', defaultOptions, applicationTree)
+    const tree = await schematicRunner
+      .runSchematicAsync('e2e', defaultOptions, applicationTree)
       .toPromise();
     const files = tree.files;
-    expect(files).toEqual(jasmine.arrayContaining([
-      '/projects/foo/e2e/protractor.conf.js',
-      '/projects/foo/e2e/tsconfig.json',
-      '/projects/foo/e2e/src/app.e2e-spec.ts',
-      '/projects/foo/e2e/src/app.po.ts',
-    ]));
+    expect(files).toEqual(
+      jasmine.arrayContaining([
+        '/projects/foo/e2e/protractor.conf.js',
+        '/projects/foo/e2e/tsconfig.json',
+        '/projects/foo/e2e/src/app.e2e-spec.ts',
+        '/projects/foo/e2e/src/app.po.ts',
+      ]),
+    );
   });
 
   it('should set the rootSelector in the app.po.ts', async () => {
-    const tree = await schematicRunner.runSchematicAsync('e2e', defaultOptions, applicationTree)
+    const tree = await schematicRunner
+      .runSchematicAsync('e2e', defaultOptions, applicationTree)
       .toPromise();
     const content = tree.readContent('/projects/foo/e2e/src/app.po.ts');
     expect(content).toMatch(/app\-root/);
   });
 
   it('should set the rootSelector in the app.po.ts from the option', async () => {
-    const options = {...defaultOptions, rootSelector: 't-a-c-o'};
-    const tree = await schematicRunner.runSchematicAsync('e2e', options, applicationTree)
+    const options = { ...defaultOptions, rootSelector: 't-a-c-o' };
+    const tree = await schematicRunner
+      .runSchematicAsync('e2e', options, applicationTree)
       .toPromise();
     const content = tree.readContent('/projects/foo/e2e/src/app.po.ts');
     expect(content).toMatch(/t\-a\-c\-o/);
   });
 
   it('should set the rootSelector in the app.po.ts from the option with emoji', async () => {
-    const options = {...defaultOptions, rootSelector: '🌮-🌯'};
-    const tree = await schematicRunner.runSchematicAsync('e2e', options, applicationTree)
+    const options = { ...defaultOptions, rootSelector: '🌮-🌯' };
+    const tree = await schematicRunner
+      .runSchematicAsync('e2e', options, applicationTree)
       .toPromise();
     const content = tree.readContent('/projects/foo/e2e/src/app.po.ts');
     expect(content).toMatch(/🌮-🌯/);
@@ -83,7 +90,8 @@ describe('Application Schematic', () => {
 
   describe('workspace config', () => {
     it('should add e2e targets for the app', async () => {
-      const tree = await schematicRunner.runSchematicAsync('e2e', defaultOptions, applicationTree)
+      const tree = await schematicRunner
+        .runSchematicAsync('e2e', defaultOptions, applicationTree)
         .toPromise();
       const workspace = JSON.parse(tree.readContent('/angular.json'));
       const targets = workspace.projects.foo.architect;
@@ -91,7 +99,8 @@ describe('Application Schematic', () => {
     });
 
     it('should set the e2e options', async () => {
-      const tree = await schematicRunner.runSchematicAsync('e2e', defaultOptions, applicationTree)
+      const tree = await schematicRunner
+        .runSchematicAsync('e2e', defaultOptions, applicationTree)
         .toPromise();
       const workspace = JSON.parse(tree.readContent('/angular.json'));
       const { options, configurations } = workspace.projects.foo.architect.e2e;
@@ -101,7 +110,8 @@ describe('Application Schematic', () => {
   });
 
   it('should add an e2e script in package.json', async () => {
-    const tree = await schematicRunner.runSchematicAsync('e2e', defaultOptions, applicationTree)
+    const tree = await schematicRunner
+      .runSchematicAsync('e2e', defaultOptions, applicationTree)
       .toPromise();
     const pkg = JSON.parse(tree.readContent('/package.json'));
     expect(pkg.scripts['e2e']).toBe('ng e2e');
diff --git a/packages/schematics/angular/e2e/schema.json b/packages/schematics/angular/e2e/schema.json
index b36bd476b8fc..185795e63ade 100644
--- a/packages/schematics/angular/e2e/schema.json
+++ b/packages/schematics/angular/e2e/schema.json
@@ -17,7 +17,5 @@
       "type": "string"
     }
   },
-  "required": [
-    "relatedAppName"
-  ]
+  "required": ["relatedAppName"]
 }
diff --git a/packages/schematics/angular/enum/files/__name@dasherize__.enum.ts.template b/packages/schematics/angular/enum/files/__name@dasherize____type__.ts.template
similarity index 100%
rename from packages/schematics/angular/enum/files/__name@dasherize__.enum.ts.template
rename to packages/schematics/angular/enum/files/__name@dasherize____type__.ts.template
diff --git a/packages/schematics/angular/enum/index.ts b/packages/schematics/angular/enum/index.ts
index 6219358cba41..c39856872132 100644
--- a/packages/schematics/angular/enum/index.ts
+++ b/packages/schematics/angular/enum/index.ts
@@ -1,49 +1,17 @@
 /**
-* @license
-* Copyright Google Inc. All Rights Reserved.
-*
-* Use of this source code is governed by an MIT-style license that can be
-* found in the LICENSE file at https://angular.io/license
-*/
-import { strings } from '@angular-devkit/core';
-import {
-  Rule,
-  Tree,
-  apply,
-  applyTemplates,
-  chain,
-  mergeWith,
-  move,
-  noop,
-  url,
-} from '@angular-devkit/schematics';
-import { applyLintFix } from '../utility/lint-fix';
-import { parseName } from '../utility/parse-name';
-import { createDefaultPath } from '../utility/workspace';
-import { Schema as EnumOptions } from './schema';
+ * @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 { generateFromFiles } from '../utility/generate-from-files';
+import { Schema as EnumOptions } from './schema';
 
 export default function (options: EnumOptions): Rule {
-  return async (host: Tree) => {
-    if (options.path === undefined) {
-      options.path = await createDefaultPath(host, options.project as string);
-    }
-
-    const parsedPath = parseName(options.path, options.name);
-    options.name = parsedPath.name;
-    options.path = parsedPath.path;
-
-    const templateSource = apply(url('./files'), [
-      applyTemplates({
-        ...strings,
-        ...options,
-      }),
-      move(parsedPath.path),
-    ]);
+  options.type = options.type ? `.${options.type}` : '';
 
-    return chain([
-      mergeWith(templateSource),
-      options.lintFix ? applyLintFix(options.path) : noop(),
-    ]);
-  };
+  return generateFromFiles(options);
 }
diff --git a/packages/schematics/angular/enum/index_spec.ts b/packages/schematics/angular/enum/index_spec.ts
index a6992409f914..4279bf53a7fe 100644
--- a/packages/schematics/angular/enum/index_spec.ts
+++ b/packages/schematics/angular/enum/index_spec.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
  */
+
 import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
 import { Schema as ApplicationOptions } from '../application/schema';
 import { Schema as WorkspaceOptions } from '../workspace/schema';
 import { Schema as EnumOptions } from './schema';
 
-
 describe('Enum Schematic', () => {
   const schematicRunner = new SchematicTestRunner(
     '@schematics/angular',
@@ -38,21 +38,24 @@ describe('Enum 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 an enumeration', async () => {
-    const tree = await schematicRunner.runSchematicAsync('enum', defaultOptions, appTree)
+    const tree = await schematicRunner
+      .runSchematicAsync('enum', defaultOptions, appTree)
       .toPromise();
     const files = tree.files;
-    expect(files).toContain('/projects/bar/src/app/foo.enum.ts');
+    expect(files).toContain('/projects/bar/src/app/foo.ts');
   });
 
   it('should create an enumeration', async () => {
-    const tree = await schematicRunner.runSchematicAsync('enum', defaultOptions, appTree)
+    const tree = await schematicRunner
+      .runSchematicAsync('enum', defaultOptions, appTree)
       .toPromise();
-    const content = tree.readContent('/projects/bar/src/app/foo.enum.ts');
+    const content = tree.readContent('/projects/bar/src/app/foo.ts');
     expect(content).toMatch('export enum Foo {');
   });
 
@@ -60,8 +63,14 @@ describe('Enum 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('enum', defaultOptions, appTree)
-      .toPromise();
-    expect(appTree.files).toContain('/projects/bar/custom/app/foo.enum.ts');
+    appTree = await schematicRunner.runSchematicAsync('enum', defaultOptions, appTree).toPromise();
+    expect(appTree.files).toContain('/projects/bar/custom/app/foo.ts');
+  });
+
+  it('should put type in the file name', async () => {
+    const options = { ...defaultOptions, type: 'enum' };
+
+    const tree = await schematicRunner.runSchematicAsync('enum', options, appTree).toPromise();
+    expect(tree.files).toContain('/projects/bar/src/app/foo.enum.ts');
   });
 });
diff --git a/packages/schematics/angular/enum/schema.json b/packages/schematics/angular/enum/schema.json
index b41b17d12c84..bb575da10562 100644
--- a/packages/schematics/angular/enum/schema.json
+++ b/packages/schematics/angular/enum/schema.json
@@ -28,6 +28,10 @@
         "$source": "projectName"
       }
     },
+    "type": {
+      "type": "string",
+      "description": "Adds a developer-defined type to the filename, in the format \"name.type.ts\"."
+    },
     "lintFix": {
       "type": "boolean",
       "description": "Apply lint fixes after generating the enum.",
@@ -35,7 +39,5 @@
       "x-deprecated": "Use \"ng lint --fix\" directly instead."
     }
   },
-  "required": [
-    "name"
-  ]
+  "required": ["name"]
 }
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..f8a35b9947bf 100644
--- a/packages/schematics/angular/guard/index.ts
+++ b/packages/schematics/angular/guard/index.ts
@@ -1,67 +1,42 @@
 /**
-* @license
-* Copyright Google Inc. All Rights Reserved.
-*
-* Use of 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,
-  SchematicsException,
-  Tree,
-  apply,
-  applyTemplates,
-  chain,
-  filter,
-  mergeWith,
-  move,
-  noop,
-  url,
-} from '@angular-devkit/schematics';
-import { applyLintFix } from '../utility/lint-fix';
-import { parseName } from '../utility/parse-name';
-import { createDefaultPath } from '../utility/workspace';
-import { Implement as GuardInterface, Schema as GuardOptions } from './schema';
+ * @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, SchematicsException } from '@angular-devkit/schematics';
+import { generateFromFiles } from '../utility/generate-from-files';
+import { Implement as GuardInterface, Schema as GuardOptions } from './schema';
 
 export default function (options: GuardOptions): Rule {
-  return async (host: Tree) => {
-    if (options.path === undefined) {
-      options.path = await createDefaultPath(host, options.project as string);
-    }
+  if (!options.implements) {
+    throw new SchematicsException('Option "implements" is required.');
+  }
 
-    if (!options.implements) {
-      throw new SchematicsException('Option "implements" is required.');
-    }
+  const implementations = options.implements
+    .map((implement) => (implement === 'CanDeactivate' ? 'CanDeactivate<unknown>' : implement))
+    .join(', ');
+  const commonRouterNameImports = ['ActivatedRouteSnapshot', 'RouterStateSnapshot'];
+  const routerNamedImports: string[] = [...options.implements, 'UrlTree'];
+
+  if (options.implements.includes(GuardInterface.CanLoad)) {
+    routerNamedImports.push('Route', 'UrlSegment');
 
-    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... ;)
-    if (options.implements.includes(GuardInterface.CanLoad)) {
-      implementationImports = `${implementationImports}Route, UrlSegment, `;
+    if (options.implements.length > 1) {
+      routerNamedImports.push(...commonRouterNameImports);
     }
+  } else {
+    routerNamedImports.push(...commonRouterNameImports);
+  }
 
-    const parsedPath = parseName(options.path, options.name);
-    options.name = parsedPath.name;
-    options.path = parsedPath.path;
+  routerNamedImports.sort();
 
-    const templateSource = apply(url('./files'), [
-      options.skipTests ? filter(path => !path.endsWith('.spec.ts.template')) : noop(),
-      applyTemplates({
-        implementations,
-        implementationImports,
-        ...strings,
-        ...options,
-      }),
-      move(parsedPath.path + (options.flat ? '' : '/' + strings.dasherize(options.name))),
-    ]);
+  const implementationImports = routerNamedImports.join(', ');
 
-    return chain([
-      mergeWith(templateSource),
-      options.lintFix ? applyLintFix(options.path) : noop(),
-    ]);
-  };
+  return generateFromFiles(options, {
+    implementations,
+    implementationImports,
+  });
 }
diff --git a/packages/schematics/angular/guard/index_spec.ts b/packages/schematics/angular/guard/index_spec.ts
index 01740b088f1f..eba8e654982b 100644
--- a/packages/schematics/angular/guard/index_spec.ts
+++ b/packages/schematics/angular/guard/index_spec.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 { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
 import { Schema as ApplicationOptions } from '../application/schema';
 import { Schema as WorkspaceOptions } from '../workspace/schema';
@@ -37,12 +38,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 +55,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 +64,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 +74,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 +92,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 +106,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 +115,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 3b14bfc095c9..5d4ccb2134ad 100644
--- a/packages/schematics/angular/guard/schema.json
+++ b/packages/schematics/angular/guard/schema.json
@@ -51,21 +51,12 @@
       "uniqueItems": true,
       "minItems": 1,
       "items": {
-        "enum": [
-          "CanActivate",
-          "CanActivateChild",
-          "CanDeactivate",
-          "CanLoad"
-        ],
+        "enum": ["CanActivate", "CanActivateChild", "CanDeactivate", "CanLoad"],
         "type": "string"
       },
-      "default": [
-        "CanActivate"
-      ],
+      "default": ["CanActivate"],
       "x-prompt": "Which interfaces would you like to implement?"
     }
   },
-  "required": [
-    "name"
-  ]
+  "required": ["name"]
 }
diff --git a/packages/schematics/angular/interceptor/index.ts b/packages/schematics/angular/interceptor/index.ts
index 3aa33e65f589..11bbe8bf106a 100755
--- a/packages/schematics/angular/interceptor/index.ts
+++ b/packages/schematics/angular/interceptor/index.ts
@@ -1,51 +1,21 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of 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,
-  Tree,
-  apply,
-  applyTemplates,
-  chain,
-  filter,
-  mergeWith,
-  move,
-  noop,
-  url,
-} from '@angular-devkit/schematics';
-import { applyLintFix } from '../utility/lint-fix';
-import { parseName } from '../utility/parse-name';
-import { createDefaultPath } from '../utility/workspace';
+
+import { Rule } from '@angular-devkit/schematics';
+import { generateFromFiles } from '../utility/generate-from-files';
 import { Schema as InterceptorOptions } from './schema';
 
 export default function (options: InterceptorOptions): Rule {
-  return async (host: Tree) => {
-    if (options.path === undefined) {
-      options.path = await createDefaultPath(host, options.project as string);
-    }
-
-    const parsedPath = parseName(options.path, options.name);
-    options.name = parsedPath.name;
-    options.path = parsedPath.path;
-
-    const templateSource = apply(url('./files'), [
-      options.skipTests ? filter(path => !path.endsWith('.spec.ts.template')) : noop(),
-      applyTemplates({
-        ...strings,
-        'if-flat': (s: string) => options.flat ? '' : s,
-        ...options,
-      }),
-      move(parsedPath.path),
-    ]);
+  // This schematic uses an older method to implement the flat option
+  const flat = options.flat;
+  options.flat = true;
 
-    return chain([
-      mergeWith(templateSource),
-      options.lintFix ? applyLintFix(options.path) : noop(),
-    ]);
-  };
+  return generateFromFiles(options, {
+    'if-flat': (s: string) => (flat ? '' : s),
+  });
 }
diff --git a/packages/schematics/angular/interceptor/index_spec.ts b/packages/schematics/angular/interceptor/index_spec.ts
index f0eba471aa8d..8b540a7ecbd8 100755
--- a/packages/schematics/angular/interceptor/index_spec.ts
+++ b/packages/schematics/angular/interceptor/index_spec.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 { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
 import { Schema as ApplicationOptions } from '../application/schema';
 import { Schema as WorkspaceOptions } from '../workspace/schema';
@@ -37,13 +38,16 @@ describe('Interceptor Schematic', () => {
   let appTree: UnitTestTree;
   beforeEach(async () => {
     appTree = await schematicRunner.runSchematicAsync('workspace', workspaceOptions).toPromise();
-    appTree = await schematicRunner.runSchematicAsync('application', appOptions, appTree).toPromise();
+    appTree = await schematicRunner
+      .runSchematicAsync('application', appOptions, appTree)
+      .toPromise();
   });
 
   it('should create an interceptor', async () => {
     const options = { ...defaultOptions };
 
-    const tree = await schematicRunner.runSchematicAsync('interceptor', options, appTree)
+    const tree = await schematicRunner
+      .runSchematicAsync('interceptor', options, appTree)
       .toPromise();
     const files = tree.files;
     expect(files).toContain('/projects/bar/src/app/foo/foo.interceptor.spec.ts');
@@ -53,7 +57,8 @@ describe('Interceptor Schematic', () => {
   it('should respect the skipTests flag', async () => {
     const options = { ...defaultOptions, skipTests: true };
 
-    const tree = await schematicRunner.runSchematicAsync('interceptor', options, appTree)
+    const tree = await schematicRunner
+      .runSchematicAsync('interceptor', options, appTree)
       .toPromise();
     const files = tree.files;
     expect(files).toContain('/projects/bar/src/app/foo/foo.interceptor.ts');
@@ -64,7 +69,8 @@ describe('Interceptor 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('interceptor', defaultOptions, appTree)
+    appTree = await schematicRunner
+      .runSchematicAsync('interceptor', defaultOptions, appTree)
       .toPromise();
     expect(appTree.files).toContain('/projects/bar/custom/app/foo/foo.interceptor.ts');
   });
diff --git a/packages/schematics/angular/interface/index.ts b/packages/schematics/angular/interface/index.ts
index 7e06cfc17ab7..2d0a2b84732f 100644
--- a/packages/schematics/angular/interface/index.ts
+++ b/packages/schematics/angular/interface/index.ts
@@ -1,52 +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 { strings } from '@angular-devkit/core';
-import {
-  Rule,
-  Tree,
-  apply,
-  applyTemplates,
-  chain,
-  mergeWith,
-  move,
-  noop,
-  url,
-} from '@angular-devkit/schematics';
-import { applyLintFix } from '../utility/lint-fix';
-import { parseName } from '../utility/parse-name';
-import { createDefaultPath } from '../utility/workspace';
-import { Schema as InterfaceOptions } from './schema';
 
+import { Rule } from '@angular-devkit/schematics';
+import { generateFromFiles } from '../utility/generate-from-files';
+import { Schema as InterfaceOptions } from './schema';
 
 export default function (options: InterfaceOptions): Rule {
-  return async (host: Tree) => {
-    if (options.path === undefined) {
-      options.path = await createDefaultPath(host, options.project as string);
-    }
-
-    const parsedPath = parseName(options.path, options.name);
-    options.name = parsedPath.name;
-    options.path = parsedPath.path;
-
-    options.prefix = options.prefix ? options.prefix : '';
-    options.type = !!options.type ? `.${options.type}` : '';
-
-    const templateSource = apply(url('./files'), [
-      applyTemplates({
-        ...strings,
-        ...options,
-      }),
-      move(parsedPath.path),
-    ]);
+  options.type = options.type ? `.${options.type}` : '';
 
-    return chain([
-      mergeWith(templateSource),
-      options.lintFix ? applyLintFix(options.path) : noop(),
-    ]);
-  };
+  return generateFromFiles(options);
 }
diff --git a/packages/schematics/angular/interface/index_spec.ts b/packages/schematics/angular/interface/index_spec.ts
index eac43cca3cae..2be12d0563ba 100644
--- a/packages/schematics/angular/interface/index_spec.ts
+++ b/packages/schematics/angular/interface/index_spec.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
  */
+
 import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
 import { Schema as ApplicationOptions } from '../application/schema';
 import { Schema as WorkspaceOptions } from '../workspace/schema';
 import { Schema as InterfaceOptions } from './schema';
 
-
 describe('Interface Schematic', () => {
   const schematicRunner = new SchematicTestRunner(
     '@schematics/angular',
@@ -40,18 +40,21 @@ describe('Interface 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 one file', async () => {
-    const tree = await schematicRunner.runSchematicAsync('interface', defaultOptions, appTree)
+    const tree = await schematicRunner
+      .runSchematicAsync('interface', defaultOptions, appTree)
       .toPromise();
     expect(tree.files).toContain('/projects/bar/src/app/foo.ts');
   });
 
   it('should create an interface named "Foo"', async () => {
-    const tree = await schematicRunner.runSchematicAsync('interface', defaultOptions, appTree)
+    const tree = await schematicRunner
+      .runSchematicAsync('interface', defaultOptions, appTree)
       .toPromise();
     const fileContent = tree.readContent('/projects/bar/src/app/foo.ts');
     expect(fileContent).toMatch(/export interface Foo/);
@@ -60,8 +63,7 @@ describe('Interface Schematic', () => {
   it('should put type in the file name', async () => {
     const options = { ...defaultOptions, type: 'model' };
 
-    const tree = await schematicRunner.runSchematicAsync('interface', options, appTree)
-      .toPromise();
+    const tree = await schematicRunner.runSchematicAsync('interface', options, appTree).toPromise();
     expect(tree.files).toContain('/projects/bar/src/app/foo.model.ts');
   });
 
@@ -69,7 +71,8 @@ describe('Interface 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('interface', defaultOptions, appTree)
+    appTree = await schematicRunner
+      .runSchematicAsync('interface', defaultOptions, appTree)
       .toPromise();
     expect(appTree.files).toContain('/projects/bar/custom/app/foo.ts');
   });
diff --git a/packages/schematics/angular/interface/schema.json b/packages/schematics/angular/interface/schema.json
index 256b28edd80f..5763f1bd7f35 100644
--- a/packages/schematics/angular/interface/schema.json
+++ b/packages/schematics/angular/interface/schema.json
@@ -4,7 +4,7 @@
   "title": "Angular Interface Options Schema",
   "type": "object",
   "additionalProperties": false,
-  "description": "Creates a new generic interface definition in the given or default project.",
+  "description": "Creates a new, generic interface definition in the given or default project.",
   "properties": {
     "name": {
       "type": "string",
@@ -48,7 +48,5 @@
       "x-deprecated": "Use \"ng lint --fix\" directly instead."
     }
   },
-  "required": [
-    "name"
-  ]
+  "required": ["name"]
 }
diff --git a/packages/schematics/angular/library/files/src/test.ts.template b/packages/schematics/angular/library/files/src/test.ts.template
index 52e55168ebc6..b84c0c21c340 100644
--- a/packages/schematics/angular/library/files/src/test.ts.template
+++ b/packages/schematics/angular/library/files/src/test.ts.template
@@ -18,8 +18,10 @@ declare const require: {
 // First, initialize the Angular testing environment.
 getTestBed().initTestEnvironment(
   BrowserDynamicTestingModule,
-  platformBrowserDynamicTesting()
+  platformBrowserDynamicTesting(),
+  { teardown: { destroyAfterEach: true }},
 );
+
 // Then we find all the tests.
 const context = require.context('./', true, /\.spec\.ts$/);
 // And load the modules.
diff --git a/packages/schematics/angular/library/index.ts b/packages/schematics/angular/library/index.ts
index 84d7e7329df3..35f999c35590 100644
--- a/packages/schematics/angular/library/index.ts
+++ b/packages/schematics/angular/library/index.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 { join, normalize, strings } from '@angular-devkit/core';
 import {
   Rule,
@@ -33,7 +34,9 @@ import { Schema as LibraryOptions } from './schema';
 
 function updateTsConfig(packageName: string, ...paths: string[]) {
   return (host: Tree) => {
-    if (!host.exists('tsconfig.json')) { return host; }
+    if (!host.exists('tsconfig.json')) {
+      return host;
+    }
 
     const file = new JSONFile(host, 'tsconfig.json');
     const jsonPath = ['compilerOptions', 'paths', packageName];
@@ -58,19 +61,19 @@ function addDependenciesToPackageJson() {
       {
         type: NodeDependencyType.Dev,
         name: 'ng-packagr',
-        version: latestVersions.ngPackagr,
+        version: latestVersions['ng-packagr'],
       },
       {
         type: NodeDependencyType.Default,
         name: 'tslib',
-        version: latestVersions.TsLib,
+        version: latestVersions['tslib'],
       },
       {
         type: NodeDependencyType.Dev,
         name: 'typescript',
-        version: latestVersions.TypeScript,
+        version: latestVersions['typescript'],
       },
-    ].forEach(dependency => addPackageJsonDependency(host, dependency));
+    ].forEach((dependency) => addPackageJsonDependency(host, dependency));
 
     return host;
   };
@@ -81,7 +84,7 @@ function addLibToWorkspaceFile(
   projectRoot: string,
   projectName: string,
 ): Rule {
-  return updateWorkspace(workspace => {
+  return updateWorkspace((workspace) => {
     if (workspace.projects.size === 0) {
       workspace.extensions.defaultProject = projectName;
     }
@@ -141,7 +144,7 @@ export default function (options: LibraryOptions): Rule {
     }
 
     const workspace = await getWorkspace(host);
-    const newProjectRoot = workspace.extensions.newProjectRoot as (string | undefined) || '';
+    const newProjectRoot = (workspace.extensions.newProjectRoot as string | undefined) || '';
 
     const scopeFolder = scopeName ? strings.dasherize(scopeName) + '/' : '';
     const folderName = `${scopeFolder}${strings.dasherize(options.name)}`;
@@ -159,8 +162,8 @@ export default function (options: LibraryOptions): Rule {
         distRoot,
         relativePathToWorkspaceRoot: relativePathToWorkspaceRoot(projectRoot),
         prefix,
-        angularLatestVersion: latestVersions.Angular.replace('~', '').replace('^', ''),
-        tsLibLatestVersion: latestVersions.TsLib.replace('~', '').replace('^', ''),
+        angularLatestVersion: latestVersions.Angular.replace(/\~|\^/, ''),
+        tsLibLatestVersion: latestVersions['tslib'].replace(/\~|\^/, ''),
         folderName,
       }),
       move(projectRoot),
@@ -176,7 +179,7 @@ export default function (options: LibraryOptions): Rule {
         commonModule: false,
         flat: true,
         path: sourceDir,
-        project: options.name,
+        project: projectName,
       }),
       schematic('component', {
         name: options.name,
@@ -186,13 +189,13 @@ export default function (options: LibraryOptions): Rule {
         flat: true,
         path: sourceDir,
         export: true,
-        project: options.name,
+        project: projectName,
       }),
       schematic('service', {
         name: options.name,
         flat: true,
         path: sourceDir,
-        project: options.name,
+        project: projectName,
       }),
       options.lintFix ? applyLintFix(sourceDir) : noop(),
       (_tree: Tree, context: SchematicContext) => {
diff --git a/packages/schematics/angular/library/index_spec.ts b/packages/schematics/angular/library/index_spec.ts
index a6fe99b0def4..0ae0e9a55f30 100644
--- a/packages/schematics/angular/library/index_spec.ts
+++ b/packages/schematics/angular/library/index_spec.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
  */
-// tslint:disable:no-big-function
+
 import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
 import { parse as parseJson } from 'jsonc-parser';
 import { getFileContent } from '../../angular/utility/test';
@@ -14,7 +14,7 @@ import { latestVersions } from '../utility/latest-versions';
 import { Schema as WorkspaceOptions } from '../workspace/schema';
 import { Schema as GenerateLibrarySchema } from './schema';
 
-// tslint:disable-next-line: no-any
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 function getJsonFileContent(tree: UnitTestTree, path: string): any {
   return parseJson(tree.readContent(path).toString());
 }
@@ -39,56 +39,72 @@ describe('Library Schematic', () => {
 
   let workspaceTree: UnitTestTree;
   beforeEach(async () => {
-    workspaceTree = await schematicRunner.runSchematicAsync('workspace', workspaceOptions).toPromise();
+    workspaceTree = await schematicRunner
+      .runSchematicAsync('workspace', workspaceOptions)
+      .toPromise();
   });
 
   it('should create files', async () => {
-    const tree = await schematicRunner.runSchematicAsync('library', defaultOptions, workspaceTree).toPromise();
+    const tree = await schematicRunner
+      .runSchematicAsync('library', defaultOptions, workspaceTree)
+      .toPromise();
     const files = tree.files;
-    expect(files).toEqual(jasmine.arrayContaining([
-      '/projects/foo/karma.conf.js',
-      '/projects/foo/ng-package.json',
-      '/projects/foo/package.json',
-      '/projects/foo/README.md',
-      '/projects/foo/tsconfig.lib.json',
-      '/projects/foo/tsconfig.lib.prod.json',
-      '/projects/foo/src/test.ts',
-      '/projects/foo/src/my-index.ts',
-      '/projects/foo/src/lib/foo.module.ts',
-      '/projects/foo/src/lib/foo.component.spec.ts',
-      '/projects/foo/src/lib/foo.component.ts',
-      '/projects/foo/src/lib/foo.service.spec.ts',
-      '/projects/foo/src/lib/foo.service.ts',
-    ]));
+    expect(files).toEqual(
+      jasmine.arrayContaining([
+        '/projects/foo/karma.conf.js',
+        '/projects/foo/ng-package.json',
+        '/projects/foo/package.json',
+        '/projects/foo/README.md',
+        '/projects/foo/tsconfig.lib.json',
+        '/projects/foo/tsconfig.lib.prod.json',
+        '/projects/foo/src/test.ts',
+        '/projects/foo/src/my-index.ts',
+        '/projects/foo/src/lib/foo.module.ts',
+        '/projects/foo/src/lib/foo.component.spec.ts',
+        '/projects/foo/src/lib/foo.component.ts',
+        '/projects/foo/src/lib/foo.service.spec.ts',
+        '/projects/foo/src/lib/foo.service.ts',
+      ]),
+    );
   });
 
   it('should create a package.json named "foo"', async () => {
-    const tree = await schematicRunner.runSchematicAsync('library', defaultOptions, workspaceTree).toPromise();
+    const tree = await schematicRunner
+      .runSchematicAsync('library', defaultOptions, workspaceTree)
+      .toPromise();
     const fileContent = getFileContent(tree, '/projects/foo/package.json');
     expect(fileContent).toMatch(/"name": "foo"/);
   });
 
   it('should have the latest Angular major versions in package.json named "foo"', async () => {
-    const tree = await schematicRunner.runSchematicAsync('library', defaultOptions, workspaceTree).toPromise();
+    const tree = await schematicRunner
+      .runSchematicAsync('library', defaultOptions, workspaceTree)
+      .toPromise();
     const fileContent = getJsonFileContent(tree, '/projects/foo/package.json');
     const angularVersion = latestVersions.Angular.replace('~', '').replace('^', '');
     expect(fileContent.peerDependencies['@angular/core']).toBe(`^${angularVersion}`);
   });
 
   it('should create a README.md named "foo"', async () => {
-    const tree = await schematicRunner.runSchematicAsync('library', defaultOptions, workspaceTree).toPromise();
+    const tree = await schematicRunner
+      .runSchematicAsync('library', defaultOptions, workspaceTree)
+      .toPromise();
     const fileContent = getFileContent(tree, '/projects/foo/README.md');
     expect(fileContent).toMatch(/# Foo/);
   });
 
   it('should create a tsconfig for library', async () => {
-    const tree = await schematicRunner.runSchematicAsync('library', defaultOptions, workspaceTree).toPromise();
+    const tree = await schematicRunner
+      .runSchematicAsync('library', defaultOptions, workspaceTree)
+      .toPromise();
     const fileContent = getJsonFileContent(tree, '/projects/foo/tsconfig.lib.json');
     expect(fileContent).toBeDefined();
   });
 
   it('should create a ng-package.json with ngPackage conf', async () => {
-    const tree = await schematicRunner.runSchematicAsync('library', defaultOptions, workspaceTree).toPromise();
+    const tree = await schematicRunner
+      .runSchematicAsync('library', defaultOptions, workspaceTree)
+      .toPromise();
     const fileContent = getJsonFileContent(tree, '/projects/foo/ng-package.json');
     expect(fileContent.lib).toBeDefined();
     expect(fileContent.lib.entryFile).toEqual('src/my-index.ts');
@@ -96,14 +112,22 @@ describe('Library Schematic', () => {
   });
 
   it('should use default value for baseDir and entryFile', async () => {
-    const tree = await schematicRunner.runSchematicAsync('library', {
-      name: 'foobar',
-    }, workspaceTree).toPromise();
+    const tree = await schematicRunner
+      .runSchematicAsync(
+        'library',
+        {
+          name: 'foobar',
+        },
+        workspaceTree,
+      )
+      .toPromise();
     expect(tree.files).toContain('/projects/foobar/src/public-api.ts');
   });
 
   it(`should add library to workspace`, async () => {
-    const tree = await schematicRunner.runSchematicAsync('library', defaultOptions, workspaceTree).toPromise();
+    const tree = await schematicRunner
+      .runSchematicAsync('library', defaultOptions, workspaceTree)
+      .toPromise();
 
     const workspace = getJsonFileContent(tree, '/angular.json');
     expect(workspace.projects.foo).toBeDefined();
@@ -111,7 +135,9 @@ describe('Library Schematic', () => {
   });
 
   it('should set the prefix to lib if none is set', async () => {
-    const tree = await schematicRunner.runSchematicAsync('library', defaultOptions, workspaceTree).toPromise();
+    const tree = await schematicRunner
+      .runSchematicAsync('library', defaultOptions, workspaceTree)
+      .toPromise();
 
     const workspace = JSON.parse(tree.readContent('/angular.json'));
     expect(workspace.projects.foo.prefix).toEqual('lib');
@@ -119,7 +145,9 @@ describe('Library Schematic', () => {
 
   it('should set the prefix correctly', async () => {
     const options = { ...defaultOptions, prefix: 'pre' };
-    const tree = await schematicRunner.runSchematicAsync('library', options, workspaceTree).toPromise();
+    const tree = await schematicRunner
+      .runSchematicAsync('library', options, workspaceTree)
+      .toPromise();
 
     const workspace = JSON.parse(tree.readContent('/angular.json'));
     expect(workspace.projects.foo.prefix).toEqual('pre');
@@ -127,53 +155,74 @@ describe('Library Schematic', () => {
 
   it('should handle a pascalCasedName', async () => {
     const options = { ...defaultOptions, name: 'pascalCasedName' };
-    const tree = await schematicRunner.runSchematicAsync('library', options, workspaceTree).toPromise();
+    const tree = await schematicRunner
+      .runSchematicAsync('library', options, workspaceTree)
+      .toPromise();
     const config = getJsonFileContent(tree, '/angular.json');
     const project = config.projects.pascalCasedName;
     expect(project).toBeDefined();
     expect(project.root).toEqual('projects/pascal-cased-name');
-    const svcContent = tree.readContent('/projects/pascal-cased-name/src/lib/pascal-cased-name.service.ts');
+    const svcContent = tree.readContent(
+      '/projects/pascal-cased-name/src/lib/pascal-cased-name.service.ts',
+    );
     expect(svcContent).toMatch(/providedIn: 'root'/);
   });
 
   it('should export the component in the NgModule', async () => {
-    const tree = await schematicRunner.runSchematicAsync('library', defaultOptions, workspaceTree).toPromise();
+    const tree = await schematicRunner
+      .runSchematicAsync('library', defaultOptions, workspaceTree)
+      .toPromise();
     const fileContent = getFileContent(tree, '/projects/foo/src/lib/foo.module.ts');
-    expect(fileContent).toMatch(/exports: \[\n(\s*)  FooComponent\n\1\]/);
+    expect(fileContent).toMatch(/exports: \[\n(\s*) {2}FooComponent\n\1\]/);
   });
 
   describe(`update package.json`, () => {
     it(`should add ng-packagr to devDependencies`, async () => {
-      const tree = await schematicRunner.runSchematicAsync('library', defaultOptions, workspaceTree).toPromise();
+      const tree = await schematicRunner
+        .runSchematicAsync('library', defaultOptions, workspaceTree)
+        .toPromise();
 
       const packageJson = getJsonFileContent(tree, 'package.json');
-      expect(packageJson.devDependencies['ng-packagr']).toEqual(latestVersions.ngPackagr);
+      expect(packageJson.devDependencies['ng-packagr']).toEqual(latestVersions['ng-packagr']);
     });
 
     it('should use the latest known versions in package.json', async () => {
-      const tree = await schematicRunner.runSchematicAsync('library', defaultOptions, workspaceTree).toPromise();
+      const tree = await schematicRunner
+        .runSchematicAsync('library', defaultOptions, workspaceTree)
+        .toPromise();
       const pkg = JSON.parse(tree.readContent('/package.json'));
       expect(pkg.devDependencies['@angular/compiler-cli']).toEqual(latestVersions.Angular);
-      expect(pkg.devDependencies['typescript']).toEqual(latestVersions.TypeScript);
+      expect(pkg.devDependencies['typescript']).toEqual(latestVersions['typescript']);
     });
 
     it(`should not override existing users dependencies`, async () => {
       const oldPackageJson = workspaceTree.readContent('package.json');
-      workspaceTree.overwrite('package.json', oldPackageJson.replace(
-        `"typescript": "${latestVersions.TypeScript}"`,
-        `"typescript": "~2.5.2"`,
-      ));
-
-      const tree = await schematicRunner.runSchematicAsync('library', defaultOptions, workspaceTree).toPromise();
+      workspaceTree.overwrite(
+        'package.json',
+        oldPackageJson.replace(
+          `"typescript": "${latestVersions['typescript']}"`,
+          `"typescript": "~2.5.2"`,
+        ),
+      );
+
+      const tree = await schematicRunner
+        .runSchematicAsync('library', defaultOptions, workspaceTree)
+        .toPromise();
       const packageJson = getJsonFileContent(tree, 'package.json');
       expect(packageJson.devDependencies.typescript).toEqual('~2.5.2');
     });
 
     it(`should not modify the file when --skipPackageJson`, async () => {
-      const tree = await schematicRunner.runSchematicAsync('library', {
-        name: 'foo',
-        skipPackageJson: true,
-      }, workspaceTree).toPromise();
+      const tree = await schematicRunner
+        .runSchematicAsync(
+          'library',
+          {
+            name: 'foo',
+            skipPackageJson: true,
+          },
+          workspaceTree,
+        )
+        .toPromise();
 
       const packageJson = getJsonFileContent(tree, 'package.json');
       expect(packageJson.devDependencies['ng-packagr']).toBeUndefined();
@@ -183,7 +232,9 @@ describe('Library Schematic', () => {
 
   describe(`update tsconfig.json`, () => {
     it(`should add paths mapping to empty tsconfig`, async () => {
-      const tree = await schematicRunner.runSchematicAsync('library', defaultOptions, workspaceTree).toPromise();
+      const tree = await schematicRunner
+        .runSchematicAsync('library', defaultOptions, workspaceTree)
+        .toPromise();
 
       const tsConfigJson = getJsonFileContent(tree, 'tsconfig.json');
       expect(tsConfigJson.compilerOptions.paths.foo).toBeTruthy();
@@ -193,15 +244,20 @@ describe('Library Schematic', () => {
     });
 
     it(`should append to existing paths mappings`, async () => {
-      workspaceTree.overwrite('tsconfig.json', JSON.stringify({
-        compilerOptions: {
-          paths: {
-            'unrelated': ['./something/else.ts'],
-            'foo': ['libs/*'],
+      workspaceTree.overwrite(
+        'tsconfig.json',
+        JSON.stringify({
+          compilerOptions: {
+            paths: {
+              'unrelated': ['./something/else.ts'],
+              'foo': ['libs/*'],
+            },
           },
-        },
-      }));
-      const tree = await schematicRunner.runSchematicAsync('library', defaultOptions, workspaceTree).toPromise();
+        }),
+      );
+      const tree = await schematicRunner
+        .runSchematicAsync('library', defaultOptions, workspaceTree)
+        .toPromise();
 
       const tsConfigJson = getJsonFileContent(tree, 'tsconfig.json');
       expect(tsConfigJson.compilerOptions.paths.foo).toBeTruthy();
@@ -211,10 +267,16 @@ describe('Library Schematic', () => {
     });
 
     it(`should not modify the file when --skipTsConfig`, async () => {
-      const tree = await schematicRunner.runSchematicAsync('library', {
-        name: 'foo',
-        skipTsConfig: true,
-      }, workspaceTree).toPromise();
+      const tree = await schematicRunner
+        .runSchematicAsync(
+          'library',
+          {
+            name: 'foo',
+            skipTsConfig: true,
+          },
+          workspaceTree,
+        )
+        .toPromise();
 
       const tsConfigJson = getJsonFileContent(tree, 'tsconfig.json');
       expect(tsConfigJson.compilerOptions.paths).toBeUndefined();
@@ -222,7 +284,9 @@ describe('Library Schematic', () => {
   });
 
   it('should generate inside of a library', async () => {
-    let tree = await schematicRunner.runSchematicAsync('library', defaultOptions, workspaceTree).toPromise();
+    let tree = await schematicRunner
+      .runSchematicAsync('library', defaultOptions, workspaceTree)
+      .toPromise();
     const componentOptions: ComponentOptions = {
       name: 'comp',
       project: 'foo',
@@ -234,7 +298,9 @@ describe('Library Schematic', () => {
   it(`should support creating scoped libraries`, async () => {
     const scopedName = '@myscope/mylib';
     const options = { ...defaultOptions, name: scopedName };
-    const tree = await schematicRunner.runSchematicAsync('library', options, workspaceTree).toPromise();
+    const tree = await schematicRunner
+      .runSchematicAsync('library', options, workspaceTree)
+      .toPromise();
 
     const pkgJsonPath = '/projects/myscope/mylib/package.json';
     expect(tree.files).toContain(pkgJsonPath);
@@ -251,10 +317,15 @@ describe('Library Schematic', () => {
     expect(cfg.projects['@myscope/mylib']).toBeDefined();
 
     const rootTsCfg = getJsonFileContent(tree, '/tsconfig.json');
-    expect(rootTsCfg.compilerOptions.paths['@myscope/mylib']).toEqual(['dist/myscope/mylib/myscope-mylib', 'dist/myscope/mylib']);
+    expect(rootTsCfg.compilerOptions.paths['@myscope/mylib']).toEqual([
+      'dist/myscope/mylib/myscope-mylib',
+      'dist/myscope/mylib',
+    ]);
 
     const karmaConf = getFileContent(tree, '/projects/myscope/mylib/karma.conf.js');
-    expect(karmaConf).toContain(`dir: require('path').join(__dirname, '../../../coverage/myscope/mylib')`);
+    expect(karmaConf).toContain(
+      `dir: require('path').join(__dirname, '../../../coverage/myscope/mylib')`,
+    );
   });
 
   it(`should dasherize scoped libraries`, async () => {
@@ -262,7 +333,9 @@ describe('Library Schematic', () => {
     const expectedScopeName = '@my-scope/my-lib';
     const expectedFolderName = 'my-scope/my-lib';
     const options = { ...defaultOptions, name: scopedName };
-    const tree = await schematicRunner.runSchematicAsync('library', options, workspaceTree).toPromise();
+    const tree = await schematicRunner
+      .runSchematicAsync('library', options, workspaceTree)
+      .toPromise();
 
     const pkgJsonPath = '/projects/my-scope/my-lib/package.json';
     expect(tree.readContent(pkgJsonPath)).toContain(expectedScopeName);
@@ -278,14 +351,19 @@ describe('Library Schematic', () => {
   });
 
   it(`should set coverage folder to "coverage/foo"`, async () => {
-    const tree = await schematicRunner.runSchematicAsync('library', defaultOptions, workspaceTree).toPromise();
+    const tree = await schematicRunner
+      .runSchematicAsync('library', defaultOptions, workspaceTree)
+      .toPromise();
     const karmaConf = getFileContent(tree, '/projects/foo/karma.conf.js');
     expect(karmaConf).toContain(`dir: require('path').join(__dirname, '../../coverage/foo')`);
   });
 
   it(`should create correct paths when 'newProjectRoot' is blank`, async () => {
-    const workspaceTree = await schematicRunner.runSchematicAsync('workspace', { ...workspaceOptions, newProjectRoot: '' }).toPromise();
-    const tree = await schematicRunner.runSchematicAsync('library', defaultOptions, workspaceTree)
+    const workspaceTree = await schematicRunner
+      .runSchematicAsync('workspace', { ...workspaceOptions, newProjectRoot: '' })
+      .toPromise();
+    const tree = await schematicRunner
+      .runSchematicAsync('library', defaultOptions, workspaceTree)
       .toPromise();
     const config = getJsonFileContent(tree, '/angular.json');
     const project = config.projects.foo;
@@ -301,7 +379,8 @@ describe('Library Schematic', () => {
   });
 
   it(`should add 'development' configuration`, async () => {
-    const tree = await schematicRunner.runSchematicAsync('library', defaultOptions, workspaceTree)
+    const tree = await schematicRunner
+      .runSchematicAsync('library', defaultOptions, workspaceTree)
       .toPromise();
 
     const workspace = JSON.parse(tree.readContent('/angular.json'));
@@ -309,10 +388,13 @@ describe('Library Schematic', () => {
   });
 
   it(`should add 'ng-packagr' builder`, async () => {
-    const tree = await schematicRunner.runSchematicAsync('library', defaultOptions, workspaceTree)
+    const tree = await schematicRunner
+      .runSchematicAsync('library', defaultOptions, workspaceTree)
       .toPromise();
 
     const workspace = JSON.parse(tree.readContent('/angular.json'));
-    expect(workspace.projects.foo.architect.build.builder).toBe('@angular-devkit/build-angular:ng-packagr');
+    expect(workspace.projects.foo.architect.build.builder).toBe(
+      '@angular-devkit/build-angular:ng-packagr',
+    );
   });
 });
diff --git a/packages/schematics/angular/library/library-long.md b/packages/schematics/angular/library/library-long.md
index 7907be6b8269..a61e0beb3f48 100644
--- a/packages/schematics/angular/library/library-long.md
+++ b/packages/schematics/angular/library/library-long.md
@@ -2,4 +2,4 @@ A library is a type of project that does not run independently.
 The library skeleton created by this command is placed by default in the `/projects` folder, and has `type` of "library".
 
 You can build a new library using the `ng build` command, run unit tests for it using the `ng test` command,
-and lint it using the `ng lint` command.
\ No newline at end of file
+and lint it using the `ng lint` command.
diff --git a/packages/schematics/angular/library/schema.json b/packages/schematics/angular/library/schema.json
index 4a2147db60aa..418941b419d7 100644
--- a/packages/schematics/angular/library/schema.json
+++ b/packages/schematics/angular/library/schema.json
@@ -3,7 +3,7 @@
   "$id": "SchematicsLibrary",
   "title": "Library Options Schema",
   "type": "object",
-  "description": "Creates a new generic library project in the current workspace.",
+  "description": "Creates a new, generic library project in the current workspace.",
   "long-description": "./library-long.md",
   "additionalProperties": false,
   "properties": {
diff --git a/packages/schematics/angular/migrations/migration-collection.json b/packages/schematics/angular/migrations/migration-collection.json
index d7bf9151f72f..d339c9fc98f8 100644
--- a/packages/schematics/angular/migrations/migration-collection.json
+++ b/packages/schematics/angular/migrations/migration-collection.json
@@ -115,6 +115,16 @@
       "factory": "./update-12/update-web-workers",
       "description": "Updates Web Worker consumer usage to use the new syntax supported directly by Webpack 5."
     },
+    "schematic-options-12": {
+      "version": "12.0.1",
+      "factory": "./update-12/schematic-options",
+      "description": "Remove invalid 'skipTests' option in '@schematics/angular:module' Angular schematic options."
+    },
+    "replace-deprecated-prod-flag": {
+      "version": "12.1.0",
+      "factory": "./update-12/replace-prod-flag",
+      "description": "Replace the deprecated '--prod' in package.json scripts."
+    },
     "production-by-default": {
       "version": "9999.0.0",
       "factory": "./update-12/production-default-config",
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..b38af9a040da 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,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 { JsonValue } from '@angular-devkit/core';
 import { Rule } from '@angular-devkit/schematics';
 import { getPackageJsonDependency } from '../../utility/dependencies';
@@ -35,7 +36,7 @@ export default function (): Rule {
     try {
       json = new JSONFile(tree, TSLINT_CONFIG_PATH);
     } catch {
-      const config = ['tslint.js', 'tslint.yaml'].find(c => tree.exists(c));
+      const config = ['tslint.js', 'tslint.yaml'].find((c) => tree.exists(c));
       if (config) {
         logger.warn(`Expected a JSON configuration file but found "${config}".`);
       } else {
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..35e36b502684 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,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 { EmptyTree } from '@angular-devkit/schematics';
 import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
 
@@ -40,7 +41,9 @@ describe('Migration of tslint to version 6', () => {
     };
     tree.create(TSLINT_PATH, JSON.stringify(config, null, 2));
 
-    const newTree = await schematicRunner.runSchematicAsync('tslint-add-deprecation-rule', {}, tree).toPromise();
+    const newTree = await schematicRunner
+      .runSchematicAsync('tslint-add-deprecation-rule', {}, tree)
+      .toPromise();
     const { rules } = JSON.parse(newTree.readContent(TSLINT_PATH));
     expect(rules['deprecation'].severity).toBe('warning');
   });
@@ -57,7 +60,9 @@ describe('Migration of tslint to version 6', () => {
     };
     tree.create(TSLINT_PATH, JSON.stringify(config, null, 2));
 
-    const newTree = await schematicRunner.runSchematicAsync('tslint-add-deprecation-rule', {}, tree).toPromise();
+    const newTree = await schematicRunner
+      .runSchematicAsync('tslint-add-deprecation-rule', {}, tree)
+      .toPromise();
     const { rules } = JSON.parse(newTree.readContent(TSLINT_PATH));
     expect(rules['deprecation']).toBe(false);
   });
@@ -76,7 +81,9 @@ describe('Migration of tslint to version 6', () => {
     };
     tree.create(TSLINT_PATH, JSON.stringify(config, null, 2));
 
-    const newTree = await schematicRunner.runSchematicAsync('tslint-add-deprecation-rule', {}, tree).toPromise();
+    const newTree = await schematicRunner
+      .runSchematicAsync('tslint-add-deprecation-rule', {}, tree)
+      .toPromise();
     const { rules } = JSON.parse(newTree.readContent(TSLINT_PATH));
     expect(rules['deprecation'].severity).toBe('error');
   });
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..68c827d59df4 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
@@ -28,15 +28,17 @@ export default function (): Rule {
         }
 
         const isES5Needed = await isES5SupportNeeded(
-          resolve(
-            normalize(host.root.path),
-            normalize(project.root),
-          ),
+          resolve(normalize(host.root.path), normalize(project.root)),
         );
 
         // Check options
         if (target.options) {
-          target.options = removeE5BrowserSupportOption(projectName, target.options, isES5Needed, context.logger);
+          target.options = removeE5BrowserSupportOption(
+            projectName,
+            target.options,
+            isES5Needed,
+            context.logger,
+          );
         }
 
         // Go through each configuration entry
@@ -78,14 +80,18 @@ function removeE5BrowserSupportOption(
   if (options.es5BrowserSupport && isES5Needed === false) {
     logger.warn(
       `Project '${projectName}' doesn't require ES5 support, but '${configurationPath}es5BrowserSupport' was set to 'true'.\n` +
-      `ES5 polyfills will no longer be added when building this project${configurationName ? ` with '${configurationName}' configuration.` : '.'}\n` +
-      `If ES5 polyfills are needed, add the supported ES5 browsers in the browserslist configuration.`,
+        `ES5 polyfills will no longer be added when building this project${
+          configurationName ? ` with '${configurationName}' configuration.` : '.'
+        }\n` +
+        `If ES5 polyfills are needed, add the supported ES5 browsers in the browserslist configuration.`,
     );
   } else if (!options.es5BrowserSupport && isES5Needed === true) {
     logger.warn(
       `Project '${projectName}' requires ES5 support, but '${configurationPath}es5BrowserSupport' was set to 'false'.\n` +
-      `ES5 polyfills will be added when building this project${configurationName ? ` with '${configurationName}' configuration.` : '.'}\n` +
-      `If ES5 polyfills are not needed, remove the unsupported ES5 browsers from the browserslist configuration.`,
+        `ES5 polyfills will be added when building this project${
+          configurationName ? ` with '${configurationName}' configuration.` : '.'
+        }\n` +
+        `If ES5 polyfills are not needed, remove the unsupported ES5 browsers from the browserslist configuration.`,
     );
   }
 
@@ -103,34 +109,30 @@ async function isES5SupportNeeded(projectRoot: Path): Promise<boolean | undefine
   // n: feature is unavailable
   // a: feature is partially supported
   // x: feature is prefixed
-  const criteria = [
-    'y',
-    'a',
-  ];
+  const criteria = ['y', 'a'];
 
   try {
-    // tslint:disable-next-line:no-implicit-dependencies
-    const browserslist = await import('browserslist');
+    // eslint-disable-next-line import/no-extraneous-dependencies
+    const browserslist = (await import('browserslist')).default;
     const supportedBrowsers = browserslist(undefined, {
       path: getSystemPath(projectRoot),
     });
 
-    // tslint:disable-next-line:no-implicit-dependencies
+    // eslint-disable-next-line import/no-extraneous-dependencies
     const { feature, features } = await import('caniuse-lite');
     const data = feature(features['es6-module']);
 
-    return supportedBrowsers
-      .some(browser => {
-        const [agentId, version] = browser.split(' ');
+    return supportedBrowsers.some((browser) => {
+      const [agentId, version] = browser.split(' ');
 
-        const browserData = data.stats[agentId];
-        const featureStatus = (browserData && browserData[version]) as string | undefined;
+      const browserData = data.stats[agentId];
+      const featureStatus = (browserData && browserData[version]) as string | undefined;
 
-        // We are only interested in the first character
-        // Ex: when 'a #4 #5', we only need to check for 'a'
-        // as for such cases we should polyfill these features as needed
-        return !featureStatus || !criteria.includes(featureStatus.charAt(0));
-      });
+      // We are only interested in the first character
+      // Ex: when 'a #4 #5', we only need to check for 'a'
+      // as for such cases we should polyfill these features as needed
+      return !featureStatus || !criteria.includes(featureStatus.charAt(0));
+    });
   } catch {
     return undefined;
   }
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..02761956ec22 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,14 +1,20 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+
 import { JsonObject } from '@angular-devkit/core';
 import { EmptyTree } from '@angular-devkit/schematics';
 import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
-import { BuilderTarget, Builders, ProjectType, WorkspaceSchema } from '../../utility/workspace-models';
+import {
+  BuilderTarget,
+  Builders,
+  ProjectType,
+  WorkspaceSchema,
+} from '../../utility/workspace-models';
 
 function getBuildTarget(tree: UnitTestTree): BuilderTarget<Builders.Browser, JsonObject> {
   return JSON.parse(tree.readContent('/angular.json')).projects.app.architect.build;
@@ -30,7 +36,7 @@ function createWorkSpaceConfig(tree: UnitTestTree, es5BrowserSupport: boolean |
               es5BrowserSupport,
               sourceMaps: true,
               buildOptimizer: false,
-            // tslint:disable-next-line:no-any
+              // eslint-disable-next-line @typescript-eslint/no-explicit-any
             } as any,
             configurations: {
               one: {
@@ -44,7 +50,7 @@ function createWorkSpaceConfig(tree: UnitTestTree, es5BrowserSupport: boolean |
                 buildOptimizer: true,
                 sourceMaps: false,
               },
-            // tslint:disable-next-line:no-any
+              // eslint-disable-next-line @typescript-eslint/no-explicit-any
             } as any,
           },
         },
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..f37c796441b3 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,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 { Path, dirname, join, normalize, resolve } from '@angular-devkit/core';
 import { DirEntry, Rule } from '@angular-devkit/schematics';
 import { JSONFile } from '../../utility/json-file';
@@ -57,20 +58,25 @@ export default function (): Rule {
     // Iterate over all tsconfig files and change the extends from 'tsconfig.base.json' to 'tsconfig.json'.
     const extendsJsonPath = ['extends'];
     for (const path of visitExtendedJsonFiles(host.root)) {
-
       try {
         const tsConfigDir = dirname(normalize(path));
         const tsConfigJson = new JSONFile(host, path);
         const extendsValue = tsConfigJson.get(extendsJsonPath);
 
-        if (typeof extendsValue === 'string' && '/tsconfig.base.json' === resolve(tsConfigDir, normalize(extendsValue))) {
+        if (
+          typeof extendsValue === 'string' &&
+          '/tsconfig.base.json' === resolve(tsConfigDir, normalize(extendsValue))
+        ) {
           // tsconfig extends the workspace tsconfig path.
-          tsConfigJson.modify(extendsJsonPath, extendsValue.replace('tsconfig.base.json', 'tsconfig.json'));
+          tsConfigJson.modify(
+            extendsJsonPath,
+            extendsValue.replace('tsconfig.base.json', 'tsconfig.json'),
+          );
         }
       } catch (error) {
         logger.warn(
           `${error.message || error}\n` +
-          'If this is a TypeScript configuration file you will need to update the "extends" value manually.',
+            'If this is a TypeScript configuration file you will need to update the "extends" value manually.',
         );
 
         continue;
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 f431127bf48b..7d3c58a786a2 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,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 { EmptyTree } from '@angular-devkit/schematics';
 import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
 import { parse as parseJson } from 'jsonc-parser';
@@ -22,7 +23,7 @@ describe('Migration to remove "Solution Style" tsconfig', () => {
     tree.create(filePath, JSON.stringify(content, undefined, 2));
   }
 
-  // tslint:disable-next-line: no-any
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   function readJsonFile(tree: UnitTestTree, filePath: string): any {
     return parseJson(tree.readContent(filePath).toString());
   }
@@ -61,7 +62,6 @@ describe('Migration to remove "Solution Style" tsconfig', () => {
     createJsonFile(tree, 'angular.json', angularConfig);
   }
 
-
   let tree: UnitTestTree;
   beforeEach(() => {
     tree = new UnitTestTree(new EmptyTree());
@@ -72,12 +72,30 @@ describe('Migration to remove "Solution Style" tsconfig', () => {
     createJsonFile(tree, 'tsconfig.json', { files: [] });
     createJsonFile(tree, 'tsconfig.base.json', { compilerOptions });
     createJsonFile(tree, 'tsconfig.common.json', { compilerOptions });
-    createJsonFile(tree, 'src/tsconfig.json', { extends: './../tsconfig.base.json', compilerOptions });
-    createJsonFile(tree, 'src/tsconfig.base.json', { extends: './../tsconfig.base.json', compilerOptions });
-    createJsonFile(tree, 'src/tsconfig.tsc.json', { extends: './tsconfig.base.json', compilerOptions });
-    createJsonFile(tree, 'src/tsconfig.app.json', { extends: './../tsconfig.common.json', compilerOptions });
-    createJsonFile(tree, 'src/tsconfig.spec.json', { extends: './../tsconfig.base.json', compilerOptions });
-    createJsonFile(tree, 'src/tsconfig.worker.json', { extends: './../tsconfig.base.json', compilerOptions });
+    createJsonFile(tree, 'src/tsconfig.json', {
+      extends: './../tsconfig.base.json',
+      compilerOptions,
+    });
+    createJsonFile(tree, 'src/tsconfig.base.json', {
+      extends: './../tsconfig.base.json',
+      compilerOptions,
+    });
+    createJsonFile(tree, 'src/tsconfig.tsc.json', {
+      extends: './tsconfig.base.json',
+      compilerOptions,
+    });
+    createJsonFile(tree, 'src/tsconfig.app.json', {
+      extends: './../tsconfig.common.json',
+      compilerOptions,
+    });
+    createJsonFile(tree, 'src/tsconfig.spec.json', {
+      extends: './../tsconfig.base.json',
+      compilerOptions,
+    });
+    createJsonFile(tree, 'src/tsconfig.worker.json', {
+      extends: './../tsconfig.base.json',
+      compilerOptions,
+    });
   });
 
   it(`should rename 'tsconfig.base.json' to 'tsconfig.json'`, async () => {
@@ -105,13 +123,15 @@ describe('Migration to remove "Solution Style" tsconfig', () => {
 
   it('should show warning with full path when parsing invalid JSON', async () => {
     const logs: string[] = [];
-    schematicRunner.logger.subscribe(m => logs.push(m.message));
+    schematicRunner.logger.subscribe((m) => logs.push(m.message));
 
     tree.create('src/invalid/error.json', `{ "extends": "./../../tsconfig.base.json", invalid }`);
     const newTree = await schematicRunner.runSchematicAsync(schematicName, {}, tree).toPromise();
 
     expect(readJsonFile(newTree, 'src/tsconfig.spec.json').extends).toEqual('./../tsconfig.json');
-    expect(logs.join('\n')).toContain('Failed to parse "/src/invalid/error.json" as JSON AST Object. InvalidSymbol at location: 43.');
+    expect(logs.join('\n')).toContain(
+      'Failed to parse "/src/invalid/error.json" as JSON AST Object. InvalidSymbol at location: 43.',
+    );
   });
 
   it(`should not error when 'tsconfig.json' doesn't exist`, async () => {
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..7f651b973d9f 100644
--- a/packages/schematics/angular/migrations/update-10/rename-browserslist-config.ts
+++ b/packages/schematics/angular/migrations/update-10/rename-browserslist-config.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 { join } from '@angular-devkit/core';
 import { DirEntry, Rule } from '@angular-devkit/schematics';
 
@@ -27,7 +28,7 @@ function* visit(directory: DirEntry): IterableIterator<string> {
 }
 
 export default function (): Rule {
-  return tree => {
+  return (tree) => {
     for (const path of visit(tree.root)) {
       tree.rename(path, path.replace(/browserslist$/, '.browserslistrc'));
     }
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..581a2f1071a8 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,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 { EmptyTree } from '@angular-devkit/schematics';
 import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
 
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..e65d4a452abf 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
@@ -12,7 +12,7 @@ import { updateWorkspace } from '../../utility/workspace';
 import { Builders, ProjectType } from '../../utility/workspace-models';
 
 export default function (): Rule {
-  return updateWorkspace(workspace => {
+  return updateWorkspace((workspace) => {
     // Remove deprecated CLI root level options
     removeDeprecatedCLIOptions(workspace.extensions);
 
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..0b470af36293 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,14 +1,20 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+
 import { JsonObject } from '@angular-devkit/core';
 import { EmptyTree } from '@angular-devkit/schematics';
 import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
-import { BuilderTarget, Builders, ProjectType, WorkspaceSchema } from '../../utility/workspace-models';
+import {
+  BuilderTarget,
+  Builders,
+  ProjectType,
+  WorkspaceSchema,
+} from '../../utility/workspace-models';
 
 function getBuildTarget(tree: UnitTestTree): BuilderTarget<Builders.Browser, JsonObject> {
   return JSON.parse(tree.readContent('/angular.json')).projects.app.architect.build;
@@ -44,7 +50,7 @@ function createWorkSpaceConfig(tree: UnitTestTree) {
               vendorSourceMap: true,
               evalSourceMap: false,
               buildOptimizer: true,
-              // tslint:disable-next-line:no-any
+              // eslint-disable-next-line @typescript-eslint/no-explicit-any
             } as any,
             configurations: {
               one: {
@@ -64,7 +70,7 @@ function createWorkSpaceConfig(tree: UnitTestTree) {
                 skipAppShell: true,
                 buildOptimizer: true,
               },
-              // tslint:disable-next-line:no-any
+              // eslint-disable-next-line @typescript-eslint/no-explicit-any
             } as any,
           },
         },
diff --git a/packages/schematics/angular/migrations/update-10/update-dependencies.ts b/packages/schematics/angular/migrations/update-10/update-dependencies.ts
index 6c0529f694b6..f6c87c238b95 100644
--- a/packages/schematics/angular/migrations/update-10/update-dependencies.ts
+++ b/packages/schematics/angular/migrations/update-10/update-dependencies.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 { Rule } from '@angular-devkit/schematics';
 import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
-import {
-  addPackageJsonDependency,
-  getPackageJsonDependency,
-} from '../../utility/dependencies';
+import { addPackageJsonDependency, getPackageJsonDependency } from '../../utility/dependencies';
 import { latestVersions } from '../../utility/latest-versions';
 
 export default function (): Rule {
@@ -24,7 +22,7 @@ export default function (): Rule {
       'karma-jasmine': '~4.0.0',
       'karma-jasmine-html-reporter': '^1.5.0',
       'protractor': '~7.0.0',
-      'ng-packagr': latestVersions.ngPackagr,
+      'ng-packagr': latestVersions['ng-packagr'],
       'tslib': '^2.0.0',
     };
 
@@ -63,9 +61,9 @@ export default function (): Rule {
     if (getPackageJsonDependency(host, 'rxjs-compat')) {
       context.logger.info(
         `Package "rxjs-compat" found in the workspace package.json. ` +
-        'This package typically was used during migration from RxJs version 5 to 6 during the Angular 5 ' +
-        'timeframe and may no longer be needed.\n' +
-        'Read more about this: https://rxjs-dev.firebaseapp.com/guide/v6/migration',
+          'This package typically was used during migration from RxJs version 5 to 6 during the Angular 5 ' +
+          'timeframe and may no longer be needed.\n' +
+          'Read more about this: https://rxjs-dev.firebaseapp.com/guide/v6/migration',
       );
     }
   };
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..efe255b16f36 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
@@ -8,13 +8,16 @@
 
 import { join, normalize } from '@angular-devkit/core';
 import { Rule } from '@angular-devkit/schematics';
-import { NodeDependencyType, addPackageJsonDependency, removePackageJsonDependency } from '../../utility/dependencies';
+import {
+  NodeDependencyType,
+  addPackageJsonDependency,
+  removePackageJsonDependency,
+} from '../../utility/dependencies';
 import { getWorkspace } from '../../utility/workspace';
 import { ProjectType } from '../../utility/workspace-models';
 
-
 export default function (): Rule {
-  return async host => {
+  return async (host) => {
     const workspace = await getWorkspace(host);
 
     for (const [, project] of workspace.projects) {
@@ -32,11 +35,15 @@ export default function (): Rule {
       removePackageJsonDependency(host, 'tslib', packageJsonPath);
 
       // Add tslib as a direct dependency
-      addPackageJsonDependency(host, {
-        name: 'tslib',
-        version: '^2.0.0',
-        type: NodeDependencyType.Default,
-      }, packageJsonPath);
+      addPackageJsonDependency(
+        host,
+        {
+          name: 'tslib',
+          version: '^2.0.0',
+          type: NodeDependencyType.Default,
+        },
+        packageJsonPath,
+      );
     }
   };
 }
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..e3eff6cb1abd 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
@@ -40,18 +40,27 @@ describe(`Migration to add tslib as a direct dependency in library projects`, ()
     tree = new UnitTestTree(new EmptyTree());
     createWorkSpaceConfig(tree);
 
-    tree.create('/project/lib/package.json', JSON.stringify({
-      peerDependencies: {
-        '@angular/common': '^9.0.0',
-        '@angular/core': '^9.0.0',
-        'tslib': '1.0.0',
-      },
-    }, undefined, 2));
+    tree.create(
+      '/project/lib/package.json',
+      JSON.stringify(
+        {
+          peerDependencies: {
+            '@angular/common': '^9.0.0',
+            '@angular/core': '^9.0.0',
+            'tslib': '1.0.0',
+          },
+        },
+        undefined,
+        2,
+      ),
+    );
   });
 
   it(`should update tslib to version 2 as a direct dependency`, async () => {
     const newTree = await schematicRunner.runSchematicAsync(schematicName, {}, tree).toPromise();
-    const { peerDependencies, dependencies } = JSON.parse(newTree.readContent('/project/lib/package.json'));
+    const { peerDependencies, dependencies } = JSON.parse(
+      newTree.readContent('/project/lib/package.json'),
+    );
     expect(peerDependencies['tslib']).toBeUndefined();
     expect(dependencies['tslib']).toBe('^2.0.0');
   });
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..0c9c16a11cbc 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,17 +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 { dirname, join, normalize } from '@angular-devkit/core';
 import { Rule, Tree } from '@angular-devkit/schematics';
 import { JSONFile } from '../../utility/json-file';
 import { getWorkspace } from '../../utility/workspace';
 import { Builders } from '../../utility/workspace-models';
 
-
 interface ModuleAndTargetReplamenent {
   oldModule?: string;
   newModule?: string | false;
@@ -40,8 +40,14 @@ export default function (): Rule {
     for (const [, project] of workspace.projects) {
       for (const [, target] of project.targets) {
         // E2E builder doesn't reference a tsconfig but it uses one found in the root folder.
-        if (target.builder === Builders.Protractor && typeof target.options?.protractorConfig === 'string') {
-          const tsConfigPath = join(dirname(normalize(target.options.protractorConfig)), 'tsconfig.json');
+        if (
+          target.builder === Builders.Protractor &&
+          typeof target.options?.protractorConfig === 'string'
+        ) {
+          const tsConfigPath = join(
+            dirname(normalize(target.options.protractorConfig)),
+            'tsconfig.json',
+          );
 
           try {
             updateModuleAndTarget(host, tsConfigPath, {
@@ -60,12 +66,9 @@ export default function (): Rule {
         }
 
         // Update all other known CLI builders that use a tsconfig
-        const tsConfigs = [
-          target.options || {},
-          ...Object.values(target.configurations || {}),
-        ]
-          .filter(opt => typeof opt?.tsConfig === 'string')
-          .map(opt => (opt as { tsConfig: string }).tsConfig);
+        const tsConfigs = [target.options || {}, ...Object.values(target.configurations || {})]
+          .filter((opt) => typeof opt?.tsConfig === 'string')
+          .map((opt) => (opt as { tsConfig: string }).tsConfig);
 
         const uniqueTsConfigs = [...new Set(tsConfigs)];
 
@@ -75,7 +78,7 @@ export default function (): Rule {
 
         switch (target.builder as Builders) {
           case Builders.Server:
-            uniqueTsConfigs.forEach(p => {
+            uniqueTsConfigs.forEach((p) => {
               try {
                 updateModuleAndTarget(host, p, {
                   oldModule: 'commonjs',
@@ -98,9 +101,7 @@ export default function (): Rule {
                 });
               } catch (error) {
                 logger.warn(
-                  `Unable to update '${p}' target option to 'es2016': ${
-                    error.message || error
-                  }`,
+                  `Unable to update '${p}' target option to 'es2016': ${error.message || error}`,
                 );
               }
             });
@@ -108,7 +109,7 @@ export default function (): Rule {
           case Builders.Karma:
           case Builders.Browser:
           case Builders.DeprecatedNgPackagr:
-            uniqueTsConfigs.forEach(p => {
+            uniqueTsConfigs.forEach((p) => {
               try {
                 updateModuleAndTarget(host, p, {
                   oldModule: 'esnext',
@@ -129,14 +130,21 @@ export default function (): Rule {
   };
 }
 
-function updateModuleAndTarget(host: Tree, tsConfigPath: string, replacements: ModuleAndTargetReplamenent) {
+function updateModuleAndTarget(
+  host: Tree,
+  tsConfigPath: string,
+  replacements: ModuleAndTargetReplamenent,
+) {
   const json = new JSONFile(host, tsConfigPath);
 
   const { oldTarget, newTarget, newModule, oldModule } = replacements;
   if (newTarget) {
     const target = json.get(['compilerOptions', 'target']);
 
-    if ((typeof target === 'string' && (!oldTarget || oldTarget === target.toLowerCase())) || !target) {
+    if (
+      (typeof target === 'string' && (!oldTarget || oldTarget === target.toLowerCase())) ||
+      !target
+    ) {
       json.modify(['compilerOptions', 'target'], newTarget);
     }
   }
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 a0a979d3df04..4c06a6b05c35 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,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 { EmptyTree } from '@angular-devkit/schematics';
 import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
 import { parse as parseJson } from 'jsonc-parser';
@@ -22,7 +23,7 @@ describe('Migration to update target and module compiler options', () => {
     tree.create(filePath, JSON.stringify(content, undefined, 2));
   }
 
-  // tslint:disable-next-line: no-any
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   function readJsonFile(tree: UnitTestTree, filePath: string): any {
     return parseJson(tree.readContent(filePath).toString());
   }
@@ -80,7 +81,6 @@ describe('Migration to update target and module compiler options', () => {
     createJsonFile(tree, 'angular.json', angularConfig);
   }
 
-
   let tree: UnitTestTree;
   beforeEach(() => {
     tree = new UnitTestTree(new EmptyTree());
@@ -99,7 +99,9 @@ describe('Migration to update target and module compiler options', () => {
 
     // E2E
     createJsonFile(tree, 'src/e2e/protractor.conf.js', '');
-    createJsonFile(tree, 'src/e2e/tsconfig.json', { compilerOptions: { module: 'commonjs', target: 'es5' } });
+    createJsonFile(tree, 'src/e2e/tsconfig.json', {
+      compilerOptions: { module: 'commonjs', target: 'es5' },
+    });
 
     // Universal
     createJsonFile(tree, 'src/tsconfig.server.json', { compilerOptions: { module: 'commonjs' } });
@@ -144,7 +146,9 @@ describe('Migration to update target and module compiler options', () => {
 
   it(`should update target to es2016 in 'tsconfig.server.json'`, async () => {
     tree.delete('src/tsconfig.server.json');
-    createJsonFile(tree, 'src/tsconfig.server.json', { compilerOptions: { module: 'commonjs', target: 'es5' } });
+    createJsonFile(tree, 'src/tsconfig.server.json', {
+      compilerOptions: { module: 'commonjs', target: 'es5' },
+    });
     const newTree = await schematicRunner.runSchematicAsync(schematicName, {}, tree).toPromise();
     const { target } = readJsonFile(newTree, 'src/tsconfig.server.json').compilerOptions;
     expect(target).toBe('es2016');
diff --git a/packages/schematics/angular/migrations/update-10/update-tslint.ts b/packages/schematics/angular/migrations/update-10/update-tslint.ts
index 23a77a3e2089..82886c0160d1 100644
--- a/packages/schematics/angular/migrations/update-10/update-tslint.ts
+++ b/packages/schematics/angular/migrations/update-10/update-tslint.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 { JsonValue } from '@angular-devkit/core';
 import { Rule } from '@angular-devkit/schematics';
 import { addPackageJsonDependency, getPackageJsonDependency } from '../../utility/dependencies';
@@ -13,10 +14,7 @@ import { JSONFile } from '../../utility/json-file';
 export const TSLINT_VERSION = '~6.1.0';
 const TSLINT_CONFIG_PATH = '/tslint.json';
 
-const RULES_TO_DELETE: string[] = [
-  'no-use-before-declare',
-  'no-unused-variable',
-];
+const RULES_TO_DELETE: string[] = ['no-use-before-declare', 'no-unused-variable'];
 
 const RULES_TO_ADD: Record<string, JsonValue> = {
   align: {
@@ -99,7 +97,7 @@ export default function (): Rule {
     try {
       json = new JSONFile(tree, TSLINT_CONFIG_PATH);
     } catch {
-      const config = ['tslint.js', 'tslint.yaml'].find(c => tree.exists(c));
+      const config = ['tslint.js', 'tslint.yaml'].find((c) => tree.exists(c));
       if (config) {
         logger.warn(`Expected a JSON configuration file but found "${config}".`);
       } else {
@@ -118,10 +116,13 @@ export default function (): Rule {
     // This is because some rules conflict with prettier or other tools.
     const extend = json.get(['extends']);
     if (
-      extend !== 'tslint:recommended' || (Array.isArray(extend) && extend.some(e => e.value !== 'tslint:recommended'))
+      extend !== 'tslint:recommended' ||
+      (Array.isArray(extend) && extend.some((e) => e.value !== 'tslint:recommended'))
     ) {
-      logger.warn(`tslint configuration does not extend "tslint:recommended" or it extends multiple configurations.`
-        + '\nSkipping rule changes as some rules might conflict.');
+      logger.warn(
+        `tslint configuration does not extend "tslint:recommended" or it extends multiple configurations.` +
+          '\nSkipping rule changes as some rules might conflict.',
+      );
 
       return;
     }
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..4bc13acbca2d 100644
--- a/packages/schematics/angular/migrations/update-10/update-tslint_spec.ts
+++ b/packages/schematics/angular/migrations/update-10/update-tslint_spec.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 { EmptyTree } from '@angular-devkit/schematics';
 import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
 import { TSLINT_VERSION } from './update-tslint';
@@ -41,25 +42,33 @@ describe('Migration of tslint to version 6', () => {
   });
 
   it('should update tslint dependency', async () => {
-    const newTree = await schematicRunner.runSchematicAsync('tslint-version-6', {}, tree).toPromise();
+    const newTree = await schematicRunner
+      .runSchematicAsync('tslint-version-6', {}, tree)
+      .toPromise();
     const packageJson = JSON.parse(newTree.readContent(PACKAGE_JSON_PATH));
     expect(packageJson.devDependencies.tslint).toBe(TSLINT_VERSION);
   });
 
   it('should remove old/deprecated rules', async () => {
-    const newTree = await schematicRunner.runSchematicAsync('tslint-version-6', {}, tree).toPromise();
+    const newTree = await schematicRunner
+      .runSchematicAsync('tslint-version-6', {}, tree)
+      .toPromise();
     const { rules } = JSON.parse(newTree.readContent(TSLINT_PATH));
     expect(rules['no-use-before-declare']).toBeUndefined();
   });
 
   it('should add new rules', async () => {
-    const newTree = await schematicRunner.runSchematicAsync('tslint-version-6', {}, tree).toPromise();
+    const newTree = await schematicRunner
+      .runSchematicAsync('tslint-version-6', {}, tree)
+      .toPromise();
     const { rules } = JSON.parse(newTree.readContent(TSLINT_PATH));
     expect(rules['eofline']).toBe(true);
   });
 
   it('should not update already present rules', async () => {
-    const newTree = await schematicRunner.runSchematicAsync('tslint-version-6', {}, tree).toPromise();
+    const newTree = await schematicRunner
+      .runSchematicAsync('tslint-version-6', {}, tree)
+      .toPromise();
     const { rules } = JSON.parse(newTree.readContent(TSLINT_PATH));
     expect(rules['arrow-return-shorthand']).toBe(false);
   });
@@ -67,13 +76,19 @@ describe('Migration of tslint to version 6', () => {
   it(`should not add new rules when not extending 'tslint:recommended'`, async () => {
     tree.overwrite(
       TSLINT_PATH,
-      JSON.stringify({
-        ...TSLINT_CONFIG,
-        extends: 'tslint-config-prettier',
-      }, null, 2),
+      JSON.stringify(
+        {
+          ...TSLINT_CONFIG,
+          extends: 'tslint-config-prettier',
+        },
+        null,
+        2,
+      ),
     );
 
-    const newTree = await schematicRunner.runSchematicAsync('tslint-version-6', {}, tree).toPromise();
+    const newTree = await schematicRunner
+      .runSchematicAsync('tslint-version-6', {}, tree)
+      .toPromise();
     const { rules } = JSON.parse(newTree.readContent(TSLINT_PATH));
     expect(rules['eofline']).toBeUndefined();
   });
@@ -81,16 +96,19 @@ describe('Migration of tslint to version 6', () => {
   it(`should not add new rules when extending multiple configs`, async () => {
     tree.overwrite(
       TSLINT_PATH,
-      JSON.stringify({
-        ...TSLINT_CONFIG,
-        extends: [
-          'tslint:recommended',
-          'tslint-config-prettier',
-        ],
-      }, null, 2),
+      JSON.stringify(
+        {
+          ...TSLINT_CONFIG,
+          extends: ['tslint:recommended', 'tslint-config-prettier'],
+        },
+        null,
+        2,
+      ),
     );
 
-    const newTree = await schematicRunner.runSchematicAsync('tslint-version-6', {}, tree).toPromise();
+    const newTree = await schematicRunner
+      .runSchematicAsync('tslint-version-6', {}, tree)
+      .toPromise();
     const { rules } = JSON.parse(newTree.readContent(TSLINT_PATH));
     expect(rules['eofline']).toBeUndefined();
   });
@@ -98,16 +116,19 @@ describe('Migration of tslint to version 6', () => {
   it(`should remove old/deprecated rules when extending multiple configs`, async () => {
     tree.overwrite(
       TSLINT_PATH,
-      JSON.stringify({
-        ...TSLINT_CONFIG,
-        extends: [
-          'tslint:recommended',
-          'tslint-config-prettier',
-        ],
-      }, null, 2),
+      JSON.stringify(
+        {
+          ...TSLINT_CONFIG,
+          extends: ['tslint:recommended', 'tslint-config-prettier'],
+        },
+        null,
+        2,
+      ),
     );
 
-    const newTree = await schematicRunner.runSchematicAsync('tslint-version-6', {}, tree).toPromise();
+    const newTree = await schematicRunner
+      .runSchematicAsync('tslint-version-6', {}, tree)
+      .toPromise();
     const { rules } = JSON.parse(newTree.readContent(TSLINT_PATH));
     expect(rules['no-use-before-declare']).toBeUndefined();
   });
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..7e9ef1f988d1 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
@@ -12,7 +12,7 @@ import { getWorkspace } from '../../utility/workspace';
 import { Builders } from '../../utility/workspace-models';
 
 export default function (): Rule {
-  return async host => {
+  return async (host) => {
     const workspace = await getWorkspace(host);
 
     for (const [, project] of workspace.projects) {
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..506c1d431b6c 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
@@ -30,7 +30,7 @@ function createWorkSpaceConfig(tree: UnitTestTree) {
                 tsConfig: 'projects/lib/tsconfig.lib.prod.json',
               },
             },
-            // tslint:disable-next-line: no-any
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
           } as any,
         },
       },
@@ -59,7 +59,9 @@ describe(`Migration to add 'declarationMap' compiler option`, () => {
 
   it(`should be added with a value of 'false' in a prod tsconfig`, async () => {
     const newTree = await schematicRunner.runSchematicAsync(schematicName, {}, tree).toPromise();
-    const { compilerOptions } = JSON.parse(newTree.readContent('/projects/lib/tsconfig.lib.prod.json'));
+    const { compilerOptions } = JSON.parse(
+      newTree.readContent('/projects/lib/tsconfig.lib.prod.json'),
+    );
     expect(compilerOptions.declarationMap).toBeFalse();
   });
 
@@ -71,11 +73,18 @@ describe(`Migration to add 'declarationMap' compiler option`, () => {
 
   it('should not be overriden when already set', async () => {
     const tsConfigPath = '/projects/lib/tsconfig.lib.json';
-    tree.overwrite(tsConfigPath, JSON.stringify({
-      compilerOptions: {
-        declarationMap: false,
-      },
-    }, undefined, 2));
+    tree.overwrite(
+      tsConfigPath,
+      JSON.stringify(
+        {
+          compilerOptions: {
+            declarationMap: false,
+          },
+        },
+        undefined,
+        2,
+      ),
+    );
 
     const newTree = await schematicRunner.runSchematicAsync(schematicName, {}, tree).toPromise();
     const { compilerOptions } = JSON.parse(newTree.readContent(tsConfigPath));
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..df8c28b78482 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,20 +1,24 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
 
 import { Rule, chain } from '@angular-devkit/schematics';
-import { NodeDependencyType, addPackageJsonDependency, removePackageJsonDependency } from '../../utility/dependencies';
+import {
+  NodeDependencyType,
+  addPackageJsonDependency,
+  removePackageJsonDependency,
+} from '../../utility/dependencies';
 import { latestVersions } from '../../utility/latest-versions';
 import { updateWorkspace } from '../../utility/workspace';
 import { Builders } from '../../utility/workspace-models';
 
 export default function (): Rule {
   return chain([
-    updateWorkspace(workspace => {
+    updateWorkspace((workspace) => {
       for (const [, project] of workspace.projects) {
         for (const [, target] of project.targets) {
           if (target.builder === Builders.DeprecatedNgPackagr) {
@@ -23,7 +27,7 @@ export default function (): Rule {
         }
       }
     }),
-    host => {
+    (host) => {
       removePackageJsonDependency(host, '@angular-devkit/build-ng-packagr');
       addPackageJsonDependency(host, {
         type: NodeDependencyType.Dev,
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..9472611f2702 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
@@ -22,7 +22,7 @@ function createWorkSpaceConfig(tree: UnitTestTree) {
         architect: {
           build: {
             builder: Builders.DeprecatedNgPackagr,
-          // tslint:disable-next-line: no-any
+            // eslint-disable-next-line @typescript-eslint/no-explicit-any
           } as any,
         },
       },
@@ -44,12 +44,19 @@ describe(`Migration to replace '@angular-devkit/build-ng-packagr' builder`, () =
   beforeEach(() => {
     tree = new UnitTestTree(new EmptyTree());
     createWorkSpaceConfig(tree);
-    tree.create('/package.json', JSON.stringify({
-      devDependencies: {
-        '@angular/compiler-cli': '0.0.0',
-        '@angular-devkit/build-ng-packagr': '0.0.0',
-      },
-    }, undefined, 2));
+    tree.create(
+      '/package.json',
+      JSON.stringify(
+        {
+          devDependencies: {
+            '@angular/compiler-cli': '0.0.0',
+            '@angular-devkit/build-ng-packagr': '0.0.0',
+          },
+        },
+        undefined,
+        2,
+      ),
+    );
   });
 
   it(`should remove '@angular-devkit/build-ng-packagr' from devDependencies`, async () => {
@@ -66,7 +73,9 @@ describe(`Migration to replace '@angular-devkit/build-ng-packagr' builder`, () =
 
   it('should update library builder target', async () => {
     const newTree = await schematicRunner.runSchematicAsync(schematicName, {}, tree).toPromise();
-    const { projects: { lib } } = JSON.parse(newTree.readContent('/angular.json'));
+    const {
+      projects: { lib },
+    } = JSON.parse(newTree.readContent('/angular.json'));
     expect(lib.architect.build.builder).toBe('@angular-devkit/build-angular:ng-packagr');
   });
 });
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 005ed5ec706c..cd10f8fd8851 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
@@ -11,8 +11,7 @@ import { Rule } from '@angular-devkit/schematics';
 import { updateWorkspace } from '../../utility/workspace';
 
 export default function (): Rule {
-  return updateWorkspace(workspace => {
-
+  return updateWorkspace((workspace) => {
     const optionsToRemove: Record<string, undefined> = {
       environment: undefined,
       extractCss: undefined,
@@ -54,8 +53,11 @@ export default function (): Rule {
 type TargetOptions = workspaces.TargetDefinition['options'];
 
 function updateLazyScriptsStyleOption(options: TargetOptions): TargetOptions {
-  function visitor(options: NonNullable<TargetOptions>, type: 'scripts' | 'styles'): JsonArray | undefined {
-    // tslint:disable-next-line: no-non-null-assertion
+  function visitor(
+    options: NonNullable<TargetOptions>,
+    type: 'scripts' | 'styles',
+  ): JsonArray | undefined {
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
     if (!options[type] || !isJsonArray(options[type]!)) {
       return undefined;
     }
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..358db2c8d31c 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,14 +1,20 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+
 import { JsonObject } from '@angular-devkit/core';
 import { EmptyTree } from '@angular-devkit/schematics';
 import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
-import { BuilderTarget, Builders, ProjectType, WorkspaceSchema } from '../../utility/workspace-models';
+import {
+  BuilderTarget,
+  Builders,
+  ProjectType,
+  WorkspaceSchema,
+} from '../../utility/workspace-models';
 
 function getBuildTarget(tree: UnitTestTree): BuilderTarget<Builders.Browser, JsonObject> {
   return JSON.parse(tree.readContent('/angular.json')).projects.app.architect.build;
@@ -27,13 +33,11 @@ function createWorkSpaceConfig(tree: UnitTestTree) {
           build: {
             builder: Builders.Browser,
             options: {
-              scripts: [
-                { lazy: true, name: 'bundle-1.js' },
-              ],
+              scripts: [{ lazy: true, name: 'bundle-1.js' }],
               extractCss: false,
               sourceMaps: true,
               buildOptimizer: false,
-              // tslint:disable-next-line:no-any
+              // eslint-disable-next-line @typescript-eslint/no-explicit-any
             } as any,
             configurations: {
               one: {
@@ -55,7 +59,7 @@ function createWorkSpaceConfig(tree: UnitTestTree) {
                 extractCss: true,
                 aot: true,
               },
-              // tslint:disable-next-line:no-any
+              // eslint-disable-next-line @typescript-eslint/no-explicit-any
             } as any,
           },
         },
@@ -108,8 +112,6 @@ describe(`Migration to update 'angular.json'. ${schematicName}`, () => {
       'bundle-3.css',
     ]);
 
-    expect(options.scripts).toEqual([
-      { inject: false, name: 'bundle-1.js' },
-    ]);
+    expect(options.scripts).toEqual([{ inject: false, name: 'bundle-1.js' }]);
   });
 });
diff --git a/packages/schematics/angular/migrations/update-11/update-dependencies.ts b/packages/schematics/angular/migrations/update-11/update-dependencies.ts
index 1ad1d5c6b9e4..2d84b18daa20 100644
--- a/packages/schematics/angular/migrations/update-11/update-dependencies.ts
+++ b/packages/schematics/angular/migrations/update-11/update-dependencies.ts
@@ -1,17 +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 { Rule } from '@angular-devkit/schematics';
 import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
-import {
-  addPackageJsonDependency,
-  getPackageJsonDependency,
-} from '../../utility/dependencies';
-import { latestVersions } from '../../utility/latest-versions';
+import { addPackageJsonDependency, getPackageJsonDependency } from '../../utility/dependencies';
 
 export default function (): Rule {
   return (host, context) => {
diff --git a/packages/schematics/angular/migrations/update-12/production-default-config.ts b/packages/schematics/angular/migrations/update-12/production-default-config.ts
index 272972b1cda5..6d122248cae2 100644
--- a/packages/schematics/angular/migrations/update-12/production-default-config.ts
+++ b/packages/schematics/angular/migrations/update-12/production-default-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
@@ -12,42 +12,44 @@ import { allTargetOptions, allWorkspaceTargets, updateWorkspace } from '../../ut
 import { Builders } from '../../utility/workspace-models';
 
 export default function (): Rule {
-  return async (_host, context) => updateWorkspace(workspace => {
-    for (const [name, target] of allWorkspaceTargets(workspace)) {
-      let defaultConfiguration: string | undefined;
-
-      // Only interested in 1st party builders
-      switch (target.builder) {
-        case Builders.AppShell:
-        case Builders.Browser:
-        case Builders.Server:
-        case Builders.NgPackagr:
-          defaultConfiguration = 'production';
-          break;
-        case Builders.DevServer:
-        case Builders.Protractor:
-        case '@nguniversal/builders:ssr-dev-server':
-          defaultConfiguration = 'development';
-          break;
-        case Builders.TsLint:
-        case Builders.ExtractI18n:
-        case Builders.Karma:
-          // Nothing to update
-          break;
-        default:
-          context.logger.warn(tags.stripIndents`Cannot update "${name}" target configuration as it's using "${target.builder}"
+  return async (_host, context) =>
+    updateWorkspace((workspace) => {
+      for (const [name, target] of allWorkspaceTargets(workspace)) {
+        let defaultConfiguration: string | undefined;
+
+        // Only interested in 1st party builders
+        switch (target.builder) {
+          case Builders.AppShell:
+          case Builders.Browser:
+          case Builders.Server:
+          case Builders.NgPackagr:
+            defaultConfiguration = 'production';
+            break;
+          case Builders.DevServer:
+          case Builders.Protractor:
+          case '@nguniversal/builders:ssr-dev-server':
+            defaultConfiguration = 'development';
+            break;
+          case Builders.TsLint:
+          case Builders.ExtractI18n:
+          case Builders.Karma:
+            // Nothing to update
+            break;
+          default:
+            context.logger
+              .warn(tags.stripIndents`Cannot update "${name}" target configuration as it's using "${target.builder}"
           which is a third-party builder. This target configuration will require manual review.`);
 
+            continue;
+        }
+
+        if (!defaultConfiguration) {
           continue;
-      }
+        }
 
-      if (!defaultConfiguration) {
-        continue;
+        updateTarget(name, target, context.logger, defaultConfiguration);
       }
-
-      updateTarget(name, target, context.logger, defaultConfiguration);
-    }
-  });
+    });
 }
 
 function getArchitectTargetWithConfig(currentTarget: string, overrideConfig?: string): string {
@@ -67,13 +69,17 @@ function updateTarget(
   }
 
   if (target.configurations?.development) {
-    logger.info(tags.stripIndents`Skipping updating "${targetName}" target configuration as a "development" configuration is already defined.`);
+    logger.info(
+      tags.stripIndents`Skipping updating "${targetName}" target configuration as a "development" configuration is already defined.`,
+    );
 
     return;
   }
 
   if (!target.configurations?.production) {
-    logger.info(tags.stripIndents`Skipping updating "${targetName}" target configuration as a "production" configuration is not defined.`);
+    logger.info(
+      tags.stripIndents`Skipping updating "${targetName}" target configuration as a "production" configuration is not defined.`,
+    );
 
     return;
   }
@@ -87,7 +93,10 @@ function updateTarget(
     if (typeof options.serverTarget === 'string') {
       options.serverTarget = getArchitectTargetWithConfig(options.serverTarget);
       if (!developmentOptions.serverTarget) {
-        developmentOptions.serverTarget = getArchitectTargetWithConfig(options.serverTarget, 'development');
+        developmentOptions.serverTarget = getArchitectTargetWithConfig(
+          options.serverTarget,
+          'development',
+        );
       }
     } else {
       serverTarget = false;
@@ -96,7 +105,10 @@ function updateTarget(
     if (typeof options.browserTarget === 'string') {
       options.browserTarget = getArchitectTargetWithConfig(options.browserTarget);
       if (!developmentOptions.browserTarget) {
-        developmentOptions.browserTarget = getArchitectTargetWithConfig(options.browserTarget, 'development');
+        developmentOptions.browserTarget = getArchitectTargetWithConfig(
+          options.browserTarget,
+          'development',
+        );
       }
     } else {
       browserTarget = false;
@@ -105,7 +117,10 @@ function updateTarget(
     if (typeof options.devServerTarget === 'string') {
       options.devServerTarget = getArchitectTargetWithConfig(options.devServerTarget);
       if (!developmentOptions.devServerTarget) {
-        developmentOptions.devServerTarget = getArchitectTargetWithConfig(options.devServerTarget, 'development');
+        developmentOptions.devServerTarget = getArchitectTargetWithConfig(
+          options.devServerTarget,
+          'development',
+        );
       }
     } else {
       devServerTarget = false;
diff --git a/packages/schematics/angular/migrations/update-12/production-default-config_spec.ts b/packages/schematics/angular/migrations/update-12/production-default-config_spec.ts
index 45076c7d1cc6..53582ff0fc7c 100644
--- a/packages/schematics/angular/migrations/update-12/production-default-config_spec.ts
+++ b/packages/schematics/angular/migrations/update-12/production-default-config_spec.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 { JsonObject } from '@angular-devkit/core';
 import { EmptyTree } from '@angular-devkit/schematics';
 import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
@@ -34,22 +35,19 @@ function createWorkSpaceConfig(tree: UnitTestTree) {
               tsConfig: 'tsconfig.app.json',
               aot: true,
               sourceMap: true,
-              assets: [
-                'src/favicon.ico',
-                'src/assets',
-              ],
-              styles: [
-                'src/styles.css',
-              ],
+              assets: ['src/favicon.ico', 'src/assets'],
+              styles: ['src/styles.css'],
               scripts: [],
             },
             configurations: {
               production: {
                 deployUrl: 'http://cdn.com',
-                fileReplacements: [{
-                  replace: 'src/environments/environment.ts',
-                  with: 'src/environments/environment.prod.ts',
-                }],
+                fileReplacements: [
+                  {
+                    replace: 'src/environments/environment.ts',
+                    with: 'src/environments/environment.prod.ts',
+                  },
+                ],
                 optimization: true,
                 outputHashing: 'all',
                 sourceMap: false,
@@ -58,11 +56,13 @@ function createWorkSpaceConfig(tree: UnitTestTree) {
                 vendorChunk: false,
                 buildOptimizer: true,
                 watch: true,
-                budgets: [{
-                  type: 'initial',
-                  maximumWarning: '2mb',
-                  maximumError: '5mb',
-                }],
+                budgets: [
+                  {
+                    type: 'initial',
+                    maximumWarning: '2mb',
+                    maximumError: '5mb',
+                  },
+                ],
               },
               optimization_sm: {
                 sourceMap: true,
@@ -193,15 +193,19 @@ describe(`Migration to update 'angular.json' configurations to production by def
           vendorChunk: false,
           buildOptimizer: true,
           watch: true,
-          fileReplacements: [{
-            replace: 'src/environments/environment.ts',
-            with: 'src/environments/environment.prod.ts',
-          }],
-          budgets: [{
-            type: 'initial',
-            maximumWarning: '2mb',
-            maximumError: '5mb',
-          }],
+          fileReplacements: [
+            {
+              replace: 'src/environments/environment.ts',
+              with: 'src/environments/environment.prod.ts',
+            },
+          ],
+          budgets: [
+            {
+              type: 'initial',
+              maximumWarning: '2mb',
+              maximumError: '5mb',
+            },
+          ],
         },
         optimization_sm: {
           sourceMap: true,
@@ -266,10 +270,12 @@ describe(`Migration to update 'angular.json' configurations to production by def
       configurations: {
         optimization_sm: { sourceMap: true, optimization: true },
         production: {
-          fileReplacements: [{
-            replace: 'src/environments/environment.ts',
-            with: 'src/environments/environment.prod.ts',
-          }],
+          fileReplacements: [
+            {
+              replace: 'src/environments/environment.ts',
+              with: 'src/environments/environment.prod.ts',
+            },
+          ],
           sourceMap: false,
           optimization: true,
         },
diff --git a/packages/schematics/angular/migrations/update-12/remove-emit-decorator-metadata.ts b/packages/schematics/angular/migrations/update-12/remove-emit-decorator-metadata.ts
index e18fdd163f24..cc4716f1497e 100644
--- a/packages/schematics/angular/migrations/update-12/remove-emit-decorator-metadata.ts
+++ b/packages/schematics/angular/migrations/update-12/remove-emit-decorator-metadata.ts
@@ -1,13 +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 { join } from '@angular-devkit/core';
 import { DirEntry, Rule } from '@angular-devkit/schematics';
 import { JSONFile } from '../../utility/json-file';
+import { allWorkspaceTargets, getWorkspace } from '../../utility/workspace';
 
 function* visitJsonFiles(directory: DirEntry): IterableIterator<string> {
   for (const path of directory.subfiles) {
@@ -28,7 +30,26 @@ function* visitJsonFiles(directory: DirEntry): IterableIterator<string> {
 }
 
 export default function (): Rule {
-  return tree => {
+  return async (tree, { logger }) => {
+    const workspace = await getWorkspace(tree);
+    const hasThirdPartyBuilders = [...allWorkspaceTargets(workspace)].some(([, target]) => {
+      const { builder } = target;
+
+      return !(
+        builder.startsWith('@angular-devkit/build-angular') ||
+        builder.startsWith('@nguniversal/builders')
+      );
+    });
+
+    if (hasThirdPartyBuilders) {
+      logger.warn(
+        'Skipping migration as the workspace uses third-party builders which may ' +
+          'require "emitDecoratorMetadata" TypeScript compiler option.',
+      );
+
+      return;
+    }
+
     for (const path of visitJsonFiles(tree.root)) {
       const content = tree.read(path);
       if (content?.toString().includes('"emitDecoratorMetadata"')) {
diff --git a/packages/schematics/angular/migrations/update-12/remove-emit-decorator-metadata_spec.ts b/packages/schematics/angular/migrations/update-12/remove-emit-decorator-metadata_spec.ts
index 4ffb96faf615..d2a9a7b4207f 100644
--- a/packages/schematics/angular/migrations/update-12/remove-emit-decorator-metadata_spec.ts
+++ b/packages/schematics/angular/migrations/update-12/remove-emit-decorator-metadata_spec.ts
@@ -1,13 +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 { EmptyTree } from '@angular-devkit/schematics';
 import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
 import { parse as parseJson } from 'jsonc-parser';
+import { Builders } from '../../utility/workspace-models';
 
 describe('Migration to remove "emitDecoratorMetadata" compiler option', () => {
   const schematicName = 'remove-emit-decorator-metadata';
@@ -17,7 +19,7 @@ describe('Migration to remove "emitDecoratorMetadata" compiler option', () => {
     require.resolve('../migration-collection.json'),
   );
 
-  // tslint:disable-next-line: no-any
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
   function readJsonFile(tree: UnitTestTree, filePath: string): any {
     return parseJson(tree.readContent(filePath).toString());
   }
@@ -25,15 +27,44 @@ describe('Migration to remove "emitDecoratorMetadata" compiler option', () => {
   let tree: UnitTestTree;
   beforeEach(() => {
     tree = new UnitTestTree(new EmptyTree());
+    tree.create(
+      '/angular.json',
+      JSON.stringify(
+        {
+          version: 1,
+          projects: {
+            app: {
+              root: '',
+              sourceRoot: 'src',
+              prefix: 'app',
+              architect: {
+                browser: {
+                  builder: Builders.Browser,
+                },
+              },
+            },
+          },
+        },
+        undefined,
+        2,
+      ),
+    );
   });
 
   it(`should rename 'emitDecoratorMetadata' when set to false`, async () => {
-    tree.create('/tsconfig.json', JSON.stringify({
-      compilerOptions: {
-        emitDecoratorMetadata: false,
-        strict: true,
-      },
-    }, undefined, 2));
+    tree.create(
+      '/tsconfig.json',
+      JSON.stringify(
+        {
+          compilerOptions: {
+            emitDecoratorMetadata: false,
+            strict: true,
+          },
+        },
+        undefined,
+        2,
+      ),
+    );
 
     const newTree = await schematicRunner.runSchematicAsync(schematicName, {}, tree).toPromise();
     const { compilerOptions } = readJsonFile(newTree, '/tsconfig.json');
@@ -42,12 +73,19 @@ describe('Migration to remove "emitDecoratorMetadata" compiler option', () => {
   });
 
   it(`should rename 'emitDecoratorMetadata' when set to true`, async () => {
-    tree.create('/tsconfig.json', JSON.stringify({
-      compilerOptions: {
-        emitDecoratorMetadata: true,
-        strict: true,
-      },
-    }, undefined, 2));
+    tree.create(
+      '/tsconfig.json',
+      JSON.stringify(
+        {
+          compilerOptions: {
+            emitDecoratorMetadata: true,
+            strict: true,
+          },
+        },
+        undefined,
+        2,
+      ),
+    );
 
     const newTree = await schematicRunner.runSchematicAsync(schematicName, {}, tree).toPromise();
     const { compilerOptions } = readJsonFile(newTree, '/tsconfig.json');
@@ -56,14 +94,62 @@ describe('Migration to remove "emitDecoratorMetadata" compiler option', () => {
   });
 
   it(`should not rename 'emitDecoratorMetadata' when it's not under 'compilerOptions'`, async () => {
-    tree.create('/foo.json', JSON.stringify({
-      options: {
-        emitDecoratorMetadata: true,
-      },
-    }, undefined, 2));
+    tree.create(
+      '/foo.json',
+      JSON.stringify(
+        {
+          options: {
+            emitDecoratorMetadata: true,
+          },
+        },
+        undefined,
+        2,
+      ),
+    );
 
     const newTree = await schematicRunner.runSchematicAsync(schematicName, {}, tree).toPromise();
     const { options } = readJsonFile(newTree, '/foo.json');
     expect(options['emitDecoratorMetadata']).toBeTrue();
   });
+
+  it(`should not remove 'emitDecoratorMetadata' when one of the builders is a third-party`, async () => {
+    tree.create(
+      '/tsconfig.json',
+      JSON.stringify(
+        {
+          compilerOptions: {
+            emitDecoratorMetadata: true,
+            strict: true,
+          },
+        },
+        undefined,
+        2,
+      ),
+    );
+    tree.overwrite(
+      '/angular.json',
+      JSON.stringify(
+        {
+          version: 1,
+          projects: {
+            app: {
+              root: '',
+              sourceRoot: 'src',
+              prefix: 'app',
+              architect: {
+                browser: {
+                  builder: '@nrwl/jest',
+                },
+              },
+            },
+          },
+        },
+        undefined,
+        2,
+      ),
+    );
+    const newTree = await schematicRunner.runSchematicAsync(schematicName, {}, tree).toPromise();
+    const { compilerOptions } = readJsonFile(newTree, '/tsconfig.json');
+    expect(compilerOptions['emitDecoratorMetadata']).toBeTrue();
+  });
 });
diff --git a/packages/schematics/angular/migrations/update-12/replace-prod-flag.ts b/packages/schematics/angular/migrations/update-12/replace-prod-flag.ts
new file mode 100644
index 000000000000..f70f3961f72e
--- /dev/null
+++ b/packages/schematics/angular/migrations/update-12/replace-prod-flag.ts
@@ -0,0 +1,30 @@
+/**
+ * @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 { JSONFile } from '../../utility/json-file';
+
+export default function (): Rule {
+  return (tree) => {
+    const file = new JSONFile(tree, 'package.json');
+    const scripts = file.get(['scripts']);
+    if (!scripts || typeof scripts !== 'object') {
+      return;
+    }
+
+    // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+    const updatedScripts = Object.entries(scripts!).map(([key, value]) => [
+      key,
+      typeof value === 'string'
+        ? value.replace(/ --prod(?!\w)/g, ' --configuration production')
+        : value,
+    ]);
+
+    file.modify(['scripts'], Object.fromEntries(updatedScripts));
+  };
+}
diff --git a/packages/schematics/angular/migrations/update-12/replace-prod-flag_spec.ts b/packages/schematics/angular/migrations/update-12/replace-prod-flag_spec.ts
new file mode 100644
index 000000000000..a482d675326c
--- /dev/null
+++ b/packages/schematics/angular/migrations/update-12/replace-prod-flag_spec.ts
@@ -0,0 +1,74 @@
+/**
+ * @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 { EmptyTree } from '@angular-devkit/schematics';
+import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
+
+describe(`Migration to replace '--prod' flag from package.json scripts`, () => {
+  const pkgJsonPath = '/package.json';
+  const schematicName = 'replace-deprecated-prod-flag';
+
+  const schematicRunner = new SchematicTestRunner(
+    'migrations',
+    require.resolve('../migration-collection.json'),
+  );
+
+  let tree: UnitTestTree;
+
+  beforeEach(async () => {
+    tree = new UnitTestTree(new EmptyTree());
+  });
+
+  it(`should replace '--prod' with '--configuration production'`, async () => {
+    tree.create(
+      pkgJsonPath,
+      JSON.stringify(
+        {
+          scripts: {
+            build: 'ng build --prod',
+            test: 'ng test --prod && ng e2e --prod',
+          },
+        },
+        undefined,
+        2,
+      ),
+    );
+    const tree2 = await schematicRunner
+      .runSchematicAsync(schematicName, {}, tree.branch())
+      .toPromise();
+
+    const { scripts } = JSON.parse(tree2.readContent(pkgJsonPath));
+    expect(scripts).toEqual({
+      build: 'ng build --configuration production',
+      test: 'ng test --configuration production && ng e2e --configuration production',
+    });
+  });
+
+  it(`should not replace flags that start with '--prod...'`, async () => {
+    tree.create(
+      pkgJsonPath,
+      JSON.stringify(
+        {
+          scripts: {
+            test: 'npx test --production && ng e2e --prod',
+          },
+        },
+        undefined,
+        2,
+      ),
+    );
+    const tree2 = await schematicRunner
+      .runSchematicAsync(schematicName, {}, tree.branch())
+      .toPromise();
+
+    const { scripts } = JSON.parse(tree2.readContent(pkgJsonPath));
+    expect(scripts).toEqual({
+      test: 'npx test --production && ng e2e --configuration production',
+    });
+  });
+});
diff --git a/packages/schematics/angular/migrations/update-12/schematic-options.ts b/packages/schematics/angular/migrations/update-12/schematic-options.ts
new file mode 100644
index 000000000000..50870ef2be64
--- /dev/null
+++ b/packages/schematics/angular/migrations/update-12/schematic-options.ts
@@ -0,0 +1,41 @@
+/**
+ * @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 { json } from '@angular-devkit/core';
+import { Rule } from '@angular-devkit/schematics';
+import { updateWorkspace } from '../../utility/workspace';
+
+export default function (): Rule {
+  return updateWorkspace((workspace) => {
+    // Update root level schematics options if present
+    const rootSchematics = workspace.extensions.schematics;
+    if (rootSchematics && json.isJsonObject(rootSchematics)) {
+      updateSchematicsField(rootSchematics);
+    }
+
+    // Update project level schematics options if present
+    for (const [, project] of workspace.projects) {
+      const projectSchematics = project.extensions.schematics;
+      if (projectSchematics && json.isJsonObject(projectSchematics)) {
+        updateSchematicsField(projectSchematics);
+      }
+    }
+  });
+}
+
+function updateSchematicsField(schematics: json.JsonObject): void {
+  for (const [schematicName, schematicOptions] of Object.entries(schematics)) {
+    if (!json.isJsonObject(schematicOptions)) {
+      continue;
+    }
+
+    if (schematicName === '@schematics/angular:module') {
+      delete schematicOptions.skipTests;
+    }
+  }
+}
diff --git a/packages/schematics/angular/migrations/update-12/schematic-options_spec.ts b/packages/schematics/angular/migrations/update-12/schematic-options_spec.ts
new file mode 100644
index 000000000000..f9891f62a367
--- /dev/null
+++ b/packages/schematics/angular/migrations/update-12/schematic-options_spec.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 { EmptyTree } from '@angular-devkit/schematics';
+import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
+
+describe('Migration to remove schematics old options in angular.json', () => {
+  const workspacePath = '/angular.json';
+  const schematicName = 'schematic-options-12';
+
+  const schematicRunner = new SchematicTestRunner(
+    'migrations',
+    require.resolve('../migration-collection.json'),
+  );
+
+  let tree: UnitTestTree;
+
+  beforeEach(async () => {
+    tree = new UnitTestTree(new EmptyTree());
+    tree = await schematicRunner
+      .runExternalSchematicAsync(
+        require.resolve('../../collection.json'),
+        'ng-new',
+        {
+          name: 'migration-test',
+          version: '1.2.3',
+          directory: '.',
+        },
+        tree,
+      )
+      .toPromise();
+  });
+
+  describe('schematic options', () => {
+    it('should remove `skipTests` from `@schematics/angular:module`', async () => {
+      const workspace = JSON.parse(tree.readContent(workspacePath));
+      workspace.schematics = {
+        '@schematics/angular:module': {
+          skipTests: true,
+        },
+      };
+      tree.overwrite(workspacePath, JSON.stringify(workspace, undefined, 2));
+
+      const tree2 = await schematicRunner
+        .runSchematicAsync(schematicName, {}, tree.branch())
+        .toPromise();
+      const { schematics } = JSON.parse(tree2.readContent(workspacePath));
+      expect(schematics['@schematics/angular:module'].skipTests).toBeUndefined();
+    });
+
+    it('should not remove `skipTests` from non `@schematics/angular:module` schematic', async () => {
+      const workspace = JSON.parse(tree.readContent(workspacePath));
+      workspace.schematics = {
+        '@schematics/angular:component': {
+          skipTests: true,
+        },
+        '@schematics/some-other:module': {
+          skipTests: true,
+        },
+      };
+      tree.overwrite(workspacePath, JSON.stringify(workspace, undefined, 2));
+
+      const tree2 = await schematicRunner
+        .runSchematicAsync(schematicName, {}, tree.branch())
+        .toPromise();
+      const { schematics } = JSON.parse(tree2.readContent(workspacePath));
+      expect(schematics['@schematics/angular:component'].skipTests).toBeTrue();
+      expect(schematics['@schematics/some-other:module'].skipTests).toBeTrue();
+    });
+  });
+});
diff --git a/packages/schematics/angular/migrations/update-12/update-angular-config.ts b/packages/schematics/angular/migrations/update-12/update-angular-config.ts
index 4c0001f77f81..d9e91ea64ea2 100644
--- a/packages/schematics/angular/migrations/update-12/update-angular-config.ts
+++ b/packages/schematics/angular/migrations/update-12/update-angular-config.ts
@@ -1,25 +1,103 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of 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, tags, workspaces } from '@angular-devkit/core';
 import { Rule } from '@angular-devkit/schematics';
 import { allTargetOptions, allWorkspaceTargets, updateWorkspace } from '../../utility/workspace';
 
+type BuilderOptionsType = Readonly<
+  [optionName: string, oldDefault: JsonValue | undefined, newDefault: JsonValue | undefined][]
+>;
+
+const BrowserBuilderOptions: BuilderOptionsType = [
+  ['aot', false, true],
+  ['vendorChunk', true, false],
+  ['extractLicenses', false, true],
+  ['buildOptimizer', false, true],
+  ['sourceMap', true, false],
+  ['optimization', false, true],
+  ['namedChunks', true, false],
+];
+
+const ServerBuilderOptions: BuilderOptionsType = [
+  ['sourceMap', true, false],
+  ['optimization', false, true],
+];
+
 export default function (): Rule {
-  return updateWorkspace(workspace => {
-    for (const [, target] of allWorkspaceTargets(workspace)) {
-      if (!target.builder.startsWith('@angular-devkit/build-angular')) {
-        continue;
-      }
+  return (_tree, context) =>
+    updateWorkspace((workspace) => {
+      for (const [targetName, target, projectName] of allWorkspaceTargets(workspace)) {
+        if (
+          !target.builder.startsWith('@angular-devkit/') &&
+          !target.builder.startsWith('@nguniversal/')
+        ) {
+          context.logger.warn(tags.stripIndent`
+            "${targetName}" target in "${projectName}" project is using a third-party builder.
+            You may need to adjust the options to retain the existing behavior.
+            For more information, see the breaking changes section within the release notes: https://github.com/angular/angular-cli/releases/tag/v12.0.0
+          `);
 
-      for (const [, options] of allTargetOptions(target)) {
-        delete options.experimentalRollupPass;
-        delete options.lazyModules;
+          continue;
+        }
+
+        // Only interested in Angular Devkit browser and server builders
+        switch (target.builder) {
+          case '@angular-devkit/build-angular:server':
+            updateOptions(target, ServerBuilderOptions);
+            break;
+          case '@angular-devkit/build-angular:browser':
+            updateOptions(target, BrowserBuilderOptions);
+            break;
+        }
+
+        for (const [, options] of allTargetOptions(target)) {
+          delete options.experimentalRollupPass;
+          delete options.lazyModules;
+          delete options.forkTypeChecker;
+        }
       }
+    });
+}
+
+function updateOptions(
+  target: workspaces.TargetDefinition,
+  optionsToUpdate: typeof ServerBuilderOptions | typeof BrowserBuilderOptions,
+): void {
+  // This is a hacky way to make this migration idempotent.
+  // `defaultConfiguration` was only introduced in v12 projects and hence v11 projects do not have this property.
+  // Setting it as an empty string will not cause any side-effect.
+  if (typeof target.defaultConfiguration === 'string') {
+    return;
+  }
+
+  target.defaultConfiguration = '';
+
+  if (!target.options) {
+    target.options = {};
+  }
+
+  const configurationOptions = target.configurations && Object.values(target.configurations);
+
+  for (const [optionName, oldDefault, newDefault] of optionsToUpdate) {
+    let value = target.options[optionName];
+    if (value === newDefault) {
+      // Value is same as new default
+      delete target.options[optionName];
+    } else if (value === undefined) {
+      // Value is not defined, hence the default in the builder was used.
+      target.options[optionName] = oldDefault;
+      value = oldDefault;
     }
-  });
+
+    // Remove overrides in configurations which are no longer needed.
+    configurationOptions
+      ?.filter((o) => o && o[optionName] === value)
+      .forEach((o) => o && delete o[optionName]);
+  }
 }
diff --git a/packages/schematics/angular/migrations/update-12/update-angular-config_spec.ts b/packages/schematics/angular/migrations/update-12/update-angular-config_spec.ts
index b3cc6f6c3374..0cabc91fa6b4 100644
--- a/packages/schematics/angular/migrations/update-12/update-angular-config_spec.ts
+++ b/packages/schematics/angular/migrations/update-12/update-angular-config_spec.ts
@@ -1,14 +1,20 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
+
 import { JsonObject } from '@angular-devkit/core';
 import { EmptyTree } from '@angular-devkit/schematics';
 import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
-import { BuilderTarget, Builders, ProjectType, WorkspaceSchema } from '../../utility/workspace-models';
+import {
+  BuilderTarget,
+  Builders,
+  ProjectType,
+  WorkspaceSchema,
+} from '../../utility/workspace-models';
 
 function getBuildTarget(tree: UnitTestTree): BuilderTarget<Builders.Browser, JsonObject> {
   return JSON.parse(tree.readContent('/angular.json')).projects.app.architect.build;
@@ -27,35 +33,23 @@ function createWorkSpaceConfig(tree: UnitTestTree) {
           build: {
             builder: Builders.Browser,
             options: {
-              scripts: [
-                { lazy: true, name: 'bundle-1.js' },
-              ],
+              aot: true,
+              optimization: true,
               experimentalRollupPass: false,
-              sourceMaps: true,
               buildOptimizer: false,
-              // tslint:disable-next-line:no-any
+              namedChunks: true,
+              // eslint-disable-next-line @typescript-eslint/no-explicit-any
             } as any,
             configurations: {
               one: {
                 aot: true,
-                scripts: [
-                  { lazy: true, name: 'bundle-1.js' },
-                  { lazy: false, name: 'bundle-2.js' },
-                  { inject: true, name: 'bundle-3.js' },
-                  'bundle-4.js',
-                ],
-                styles: [
-                  { lazy: true, name: 'bundle-1.css' },
-                  { lazy: false, name: 'bundle-2.css' },
-                  { inject: true, name: 'bundle-3.css' },
-                  'bundle-3.css',
-                ],
               },
               two: {
                 experimentalRollupPass: true,
-                aot: true,
+                aot: false,
+                optimization: false,
               },
-              // tslint:disable-next-line:no-any
+              // eslint-disable-next-line @typescript-eslint/no-explicit-any
             } as any,
           },
         },
@@ -85,9 +79,62 @@ describe(`Migration to update 'angular.json'. ${schematicName}`, () => {
     const { options, configurations } = getBuildTarget(newTree);
 
     expect(options.experimentalRollupPass).toBeUndefined();
-    expect(options.sourceMaps).toBeTrue();
+    expect(options.buildOptimizer).toBeFalse();
     expect(configurations).toBeDefined();
     expect(configurations?.one.experimentalRollupPass).toBeUndefined();
     expect(configurations?.two.experimentalRollupPass).toBeUndefined();
   });
+
+  it(`should remove value from "options" section which value is now the new default`, async () => {
+    const newTree = await schematicRunner.runSchematicAsync(schematicName, {}, tree).toPromise();
+    const { options, configurations } = getBuildTarget(newTree);
+
+    expect(options.aot).toBeUndefined();
+    expect(configurations?.one.aot).toBeUndefined();
+    expect(configurations?.two.aot).toBeFalse();
+  });
+
+  it(`should remove value from "configuration" section when value is the same as that of "options"`, async () => {
+    const newTree = await schematicRunner.runSchematicAsync(schematicName, {}, tree).toPromise();
+    const { options, configurations } = getBuildTarget(newTree);
+
+    expect(options.aot).toBeUndefined();
+    expect(configurations?.one.aot).toBeUndefined();
+    expect(configurations?.two.aot).toBeFalse();
+  });
+
+  it(`should add value in "options" section when option was not defined`, async () => {
+    const newTree = await schematicRunner.runSchematicAsync(schematicName, {}, tree).toPromise();
+    const { options, configurations } = getBuildTarget(newTree);
+
+    expect(options.sourceMap).toBeTrue();
+    expect(configurations?.one.sourceMap).toBeUndefined();
+    expect(configurations?.two.sourceMap).toBeUndefined();
+    expect(configurations?.two.optimization).toBeFalse();
+  });
+
+  it(`should not remove value in "options" when value is not the new default`, async () => {
+    const newTree = await schematicRunner.runSchematicAsync(schematicName, {}, tree).toPromise();
+    const { options } = getBuildTarget(newTree);
+
+    expect(options.namedChunks).toBeTrue();
+    expect(options.buildOptimizer).toBeFalse();
+  });
+
+  it('migration should be idempotent', async () => {
+    const { options } = getBuildTarget(tree);
+    expect(options.aot).toBeTrue();
+
+    // First run
+    const newTree1 = await schematicRunner.runSchematicAsync(schematicName, {}, tree).toPromise();
+    const { options: options1 } = getBuildTarget(newTree1);
+    expect(options1.aot).toBeUndefined();
+
+    // Second run
+    const newTree2 = await schematicRunner
+      .runSchematicAsync(schematicName, {}, newTree1)
+      .toPromise();
+    const { options: options2 } = getBuildTarget(newTree2);
+    expect(options2.aot).toBeUndefined();
+  });
 });
diff --git a/packages/schematics/angular/migrations/update-12/update-lazy-module-paths.ts b/packages/schematics/angular/migrations/update-12/update-lazy-module-paths.ts
index b812ec2a5e36..74ee406cbfba 100644
--- a/packages/schematics/angular/migrations/update-12/update-lazy-module-paths.ts
+++ b/packages/schematics/angular/migrations/update-12/update-lazy-module-paths.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 { DirEntry, Rule, UpdateRecorder } from '@angular-devkit/schematics';
 import * as ts from '../../third_party/github.com/Microsoft/TypeScript/lib/typescript';
 
@@ -37,16 +38,18 @@ function* visit(directory: DirEntry): IterableIterator<ts.SourceFile> {
   }
 }
 
-export default function(): Rule {
-  return tree => {
+export default function (): Rule {
+  return (tree) => {
     for (const sourceFile of visit(tree.root)) {
       let recorder: UpdateRecorder | undefined;
 
       ts.forEachChild(sourceFile, function analyze(node) {
-        if (ts.isPropertyAssignment(node) &&
-            (ts.isIdentifier(node.name) || ts.isStringLiteral(node.name)) &&
-            node.name.text === 'loadChildren' &&
-            ts.isStringLiteral(node.initializer)) {
+        if (
+          ts.isPropertyAssignment(node) &&
+          (ts.isIdentifier(node.name) || ts.isStringLiteral(node.name)) &&
+          node.name.text === 'loadChildren' &&
+          ts.isStringLiteral(node.initializer)
+        ) {
           const valueNode = node.initializer;
           const parts = valueNode.text.split('#');
           const path = parts[0];
@@ -60,9 +63,7 @@ export default function(): Rule {
 
           const index = valueNode.getStart();
           const length = valueNode.getWidth();
-          recorder
-            .remove(index, length)
-            .insertLeft(index, fix);
+          recorder.remove(index, length).insertLeft(index, fix);
         }
 
         ts.forEachChild(node, analyze);
diff --git a/packages/schematics/angular/migrations/update-12/update-lazy-module-paths_spec.ts b/packages/schematics/angular/migrations/update-12/update-lazy-module-paths_spec.ts
index 85cd77e49adb..57baa0b43ac9 100644
--- a/packages/schematics/angular/migrations/update-12/update-lazy-module-paths_spec.ts
+++ b/packages/schematics/angular/migrations/update-12/update-lazy-module-paths_spec.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 { normalize, virtualFs } from '@angular-devkit/core';
 import { EmptyTree } from '@angular-devkit/schematics';
 import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
@@ -57,7 +58,8 @@ describe('Migration to version 8', () => {
 
       expect(routes).not.toContain('./lazy/lazy.module#LazyModule');
       expect(routes).toContain(
-        `loadChildren: () => import('./lazy/lazy.module').then(m => m.LazyModule)`);
+        `loadChildren: () => import('./lazy/lazy.module').then(m => m.LazyModule)`,
+      );
     });
 
     it('should replace the module path string in a child path', async () => {
@@ -71,7 +73,8 @@ describe('Migration to version 8', () => {
       expect(routes).not.toContain('./lazy/lazy.module#LazyModule');
 
       expect(routes).toContain(
-        `loadChildren: () => import('./lazy/lazy.module').then(m => m.LazyModule)`);
+        `loadChildren: () => import('./lazy/lazy.module').then(m => m.LazyModule)`,
+      );
     });
 
     it('should replace the module path string when file has BOM', async () => {
@@ -84,8 +87,8 @@ describe('Migration to version 8', () => {
 
       expect(routes).not.toContain('./lazy/lazy.module#LazyModule');
       expect(routes).toContain(
-        `loadChildren: () => import('./lazy/lazy.module').then(m => m.LazyModule)`);
+        `loadChildren: () => import('./lazy/lazy.module').then(m => m.LazyModule)`,
+      );
     });
-
   });
 });
diff --git a/packages/schematics/angular/migrations/update-12/update-web-workers.ts b/packages/schematics/angular/migrations/update-12/update-web-workers.ts
index bd931801f5d1..cbe0ee5b9390 100644
--- a/packages/schematics/angular/migrations/update-12/update-web-workers.ts
+++ b/packages/schematics/angular/migrations/update-12/update-web-workers.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 { DirEntry, Rule, UpdateRecorder } from '@angular-devkit/schematics';
 import * as ts from '../../third_party/github.com/Microsoft/TypeScript/lib/typescript';
 
diff --git a/packages/schematics/angular/migrations/update-12/update-web-workers_spec.ts b/packages/schematics/angular/migrations/update-12/update-web-workers_spec.ts
index 57fa139a857f..10070fb97471 100644
--- a/packages/schematics/angular/migrations/update-12/update-web-workers_spec.ts
+++ b/packages/schematics/angular/migrations/update-12/update-web-workers_spec.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 { EmptyTree } from '@angular-devkit/schematics';
 import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
 
@@ -74,9 +75,7 @@ describe('Migration to update Web Workers for Webpack 5', () => {
     const consumer = tree.readContent(workerConsumerPath);
 
     expect(consumer).toContain(`new Worker('./app/app.worker'`);
-    expect(consumer).not.toContain(
-      `new Worker(new URL('42', import.meta.url), { type: 'xyz' });`,
-    );
+    expect(consumer).not.toContain(`new Worker(new URL('42', import.meta.url), { type: 'xyz' });`);
   });
 
   it('should replace the module path string when file has BOM', async () => {
diff --git a/packages/schematics/angular/migrations/update-12/update-zonejs.ts b/packages/schematics/angular/migrations/update-12/update-zonejs.ts
index 7b710cc88d71..41def83155ae 100644
--- a/packages/schematics/angular/migrations/update-12/update-zonejs.ts
+++ b/packages/schematics/angular/migrations/update-12/update-zonejs.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 { join } from '@angular-devkit/core';
 import { DirEntry, Rule } from '@angular-devkit/schematics';
 import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
@@ -64,26 +65,25 @@ export default function (): Rule {
       // - require('zone.js/dist/zone-error') -> require('zone.js/plugins/zone-error')
       tree.overwrite(
         path,
-        content
-          .replace(
-            /(?<=(?:require\s*\(|import\s+)['"]zone\.js)\/dist\/zone-?\w*(?=['"]\)?)/g,
-            match => {
-              switch (match) {
-                case '/dist/zone':
-                case '/dist/zone-evergreen':
-                  return '';
-                case '/dist/zone-testing':
-                case '/dist/zone-evergreen-testing':
-                  return '/testing';
-                case '/dist/zone-node':
-                  return '/node';
-                case '/dist/zone-mix':
-                  return '/mix';
-                default:
-                  return `/plugins${match.substr(5)}`;
-              }
-            },
-          ),
+        content.replace(
+          /(?<=(?:require\s*\(|import\s+)['"]zone\.js)\/dist\/zone-?\w*(?=['"]\)?)/g,
+          (match) => {
+            switch (match) {
+              case '/dist/zone':
+              case '/dist/zone-evergreen':
+                return '';
+              case '/dist/zone-testing':
+              case '/dist/zone-evergreen-testing':
+                return '/testing';
+              case '/dist/zone-node':
+                return '/node';
+              case '/dist/zone-mix':
+                return '/mix';
+              default:
+                return `/plugins${match.substr(5)}`;
+            }
+          },
+        ),
       );
     }
   };
diff --git a/packages/schematics/angular/migrations/update-12/update-zonejs_spec.ts b/packages/schematics/angular/migrations/update-12/update-zonejs_spec.ts
index c5f5614fef71..10fff9a10b4b 100644
--- a/packages/schematics/angular/migrations/update-12/update-zonejs_spec.ts
+++ b/packages/schematics/angular/migrations/update-12/update-zonejs_spec.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 { EmptyTree } from '@angular-devkit/schematics';
 import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
 import { getPackageJsonDependency } from '../../utility/dependencies';
@@ -19,7 +20,10 @@ describe(`Migration to update 'zone.js' to 0.11.x. ${schematicName}`, () => {
   let tree: UnitTestTree;
   beforeEach(() => {
     tree = new UnitTestTree(new EmptyTree());
-    tree.create('/package.json', JSON.stringify({ 'dependencies': { 'zone.js': '~0.10.0' } }, undefined, 2));
+    tree.create(
+      '/package.json',
+      JSON.stringify({ 'dependencies': { 'zone.js': '~0.10.0' } }, undefined, 2),
+    );
   });
 
   it(`should update 'zone.js' dependency in 'package.json'`, async () => {
@@ -28,12 +32,15 @@ describe(`Migration to update 'zone.js' to 0.11.x. ${schematicName}`, () => {
   });
 
   it(`should update 'zone.js/dist/zone' import`, async () => {
-    tree.create('file.ts', `
+    tree.create(
+      'file.ts',
+      `
       import 'zone.js';
       import 'zone.js/dist/zone';
       import "zone.js/dist/zone";
       // import "zone.js/dist/zone";
-    `);
+    `,
+    );
 
     const newTree = await schematicRunner.runSchematicAsync(schematicName, {}, tree).toPromise();
     expect(newTree.readContent('file.ts')).toBe(`
@@ -45,12 +52,15 @@ describe(`Migration to update 'zone.js' to 0.11.x. ${schematicName}`, () => {
   });
 
   it(`should update 'zone.js/dist/zone' require`, async () => {
-    tree.create('file.ts', `
+    tree.create(
+      'file.ts',
+      `
       require('zone.js');
       require('zone.js/dist/zone');
       require("zone.js/dist/zone");
       // require("zone.js/dist/zone");
-    `);
+    `,
+    );
 
     const newTree = await schematicRunner.runSchematicAsync(schematicName, {}, tree).toPromise();
     expect(newTree.readContent('file.ts')).toBe(`
@@ -62,12 +72,15 @@ describe(`Migration to update 'zone.js' to 0.11.x. ${schematicName}`, () => {
   });
 
   it(`should update 'zone.js/dist/zone-error' import`, async () => {
-    tree.create('file.ts', `
+    tree.create(
+      'file.ts',
+      `
       import 'zone.js/plugins/zone-error';
       import 'zone.js/dist/zone-error';
       import "zone.js/dist/zone-error";
       // import "zone.js/dist/zone-error";
-    `);
+    `,
+    );
 
     const newTree = await schematicRunner.runSchematicAsync(schematicName, {}, tree).toPromise();
     expect(newTree.readContent('file.ts')).toBe(`
@@ -79,12 +92,15 @@ describe(`Migration to update 'zone.js' to 0.11.x. ${schematicName}`, () => {
   });
 
   it(`should update 'zone.js/dist/zone-error' require`, async () => {
-    tree.create('file.ts', `
+    tree.create(
+      'file.ts',
+      `
       require('zone.js/plugins/zone-error');
       require('zone.js/dist/zone-error');
       require("zone.js/dist/zone-error");
       // require("zone.js/dist/zone-error");
-    `);
+    `,
+    );
 
     const newTree = await schematicRunner.runSchematicAsync(schematicName, {}, tree).toPromise();
     expect(newTree.readContent('file.ts')).toBe(`
@@ -96,12 +112,15 @@ describe(`Migration to update 'zone.js' to 0.11.x. ${schematicName}`, () => {
   });
 
   it(`should update 'zone.js/dist/zone-testing' import`, async () => {
-    tree.create('file.ts', `
+    tree.create(
+      'file.ts',
+      `
       import 'zone.js/testing';
       import 'zone.js/dist/zone-testing';
       import "zone.js/dist/zone-testing";
       // import "zone.js/dist/zone-testing";
-    `);
+    `,
+    );
 
     const newTree = await schematicRunner.runSchematicAsync(schematicName, {}, tree).toPromise();
     expect(newTree.readContent('file.ts')).toBe(`
@@ -113,12 +132,15 @@ describe(`Migration to update 'zone.js' to 0.11.x. ${schematicName}`, () => {
   });
 
   it(`should update 'zone.js/dist/zone-testing' require`, async () => {
-    tree.create('file.ts', `
+    tree.create(
+      'file.ts',
+      `
       require('zone.js/testing');
       require('zone.js/dist/zone-testing');
       require("zone.js/dist/zone-testing");
       // require("zone.js/dist/zone-testing");
-    `);
+    `,
+    );
 
     const newTree = await schematicRunner.runSchematicAsync(schematicName, {}, tree).toPromise();
     expect(newTree.readContent('file.ts')).toBe(`
diff --git a/packages/schematics/angular/migrations/update-9/add-tslib.ts b/packages/schematics/angular/migrations/update-9/add-tslib.ts
index ca4eca9fa776..3c57cfe79eef 100644
--- a/packages/schematics/angular/migrations/update-9/add-tslib.ts
+++ b/packages/schematics/angular/migrations/update-9/add-tslib.ts
@@ -1,16 +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 { Rule } from '@angular-devkit/schematics';
-import { NodeDependencyType, addPackageJsonDependency, getPackageJsonDependency, removePackageJsonDependency } from '../../utility/dependencies';
+import {
+  NodeDependencyType,
+  addPackageJsonDependency,
+  getPackageJsonDependency,
+  removePackageJsonDependency,
+} from '../../utility/dependencies';
 import { latestVersions } from '../../utility/latest-versions';
 
 export function addTsLib(): Rule {
-  return host => {
+  return (host) => {
     const tslibDep = getPackageJsonDependency(host, 'tslib');
 
     if (tslibDep && tslibDep.type !== NodeDependencyType.Default) {
@@ -19,7 +25,7 @@ export function addTsLib(): Rule {
 
     addPackageJsonDependency(host, {
       name: 'tslib',
-      version: latestVersions.TsLib,
+      version: latestVersions['tslib'],
       type: NodeDependencyType.Default,
       overwrite: true,
     });
diff --git a/packages/schematics/angular/migrations/update-9/index.ts b/packages/schematics/angular/migrations/update-9/index.ts
index 174ec88d9a74..890531502249 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
@@ -18,7 +18,7 @@ import { updateI18nConfig } from './update-i18n';
 import { updateServerMainFile } from './update-server-main-file';
 import { updateWorkspaceConfig } from './update-workspace-config';
 
-export default function(): Rule {
+export default function (): Rule {
   return () => {
     return chain([
       updateWorkspaceConfig(),
@@ -31,7 +31,7 @@ export default function(): Rule {
       removeTsickle(),
       addTsLib(),
       (tree, context) => {
-        const packageChanges = tree.actions.some(a => a.path.endsWith('/package.json'));
+        const packageChanges = tree.actions.some((a) => a.path.endsWith('/package.json'));
         if (packageChanges) {
           context.addTask(new NodePackageInstallTask());
         }
diff --git a/packages/schematics/angular/migrations/update-9/ivy-libraries.ts b/packages/schematics/angular/migrations/update-9/ivy-libraries.ts
index 1a84d3e25ae3..8e71cbda2fad 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
@@ -20,7 +20,7 @@ import { Builders } from '../../utility/workspace-models';
  * - Create a prod tsconfig for which disables Ivy and enables VE compilations.
  */
 export function updateLibraries(): Rule {
-  return updateWorkspace(workspace => {
+  return updateWorkspace((workspace) => {
     const followupRules: Rule[] = [];
 
     for (const [, project] of workspace.projects) {
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 4a21fba6642a..267ab5218505 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
@@ -10,10 +10,9 @@ import { EmptyTree } from '@angular-devkit/schematics';
 import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
 import { Builders, WorkspaceTargets } from '../../utility/workspace-models';
 
-// tslint:disable-next-line: no-any
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 function getWorkspaceTargets(tree: UnitTestTree): any {
-  return JSON.parse(tree.readContent(workspacePath))
-    .projects['migration-lib'].architect;
+  return JSON.parse(tree.readContent(workspacePath)).projects['migration-lib'].architect;
 }
 
 function updateWorkspaceTargets(tree: UnitTestTree, workspaceTargets: WorkspaceTargets) {
@@ -25,7 +24,6 @@ function updateWorkspaceTargets(tree: UnitTestTree, workspaceTargets: WorkspaceT
 const workspacePath = '/angular.json';
 const libProdTsConfig = 'migration-lib/tsconfig.lib.prod.json';
 
-// tslint:disable:no-big-function
 describe('Migration to version 9', () => {
   describe('Migrate Ivy Libraries', () => {
     const schematicRunner = new SchematicTestRunner(
@@ -60,7 +58,10 @@ describe('Migration to version 9', () => {
         )
         .toPromise();
 
-      tree.overwrite('/angular.json', tree.readContent('/angular.json').replace(Builders.NgPackagr, Builders.DeprecatedNgPackagr));
+      tree.overwrite(
+        '/angular.json',
+        tree.readContent('/angular.json').replace(Builders.NgPackagr, Builders.DeprecatedNgPackagr),
+      );
       tree.delete(libProdTsConfig);
     });
 
@@ -72,7 +73,9 @@ describe('Migration to version 9', () => {
       tree.overwrite(workspacePath, JSON.stringify(config, undefined, 2));
 
       const libProdTsConfigPath = 'tsconfig.lib.prod.json';
-      const tree2 = await schematicRunner.runSchematicAsync('workspace-version-9', {}, tree.branch()).toPromise();
+      const tree2 = await schematicRunner
+        .runSchematicAsync('workspace-version-9', {}, tree.branch())
+        .toPromise();
       config = getWorkspaceTargets(tree2).build;
       expect(config.configurations.production.tsConfig).toEqual(libProdTsConfigPath);
       expect(tree2.exists(libProdTsConfigPath)).toBeTruthy();
@@ -84,7 +87,9 @@ describe('Migration to version 9', () => {
 
       updateWorkspaceTargets(tree, config);
 
-      const tree2 = await schematicRunner.runSchematicAsync('workspace-version-9', {}, tree.branch()).toPromise();
+      const tree2 = await schematicRunner
+        .runSchematicAsync('workspace-version-9', {}, tree.branch())
+        .toPromise();
       config = getWorkspaceTargets(tree2).build;
       expect(config.configurations.production.tsConfig).toEqual(libProdTsConfig);
       expect(tree2.exists(libProdTsConfig)).toBeTruthy();
@@ -96,7 +101,9 @@ describe('Migration to version 9', () => {
 
       updateWorkspaceTargets(tree, config);
 
-      const tree2 = await schematicRunner.runSchematicAsync('workspace-version-9', {}, tree.branch()).toPromise();
+      const tree2 = await schematicRunner
+        .runSchematicAsync('workspace-version-9', {}, tree.branch())
+        .toPromise();
       config = getWorkspaceTargets(tree2).build;
       expect(config.configurations.production.tsConfig).toEqual(libProdTsConfig);
       expect(tree2.exists(libProdTsConfig)).toBeTruthy();
@@ -108,7 +115,9 @@ describe('Migration to version 9', () => {
 
       updateWorkspaceTargets(tree, config);
 
-      const tree2 = await schematicRunner.runSchematicAsync('workspace-version-9', {}, tree.branch()).toPromise();
+      const tree2 = await schematicRunner
+        .runSchematicAsync('workspace-version-9', {}, tree.branch())
+        .toPromise();
       config = getWorkspaceTargets(tree2).build;
       expect(config.configurations.production.tsConfig).toEqual(libProdTsConfig);
       expect(tree2.exists(libProdTsConfig)).toBeTruthy();
@@ -127,7 +136,9 @@ describe('Migration to version 9', () => {
 
       tree.create(prodLibTsConfig, JSON.stringify(tsconfig, undefined, 2));
 
-      const tree2 = await schematicRunner.runSchematicAsync('workspace-version-9', {}, tree.branch()).toPromise();
+      const tree2 = await schematicRunner
+        .runSchematicAsync('workspace-version-9', {}, tree.branch())
+        .toPromise();
       config = getWorkspaceTargets(tree2).build;
       expect(config.configurations.production.tsConfig).toEqual(prodLibTsConfig);
 
@@ -151,7 +162,9 @@ describe('Migration to version 9', () => {
 
       tree.create(prodLibTsConfig, JSON.stringify(tsconfig, undefined, 2));
 
-      const tree2 = await schematicRunner.runSchematicAsync('workspace-version-9', {}, tree.branch()).toPromise();
+      const tree2 = await schematicRunner
+        .runSchematicAsync('workspace-version-9', {}, tree.branch())
+        .toPromise();
       config = getWorkspaceTargets(tree2).build;
       expect(config.configurations.production.tsConfig).toEqual(prodLibTsConfig);
 
diff --git a/packages/schematics/angular/migrations/update-9/ngsw-config.ts b/packages/schematics/angular/migrations/update-9/ngsw-config.ts
index e48120340576..34bddcaaa94f 100644
--- a/packages/schematics/angular/migrations/update-9/ngsw-config.ts
+++ b/packages/schematics/angular/migrations/update-9/ngsw-config.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 { Rule } from '@angular-devkit/schematics';
 import { JSONFile } from '../../utility/json-file';
 import { allTargetOptions, allWorkspaceTargets, getWorkspace } from '../../utility/workspace';
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..1c140240f484 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
@@ -10,10 +10,9 @@ import { EmptyTree } from '@angular-devkit/schematics';
 import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
 import { WorkspaceTargets } from '../../utility/workspace-models';
 
-// tslint:disable-next-line: no-any
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 function getWorkspaceTargets(tree: UnitTestTree): any {
-  return JSON.parse(tree.readContent(workspacePath))
-    .projects['migration-test'].architect;
+  return JSON.parse(tree.readContent(workspacePath)).projects['migration-test'].architect;
 }
 
 function updateWorkspaceTargets(tree: UnitTestTree, workspaceTargets: WorkspaceTargets) {
@@ -24,7 +23,6 @@ function updateWorkspaceTargets(tree: UnitTestTree, workspaceTargets: WorkspaceT
 
 const workspacePath = '/angular.json';
 
-// tslint:disable:no-big-function
 describe('Migration to version 9', () => {
   describe('Migrate ngsw config', () => {
     const schematicRunner = new SchematicTestRunner(
@@ -63,10 +61,7 @@ describe('Migration to version 9', () => {
               name: 'app',
               installMode: 'prefetch',
               resources: {
-                files: [
-                  '/favicon.ico',
-                  '/index.html',
-                ],
+                files: ['/favicon.ico', '/index.html'],
               },
             },
             {
@@ -74,9 +69,7 @@ describe('Migration to version 9', () => {
               installMode: 'lazy',
               updateMode: 'prefetch',
               resources: {
-                files: [
-                  '/assets/**',
-                ],
+                files: ['/assets/**'],
               },
             },
           ],
@@ -87,16 +80,16 @@ describe('Migration to version 9', () => {
 
       tree.create(ngswConfigPath, ngswConfig);
 
-      const tree2 = await schematicRunner.runSchematicAsync('workspace-version-9', {}, tree.branch()).toPromise();
+      const tree2 = await schematicRunner
+        .runSchematicAsync('workspace-version-9', {}, tree.branch())
+        .toPromise();
       const { assetGroups } = JSON.parse(tree2.readContent(ngswConfigPath));
       expect(assetGroups[0].resources.files).toEqual([
         '/favicon.ico',
         '/index.html',
         '/manifest.webmanifest',
       ]);
-      expect(assetGroups[1].resources.files).toEqual([
-        '/assets/**',
-      ]);
+      expect(assetGroups[1].resources.files).toEqual(['/assets/**']);
     });
 
     it(`should not add 'manifest.webmanifest' to files if exists`, async () => {
@@ -112,11 +105,7 @@ describe('Migration to version 9', () => {
               name: 'app',
               installMode: 'prefetch',
               resources: {
-                files: [
-                  '/manifest.webmanifest',
-                  '/favicon.ico',
-                  '/index.html',
-                ],
+                files: ['/manifest.webmanifest', '/favicon.ico', '/index.html'],
               },
             },
           ],
@@ -127,7 +116,9 @@ describe('Migration to version 9', () => {
 
       tree.create(ngswConfigPath, ngswConfig);
 
-      const tree2 = await schematicRunner.runSchematicAsync('workspace-version-9', {}, tree.branch()).toPromise();
+      const tree2 = await schematicRunner
+        .runSchematicAsync('workspace-version-9', {}, tree.branch())
+        .toPromise();
       const { assetGroups } = JSON.parse(tree2.readContent(ngswConfigPath));
       expect(assetGroups[0].resources.files).toEqual([
         '/manifest.webmanifest',
diff --git a/packages/schematics/angular/migrations/update-9/remove-tsickle.ts b/packages/schematics/angular/migrations/update-9/remove-tsickle.ts
index 1f8d4575266d..f20993f0a78d 100644
--- a/packages/schematics/angular/migrations/update-9/remove-tsickle.ts
+++ b/packages/schematics/angular/migrations/update-9/remove-tsickle.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 { Rule } from '@angular-devkit/schematics';
 import { removePackageJsonDependency } from '../../utility/dependencies';
 import { JSONFile } from '../../utility/json-file';
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 046457e2e2e6..f884bc522796 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
@@ -10,7 +10,6 @@ import { EmptyTree } from '@angular-devkit/schematics';
 import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
 import { Builders } from '../../utility/workspace-models';
 
-// tslint:disable:no-big-function
 describe('Migration to version 9', () => {
   describe('Remove tsickle and annotateForClosureCompiler', () => {
     const schematicRunner = new SchematicTestRunner(
@@ -44,7 +43,10 @@ describe('Migration to version 9', () => {
         )
         .toPromise();
 
-      tree.overwrite('/angular.json', tree.readContent('/angular.json').replace(Builders.NgPackagr, Builders.DeprecatedNgPackagr));
+      tree.overwrite(
+        '/angular.json',
+        tree.readContent('/angular.json').replace(Builders.NgPackagr, Builders.DeprecatedNgPackagr),
+      );
     });
 
     it(`should remove 'annotateForClosureCompiler' from library tsconfig`, async () => {
@@ -61,7 +63,9 @@ describe('Migration to version 9', () => {
 
       tree.overwrite(libTsConfig, JSON.stringify(tsconfig, undefined, 2));
 
-      const tree2 = await schematicRunner.runSchematicAsync('workspace-version-9', {}, tree.branch()).toPromise();
+      const tree2 = await schematicRunner
+        .runSchematicAsync('workspace-version-9', {}, tree.branch())
+        .toPromise();
       const { angularCompilerOptions } = JSON.parse(tree2.readContent(libTsConfig));
       expect(angularCompilerOptions).toEqual({ enableIvy: false, skipTemplateCodegen: true });
     });
@@ -77,7 +81,9 @@ describe('Migration to version 9', () => {
       };
 
       tree.overwrite('/package.json', JSON.stringify(packageJson, undefined, 2));
-      const tree2 = await schematicRunner.runSchematicAsync('workspace-version-9', {}, tree.branch()).toPromise();
+      const tree2 = await schematicRunner
+        .runSchematicAsync('workspace-version-9', {}, tree.branch())
+        .toPromise();
       const { dependencies, devDependencies } = JSON.parse(tree2.readContent('/package.json'));
       expect(dependencies['tsickle']).toBeUndefined();
       expect(devDependencies['tsickle']).toBeUndefined();
diff --git a/packages/schematics/angular/migrations/update-9/schematic-options.ts b/packages/schematics/angular/migrations/update-9/schematic-options.ts
index 0d96634d4c4f..56b62746f3dd 100644
--- a/packages/schematics/angular/migrations/update-9/schematic-options.ts
+++ b/packages/schematics/angular/migrations/update-9/schematic-options.ts
@@ -1,16 +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 { json } from '@angular-devkit/core';
 import { Rule } from '@angular-devkit/schematics';
 import { updateWorkspace } from '../../utility/workspace';
 
-export default function(): Rule {
-  return updateWorkspace(workspace => {
+export default function (): Rule {
+  return updateWorkspace((workspace) => {
     // Update root level schematics options if present
     const rootSchematics = workspace.extensions.schematics;
     if (rootSchematics && json.isJsonObject(rootSchematics)) {
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..86281236469e 100644
--- a/packages/schematics/angular/migrations/update-9/schematic-options_spec.ts
+++ b/packages/schematics/angular/migrations/update-9/schematic-options_spec.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 { EmptyTree } from '@angular-devkit/schematics';
 import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
 
@@ -45,7 +46,9 @@ describe('Migration to version 9', () => {
         };
         tree.overwrite(workspacePath, JSON.stringify(workspace, undefined, 2));
 
-        const tree2 = await schematicRunner.runSchematicAsync('schematic-options-9', {}, tree.branch()).toPromise();
+        const tree2 = await schematicRunner
+          .runSchematicAsync('schematic-options-9', {}, tree.branch())
+          .toPromise();
         const { schematics } = JSON.parse(tree2.readContent(workspacePath));
         expect(schematics['@schematics/angular:component'].styleext).toBeUndefined();
         expect(schematics['@schematics/angular:component'].style).toBe('scss');
@@ -60,7 +63,9 @@ describe('Migration to version 9', () => {
         };
         tree.overwrite(workspacePath, JSON.stringify(workspace, undefined, 2));
 
-        const tree2 = await schematicRunner.runSchematicAsync('schematic-options-9', {}, tree.branch()).toPromise();
+        const tree2 = await schematicRunner
+          .runSchematicAsync('schematic-options-9', {}, tree.branch())
+          .toPromise();
         const { schematics } = JSON.parse(tree2.readContent(workspacePath));
         expect(schematics['@schematics/some-other:component'].styleext).toBe('scss');
         expect(schematics['@schematics/some-other:component'].style).toBeUndefined();
@@ -75,7 +80,9 @@ describe('Migration to version 9', () => {
         };
         tree.overwrite(workspacePath, JSON.stringify(workspace, undefined, 2));
 
-        const tree2 = await schematicRunner.runSchematicAsync('schematic-options-9', {}, tree.branch()).toPromise();
+        const tree2 = await schematicRunner
+          .runSchematicAsync('schematic-options-9', {}, tree.branch())
+          .toPromise();
         const { schematics } = JSON.parse(tree2.readContent(workspacePath));
         expect(schematics['@schematics/angular:component'].spec).toBeUndefined();
         expect(schematics['@schematics/angular:component'].skipTests).toBe(true);
@@ -90,7 +97,9 @@ describe('Migration to version 9', () => {
         };
         tree.overwrite(workspacePath, JSON.stringify(workspace, undefined, 2));
 
-        const tree2 = await schematicRunner.runSchematicAsync('schematic-options-9', {}, tree.branch()).toPromise();
+        const tree2 = await schematicRunner
+          .runSchematicAsync('schematic-options-9', {}, tree.branch())
+          .toPromise();
         const { schematics } = JSON.parse(tree2.readContent(workspacePath));
         expect(schematics['@schematics/angular:component'].spec).toBeUndefined();
         expect(schematics['@schematics/angular:component'].skipTests).toBe(false);
@@ -117,7 +126,9 @@ describe('Migration to version 9', () => {
         };
         tree.overwrite(workspacePath, JSON.stringify(workspace, undefined, 2));
 
-        const tree2 = await schematicRunner.runSchematicAsync('schematic-options-9', {}, tree.branch()).toPromise();
+        const tree2 = await schematicRunner
+          .runSchematicAsync('schematic-options-9', {}, tree.branch())
+          .toPromise();
         const { schematics } = JSON.parse(tree2.readContent(workspacePath));
         for (const key of Object.keys(workspace.schematics)) {
           expect(schematics[key].spec).toBeUndefined();
@@ -135,7 +146,9 @@ describe('Migration to version 9', () => {
         };
         tree.overwrite(workspacePath, JSON.stringify(workspace, undefined, 2));
 
-        const tree2 = await schematicRunner.runSchematicAsync('schematic-options-9', {}, tree.branch()).toPromise();
+        const tree2 = await schematicRunner
+          .runSchematicAsync('schematic-options-9', {}, tree.branch())
+          .toPromise();
         const { schematics } = JSON.parse(tree2.readContent(workspacePath));
         expect(schematics['@schematics/angular:component'].styleext).toBeUndefined();
         expect(schematics['@schematics/angular:component'].style).toBe('scss');
@@ -153,14 +166,19 @@ describe('Migration to version 9', () => {
         };
         tree.overwrite(workspacePath, JSON.stringify(workspace, undefined, 2));
 
-        const tree2 = await schematicRunner.runSchematicAsync('schematic-options-9', {}, tree.branch()).toPromise();
-        const { projects: { 'migration-test': { schematics } } } = JSON.parse(tree2.readContent(workspacePath));
+        const tree2 = await schematicRunner
+          .runSchematicAsync('schematic-options-9', {}, tree.branch())
+          .toPromise();
+        const {
+          projects: {
+            'migration-test': { schematics },
+          },
+        } = JSON.parse(tree2.readContent(workspacePath));
         expect(schematics['@schematics/angular:component'].styleext).toBeUndefined();
         expect(schematics['@schematics/angular:component'].style).toBe('scss');
         expect(schematics['@schematics/angular:component'].spec).toBeUndefined();
         expect(schematics['@schematics/angular:component'].skipTests).toBe(true);
       });
-
     });
   });
 });
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..e76bfd064291 100644
--- a/packages/schematics/angular/migrations/update-9/update-app-tsconfigs.ts
+++ b/packages/schematics/angular/migrations/update-9/update-app-tsconfigs.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 { join, logging, normalize, workspaces } from '@angular-devkit/core';
 import { Rule, Tree } from '@angular-devkit/schematics';
 import { dirname, relative } from 'path';
@@ -91,10 +92,11 @@ function updateTsConfig(
 
     // Add stricter file inclusions to avoid unused file warning during compilation
     if (builderConfig.builder !== Builders.Karma) {
-
       const include = tsConfigJson.get(['include']);
       if (include && Array.isArray(include)) {
-        const tsInclude = include.findIndex((value) => typeof value === 'string' && value.endsWith('**/*.ts'));
+        const tsInclude = include.findIndex(
+          (value) => typeof value === 'string' && value.endsWith('**/*.ts'),
+        );
         if (tsInclude !== -1) {
           // Replace ts includes with d.ts
           tsConfigJson.modify(['include', tsInclude], include[tsInclude].replace('.ts', '.d.ts'));
@@ -103,9 +105,10 @@ function updateTsConfig(
         // Includes are not present, add includes to dts files
         // By default when 'include' nor 'files' fields are used TypeScript
         // will include all ts files.
-        const include = projectSourceRoot !== undefined
-          ? join(normalize(projectSourceRoot), '**/*.d.ts')
-          : '**/*.d.ts';
+        const include =
+          projectSourceRoot !== undefined
+            ? join(normalize(projectSourceRoot), '**/*.d.ts')
+            : '**/*.d.ts';
 
         tsConfigJson.modify(['include'], [include]);
       }
@@ -117,14 +120,12 @@ function updateTsConfig(
 
         const mainOption = options.main;
         if (mainOption && typeof mainOption === 'string') {
-          newFiles.push(
-            forwardSlashPath(relative(tsConfigDir, forwardSlashPath(mainOption))));
+          newFiles.push(forwardSlashPath(relative(tsConfigDir, forwardSlashPath(mainOption))));
         }
 
         const polyfillsOption = options.polyfills;
         if (polyfillsOption && typeof polyfillsOption === 'string') {
-          newFiles.push(
-            forwardSlashPath(relative(tsConfigDir, forwardSlashPath(polyfillsOption))));
+          newFiles.push(forwardSlashPath(relative(tsConfigDir, forwardSlashPath(polyfillsOption))));
         }
 
         if (newFiles.length) {
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 34ac9c9e339a..2de639a541b7 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,6 +1,6 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use 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,7 @@ import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/te
 import { parse as parseJson } from 'jsonc-parser';
 import { getWorkspaceTargets, updateWorkspaceTargets } from './update-workspace-config_spec';
 
-// tslint:disable-next-line: no-any
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 function readJsonFile(tree: UnitTestTree, path: string): any {
   return parseJson(tree.readContent(path).toString());
 }
@@ -27,16 +27,12 @@ const defaultTsConfigOptions = {
     outDir: './out-tsc/app',
     types: [],
   },
-  exclude: [
-    'src/test.ts',
-    'src/**/*.spec.ts',
-  ],
+  exclude: ['src/test.ts', 'src/**/*.spec.ts'],
   angularCompilerOptions: {
     enableIvy: true,
   },
 };
 
-// tslint:disable:no-big-function
 describe('Migration to version 9', () => {
   describe('Update applications tsconfig', () => {
     const schematicRunner = new SchematicTestRunner(
@@ -67,8 +63,10 @@ describe('Migration to version 9', () => {
 
     it('should update apps tsConfig with stricter files inclusions', async () => {
       overrideJsonFile(tree, 'tsconfig.app.json', defaultTsConfigOptions);
-      const tree2 = await schematicRunner.runSchematicAsync('workspace-version-9', {}, tree.branch()).toPromise();
-      const { exclude, files, include } = readJsonFile(tree2 , 'tsconfig.app.json');
+      const tree2 = await schematicRunner
+        .runSchematicAsync('workspace-version-9', {}, tree.branch())
+        .toPromise();
+      const { exclude, files, include } = readJsonFile(tree2, 'tsconfig.app.json');
       expect(exclude).toBeUndefined();
       expect(files).toEqual(['src/main.ts', 'src/polyfills.ts']);
       expect(include).toEqual(['src/**/*.d.ts']);
@@ -94,7 +92,9 @@ describe('Migration to version 9', () => {
       config.build.options.tsConfig = 'projects\\another-app\\tsconfig.app.json';
       updateWorkspaceTargets(tree2, config, 'another-app');
 
-      const tree3 = await schematicRunner.runSchematicAsync('workspace-version-9', {}, tree2.branch()).toPromise();
+      const tree3 = await schematicRunner
+        .runSchematicAsync('workspace-version-9', {}, tree2.branch())
+        .toPromise();
       const { exclude, files } = readJsonFile(tree3, tsCfgPath);
       expect(exclude).toBeUndefined();
       expect(files).toEqual(['src/main.ts', 'src/polyfills.ts']);
@@ -108,7 +108,9 @@ describe('Migration to version 9', () => {
 
       overrideJsonFile(tree, 'tsconfig.app.json', tsConfigContent);
 
-      const tree2 = await schematicRunner.runSchematicAsync('workspace-version-9', {}, tree.branch()).toPromise();
+      const tree2 = await schematicRunner
+        .runSchematicAsync('workspace-version-9', {}, tree.branch())
+        .toPromise();
       const { files, include } = readJsonFile(tree2, 'tsconfig.app.json');
       expect(files).toEqual(['src/main.ts', 'src/polyfills.ts']);
       expect(include).toEqual(['foo.ts']);
@@ -123,7 +125,9 @@ describe('Migration to version 9', () => {
 
       overrideJsonFile(tree, 'tsconfig.app.json', tsConfigContent);
 
-      const tree2 = await schematicRunner.runSchematicAsync('workspace-version-9', {}, tree.branch()).toPromise();
+      const tree2 = await schematicRunner
+        .runSchematicAsync('workspace-version-9', {}, tree.branch())
+        .toPromise();
       const { files, include, exclude } = readJsonFile(tree2, 'tsconfig.app.json');
       expect(files).toEqual(['src/main.ts', 'src/polyfills.ts']);
       expect(include).toEqual(['src/**/*.d.ts']);
@@ -138,7 +142,9 @@ describe('Migration to version 9', () => {
 
       overrideJsonFile(tree, 'tsconfig.app.json', tsConfigContent);
 
-      const tree2 = await schematicRunner.runSchematicAsync('workspace-version-9', {}, tree.branch()).toPromise();
+      const tree2 = await schematicRunner
+        .runSchematicAsync('workspace-version-9', {}, tree.branch())
+        .toPromise();
       const { files, include, exclude } = readJsonFile(tree2, 'tsconfig.app.json');
       expect(files).toEqual(['src/main.ts', 'src/polyfills.ts']);
       expect(include).toEqual(['foo.ts', 'src/**/*.d.ts']);
@@ -147,7 +153,9 @@ describe('Migration to version 9', () => {
 
     it(`should remove angularCompilerOptions when enableIvy is true and it's the only option`, async () => {
       overrideJsonFile(tree, 'tsconfig.app.json', defaultTsConfigOptions);
-      const tree2 = await schematicRunner.runSchematicAsync('workspace-version-9', {}, tree.branch()).toPromise();
+      const tree2 = await schematicRunner
+        .runSchematicAsync('workspace-version-9', {}, tree.branch())
+        .toPromise();
       const { angularCompilerOptions } = readJsonFile(tree2, 'tsconfig.app.json');
       expect(angularCompilerOptions).toBeUndefined();
     });
@@ -162,7 +170,9 @@ describe('Migration to version 9', () => {
       };
 
       overrideJsonFile(tree, 'tsconfig.app.json', tsConfigContent);
-      const tree2 = await schematicRunner.runSchematicAsync('workspace-version-9', {}, tree.branch()).toPromise();
+      const tree2 = await schematicRunner
+        .runSchematicAsync('workspace-version-9', {}, tree.branch())
+        .toPromise();
       const { angularCompilerOptions } = readJsonFile(tree2, 'tsconfig.app.json');
       expect(angularCompilerOptions.enableIvy).toBeUndefined();
       expect(angularCompilerOptions.fullTemplateTypeCheck).toBe(true);
@@ -178,7 +188,9 @@ describe('Migration to version 9', () => {
       };
 
       overrideJsonFile(tree, 'tsconfig.app.json', tsConfigContent);
-      const tree2 = await schematicRunner.runSchematicAsync('workspace-version-9', {}, tree.branch()).toPromise();
+      const tree2 = await schematicRunner
+        .runSchematicAsync('workspace-version-9', {}, tree.branch())
+        .toPromise();
       const { angularCompilerOptions } = readJsonFile(tree2, 'tsconfig.app.json');
       expect(angularCompilerOptions.enableIvy).toBe(false);
       expect(angularCompilerOptions.fullTemplateTypeCheck).toBe(true);
@@ -194,7 +206,9 @@ describe('Migration to version 9', () => {
       };
 
       overrideJsonFile(tree, 'tsconfig.app.json', tsConfigContent);
-      const tree2 = await schematicRunner.runSchematicAsync('workspace-version-9', {}, tree.branch()).toPromise();
+      const tree2 = await schematicRunner
+        .runSchematicAsync('workspace-version-9', {}, tree.branch())
+        .toPromise();
       const { compilerOptions } = readJsonFile(tree2, 'tsconfig.app.json');
       expect(compilerOptions.module).toBeUndefined();
 
@@ -213,7 +227,9 @@ describe('Migration to version 9', () => {
       };
 
       overrideJsonFile(tree, 'tsconfig.app.json', tsConfigContent);
-      const tree2 = await schematicRunner.runSchematicAsync('workspace-version-9', {}, tree.branch()).toPromise();
+      const tree2 = await schematicRunner
+        .runSchematicAsync('workspace-version-9', {}, tree.branch())
+        .toPromise();
       const { compilerOptions } = readJsonFile(tree2, 'tsconfig.app.json');
       expect(compilerOptions.module).toBe('esnext');
     });
@@ -235,14 +251,16 @@ describe('Migration to version 9', () => {
           require.resolve('../../collection.json'),
           'universal',
           {
-            clientProject: 'migration-test',
+            project: 'migration-test',
           },
           tree,
         )
         .toPromise();
 
       overrideJsonFile(tree, 'tsconfig.server.json', tsConfigContent);
-      const tree2 = await schematicRunner.runSchematicAsync('workspace-version-9', {}, tree.branch()).toPromise();
+      const tree2 = await schematicRunner
+        .runSchematicAsync('workspace-version-9', {}, tree.branch())
+        .toPromise();
       const { compilerOptions } = readJsonFile(tree2, 'tsconfig.server.json');
       expect(compilerOptions.module).toBe('commonjs');
     });
@@ -254,7 +272,9 @@ describe('Migration to version 9', () => {
       };
 
       overrideJsonFile(tree, 'tsconfig.json', tsConfigContent);
-      const tree2 = await schematicRunner.runSchematicAsync('workspace-version-9', {}, tree.branch()).toPromise();
+      const tree2 = await schematicRunner
+        .runSchematicAsync('workspace-version-9', {}, tree.branch())
+        .toPromise();
       const { compilerOptions } = readJsonFile(tree2, 'tsconfig.json');
       expect(compilerOptions.module).toBe('esnext');
     });
diff --git a/packages/schematics/angular/migrations/update-9/update-dependencies.ts b/packages/schematics/angular/migrations/update-9/update-dependencies.ts
index 867087e9d022..a5308a52fce6 100644
--- a/packages/schematics/angular/migrations/update-9/update-dependencies.ts
+++ b/packages/schematics/angular/migrations/update-9/update-dependencies.ts
@@ -1,17 +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 { Rule } from '@angular-devkit/schematics';
 import {
   addPackageJsonDependency,
   getPackageJsonDependency,
   removePackageJsonDependency,
 } from '../../utility/dependencies';
-import { latestVersions } from '../../utility/latest-versions';
 
 export function updateDependencies(): Rule {
   return (host, context) => {
diff --git a/packages/schematics/angular/migrations/update-9/update-i18n.ts b/packages/schematics/angular/migrations/update-9/update-i18n.ts
index 259e40c48d87..868d996cb844 100644
--- a/packages/schematics/angular/migrations/update-9/update-i18n.ts
+++ b/packages/schematics/angular/migrations/update-9/update-i18n.ts
@@ -1,14 +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 { logging, workspaces } from '@angular-devkit/core';
 import { Rule, Tree } from '@angular-devkit/schematics';
 import { posix } from 'path';
-import { NodeDependencyType, addPackageJsonDependency, getPackageJsonDependency } from '../../utility/dependencies';
+import {
+  NodeDependencyType,
+  addPackageJsonDependency,
+  getPackageJsonDependency,
+} from '../../utility/dependencies';
 import { latestVersions } from '../../utility/latest-versions';
 import { allTargetOptions, allWorkspaceTargets, updateWorkspace } from '../../utility/workspace';
 import { Builders } from '../../utility/workspace-models';
@@ -99,7 +104,7 @@ function addProjectI18NOptions(
     const i18nOptions = [...allTargetOptions(builderConfig)];
     const sourceLocale = i18nOptions
       .map(([, o]) => o.i18nLocale)
-      .find(x => !!x && typeof x === 'string');
+      .find((x) => !!x && typeof x === 'string');
 
     projectConfig.extensions['i18n'] = {
       locales,
@@ -126,16 +131,9 @@ function addBuilderI18NOptions(
     const i18nFile = options.i18nFile;
 
     const outputPath = options.outputPath;
-    if (
-      typeof localeId === 'string' &&
-      i18nFile &&
-      typeof outputPath === 'string'
-    ) {
+    if (typeof localeId === 'string' && i18nFile && typeof outputPath === 'string') {
       if (outputPath.match(new RegExp(`[/\\\\]${localeId}[/\\\\]?$`))) {
-        const newOutputPath = outputPath.replace(
-          new RegExp(`[/\\\\]${localeId}[/\\\\]?$`),
-          '',
-        );
+        const newOutputPath = outputPath.replace(new RegExp(`[/\\\\]${localeId}[/\\\\]?$`), '');
         options.outputPath = newOutputPath;
       } else {
         logger.warn(
@@ -170,9 +168,7 @@ function removeFormatOption(builderConfig: workspaces.TargetDefinition) {
   }
 }
 
-function updateBaseHrefs(
-  builderConfig: workspaces.TargetDefinition,
-) {
+function updateBaseHrefs(builderConfig: workspaces.TargetDefinition) {
   const mainBaseHref = builderConfig.options?.baseHref;
   const hasMainBaseHref =
     !!mainBaseHref && typeof mainBaseHref === 'string' && mainBaseHref !== '/';
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 f90e754c696d..58f08bdbb296 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
@@ -11,10 +11,9 @@ import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/te
 import { latestVersions } from '../../utility/latest-versions';
 import { WorkspaceTargets } from '../../utility/workspace-models';
 
-// tslint:disable-next-line: no-any
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 function getWorkspaceTargets(tree: UnitTestTree): any {
-  return JSON.parse(tree.readContent(workspacePath))
-    .projects['migration-test'].architect;
+  return JSON.parse(tree.readContent(workspacePath)).projects['migration-test'].architect;
 }
 
 function updateWorkspaceTargets(tree: UnitTestTree, workspaceTargets: WorkspaceTargets) {
@@ -25,7 +24,6 @@ function updateWorkspaceTargets(tree: UnitTestTree, workspaceTargets: WorkspaceT
 
 const workspacePath = '/angular.json';
 
-// tslint:disable:no-big-function
 describe('Migration to version 9', () => {
   describe('Migrate workspace config', () => {
     const schematicRunner = new SchematicTestRunner(
@@ -50,7 +48,10 @@ describe('Migration to version 9', () => {
         )
         .toPromise();
 
-      tree.overwrite('angular.json', tree.readContent('angular.json').replace(/development/g, 'production'));
+      tree.overwrite(
+        'angular.json',
+        tree.readContent('angular.json').replace(/development/g, 'production'),
+      );
     });
 
     describe('i18n configuration', () => {
@@ -70,7 +71,9 @@ describe('Migration to version 9', () => {
           config.build.configurations.de = getI18NConfig('de');
           updateWorkspaceTargets(tree, config);
 
-          const tree2 = await schematicRunner.runSchematicAsync('workspace-version-9', {}, tree.branch()).toPromise();
+          const tree2 = await schematicRunner
+            .runSchematicAsync('workspace-version-9', {}, tree.branch())
+            .toPromise();
           const { dependencies } = JSON.parse(tree2.readContent('/package.json'));
           expect(dependencies['@angular/localize']).toBe(latestVersions.Angular);
         });
@@ -82,7 +85,9 @@ describe('Migration to version 9', () => {
           config.build.configurations.de = getI18NConfig('de');
           updateWorkspaceTargets(tree, config);
 
-          const tree2 = await schematicRunner.runSchematicAsync('workspace-version-9', {}, tree.branch()).toPromise();
+          const tree2 = await schematicRunner
+            .runSchematicAsync('workspace-version-9', {}, tree.branch())
+            .toPromise();
           config = getWorkspaceTargets(tree2).build;
           expect(config.options.localize).toEqual(['fr']);
           expect(config.configurations.de.localize).toEqual(['de']);
@@ -95,7 +100,9 @@ describe('Migration to version 9', () => {
           config.build.configurations.de = getI18NConfig('de');
           updateWorkspaceTargets(tree, config);
 
-          const tree2 = await schematicRunner.runSchematicAsync('workspace-version-9', {}, tree.branch()).toPromise();
+          const tree2 = await schematicRunner
+            .runSchematicAsync('workspace-version-9', {}, tree.branch())
+            .toPromise();
           config = getWorkspaceTargets(tree2).build;
           expect(config.options.i18nFormat).toBeUndefined();
           expect(config.options.i18nFile).toBeUndefined();
@@ -111,7 +118,9 @@ describe('Migration to version 9', () => {
           config.build.configurations.de = { ...getI18NConfig('de'), baseHref: '/abc/' };
           updateWorkspaceTargets(tree, config);
 
-          const tree2 = await schematicRunner.runSchematicAsync('workspace-version-9', {}, tree.branch()).toPromise();
+          const tree2 = await schematicRunner
+            .runSchematicAsync('workspace-version-9', {}, tree.branch())
+            .toPromise();
           config = getWorkspaceTargets(tree2).build;
           expect(config.configurations.fr.baseHref).toBeUndefined();
           expect(config.configurations.de.baseHref).toBeUndefined();
@@ -124,7 +133,9 @@ describe('Migration to version 9', () => {
           config.build.configurations.de = { ...getI18NConfig('de'), outputPath: '/dist/de/' };
           updateWorkspaceTargets(tree, config);
 
-          const tree2 = await schematicRunner.runSchematicAsync('workspace-version-9', {}, tree.branch()).toPromise();
+          const tree2 = await schematicRunner
+            .runSchematicAsync('workspace-version-9', {}, tree.branch())
+            .toPromise();
           config = getWorkspaceTargets(tree2).build;
           expect(config.configurations.fr.outputPath).toBe('dist');
           expect(config.configurations.de.outputPath).toBe('/dist');
@@ -137,7 +148,9 @@ describe('Migration to version 9', () => {
           config.build.configurations.de = { ...getI18NConfig('de'), outputPath: '/dist/123' };
           updateWorkspaceTargets(tree, config);
 
-          const tree2 = await schematicRunner.runSchematicAsync('workspace-version-9', {}, tree.branch()).toPromise();
+          const tree2 = await schematicRunner
+            .runSchematicAsync('workspace-version-9', {}, tree.branch())
+            .toPromise();
           config = getWorkspaceTargets(tree2).build;
           expect(config.configurations.fr.outputPath).toBe('dist/abc');
           expect(config.configurations.fr.i18nFormat).toBeUndefined();
@@ -156,7 +169,9 @@ describe('Migration to version 9', () => {
           config.build.configurations.staging = { baseHref: '/de/' };
           updateWorkspaceTargets(tree, config);
 
-          const tree2 = await schematicRunner.runSchematicAsync('workspace-version-9', {}, tree.branch()).toPromise();
+          const tree2 = await schematicRunner
+            .runSchematicAsync('workspace-version-9', {}, tree.branch())
+            .toPromise();
           config = getWorkspaceTargets(tree2).build;
           expect(config.configurations.staging.baseHref).toBe('/de/');
         });
@@ -167,7 +182,9 @@ describe('Migration to version 9', () => {
           config.build.configurations.de = { ...getI18NConfig('de'), baseHref: '/de/' };
           updateWorkspaceTargets(tree, config);
 
-          const tree2 = await schematicRunner.runSchematicAsync('workspace-version-9', {}, tree.branch()).toPromise();
+          const tree2 = await schematicRunner
+            .runSchematicAsync('workspace-version-9', {}, tree.branch())
+            .toPromise();
           config = getWorkspaceTargets(tree2).build;
           expect(config.options.baseHref).toBe('/my-app/');
           expect(config.configurations.de.baseHref).toBe('/');
@@ -179,7 +196,9 @@ describe('Migration to version 9', () => {
           config['extract-i18n'].options.i18nLocale = 'en-GB';
           updateWorkspaceTargets(tree, config);
 
-          const tree2 = await schematicRunner.runSchematicAsync('workspace-version-9', {}, tree.branch()).toPromise();
+          const tree2 = await schematicRunner
+            .runSchematicAsync('workspace-version-9', {}, tree.branch())
+            .toPromise();
           config = getWorkspaceTargets(tree2)['extract-i18n'];
           expect(config.options.i18nFormat).toBeUndefined();
           expect(config.options.i18nLocale).toBeUndefined();
@@ -194,8 +213,12 @@ describe('Migration to version 9', () => {
           config.build.configurations.de = getI18NConfig('de');
           updateWorkspaceTargets(tree, config);
 
-          const tree2 = await schematicRunner.runSchematicAsync('workspace-version-9', {}, tree.branch()).toPromise();
-          const projectConfig = JSON.parse(tree2.readContent(workspacePath)).projects['migration-test'];
+          const tree2 = await schematicRunner
+            .runSchematicAsync('workspace-version-9', {}, tree.branch())
+            .toPromise();
+          const projectConfig = JSON.parse(tree2.readContent(workspacePath)).projects[
+            'migration-test'
+          ];
           expect(projectConfig.i18n.sourceLocale).toBe('en-GB');
           expect(projectConfig.i18n.locales).toBeDefined();
         });
@@ -206,8 +229,12 @@ describe('Migration to version 9', () => {
           config.build.configurations.de = getI18NConfig('de');
           updateWorkspaceTargets(tree, config);
 
-          const tree2 = await schematicRunner.runSchematicAsync('workspace-version-9', {}, tree.branch()).toPromise();
-          const projectConfig = JSON.parse(tree2.readContent(workspacePath)).projects['migration-test'];
+          const tree2 = await schematicRunner
+            .runSchematicAsync('workspace-version-9', {}, tree.branch())
+            .toPromise();
+          const projectConfig = JSON.parse(tree2.readContent(workspacePath)).projects[
+            'migration-test'
+          ];
           expect(projectConfig.i18n.sourceLocale).toBeUndefined();
           expect(projectConfig.i18n.locales).toEqual({
             de: { translation: 'src/locale/messages.de.xlf', baseHref: '' },
@@ -221,8 +248,12 @@ describe('Migration to version 9', () => {
           config.build.configurations.de = { ...getI18NConfig('de'), baseHref: '/abc/' };
           updateWorkspaceTargets(tree, config);
 
-          const tree2 = await schematicRunner.runSchematicAsync('workspace-version-9', {}, tree.branch()).toPromise();
-          const projectConfig = JSON.parse(tree2.readContent(workspacePath)).projects['migration-test'];
+          const tree2 = await schematicRunner
+            .runSchematicAsync('workspace-version-9', {}, tree.branch())
+            .toPromise();
+          const projectConfig = JSON.parse(tree2.readContent(workspacePath)).projects[
+            'migration-test'
+          ];
           expect(projectConfig.i18n.sourceLocale).toBeUndefined();
           expect(projectConfig.i18n.locales).toEqual({
             de: { translation: 'src/locale/messages.de.xlf', baseHref: '/abc/' },
@@ -237,8 +268,12 @@ describe('Migration to version 9', () => {
           config.build.configurations.de = { ...getI18NConfig('de'), baseHref: '/abc/' };
           updateWorkspaceTargets(tree, config);
 
-          const tree2 = await schematicRunner.runSchematicAsync('workspace-version-9', {}, tree.branch()).toPromise();
-          const projectConfig = JSON.parse(tree2.readContent(workspacePath)).projects['migration-test'];
+          const tree2 = await schematicRunner
+            .runSchematicAsync('workspace-version-9', {}, tree.branch())
+            .toPromise();
+          const projectConfig = JSON.parse(tree2.readContent(workspacePath)).projects[
+            'migration-test'
+          ];
           expect(projectConfig.i18n.sourceLocale).toBeUndefined();
           expect(projectConfig.i18n.locales).toEqual({
             de: { translation: 'src/locale/messages.de.xlf', baseHref: '/abc/' },
@@ -249,15 +284,21 @@ describe('Migration to version 9', () => {
 
       describe('when i18n builder options are not set', () => {
         it(`should not add 'localize' option`, async () => {
-          const tree2 = await schematicRunner.runSchematicAsync('workspace-version-9', {}, tree.branch()).toPromise();
+          const tree2 = await schematicRunner
+            .runSchematicAsync('workspace-version-9', {}, tree.branch())
+            .toPromise();
           const config = getWorkspaceTargets(tree2).build;
           expect(config.options.localize).toBeUndefined();
           expect(config.configurations.production.localize).toBeUndefined();
         });
 
         it('should not add i18n project config', async () => {
-          const tree2 = await schematicRunner.runSchematicAsync('workspace-version-9', {}, tree.branch()).toPromise();
-          const projectConfig = JSON.parse(tree2.readContent(workspacePath)).projects['migration-test'];
+          const tree2 = await schematicRunner
+            .runSchematicAsync('workspace-version-9', {}, tree.branch())
+            .toPromise();
+          const projectConfig = JSON.parse(tree2.readContent(workspacePath)).projects[
+            'migration-test'
+          ];
           expect(projectConfig.i18n).toBeUndefined();
         });
       });
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..2260dc49b602 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,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 { Rule } from '@angular-devkit/schematics';
 import * as ts from '../../third_party/github.com/Microsoft/TypeScript/lib/typescript';
 import { findNodes } from '../../utility/ast-utils';
@@ -16,7 +17,7 @@ import { Builders } from '../../utility/workspace-models';
  * now required for Universal and App-Shell for Ivy and `bundleDependencies`.
  */
 export function updateServerMainFile(): Rule {
-  return async tree => {
+  return async (tree) => {
     const workspace = await getWorkspace(tree);
 
     for (const [targetName, target] of allWorkspaceTargets(workspace)) {
@@ -43,11 +44,17 @@ export function updateServerMainFile(): Rule {
       );
 
       // find exports in main server file
-      const exportDeclarations = findNodes(source, ts.SyntaxKind.ExportDeclaration) as ts.ExportDeclaration[];
-
-      const platformServerExports = exportDeclarations.filter(({ moduleSpecifier }) => (
-        moduleSpecifier && ts.isStringLiteral(moduleSpecifier) && moduleSpecifier.text === '@angular/platform-server'
-      ));
+      const exportDeclarations = findNodes(
+        source,
+        ts.SyntaxKind.ExportDeclaration,
+      ) as ts.ExportDeclaration[];
+
+      const platformServerExports = exportDeclarations.filter(
+        ({ moduleSpecifier }) =>
+          moduleSpecifier &&
+          ts.isStringLiteral(moduleSpecifier) &&
+          moduleSpecifier.text === '@angular/platform-server',
+      );
 
       let hasRenderModule = false;
       let hasRenderModuleFactory = false;
@@ -56,11 +63,15 @@ export function updateServerMainFile(): Rule {
       for (const { exportClause } of platformServerExports) {
         if (exportClause && ts.isNamedExports(exportClause)) {
           if (!hasRenderModuleFactory) {
-            hasRenderModuleFactory = exportClause.elements.some(({ name }) => name.text === 'renderModuleFactory');
+            hasRenderModuleFactory = exportClause.elements.some(
+              ({ name }) => name.text === 'renderModuleFactory',
+            );
           }
 
           if (!hasRenderModule) {
-            hasRenderModule = exportClause.elements.some(({ name }) => name.text === 'renderModule');
+            hasRenderModule = exportClause.elements.some(
+              ({ name }) => name.text === 'renderModule',
+            );
           }
         }
       }
@@ -75,7 +86,7 @@ export function updateServerMainFile(): Rule {
 
       // Add missing exports
       if (platformServerExports.length) {
-        const { exportClause } = platformServerExports[0] as ts.ExportDeclaration;
+        const { exportClause } = platformServerExports[0];
         if (!exportClause || ts.isNamespaceExport(exportClause)) {
           continue;
         }
@@ -85,17 +96,15 @@ export function updateServerMainFile(): Rule {
       }
 
       if (!hasRenderModule) {
-        exportSpecifiers.push(ts.createExportSpecifier(
-          undefined,
-          ts.createIdentifier('renderModule'),
-        ));
+        exportSpecifiers.push(
+          ts.createExportSpecifier(undefined, ts.createIdentifier('renderModule')),
+        );
       }
 
       if (!hasRenderModuleFactory) {
-        exportSpecifiers.push(ts.createExportSpecifier(
-          undefined,
-          ts.createIdentifier('renderModuleFactory'),
-        ));
+        exportSpecifiers.push(
+          ts.createExportSpecifier(undefined, ts.createIdentifier('renderModuleFactory')),
+        );
       }
 
       // Create a TS printer to get the text of the export node
@@ -105,7 +114,7 @@ export function updateServerMainFile(): Rule {
 
       // TypeScript will emit the Node with double quotes.
       // In schematics we usually write code with a single quotes
-      // tslint:disable-next-line: no-any
+      // eslint-disable-next-line @typescript-eslint/no-explicit-any
       (moduleSpecifier as any).singleQuote = true;
 
       const newExportDeclarationText = printer.printNode(
@@ -124,9 +133,7 @@ export function updateServerMainFile(): Rule {
         const start = platformServerExports[0].getStart();
         const width = platformServerExports[0].getWidth();
 
-        recorder
-          .remove(start, width)
-          .insertLeft(start, newExportDeclarationText);
+        recorder.remove(start, width).insertLeft(start, newExportDeclarationText);
       } else {
         recorder.insertLeft(source.getWidth(), '\n' + newExportDeclarationText);
       }
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..9dc703b0a0d0 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
@@ -52,7 +52,7 @@ describe('Migration to version 9', () => {
           require.resolve('../../collection.json'),
           'universal',
           {
-            clientProject: 'migration-test',
+            project: 'migration-test',
           },
           tree,
         )
@@ -61,7 +61,9 @@ describe('Migration to version 9', () => {
 
     it(`should add exports from '@angular/platform-server'`, async () => {
       tree.overwrite(mainServerFile, mainServerContent);
-      const tree2 = await schematicRunner.runSchematicAsync('workspace-version-9', {}, tree.branch()).toPromise();
+      const tree2 = await schematicRunner
+        .runSchematicAsync('workspace-version-9', {}, tree.branch())
+        .toPromise();
       expect(tree2.readContent(mainServerFile)).toContain(tags.stripIndents`
         export { AppServerModule } from './app/app.server.module';
         export { renderModule, renderModuleFactory } from '@angular/platform-server';
@@ -69,12 +71,17 @@ describe('Migration to version 9', () => {
     });
 
     it(`should add 'renderModule' and 'renderModuleFactory' to existing '@angular/platform-server' export`, async () => {
-      tree.overwrite(mainServerFile, tags.stripIndents`
+      tree.overwrite(
+        mainServerFile,
+        tags.stripIndents`
         ${mainServerContent}
         export { platformDynamicServer } from '@angular/platform-server';
         export { PlatformConfig } from '@angular/platform-server';
-      `);
-      const tree2 = await schematicRunner.runSchematicAsync('workspace-version-9', {}, tree.branch()).toPromise();
+      `,
+      );
+      const tree2 = await schematicRunner
+        .runSchematicAsync('workspace-version-9', {}, tree.branch())
+        .toPromise();
       expect(tree2.readContent(mainServerFile)).toContain(tags.stripIndents`
         export { AppServerModule } from './app/app.server.module';
         export { platformDynamicServer, renderModule, renderModuleFactory } from '@angular/platform-server';
@@ -83,11 +90,16 @@ describe('Migration to version 9', () => {
     });
 
     it(`should add 'renderModule' to existing '@angular/platform-server' export`, async () => {
-      tree.overwrite(mainServerFile, tags.stripIndents`
+      tree.overwrite(
+        mainServerFile,
+        tags.stripIndents`
         ${mainServerContent}
         export { platformDynamicServer, renderModuleFactory } from '@angular/platform-server';
-      `);
-      const tree2 = await schematicRunner.runSchematicAsync('workspace-version-9', {}, tree.branch()).toPromise();
+      `,
+      );
+      const tree2 = await schematicRunner
+        .runSchematicAsync('workspace-version-9', {}, tree.branch())
+        .toPromise();
       expect(tree2.readContent(mainServerFile)).toContain(tags.stripIndents`
         export { AppServerModule } from './app/app.server.module';
         export { platformDynamicServer, renderModuleFactory, renderModule } from '@angular/platform-server';
@@ -101,7 +113,9 @@ describe('Migration to version 9', () => {
       `;
 
       tree.overwrite(mainServerFile, input);
-      const tree2 = await schematicRunner.runSchematicAsync('workspace-version-9', {}, tree.branch()).toPromise();
+      const tree2 = await schematicRunner
+        .runSchematicAsync('workspace-version-9', {}, tree.branch())
+        .toPromise();
       expect(tree2.readContent(mainServerFile)).toBe(input);
     });
   });
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..9b1694e002bb 100644
--- a/packages/schematics/angular/migrations/update-9/update-workspace-config.ts
+++ b/packages/schematics/angular/migrations/update-9/update-workspace-config.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 { workspaces } from '@angular-devkit/core';
 import { Rule, Tree } from '@angular-devkit/schematics';
 import { allTargetOptions, allWorkspaceTargets, updateWorkspace } from '../../utility/workspace';
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 58e6101ce49c..a667646c8aba 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
@@ -11,7 +11,7 @@ import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/te
 import { WorkspaceTargets } from '../../utility/workspace-models';
 import { ANY_COMPONENT_STYLE_BUDGET } from './update-workspace-config';
 
-// tslint:disable-next-line: no-any
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
 export function getWorkspaceTargets(tree: UnitTestTree, project = 'migration-test'): any {
   return JSON.parse(tree.readContent(workspacePath)).projects[project].architect;
 }
@@ -56,7 +56,6 @@ const stylesExpectWithLazy = [
 
 const workspacePath = '/angular.json';
 
-// tslint:disable:no-big-function
 describe('Migration to version 9', () => {
   describe('Migrate workspace config', () => {
     const schematicRunner = new SchematicTestRunner(
@@ -94,7 +93,10 @@ describe('Migration to version 9', () => {
 
       tree.overwrite('tsconfig.app.json', tsConfig);
 
-      tree.overwrite('angular.json', tree.readContent('angular.json').replace(/development/g, 'production'));
+      tree.overwrite(
+        'angular.json',
+        tree.readContent('angular.json').replace(/development/g, 'production'),
+      );
     });
 
     describe('scripts and style options', () => {
@@ -104,7 +106,9 @@ describe('Migration to version 9', () => {
         config.build.configurations.production.scripts = scriptsWithLazy;
 
         updateWorkspaceTargets(tree, config);
-        const tree2 = await schematicRunner.runSchematicAsync('workspace-version-9', {}, tree.branch()).toPromise();
+        const tree2 = await schematicRunner
+          .runSchematicAsync('workspace-version-9', {}, tree.branch())
+          .toPromise();
         config = getWorkspaceTargets(tree2).build;
         expect(config.options.scripts).toEqual(scriptsExpectWithLazy);
         expect(config.configurations.production.scripts).toEqual(scriptsExpectWithLazy);
@@ -116,7 +120,9 @@ describe('Migration to version 9', () => {
         config.build.configurations.production.styles = stylesWithLazy;
 
         updateWorkspaceTargets(tree, config);
-        const tree2 = await schematicRunner.runSchematicAsync('workspace-version-9', {}, tree.branch()).toPromise();
+        const tree2 = await schematicRunner
+          .runSchematicAsync('workspace-version-9', {}, tree.branch())
+          .toPromise();
         config = getWorkspaceTargets(tree2).build;
         expect(config.options.styles).toEqual(stylesExpectWithLazy);
         expect(config.configurations.production.styles).toEqual(stylesExpectWithLazy);
@@ -128,7 +134,9 @@ describe('Migration to version 9', () => {
         config.test.configurations = { production: { scripts: scriptsWithLazy } };
 
         updateWorkspaceTargets(tree, config);
-        const tree2 = await schematicRunner.runSchematicAsync('workspace-version-9', {}, tree.branch()).toPromise();
+        const tree2 = await schematicRunner
+          .runSchematicAsync('workspace-version-9', {}, tree.branch())
+          .toPromise();
         config = getWorkspaceTargets(tree2).test;
         expect(config.options.scripts).toEqual(scriptsExpectWithLazy);
         expect(config.configurations.production.scripts).toEqual(scriptsExpectWithLazy);
@@ -140,7 +148,9 @@ describe('Migration to version 9', () => {
         config.test.configurations = { production: { styles: stylesWithLazy } };
 
         updateWorkspaceTargets(tree, config);
-        const tree2 = await schematicRunner.runSchematicAsync('workspace-version-9', {}, tree.branch()).toPromise();
+        const tree2 = await schematicRunner
+          .runSchematicAsync('workspace-version-9', {}, tree.branch())
+          .toPromise();
         config = getWorkspaceTargets(tree2).test;
         expect(config.options.styles).toEqual(stylesExpectWithLazy);
         expect(config.configurations.production.styles).toEqual(stylesExpectWithLazy);
@@ -158,7 +168,9 @@ describe('Migration to version 9', () => {
         config.build.configurations.production.budgets = defaultBudget;
         updateWorkspaceTargets(tree, config);
 
-        const tree2 = await schematicRunner.runSchematicAsync('workspace-version-9', {}, tree.branch()).toPromise();
+        const tree2 = await schematicRunner
+          .runSchematicAsync('workspace-version-9', {}, tree.branch())
+          .toPromise();
         config = getWorkspaceTargets(tree2).build;
         expect(config.configurations.production.budgets).toEqual(defaultBudget);
       });
@@ -169,7 +181,9 @@ describe('Migration to version 9', () => {
         config.build.configurations.production.budgets = defaultBudget;
         updateWorkspaceTargets(tree, config);
 
-        const tree2 = await schematicRunner.runSchematicAsync('workspace-version-9', {}, tree.branch()).toPromise();
+        const tree2 = await schematicRunner
+          .runSchematicAsync('workspace-version-9', {}, tree.branch())
+          .toPromise();
         config = getWorkspaceTargets(tree2).build;
         expect(config.configurations.production.budgets).toEqual([
           ...defaultBudget,
@@ -182,7 +196,9 @@ describe('Migration to version 9', () => {
         config.build.configurations.production.budgets = undefined;
         updateWorkspaceTargets(tree, config);
 
-        const tree2 = await schematicRunner.runSchematicAsync('workspace-version-9', {}, tree.branch()).toPromise();
+        const tree2 = await schematicRunner
+          .runSchematicAsync('workspace-version-9', {}, tree.branch())
+          .toPromise();
         config = getWorkspaceTargets(tree2).build;
         expect(config.configurations.production.budgets).toEqual([ANY_COMPONENT_STYLE_BUDGET]);
       });
@@ -194,7 +210,9 @@ describe('Migration to version 9', () => {
         config.build.options.aot = false;
         updateWorkspaceTargets(tree, config);
 
-        const tree2 = await schematicRunner.runSchematicAsync('workspace-version-9', {}, tree.branch()).toPromise();
+        const tree2 = await schematicRunner
+          .runSchematicAsync('workspace-version-9', {}, tree.branch())
+          .toPromise();
         config = getWorkspaceTargets(tree2).build;
         expect(config.options.aot).toBe(true);
       });
@@ -204,7 +222,9 @@ describe('Migration to version 9', () => {
         config.build.options.aot = undefined;
         updateWorkspaceTargets(tree, config);
 
-        const tree2 = await schematicRunner.runSchematicAsync('workspace-version-9', {}, tree.branch()).toPromise();
+        const tree2 = await schematicRunner
+          .runSchematicAsync('workspace-version-9', {}, tree.branch())
+          .toPromise();
         config = getWorkspaceTargets(tree2).build;
         expect(config.options.aot).toBe(true);
       });
@@ -227,7 +247,9 @@ describe('Migration to version 9', () => {
         config.build.options.aot = false;
         updateWorkspaceTargets(tree, config);
 
-        const tree2 = await schematicRunner.runSchematicAsync('workspace-version-9', {}, tree.branch()).toPromise();
+        const tree2 = await schematicRunner
+          .runSchematicAsync('workspace-version-9', {}, tree.branch())
+          .toPromise();
         config = getWorkspaceTargets(tree2).build;
         expect(config.options.aot).toBe(false);
       });
@@ -249,7 +271,9 @@ describe('Migration to version 9', () => {
         config.build.options.aot = false;
         updateWorkspaceTargets(tree, config);
 
-        const tree2 = await schematicRunner.runSchematicAsync('workspace-version-9', {}, tree.branch()).toPromise();
+        const tree2 = await schematicRunner
+          .runSchematicAsync('workspace-version-9', {}, tree.branch())
+          .toPromise();
         config = getWorkspaceTargets(tree2).build;
         expect(config.options.aot).toBe(false);
       });
@@ -260,7 +284,9 @@ describe('Migration to version 9', () => {
         config.build.configurations.production.aot = true;
         updateWorkspaceTargets(tree, config);
 
-        const tree2 = await schematicRunner.runSchematicAsync('workspace-version-9', {}, tree.branch()).toPromise();
+        const tree2 = await schematicRunner
+          .runSchematicAsync('workspace-version-9', {}, tree.branch())
+          .toPromise();
         config = getWorkspaceTargets(tree2).build;
         expect(config.options.aot).toBe(true);
         expect(config.configurations.production.aot).toBeUndefined();
@@ -274,13 +300,16 @@ describe('Migration to version 9', () => {
             require.resolve('../../collection.json'),
             'universal',
             {
-              clientProject: 'migration-test',
+              project: 'migration-test',
             },
             tree,
           )
           .toPromise();
 
-        tree.overwrite('angular.json', tree.readContent('angular.json').replace(/development/g, 'production'));
+        tree.overwrite(
+          'angular.json',
+          tree.readContent('angular.json').replace(/development/g, 'production'),
+        );
       });
 
       it('should add optimization option when not defined', async () => {
@@ -288,7 +317,9 @@ describe('Migration to version 9', () => {
         config.server.configurations.production.optimization = undefined;
         updateWorkspaceTargets(tree, config);
 
-        const tree2 = await schematicRunner.runSchematicAsync('workspace-version-9', {}, tree.branch()).toPromise();
+        const tree2 = await schematicRunner
+          .runSchematicAsync('workspace-version-9', {}, tree.branch())
+          .toPromise();
         config = getWorkspaceTargets(tree2).server.configurations;
         expect(config.production.optimization).toBe(true);
       });
@@ -298,7 +329,9 @@ describe('Migration to version 9', () => {
         config.server.configurations.production.optimization = false;
         updateWorkspaceTargets(tree, config);
 
-        const tree2 = await schematicRunner.runSchematicAsync('workspace-version-9', {}, tree.branch()).toPromise();
+        const tree2 = await schematicRunner
+          .runSchematicAsync('workspace-version-9', {}, tree.branch())
+          .toPromise();
         config = getWorkspaceTargets(tree2).server.configurations;
         expect(config.production.optimization).toBe(true);
       });
@@ -311,11 +344,12 @@ describe('Migration to version 9', () => {
         };
         updateWorkspaceTargets(tree, config);
 
-        const tree2 = await schematicRunner.runSchematicAsync('workspace-version-9', {}, tree.branch()).toPromise();
+        const tree2 = await schematicRunner
+          .runSchematicAsync('workspace-version-9', {}, tree.branch())
+          .toPromise();
         config = getWorkspaceTargets(tree2).server.configurations;
         expect(config.production.optimization).toBe(true);
       });
     });
-
   });
 });
diff --git a/packages/schematics/angular/migrations/update-9/utils.ts b/packages/schematics/angular/migrations/update-9/utils.ts
index 5f339e74d5c2..c8195333d8f8 100644
--- a/packages/schematics/angular/migrations/update-9/utils.ts
+++ b/packages/schematics/angular/migrations/update-9/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 { dirname, normalize, resolve } from '@angular-devkit/core';
 import { Tree } from '@angular-devkit/schematics';
 import { JSONFile } from '../../utility/json-file';
diff --git a/packages/schematics/angular/migrations/update-9/utils_spec.ts b/packages/schematics/angular/migrations/update-9/utils_spec.ts
index 0726bb04bc8a..4f36b2806913 100644
--- a/packages/schematics/angular/migrations/update-9/utils_spec.ts
+++ b/packages/schematics/angular/migrations/update-9/utils_spec.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 { HostTree } from '@angular-devkit/schematics';
 import { isIvyEnabled } from './utils';
 
@@ -18,88 +18,124 @@ describe('migrations update-9 utils', () => {
     });
 
     it('should return false when disabled in base tsconfig', () => {
-      tree.create('tsconfig.json', JSON.stringify({
-        angularCompilerOptions: {
-          enableIvy: false,
-        },
-      }));
-
-      tree.create('foo/tsconfig.app.json', JSON.stringify({
-        extends: '../tsconfig.json',
-      }));
+      tree.create(
+        'tsconfig.json',
+        JSON.stringify({
+          angularCompilerOptions: {
+            enableIvy: false,
+          },
+        }),
+      );
+
+      tree.create(
+        'foo/tsconfig.app.json',
+        JSON.stringify({
+          extends: '../tsconfig.json',
+        }),
+      );
 
       expect(isIvyEnabled(tree, 'foo/tsconfig.app.json')).toBe(false);
     });
 
     it('should return true when enable in child tsconfig but disabled in base tsconfig', () => {
-      tree.create('tsconfig.json', JSON.stringify({
-        angularCompilerOptions: {
-          enableIvy: false,
-        },
-      }));
-
-      tree.create('foo/tsconfig.app.json', JSON.stringify({
-        extends: '../tsconfig.json',
-        angularCompilerOptions: {
-          enableIvy: true,
-        },
-      }));
+      tree.create(
+        'tsconfig.json',
+        JSON.stringify({
+          angularCompilerOptions: {
+            enableIvy: false,
+          },
+        }),
+      );
+
+      tree.create(
+        'foo/tsconfig.app.json',
+        JSON.stringify({
+          extends: '../tsconfig.json',
+          angularCompilerOptions: {
+            enableIvy: true,
+          },
+        }),
+      );
 
       expect(isIvyEnabled(tree, 'foo/tsconfig.app.json')).toBe(true);
     });
 
     it('should return false when disabled in child tsconfig but enabled in base tsconfig', () => {
-      tree.create('tsconfig.json', JSON.stringify({
-        angularCompilerOptions: {
-          enableIvy: true,
-        },
-      }));
-
-      tree.create('foo/tsconfig.app.json', JSON.stringify({
-        extends: '../tsconfig.json',
-        angularCompilerOptions: {
-          enableIvy: false,
-        },
-      }));
+      tree.create(
+        'tsconfig.json',
+        JSON.stringify({
+          angularCompilerOptions: {
+            enableIvy: true,
+          },
+        }),
+      );
+
+      tree.create(
+        'foo/tsconfig.app.json',
+        JSON.stringify({
+          extends: '../tsconfig.json',
+          angularCompilerOptions: {
+            enableIvy: false,
+          },
+        }),
+      );
 
       expect(isIvyEnabled(tree, 'foo/tsconfig.app.json')).toBe(false);
     });
 
     it('should return false when disabled in base with multiple extends', () => {
-      tree.create('tsconfig.json', JSON.stringify({
-        angularCompilerOptions: {
-          enableIvy: false,
-        },
-      }));
-
-      tree.create('foo/tsconfig.project.json', JSON.stringify({
-        extends: '../tsconfig.json',
-      }));
-
-      tree.create('foo/tsconfig.app.json', JSON.stringify({
-        extends: './tsconfig.project.json',
-      }));
+      tree.create(
+        'tsconfig.json',
+        JSON.stringify({
+          angularCompilerOptions: {
+            enableIvy: false,
+          },
+        }),
+      );
+
+      tree.create(
+        'foo/tsconfig.project.json',
+        JSON.stringify({
+          extends: '../tsconfig.json',
+        }),
+      );
+
+      tree.create(
+        'foo/tsconfig.app.json',
+        JSON.stringify({
+          extends: './tsconfig.project.json',
+        }),
+      );
 
       expect(isIvyEnabled(tree, 'foo/tsconfig.app.json')).toBe(false);
     });
 
     it('should return true when enable in intermediate tsconfig with multiple extends', () => {
-      tree.create('tsconfig.json', JSON.stringify({
-        angularCompilerOptions: {
-          enableIvy: false,
-        },
-      }));
-
-      tree.create('foo/tsconfig.project.json', JSON.stringify({
-        extends: '../tsconfig.json',
-        angularCompilerOptions: {
-          enableIvy: true,
-        },
-      }));
-
-      tree.create('foo/tsconfig.app.json', JSON.stringify({
-        extends: './tsconfig.project.json',
-      }));
+      tree.create(
+        'tsconfig.json',
+        JSON.stringify({
+          angularCompilerOptions: {
+            enableIvy: false,
+          },
+        }),
+      );
+
+      tree.create(
+        'foo/tsconfig.project.json',
+        JSON.stringify({
+          extends: '../tsconfig.json',
+          angularCompilerOptions: {
+            enableIvy: true,
+          },
+        }),
+      );
+
+      tree.create(
+        'foo/tsconfig.app.json',
+        JSON.stringify({
+          extends: './tsconfig.project.json',
+        }),
+      );
 
       expect(isIvyEnabled(tree, 'foo/tsconfig.app.json')).toBe(true);
     });
diff --git a/packages/schematics/angular/module/index.ts b/packages/schematics/angular/module/index.ts
index 4fd84884a6ec..efc43130bd09 100644
--- a/packages/schematics/angular/module/index.ts
+++ b/packages/schematics/angular/module/index.ts
@@ -1,10 +1,11 @@
 /**
-* @license
-* Copyright Google Inc. All Rights Reserved.
-*
-* Use of this source code is governed by an MIT-style license that can be
-* found in the LICENSE file at https://angular.io/license
-*/
+ * @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,
@@ -24,18 +25,23 @@ import { Schema as ComponentOptions } from '../component/schema';
 import * as ts from '../third_party/github.com/Microsoft/TypeScript/lib/typescript';
 import { addImportToModule, addRouteDeclarationToModule } from '../utility/ast-utils';
 import { InsertChange } from '../utility/change';
-import { MODULE_EXT, ROUTING_MODULE_EXT, buildRelativePath, findModuleFromOptions } from '../utility/find-module';
+import {
+  MODULE_EXT,
+  ROUTING_MODULE_EXT,
+  buildRelativePath,
+  findModuleFromOptions,
+} from '../utility/find-module';
 import { applyLintFix } from '../utility/lint-fix';
 import { parseName } from '../utility/parse-name';
 import { createDefaultPath } from '../utility/workspace';
-import { RoutingScope, Schema as ModuleOptions } from './schema';
+import { Schema as ModuleOptions, RoutingScope } from './schema';
 
 function buildRelativeModulePath(options: ModuleOptions, modulePath: string): string {
   const importModulePath = normalize(
-    `/${options.path}/`
-    + (options.flat ? '' : strings.dasherize(options.name) + '/')
-    + strings.dasherize(options.name)
-    + '.module',
+    `/${options.path}/` +
+      (options.flat ? '' : strings.dasherize(options.name) + '/') +
+      strings.dasherize(options.name) +
+      '.module',
   );
 
   return buildRelativePath(modulePath, importModulePath);
@@ -57,10 +63,12 @@ function addDeclarationToNgModule(options: ModuleOptions): Rule {
     const source = ts.createSourceFile(modulePath, sourceText, ts.ScriptTarget.Latest, true);
 
     const relativePath = buildRelativeModulePath(options, modulePath);
-    const changes = addImportToModule(source,
-                                      modulePath,
-                                      strings.classify(`${options.name}Module`),
-                                      relativePath);
+    const changes = addImportToModule(
+      source,
+      modulePath,
+      strings.classify(`${options.name}Module`),
+      relativePath,
+    );
 
     const recorder = host.beginUpdate(modulePath);
     for (const change of changes) {
@@ -153,10 +161,10 @@ export default function (options: ModuleOptions): Rule {
     const templateSource = apply(url('./files'), [
       options.routing || (isLazyLoadedModuleGen && routingModulePath)
         ? noop()
-        : filter(path => !path.endsWith('-routing.module.ts.template')),
+        : filter((path) => !path.endsWith('-routing.module.ts.template')),
       applyTemplates({
         ...strings,
-        'if-flat': (s: string) => options.flat ? '' : s,
+        'if-flat': (s: string) => (options.flat ? '' : s),
         lazyRoute: isLazyLoadedModuleGen,
         lazyRouteWithoutRouteModule: isLazyLoadedModuleGen && !routingModulePath,
         lazyRouteWithRouteModule: isLazyLoadedModuleGen && !!routingModulePath,
@@ -165,8 +173,9 @@ export default function (options: ModuleOptions): Rule {
       move(parsedPath.path),
     ]);
     const moduleDasherized = strings.dasherize(options.name);
-    const modulePath =
-      `${!options.flat ? moduleDasherized + '/' : ''}${moduleDasherized}.module.ts`;
+    const modulePath = `${
+      !options.flat ? moduleDasherized + '/' : ''
+    }${moduleDasherized}.module.ts`;
 
     const componentOptions: ComponentOptions = {
       module: modulePath,
@@ -180,9 +189,7 @@ export default function (options: ModuleOptions): Rule {
       !isLazyLoadedModuleGen ? addDeclarationToNgModule(options) : noop(),
       addRouteDeclarationToNgModule(options, routingModulePath),
       mergeWith(templateSource),
-      isLazyLoadedModuleGen
-        ? schematic('component', componentOptions)
-        : noop(),
+      isLazyLoadedModuleGen ? schematic('component', componentOptions) : noop(),
       options.lintFix ? applyLintFix(options.path) : noop(),
     ]);
   };
diff --git a/packages/schematics/angular/module/index_spec.ts b/packages/schematics/angular/module/index_spec.ts
index 8cd9f1c62c21..11d80cb1fc87 100644
--- a/packages/schematics/angular/module/index_spec.ts
+++ b/packages/schematics/angular/module/index_spec.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
  */
+
 import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
 import { Schema as ApplicationOptions } from '../application/schema';
 import { Schema as WorkspaceOptions } from '../workspace/schema';
 import { Schema as ModuleOptions } from './schema';
 
-// tslint:disable-next-line: no-big-function
 describe('Module Schematic', () => {
   const schematicRunner = new SchematicTestRunner(
     '@schematics/angular',
@@ -40,7 +40,8 @@ describe('Module 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();
   });
 
@@ -73,17 +74,29 @@ describe('Module Schematic', () => {
   it('should import into another module (deep)', async () => {
     let tree = appTree;
 
-    tree = await schematicRunner.runSchematicAsync('module', {
-      ...defaultOptions,
-      path: 'projects/bar/src/app/sub1',
-      name: 'test1',
-    }, tree).toPromise();
-    tree = await schematicRunner.runSchematicAsync('module', {
-      ...defaultOptions,
-      path: 'projects/bar/src/app/sub2',
-      name: 'test2',
-      module: '../sub1/test1',
-    }, tree).toPromise();
+    tree = await schematicRunner
+      .runSchematicAsync(
+        'module',
+        {
+          ...defaultOptions,
+          path: 'projects/bar/src/app/sub1',
+          name: 'test1',
+        },
+        tree,
+      )
+      .toPromise();
+    tree = await schematicRunner
+      .runSchematicAsync(
+        'module',
+        {
+          ...defaultOptions,
+          path: 'projects/bar/src/app/sub2',
+          name: 'test2',
+          module: '../sub1/test1',
+        },
+        tree,
+      )
+      .toPromise();
 
     const content = tree.readContent('/projects/bar/src/app/sub1/test1/test1.module.ts');
     expect(content).toMatch(/import { Test2Module } from '..\/..\/sub2\/test2\/test2.module'/);
@@ -98,7 +111,9 @@ describe('Module Schematic', () => {
     expect(files).toContain('/projects/bar/src/app/foo/foo-routing.module.ts');
     const moduleContent = tree.readContent('/projects/bar/src/app/foo/foo.module.ts');
     expect(moduleContent).toMatch(/import { FooRoutingModule } from '.\/foo-routing.module'/);
-    const routingModuleContent = tree.readContent('/projects/bar/src/app/foo/foo-routing.module.ts');
+    const routingModuleContent = tree.readContent(
+      '/projects/bar/src/app/foo/foo-routing.module.ts',
+    );
     expect(routingModuleContent).toMatch(/RouterModule.forChild\(routes\)/);
   });
 
@@ -114,7 +129,8 @@ describe('Module 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('module', defaultOptions, appTree)
+    appTree = await schematicRunner
+      .runSchematicAsync('module', defaultOptions, appTree)
       .toPromise();
     expect(appTree.files).toContain('/projects/bar/custom/app/foo/foo.module.ts');
   });
@@ -130,27 +146,35 @@ describe('Module Schematic', () => {
       const tree = await schematicRunner.runSchematicAsync('module', options, appTree).toPromise();
       const files = tree.files;
 
-      expect(files).toEqual(jasmine.arrayContaining([
-        '/projects/bar/src/app/foo/foo.module.ts',
-        '/projects/bar/src/app/foo/foo-routing.module.ts',
-        '/projects/bar/src/app/foo/foo.component.ts',
-        '/projects/bar/src/app/foo/foo.component.html',
-        '/projects/bar/src/app/foo/foo.component.css',
-      ]));
+      expect(files).toEqual(
+        jasmine.arrayContaining([
+          '/projects/bar/src/app/foo/foo.module.ts',
+          '/projects/bar/src/app/foo/foo-routing.module.ts',
+          '/projects/bar/src/app/foo/foo.component.ts',
+          '/projects/bar/src/app/foo/foo.component.html',
+          '/projects/bar/src/app/foo/foo.component.css',
+        ]),
+      );
 
-      const appRoutingModuleContent = tree.readContent('/projects/bar/src/app/app-routing.module.ts');
+      const appRoutingModuleContent = tree.readContent(
+        '/projects/bar/src/app/app-routing.module.ts',
+      );
       expect(appRoutingModuleContent).toMatch(
         /path: '\/new-route', loadChildren: \(\) => import\('.\/foo\/foo.module'\).then\(m => m.FooModule\)/,
       );
 
-      const fooRoutingModuleContent = tree.readContent('/projects/bar/src/app/foo/foo-routing.module.ts');
+      const fooRoutingModuleContent = tree.readContent(
+        '/projects/bar/src/app/foo/foo-routing.module.ts',
+      );
       expect(fooRoutingModuleContent).toMatch(/RouterModule.forChild\(routes\)/);
-      expect(fooRoutingModuleContent)
-        .toMatch(/const routes: Routes = \[\r?\n?\s*{ path: '', component: FooComponent }\r?\n?\s*\];/);
+      expect(fooRoutingModuleContent).toMatch(
+        /const routes: Routes = \[\r?\n?\s*{ path: '', component: FooComponent }\r?\n?\s*\];/,
+      );
     });
 
     it('should generate a lazy loaded module with embedded route declarations', async () => {
-      appTree.overwrite('/projects/bar/src/app/app.module.ts',
+      appTree.overwrite(
+        '/projects/bar/src/app/app.module.ts',
         `
         import { NgModule } from '@angular/core';
         import { AppComponent } from './app.component';
@@ -187,67 +211,82 @@ describe('Module Schematic', () => {
 
       const fooModuleContent = tree.readContent('/projects/bar/src/app/foo/foo.module.ts');
       expect(fooModuleContent).toMatch(/RouterModule.forChild\(routes\)/);
-      expect(fooModuleContent)
-        .toMatch(/const routes: Routes = \[\r?\n?\s*{ path: '', component: FooComponent }\r?\n?\s*\];/);
+      expect(fooModuleContent).toMatch(
+        /const routes: Routes = \[\r?\n?\s*{ path: '', component: FooComponent }\r?\n?\s*\];/,
+      );
     });
 
     it('should generate a lazy loaded module when "flat" flag is true', async () => {
-      const tree = await schematicRunner.runSchematicAsync(
-        'module',
-        { ...options, flat: true },
-        appTree,
-      ).toPromise();
+      const tree = await schematicRunner
+        .runSchematicAsync('module', { ...options, flat: true }, appTree)
+        .toPromise();
       const files = tree.files;
 
-      expect(files).toEqual(jasmine.arrayContaining([
-        '/projects/bar/src/app/foo.module.ts',
-        '/projects/bar/src/app/foo-routing.module.ts',
-        '/projects/bar/src/app/foo.component.ts',
-        '/projects/bar/src/app/foo.component.html',
-        '/projects/bar/src/app/foo.component.css',
-      ]));
+      expect(files).toEqual(
+        jasmine.arrayContaining([
+          '/projects/bar/src/app/foo.module.ts',
+          '/projects/bar/src/app/foo-routing.module.ts',
+          '/projects/bar/src/app/foo.component.ts',
+          '/projects/bar/src/app/foo.component.html',
+          '/projects/bar/src/app/foo.component.css',
+        ]),
+      );
 
-      const appRoutingModuleContent = tree.readContent('/projects/bar/src/app/app-routing.module.ts');
+      const appRoutingModuleContent = tree.readContent(
+        '/projects/bar/src/app/app-routing.module.ts',
+      );
       expect(appRoutingModuleContent).toMatch(
         /path: '\/new-route', loadChildren: \(\) => import\('.\/foo.module'\).then\(m => m.FooModule\)/,
       );
     });
 
     it('should generate a lazy loaded module and add route in another parallel routing module', async () => {
-      await schematicRunner.runSchematicAsync(
-        'module',
-        {
-          ...defaultOptions,
-          name: 'foo',
-          routing: true,
-        },
-        appTree,
-      ).toPromise();
-
-      const tree = await schematicRunner.runSchematicAsync(
-        'module',
-        {
-          ...defaultOptions,
-          name: 'bar',
-          module: 'foo',
-          route: 'new-route',
-        },
-        appTree,
-      ).toPromise();
+      await schematicRunner
+        .runSchematicAsync(
+          'module',
+          {
+            ...defaultOptions,
+            name: 'foo',
+            routing: true,
+          },
+          appTree,
+        )
+        .toPromise();
+
+      const tree = await schematicRunner
+        .runSchematicAsync(
+          'module',
+          {
+            ...defaultOptions,
+            name: 'bar',
+            module: 'foo',
+            route: 'new-route',
+          },
+          appTree,
+        )
+        .toPromise();
+
+      expect(tree.files).toEqual(
+        jasmine.arrayContaining([
+          '/projects/bar/src/app/foo/foo-routing.module.ts',
+          '/projects/bar/src/app/foo/foo.module.ts',
+          '/projects/bar/src/app/bar/bar-routing.module.ts',
+          '/projects/bar/src/app/bar/bar.module.ts',
+          '/projects/bar/src/app/bar/bar.component.ts',
+        ]),
+      );
 
-      expect(tree.files).toEqual(jasmine.arrayContaining([
-        '/projects/bar/src/app/foo/foo-routing.module.ts',
-        '/projects/bar/src/app/foo/foo.module.ts',
+      const barRoutingModuleContent = tree.readContent(
         '/projects/bar/src/app/bar/bar-routing.module.ts',
-        '/projects/bar/src/app/bar/bar.module.ts',
-        '/projects/bar/src/app/bar/bar.component.ts',
-      ]));
-
-      const barRoutingModuleContent = tree.readContent('/projects/bar/src/app/bar/bar-routing.module.ts');
+      );
       expect(barRoutingModuleContent).toContain(`path: '', component: BarComponent `);
 
-      const fooRoutingModuleContent = tree.readContent('/projects/bar/src/app/foo/foo-routing.module.ts');
-      expect(fooRoutingModuleContent).toContain(`loadChildren: () => import('../bar/bar.module').then(m => m.BarModule)`);
+      const fooRoutingModuleContent = tree.readContent(
+        '/projects/bar/src/app/foo/foo-routing.module.ts',
+      );
+      expect(fooRoutingModuleContent).toContain(
+        `loadChildren: () => import('../bar/bar.module').then(m => m.BarModule)`,
+      );
     });
   });
 });
diff --git a/packages/schematics/angular/module/schema.json b/packages/schematics/angular/module/schema.json
index c8abc36729c1..fe8716c2162f 100644
--- a/packages/schematics/angular/module/schema.json
+++ b/packages/schematics/angular/module/schema.json
@@ -4,7 +4,7 @@
   "title": "Angular Module Options Schema",
   "type": "object",
   "additionalProperties": false,
-  "description": "Creates a new generic NgModule definition in the given or default project.",
+  "description": "Creates a new, generic NgModule definition in the given or default project.",
   "properties": {
     "name": {
       "type": "string",
@@ -55,7 +55,7 @@
       "default": true,
       "visible": false
     },
-    "module":  {
+    "module": {
       "type": "string",
       "description": "The declaring NgModule.",
       "alias": "m"
@@ -67,7 +67,5 @@
       "x-deprecated": "Use \"ng lint --fix\" directly instead."
     }
   },
-  "required": [
-    "name"
-  ]
+  "required": ["name"]
 }
diff --git a/packages/schematics/angular/ng-new/index.ts b/packages/schematics/angular/ng-new/index.ts
index 80f57210733f..fb57365c41b0 100644
--- a/packages/schematics/angular/ng-new/index.ts
+++ b/packages/schematics/angular/ng-new/index.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 {
   Rule,
   SchematicContext,
@@ -28,8 +29,7 @@ import { validateProjectName } from '../utility/validation';
 import { Schema as WorkspaceOptions } from '../workspace/schema';
 import { Schema as NgNewOptions } from './schema';
 
-
-export default function(options: NgNewOptions): Rule {
+export default function (options: NgNewOptions): Rule {
   if (!options.name) {
     throw new SchematicsException(`Invalid options, "name" is required.`);
   }
@@ -91,15 +91,11 @@ export default function(options: NgNewOptions): Rule {
         }
       }
       if (!options.skipGit) {
-        const commit = typeof options.commit == 'object'
-          ? options.commit
-          : (!!options.commit ? {} : false);
+        const commit =
+          typeof options.commit == 'object' ? options.commit : options.commit ? {} : false;
 
         context.addTask(
-          new RepositoryInitializerTask(
-            options.directory,
-            commit,
-          ),
+          new RepositoryInitializerTask(options.directory, commit),
           packageTask ? [packageTask] : [],
         );
       }
diff --git a/packages/schematics/angular/ng-new/index_spec.ts b/packages/schematics/angular/ng-new/index_spec.ts
index f5bb57985542..4965f098cfd9 100644
--- a/packages/schematics/angular/ng-new/index_spec.ts
+++ b/packages/schematics/angular/ng-new/index_spec.ts
@@ -1,14 +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 { SchematicTestRunner } from '@angular-devkit/schematics/testing';
 import { Schema as NgNewOptions } from './schema';
 
-
 describe('Ng New Schematic', () => {
   const schematicRunner = new SchematicTestRunner(
     '@schematics/angular',
@@ -33,15 +33,13 @@ describe('Ng New Schematic', () => {
 
     const tree = await schematicRunner.runSchematicAsync('ng-new', options).toPromise();
     const files = tree.files;
-    expect(files).toEqual(jasmine.arrayContaining([
-      '/bar/tsconfig.app.json',
-      '/bar/src/main.ts',
-      '/bar/src/app/app.module.ts',
-      '/bar/e2e/src/app.po.ts',
-      '/bar/e2e/src/app.e2e-spec.ts',
-      '/bar/e2e/tsconfig.json',
-      '/bar/e2e/protractor.conf.js',
-    ]));
+    expect(files).toEqual(
+      jasmine.arrayContaining([
+        '/bar/tsconfig.app.json',
+        '/bar/src/main.ts',
+        '/bar/src/app/app.module.ts',
+      ]),
+    );
   });
 
   it('should should set the prefix in angular.json and in app.component.ts', async () => {
diff --git a/packages/schematics/angular/ng-new/schema.json b/packages/schematics/angular/ng-new/schema.json
index fc725d8fc288..33cac6a11bf3 100644
--- a/packages/schematics/angular/ng-new/schema.json
+++ b/packages/schematics/angular/ng-new/schema.json
@@ -3,6 +3,7 @@
   "$id": "SchematicsAngularNgNew",
   "title": "Angular Ng New Options Schema",
   "type": "object",
+  "description": "Creates a new project by combining the workspace and application schematics.",
   "additionalProperties": false,
   "properties": {
     "directory": {
@@ -106,7 +107,7 @@
     "style": {
       "description": "The file extension or preprocessor to use for style files.",
       "type": "string",
-      "enum": ["css", "scss", "sass", "less", "styl"],
+      "enum": ["css", "scss", "sass", "less"],
       "x-user-analytics": 5
     },
     "skipTests": {
diff --git a/packages/schematics/angular/no_typescript_runtime_dep_spec.js b/packages/schematics/angular/no_typescript_runtime_dep_spec.js
index df1cc2f2332a..07319cc439ea 100644
--- a/packages/schematics/angular/no_typescript_runtime_dep_spec.js
+++ b/packages/schematics/angular/no_typescript_runtime_dep_spec.js
@@ -1,29 +1,31 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-
 const fs = require('fs');
 const path = require('path');
 
 const pkg = path.dirname(require.resolve(__filename));
 describe('@schematics/angular javascript code', () => {
-  fs.readdirSync(pkg).forEach(d => {
+  fs.readdirSync(pkg).forEach((d) => {
     const dir = path.join(pkg, d);
     if (!fs.statSync(dir).isDirectory()) return;
 
     it(`${d} has no typescript dependency`, () => {
       function check(subdir) {
-        fs.readdirSync(subdir).forEach(f => {
+        fs.readdirSync(subdir).forEach((f) => {
           const file = path.join(subdir, f);
           if (fs.statSync(file).isDirectory()) {
             check(file);
           } else if (file.endsWith('.js')) {
             const content = fs.readFileSync(file, { encoding: 'utf-8' });
-            if (content.includes(`require("typescript")`) || content.includes(`require('typescript')`)) {
+            if (
+              content.includes(`require("typescript")`) ||
+              content.includes(`require('typescript')`)
+            ) {
               fail(`${file} has a typescript import`);
             }
           }
diff --git a/packages/schematics/angular/package.json b/packages/schematics/angular/package.json
index fa634e3887b0..2dbe09db2bc4 100644
--- a/packages/schematics/angular/package.json
+++ b/packages/schematics/angular/package.json
@@ -2,6 +2,7 @@
   "name": "@schematics/angular",
   "version": "0.0.0",
   "description": "Schematics specific to Angular",
+  "homepage": "https://github.com/angular/angular-cli",
   "keywords": [
     "blueprints",
     "code generation",
diff --git a/packages/schematics/angular/pipe/index.ts b/packages/schematics/angular/pipe/index.ts
index 0e6345076490..858c51225b9a 100644
--- a/packages/schematics/angular/pipe/index.ts
+++ b/packages/schematics/angular/pipe/index.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 { strings } from '@angular-devkit/core';
 import {
   Rule,
@@ -28,7 +29,6 @@ import { parseName } from '../utility/parse-name';
 import { createDefaultPath } from '../utility/workspace';
 import { Schema as PipeOptions } from './schema';
 
-
 function addDeclarationToNgModule(options: PipeOptions): Rule {
   return (host: Tree) => {
     if (options.skipImport || !options.module) {
@@ -43,14 +43,18 @@ function addDeclarationToNgModule(options: PipeOptions): Rule {
     const sourceText = text.toString('utf-8');
     const source = ts.createSourceFile(modulePath, sourceText, ts.ScriptTarget.Latest, true);
 
-    const pipePath = `/${options.path}/`
-                     + (options.flat ? '' : strings.dasherize(options.name) + '/')
-                     + strings.dasherize(options.name)
-                     + '.pipe';
+    const pipePath =
+      `/${options.path}/` +
+      (options.flat ? '' : strings.dasherize(options.name) + '/') +
+      strings.dasherize(options.name) +
+      '.pipe';
     const relativePath = buildRelativePath(modulePath, pipePath);
-    const changes = addDeclarationToModule(source, modulePath,
-                                           strings.classify(`${options.name}Pipe`),
-                                           relativePath);
+    const changes = addDeclarationToModule(
+      source,
+      modulePath,
+      strings.classify(`${options.name}Pipe`),
+      relativePath,
+    );
     const recorder = host.beginUpdate(modulePath);
     for (const change of changes) {
       if (change instanceof InsertChange) {
@@ -68,9 +72,12 @@ function addDeclarationToNgModule(options: PipeOptions): Rule {
       const source = ts.createSourceFile(modulePath, sourceText, ts.ScriptTarget.Latest, true);
 
       const exportRecorder = host.beginUpdate(modulePath);
-      const exportChanges = addExportToModule(source, modulePath,
-                                              strings.classify(`${options.name}Pipe`),
-                                              relativePath);
+      const exportChanges = addExportToModule(
+        source,
+        modulePath,
+        strings.classify(`${options.name}Pipe`),
+        relativePath,
+      );
 
       for (const change of exportChanges) {
         if (change instanceof InsertChange) {
@@ -97,10 +104,10 @@ export default function (options: PipeOptions): Rule {
     options.path = parsedPath.path;
 
     const templateSource = apply(url('./files'), [
-      options.skipTests ? filter(path => !path.endsWith('.spec.ts.template')) : noop(),
+      options.skipTests ? filter((path) => !path.endsWith('.spec.ts.template')) : noop(),
       applyTemplates({
         ...strings,
-        'if-flat': (s: string) => options.flat ? '' : s,
+        'if-flat': (s: string) => (options.flat ? '' : s),
         ...options,
       }),
       move(parsedPath.path),
diff --git a/packages/schematics/angular/pipe/index_spec.ts b/packages/schematics/angular/pipe/index_spec.ts
index 263236bd72b4..3dd75e667efa 100644
--- a/packages/schematics/angular/pipe/index_spec.ts
+++ b/packages/schematics/angular/pipe/index_spec.ts
@@ -1,17 +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 { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
 import { Schema as ApplicationOptions } from '../application/schema';
 import { createAppModule, getFileContent } from '../utility/test';
 import { Schema as WorkspaceOptions } from '../workspace/schema';
 import { Schema as PipeOptions } from './schema';
 
-
 describe('Pipe Schematic', () => {
   const schematicRunner = new SchematicTestRunner(
     '@schematics/angular',
@@ -42,7 +42,8 @@ describe('Pipe 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();
   });
 
@@ -81,11 +82,9 @@ describe('Pipe Schematic', () => {
   });
 
   it('should handle a path in the name and module options', async () => {
-    appTree = await schematicRunner.runSchematicAsync(
-      'module',
-      { name: 'admin/module', project: 'bar' },
-      appTree,
-    ).toPromise();
+    appTree = await schematicRunner
+      .runSchematicAsync('module', { name: 'admin/module', project: 'bar' }, appTree)
+      .toPromise();
 
     const options = { ...defaultOptions, module: 'admin/module' };
     appTree = await schematicRunner.runSchematicAsync('pipe', options, appTree).toPromise();
@@ -99,7 +98,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: \[\n(\s*)  FooPipe\n\1\]/);
+    expect(appModuleContent).toMatch(/exports: \[\n(\s*) {2}FooPipe\n\1\]/);
   });
 
   it('should respect the flat flag', async () => {
@@ -139,4 +138,13 @@ describe('Pipe Schematic', () => {
     appTree = await schematicRunner.runSchematicAsync('pipe', defaultOptions, appTree).toPromise();
     expect(appTree.files).toContain('/projects/bar/custom/app/foo.pipe.ts');
   });
+
+  it('should respect the skipTests flag', async () => {
+    const options = { ...defaultOptions, skipTests: true };
+
+    const tree = await schematicRunner.runSchematicAsync('pipe', options, appTree).toPromise();
+    const files = tree.files;
+    expect(files).not.toContain('/projects/bar/src/app/foo.pipe.spec.ts');
+    expect(files).toContain('/projects/bar/src/app/foo.pipe.ts');
+  });
 });
diff --git a/packages/schematics/angular/pipe/schema.json b/packages/schematics/angular/pipe/schema.json
index d4cb51981e43..d65280d30555 100644
--- a/packages/schematics/angular/pipe/schema.json
+++ b/packages/schematics/angular/pipe/schema.json
@@ -4,7 +4,7 @@
   "title": "Angular Pipe Options Schema",
   "type": "object",
   "additionalProperties": false,
-  "description": "Creates a new generic pipe definition in the given or default project.",
+  "description": "Creates a new, generic pipe definition in the given or default project.",
   "properties": {
     "name": {
       "type": "string",
@@ -64,7 +64,5 @@
       "x-deprecated": "Use \"ng lint --fix\" directly instead."
     }
   },
-  "required": [
-    "name"
-  ]
+  "required": ["name"]
 }
diff --git a/packages/schematics/angular/resolver/index.ts b/packages/schematics/angular/resolver/index.ts
index 73f3282982d3..35ae7dd27503 100644
--- a/packages/schematics/angular/resolver/index.ts
+++ b/packages/schematics/angular/resolver/index.ts
@@ -1,49 +1,15 @@
 /**
-* @license
-* Copyright Google Inc. All Rights Reserved.
-*
-* Use of this source code is governed by an MIT-style license that can be
-* found in the LICENSE file at https://angular.io/license
-*/
-import { strings } from '@angular-devkit/core';
-import {
-  Rule,
-  Tree,
-  apply,
-  applyTemplates,
-  chain,
-  filter,
-  mergeWith,
-  move,
-  noop,
-  url,
-} from '@angular-devkit/schematics';
-import { parseName } from '../utility/parse-name';
-import { createDefaultPath } from '../utility/workspace';
+ * @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 { generateFromFiles } from '../utility/generate-from-files';
 import { Schema } from './schema';
 
-
 export default function (options: Schema): Rule {
-  return async (host: Tree) => {
-    if (options.path === undefined) {
-      options.path = await createDefaultPath(host, options.project as string);
-    }
-
-    const parsedPath = parseName(options.path, options.name);
-    options.name = parsedPath.name;
-    options.path = parsedPath.path;
-
-    const templateSource = apply(url('./files'), [
-      options.skipTests ? filter(path => !path.endsWith('.spec.ts.template')) : noop(),
-      applyTemplates({
-        ...strings,
-        ...options,
-      }),
-      move(parsedPath.path + (options.flat ? '' : '/' + strings.dasherize(options.name))),
-    ]);
-
-    return chain([
-      mergeWith(templateSource),
-    ]);
-  };
+  return generateFromFiles(options);
 }
diff --git a/packages/schematics/angular/resolver/index_spec.ts b/packages/schematics/angular/resolver/index_spec.ts
index f7b599cb26e9..af2fdd22087e 100644
--- a/packages/schematics/angular/resolver/index_spec.ts
+++ b/packages/schematics/angular/resolver/index_spec.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 { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
 import { Schema as ApplicationOptions } from '../application/schema';
 import { Schema as WorkspaceOptions } from '../workspace/schema';
@@ -37,12 +38,14 @@ describe('resolver 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 resolver', async () => {
-    const tree = await schematicRunner.runSchematicAsync('resolver', defaultOptions, appTree)
+    const tree = await schematicRunner
+      .runSchematicAsync('resolver', defaultOptions, appTree)
       .toPromise();
     const files = tree.files;
     expect(files).toContain('/projects/bar/src/app/foo.resolver.spec.ts');
@@ -52,8 +55,7 @@ describe('resolver Schematic', () => {
   it('should respect the skipTests flag', async () => {
     const options = { ...defaultOptions, skipTests: true };
 
-    const tree = await schematicRunner.runSchematicAsync('resolver', options, appTree)
-      .toPromise();
+    const tree = await schematicRunner.runSchematicAsync('resolver', options, appTree).toPromise();
     const files = tree.files;
     expect(files).not.toContain('/projects/bar/src/app/foo.resolver.spec.ts');
     expect(files).toContain('/projects/bar/src/app/foo.resolver.ts');
@@ -62,8 +64,7 @@ describe('resolver Schematic', () => {
   it('should respect the flat flag', async () => {
     const options = { ...defaultOptions, flat: false };
 
-    const tree = await schematicRunner.runSchematicAsync('resolver', options, appTree)
-      .toPromise();
+    const tree = await schematicRunner.runSchematicAsync('resolver', options, appTree).toPromise();
     const files = tree.files;
     expect(files).toContain('/projects/bar/src/app/foo/foo.resolver.spec.ts');
     expect(files).toContain('/projects/bar/src/app/foo/foo.resolver.ts');
@@ -73,7 +74,8 @@ describe('resolver 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('resolver', defaultOptions, appTree)
+    appTree = await schematicRunner
+      .runSchematicAsync('resolver', defaultOptions, appTree)
       .toPromise();
     expect(appTree.files).toContain('/projects/bar/custom/app/foo.resolver.ts');
   });
diff --git a/packages/schematics/angular/resolver/schema.json b/packages/schematics/angular/resolver/schema.json
index bbeec7b1b380..e62b537b10b8 100644
--- a/packages/schematics/angular/resolver/schema.json
+++ b/packages/schematics/angular/resolver/schema.json
@@ -40,7 +40,5 @@
       }
     }
   },
-  "required": [
-    "name"
-  ]
+  "required": ["name"]
 }
diff --git a/packages/schematics/angular/service-worker/index.ts b/packages/schematics/angular/service-worker/index.ts
index 3c0a0b44e2e4..53feb12dfc3c 100644
--- a/packages/schematics/angular/service-worker/index.ts
+++ b/packages/schematics/angular/service-worker/index.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 { join, normalize, tags } from '@angular-devkit/core';
 import {
   Rule,
@@ -20,7 +21,12 @@ import {
 } from '@angular-devkit/schematics';
 import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
 import * as ts from '../third_party/github.com/Microsoft/TypeScript/lib/typescript';
-import { addSymbolToNgModuleMetadata, getEnvironmentExportName, insertImport, isImported } from '../utility/ast-utils';
+import {
+  addSymbolToNgModuleMetadata,
+  getEnvironmentExportName,
+  insertImport,
+  isImported,
+} from '../utility/ast-utils';
 import { applyToUpdateRecorder } from '../utility/change';
 import { addPackageJsonDependency, getPackageJsonDependency } from '../utility/dependencies';
 import { getAppModulePath } from '../utility/ng-ast-utils';
@@ -100,7 +106,11 @@ function updateAppModule(mainPath: string): Rule {
     `;
     moduleSource = getTsSourceFile(host, modulePath);
     const metadataChanges = addSymbolToNgModuleMetadata(
-      moduleSource, modulePath, 'imports', importText);
+      moduleSource,
+      modulePath,
+      'imports',
+      importText,
+    );
     if (metadataChanges) {
       const recorder = host.beginUpdate(modulePath);
       applyToUpdateRecorder(recorder, metadataChanges);
@@ -136,7 +146,7 @@ export default function (options: ServiceWorkerOptions): Rule {
     if (!buildTarget) {
       throw targetBuildNotFoundError();
     }
-    const buildOptions = (buildTarget.options || {}) as unknown as BrowserBuilderOptions;
+    const buildOptions = ((buildTarget.options || {}) as unknown) as BrowserBuilderOptions;
     const root = project.root;
     buildOptions.serviceWorker = true;
     buildOptions.ngswConfigPath = join(normalize(root), 'ngsw-config.json');
diff --git a/packages/schematics/angular/service-worker/index_spec.ts b/packages/schematics/angular/service-worker/index_spec.ts
index 7cbec451166e..8b3b9cdef1ad 100644
--- a/packages/schematics/angular/service-worker/index_spec.ts
+++ b/packages/schematics/angular/service-worker/index_spec.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
  */
+
 import { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
 import { Schema as ApplicationOptions } from '../application/schema';
 import { Schema as WorkspaceOptions } from '../workspace/schema';
 import { Schema as ServiceWorkerOptions } from './schema';
 
-// tslint:disable-next-line:no-big-function
 describe('Service Worker Schematic', () => {
   const schematicRunner = new SchematicTestRunner(
     '@schematics/angular',
@@ -41,12 +41,14 @@ describe('Service Worker Schematic', () => {
 
   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 add `serviceWorker` option to build target', async () => {
-    const tree = await schematicRunner.runSchematicAsync('service-worker', defaultOptions, appTree)
+    const tree = await schematicRunner
+      .runSchematicAsync('service-worker', defaultOptions, appTree)
       .toPromise();
     const configText = tree.readContent('/angular.json');
     const buildConfig = JSON.parse(configText).projects.bar.architect.build;
@@ -55,7 +57,8 @@ describe('Service Worker Schematic', () => {
   });
 
   it('should add the necessary dependency', async () => {
-    const tree = await schematicRunner.runSchematicAsync('service-worker', defaultOptions, appTree)
+    const tree = await schematicRunner
+      .runSchematicAsync('service-worker', defaultOptions, appTree)
       .toPromise();
     const pkgText = tree.readContent('/package.json');
     const pkg = JSON.parse(pkgText);
@@ -64,30 +67,36 @@ describe('Service Worker Schematic', () => {
   });
 
   it('should import ServiceWorkerModule', async () => {
-    const tree = await schematicRunner.runSchematicAsync('service-worker', defaultOptions, appTree)
+    const tree = await schematicRunner
+      .runSchematicAsync('service-worker', defaultOptions, appTree)
       .toPromise();
     const pkgText = tree.readContent('/projects/bar/src/app/app.module.ts');
     expect(pkgText).toMatch(/import \{ ServiceWorkerModule \} from '@angular\/service-worker'/);
   });
 
   it('should import environment', async () => {
-    const tree = await schematicRunner.runSchematicAsync('service-worker', defaultOptions, appTree)
+    const tree = await schematicRunner
+      .runSchematicAsync('service-worker', defaultOptions, appTree)
       .toPromise();
     const pkgText = tree.readContent('/projects/bar/src/app/app.module.ts');
     expect(pkgText).toMatch(/import \{ environment \} from '\.\.\/environments\/environment'/);
   });
 
   it('should add the SW import to the NgModule imports', async () => {
-    const tree = await schematicRunner.runSchematicAsync('service-worker', defaultOptions, appTree)
+    const tree = await schematicRunner
+      .runSchematicAsync('service-worker', defaultOptions, appTree)
       .toPromise();
     const pkgText = tree.readContent('/projects/bar/src/app/app.module.ts');
-    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}\\)'));
+    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 () => {
@@ -112,16 +121,20 @@ describe('Service Worker Schematic', () => {
 
     appTree.overwrite('/projects/bar/src/app/app.module.ts', moduleContent);
 
-    const tree = await schematicRunner.runSchematicAsync('service-worker', defaultOptions, appTree)
+    const tree = await schematicRunner
+      .runSchematicAsync('service-worker', defaultOptions, appTree)
       .toPromise();
     const pkgText = tree.readContent('/projects/bar/src/app/app.module.ts');
-    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}\\)'));
+    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 () => {
@@ -146,26 +159,33 @@ describe('Service Worker Schematic', () => {
 
     appTree.overwrite('/projects/bar/src/app/app.module.ts', moduleContent);
 
-    const tree = await schematicRunner.runSchematicAsync('service-worker', defaultOptions, appTree)
+    const tree = await schematicRunner
+      .runSchematicAsync('service-worker', defaultOptions, appTree)
       .toPromise();
     const pkgText = tree.readContent('/projects/bar/src/app/app.module.ts');
-    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}\\)'));
+    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 () => {
-    const tree = await schematicRunner.runSchematicAsync('service-worker', defaultOptions, appTree)
+    const tree = await schematicRunner
+      .runSchematicAsync('service-worker', defaultOptions, appTree)
       .toPromise();
     const path = '/projects/bar/ngsw-config.json';
     expect(tree.exists(path)).toEqual(true);
 
     const { projects } = JSON.parse(tree.readContent('/angular.json'));
-    expect(projects.bar.architect.build.options.ngswConfigPath).toBe('projects/bar/ngsw-config.json');
+    expect(projects.bar.architect.build.options.ngswConfigPath).toBe(
+      'projects/bar/ngsw-config.json',
+    );
   });
 
   it('should add $schema in ngsw-config.json with correct relative path', async () => {
@@ -181,49 +201,47 @@ describe('Service Worker Schematic', () => {
       ...defaultOptions,
       project: name,
     };
-    const rootAppTree = await schematicRunner.runSchematicAsync(
-      'application',
-      rootAppOptions,
-      appTree,
-    ).toPromise();
-    const treeInRoot = await schematicRunner.runSchematicAsync(
-      'service-worker',
-      rootSWOptions,
-      rootAppTree,
-    ).toPromise();
+    const rootAppTree = await schematicRunner
+      .runSchematicAsync('application', rootAppOptions, appTree)
+      .toPromise();
+    const treeInRoot = await schematicRunner
+      .runSchematicAsync('service-worker', rootSWOptions, rootAppTree)
+      .toPromise();
     const pkgTextInRoot = treeInRoot.readContent('/ngsw-config.json');
     const configInRoot = JSON.parse(pkgTextInRoot);
     expect(configInRoot.$schema).toBe(`./${pathToNgswConfigSchema}`);
 
-    const treeNotInRoot = await schematicRunner.runSchematicAsync(
-      'service-worker',
-      defaultOptions,
-      appTree,
-    ).toPromise();
+    const treeNotInRoot = await schematicRunner
+      .runSchematicAsync('service-worker', defaultOptions, appTree)
+      .toPromise();
     const pkgTextNotInRoot = treeNotInRoot.readContent('/projects/bar/ngsw-config.json');
     const configNotInRoot = JSON.parse(pkgTextNotInRoot);
     expect(configNotInRoot.$schema).toBe(`../../${pathToNgswConfigSchema}`);
   });
 
   it('should add root assets RegExp', async () => {
-    const tree = await schematicRunner.runSchematicAsync('service-worker', defaultOptions, appTree)
+    const tree = await schematicRunner
+      .runSchematicAsync('service-worker', defaultOptions, appTree)
       .toPromise();
     const pkgText = tree.readContent('/projects/bar/ngsw-config.json');
     const config = JSON.parse(pkgText);
-    expect(config.assetGroups[1].resources.files)
-      .toContain('/*.(eot|svg|cur|jpg|png|webp|gif|otf|ttf|woff|woff2|ani)');
+    expect(config.assetGroups[1].resources.files).toContain(
+      '/*.(eot|svg|cur|jpg|png|webp|gif|otf|ttf|woff|woff2|ani)',
+    );
   });
 
   it('should add resourcesOutputPath to root assets when specified', async () => {
     const config = JSON.parse(appTree.readContent('/angular.json'));
     config.projects.bar.architect.build.options.resourcesOutputPath = 'outDir';
     appTree.overwrite('/angular.json', JSON.stringify(config));
-    const tree = await schematicRunner.runSchematicAsync('service-worker', defaultOptions, appTree)
+    const tree = await schematicRunner
+      .runSchematicAsync('service-worker', defaultOptions, appTree)
       .toPromise();
     const pkgText = tree.readContent('/projects/bar/ngsw-config.json');
     const ngswConfig = JSON.parse(pkgText);
-    expect(ngswConfig.assetGroups[1].resources.files)
-      .toContain('/outDir/*.(eot|svg|cur|jpg|png|webp|gif|otf|ttf|woff|woff2|ani)');
+    expect(ngswConfig.assetGroups[1].resources.files).toContain(
+      '/outDir/*.(eot|svg|cur|jpg|png|webp|gif|otf|ttf|woff|woff2|ani)',
+    );
   });
 
   it('should generate ngsw-config.json in root when the application is at root level', async () => {
@@ -238,9 +256,11 @@ describe('Service Worker Schematic', () => {
       project: name,
     };
 
-    let tree = await schematicRunner.runSchematicAsync('application', rootAppOptions, appTree)
+    let tree = await schematicRunner
+      .runSchematicAsync('application', rootAppOptions, appTree)
       .toPromise();
-    tree = await schematicRunner.runSchematicAsync('service-worker', rootSWOptions, tree)
+    tree = await schematicRunner
+      .runSchematicAsync('service-worker', rootSWOptions, tree)
       .toPromise();
     expect(tree.exists('/ngsw-config.json')).toBe(true);
 
diff --git a/packages/schematics/angular/service-worker/schema.d.ts b/packages/schematics/angular/service-worker/schema.d.ts
index 571d59ed771f..d2fa68faa33a 100644
--- a/packages/schematics/angular/service-worker/schema.d.ts
+++ b/packages/schematics/angular/service-worker/schema.d.ts
@@ -1,22 +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
  */
 
 export interface Schema {
-    /**
-     * The name of the project.
-     */
-    project: string;
-    /**
-     * The target to apply service worker to.
-     */
-    target: string;
-    /**
-     * The configuration to apply service worker to.
-     */
-    configuration: string;
+  /**
+   * The name of the project.
+   */
+  project: string;
+  /**
+   * The target to apply service worker to.
+   */
+  target: string;
+  /**
+   * The configuration to apply service worker to.
+   */
+  configuration: string;
 }
diff --git a/packages/schematics/angular/service-worker/schema.json b/packages/schematics/angular/service-worker/schema.json
index 9af3b594d8b8..e1399b728a5d 100644
--- a/packages/schematics/angular/service-worker/schema.json
+++ b/packages/schematics/angular/service-worker/schema.json
@@ -24,7 +24,5 @@
       "x-deprecated": "No longer has an effect."
     }
   },
-  "required": [
-    "project"
-  ]
+  "required": ["project"]
 }
diff --git a/packages/schematics/angular/service/index.ts b/packages/schematics/angular/service/index.ts
index c509f05c164f..7fb6d4e33bfa 100644
--- a/packages/schematics/angular/service/index.ts
+++ b/packages/schematics/angular/service/index.ts
@@ -1,51 +1,21 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of 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,
-  Tree,
-  apply,
-  applyTemplates,
-  chain,
-  filter,
-  mergeWith,
-  move,
-  noop,
-  url,
-} from '@angular-devkit/schematics';
-import { applyLintFix } from '../utility/lint-fix';
-import { parseName } from '../utility/parse-name';
-import { createDefaultPath } from '../utility/workspace';
+
+import { Rule } from '@angular-devkit/schematics';
+import { generateFromFiles } from '../utility/generate-from-files';
 import { Schema as ServiceOptions } from './schema';
 
 export default function (options: ServiceOptions): Rule {
-  return async (host: Tree) => {
-    if (options.path === undefined) {
-      options.path = await createDefaultPath(host, options.project as string);
-    }
-
-    const parsedPath = parseName(options.path, options.name);
-    options.name = parsedPath.name;
-    options.path = parsedPath.path;
-
-    const templateSource = apply(url('./files'), [
-      options.skipTests ? filter(path => !path.endsWith('.spec.ts.template')) : noop(),
-      applyTemplates({
-        ...strings,
-        'if-flat': (s: string) => options.flat ? '' : s,
-        ...options,
-      }),
-      move(parsedPath.path),
-    ]);
+  // This schematic uses an older method to implement the flat option
+  const flat = options.flat;
+  options.flat = true;
 
-    return chain([
-      mergeWith(templateSource),
-      options.lintFix ? applyLintFix(options.path) : noop(),
-    ]);
-  };
+  return generateFromFiles(options, {
+    'if-flat': (s: string) => (flat ? '' : s),
+  });
 }
diff --git a/packages/schematics/angular/service/index_spec.ts b/packages/schematics/angular/service/index_spec.ts
index df7fe66014c4..96d80fa9795e 100644
--- a/packages/schematics/angular/service/index_spec.ts
+++ b/packages/schematics/angular/service/index_spec.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 { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
 import { Schema as ApplicationOptions } from '../application/schema';
 import { Schema as WorkspaceOptions } from '../workspace/schema';
@@ -37,24 +38,24 @@ describe('Service Schematic', () => {
   let appTree: UnitTestTree;
   beforeEach(async () => {
     appTree = await schematicRunner.runSchematicAsync('workspace', workspaceOptions).toPromise();
-    appTree = await schematicRunner.runSchematicAsync('application', appOptions, appTree).toPromise();
+    appTree = await schematicRunner
+      .runSchematicAsync('application', appOptions, appTree)
+      .toPromise();
   });
 
   it('should create a service', async () => {
     const options = { ...defaultOptions };
 
-    const tree = await schematicRunner.runSchematicAsync('service', options, appTree)
-      .toPromise();
+    const tree = await schematicRunner.runSchematicAsync('service', options, appTree).toPromise();
     const files = tree.files;
     expect(files).toContain('/projects/bar/src/app/foo/foo.service.spec.ts');
     expect(files).toContain('/projects/bar/src/app/foo/foo.service.ts');
   });
 
   it('service should be tree-shakeable', async () => {
-    const options = { ...defaultOptions};
+    const options = { ...defaultOptions };
 
-    const tree = await schematicRunner.runSchematicAsync('service', options, appTree)
-      .toPromise();
+    const tree = await schematicRunner.runSchematicAsync('service', options, appTree).toPromise();
     const content = tree.readContent('/projects/bar/src/app/foo/foo.service.ts');
     expect(content).toMatch(/providedIn: 'root'/);
   });
@@ -62,8 +63,7 @@ describe('Service Schematic', () => {
   it('should respect the skipTests flag', async () => {
     const options = { ...defaultOptions, skipTests: true };
 
-    const tree = await schematicRunner.runSchematicAsync('service', options, appTree)
-      .toPromise();
+    const tree = await schematicRunner.runSchematicAsync('service', options, appTree).toPromise();
     const files = tree.files;
     expect(files).toContain('/projects/bar/src/app/foo/foo.service.ts');
     expect(files).not.toContain('/projects/bar/src/app/foo/foo.service.spec.ts');
@@ -73,7 +73,8 @@ describe('Service 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('service', defaultOptions, appTree)
+    appTree = await schematicRunner
+      .runSchematicAsync('service', defaultOptions, appTree)
       .toPromise();
     expect(appTree.files).toContain('/projects/bar/custom/app/foo/foo.service.ts');
   });
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 bba168d37e72..b86a3a29970a 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.2";
+    const versionMajorMinor = "4.3";
     /** The version of the TypeScript compiler release */
     const version: string;
     /**
@@ -260,192 +260,196 @@ declare namespace ts {
         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,
+        OverrideKeyword = 156,
+        OfKeyword = 157,
+        QualifiedName = 158,
+        ComputedPropertyName = 159,
+        TypeParameter = 160,
+        Parameter = 161,
+        Decorator = 162,
+        PropertySignature = 163,
+        PropertyDeclaration = 164,
+        MethodSignature = 165,
+        MethodDeclaration = 166,
+        Constructor = 167,
+        GetAccessor = 168,
+        SetAccessor = 169,
+        CallSignature = 170,
+        ConstructSignature = 171,
+        IndexSignature = 172,
+        TypePredicate = 173,
+        TypeReference = 174,
+        FunctionType = 175,
+        ConstructorType = 176,
+        TypeQuery = 177,
+        TypeLiteral = 178,
+        ArrayType = 179,
+        TupleType = 180,
+        OptionalType = 181,
+        RestType = 182,
+        UnionType = 183,
+        IntersectionType = 184,
+        ConditionalType = 185,
+        InferType = 186,
+        ParenthesizedType = 187,
+        ThisType = 188,
+        TypeOperator = 189,
+        IndexedAccessType = 190,
+        MappedType = 191,
+        LiteralType = 192,
+        NamedTupleMember = 193,
+        TemplateLiteralType = 194,
+        TemplateLiteralTypeSpan = 195,
+        ImportType = 196,
+        ObjectBindingPattern = 197,
+        ArrayBindingPattern = 198,
+        BindingElement = 199,
+        ArrayLiteralExpression = 200,
+        ObjectLiteralExpression = 201,
+        PropertyAccessExpression = 202,
+        ElementAccessExpression = 203,
+        CallExpression = 204,
+        NewExpression = 205,
+        TaggedTemplateExpression = 206,
+        TypeAssertionExpression = 207,
+        ParenthesizedExpression = 208,
+        FunctionExpression = 209,
+        ArrowFunction = 210,
+        DeleteExpression = 211,
+        TypeOfExpression = 212,
+        VoidExpression = 213,
+        AwaitExpression = 214,
+        PrefixUnaryExpression = 215,
+        PostfixUnaryExpression = 216,
+        BinaryExpression = 217,
+        ConditionalExpression = 218,
+        TemplateExpression = 219,
+        YieldExpression = 220,
+        SpreadElement = 221,
+        ClassExpression = 222,
+        OmittedExpression = 223,
+        ExpressionWithTypeArguments = 224,
+        AsExpression = 225,
+        NonNullExpression = 226,
+        MetaProperty = 227,
+        SyntheticExpression = 228,
+        TemplateSpan = 229,
+        SemicolonClassElement = 230,
+        Block = 231,
+        EmptyStatement = 232,
+        VariableStatement = 233,
+        ExpressionStatement = 234,
+        IfStatement = 235,
+        DoStatement = 236,
+        WhileStatement = 237,
+        ForStatement = 238,
+        ForInStatement = 239,
+        ForOfStatement = 240,
+        ContinueStatement = 241,
+        BreakStatement = 242,
+        ReturnStatement = 243,
+        WithStatement = 244,
+        SwitchStatement = 245,
+        LabeledStatement = 246,
+        ThrowStatement = 247,
+        TryStatement = 248,
+        DebuggerStatement = 249,
+        VariableDeclaration = 250,
+        VariableDeclarationList = 251,
+        FunctionDeclaration = 252,
+        ClassDeclaration = 253,
+        InterfaceDeclaration = 254,
+        TypeAliasDeclaration = 255,
+        EnumDeclaration = 256,
+        ModuleDeclaration = 257,
+        ModuleBlock = 258,
+        CaseBlock = 259,
+        NamespaceExportDeclaration = 260,
+        ImportEqualsDeclaration = 261,
+        ImportDeclaration = 262,
+        ImportClause = 263,
+        NamespaceImport = 264,
+        NamedImports = 265,
+        ImportSpecifier = 266,
+        ExportAssignment = 267,
+        ExportDeclaration = 268,
+        NamedExports = 269,
+        NamespaceExport = 270,
+        ExportSpecifier = 271,
+        MissingDeclaration = 272,
+        ExternalModuleReference = 273,
+        JsxElement = 274,
+        JsxSelfClosingElement = 275,
+        JsxOpeningElement = 276,
+        JsxClosingElement = 277,
+        JsxFragment = 278,
+        JsxOpeningFragment = 279,
+        JsxClosingFragment = 280,
+        JsxAttribute = 281,
+        JsxAttributes = 282,
+        JsxSpreadAttribute = 283,
+        JsxExpression = 284,
+        CaseClause = 285,
+        DefaultClause = 286,
+        HeritageClause = 287,
+        CatchClause = 288,
+        PropertyAssignment = 289,
+        ShorthandPropertyAssignment = 290,
+        SpreadAssignment = 291,
+        EnumMember = 292,
+        UnparsedPrologue = 293,
+        UnparsedPrepend = 294,
+        UnparsedText = 295,
+        UnparsedInternalText = 296,
+        UnparsedSyntheticReference = 297,
+        SourceFile = 298,
+        Bundle = 299,
+        UnparsedSource = 300,
+        InputFiles = 301,
+        JSDocTypeExpression = 302,
+        JSDocNameReference = 303,
+        JSDocAllType = 304,
+        JSDocUnknownType = 305,
+        JSDocNullableType = 306,
+        JSDocNonNullableType = 307,
+        JSDocOptionalType = 308,
+        JSDocFunctionType = 309,
+        JSDocVariadicType = 310,
+        JSDocNamepathType = 311,
+        JSDocComment = 312,
+        JSDocText = 313,
+        JSDocTypeLiteral = 314,
+        JSDocSignature = 315,
+        JSDocLink = 316,
+        JSDocTag = 317,
+        JSDocAugmentsTag = 318,
+        JSDocImplementsTag = 319,
+        JSDocAuthorTag = 320,
+        JSDocDeprecatedTag = 321,
+        JSDocClassTag = 322,
+        JSDocPublicTag = 323,
+        JSDocPrivateTag = 324,
+        JSDocProtectedTag = 325,
+        JSDocReadonlyTag = 326,
+        JSDocOverrideTag = 327,
+        JSDocCallbackTag = 328,
+        JSDocEnumTag = 329,
+        JSDocParameterTag = 330,
+        JSDocReturnTag = 331,
+        JSDocThisTag = 332,
+        JSDocTypeTag = 333,
+        JSDocTemplateTag = 334,
+        JSDocTypedefTag = 335,
+        JSDocSeeTag = 336,
+        JSDocPropertyTag = 337,
+        SyntaxList = 338,
+        NotEmittedStatement = 339,
+        PartiallyEmittedExpression = 340,
+        CommaListExpression = 341,
+        MergeDeclarationMarker = 342,
+        EndOfDeclarationMarker = 343,
+        SyntheticReferenceExpression = 344,
+        Count = 345,
         FirstAssignment = 62,
         LastAssignment = 77,
         FirstCompoundAssignment = 63,
@@ -453,15 +457,15 @@ declare namespace ts {
         FirstReservedWord = 80,
         LastReservedWord = 115,
         FirstKeyword = 80,
-        LastKeyword = 156,
+        LastKeyword = 157,
         FirstFutureReservedWord = 116,
         LastFutureReservedWord = 124,
-        FirstTypeNode = 172,
-        LastTypeNode = 195,
+        FirstTypeNode = 173,
+        LastTypeNode = 196,
         FirstPunctuation = 18,
         LastPunctuation = 77,
         FirstToken = 0,
-        LastToken = 156,
+        LastToken = 157,
         FirstTriviaToken = 2,
         LastTriviaToken = 7,
         FirstLiteralToken = 8,
@@ -470,20 +474,20 @@ declare namespace ts {
         LastTemplateToken = 17,
         FirstBinaryOperator = 29,
         LastBinaryOperator = 77,
-        FirstStatement = 232,
-        LastStatement = 248,
-        FirstNode = 157,
-        FirstJSDocNode = 301,
-        LastJSDocNode = 333,
-        FirstJSDocTagNode = 314,
-        LastJSDocTagNode = 333,
+        FirstStatement = 233,
+        LastStatement = 249,
+        FirstNode = 158,
+        FirstJSDocNode = 302,
+        LastJSDocNode = 337,
+        FirstJSDocTagNode = 317,
+        LastJSDocTagNode = 337,
     }
     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.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 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.OverrideKeyword | 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.OverrideKeyword | SyntaxKind.StaticKeyword;
     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;
@@ -533,13 +537,14 @@ declare namespace ts {
         Const = 2048,
         HasComputedJSDocModifiers = 4096,
         Deprecated = 8192,
+        Override = 16384,
         HasComputedFlags = 536870912,
         AccessibilityModifier = 28,
-        ParameterPropertyModifier = 92,
+        ParameterPropertyModifier = 16476,
         NonPublicAccessibilityModifier = 24,
-        TypeScriptModifier = 2270,
+        TypeScriptModifier = 18654,
         ExportDefault = 513,
-        All = 11263
+        All = 27647
     }
     export enum JsxFlags {
         None = 0,
@@ -558,7 +563,7 @@ declare namespace ts {
     }
     export interface JSDocContainer {
     }
-    export type HasJSDoc = ParameterDeclaration | CallSignatureDeclaration | ConstructSignatureDeclaration | MethodSignature | PropertySignature | ArrowFunction | ParenthesizedExpression | SpreadAssignment | ShorthandPropertyAssignment | PropertyAssignment | FunctionExpression | LabeledStatement | ExpressionStatement | VariableStatement | FunctionDeclaration | ConstructorDeclaration | MethodDeclaration | PropertyDeclaration | AccessorDeclaration | ClassLikeDeclaration | InterfaceDeclaration | TypeAliasDeclaration | EnumMember | EnumDeclaration | ModuleDeclaration | ImportEqualsDeclaration | ImportDeclaration | NamespaceExportDeclaration | ExportAssignment | IndexSignatureDeclaration | FunctionTypeNode | ConstructorTypeNode | JSDocFunctionType | ExportDeclaration | NamedTupleMember | EndOfFileToken;
+    export type HasJSDoc = ParameterDeclaration | CallSignatureDeclaration | ConstructSignatureDeclaration | MethodSignature | PropertySignature | ArrowFunction | ParenthesizedExpression | SpreadAssignment | ShorthandPropertyAssignment | PropertyAssignment | FunctionExpression | EmptyStatement | DebuggerStatement | Block | VariableStatement | ExpressionStatement | IfStatement | DoStatement | WhileStatement | ForStatement | ForInStatement | ForOfStatement | BreakStatement | ContinueStatement | ReturnStatement | WithStatement | SwitchStatement | LabeledStatement | ThrowStatement | TryStatement | FunctionDeclaration | ConstructorDeclaration | MethodDeclaration | VariableDeclaration | PropertyDeclaration | AccessorDeclaration | ClassLikeDeclaration | InterfaceDeclaration | TypeAliasDeclaration | EnumMember | EnumDeclaration | ModuleDeclaration | ImportEqualsDeclaration | ImportDeclaration | NamespaceExportDeclaration | ExportAssignment | IndexSignatureDeclaration | FunctionTypeNode | ConstructorTypeNode | JSDocFunctionType | ExportDeclaration | NamedTupleMember | EndOfFileToken;
     export type HasType = SignatureDeclaration | VariableDeclaration | ParameterDeclaration | PropertySignature | PropertyDeclaration | TypePredicateNode | ParenthesizedTypeNode | TypeOperatorNode | MappedTypeNode | AssertionExpression | TypeAliasDeclaration | JSDocTypeExpression | JSDocNonNullableType | JSDocNullableType | JSDocOptionalType | JSDocVariadicType;
     export type HasTypeArguments = CallExpression | NewExpression | TaggedTemplateExpression | JsxOpeningElement | JsxSelfClosingElement;
     export type HasInitializer = HasExpressionInitializer | ForStatement | ForInStatement | ForOfStatement | JsxAttribute;
@@ -603,10 +608,11 @@ declare namespace ts {
     export type ProtectedKeyword = ModifierToken<SyntaxKind.ProtectedKeyword>;
     export type PublicKeyword = ModifierToken<SyntaxKind.PublicKeyword>;
     export type ReadonlyKeyword = ModifierToken<SyntaxKind.ReadonlyKeyword>;
+    export type OverrideKeyword = ModifierToken<SyntaxKind.OverrideKeyword>;
     export type StaticKeyword = ModifierToken<SyntaxKind.StaticKeyword>;
     /** @deprecated Use `ReadonlyKeyword` instead. */
     export type ReadonlyToken = ReadonlyKeyword;
-    export type Modifier = AbstractKeyword | AsyncKeyword | ConstKeyword | DeclareKeyword | DefaultKeyword | ExportKeyword | PrivateKeyword | ProtectedKeyword | PublicKeyword | ReadonlyKeyword | StaticKeyword;
+    export type Modifier = AbstractKeyword | AsyncKeyword | ConstKeyword | DeclareKeyword | DefaultKeyword | ExportKeyword | PrivateKeyword | ProtectedKeyword | PublicKeyword | OverrideKeyword | ReadonlyKeyword | StaticKeyword;
     export type AccessibilityModifier = PublicKeyword | PrivateKeyword | ProtectedKeyword;
     export type ParameterPropertyModifier = AccessibilityModifier | ReadonlyKeyword;
     export type ClassMemberModifier = AccessibilityModifier | ReadonlyKeyword | StaticKeyword;
@@ -638,6 +644,7 @@ declare namespace ts {
     }
     export type EntityName = Identifier | QualifiedName;
     export type PropertyName = Identifier | StringLiteral | NumericLiteral | ComputedPropertyName | PrivateIdentifier;
+    export type MemberName = Identifier | PrivateIdentifier;
     export type DeclarationName = Identifier | PrivateIdentifier | StringLiteralLike | NumericLiteral | ComputedPropertyName | ElementAccessExpression | BindingPattern | EntityNameExpression;
     export interface Declaration extends Node {
         _declarationBrand: any;
@@ -686,7 +693,7 @@ declare namespace ts {
         readonly kind: SyntaxKind.ConstructSignature;
     }
     export type BindingName = Identifier | BindingPattern;
-    export interface VariableDeclaration extends NamedDeclaration {
+    export interface VariableDeclaration extends NamedDeclaration, JSDocContainer {
         readonly kind: SyntaxKind.VariableDeclaration;
         readonly parent: VariableDeclarationList | CatchClause;
         readonly name: BindingName;
@@ -820,15 +827,15 @@ declare namespace ts {
         readonly kind: SyntaxKind.SemicolonClassElement;
         readonly parent: ClassLikeDeclaration;
     }
-    export interface GetAccessorDeclaration extends FunctionLikeDeclarationBase, ClassElement, ObjectLiteralElement, JSDocContainer {
+    export interface GetAccessorDeclaration extends FunctionLikeDeclarationBase, ClassElement, TypeElement, ObjectLiteralElement, JSDocContainer {
         readonly kind: SyntaxKind.GetAccessor;
-        readonly parent: ClassLikeDeclaration | ObjectLiteralExpression;
+        readonly parent: ClassLikeDeclaration | ObjectLiteralExpression | TypeLiteralNode | InterfaceDeclaration;
         readonly name: PropertyName;
         readonly body?: FunctionBody;
     }
-    export interface SetAccessorDeclaration extends FunctionLikeDeclarationBase, ClassElement, ObjectLiteralElement, JSDocContainer {
+    export interface SetAccessorDeclaration extends FunctionLikeDeclarationBase, ClassElement, TypeElement, ObjectLiteralElement, JSDocContainer {
         readonly kind: SyntaxKind.SetAccessor;
-        readonly parent: ClassLikeDeclaration | ObjectLiteralExpression;
+        readonly parent: ClassLikeDeclaration | ObjectLiteralExpression | TypeLiteralNode | InterfaceDeclaration;
         readonly name: PropertyName;
         readonly body?: FunctionBody;
     }
@@ -1216,11 +1223,11 @@ declare namespace ts {
         readonly kind: SyntaxKind.PropertyAccessExpression;
         readonly expression: LeftHandSideExpression;
         readonly questionDotToken?: QuestionDotToken;
-        readonly name: Identifier | PrivateIdentifier;
+        readonly name: MemberName;
     }
     export interface PropertyAccessChain extends PropertyAccessExpression {
         _optionalChainBrand: any;
-        readonly name: Identifier | PrivateIdentifier;
+        readonly name: MemberName;
     }
     export interface SuperPropertyAccessExpression extends PropertyAccessExpression {
         readonly expression: SuperExpression;
@@ -1373,7 +1380,7 @@ declare namespace ts {
         readonly containsOnlyTriviaWhiteSpaces: boolean;
     }
     export type JsxChild = JsxText | JsxExpression | JsxElement | JsxSelfClosingElement | JsxFragment;
-    export interface Statement extends Node {
+    export interface Statement extends Node, JSDocContainer {
         _statementBrand: any;
     }
     export interface NotEmittedStatement extends Statement {
@@ -1401,11 +1408,11 @@ declare namespace ts {
         readonly kind: SyntaxKind.Block;
         readonly statements: NodeArray<Statement>;
     }
-    export interface VariableStatement extends Statement, JSDocContainer {
+    export interface VariableStatement extends Statement {
         readonly kind: SyntaxKind.VariableStatement;
         readonly declarationList: VariableDeclarationList;
     }
-    export interface ExpressionStatement extends Statement, JSDocContainer {
+    export interface ExpressionStatement extends Statement {
         readonly kind: SyntaxKind.ExpressionStatement;
         readonly expression: Expression;
     }
@@ -1486,7 +1493,7 @@ declare namespace ts {
         readonly statements: NodeArray<Statement>;
     }
     export type CaseOrDefaultClause = CaseClause | DefaultClause;
-    export interface LabeledStatement extends Statement, JSDocContainer {
+    export interface LabeledStatement extends Statement {
         readonly kind: SyntaxKind.LabeledStatement;
         readonly label: Identifier;
         readonly statement: Statement;
@@ -1606,7 +1613,7 @@ declare namespace ts {
         readonly parent: ImportEqualsDeclaration;
         readonly expression: Expression;
     }
-    export interface ImportDeclaration extends Statement, JSDocContainer {
+    export interface ImportDeclaration extends Statement {
         readonly kind: SyntaxKind.ImportDeclaration;
         readonly parent: SourceFile | ModuleBlock;
         readonly importClause?: ImportClause;
@@ -1742,12 +1749,21 @@ declare namespace ts {
         readonly kind: SyntaxKind.JSDocComment;
         readonly parent: HasJSDoc;
         readonly tags?: NodeArray<JSDocTag>;
-        readonly comment?: string;
+        readonly comment?: string | NodeArray<JSDocText | JSDocLink>;
     }
     export interface JSDocTag extends Node {
         readonly parent: JSDoc | JSDocTypeLiteral;
         readonly tagName: Identifier;
-        readonly comment?: string;
+        readonly comment?: string | NodeArray<JSDocText | JSDocLink>;
+    }
+    export interface JSDocLink extends Node {
+        readonly kind: SyntaxKind.JSDocLink;
+        readonly name?: EntityName;
+        text: string;
+    }
+    export interface JSDocText extends Node {
+        readonly kind: SyntaxKind.JSDocText;
+        text: string;
     }
     export interface JSDocUnknownTag extends JSDocTag {
         readonly kind: SyntaxKind.JSDocTag;
@@ -1789,6 +1805,9 @@ declare namespace ts {
     export interface JSDocReadonlyTag extends JSDocTag {
         readonly kind: SyntaxKind.JSDocReadonlyTag;
     }
+    export interface JSDocOverrideTag extends JSDocTag {
+        readonly kind: SyntaxKind.JSDocOverrideTag;
+    }
     export interface JSDocEnumTag extends JSDocTag, Declaration {
         readonly kind: SyntaxKind.JSDocEnumTag;
         readonly parent: JSDoc;
@@ -2080,7 +2099,6 @@ 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;
@@ -2186,7 +2204,7 @@ declare namespace ts {
          * The function returns the value (local variable) symbol of an identifier in the short-hand property assignment.
          * This is necessary as an identifier in short-hand property assignment can contains two meaning: property name and property value.
          */
-        getShorthandAssignmentValueSymbol(location: Node): Symbol | undefined;
+        getShorthandAssignmentValueSymbol(location: Node | undefined): Symbol | undefined;
         getExportSpecifierLocalTargetSymbol(location: ExportSpecifier | Identifier): Symbol | undefined;
         /**
          * If a symbol is a local symbol with an associated exported symbol, returns the exported symbol.
@@ -2261,6 +2279,8 @@ declare namespace ts {
         NoTypeReduction = 536870912,
         NoUndefinedOptionalParameterType = 1073741824,
         AllowThisInObjectLiteral = 32768,
+        AllowQualifiedNameInPlaceOfIdentifier = 65536,
+        /** @deprecated AllowQualifedNameInPlaceOfIdentifier. Use AllowQualifiedNameInPlaceOfIdentifier instead. */
         AllowQualifedNameInPlaceOfIdentifier = 65536,
         AllowAnonymousIdentifier = 131072,
         AllowEmptyUnionOrIntersection = 262144,
@@ -2271,8 +2291,7 @@ declare namespace ts {
         IgnoreErrors = 70221824,
         InObjectTypeLiteral = 4194304,
         InTypeAlias = 8388608,
-        InInitialEntityName = 16777216,
-        InReverseMappedType = 33554432
+        InInitialEntityName = 16777216
     }
     export enum TypeFormatFlags {
         None = 0,
@@ -2405,8 +2424,8 @@ declare namespace ts {
     export interface Symbol {
         flags: SymbolFlags;
         escapedName: __String;
-        declarations: Declaration[];
-        valueDeclaration: Declaration;
+        declarations?: Declaration[];
+        valueDeclaration?: Declaration;
         members?: SymbolTable;
         exports?: SymbolTable;
         globalExports?: SymbolTable;
@@ -2540,15 +2559,15 @@ declare namespace ts {
         ObjectLiteral = 128,
         EvolvingArray = 256,
         ObjectLiteralPatternWithComputedProperties = 512,
-        ContainsSpread = 1024,
-        ReverseMapped = 2048,
-        JsxAttributes = 4096,
-        MarkerType = 8192,
-        JSLiteral = 16384,
-        FreshLiteral = 32768,
-        ArrayLiteral = 65536,
-        ObjectRestType = 131072,
+        ReverseMapped = 1024,
+        JsxAttributes = 2048,
+        MarkerType = 4096,
+        JSLiteral = 8192,
+        FreshLiteral = 16384,
+        ArrayLiteral = 32768,
         ClassOrInterface = 3,
+        ContainsSpread = 4194304,
+        ObjectRestType = 8388608,
     }
     export interface ObjectType extends Type {
         objectFlags: ObjectFlags;
@@ -2662,6 +2681,7 @@ declare namespace ts {
         type: Type;
     }
     export interface SubstitutionType extends InstantiableType {
+        objectFlags: ObjectFlags;
         baseType: Type;
         substitute: Type;
     }
@@ -2686,16 +2706,17 @@ declare namespace ts {
     export enum InferencePriority {
         NakedTypeVariable = 1,
         SpeculativeTuple = 2,
-        HomomorphicMappedType = 4,
-        PartialHomomorphicMappedType = 8,
-        MappedTypeConstraint = 16,
-        ContravariantConditional = 32,
-        ReturnType = 64,
-        LiteralKeyof = 128,
-        NoConstraints = 256,
-        AlwaysStrict = 512,
-        MaxValue = 1024,
-        PriorityImpliesCombination = 208,
+        SubstituteSource = 4,
+        HomomorphicMappedType = 8,
+        PartialHomomorphicMappedType = 16,
+        MappedTypeConstraint = 32,
+        ContravariantConditional = 64,
+        ReturnType = 128,
+        LiteralKeyof = 256,
+        NoConstraints = 512,
+        AlwaysStrict = 1024,
+        MaxValue = 2048,
+        PriorityImpliesCombination = 416,
         Circularity = -1
     }
     /** @deprecated Use FileExtensionInfo instead. */
@@ -2772,18 +2793,21 @@ declare namespace ts {
         FixedPollingInterval = 0,
         PriorityPollingInterval = 1,
         DynamicPriorityPolling = 2,
-        UseFsEvents = 3,
-        UseFsEventsOnParentDirectory = 4
+        FixedChunkSizePolling = 3,
+        UseFsEvents = 4,
+        UseFsEventsOnParentDirectory = 5
     }
     export enum WatchDirectoryKind {
         UseFsEvents = 0,
         FixedPollingInterval = 1,
-        DynamicPriorityPolling = 2
+        DynamicPriorityPolling = 2,
+        FixedChunkSizePolling = 3
     }
     export enum PollingWatchKind {
         FixedInterval = 0,
         PriorityInterval = 1,
-        DynamicPriority = 2
+        DynamicPriority = 2,
+        FixedChunkSize = 3
     }
     export type CompilerOptionsValue = string | number | boolean | (string | number)[] | string[] | MapLike<string[]> | PluginImport[] | ProjectReference[] | null | undefined;
     export interface CompilerOptions {
@@ -2845,6 +2869,7 @@ declare namespace ts {
         outFile?: string;
         paths?: MapLike<string[]>;
         preserveConstEnums?: boolean;
+        noImplicitOverride?: boolean;
         preserveSymlinks?: boolean;
         project?: string;
         reactNamespace?: string;
@@ -2955,6 +2980,7 @@ declare namespace ts {
         ES2018 = 5,
         ES2019 = 6,
         ES2020 = 7,
+        ES2021 = 8,
         ESNext = 99,
         JSON = 100,
         Latest = 99
@@ -3128,17 +3154,21 @@ declare namespace ts {
         Iterator = 8388608,
         NoAsciiEscaping = 16777216,
     }
-    export interface EmitHelper {
+    export interface EmitHelperBase {
         readonly name: string;
         readonly scoped: boolean;
         readonly text: string | ((node: EmitHelperUniqueNameCallback) => string);
         readonly priority?: number;
         readonly dependencies?: EmitHelper[];
     }
-    export interface UnscopedEmitHelper extends EmitHelper {
+    export interface ScopedEmitHelper extends EmitHelperBase {
+        readonly scoped: true;
+    }
+    export interface UnscopedEmitHelper extends EmitHelperBase {
         readonly scoped: false;
         readonly text: string;
     }
+    export type EmitHelper = ScopedEmitHelper | UnscopedEmitHelper;
     export type EmitHelperUniqueNameCallback = (name: string) => string;
     export enum EmitHint {
         SourceFile = 0,
@@ -3166,14 +3196,27 @@ declare namespace ts {
         createStringLiteralFromNode(sourceNode: PropertyNameLiteral, isSingleQuote?: boolean): StringLiteral;
         createRegularExpressionLiteral(text: string): RegularExpressionLiteral;
         createIdentifier(text: string): Identifier;
-        /** Create a unique temporary variable. */
-        createTempVariable(recordTempVariable: ((node: Identifier) => void) | undefined): Identifier;
-        /** Create a unique temporary variable for use in a loop. */
-        createLoopVariable(): Identifier;
+        /**
+         * Create a unique temporary variable.
+         * @param recordTempVariable An optional callback used to record the temporary variable name. This
+         * should usually be a reference to `hoistVariableDeclaration` from a `TransformationContext`, but
+         * can be `undefined` if you plan to record the temporary variable manually.
+         * @param reservedInNestedScopes When `true`, reserves the temporary variable name in all nested scopes
+         * during emit so that the variable can be referenced in a nested function body. This is an alternative to
+         * setting `EmitFlags.ReuseTempVariableScope` on the nested function itself.
+         */
+        createTempVariable(recordTempVariable: ((node: Identifier) => void) | undefined, reservedInNestedScopes?: boolean): Identifier;
+        /**
+         * Create a unique temporary variable for use in a loop.
+         * @param reservedInNestedScopes When `true`, reserves the temporary variable name in all nested scopes
+         * during emit so that the variable can be referenced in a nested function body. This is an alternative to
+         * setting `EmitFlags.ReuseTempVariableScope` on the nested function itself.
+         */
+        createLoopVariable(reservedInNestedScopes?: boolean): Identifier;
         /** Create a unique name based on the supplied text. */
         createUniqueName(text: string, flags?: GeneratedIdentifierFlags): Identifier;
         /** Create a unique name generated for a node. */
-        getGeneratedNameForNode(node: Node | undefined): Identifier;
+        getGeneratedNameForNode(node: Node | undefined, flags?: GeneratedIdentifierFlags): Identifier;
         createPrivateIdentifier(text: string): PrivateIdentifier;
         createToken(token: SyntaxKind.SuperKeyword): SuperExpression;
         createToken(token: SyntaxKind.ThisKeyword): ThisExpression;
@@ -3284,10 +3327,10 @@ declare namespace ts {
         updateArrayLiteralExpression(node: ArrayLiteralExpression, elements: readonly Expression[]): ArrayLiteralExpression;
         createObjectLiteralExpression(properties?: readonly ObjectLiteralElementLike[], multiLine?: boolean): ObjectLiteralExpression;
         updateObjectLiteralExpression(node: ObjectLiteralExpression, properties: readonly ObjectLiteralElementLike[]): ObjectLiteralExpression;
-        createPropertyAccessExpression(expression: Expression, name: string | Identifier | PrivateIdentifier): PropertyAccessExpression;
-        updatePropertyAccessExpression(node: PropertyAccessExpression, expression: Expression, name: Identifier | PrivateIdentifier): PropertyAccessExpression;
-        createPropertyAccessChain(expression: Expression, questionDotToken: QuestionDotToken | undefined, name: string | Identifier | PrivateIdentifier): PropertyAccessChain;
-        updatePropertyAccessChain(node: PropertyAccessChain, expression: Expression, questionDotToken: QuestionDotToken | undefined, name: Identifier | PrivateIdentifier): PropertyAccessChain;
+        createPropertyAccessExpression(expression: Expression, name: string | MemberName): PropertyAccessExpression;
+        updatePropertyAccessExpression(node: PropertyAccessExpression, expression: Expression, name: MemberName): PropertyAccessExpression;
+        createPropertyAccessChain(expression: Expression, questionDotToken: QuestionDotToken | undefined, name: string | MemberName): PropertyAccessChain;
+        updatePropertyAccessChain(node: PropertyAccessChain, expression: Expression, questionDotToken: QuestionDotToken | undefined, name: MemberName): PropertyAccessChain;
         createElementAccessExpression(expression: Expression, index: number | Expression): ElementAccessExpression;
         updateElementAccessExpression(node: ElementAccessExpression, expression: Expression, argumentExpression: Expression): ElementAccessExpression;
         createElementAccessChain(expression: Expression, questionDotToken: QuestionDotToken | undefined, index: number | Expression): ElementAccessChain;
@@ -3455,52 +3498,58 @@ declare namespace ts {
         updateJSDocTypeExpression(node: JSDocTypeExpression, type: TypeNode): JSDocTypeExpression;
         createJSDocNameReference(name: EntityName): JSDocNameReference;
         updateJSDocNameReference(node: JSDocNameReference, name: EntityName): JSDocNameReference;
+        createJSDocLink(name: EntityName | undefined, text: string): JSDocLink;
+        updateJSDocLink(node: JSDocLink, name: EntityName | undefined, text: string): JSDocLink;
         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;
         updateJSDocSignature(node: JSDocSignature, typeParameters: readonly JSDocTemplateTag[] | undefined, parameters: readonly JSDocParameterTag[], type: JSDocReturnTag | undefined): JSDocSignature;
-        createJSDocTemplateTag(tagName: Identifier | undefined, constraint: JSDocTypeExpression | undefined, typeParameters: readonly TypeParameterDeclaration[], comment?: string): JSDocTemplateTag;
-        updateJSDocTemplateTag(node: JSDocTemplateTag, tagName: Identifier | undefined, constraint: JSDocTypeExpression | undefined, typeParameters: readonly TypeParameterDeclaration[], comment: string | undefined): JSDocTemplateTag;
-        createJSDocTypedefTag(tagName: Identifier | undefined, typeExpression?: JSDocTypeExpression | JSDocTypeLiteral, fullName?: Identifier | JSDocNamespaceDeclaration, comment?: string): JSDocTypedefTag;
-        updateJSDocTypedefTag(node: JSDocTypedefTag, tagName: Identifier | undefined, typeExpression: JSDocTypeExpression | JSDocTypeLiteral | undefined, fullName: Identifier | JSDocNamespaceDeclaration | undefined, comment: string | undefined): JSDocTypedefTag;
-        createJSDocParameterTag(tagName: Identifier | undefined, name: EntityName, isBracketed: boolean, typeExpression?: JSDocTypeExpression, isNameFirst?: boolean, comment?: string): JSDocParameterTag;
-        updateJSDocParameterTag(node: JSDocParameterTag, tagName: Identifier | undefined, name: EntityName, isBracketed: boolean, typeExpression: JSDocTypeExpression | undefined, isNameFirst: boolean, comment: string | undefined): JSDocParameterTag;
-        createJSDocPropertyTag(tagName: Identifier | undefined, name: EntityName, isBracketed: boolean, typeExpression?: JSDocTypeExpression, isNameFirst?: boolean, comment?: string): JSDocPropertyTag;
-        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;
-        updateJSDocThisTag(node: JSDocThisTag, tagName: Identifier | undefined, typeExpression: JSDocTypeExpression | undefined, comment: string | undefined): JSDocThisTag;
-        createJSDocEnumTag(tagName: Identifier | undefined, typeExpression: JSDocTypeExpression, comment?: string): JSDocEnumTag;
-        updateJSDocEnumTag(node: JSDocEnumTag, tagName: Identifier | undefined, typeExpression: JSDocTypeExpression, comment: string | undefined): JSDocEnumTag;
-        createJSDocCallbackTag(tagName: Identifier | undefined, typeExpression: JSDocSignature, fullName?: Identifier | JSDocNamespaceDeclaration, comment?: string): JSDocCallbackTag;
-        updateJSDocCallbackTag(node: JSDocCallbackTag, tagName: Identifier | undefined, typeExpression: JSDocSignature, fullName: Identifier | JSDocNamespaceDeclaration | undefined, comment: string | undefined): JSDocCallbackTag;
-        createJSDocAugmentsTag(tagName: Identifier | undefined, className: JSDocAugmentsTag["class"], comment?: string): JSDocAugmentsTag;
-        updateJSDocAugmentsTag(node: JSDocAugmentsTag, tagName: Identifier | undefined, className: JSDocAugmentsTag["class"], comment: string | undefined): JSDocAugmentsTag;
-        createJSDocImplementsTag(tagName: Identifier | undefined, className: JSDocImplementsTag["class"], comment?: string): JSDocImplementsTag;
-        updateJSDocImplementsTag(node: JSDocImplementsTag, tagName: Identifier | undefined, className: JSDocImplementsTag["class"], comment: string | undefined): JSDocImplementsTag;
-        createJSDocAuthorTag(tagName: Identifier | undefined, comment?: string): JSDocAuthorTag;
-        updateJSDocAuthorTag(node: JSDocAuthorTag, tagName: Identifier | undefined, comment: string | undefined): JSDocAuthorTag;
-        createJSDocClassTag(tagName: Identifier | undefined, comment?: string): JSDocClassTag;
-        updateJSDocClassTag(node: JSDocClassTag, tagName: Identifier | undefined, comment: string | undefined): JSDocClassTag;
-        createJSDocPublicTag(tagName: Identifier | undefined, comment?: string): JSDocPublicTag;
-        updateJSDocPublicTag(node: JSDocPublicTag, tagName: Identifier | undefined, comment: string | undefined): JSDocPublicTag;
-        createJSDocPrivateTag(tagName: Identifier | undefined, comment?: string): JSDocPrivateTag;
-        updateJSDocPrivateTag(node: JSDocPrivateTag, tagName: Identifier | undefined, comment: string | undefined): JSDocPrivateTag;
-        createJSDocProtectedTag(tagName: Identifier | undefined, comment?: string): JSDocProtectedTag;
-        updateJSDocProtectedTag(node: JSDocProtectedTag, tagName: Identifier | undefined, comment: string | undefined): JSDocProtectedTag;
-        createJSDocReadonlyTag(tagName: Identifier | undefined, comment?: string): JSDocReadonlyTag;
-        updateJSDocReadonlyTag(node: JSDocReadonlyTag, tagName: Identifier | undefined, comment: string | undefined): JSDocReadonlyTag;
-        createJSDocUnknownTag(tagName: Identifier, comment?: string): JSDocUnknownTag;
-        updateJSDocUnknownTag(node: JSDocUnknownTag, tagName: Identifier, comment: string | undefined): JSDocUnknownTag;
-        createJSDocDeprecatedTag(tagName: Identifier, comment?: string): JSDocDeprecatedTag;
-        updateJSDocDeprecatedTag(node: JSDocDeprecatedTag, tagName: Identifier, comment?: string): JSDocDeprecatedTag;
-        createJSDocComment(comment?: string | undefined, tags?: readonly JSDocTag[] | undefined): JSDoc;
-        updateJSDocComment(node: JSDoc, comment: string | undefined, tags: readonly JSDocTag[] | undefined): JSDoc;
+        createJSDocTemplateTag(tagName: Identifier | undefined, constraint: JSDocTypeExpression | undefined, typeParameters: readonly TypeParameterDeclaration[], comment?: string | NodeArray<JSDocText | JSDocLink>): JSDocTemplateTag;
+        updateJSDocTemplateTag(node: JSDocTemplateTag, tagName: Identifier | undefined, constraint: JSDocTypeExpression | undefined, typeParameters: readonly TypeParameterDeclaration[], comment: string | NodeArray<JSDocText | JSDocLink> | undefined): JSDocTemplateTag;
+        createJSDocTypedefTag(tagName: Identifier | undefined, typeExpression?: JSDocTypeExpression | JSDocTypeLiteral, fullName?: Identifier | JSDocNamespaceDeclaration, comment?: string | NodeArray<JSDocText | JSDocLink>): JSDocTypedefTag;
+        updateJSDocTypedefTag(node: JSDocTypedefTag, tagName: Identifier | undefined, typeExpression: JSDocTypeExpression | JSDocTypeLiteral | undefined, fullName: Identifier | JSDocNamespaceDeclaration | undefined, comment: string | NodeArray<JSDocText | JSDocLink> | undefined): JSDocTypedefTag;
+        createJSDocParameterTag(tagName: Identifier | undefined, name: EntityName, isBracketed: boolean, typeExpression?: JSDocTypeExpression, isNameFirst?: boolean, comment?: string | NodeArray<JSDocText | JSDocLink>): JSDocParameterTag;
+        updateJSDocParameterTag(node: JSDocParameterTag, tagName: Identifier | undefined, name: EntityName, isBracketed: boolean, typeExpression: JSDocTypeExpression | undefined, isNameFirst: boolean, comment: string | NodeArray<JSDocText | JSDocLink> | undefined): JSDocParameterTag;
+        createJSDocPropertyTag(tagName: Identifier | undefined, name: EntityName, isBracketed: boolean, typeExpression?: JSDocTypeExpression, isNameFirst?: boolean, comment?: string | NodeArray<JSDocText | JSDocLink>): JSDocPropertyTag;
+        updateJSDocPropertyTag(node: JSDocPropertyTag, tagName: Identifier | undefined, name: EntityName, isBracketed: boolean, typeExpression: JSDocTypeExpression | undefined, isNameFirst: boolean, comment: string | NodeArray<JSDocText | JSDocLink> | undefined): JSDocPropertyTag;
+        createJSDocTypeTag(tagName: Identifier | undefined, typeExpression: JSDocTypeExpression, comment?: string | NodeArray<JSDocText | JSDocLink>): JSDocTypeTag;
+        updateJSDocTypeTag(node: JSDocTypeTag, tagName: Identifier | undefined, typeExpression: JSDocTypeExpression, comment: string | NodeArray<JSDocText | JSDocLink> | undefined): JSDocTypeTag;
+        createJSDocSeeTag(tagName: Identifier | undefined, nameExpression: JSDocNameReference | undefined, comment?: string | NodeArray<JSDocText | JSDocLink>): JSDocSeeTag;
+        updateJSDocSeeTag(node: JSDocSeeTag, tagName: Identifier | undefined, nameExpression: JSDocNameReference | undefined, comment?: string | NodeArray<JSDocText | JSDocLink>): JSDocSeeTag;
+        createJSDocReturnTag(tagName: Identifier | undefined, typeExpression?: JSDocTypeExpression, comment?: string | NodeArray<JSDocText | JSDocLink>): JSDocReturnTag;
+        updateJSDocReturnTag(node: JSDocReturnTag, tagName: Identifier | undefined, typeExpression: JSDocTypeExpression | undefined, comment: string | NodeArray<JSDocText | JSDocLink> | undefined): JSDocReturnTag;
+        createJSDocThisTag(tagName: Identifier | undefined, typeExpression: JSDocTypeExpression, comment?: string | NodeArray<JSDocText | JSDocLink>): JSDocThisTag;
+        updateJSDocThisTag(node: JSDocThisTag, tagName: Identifier | undefined, typeExpression: JSDocTypeExpression | undefined, comment: string | NodeArray<JSDocText | JSDocLink> | undefined): JSDocThisTag;
+        createJSDocEnumTag(tagName: Identifier | undefined, typeExpression: JSDocTypeExpression, comment?: string | NodeArray<JSDocText | JSDocLink>): JSDocEnumTag;
+        updateJSDocEnumTag(node: JSDocEnumTag, tagName: Identifier | undefined, typeExpression: JSDocTypeExpression, comment: string | NodeArray<JSDocText | JSDocLink> | undefined): JSDocEnumTag;
+        createJSDocCallbackTag(tagName: Identifier | undefined, typeExpression: JSDocSignature, fullName?: Identifier | JSDocNamespaceDeclaration, comment?: string | NodeArray<JSDocText | JSDocLink>): JSDocCallbackTag;
+        updateJSDocCallbackTag(node: JSDocCallbackTag, tagName: Identifier | undefined, typeExpression: JSDocSignature, fullName: Identifier | JSDocNamespaceDeclaration | undefined, comment: string | NodeArray<JSDocText | JSDocLink> | undefined): JSDocCallbackTag;
+        createJSDocAugmentsTag(tagName: Identifier | undefined, className: JSDocAugmentsTag["class"], comment?: string | NodeArray<JSDocText | JSDocLink>): JSDocAugmentsTag;
+        updateJSDocAugmentsTag(node: JSDocAugmentsTag, tagName: Identifier | undefined, className: JSDocAugmentsTag["class"], comment: string | NodeArray<JSDocText | JSDocLink> | undefined): JSDocAugmentsTag;
+        createJSDocImplementsTag(tagName: Identifier | undefined, className: JSDocImplementsTag["class"], comment?: string | NodeArray<JSDocText | JSDocLink>): JSDocImplementsTag;
+        updateJSDocImplementsTag(node: JSDocImplementsTag, tagName: Identifier | undefined, className: JSDocImplementsTag["class"], comment: string | NodeArray<JSDocText | JSDocLink> | undefined): JSDocImplementsTag;
+        createJSDocAuthorTag(tagName: Identifier | undefined, comment?: string | NodeArray<JSDocText | JSDocLink>): JSDocAuthorTag;
+        updateJSDocAuthorTag(node: JSDocAuthorTag, tagName: Identifier | undefined, comment: string | NodeArray<JSDocText | JSDocLink> | undefined): JSDocAuthorTag;
+        createJSDocClassTag(tagName: Identifier | undefined, comment?: string | NodeArray<JSDocText | JSDocLink>): JSDocClassTag;
+        updateJSDocClassTag(node: JSDocClassTag, tagName: Identifier | undefined, comment: string | NodeArray<JSDocText | JSDocLink> | undefined): JSDocClassTag;
+        createJSDocPublicTag(tagName: Identifier | undefined, comment?: string | NodeArray<JSDocText | JSDocLink>): JSDocPublicTag;
+        updateJSDocPublicTag(node: JSDocPublicTag, tagName: Identifier | undefined, comment: string | NodeArray<JSDocText | JSDocLink> | undefined): JSDocPublicTag;
+        createJSDocPrivateTag(tagName: Identifier | undefined, comment?: string | NodeArray<JSDocText | JSDocLink>): JSDocPrivateTag;
+        updateJSDocPrivateTag(node: JSDocPrivateTag, tagName: Identifier | undefined, comment: string | NodeArray<JSDocText | JSDocLink> | undefined): JSDocPrivateTag;
+        createJSDocProtectedTag(tagName: Identifier | undefined, comment?: string | NodeArray<JSDocText | JSDocLink>): JSDocProtectedTag;
+        updateJSDocProtectedTag(node: JSDocProtectedTag, tagName: Identifier | undefined, comment: string | NodeArray<JSDocText | JSDocLink> | undefined): JSDocProtectedTag;
+        createJSDocReadonlyTag(tagName: Identifier | undefined, comment?: string | NodeArray<JSDocText | JSDocLink>): JSDocReadonlyTag;
+        updateJSDocReadonlyTag(node: JSDocReadonlyTag, tagName: Identifier | undefined, comment: string | NodeArray<JSDocText | JSDocLink> | undefined): JSDocReadonlyTag;
+        createJSDocUnknownTag(tagName: Identifier, comment?: string | NodeArray<JSDocText | JSDocLink>): JSDocUnknownTag;
+        updateJSDocUnknownTag(node: JSDocUnknownTag, tagName: Identifier, comment: string | NodeArray<JSDocText | JSDocLink> | undefined): JSDocUnknownTag;
+        createJSDocDeprecatedTag(tagName: Identifier, comment?: string | NodeArray<JSDocText | JSDocLink>): JSDocDeprecatedTag;
+        updateJSDocDeprecatedTag(node: JSDocDeprecatedTag, tagName: Identifier, comment?: string | NodeArray<JSDocText | JSDocLink>): JSDocDeprecatedTag;
+        createJSDocOverrideTag(tagName: Identifier, comment?: string | NodeArray<JSDocText | JSDocLink>): JSDocOverrideTag;
+        updateJSDocOverrideTag(node: JSDocOverrideTag, tagName: Identifier, comment?: string | NodeArray<JSDocText | JSDocLink>): JSDocOverrideTag;
+        createJSDocText(text: string): JSDocText;
+        updateJSDocText(node: JSDocText, text: string): JSDocText;
+        createJSDocComment(comment?: string | NodeArray<JSDocText | JSDocLink> | undefined, tags?: readonly JSDocTag[] | undefined): JSDoc;
+        updateJSDocComment(node: JSDoc, comment: string | NodeArray<JSDocText | JSDocLink> | undefined, tags: readonly JSDocTag[] | undefined): JSDoc;
         createJsxElement(openingElement: JsxOpeningElement, children: readonly JsxChild[], closingElement: JsxClosingElement): JsxElement;
         updateJsxElement(node: JsxElement, openingElement: JsxOpeningElement, children: readonly JsxChild[], closingElement: JsxClosingElement): JsxElement;
         createJsxSelfClosingElement(tagName: JsxTagNameExpression, typeArguments: readonly TypeNode[] | undefined, attributes: JsxAttributes): JsxSelfClosingElement;
@@ -3748,12 +3797,12 @@ declare namespace ts {
          * });
          * ```
          */
-        onEmitNode?(hint: EmitHint, node: Node | undefined, emitCallback: (hint: EmitHint, node: Node | undefined) => void): void;
+        onEmitNode?(hint: EmitHint, node: Node, emitCallback: (hint: EmitHint, node: Node) => void): void;
         /**
          * A hook used to check if an emit notification is required for a node.
          * @param node The node to emit.
          */
-        isEmitNotificationEnabled?(node: Node | undefined): boolean;
+        isEmitNotificationEnabled?(node: Node): boolean;
         /**
          * A hook used by the Printer to perform just-in-time substitution of a node. This is
          * primarily used by node transformations that need to substitute one node for another,
@@ -3867,6 +3916,8 @@ declare namespace ts {
         readonly disableSuggestions?: boolean;
         readonly quotePreference?: "auto" | "double" | "single";
         readonly includeCompletionsForModuleExports?: boolean;
+        readonly includeCompletionsForImportStatements?: boolean;
+        readonly includeCompletionsWithSnippetText?: boolean;
         readonly includeAutomaticOptionalChainCompletions?: boolean;
         readonly includeCompletionsWithInsertText?: boolean;
         readonly importModuleSpecifierPreference?: "shortest" | "project-relative" | "relative" | "non-relative";
@@ -3965,7 +4016,7 @@ declare namespace ts {
         scanJsxIdentifier(): SyntaxKind;
         scanJsxAttributeValue(): SyntaxKind;
         reScanJsxAttributeValue(): SyntaxKind;
-        reScanJsxToken(): JsxTokenSyntaxKind;
+        reScanJsxToken(allowMultilineJsxText?: boolean): JsxTokenSyntaxKind;
         reScanLessThanToken(): SyntaxKind;
         reScanQuestionToken(): SyntaxKind;
         reScanInvalidIdentifier(): SyntaxKind;
@@ -4100,7 +4151,7 @@ declare namespace ts {
     function idText(identifierOrPrivateName: Identifier | PrivateIdentifier): string;
     function symbolName(symbol: Symbol): string;
     function getNameOfJSDocTypedef(declaration: JSDocTypedefTag): Identifier | PrivateIdentifier | undefined;
-    function getNameOfDeclaration(declaration: Declaration | Expression): DeclarationName | undefined;
+    function getNameOfDeclaration(declaration: Declaration | Expression | undefined): DeclarationName | undefined;
     /**
      * Gets the JSDoc parameter tags for the node if present.
      *
@@ -4146,6 +4197,7 @@ declare namespace ts {
     function getJSDocProtectedTag(node: Node): JSDocProtectedTag | undefined;
     /** Gets the JSDoc protected tag for the node if present */
     function getJSDocReadonlyTag(node: Node): JSDocReadonlyTag | undefined;
+    function getJSDocOverrideTagNoCache(node: Node): JSDocOverrideTag | undefined;
     /** Gets the JSDoc deprecated tag for the node if present */
     function getJSDocDeprecatedTag(node: Node): JSDocDeprecatedTag | undefined;
     /** Gets the JSDoc enum tag for the node if present */
@@ -4183,13 +4235,15 @@ declare namespace ts {
     function getAllJSDocTags<T extends JSDocTag>(node: Node, predicate: (tag: JSDocTag) => tag is T): readonly T[];
     /** Gets all JSDoc tags of a specified kind */
     function getAllJSDocTagsOfKind(node: Node, kind: SyntaxKind): readonly JSDocTag[];
+    /** Gets the text of a jsdoc comment, flattening links to their text. */
+    function getTextOfJSDocComment(comment?: string | NodeArray<JSDocText | JSDocLink>): string | undefined;
     /**
      * Gets the effective type parameters. If the node was parsed in a
      * JavaScript file, gets the type parameters from the `@template` tag from JSDoc.
      */
     function getEffectiveTypeParameterDeclarations(node: DeclarationWithTypeParameters): readonly TypeParameterDeclaration[];
     function getEffectiveConstraintOfTypeParameter(node: TypeParameterDeclaration): TypeNode | undefined;
-    function isIdentifierOrPrivateIdentifier(node: Node): node is Identifier | PrivateIdentifier;
+    function isMemberName(node: Node): node is MemberName;
     function isPropertyAccessChain(node: Node): node is PropertyAccessChain;
     function isElementAccessChain(node: Node): node is ElementAccessChain;
     function isCallChain(node: Node): node is CallChain;
@@ -4204,6 +4258,12 @@ declare namespace ts {
     function isUnparsedTextLike(node: Node): node is UnparsedTextLike;
     function isUnparsedNode(node: Node): node is UnparsedNode;
     function isJSDocPropertyLikeTag(node: Node): node is JSDocPropertyLikeTag;
+    /**
+     * True if kind is of some token syntax kind.
+     * For example, this is true for an IfKeyword but not for an IfStatement.
+     * Literals are considered tokens, except TemplateLiteral, but does include TemplateHead/Middle/Tail.
+     */
+    function isTokenKind(kind: SyntaxKind): boolean;
     /**
      * True if node is of some token syntax kind.
      * For example, this is true for an IfKeyword but not for an IfStatement.
@@ -4220,7 +4280,7 @@ declare namespace ts {
     function isEntityName(node: Node): node is EntityName;
     function isPropertyName(node: Node): node is PropertyName;
     function isBindingName(node: Node): node is BindingName;
-    function isFunctionLike(node: Node): node is SignatureDeclaration;
+    function isFunctionLike(node: Node | undefined): node is SignatureDeclaration;
     function isClassElement(node: Node): node is ClassElement;
     function isClassLike(node: Node): node is ClassLikeDeclaration;
     function isAccessor(node: Node): node is AccessorDeclaration;
@@ -4346,10 +4406,14 @@ declare namespace ts {
     function isTemplateHead(node: Node): node is TemplateHead;
     function isTemplateMiddle(node: Node): node is TemplateMiddle;
     function isTemplateTail(node: Node): node is TemplateTail;
+    function isDotDotDotToken(node: Node): node is DotDotDotToken;
+    function isPlusToken(node: Node): node is PlusToken;
+    function isMinusToken(node: Node): node is MinusToken;
+    function isAsteriskToken(node: Node): node is AsteriskToken;
     function isIdentifier(node: Node): node is Identifier;
+    function isPrivateIdentifier(node: Node): node is PrivateIdentifier;
     function isQualifiedName(node: Node): node is QualifiedName;
     function isComputedPropertyName(node: Node): node is ComputedPropertyName;
-    function isPrivateIdentifier(node: Node): node is PrivateIdentifier;
     function isTypeParameterDeclaration(node: Node): node is TypeParameterDeclaration;
     function isParameter(node: Node): node is ParameterDeclaration;
     function isDecorator(node: Node): node is Decorator;
@@ -4492,6 +4556,7 @@ declare namespace ts {
     function isUnparsedSource(node: Node): node is UnparsedSource;
     function isJSDocTypeExpression(node: Node): node is JSDocTypeExpression;
     function isJSDocNameReference(node: Node): node is JSDocNameReference;
+    function isJSDocLink(node: Node): node is JSDocLink;
     function isJSDocAllType(node: Node): node is JSDocAllType;
     function isJSDocUnknownType(node: Node): node is JSDocUnknownType;
     function isJSDocNullableType(node: Node): node is JSDocNullableType;
@@ -4511,6 +4576,7 @@ declare namespace ts {
     function isJSDocPrivateTag(node: Node): node is JSDocPrivateTag;
     function isJSDocProtectedTag(node: Node): node is JSDocProtectedTag;
     function isJSDocReadonlyTag(node: Node): node is JSDocReadonlyTag;
+    function isJSDocOverrideTag(node: Node): node is JSDocOverrideTag;
     function isJSDocDeprecatedTag(node: Node): node is JSDocDeprecatedTag;
     function isJSDocSeeTag(node: Node): node is JSDocSeeTag;
     function isJSDocEnumTag(node: Node): node is JSDocEnumTag;
@@ -4575,7 +4641,7 @@ declare namespace ts {
     /**
      * Reads the config file, reports errors if any and exits if the config file cannot be found
      */
-    export function getParsedCommandLineOfConfigFile(configFileName: string, optionsToExtend: CompilerOptions, host: ParseConfigFileHost, extendedConfigCache?: Map<ExtendedConfigCacheEntry>, watchOptionsToExtend?: WatchOptions, extraFileExtensions?: readonly FileExtensionInfo[]): ParsedCommandLine | undefined;
+    export function getParsedCommandLineOfConfigFile(configFileName: string, optionsToExtend: CompilerOptions | undefined, host: ParseConfigFileHost, extendedConfigCache?: Map<ExtendedConfigCacheEntry>, watchOptionsToExtend?: WatchOptions, extraFileExtensions?: readonly FileExtensionInfo[]): ParsedCommandLine | undefined;
     /**
      * Read tsconfig.json file
      * @param fileName The path to the config file
@@ -4643,13 +4709,13 @@ declare namespace ts {
     export {};
 }
 declare namespace ts {
-    function getEffectiveTypeRoots(options: CompilerOptions, host: GetEffectiveTypeRootsHost): string[] | undefined;
+    export function getEffectiveTypeRoots(options: CompilerOptions, host: GetEffectiveTypeRootsHost): string[] | undefined;
     /**
      * @param {string | undefined} containingFile - file that contains type reference directive, can be undefined if containing file is unknown.
      * This is possible in case if resolution is performed for directives specified via 'types' parameter. In this case initial path for secondary lookups
      * is assumed to be the same as root directory of the project.
      */
-    function resolveTypeReferenceDirective(typeReferenceDirectiveName: string, containingFile: string | undefined, options: CompilerOptions, host: ModuleResolutionHost, redirectedReference?: ResolvedProjectReference): ResolvedTypeReferenceDirectiveWithFailedLookupLocations;
+    export function resolveTypeReferenceDirective(typeReferenceDirectiveName: string, containingFile: string | undefined, options: CompilerOptions, host: ModuleResolutionHost, redirectedReference?: ResolvedProjectReference, cache?: TypeReferenceDirectiveResolutionCache): ResolvedTypeReferenceDirectiveWithFailedLookupLocations;
     /**
      * Given a set of options, returns the set of type directive names
      *   that should be included for this program automatically.
@@ -4658,30 +4724,46 @@ declare namespace ts {
      * More type directives might appear in the program later as a result of loading actual source files;
      *   this list is only the set of defaults that are implicitly included.
      */
-    function getAutomaticTypeDirectiveNames(options: CompilerOptions, host: ModuleResolutionHost): string[];
+    export function getAutomaticTypeDirectiveNames(options: CompilerOptions, host: ModuleResolutionHost): string[];
+    export interface TypeReferenceDirectiveResolutionCache extends PerDirectoryResolutionCache<ResolvedTypeReferenceDirectiveWithFailedLookupLocations>, PackageJsonInfoCache {
+    }
     /**
-     * Cached module resolutions per containing directory.
+     * Cached resolutions per containing directory.
      * This assumes that any module id will have the same resolution for sibling files located in the same folder.
      */
-    interface ModuleResolutionCache extends NonRelativeModuleNameResolutionCache {
-        getOrCreateCacheForDirectory(directoryName: string, redirectedReference?: ResolvedProjectReference): Map<ResolvedModuleWithFailedLookupLocations>;
+    export interface PerDirectoryResolutionCache<T> {
+        getOrCreateCacheForDirectory(directoryName: string, redirectedReference?: ResolvedProjectReference): Map<T>;
+        clear(): void;
+        /**
+         *  Updates with the current compilerOptions the cache will operate with.
+         *  This updates the redirects map as well if needed so module resolutions are cached if they can across the projects
+         */
+        update(options: CompilerOptions): void;
+    }
+    export interface ModuleResolutionCache extends PerDirectoryResolutionCache<ResolvedModuleWithFailedLookupLocations>, NonRelativeModuleNameResolutionCache, PackageJsonInfoCache {
+        getPackageJsonInfoCache(): PackageJsonInfoCache;
     }
     /**
      * Stored map from non-relative module name to a table: directory -> result of module lookup in this directory
      * We support only non-relative module names because resolution of relative module names is usually more deterministic and thus less expensive.
      */
-    interface NonRelativeModuleNameResolutionCache {
+    export interface NonRelativeModuleNameResolutionCache extends PackageJsonInfoCache {
         getOrCreateCacheForModuleName(nonRelativeModuleName: string, redirectedReference?: ResolvedProjectReference): PerModuleNameCache;
     }
-    interface PerModuleNameCache {
+    export interface PackageJsonInfoCache {
+        clear(): void;
+    }
+    export interface PerModuleNameCache {
         get(directory: string): ResolvedModuleWithFailedLookupLocations | undefined;
         set(directory: string, result: ResolvedModuleWithFailedLookupLocations): void;
     }
-    function createModuleResolutionCache(currentDirectory: string, getCanonicalFileName: (s: string) => string, options?: CompilerOptions): ModuleResolutionCache;
-    function resolveModuleNameFromCache(moduleName: string, containingFile: string, cache: ModuleResolutionCache): ResolvedModuleWithFailedLookupLocations | undefined;
-    function resolveModuleName(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost, cache?: ModuleResolutionCache, redirectedReference?: ResolvedProjectReference): ResolvedModuleWithFailedLookupLocations;
-    function nodeModuleNameResolver(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost, cache?: ModuleResolutionCache, redirectedReference?: ResolvedProjectReference): ResolvedModuleWithFailedLookupLocations;
-    function classicNameResolver(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost, cache?: NonRelativeModuleNameResolutionCache, redirectedReference?: ResolvedProjectReference): ResolvedModuleWithFailedLookupLocations;
+    export function createModuleResolutionCache(currentDirectory: string, getCanonicalFileName: (s: string) => string, options?: CompilerOptions): ModuleResolutionCache;
+    export function createTypeReferenceDirectiveResolutionCache(currentDirectory: string, getCanonicalFileName: (s: string) => string, options?: CompilerOptions, packageJsonInfoCache?: PackageJsonInfoCache): TypeReferenceDirectiveResolutionCache;
+    export function resolveModuleNameFromCache(moduleName: string, containingFile: string, cache: ModuleResolutionCache): ResolvedModuleWithFailedLookupLocations | undefined;
+    export function resolveModuleName(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost, cache?: ModuleResolutionCache, redirectedReference?: ResolvedProjectReference): ResolvedModuleWithFailedLookupLocations;
+    export function nodeModuleNameResolver(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost, cache?: ModuleResolutionCache, redirectedReference?: ResolvedProjectReference): ResolvedModuleWithFailedLookupLocations;
+    export function classicNameResolver(moduleName: string, containingFile: string, compilerOptions: CompilerOptions, host: ModuleResolutionHost, cache?: NonRelativeModuleNameResolutionCache, redirectedReference?: ResolvedProjectReference): ResolvedModuleWithFailedLookupLocations;
+    export {};
 }
 declare namespace ts {
     /**
@@ -4748,6 +4830,10 @@ declare namespace ts {
      * environment and merging hoisted declarations upon completion.
      */
     function visitFunctionBody(node: ConciseBody, visitor: Visitor, context: TransformationContext): ConciseBody;
+    /**
+     * Visits an iteration body, adding any block-scoped variables required by the transformation.
+     */
+    function visitIterationBody(body: Statement, visitor: Visitor, context: TransformationContext): Statement;
     /**
      * Visits each child of a Node using the supplied visitor, possibly returning a new Node of the same kind in its place.
      *
@@ -5036,6 +5122,8 @@ declare namespace ts {
     interface WatchCompilerHost<T extends BuilderProgram> extends ProgramHost<T>, WatchHost {
         /** Instead of using output d.ts file from project reference, use its source file */
         useSourceOfProjectReferenceRedirect?(): boolean;
+        /** If provided, use this method to get parsed command lines for referenced projects */
+        getParsedCommandLine?(fileName: string): ParsedCommandLine | undefined;
         /** If provided, callback to invoke after every new program creation */
         afterProgramCreate?(program: T): void;
     }
@@ -5131,9 +5219,9 @@ declare namespace ts {
     interface SolutionBuilderWithWatchHost<T extends BuilderProgram> extends SolutionBuilderHostBase<T>, WatchHost {
     }
     interface SolutionBuilder<T extends BuilderProgram> {
-        build(project?: string, cancellationToken?: CancellationToken): ExitStatus;
+        build(project?: string, cancellationToken?: CancellationToken, writeFile?: WriteFileCallback, getCustomTransformers?: (project: string) => CustomTransformers): ExitStatus;
         clean(project?: string): ExitStatus;
-        buildReferences(project: string, cancellationToken?: CancellationToken): ExitStatus;
+        buildReferences(project: string, cancellationToken?: CancellationToken, writeFile?: WriteFileCallback, getCustomTransformers?: (project: string) => CustomTransformers): ExitStatus;
         cleanReferences(project?: string): ExitStatus;
         getNextInvalidatedProject(cancellationToken?: CancellationToken): InvalidatedProject<T> | undefined;
     }
@@ -5291,7 +5379,7 @@ declare namespace ts {
         getName(): string;
         getDeclarations(): Declaration[] | undefined;
         getDocumentationComment(typeChecker: TypeChecker | undefined): SymbolDisplayPart[];
-        getJsDocTags(): JSDocTagInfo[];
+        getJsDocTags(checker?: TypeChecker): JSDocTagInfo[];
     }
     interface Type {
         getFlags(): TypeFlags;
@@ -5422,6 +5510,7 @@ declare namespace ts {
         isKnownTypesPackageName?(name: string): boolean;
         installPackage?(options: InstallPackageOptions): Promise<ApplyCodeActionCommandResult>;
         writeFile?(fileName: string, content: string): void;
+        getParsedCommandLine?(fileName: string): ParsedCommandLine | undefined;
     }
     type WithMetadata<T> = T & {
         metadata?: unknown;
@@ -5511,12 +5600,13 @@ declare namespace ts {
          *
          * @param fileName The path to the file
          * @param position A zero based index of the character where you want the entries
-         * @param entryName The name from an existing completion which came from `getCompletionsAtPosition`
+         * @param entryName The `name` from an existing completion which came from `getCompletionsAtPosition`
          * @param formatOptions How should code samples in the completions be formatted, can be undefined for backwards compatibility
-         * @param source Source code for the current file, can be undefined for backwards compatibility
+         * @param source `source` property from the completion entry
          * @param preferences User settings, can be undefined for backwards compatibility
+         * @param data `data` property from the completion entry
          */
-        getCompletionEntryDetails(fileName: string, position: number, entryName: string, formatOptions: FormatCodeOptions | FormatCodeSettings | undefined, source: string | undefined, preferences: UserPreferences | undefined): CompletionEntryDetails | undefined;
+        getCompletionEntryDetails(fileName: string, position: number, entryName: string, formatOptions: FormatCodeOptions | FormatCodeSettings | undefined, source: string | undefined, preferences: UserPreferences | undefined, data: CompletionEntryData | undefined): CompletionEntryDetails | undefined;
         getCompletionEntrySymbol(fileName: string, position: number, name: string, source: string | undefined): Symbol | undefined;
         /**
          * Gets semantic information about the identifier at a particular position in a
@@ -5577,7 +5667,7 @@ declare namespace ts {
         applyCodeActionCommand(fileName: string, action: CodeActionCommand | CodeActionCommand[]): Promise<ApplyCodeActionCommandResult | ApplyCodeActionCommandResult[]>;
         getApplicableRefactors(fileName: string, positionOrRange: number | TextRange, preferences: UserPreferences | undefined, triggerReason?: RefactorTriggerReason, kind?: string): ApplicableRefactorInfo[];
         getEditsForRefactor(fileName: string, formatOptions: FormatCodeSettings, positionOrRange: number | TextRange, refactorName: string, actionName: string, preferences: UserPreferences | undefined): RefactorEditInfo | undefined;
-        organizeImports(scope: OrganizeImportsScope, formatOptions: FormatCodeSettings, preferences: UserPreferences | undefined): readonly FileTextChanges[];
+        organizeImports(args: OrganizeImportsArgs, formatOptions: FormatCodeSettings, preferences: UserPreferences | undefined): readonly FileTextChanges[];
         getEditsForFileRename(oldFilePath: string, newFilePath: string, formatOptions: FormatCodeSettings, preferences: UserPreferences | undefined): readonly FileTextChanges[];
         getEmitOutput(fileName: string, emitOnlyDtsFiles?: boolean, forceDtsEmit?: boolean): EmitOutput;
         getProgram(): Program | undefined;
@@ -5594,8 +5684,10 @@ declare namespace ts {
         type: "file";
         fileName: string;
     }
-    type OrganizeImportsScope = CombinedCodeFixScope;
-    type CompletionsTriggerCharacter = "." | '"' | "'" | "`" | "/" | "@" | "<" | "#";
+    interface OrganizeImportsArgs extends CombinedCodeFixScope {
+        skipDestructiveCodeActions?: boolean;
+    }
+    type CompletionsTriggerCharacter = "." | '"' | "'" | "`" | "/" | "@" | "<" | "#" | " ";
     interface GetCompletionsAtPositionOptions extends UserPreferences {
         /**
          * If the editor is asking for completions because a certain character was typed
@@ -5947,6 +6039,7 @@ declare namespace ts {
         name: string;
         containerKind: ScriptElementKind;
         containerName: string;
+        unverified?: boolean;
     }
     interface DefinitionInfoAndBoundSpan {
         definitions?: readonly DefinitionInfo[];
@@ -5981,15 +6074,21 @@ declare namespace ts {
         typeParameterName = 18,
         enumMemberName = 19,
         functionName = 20,
-        regularExpressionLiteral = 21
+        regularExpressionLiteral = 21,
+        link = 22,
+        linkName = 23,
+        linkText = 24
     }
     interface SymbolDisplayPart {
         text: string;
         kind: string;
     }
+    interface JSDocLinkDisplayPart extends SymbolDisplayPart {
+        target: DocumentSpan;
+    }
     interface JSDocTagInfo {
         name: string;
-        text?: string;
+        text?: SymbolDisplayPart[];
     }
     interface QuickInfo {
         kind: ScriptElementKind;
@@ -6074,14 +6173,36 @@ declare namespace ts {
          * true when the current location also allows for a new identifier
          */
         isNewIdentifierLocation: boolean;
+        /**
+         * Indicates to client to continue requesting completions on subsequent keystrokes.
+         */
+        isIncomplete?: true;
         entries: CompletionEntry[];
     }
+    interface CompletionEntryData {
+        /** The file name declaring the export's module symbol, if it was an external module */
+        fileName?: string;
+        /** The module name (with quotes stripped) of the export's module symbol, if it was an ambient module */
+        ambientModuleName?: string;
+        /** True if the export was found in the package.json AutoImportProvider */
+        isPackageJsonImport?: true;
+        /**
+         * The name of the property or export in the module's symbol table. Differs from the completion name
+         * in the case of InternalSymbolName.ExportEquals and InternalSymbolName.Default.
+         */
+        exportName: string;
+        /**
+         * Set for auto imports with eagerly resolved module specifiers.
+         */
+        moduleSpecifier?: string;
+    }
     interface CompletionEntry {
         name: string;
         kind: ScriptElementKind;
         kindModifiers?: string;
         sortText: string;
         insertText?: string;
+        isSnippet?: true;
         /**
          * An optional span that indicates the text to be replaced by this completion item.
          * If present, this span should be used instead of the default one.
@@ -6090,9 +6211,20 @@ declare namespace ts {
         replacementSpan?: TextSpan;
         hasAction?: true;
         source?: string;
+        sourceDisplay?: SymbolDisplayPart[];
         isRecommended?: true;
         isFromUncheckedFile?: true;
         isPackageJsonImport?: true;
+        isImportStatementCompletion?: true;
+        /**
+         * A property to be sent back to TS Server in the CompletionDetailsRequest, along with `name`,
+         * that allows TS Server to look up the symbol represented by the completion item, disambiguating
+         * items with the same name. Currently only defined for auto-import completions, but the type is
+         * `unknown` in the protocol, so it can be changed as needed to support other kinds of completions.
+         * The presence of this property should generally not be used to assume that this completion entry
+         * is an auto-import.
+         */
+        data?: CompletionEntryData;
     }
     interface CompletionEntryDetails {
         name: string;
@@ -6102,7 +6234,9 @@ declare namespace ts {
         documentation?: SymbolDisplayPart[];
         tags?: JSDocTagInfo[];
         codeActions?: CodeAction[];
+        /** @deprecated Use `sourceDisplay` instead. */
         source?: SymbolDisplayPart[];
+        sourceDisplay?: SymbolDisplayPart[];
     }
     interface OutliningSpan {
         /** The span of the document to actually collapse. */
@@ -6256,7 +6390,13 @@ declare namespace ts {
          */
         jsxAttribute = "JSX attribute",
         /** String literal */
-        string = "string"
+        string = "string",
+        /** Jsdoc @link: in `{@link C link text}`, the before and after text "{@link " and "}" */
+        link = "link",
+        /** Jsdoc @link: in `{@link C link text}`, the entity name "C" */
+        linkName = "link name",
+        /** Jsdoc @link: in `{@link C link text}`, the link text "link text" */
+        linkText = "link text"
     }
     enum ScriptElementKindModifier {
         none = "",
@@ -6397,8 +6537,23 @@ declare namespace ts {
          * @param fileName The name of the file to be released
          * @param compilationSettings The compilation settings used to acquire the file
          */
+        /**@deprecated pass scriptKind for correctness */
         releaseDocument(fileName: string, compilationSettings: CompilerOptions): void;
+        /**
+         * Informs the DocumentRegistry that a file is not needed any longer.
+         *
+         * Note: It is not allowed to call release on a SourceFile that was not acquired from
+         * this registry originally.
+         *
+         * @param fileName The name of the file to be released
+         * @param compilationSettings The compilation settings used to acquire the file
+         * @param scriptKind The script kind of the file to be released
+         */
+        releaseDocument(fileName: string, compilationSettings: CompilerOptions, scriptKind: ScriptKind): void;
+        /**
+         * @deprecated pass scriptKind for correctness */
         releaseDocumentWithKey(path: Path, key: DocumentRegistryBucketKey): void;
+        releaseDocumentWithKey(path: Path, key: DocumentRegistryBucketKey, scriptKind: ScriptKind): void;
         reportStats(): string;
     }
     type DocumentRegistryBucketKey = string & {
@@ -6469,7 +6624,7 @@ declare namespace ts {
     /** @deprecated Use `factory.createRegularExpressionLiteral` or the factory supplied by your transformation context instead. */
     const createRegularExpressionLiteral: (text: string) => RegularExpressionLiteral;
     /** @deprecated Use `factory.createLoopVariable` or the factory supplied by your transformation context instead. */
-    const createLoopVariable: () => Identifier;
+    const createLoopVariable: (reservedInNestedScopes?: boolean | undefined) => Identifier;
     /** @deprecated Use `factory.createUniqueName` or the factory supplied by your transformation context instead. */
     const createUniqueName: (text: string, flags?: GeneratedIdentifierFlags | undefined) => Identifier;
     /** @deprecated Use `factory.createPrivateIdentifier` or the factory supplied by your transformation context instead. */
@@ -6641,13 +6796,13 @@ declare namespace ts {
     /** @deprecated Use `factory.updateObjectLiteralExpression` or the factory supplied by your transformation context instead. */
     const updateObjectLiteral: (node: ObjectLiteralExpression, properties: readonly ObjectLiteralElementLike[]) => ObjectLiteralExpression;
     /** @deprecated Use `factory.createPropertyAccessExpression` or the factory supplied by your transformation context instead. */
-    const createPropertyAccess: (expression: Expression, name: string | Identifier | PrivateIdentifier) => PropertyAccessExpression;
+    const createPropertyAccess: (expression: Expression, name: string | MemberName) => PropertyAccessExpression;
     /** @deprecated Use `factory.updatePropertyAccessExpression` or the factory supplied by your transformation context instead. */
-    const updatePropertyAccess: (node: PropertyAccessExpression, expression: Expression, name: Identifier | PrivateIdentifier) => PropertyAccessExpression;
+    const updatePropertyAccess: (node: PropertyAccessExpression, expression: Expression, name: MemberName) => PropertyAccessExpression;
     /** @deprecated Use `factory.createPropertyAccessChain` or the factory supplied by your transformation context instead. */
-    const createPropertyAccessChain: (expression: Expression, questionDotToken: QuestionDotToken | undefined, name: string | Identifier | PrivateIdentifier) => PropertyAccessChain;
+    const createPropertyAccessChain: (expression: Expression, questionDotToken: QuestionDotToken | undefined, name: string | MemberName) => PropertyAccessChain;
     /** @deprecated Use `factory.updatePropertyAccessChain` or the factory supplied by your transformation context instead. */
-    const updatePropertyAccessChain: (node: PropertyAccessChain, expression: Expression, questionDotToken: QuestionDotToken | undefined, name: Identifier | PrivateIdentifier) => PropertyAccessChain;
+    const updatePropertyAccessChain: (node: PropertyAccessChain, expression: Expression, questionDotToken: QuestionDotToken | undefined, name: MemberName) => PropertyAccessChain;
     /** @deprecated Use `factory.createElementAccessExpression` or the factory supplied by your transformation context instead. */
     const createElementAccess: (expression: Expression, index: number | Expression) => ElementAccessExpression;
     /** @deprecated Use `factory.updateElementAccessExpression` or the factory supplied by your transformation context instead. */
@@ -6917,51 +7072,51 @@ declare namespace ts {
     /** @deprecated Use `factory.createJSDocTypeExpression` or the factory supplied by your transformation context instead. */
     const createJSDocTypeExpression: (type: TypeNode) => JSDocTypeExpression;
     /** @deprecated Use `factory.createJSDocTypeTag` or the factory supplied by your transformation context instead. */
-    const createJSDocTypeTag: (tagName: Identifier | undefined, typeExpression: JSDocTypeExpression, comment?: string | undefined) => JSDocTypeTag;
+    const createJSDocTypeTag: (tagName: Identifier | undefined, typeExpression: JSDocTypeExpression, comment?: string | NodeArray<JSDocText | JSDocLink> | undefined) => JSDocTypeTag;
     /** @deprecated Use `factory.createJSDocReturnTag` or the factory supplied by your transformation context instead. */
-    const createJSDocReturnTag: (tagName: Identifier | undefined, typeExpression?: JSDocTypeExpression | undefined, comment?: string | undefined) => JSDocReturnTag;
+    const createJSDocReturnTag: (tagName: Identifier | undefined, typeExpression?: JSDocTypeExpression | undefined, comment?: string | NodeArray<JSDocText | JSDocLink> | undefined) => JSDocReturnTag;
     /** @deprecated Use `factory.createJSDocThisTag` or the factory supplied by your transformation context instead. */
-    const createJSDocThisTag: (tagName: Identifier | undefined, typeExpression: JSDocTypeExpression, comment?: string | undefined) => JSDocThisTag;
+    const createJSDocThisTag: (tagName: Identifier | undefined, typeExpression: JSDocTypeExpression, comment?: string | NodeArray<JSDocText | JSDocLink> | undefined) => JSDocThisTag;
     /** @deprecated Use `factory.createJSDocComment` or the factory supplied by your transformation context instead. */
-    const createJSDocComment: (comment?: string | undefined, tags?: readonly JSDocTag[] | undefined) => JSDoc;
+    const createJSDocComment: (comment?: string | NodeArray<JSDocText | JSDocLink> | undefined, tags?: readonly JSDocTag[] | undefined) => JSDoc;
     /** @deprecated Use `factory.createJSDocParameterTag` or the factory supplied by your transformation context instead. */
-    const createJSDocParameterTag: (tagName: Identifier | undefined, name: EntityName, isBracketed: boolean, typeExpression?: JSDocTypeExpression | undefined, isNameFirst?: boolean | undefined, comment?: string | undefined) => JSDocParameterTag;
+    const createJSDocParameterTag: (tagName: Identifier | undefined, name: EntityName, isBracketed: boolean, typeExpression?: JSDocTypeExpression | undefined, isNameFirst?: boolean | undefined, comment?: string | NodeArray<JSDocText | JSDocLink> | undefined) => JSDocParameterTag;
     /** @deprecated Use `factory.createJSDocClassTag` or the factory supplied by your transformation context instead. */
-    const createJSDocClassTag: (tagName: Identifier | undefined, comment?: string | undefined) => JSDocClassTag;
+    const createJSDocClassTag: (tagName: Identifier | undefined, comment?: string | NodeArray<JSDocText | JSDocLink> | undefined) => JSDocClassTag;
     /** @deprecated Use `factory.createJSDocAugmentsTag` or the factory supplied by your transformation context instead. */
     const createJSDocAugmentsTag: (tagName: Identifier | undefined, className: ExpressionWithTypeArguments & {
         readonly expression: Identifier | PropertyAccessEntityNameExpression;
-    }, comment?: string | undefined) => JSDocAugmentsTag;
+    }, comment?: string | NodeArray<JSDocText | JSDocLink> | undefined) => JSDocAugmentsTag;
     /** @deprecated Use `factory.createJSDocEnumTag` or the factory supplied by your transformation context instead. */
-    const createJSDocEnumTag: (tagName: Identifier | undefined, typeExpression: JSDocTypeExpression, comment?: string | undefined) => JSDocEnumTag;
+    const createJSDocEnumTag: (tagName: Identifier | undefined, typeExpression: JSDocTypeExpression, comment?: string | NodeArray<JSDocText | JSDocLink> | undefined) => JSDocEnumTag;
     /** @deprecated Use `factory.createJSDocTemplateTag` or the factory supplied by your transformation context instead. */
-    const createJSDocTemplateTag: (tagName: Identifier | undefined, constraint: JSDocTypeExpression | undefined, typeParameters: readonly TypeParameterDeclaration[], comment?: string | undefined) => JSDocTemplateTag;
+    const createJSDocTemplateTag: (tagName: Identifier | undefined, constraint: JSDocTypeExpression | undefined, typeParameters: readonly TypeParameterDeclaration[], comment?: string | NodeArray<JSDocText | JSDocLink> | undefined) => JSDocTemplateTag;
     /** @deprecated Use `factory.createJSDocTypedefTag` or the factory supplied by your transformation context instead. */
-    const createJSDocTypedefTag: (tagName: Identifier | undefined, typeExpression?: JSDocTypeLiteral | JSDocTypeExpression | undefined, fullName?: Identifier | JSDocNamespaceDeclaration | undefined, comment?: string | undefined) => JSDocTypedefTag;
+    const createJSDocTypedefTag: (tagName: Identifier | undefined, typeExpression?: JSDocTypeLiteral | JSDocTypeExpression | undefined, fullName?: Identifier | JSDocNamespaceDeclaration | undefined, comment?: string | NodeArray<JSDocText | JSDocLink> | undefined) => JSDocTypedefTag;
     /** @deprecated Use `factory.createJSDocCallbackTag` or the factory supplied by your transformation context instead. */
-    const createJSDocCallbackTag: (tagName: Identifier | undefined, typeExpression: JSDocSignature, fullName?: Identifier | JSDocNamespaceDeclaration | undefined, comment?: string | undefined) => JSDocCallbackTag;
+    const createJSDocCallbackTag: (tagName: Identifier | undefined, typeExpression: JSDocSignature, fullName?: Identifier | JSDocNamespaceDeclaration | undefined, comment?: string | NodeArray<JSDocText | JSDocLink> | undefined) => JSDocCallbackTag;
     /** @deprecated Use `factory.createJSDocSignature` or the factory supplied by your transformation context instead. */
     const createJSDocSignature: (typeParameters: readonly JSDocTemplateTag[] | undefined, parameters: readonly JSDocParameterTag[], type?: JSDocReturnTag | undefined) => JSDocSignature;
     /** @deprecated Use `factory.createJSDocPropertyTag` or the factory supplied by your transformation context instead. */
-    const createJSDocPropertyTag: (tagName: Identifier | undefined, name: EntityName, isBracketed: boolean, typeExpression?: JSDocTypeExpression | undefined, isNameFirst?: boolean | undefined, comment?: string | undefined) => JSDocPropertyTag;
+    const createJSDocPropertyTag: (tagName: Identifier | undefined, name: EntityName, isBracketed: boolean, typeExpression?: JSDocTypeExpression | undefined, isNameFirst?: boolean | undefined, comment?: string | NodeArray<JSDocText | JSDocLink> | undefined) => JSDocPropertyTag;
     /** @deprecated Use `factory.createJSDocTypeLiteral` or the factory supplied by your transformation context instead. */
     const createJSDocTypeLiteral: (jsDocPropertyTags?: readonly JSDocPropertyLikeTag[] | undefined, isArrayType?: boolean | undefined) => JSDocTypeLiteral;
     /** @deprecated Use `factory.createJSDocImplementsTag` or the factory supplied by your transformation context instead. */
     const createJSDocImplementsTag: (tagName: Identifier | undefined, className: ExpressionWithTypeArguments & {
         readonly expression: Identifier | PropertyAccessEntityNameExpression;
-    }, comment?: string | undefined) => JSDocImplementsTag;
+    }, comment?: string | NodeArray<JSDocText | JSDocLink> | undefined) => JSDocImplementsTag;
     /** @deprecated Use `factory.createJSDocAuthorTag` or the factory supplied by your transformation context instead. */
-    const createJSDocAuthorTag: (tagName: Identifier | undefined, comment?: string | undefined) => JSDocAuthorTag;
+    const createJSDocAuthorTag: (tagName: Identifier | undefined, comment?: string | NodeArray<JSDocText | JSDocLink> | undefined) => JSDocAuthorTag;
     /** @deprecated Use `factory.createJSDocPublicTag` or the factory supplied by your transformation context instead. */
-    const createJSDocPublicTag: (tagName: Identifier | undefined, comment?: string | undefined) => JSDocPublicTag;
+    const createJSDocPublicTag: (tagName: Identifier | undefined, comment?: string | NodeArray<JSDocText | JSDocLink> | undefined) => JSDocPublicTag;
     /** @deprecated Use `factory.createJSDocPrivateTag` or the factory supplied by your transformation context instead. */
-    const createJSDocPrivateTag: (tagName: Identifier | undefined, comment?: string | undefined) => JSDocPrivateTag;
+    const createJSDocPrivateTag: (tagName: Identifier | undefined, comment?: string | NodeArray<JSDocText | JSDocLink> | undefined) => JSDocPrivateTag;
     /** @deprecated Use `factory.createJSDocProtectedTag` or the factory supplied by your transformation context instead. */
-    const createJSDocProtectedTag: (tagName: Identifier | undefined, comment?: string | undefined) => JSDocProtectedTag;
+    const createJSDocProtectedTag: (tagName: Identifier | undefined, comment?: string | NodeArray<JSDocText | JSDocLink> | undefined) => JSDocProtectedTag;
     /** @deprecated Use `factory.createJSDocReadonlyTag` or the factory supplied by your transformation context instead. */
-    const createJSDocReadonlyTag: (tagName: Identifier | undefined, comment?: string | undefined) => JSDocReadonlyTag;
+    const createJSDocReadonlyTag: (tagName: Identifier | undefined, comment?: string | NodeArray<JSDocText | JSDocLink> | undefined) => JSDocReadonlyTag;
     /** @deprecated Use `factory.createJSDocUnknownTag` or the factory supplied by your transformation context instead. */
-    const createJSDocTag: (tagName: Identifier, comment?: string | undefined) => JSDocUnknownTag;
+    const createJSDocTag: (tagName: Identifier, comment?: string | NodeArray<JSDocText | JSDocLink> | undefined) => JSDocUnknownTag;
     /** @deprecated Use `factory.createJsxElement` or the factory supplied by your transformation context instead. */
     const createJsxElement: (openingElement: JsxOpeningElement, children: readonly JsxChild[], closingElement: JsxClosingElement) => JsxElement;
     /** @deprecated Use `factory.updateJsxElement` or the factory supplied by your transformation context instead. */
@@ -7217,6 +7372,10 @@ declare namespace ts {
      */
     interface Map<T> extends ESMap<string, T> {
     }
+    /**
+     * @deprecated Use `isMemberName` instead.
+     */
+    const isIdentifierOrPrivateIdentifier: (node: Node) => node is MemberName;
 }
 
 export = ts;
\ No newline at end of file
diff --git a/packages/schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript.js b/packages/schematics/angular/third_party/github.com/Microsoft/TypeScript/lib/typescript.js
index 84f8b518d49a..615ad27f3f7d 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,11 +286,11 @@ 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.2";
+    ts.versionMajorMinor = "4.3";
     // The following is baselined as a literal template type without intervention
     /** The version of the TypeScript compiler release */
     // eslint-disable-next-line @typescript-eslint/no-inferrable-types
-    ts.version = "4.2.3";
+    ts.version = "4.3.2";
     /* @internal */
     var Comparison;
     (function (Comparison) {
@@ -2594,6 +2594,8 @@ var ts;
             }
         }
         Debug.assertMissingNode = assertMissingNode;
+        function type(_value) { }
+        Debug.type = type;
         function getFunctionName(func) {
             if (typeof func !== "function") {
                 return "";
@@ -2855,11 +2857,11 @@ var ts;
                                                                                         this.objectFlags & 8 /* Tuple */ ? "TupleType" :
                                                                                             this.objectFlags & 16 /* Anonymous */ ? "AnonymousType" :
                                                                                                 this.objectFlags & 32 /* Mapped */ ? "MappedType" :
-                                                                                                    this.objectFlags & 2048 /* ReverseMapped */ ? "ReverseMappedType" :
+                                                                                                    this.objectFlags & 1024 /* ReverseMapped */ ? "ReverseMappedType" :
                                                                                                         this.objectFlags & 256 /* EvolvingArray */ ? "EvolvingArrayType" :
                                                                                                             "ObjectType" :
                                                                                 "Type";
-                        var remainingObjectFlags = this.flags & 524288 /* Object */ ? this.objectFlags & ~2367 /* ObjectTypeKindMask */ : 0;
+                        var remainingObjectFlags = this.flags & 524288 /* Object */ ? this.objectFlags & ~1343 /* ObjectTypeKindMask */ : 0;
                         return "" + typeHeader + (this.symbol ? " '" + ts.symbolName(this.symbol) + "'" : "") + (remainingObjectFlags ? " (" + formatObjectFlags(remainingObjectFlags) + ")" : "");
                     }
                 },
@@ -3662,22 +3664,14 @@ var ts;
 var ts;
 (function (ts) {
     // enable the above using startTracing()
-})(ts || (ts = {}));
-// `tracingEnabled` should never be used directly, only through the above
-/* @internal */
-(function (ts) {
+    // `tracingEnabled` should never be used directly, only through the above
     var tracingEnabled;
     (function (tracingEnabled) {
-        var Mode;
-        (function (Mode) {
-            Mode[Mode["Project"] = 0] = "Project";
-            Mode[Mode["Build"] = 1] = "Build";
-            Mode[Mode["Server"] = 2] = "Server";
-        })(Mode = tracingEnabled.Mode || (tracingEnabled.Mode = {}));
         var fs;
         var traceCount = 0;
         var traceFd = 0;
         var mode;
+        var typeCatalog = []; // NB: id is index + 1
         var legendPath;
         var legend = [];
         ;
@@ -3693,6 +3687,7 @@ var ts;
                 }
             }
             mode = tracingMode;
+            typeCatalog.length = 0;
             if (legendPath === undefined) {
                 legendPath = ts.combinePaths(traceDir, "legend.json");
             }
@@ -3700,8 +3695,8 @@ var ts;
             if (!fs.existsSync(traceDir)) {
                 fs.mkdirSync(traceDir, { recursive: true });
             }
-            var countPart = mode === 1 /* Build */ ? "." + process.pid + "-" + ++traceCount
-                : mode === 2 /* Server */ ? "." + process.pid
+            var countPart = mode === "build" ? "." + process.pid + "-" + ++traceCount
+                : mode === "server" ? "." + process.pid
                     : "";
             var tracePath = ts.combinePaths(traceDir, "trace" + countPart + ".json");
             var typesPath = ts.combinePaths(traceDir, "types" + countPart + ".json");
@@ -3720,13 +3715,13 @@ var ts;
         }
         tracingEnabled.startTracing = startTracing;
         /** Stops tracing for the in-progress project and dumps the type catalog. */
-        function stopTracing(typeCatalog) {
+        function stopTracing() {
             ts.Debug.assert(ts.tracing, "Tracing is not in progress");
-            ts.Debug.assert(!!typeCatalog === (mode !== 2 /* Server */)); // Have a type catalog iff not in server mode
+            ts.Debug.assert(!!typeCatalog.length === (mode !== "server")); // Have a type catalog iff not in server mode
             fs.writeSync(traceFd, "\n]\n");
             fs.closeSync(traceFd);
             ts.tracing = undefined;
-            if (typeCatalog) {
+            if (typeCatalog.length) {
                 dumpTypes(typeCatalog);
             }
             else {
@@ -3736,6 +3731,12 @@ var ts;
             }
         }
         tracingEnabled.stopTracing = stopTracing;
+        function recordType(type) {
+            if (mode !== "server") {
+                typeCatalog.push(type);
+            }
+        }
+        tracingEnabled.recordType = recordType;
         var Phase;
         (function (Phase) {
             Phase["Parse"] = "parse";
@@ -3794,7 +3795,7 @@ var ts;
         function writeEvent(eventType, phase, name, args, extras, time) {
             if (time === void 0) { time = 1000 * ts.timestamp(); }
             // In server mode, there's no easy way to dump type information, so we drop events that would require it.
-            if (mode === 2 /* Server */ && phase === "checkTypes" /* CheckTypes */)
+            if (mode === "server" && phase === "checkTypes" /* CheckTypes */)
                 return;
             ts.performance.mark("beginTracing");
             fs.writeSync(traceFd, ",\n{\"pid\":1,\"tid\":1,\"ph\":\"" + eventType + "\",\"cat\":\"" + phase + "\",\"ts\":" + time + ",\"name\":\"" + name + "\"");
@@ -3806,14 +3807,24 @@ var ts;
             ts.performance.mark("endTracing");
             ts.performance.measure("Tracing", "beginTracing", "endTracing");
         }
-        function indexFromOne(lc) {
-            return {
-                line: lc.line + 1,
-                character: lc.character + 1,
-            };
+        function getLocation(node) {
+            var file = ts.getSourceFileOfNode(node);
+            return !file
+                ? undefined
+                : {
+                    path: file.path,
+                    start: indexFromOne(ts.getLineAndCharacterOfPosition(file, node.pos)),
+                    end: indexFromOne(ts.getLineAndCharacterOfPosition(file, node.end)),
+                };
+            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;
+            var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x;
             ts.performance.mark("beginDumpTypes");
             var typesPath = legend[legend.length - 1].typesPath;
             var typesFd = fs.openSync(typesPath, "w");
@@ -3825,15 +3836,13 @@ var ts;
                 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);
+                        display = (_b = type.checker) === null || _b === void 0 ? void 0 : _b.typeToString(type);
                     }
-                    catch (_s) {
+                    catch (_y) {
                         display = undefined;
                     }
                 }
@@ -3841,26 +3850,52 @@ var ts;
                 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,
+                        indexedAccessObjectType: (_c = indexedAccessType.objectType) === null || _c === void 0 ? void 0 : _c.id,
+                        indexedAccessIndexType: (_d = indexedAccessType.indexType) === null || _d === void 0 ? void 0 : _d.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; }),
+                        instantiatedType: (_e = referenceType.target) === null || _e === void 0 ? void 0 : _e.id,
+                        typeArguments: (_f = referenceType.resolvedTypeArguments) === null || _f === void 0 ? void 0 : _f.map(function (t) { return t.id; }),
+                        referenceLocation: getLocation(referenceType.node),
                     };
                 }
                 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,
+                        conditionalCheckType: (_g = conditionalType.checkType) === null || _g === void 0 ? void 0 : _g.id,
+                        conditionalExtendsType: (_h = conditionalType.extendsType) === null || _h === void 0 ? void 0 : _h.id,
+                        conditionalTrueType: (_k = (_j = conditionalType.resolvedTrueType) === null || _j === void 0 ? void 0 : _j.id) !== null && _k !== void 0 ? _k : -1,
+                        conditionalFalseType: (_m = (_l = conditionalType.resolvedFalseType) === null || _l === void 0 ? void 0 : _l.id) !== null && _m !== void 0 ? _m : -1,
+                    };
+                }
+                var substitutionProperties = {};
+                if (type.flags & 33554432 /* Substitution */) {
+                    var substitutionType = type;
+                    substitutionProperties = {
+                        substitutionBaseType: (_o = substitutionType.baseType) === null || _o === void 0 ? void 0 : _o.id,
+                        substituteType: (_p = substitutionType.substitute) === null || _p === void 0 ? void 0 : _p.id,
+                    };
+                }
+                var reverseMappedProperties = {};
+                if (objectFlags & 1024 /* ReverseMapped */) {
+                    var reverseMappedType = type;
+                    reverseMappedProperties = {
+                        reverseMappedSourceType: (_q = reverseMappedType.source) === null || _q === void 0 ? void 0 : _q.id,
+                        reverseMappedMappedType: (_r = reverseMappedType.mappedType) === null || _r === void 0 ? void 0 : _r.id,
+                        reverseMappedConstraintType: (_s = reverseMappedType.constraintType) === null || _s === void 0 ? void 0 : _s.id,
+                    };
+                }
+                var evolvingArrayProperties = {};
+                if (objectFlags & 256 /* EvolvingArray */) {
+                    var evolvingArrayType = type;
+                    evolvingArrayProperties = {
+                        evolvingArrayElementType: evolvingArrayType.elementType.id,
+                        evolvingArrayFinalType: (_t = evolvingArrayType.finalArrayType) === null || _t === void 0 ? void 0 : _t.id,
                     };
                 }
                 // We can't print out an arbitrary object, so just assign each one a unique number.
@@ -3874,11 +3909,7 @@ var ts;
                         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 });
+                var descriptor = __assign(__assign(__assign(__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, isTuple: objectFlags & 8 /* Tuple */ ? true : undefined, unionTypes: (type.flags & 1048576 /* Union */) ? (_u = type.types) === null || _u === void 0 ? void 0 : _u.map(function (t) { return t.id; }) : undefined, intersectionTypes: (type.flags & 2097152 /* Intersection */) ? type.types.map(function (t) { return t.id; }) : undefined, aliasTypeArguments: (_v = type.aliasTypeArguments) === null || _v === void 0 ? void 0 : _v.map(function (t) { return t.id; }), keyofType: (type.flags & 4194304 /* Index */) ? (_w = type.type) === null || _w === void 0 ? void 0 : _w.id : undefined }, indexedAccessProperties), referenceProperties), conditionalProperties), substitutionProperties), reverseMappedProperties), evolvingArrayProperties), { destructuringPattern: getLocation(type.pattern), firstDeclaration: getLocation((_x = symbol === null || symbol === void 0 ? void 0 : symbol.declarations) === null || _x === void 0 ? void 0 : _x[0]), flags: ts.Debug.formatTypeFlags(type.flags).split("|"), display: display });
                 fs.writeSync(typesFd, JSON.stringify(descriptor));
                 if (i < numTypes - 1) {
                     fs.writeSync(typesFd, ",\n");
@@ -3896,12 +3927,10 @@ var ts;
             fs.writeFileSync(legendPath, JSON.stringify(legend));
         }
         tracingEnabled.dumpLegend = dumpLegend;
-    })(tracingEnabled = ts.tracingEnabled || (ts.tracingEnabled = {}));
-})(ts || (ts = {}));
-/*@internal*/
-(function (ts) {
+    })(tracingEnabled || (tracingEnabled = {}));
     // define after tracingEnabled is initialized
-    ts.startTracing = ts.tracingEnabled.startTracing;
+    ts.startTracing = tracingEnabled.startTracing;
+    ts.dumpTracingLegend = tracingEnabled.dumpLegend;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
@@ -4077,215 +4106,216 @@ var ts;
         SyntaxKind[SyntaxKind["FromKeyword"] = 153] = "FromKeyword";
         SyntaxKind[SyntaxKind["GlobalKeyword"] = 154] = "GlobalKeyword";
         SyntaxKind[SyntaxKind["BigIntKeyword"] = 155] = "BigIntKeyword";
-        SyntaxKind[SyntaxKind["OfKeyword"] = 156] = "OfKeyword";
+        SyntaxKind[SyntaxKind["OverrideKeyword"] = 156] = "OverrideKeyword";
+        SyntaxKind[SyntaxKind["OfKeyword"] = 157] = "OfKeyword";
         // Parse tree nodes
         // Names
-        SyntaxKind[SyntaxKind["QualifiedName"] = 157] = "QualifiedName";
-        SyntaxKind[SyntaxKind["ComputedPropertyName"] = 158] = "ComputedPropertyName";
+        SyntaxKind[SyntaxKind["QualifiedName"] = 158] = "QualifiedName";
+        SyntaxKind[SyntaxKind["ComputedPropertyName"] = 159] = "ComputedPropertyName";
         // Signature elements
-        SyntaxKind[SyntaxKind["TypeParameter"] = 159] = "TypeParameter";
-        SyntaxKind[SyntaxKind["Parameter"] = 160] = "Parameter";
-        SyntaxKind[SyntaxKind["Decorator"] = 161] = "Decorator";
+        SyntaxKind[SyntaxKind["TypeParameter"] = 160] = "TypeParameter";
+        SyntaxKind[SyntaxKind["Parameter"] = 161] = "Parameter";
+        SyntaxKind[SyntaxKind["Decorator"] = 162] = "Decorator";
         // TypeMember
-        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";
+        SyntaxKind[SyntaxKind["PropertySignature"] = 163] = "PropertySignature";
+        SyntaxKind[SyntaxKind["PropertyDeclaration"] = 164] = "PropertyDeclaration";
+        SyntaxKind[SyntaxKind["MethodSignature"] = 165] = "MethodSignature";
+        SyntaxKind[SyntaxKind["MethodDeclaration"] = 166] = "MethodDeclaration";
+        SyntaxKind[SyntaxKind["Constructor"] = 167] = "Constructor";
+        SyntaxKind[SyntaxKind["GetAccessor"] = 168] = "GetAccessor";
+        SyntaxKind[SyntaxKind["SetAccessor"] = 169] = "SetAccessor";
+        SyntaxKind[SyntaxKind["CallSignature"] = 170] = "CallSignature";
+        SyntaxKind[SyntaxKind["ConstructSignature"] = 171] = "ConstructSignature";
+        SyntaxKind[SyntaxKind["IndexSignature"] = 172] = "IndexSignature";
         // Type
-        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";
+        SyntaxKind[SyntaxKind["TypePredicate"] = 173] = "TypePredicate";
+        SyntaxKind[SyntaxKind["TypeReference"] = 174] = "TypeReference";
+        SyntaxKind[SyntaxKind["FunctionType"] = 175] = "FunctionType";
+        SyntaxKind[SyntaxKind["ConstructorType"] = 176] = "ConstructorType";
+        SyntaxKind[SyntaxKind["TypeQuery"] = 177] = "TypeQuery";
+        SyntaxKind[SyntaxKind["TypeLiteral"] = 178] = "TypeLiteral";
+        SyntaxKind[SyntaxKind["ArrayType"] = 179] = "ArrayType";
+        SyntaxKind[SyntaxKind["TupleType"] = 180] = "TupleType";
+        SyntaxKind[SyntaxKind["OptionalType"] = 181] = "OptionalType";
+        SyntaxKind[SyntaxKind["RestType"] = 182] = "RestType";
+        SyntaxKind[SyntaxKind["UnionType"] = 183] = "UnionType";
+        SyntaxKind[SyntaxKind["IntersectionType"] = 184] = "IntersectionType";
+        SyntaxKind[SyntaxKind["ConditionalType"] = 185] = "ConditionalType";
+        SyntaxKind[SyntaxKind["InferType"] = 186] = "InferType";
+        SyntaxKind[SyntaxKind["ParenthesizedType"] = 187] = "ParenthesizedType";
+        SyntaxKind[SyntaxKind["ThisType"] = 188] = "ThisType";
+        SyntaxKind[SyntaxKind["TypeOperator"] = 189] = "TypeOperator";
+        SyntaxKind[SyntaxKind["IndexedAccessType"] = 190] = "IndexedAccessType";
+        SyntaxKind[SyntaxKind["MappedType"] = 191] = "MappedType";
+        SyntaxKind[SyntaxKind["LiteralType"] = 192] = "LiteralType";
+        SyntaxKind[SyntaxKind["NamedTupleMember"] = 193] = "NamedTupleMember";
+        SyntaxKind[SyntaxKind["TemplateLiteralType"] = 194] = "TemplateLiteralType";
+        SyntaxKind[SyntaxKind["TemplateLiteralTypeSpan"] = 195] = "TemplateLiteralTypeSpan";
+        SyntaxKind[SyntaxKind["ImportType"] = 196] = "ImportType";
         // Binding patterns
-        SyntaxKind[SyntaxKind["ObjectBindingPattern"] = 196] = "ObjectBindingPattern";
-        SyntaxKind[SyntaxKind["ArrayBindingPattern"] = 197] = "ArrayBindingPattern";
-        SyntaxKind[SyntaxKind["BindingElement"] = 198] = "BindingElement";
+        SyntaxKind[SyntaxKind["ObjectBindingPattern"] = 197] = "ObjectBindingPattern";
+        SyntaxKind[SyntaxKind["ArrayBindingPattern"] = 198] = "ArrayBindingPattern";
+        SyntaxKind[SyntaxKind["BindingElement"] = 199] = "BindingElement";
         // Expression
-        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";
+        SyntaxKind[SyntaxKind["ArrayLiteralExpression"] = 200] = "ArrayLiteralExpression";
+        SyntaxKind[SyntaxKind["ObjectLiteralExpression"] = 201] = "ObjectLiteralExpression";
+        SyntaxKind[SyntaxKind["PropertyAccessExpression"] = 202] = "PropertyAccessExpression";
+        SyntaxKind[SyntaxKind["ElementAccessExpression"] = 203] = "ElementAccessExpression";
+        SyntaxKind[SyntaxKind["CallExpression"] = 204] = "CallExpression";
+        SyntaxKind[SyntaxKind["NewExpression"] = 205] = "NewExpression";
+        SyntaxKind[SyntaxKind["TaggedTemplateExpression"] = 206] = "TaggedTemplateExpression";
+        SyntaxKind[SyntaxKind["TypeAssertionExpression"] = 207] = "TypeAssertionExpression";
+        SyntaxKind[SyntaxKind["ParenthesizedExpression"] = 208] = "ParenthesizedExpression";
+        SyntaxKind[SyntaxKind["FunctionExpression"] = 209] = "FunctionExpression";
+        SyntaxKind[SyntaxKind["ArrowFunction"] = 210] = "ArrowFunction";
+        SyntaxKind[SyntaxKind["DeleteExpression"] = 211] = "DeleteExpression";
+        SyntaxKind[SyntaxKind["TypeOfExpression"] = 212] = "TypeOfExpression";
+        SyntaxKind[SyntaxKind["VoidExpression"] = 213] = "VoidExpression";
+        SyntaxKind[SyntaxKind["AwaitExpression"] = 214] = "AwaitExpression";
+        SyntaxKind[SyntaxKind["PrefixUnaryExpression"] = 215] = "PrefixUnaryExpression";
+        SyntaxKind[SyntaxKind["PostfixUnaryExpression"] = 216] = "PostfixUnaryExpression";
+        SyntaxKind[SyntaxKind["BinaryExpression"] = 217] = "BinaryExpression";
+        SyntaxKind[SyntaxKind["ConditionalExpression"] = 218] = "ConditionalExpression";
+        SyntaxKind[SyntaxKind["TemplateExpression"] = 219] = "TemplateExpression";
+        SyntaxKind[SyntaxKind["YieldExpression"] = 220] = "YieldExpression";
+        SyntaxKind[SyntaxKind["SpreadElement"] = 221] = "SpreadElement";
+        SyntaxKind[SyntaxKind["ClassExpression"] = 222] = "ClassExpression";
+        SyntaxKind[SyntaxKind["OmittedExpression"] = 223] = "OmittedExpression";
+        SyntaxKind[SyntaxKind["ExpressionWithTypeArguments"] = 224] = "ExpressionWithTypeArguments";
+        SyntaxKind[SyntaxKind["AsExpression"] = 225] = "AsExpression";
+        SyntaxKind[SyntaxKind["NonNullExpression"] = 226] = "NonNullExpression";
+        SyntaxKind[SyntaxKind["MetaProperty"] = 227] = "MetaProperty";
+        SyntaxKind[SyntaxKind["SyntheticExpression"] = 228] = "SyntheticExpression";
         // Misc
-        SyntaxKind[SyntaxKind["TemplateSpan"] = 228] = "TemplateSpan";
-        SyntaxKind[SyntaxKind["SemicolonClassElement"] = 229] = "SemicolonClassElement";
+        SyntaxKind[SyntaxKind["TemplateSpan"] = 229] = "TemplateSpan";
+        SyntaxKind[SyntaxKind["SemicolonClassElement"] = 230] = "SemicolonClassElement";
         // Element
-        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";
+        SyntaxKind[SyntaxKind["Block"] = 231] = "Block";
+        SyntaxKind[SyntaxKind["EmptyStatement"] = 232] = "EmptyStatement";
+        SyntaxKind[SyntaxKind["VariableStatement"] = 233] = "VariableStatement";
+        SyntaxKind[SyntaxKind["ExpressionStatement"] = 234] = "ExpressionStatement";
+        SyntaxKind[SyntaxKind["IfStatement"] = 235] = "IfStatement";
+        SyntaxKind[SyntaxKind["DoStatement"] = 236] = "DoStatement";
+        SyntaxKind[SyntaxKind["WhileStatement"] = 237] = "WhileStatement";
+        SyntaxKind[SyntaxKind["ForStatement"] = 238] = "ForStatement";
+        SyntaxKind[SyntaxKind["ForInStatement"] = 239] = "ForInStatement";
+        SyntaxKind[SyntaxKind["ForOfStatement"] = 240] = "ForOfStatement";
+        SyntaxKind[SyntaxKind["ContinueStatement"] = 241] = "ContinueStatement";
+        SyntaxKind[SyntaxKind["BreakStatement"] = 242] = "BreakStatement";
+        SyntaxKind[SyntaxKind["ReturnStatement"] = 243] = "ReturnStatement";
+        SyntaxKind[SyntaxKind["WithStatement"] = 244] = "WithStatement";
+        SyntaxKind[SyntaxKind["SwitchStatement"] = 245] = "SwitchStatement";
+        SyntaxKind[SyntaxKind["LabeledStatement"] = 246] = "LabeledStatement";
+        SyntaxKind[SyntaxKind["ThrowStatement"] = 247] = "ThrowStatement";
+        SyntaxKind[SyntaxKind["TryStatement"] = 248] = "TryStatement";
+        SyntaxKind[SyntaxKind["DebuggerStatement"] = 249] = "DebuggerStatement";
+        SyntaxKind[SyntaxKind["VariableDeclaration"] = 250] = "VariableDeclaration";
+        SyntaxKind[SyntaxKind["VariableDeclarationList"] = 251] = "VariableDeclarationList";
+        SyntaxKind[SyntaxKind["FunctionDeclaration"] = 252] = "FunctionDeclaration";
+        SyntaxKind[SyntaxKind["ClassDeclaration"] = 253] = "ClassDeclaration";
+        SyntaxKind[SyntaxKind["InterfaceDeclaration"] = 254] = "InterfaceDeclaration";
+        SyntaxKind[SyntaxKind["TypeAliasDeclaration"] = 255] = "TypeAliasDeclaration";
+        SyntaxKind[SyntaxKind["EnumDeclaration"] = 256] = "EnumDeclaration";
+        SyntaxKind[SyntaxKind["ModuleDeclaration"] = 257] = "ModuleDeclaration";
+        SyntaxKind[SyntaxKind["ModuleBlock"] = 258] = "ModuleBlock";
+        SyntaxKind[SyntaxKind["CaseBlock"] = 259] = "CaseBlock";
+        SyntaxKind[SyntaxKind["NamespaceExportDeclaration"] = 260] = "NamespaceExportDeclaration";
+        SyntaxKind[SyntaxKind["ImportEqualsDeclaration"] = 261] = "ImportEqualsDeclaration";
+        SyntaxKind[SyntaxKind["ImportDeclaration"] = 262] = "ImportDeclaration";
+        SyntaxKind[SyntaxKind["ImportClause"] = 263] = "ImportClause";
+        SyntaxKind[SyntaxKind["NamespaceImport"] = 264] = "NamespaceImport";
+        SyntaxKind[SyntaxKind["NamedImports"] = 265] = "NamedImports";
+        SyntaxKind[SyntaxKind["ImportSpecifier"] = 266] = "ImportSpecifier";
+        SyntaxKind[SyntaxKind["ExportAssignment"] = 267] = "ExportAssignment";
+        SyntaxKind[SyntaxKind["ExportDeclaration"] = 268] = "ExportDeclaration";
+        SyntaxKind[SyntaxKind["NamedExports"] = 269] = "NamedExports";
+        SyntaxKind[SyntaxKind["NamespaceExport"] = 270] = "NamespaceExport";
+        SyntaxKind[SyntaxKind["ExportSpecifier"] = 271] = "ExportSpecifier";
+        SyntaxKind[SyntaxKind["MissingDeclaration"] = 272] = "MissingDeclaration";
         // Module references
-        SyntaxKind[SyntaxKind["ExternalModuleReference"] = 272] = "ExternalModuleReference";
+        SyntaxKind[SyntaxKind["ExternalModuleReference"] = 273] = "ExternalModuleReference";
         // JSX
-        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";
+        SyntaxKind[SyntaxKind["JsxElement"] = 274] = "JsxElement";
+        SyntaxKind[SyntaxKind["JsxSelfClosingElement"] = 275] = "JsxSelfClosingElement";
+        SyntaxKind[SyntaxKind["JsxOpeningElement"] = 276] = "JsxOpeningElement";
+        SyntaxKind[SyntaxKind["JsxClosingElement"] = 277] = "JsxClosingElement";
+        SyntaxKind[SyntaxKind["JsxFragment"] = 278] = "JsxFragment";
+        SyntaxKind[SyntaxKind["JsxOpeningFragment"] = 279] = "JsxOpeningFragment";
+        SyntaxKind[SyntaxKind["JsxClosingFragment"] = 280] = "JsxClosingFragment";
+        SyntaxKind[SyntaxKind["JsxAttribute"] = 281] = "JsxAttribute";
+        SyntaxKind[SyntaxKind["JsxAttributes"] = 282] = "JsxAttributes";
+        SyntaxKind[SyntaxKind["JsxSpreadAttribute"] = 283] = "JsxSpreadAttribute";
+        SyntaxKind[SyntaxKind["JsxExpression"] = 284] = "JsxExpression";
         // Clauses
-        SyntaxKind[SyntaxKind["CaseClause"] = 284] = "CaseClause";
-        SyntaxKind[SyntaxKind["DefaultClause"] = 285] = "DefaultClause";
-        SyntaxKind[SyntaxKind["HeritageClause"] = 286] = "HeritageClause";
-        SyntaxKind[SyntaxKind["CatchClause"] = 287] = "CatchClause";
+        SyntaxKind[SyntaxKind["CaseClause"] = 285] = "CaseClause";
+        SyntaxKind[SyntaxKind["DefaultClause"] = 286] = "DefaultClause";
+        SyntaxKind[SyntaxKind["HeritageClause"] = 287] = "HeritageClause";
+        SyntaxKind[SyntaxKind["CatchClause"] = 288] = "CatchClause";
         // Property assignments
-        SyntaxKind[SyntaxKind["PropertyAssignment"] = 288] = "PropertyAssignment";
-        SyntaxKind[SyntaxKind["ShorthandPropertyAssignment"] = 289] = "ShorthandPropertyAssignment";
-        SyntaxKind[SyntaxKind["SpreadAssignment"] = 290] = "SpreadAssignment";
+        SyntaxKind[SyntaxKind["PropertyAssignment"] = 289] = "PropertyAssignment";
+        SyntaxKind[SyntaxKind["ShorthandPropertyAssignment"] = 290] = "ShorthandPropertyAssignment";
+        SyntaxKind[SyntaxKind["SpreadAssignment"] = 291] = "SpreadAssignment";
         // Enum
-        SyntaxKind[SyntaxKind["EnumMember"] = 291] = "EnumMember";
+        SyntaxKind[SyntaxKind["EnumMember"] = 292] = "EnumMember";
         // Unparsed
-        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";
+        SyntaxKind[SyntaxKind["UnparsedPrologue"] = 293] = "UnparsedPrologue";
+        SyntaxKind[SyntaxKind["UnparsedPrepend"] = 294] = "UnparsedPrepend";
+        SyntaxKind[SyntaxKind["UnparsedText"] = 295] = "UnparsedText";
+        SyntaxKind[SyntaxKind["UnparsedInternalText"] = 296] = "UnparsedInternalText";
+        SyntaxKind[SyntaxKind["UnparsedSyntheticReference"] = 297] = "UnparsedSyntheticReference";
         // Top-level nodes
-        SyntaxKind[SyntaxKind["SourceFile"] = 297] = "SourceFile";
-        SyntaxKind[SyntaxKind["Bundle"] = 298] = "Bundle";
-        SyntaxKind[SyntaxKind["UnparsedSource"] = 299] = "UnparsedSource";
-        SyntaxKind[SyntaxKind["InputFiles"] = 300] = "InputFiles";
+        SyntaxKind[SyntaxKind["SourceFile"] = 298] = "SourceFile";
+        SyntaxKind[SyntaxKind["Bundle"] = 299] = "Bundle";
+        SyntaxKind[SyntaxKind["UnparsedSource"] = 300] = "UnparsedSource";
+        SyntaxKind[SyntaxKind["InputFiles"] = 301] = "InputFiles";
         // JSDoc nodes
-        SyntaxKind[SyntaxKind["JSDocTypeExpression"] = 301] = "JSDocTypeExpression";
-        SyntaxKind[SyntaxKind["JSDocNameReference"] = 302] = "JSDocNameReference";
-        // The * type
-        SyntaxKind[SyntaxKind["JSDocAllType"] = 303] = "JSDocAllType";
-        // The ? type
-        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"] = 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";
+        SyntaxKind[SyntaxKind["JSDocTypeExpression"] = 302] = "JSDocTypeExpression";
+        SyntaxKind[SyntaxKind["JSDocNameReference"] = 303] = "JSDocNameReference";
+        SyntaxKind[SyntaxKind["JSDocAllType"] = 304] = "JSDocAllType";
+        SyntaxKind[SyntaxKind["JSDocUnknownType"] = 305] = "JSDocUnknownType";
+        SyntaxKind[SyntaxKind["JSDocNullableType"] = 306] = "JSDocNullableType";
+        SyntaxKind[SyntaxKind["JSDocNonNullableType"] = 307] = "JSDocNonNullableType";
+        SyntaxKind[SyntaxKind["JSDocOptionalType"] = 308] = "JSDocOptionalType";
+        SyntaxKind[SyntaxKind["JSDocFunctionType"] = 309] = "JSDocFunctionType";
+        SyntaxKind[SyntaxKind["JSDocVariadicType"] = 310] = "JSDocVariadicType";
+        SyntaxKind[SyntaxKind["JSDocNamepathType"] = 311] = "JSDocNamepathType";
+        SyntaxKind[SyntaxKind["JSDocComment"] = 312] = "JSDocComment";
+        SyntaxKind[SyntaxKind["JSDocText"] = 313] = "JSDocText";
+        SyntaxKind[SyntaxKind["JSDocTypeLiteral"] = 314] = "JSDocTypeLiteral";
+        SyntaxKind[SyntaxKind["JSDocSignature"] = 315] = "JSDocSignature";
+        SyntaxKind[SyntaxKind["JSDocLink"] = 316] = "JSDocLink";
+        SyntaxKind[SyntaxKind["JSDocTag"] = 317] = "JSDocTag";
+        SyntaxKind[SyntaxKind["JSDocAugmentsTag"] = 318] = "JSDocAugmentsTag";
+        SyntaxKind[SyntaxKind["JSDocImplementsTag"] = 319] = "JSDocImplementsTag";
+        SyntaxKind[SyntaxKind["JSDocAuthorTag"] = 320] = "JSDocAuthorTag";
+        SyntaxKind[SyntaxKind["JSDocDeprecatedTag"] = 321] = "JSDocDeprecatedTag";
+        SyntaxKind[SyntaxKind["JSDocClassTag"] = 322] = "JSDocClassTag";
+        SyntaxKind[SyntaxKind["JSDocPublicTag"] = 323] = "JSDocPublicTag";
+        SyntaxKind[SyntaxKind["JSDocPrivateTag"] = 324] = "JSDocPrivateTag";
+        SyntaxKind[SyntaxKind["JSDocProtectedTag"] = 325] = "JSDocProtectedTag";
+        SyntaxKind[SyntaxKind["JSDocReadonlyTag"] = 326] = "JSDocReadonlyTag";
+        SyntaxKind[SyntaxKind["JSDocOverrideTag"] = 327] = "JSDocOverrideTag";
+        SyntaxKind[SyntaxKind["JSDocCallbackTag"] = 328] = "JSDocCallbackTag";
+        SyntaxKind[SyntaxKind["JSDocEnumTag"] = 329] = "JSDocEnumTag";
+        SyntaxKind[SyntaxKind["JSDocParameterTag"] = 330] = "JSDocParameterTag";
+        SyntaxKind[SyntaxKind["JSDocReturnTag"] = 331] = "JSDocReturnTag";
+        SyntaxKind[SyntaxKind["JSDocThisTag"] = 332] = "JSDocThisTag";
+        SyntaxKind[SyntaxKind["JSDocTypeTag"] = 333] = "JSDocTypeTag";
+        SyntaxKind[SyntaxKind["JSDocTemplateTag"] = 334] = "JSDocTemplateTag";
+        SyntaxKind[SyntaxKind["JSDocTypedefTag"] = 335] = "JSDocTypedefTag";
+        SyntaxKind[SyntaxKind["JSDocSeeTag"] = 336] = "JSDocSeeTag";
+        SyntaxKind[SyntaxKind["JSDocPropertyTag"] = 337] = "JSDocPropertyTag";
         // Synthesized list
-        SyntaxKind[SyntaxKind["SyntaxList"] = 334] = "SyntaxList";
+        SyntaxKind[SyntaxKind["SyntaxList"] = 338] = "SyntaxList";
         // Transformation nodes
-        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";
+        SyntaxKind[SyntaxKind["NotEmittedStatement"] = 339] = "NotEmittedStatement";
+        SyntaxKind[SyntaxKind["PartiallyEmittedExpression"] = 340] = "PartiallyEmittedExpression";
+        SyntaxKind[SyntaxKind["CommaListExpression"] = 341] = "CommaListExpression";
+        SyntaxKind[SyntaxKind["MergeDeclarationMarker"] = 342] = "MergeDeclarationMarker";
+        SyntaxKind[SyntaxKind["EndOfDeclarationMarker"] = 343] = "EndOfDeclarationMarker";
+        SyntaxKind[SyntaxKind["SyntheticReferenceExpression"] = 344] = "SyntheticReferenceExpression";
         // Enum value count
-        SyntaxKind[SyntaxKind["Count"] = 341] = "Count";
+        SyntaxKind[SyntaxKind["Count"] = 345] = "Count";
         // Markers
         SyntaxKind[SyntaxKind["FirstAssignment"] = 62] = "FirstAssignment";
         SyntaxKind[SyntaxKind["LastAssignment"] = 77] = "LastAssignment";
@@ -4294,15 +4324,15 @@ var ts;
         SyntaxKind[SyntaxKind["FirstReservedWord"] = 80] = "FirstReservedWord";
         SyntaxKind[SyntaxKind["LastReservedWord"] = 115] = "LastReservedWord";
         SyntaxKind[SyntaxKind["FirstKeyword"] = 80] = "FirstKeyword";
-        SyntaxKind[SyntaxKind["LastKeyword"] = 156] = "LastKeyword";
+        SyntaxKind[SyntaxKind["LastKeyword"] = 157] = "LastKeyword";
         SyntaxKind[SyntaxKind["FirstFutureReservedWord"] = 116] = "FirstFutureReservedWord";
         SyntaxKind[SyntaxKind["LastFutureReservedWord"] = 124] = "LastFutureReservedWord";
-        SyntaxKind[SyntaxKind["FirstTypeNode"] = 172] = "FirstTypeNode";
-        SyntaxKind[SyntaxKind["LastTypeNode"] = 195] = "LastTypeNode";
+        SyntaxKind[SyntaxKind["FirstTypeNode"] = 173] = "FirstTypeNode";
+        SyntaxKind[SyntaxKind["LastTypeNode"] = 196] = "LastTypeNode";
         SyntaxKind[SyntaxKind["FirstPunctuation"] = 18] = "FirstPunctuation";
         SyntaxKind[SyntaxKind["LastPunctuation"] = 77] = "LastPunctuation";
         SyntaxKind[SyntaxKind["FirstToken"] = 0] = "FirstToken";
-        SyntaxKind[SyntaxKind["LastToken"] = 156] = "LastToken";
+        SyntaxKind[SyntaxKind["LastToken"] = 157] = "LastToken";
         SyntaxKind[SyntaxKind["FirstTriviaToken"] = 2] = "FirstTriviaToken";
         SyntaxKind[SyntaxKind["LastTriviaToken"] = 7] = "LastTriviaToken";
         SyntaxKind[SyntaxKind["FirstLiteralToken"] = 8] = "FirstLiteralToken";
@@ -4311,15 +4341,15 @@ var ts;
         SyntaxKind[SyntaxKind["LastTemplateToken"] = 17] = "LastTemplateToken";
         SyntaxKind[SyntaxKind["FirstBinaryOperator"] = 29] = "FirstBinaryOperator";
         SyntaxKind[SyntaxKind["LastBinaryOperator"] = 77] = "LastBinaryOperator";
-        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";
+        SyntaxKind[SyntaxKind["FirstStatement"] = 233] = "FirstStatement";
+        SyntaxKind[SyntaxKind["LastStatement"] = 249] = "LastStatement";
+        SyntaxKind[SyntaxKind["FirstNode"] = 158] = "FirstNode";
+        SyntaxKind[SyntaxKind["FirstJSDocNode"] = 302] = "FirstJSDocNode";
+        SyntaxKind[SyntaxKind["LastJSDocNode"] = 337] = "LastJSDocNode";
+        SyntaxKind[SyntaxKind["FirstJSDocTagNode"] = 317] = "FirstJSDocTagNode";
+        SyntaxKind[SyntaxKind["LastJSDocTagNode"] = 337] = "LastJSDocTagNode";
         /* @internal */ SyntaxKind[SyntaxKind["FirstContextualKeyword"] = 125] = "FirstContextualKeyword";
-        /* @internal */ SyntaxKind[SyntaxKind["LastContextualKeyword"] = 156] = "LastContextualKeyword";
+        /* @internal */ SyntaxKind[SyntaxKind["LastContextualKeyword"] = 157] = "LastContextualKeyword";
     })(SyntaxKind = ts.SyntaxKind || (ts.SyntaxKind = {}));
     var NodeFlags;
     (function (NodeFlags) {
@@ -4389,14 +4419,15 @@ var ts;
         ModifierFlags[ModifierFlags["Const"] = 2048] = "Const";
         ModifierFlags[ModifierFlags["HasComputedJSDocModifiers"] = 4096] = "HasComputedJSDocModifiers";
         ModifierFlags[ModifierFlags["Deprecated"] = 8192] = "Deprecated";
+        ModifierFlags[ModifierFlags["Override"] = 16384] = "Override";
         ModifierFlags[ModifierFlags["HasComputedFlags"] = 536870912] = "HasComputedFlags";
         ModifierFlags[ModifierFlags["AccessibilityModifier"] = 28] = "AccessibilityModifier";
         // Accessibility modifiers and 'readonly' can be attached to a parameter in a constructor to make it a property.
-        ModifierFlags[ModifierFlags["ParameterPropertyModifier"] = 92] = "ParameterPropertyModifier";
+        ModifierFlags[ModifierFlags["ParameterPropertyModifier"] = 16476] = "ParameterPropertyModifier";
         ModifierFlags[ModifierFlags["NonPublicAccessibilityModifier"] = 24] = "NonPublicAccessibilityModifier";
-        ModifierFlags[ModifierFlags["TypeScriptModifier"] = 2270] = "TypeScriptModifier";
+        ModifierFlags[ModifierFlags["TypeScriptModifier"] = 18654] = "TypeScriptModifier";
         ModifierFlags[ModifierFlags["ExportDefault"] = 513] = "ExportDefault";
-        ModifierFlags[ModifierFlags["All"] = 11263] = "All";
+        ModifierFlags[ModifierFlags["All"] = 27647] = "All";
     })(ModifierFlags = ts.ModifierFlags || (ts.ModifierFlags = {}));
     var JsxFlags;
     (function (JsxFlags) {
@@ -4577,6 +4608,8 @@ var ts;
         NodeBuilderFlags[NodeBuilderFlags["NoUndefinedOptionalParameterType"] = 1073741824] = "NoUndefinedOptionalParameterType";
         // Error handling
         NodeBuilderFlags[NodeBuilderFlags["AllowThisInObjectLiteral"] = 32768] = "AllowThisInObjectLiteral";
+        NodeBuilderFlags[NodeBuilderFlags["AllowQualifiedNameInPlaceOfIdentifier"] = 65536] = "AllowQualifiedNameInPlaceOfIdentifier";
+        /** @deprecated AllowQualifedNameInPlaceOfIdentifier. Use AllowQualifiedNameInPlaceOfIdentifier instead. */
         NodeBuilderFlags[NodeBuilderFlags["AllowQualifedNameInPlaceOfIdentifier"] = 65536] = "AllowQualifedNameInPlaceOfIdentifier";
         NodeBuilderFlags[NodeBuilderFlags["AllowAnonymousIdentifier"] = 131072] = "AllowAnonymousIdentifier";
         NodeBuilderFlags[NodeBuilderFlags["AllowEmptyUnionOrIntersection"] = 262144] = "AllowEmptyUnionOrIntersection";
@@ -4591,7 +4624,6 @@ var ts;
         NodeBuilderFlags[NodeBuilderFlags["InObjectTypeLiteral"] = 4194304] = "InObjectTypeLiteral";
         NodeBuilderFlags[NodeBuilderFlags["InTypeAlias"] = 8388608] = "InTypeAlias";
         NodeBuilderFlags[NodeBuilderFlags["InInitialEntityName"] = 16777216] = "InInitialEntityName";
-        NodeBuilderFlags[NodeBuilderFlags["InReverseMappedType"] = 33554432] = "InReverseMappedType";
     })(NodeBuilderFlags = ts.NodeBuilderFlags || (ts.NodeBuilderFlags = {}));
     // Ensure the shared flags between this and `NodeBuilderFlags` stay in alignment
     var TypeFormatFlags;
@@ -4944,6 +4976,9 @@ var ts;
         /* @internal */
         TypeFlags[TypeFlags["IncludesEmptyObject"] = 16777216] = "IncludesEmptyObject";
     })(TypeFlags = ts.TypeFlags || (ts.TypeFlags = {}));
+    // Types included in TypeFlags.ObjectFlagsType have an objectFlags property. Some ObjectFlags
+    // are specific to certain types and reuse the same bit position. Those ObjectFlags require a check
+    // for a certain TypeFlags value to determine their meaning.
     var ObjectFlags;
     (function (ObjectFlags) {
         ObjectFlags[ObjectFlags["Class"] = 1] = "Class";
@@ -4956,50 +4991,59 @@ var ts;
         ObjectFlags[ObjectFlags["ObjectLiteral"] = 128] = "ObjectLiteral";
         ObjectFlags[ObjectFlags["EvolvingArray"] = 256] = "EvolvingArray";
         ObjectFlags[ObjectFlags["ObjectLiteralPatternWithComputedProperties"] = 512] = "ObjectLiteralPatternWithComputedProperties";
-        ObjectFlags[ObjectFlags["ContainsSpread"] = 1024] = "ContainsSpread";
-        ObjectFlags[ObjectFlags["ReverseMapped"] = 2048] = "ReverseMapped";
-        ObjectFlags[ObjectFlags["JsxAttributes"] = 4096] = "JsxAttributes";
-        ObjectFlags[ObjectFlags["MarkerType"] = 8192] = "MarkerType";
-        ObjectFlags[ObjectFlags["JSLiteral"] = 16384] = "JSLiteral";
-        ObjectFlags[ObjectFlags["FreshLiteral"] = 32768] = "FreshLiteral";
-        ObjectFlags[ObjectFlags["ArrayLiteral"] = 65536] = "ArrayLiteral";
-        ObjectFlags[ObjectFlags["ObjectRestType"] = 131072] = "ObjectRestType";
+        ObjectFlags[ObjectFlags["ReverseMapped"] = 1024] = "ReverseMapped";
+        ObjectFlags[ObjectFlags["JsxAttributes"] = 2048] = "JsxAttributes";
+        ObjectFlags[ObjectFlags["MarkerType"] = 4096] = "MarkerType";
+        ObjectFlags[ObjectFlags["JSLiteral"] = 8192] = "JSLiteral";
+        ObjectFlags[ObjectFlags["FreshLiteral"] = 16384] = "FreshLiteral";
+        ObjectFlags[ObjectFlags["ArrayLiteral"] = 32768] = "ArrayLiteral";
         /* @internal */
-        ObjectFlags[ObjectFlags["PrimitiveUnion"] = 262144] = "PrimitiveUnion";
+        ObjectFlags[ObjectFlags["PrimitiveUnion"] = 65536] = "PrimitiveUnion";
         /* @internal */
-        ObjectFlags[ObjectFlags["ContainsWideningType"] = 524288] = "ContainsWideningType";
+        ObjectFlags[ObjectFlags["ContainsWideningType"] = 131072] = "ContainsWideningType";
         /* @internal */
-        ObjectFlags[ObjectFlags["ContainsObjectOrArrayLiteral"] = 1048576] = "ContainsObjectOrArrayLiteral";
+        ObjectFlags[ObjectFlags["ContainsObjectOrArrayLiteral"] = 262144] = "ContainsObjectOrArrayLiteral";
         /* @internal */
-        ObjectFlags[ObjectFlags["NonInferrableType"] = 2097152] = "NonInferrableType";
+        ObjectFlags[ObjectFlags["NonInferrableType"] = 524288] = "NonInferrableType";
         /* @internal */
-        ObjectFlags[ObjectFlags["IsGenericObjectTypeComputed"] = 4194304] = "IsGenericObjectTypeComputed";
+        ObjectFlags[ObjectFlags["CouldContainTypeVariablesComputed"] = 1048576] = "CouldContainTypeVariablesComputed";
         /* @internal */
-        ObjectFlags[ObjectFlags["IsGenericObjectType"] = 8388608] = "IsGenericObjectType";
+        ObjectFlags[ObjectFlags["CouldContainTypeVariables"] = 2097152] = "CouldContainTypeVariables";
+        ObjectFlags[ObjectFlags["ClassOrInterface"] = 3] = "ClassOrInterface";
         /* @internal */
-        ObjectFlags[ObjectFlags["IsGenericIndexTypeComputed"] = 16777216] = "IsGenericIndexTypeComputed";
+        ObjectFlags[ObjectFlags["RequiresWidening"] = 393216] = "RequiresWidening";
         /* @internal */
-        ObjectFlags[ObjectFlags["IsGenericIndexType"] = 33554432] = "IsGenericIndexType";
+        ObjectFlags[ObjectFlags["PropagatingFlags"] = 917504] = "PropagatingFlags";
+        // Object flags that uniquely identify the kind of ObjectType
         /* @internal */
-        ObjectFlags[ObjectFlags["CouldContainTypeVariablesComputed"] = 67108864] = "CouldContainTypeVariablesComputed";
+        ObjectFlags[ObjectFlags["ObjectTypeKindMask"] = 1343] = "ObjectTypeKindMask";
+        // Flags that require TypeFlags.Object
+        ObjectFlags[ObjectFlags["ContainsSpread"] = 4194304] = "ContainsSpread";
+        ObjectFlags[ObjectFlags["ObjectRestType"] = 8388608] = "ObjectRestType";
         /* @internal */
-        ObjectFlags[ObjectFlags["CouldContainTypeVariables"] = 134217728] = "CouldContainTypeVariables";
+        ObjectFlags[ObjectFlags["IsClassInstanceClone"] = 16777216] = "IsClassInstanceClone";
+        // Flags that require TypeFlags.Object and ObjectFlags.Reference
         /* @internal */
-        ObjectFlags[ObjectFlags["ContainsIntersections"] = 268435456] = "ContainsIntersections";
+        ObjectFlags[ObjectFlags["IdenticalBaseTypeCalculated"] = 33554432] = "IdenticalBaseTypeCalculated";
         /* @internal */
-        ObjectFlags[ObjectFlags["IsNeverIntersectionComputed"] = 268435456] = "IsNeverIntersectionComputed";
+        ObjectFlags[ObjectFlags["IdenticalBaseTypeExists"] = 67108864] = "IdenticalBaseTypeExists";
+        // Flags that require TypeFlags.UnionOrIntersection or TypeFlags.Substitution
         /* @internal */
-        ObjectFlags[ObjectFlags["IsNeverIntersection"] = 536870912] = "IsNeverIntersection";
+        ObjectFlags[ObjectFlags["IsGenericObjectTypeComputed"] = 4194304] = "IsGenericObjectTypeComputed";
         /* @internal */
-        ObjectFlags[ObjectFlags["IsClassInstanceClone"] = 1073741824] = "IsClassInstanceClone";
-        ObjectFlags[ObjectFlags["ClassOrInterface"] = 3] = "ClassOrInterface";
+        ObjectFlags[ObjectFlags["IsGenericObjectType"] = 8388608] = "IsGenericObjectType";
+        /* @internal */
+        ObjectFlags[ObjectFlags["IsGenericIndexTypeComputed"] = 16777216] = "IsGenericIndexTypeComputed";
         /* @internal */
-        ObjectFlags[ObjectFlags["RequiresWidening"] = 1572864] = "RequiresWidening";
+        ObjectFlags[ObjectFlags["IsGenericIndexType"] = 33554432] = "IsGenericIndexType";
+        // Flags that require TypeFlags.Union
         /* @internal */
-        ObjectFlags[ObjectFlags["PropagatingFlags"] = 3670016] = "PropagatingFlags";
-        // Object flags that uniquely identify the kind of ObjectType
+        ObjectFlags[ObjectFlags["ContainsIntersections"] = 67108864] = "ContainsIntersections";
+        // Flags that require TypeFlags.Intersection
         /* @internal */
-        ObjectFlags[ObjectFlags["ObjectTypeKindMask"] = 2367] = "ObjectTypeKindMask";
+        ObjectFlags[ObjectFlags["IsNeverIntersectionComputed"] = 67108864] = "IsNeverIntersectionComputed";
+        /* @internal */
+        ObjectFlags[ObjectFlags["IsNeverIntersection"] = 134217728] = "IsNeverIntersection";
     })(ObjectFlags = ts.ObjectFlags || (ts.ObjectFlags = {}));
     /* @internal */
     var VarianceFlags;
@@ -5073,16 +5117,17 @@ var ts;
     (function (InferencePriority) {
         InferencePriority[InferencePriority["NakedTypeVariable"] = 1] = "NakedTypeVariable";
         InferencePriority[InferencePriority["SpeculativeTuple"] = 2] = "SpeculativeTuple";
-        InferencePriority[InferencePriority["HomomorphicMappedType"] = 4] = "HomomorphicMappedType";
-        InferencePriority[InferencePriority["PartialHomomorphicMappedType"] = 8] = "PartialHomomorphicMappedType";
-        InferencePriority[InferencePriority["MappedTypeConstraint"] = 16] = "MappedTypeConstraint";
-        InferencePriority[InferencePriority["ContravariantConditional"] = 32] = "ContravariantConditional";
-        InferencePriority[InferencePriority["ReturnType"] = 64] = "ReturnType";
-        InferencePriority[InferencePriority["LiteralKeyof"] = 128] = "LiteralKeyof";
-        InferencePriority[InferencePriority["NoConstraints"] = 256] = "NoConstraints";
-        InferencePriority[InferencePriority["AlwaysStrict"] = 512] = "AlwaysStrict";
-        InferencePriority[InferencePriority["MaxValue"] = 1024] = "MaxValue";
-        InferencePriority[InferencePriority["PriorityImpliesCombination"] = 208] = "PriorityImpliesCombination";
+        InferencePriority[InferencePriority["SubstituteSource"] = 4] = "SubstituteSource";
+        InferencePriority[InferencePriority["HomomorphicMappedType"] = 8] = "HomomorphicMappedType";
+        InferencePriority[InferencePriority["PartialHomomorphicMappedType"] = 16] = "PartialHomomorphicMappedType";
+        InferencePriority[InferencePriority["MappedTypeConstraint"] = 32] = "MappedTypeConstraint";
+        InferencePriority[InferencePriority["ContravariantConditional"] = 64] = "ContravariantConditional";
+        InferencePriority[InferencePriority["ReturnType"] = 128] = "ReturnType";
+        InferencePriority[InferencePriority["LiteralKeyof"] = 256] = "LiteralKeyof";
+        InferencePriority[InferencePriority["NoConstraints"] = 512] = "NoConstraints";
+        InferencePriority[InferencePriority["AlwaysStrict"] = 1024] = "AlwaysStrict";
+        InferencePriority[InferencePriority["MaxValue"] = 2048] = "MaxValue";
+        InferencePriority[InferencePriority["PriorityImpliesCombination"] = 416] = "PriorityImpliesCombination";
         InferencePriority[InferencePriority["Circularity"] = -1] = "Circularity";
     })(InferencePriority = ts.InferencePriority || (ts.InferencePriority = {}));
     /* @internal */
@@ -5160,20 +5205,23 @@ var ts;
         WatchFileKind[WatchFileKind["FixedPollingInterval"] = 0] = "FixedPollingInterval";
         WatchFileKind[WatchFileKind["PriorityPollingInterval"] = 1] = "PriorityPollingInterval";
         WatchFileKind[WatchFileKind["DynamicPriorityPolling"] = 2] = "DynamicPriorityPolling";
-        WatchFileKind[WatchFileKind["UseFsEvents"] = 3] = "UseFsEvents";
-        WatchFileKind[WatchFileKind["UseFsEventsOnParentDirectory"] = 4] = "UseFsEventsOnParentDirectory";
+        WatchFileKind[WatchFileKind["FixedChunkSizePolling"] = 3] = "FixedChunkSizePolling";
+        WatchFileKind[WatchFileKind["UseFsEvents"] = 4] = "UseFsEvents";
+        WatchFileKind[WatchFileKind["UseFsEventsOnParentDirectory"] = 5] = "UseFsEventsOnParentDirectory";
     })(WatchFileKind = ts.WatchFileKind || (ts.WatchFileKind = {}));
     var WatchDirectoryKind;
     (function (WatchDirectoryKind) {
         WatchDirectoryKind[WatchDirectoryKind["UseFsEvents"] = 0] = "UseFsEvents";
         WatchDirectoryKind[WatchDirectoryKind["FixedPollingInterval"] = 1] = "FixedPollingInterval";
         WatchDirectoryKind[WatchDirectoryKind["DynamicPriorityPolling"] = 2] = "DynamicPriorityPolling";
+        WatchDirectoryKind[WatchDirectoryKind["FixedChunkSizePolling"] = 3] = "FixedChunkSizePolling";
     })(WatchDirectoryKind = ts.WatchDirectoryKind || (ts.WatchDirectoryKind = {}));
     var PollingWatchKind;
     (function (PollingWatchKind) {
         PollingWatchKind[PollingWatchKind["FixedInterval"] = 0] = "FixedInterval";
         PollingWatchKind[PollingWatchKind["PriorityInterval"] = 1] = "PriorityInterval";
         PollingWatchKind[PollingWatchKind["DynamicPriority"] = 2] = "DynamicPriority";
+        PollingWatchKind[PollingWatchKind["FixedChunkSize"] = 3] = "FixedChunkSize";
     })(PollingWatchKind = ts.PollingWatchKind || (ts.PollingWatchKind = {}));
     var ModuleKind;
     (function (ModuleKind) {
@@ -5234,6 +5282,7 @@ var ts;
         ScriptTarget[ScriptTarget["ES2018"] = 5] = "ES2018";
         ScriptTarget[ScriptTarget["ES2019"] = 6] = "ES2019";
         ScriptTarget[ScriptTarget["ES2020"] = 7] = "ES2020";
+        ScriptTarget[ScriptTarget["ES2021"] = 8] = "ES2021";
         ScriptTarget[ScriptTarget["ESNext"] = 99] = "ESNext";
         ScriptTarget[ScriptTarget["JSON"] = 100] = "JSON";
         ScriptTarget[ScriptTarget["Latest"] = 99] = "Latest";
@@ -5396,29 +5445,30 @@ var ts;
         TransformFlags[TransformFlags["ContainsTypeScript"] = 1] = "ContainsTypeScript";
         TransformFlags[TransformFlags["ContainsJsx"] = 2] = "ContainsJsx";
         TransformFlags[TransformFlags["ContainsESNext"] = 4] = "ContainsESNext";
-        TransformFlags[TransformFlags["ContainsES2020"] = 8] = "ContainsES2020";
-        TransformFlags[TransformFlags["ContainsES2019"] = 16] = "ContainsES2019";
-        TransformFlags[TransformFlags["ContainsES2018"] = 32] = "ContainsES2018";
-        TransformFlags[TransformFlags["ContainsES2017"] = 64] = "ContainsES2017";
-        TransformFlags[TransformFlags["ContainsES2016"] = 128] = "ContainsES2016";
-        TransformFlags[TransformFlags["ContainsES2015"] = 256] = "ContainsES2015";
-        TransformFlags[TransformFlags["ContainsGenerator"] = 512] = "ContainsGenerator";
-        TransformFlags[TransformFlags["ContainsDestructuringAssignment"] = 1024] = "ContainsDestructuringAssignment";
+        TransformFlags[TransformFlags["ContainsES2021"] = 8] = "ContainsES2021";
+        TransformFlags[TransformFlags["ContainsES2020"] = 16] = "ContainsES2020";
+        TransformFlags[TransformFlags["ContainsES2019"] = 32] = "ContainsES2019";
+        TransformFlags[TransformFlags["ContainsES2018"] = 64] = "ContainsES2018";
+        TransformFlags[TransformFlags["ContainsES2017"] = 128] = "ContainsES2017";
+        TransformFlags[TransformFlags["ContainsES2016"] = 256] = "ContainsES2016";
+        TransformFlags[TransformFlags["ContainsES2015"] = 512] = "ContainsES2015";
+        TransformFlags[TransformFlags["ContainsGenerator"] = 1024] = "ContainsGenerator";
+        TransformFlags[TransformFlags["ContainsDestructuringAssignment"] = 2048] = "ContainsDestructuringAssignment";
         // Markers
         // - Flags used to indicate that a subtree contains a specific transformation.
-        TransformFlags[TransformFlags["ContainsTypeScriptClassSyntax"] = 2048] = "ContainsTypeScriptClassSyntax";
-        TransformFlags[TransformFlags["ContainsLexicalThis"] = 4096] = "ContainsLexicalThis";
-        TransformFlags[TransformFlags["ContainsRestOrSpread"] = 8192] = "ContainsRestOrSpread";
-        TransformFlags[TransformFlags["ContainsObjectRestOrSpread"] = 16384] = "ContainsObjectRestOrSpread";
-        TransformFlags[TransformFlags["ContainsComputedPropertyName"] = 32768] = "ContainsComputedPropertyName";
-        TransformFlags[TransformFlags["ContainsBlockScopedBinding"] = 65536] = "ContainsBlockScopedBinding";
-        TransformFlags[TransformFlags["ContainsBindingPattern"] = 131072] = "ContainsBindingPattern";
-        TransformFlags[TransformFlags["ContainsYield"] = 262144] = "ContainsYield";
-        TransformFlags[TransformFlags["ContainsAwait"] = 524288] = "ContainsAwait";
-        TransformFlags[TransformFlags["ContainsHoistedDeclarationOrCompletion"] = 1048576] = "ContainsHoistedDeclarationOrCompletion";
-        TransformFlags[TransformFlags["ContainsDynamicImport"] = 2097152] = "ContainsDynamicImport";
-        TransformFlags[TransformFlags["ContainsClassFields"] = 4194304] = "ContainsClassFields";
-        TransformFlags[TransformFlags["ContainsPossibleTopLevelAwait"] = 8388608] = "ContainsPossibleTopLevelAwait";
+        TransformFlags[TransformFlags["ContainsTypeScriptClassSyntax"] = 4096] = "ContainsTypeScriptClassSyntax";
+        TransformFlags[TransformFlags["ContainsLexicalThis"] = 8192] = "ContainsLexicalThis";
+        TransformFlags[TransformFlags["ContainsRestOrSpread"] = 16384] = "ContainsRestOrSpread";
+        TransformFlags[TransformFlags["ContainsObjectRestOrSpread"] = 32768] = "ContainsObjectRestOrSpread";
+        TransformFlags[TransformFlags["ContainsComputedPropertyName"] = 65536] = "ContainsComputedPropertyName";
+        TransformFlags[TransformFlags["ContainsBlockScopedBinding"] = 131072] = "ContainsBlockScopedBinding";
+        TransformFlags[TransformFlags["ContainsBindingPattern"] = 262144] = "ContainsBindingPattern";
+        TransformFlags[TransformFlags["ContainsYield"] = 524288] = "ContainsYield";
+        TransformFlags[TransformFlags["ContainsAwait"] = 1048576] = "ContainsAwait";
+        TransformFlags[TransformFlags["ContainsHoistedDeclarationOrCompletion"] = 2097152] = "ContainsHoistedDeclarationOrCompletion";
+        TransformFlags[TransformFlags["ContainsDynamicImport"] = 4194304] = "ContainsDynamicImport";
+        TransformFlags[TransformFlags["ContainsClassFields"] = 8388608] = "ContainsClassFields";
+        TransformFlags[TransformFlags["ContainsPossibleTopLevelAwait"] = 16777216] = "ContainsPossibleTopLevelAwait";
         // Please leave this as 1 << 29.
         // It is the maximum bit we can set before we outgrow the size of a v8 small integer (SMI) on an x86 system.
         // It is a good reminder of how much room we have left
@@ -5428,37 +5478,38 @@ var ts;
         TransformFlags[TransformFlags["AssertTypeScript"] = 1] = "AssertTypeScript";
         TransformFlags[TransformFlags["AssertJsx"] = 2] = "AssertJsx";
         TransformFlags[TransformFlags["AssertESNext"] = 4] = "AssertESNext";
-        TransformFlags[TransformFlags["AssertES2020"] = 8] = "AssertES2020";
-        TransformFlags[TransformFlags["AssertES2019"] = 16] = "AssertES2019";
-        TransformFlags[TransformFlags["AssertES2018"] = 32] = "AssertES2018";
-        TransformFlags[TransformFlags["AssertES2017"] = 64] = "AssertES2017";
-        TransformFlags[TransformFlags["AssertES2016"] = 128] = "AssertES2016";
-        TransformFlags[TransformFlags["AssertES2015"] = 256] = "AssertES2015";
-        TransformFlags[TransformFlags["AssertGenerator"] = 512] = "AssertGenerator";
-        TransformFlags[TransformFlags["AssertDestructuringAssignment"] = 1024] = "AssertDestructuringAssignment";
+        TransformFlags[TransformFlags["AssertES2021"] = 8] = "AssertES2021";
+        TransformFlags[TransformFlags["AssertES2020"] = 16] = "AssertES2020";
+        TransformFlags[TransformFlags["AssertES2019"] = 32] = "AssertES2019";
+        TransformFlags[TransformFlags["AssertES2018"] = 64] = "AssertES2018";
+        TransformFlags[TransformFlags["AssertES2017"] = 128] = "AssertES2017";
+        TransformFlags[TransformFlags["AssertES2016"] = 256] = "AssertES2016";
+        TransformFlags[TransformFlags["AssertES2015"] = 512] = "AssertES2015";
+        TransformFlags[TransformFlags["AssertGenerator"] = 1024] = "AssertGenerator";
+        TransformFlags[TransformFlags["AssertDestructuringAssignment"] = 2048] = "AssertDestructuringAssignment";
         // Scope Exclusions
         // - Bitmasks that exclude flags from propagating out of a specific context
         //   into the subtree flags of their container.
         TransformFlags[TransformFlags["OuterExpressionExcludes"] = 536870912] = "OuterExpressionExcludes";
         TransformFlags[TransformFlags["PropertyAccessExcludes"] = 536870912] = "PropertyAccessExcludes";
         TransformFlags[TransformFlags["NodeExcludes"] = 536870912] = "NodeExcludes";
-        TransformFlags[TransformFlags["ArrowFunctionExcludes"] = 547309568] = "ArrowFunctionExcludes";
-        TransformFlags[TransformFlags["FunctionExcludes"] = 547313664] = "FunctionExcludes";
-        TransformFlags[TransformFlags["ConstructorExcludes"] = 547311616] = "ConstructorExcludes";
-        TransformFlags[TransformFlags["MethodOrAccessorExcludes"] = 538923008] = "MethodOrAccessorExcludes";
-        TransformFlags[TransformFlags["PropertyExcludes"] = 536875008] = "PropertyExcludes";
-        TransformFlags[TransformFlags["ClassExcludes"] = 536905728] = "ClassExcludes";
-        TransformFlags[TransformFlags["ModuleExcludes"] = 546379776] = "ModuleExcludes";
+        TransformFlags[TransformFlags["ArrowFunctionExcludes"] = 557748224] = "ArrowFunctionExcludes";
+        TransformFlags[TransformFlags["FunctionExcludes"] = 557756416] = "FunctionExcludes";
+        TransformFlags[TransformFlags["ConstructorExcludes"] = 557752320] = "ConstructorExcludes";
+        TransformFlags[TransformFlags["MethodOrAccessorExcludes"] = 540975104] = "MethodOrAccessorExcludes";
+        TransformFlags[TransformFlags["PropertyExcludes"] = 536879104] = "PropertyExcludes";
+        TransformFlags[TransformFlags["ClassExcludes"] = 536940544] = "ClassExcludes";
+        TransformFlags[TransformFlags["ModuleExcludes"] = 555888640] = "ModuleExcludes";
         TransformFlags[TransformFlags["TypeExcludes"] = -2] = "TypeExcludes";
-        TransformFlags[TransformFlags["ObjectLiteralExcludes"] = 536922112] = "ObjectLiteralExcludes";
-        TransformFlags[TransformFlags["ArrayLiteralOrCallOrNewExcludes"] = 536879104] = "ArrayLiteralOrCallOrNewExcludes";
-        TransformFlags[TransformFlags["VariableDeclarationListExcludes"] = 537018368] = "VariableDeclarationListExcludes";
+        TransformFlags[TransformFlags["ObjectLiteralExcludes"] = 536973312] = "ObjectLiteralExcludes";
+        TransformFlags[TransformFlags["ArrayLiteralOrCallOrNewExcludes"] = 536887296] = "ArrayLiteralOrCallOrNewExcludes";
+        TransformFlags[TransformFlags["VariableDeclarationListExcludes"] = 537165824] = "VariableDeclarationListExcludes";
         TransformFlags[TransformFlags["ParameterExcludes"] = 536870912] = "ParameterExcludes";
-        TransformFlags[TransformFlags["CatchClauseExcludes"] = 536887296] = "CatchClauseExcludes";
-        TransformFlags[TransformFlags["BindingPatternExcludes"] = 536879104] = "BindingPatternExcludes";
+        TransformFlags[TransformFlags["CatchClauseExcludes"] = 536903680] = "CatchClauseExcludes";
+        TransformFlags[TransformFlags["BindingPatternExcludes"] = 536887296] = "BindingPatternExcludes";
         // Propagating flags
         // - Bitmasks for flags that should propagate from a child
-        TransformFlags[TransformFlags["PropertyNamePropagatingFlags"] = 4096] = "PropertyNamePropagatingFlags";
+        TransformFlags[TransformFlags["PropertyNamePropagatingFlags"] = 8192] = "PropertyNamePropagatingFlags";
         // Masks
         // - Additional bitmasks
     })(TransformFlags = ts.TransformFlags || (ts.TransformFlags = {}));
@@ -6446,6 +6497,11 @@ var ts;
     })(PollingInterval = ts.PollingInterval || (ts.PollingInterval = {}));
     /* @internal */
     ts.missingFileModifiedTime = new Date(0); // Any subsequent modification will occur after this time
+    /* @internal */
+    function getModifiedTime(host, fileName) {
+        return host.getModifiedTime(fileName) || ts.missingFileModifiedTime;
+    }
+    ts.getModifiedTime = getModifiedTime;
     function createPollingIntervalBasedLevels(levels) {
         var _a;
         return _a = {},
@@ -6502,6 +6558,51 @@ var ts;
         }
     }
     ts.setCustomPollingValues = setCustomPollingValues;
+    function pollWatchedFileQueue(host, queue, pollIndex, chunkSize, callbackOnWatchFileStat) {
+        var definedValueCopyToIndex = pollIndex;
+        // Max visit would be all elements of the queue
+        for (var canVisit = queue.length; chunkSize && canVisit; nextPollIndex(), canVisit--) {
+            var watchedFile = queue[pollIndex];
+            if (!watchedFile) {
+                continue;
+            }
+            else if (watchedFile.isClosed) {
+                queue[pollIndex] = undefined;
+                continue;
+            }
+            // Only files polled count towards chunkSize
+            chunkSize--;
+            var fileChanged = onWatchedFileStat(watchedFile, getModifiedTime(host, watchedFile.fileName));
+            if (watchedFile.isClosed) {
+                // Closed watcher as part of callback
+                queue[pollIndex] = undefined;
+                continue;
+            }
+            callbackOnWatchFileStat === null || callbackOnWatchFileStat === void 0 ? void 0 : callbackOnWatchFileStat(watchedFile, pollIndex, fileChanged);
+            // Defragment the queue while we are at it
+            if (queue[pollIndex]) {
+                // Copy this file to the non hole location
+                if (definedValueCopyToIndex < pollIndex) {
+                    queue[definedValueCopyToIndex] = watchedFile;
+                    queue[pollIndex] = undefined;
+                }
+                definedValueCopyToIndex++;
+            }
+        }
+        // Return next poll index
+        return pollIndex;
+        function nextPollIndex() {
+            pollIndex++;
+            if (pollIndex === queue.length) {
+                if (definedValueCopyToIndex < pollIndex) {
+                    // There are holes from definedValueCopyToIndex to end of queue, change queue size
+                    queue.length = definedValueCopyToIndex;
+                }
+                pollIndex = 0;
+                definedValueCopyToIndex = 0;
+            }
+        }
+    }
     /* @internal */
     function createDynamicPriorityPollingWatchFile(host) {
         var watchedFiles = [];
@@ -6515,7 +6616,7 @@ var ts;
                 fileName: fileName,
                 callback: callback,
                 unchangedPolls: 0,
-                mtime: getModifiedTime(fileName)
+                mtime: getModifiedTime(host, fileName)
             };
             watchedFiles.push(file);
             addToPollingIntervalQueue(file, defaultPollingInterval);
@@ -6558,25 +6659,9 @@ var ts;
             }
         }
         function pollQueue(queue, pollingInterval, pollIndex, chunkSize) {
-            // Max visit would be all elements of the queue
-            var needsVisit = queue.length;
-            var definedValueCopyToIndex = pollIndex;
-            for (var polled = 0; polled < chunkSize && needsVisit > 0; nextPollIndex(), needsVisit--) {
-                var watchedFile = queue[pollIndex];
-                if (!watchedFile) {
-                    continue;
-                }
-                else if (watchedFile.isClosed) {
-                    queue[pollIndex] = undefined;
-                    continue;
-                }
-                polled++;
-                var fileChanged = onWatchedFileStat(watchedFile, getModifiedTime(watchedFile.fileName));
-                if (watchedFile.isClosed) {
-                    // Closed watcher as part of callback
-                    queue[pollIndex] = undefined;
-                }
-                else if (fileChanged) {
+            return pollWatchedFileQueue(host, queue, pollIndex, chunkSize, onWatchFileStat);
+            function onWatchFileStat(watchedFile, pollIndex, fileChanged) {
+                if (fileChanged) {
                     watchedFile.unchangedPolls = 0;
                     // Changed files go to changedFilesInLastPoll queue
                     if (queue !== changedFilesInLastPoll) {
@@ -6598,27 +6683,6 @@ var ts;
                     queue[pollIndex] = undefined;
                     addToPollingIntervalQueue(watchedFile, pollingInterval === PollingInterval.Low ? PollingInterval.Medium : PollingInterval.High);
                 }
-                if (queue[pollIndex]) {
-                    // Copy this file to the non hole location
-                    if (definedValueCopyToIndex < pollIndex) {
-                        queue[definedValueCopyToIndex] = watchedFile;
-                        queue[pollIndex] = undefined;
-                    }
-                    definedValueCopyToIndex++;
-                }
-            }
-            // Return next poll index
-            return pollIndex;
-            function nextPollIndex() {
-                pollIndex++;
-                if (pollIndex === queue.length) {
-                    if (definedValueCopyToIndex < pollIndex) {
-                        // There are holes from nextDefinedValueIndex to end of queue, change queue size
-                        queue.length = definedValueCopyToIndex;
-                    }
-                    pollIndex = 0;
-                    definedValueCopyToIndex = 0;
-                }
             }
         }
         function pollingIntervalQueue(pollingInterval) {
@@ -6647,9 +6711,6 @@ var ts;
         function scheduleNextPoll(pollingInterval) {
             pollingIntervalQueue(pollingInterval).pollScheduled = host.setTimeout(pollingInterval === PollingInterval.Low ? pollLowPollingIntervalQueue : pollPollingIntervalQueue, pollingInterval, pollingIntervalQueue(pollingInterval));
         }
-        function getModifiedTime(fileName) {
-            return host.getModifiedTime(fileName) || ts.missingFileModifiedTime;
-        }
     }
     ts.createDynamicPriorityPollingWatchFile = createDynamicPriorityPollingWatchFile;
     function createUseFsEventsOnParentDirectoryWatchFile(fsWatch, useCaseSensitiveFileNames) {
@@ -6700,6 +6761,37 @@ var ts;
             return watcher;
         }
     }
+    function createFixedChunkSizePollingWatchFile(host) {
+        var watchedFiles = [];
+        var pollIndex = 0;
+        var pollScheduled;
+        return watchFile;
+        function watchFile(fileName, callback) {
+            var file = {
+                fileName: fileName,
+                callback: callback,
+                mtime: getModifiedTime(host, fileName)
+            };
+            watchedFiles.push(file);
+            scheduleNextPoll();
+            return {
+                close: function () {
+                    file.isClosed = true;
+                    ts.unorderedRemoveItem(watchedFiles, file);
+                }
+            };
+        }
+        function pollQueue() {
+            pollScheduled = undefined;
+            pollIndex = pollWatchedFileQueue(host, watchedFiles, pollIndex, pollingChunkSize[PollingInterval.Low]);
+            scheduleNextPoll();
+        }
+        function scheduleNextPoll() {
+            if (!watchedFiles.length || pollScheduled)
+                return;
+            pollScheduled = host.setTimeout(pollQueue, PollingInterval.High);
+        }
+    }
     /* @internal */
     function createSingleFileWatcherPerName(watchFile, useCaseSensitiveFileNames) {
         var cache = new ts.Map();
@@ -7022,8 +7114,9 @@ var ts;
     }
     /*@internal*/
     function createSystemWatchFunctions(_a) {
-        var pollingWatchFile = _a.pollingWatchFile, getModifiedTime = _a.getModifiedTime, setTimeout = _a.setTimeout, clearTimeout = _a.clearTimeout, fsWatch = _a.fsWatch, fileExists = _a.fileExists, useCaseSensitiveFileNames = _a.useCaseSensitiveFileNames, getCurrentDirectory = _a.getCurrentDirectory, fsSupportsRecursiveFsWatch = _a.fsSupportsRecursiveFsWatch, directoryExists = _a.directoryExists, getAccessibleSortedChildDirectories = _a.getAccessibleSortedChildDirectories, realpath = _a.realpath, tscWatchFile = _a.tscWatchFile, useNonPollingWatchers = _a.useNonPollingWatchers, tscWatchDirectory = _a.tscWatchDirectory;
+        var pollingWatchFile = _a.pollingWatchFile, getModifiedTime = _a.getModifiedTime, setTimeout = _a.setTimeout, clearTimeout = _a.clearTimeout, fsWatch = _a.fsWatch, fileExists = _a.fileExists, useCaseSensitiveFileNames = _a.useCaseSensitiveFileNames, getCurrentDirectory = _a.getCurrentDirectory, fsSupportsRecursiveFsWatch = _a.fsSupportsRecursiveFsWatch, directoryExists = _a.directoryExists, getAccessibleSortedChildDirectories = _a.getAccessibleSortedChildDirectories, realpath = _a.realpath, tscWatchFile = _a.tscWatchFile, useNonPollingWatchers = _a.useNonPollingWatchers, tscWatchDirectory = _a.tscWatchDirectory, defaultWatchFileKind = _a.defaultWatchFileKind;
         var dynamicPollingWatchFile;
+        var fixedChunkSizePollingWatchFile;
         var nonPollingWatchFile;
         var hostRecursiveDirectoryWatcher;
         return {
@@ -7040,6 +7133,8 @@ var ts;
                     return pollingWatchFile(fileName, callback, pollingInterval, /*options*/ undefined);
                 case ts.WatchFileKind.DynamicPriorityPolling:
                     return ensureDynamicPollingWatchFile()(fileName, callback, pollingInterval, /*options*/ undefined);
+                case ts.WatchFileKind.FixedChunkSizePolling:
+                    return ensureFixedChunkSizePollingWatchFile()(fileName, callback, /* pollingInterval */ undefined, /*options*/ undefined);
                 case ts.WatchFileKind.UseFsEvents:
                     return fsWatch(fileName, 0 /* File */, createFsWatchCallbackForFileWatcherCallback(fileName, callback, fileExists), 
                     /*recursive*/ false, pollingInterval, ts.getFallbackOptions(options));
@@ -7053,8 +7148,10 @@ var ts;
             }
         }
         function ensureDynamicPollingWatchFile() {
-            return dynamicPollingWatchFile ||
-                (dynamicPollingWatchFile = createDynamicPriorityPollingWatchFile({ getModifiedTime: getModifiedTime, setTimeout: setTimeout }));
+            return dynamicPollingWatchFile || (dynamicPollingWatchFile = createDynamicPriorityPollingWatchFile({ getModifiedTime: getModifiedTime, setTimeout: setTimeout }));
+        }
+        function ensureFixedChunkSizePollingWatchFile() {
+            return fixedChunkSizePollingWatchFile || (fixedChunkSizePollingWatchFile = createFixedChunkSizePollingWatchFile({ getModifiedTime: getModifiedTime, setTimeout: setTimeout }));
         }
         function updateOptionsForWatchFile(options, useNonPollingWatchers) {
             if (options && options.watchFile !== undefined)
@@ -7080,7 +7177,7 @@ var ts;
                         // Use notifications from FS to watch with falling back to fs.watchFile
                         generateWatchFileOptions(ts.WatchFileKind.UseFsEventsOnParentDirectory, ts.PollingWatchKind.PriorityInterval, options) :
                         // Default to do not use fixed polling interval
-                        { watchFile: ts.WatchFileKind.FixedPollingInterval };
+                        { watchFile: (defaultWatchFileKind === null || defaultWatchFileKind === void 0 ? void 0 : defaultWatchFileKind()) || ts.WatchFileKind.FixedPollingInterval };
             }
         }
         function generateWatchFileOptions(watchFile, fallbackPolling, options) {
@@ -7121,6 +7218,10 @@ var ts;
                 case ts.WatchDirectoryKind.DynamicPriorityPolling:
                     return ensureDynamicPollingWatchFile()(directoryName, function () { return callback(directoryName); }, PollingInterval.Medium, 
                     /*options*/ undefined);
+                case ts.WatchDirectoryKind.FixedChunkSizePolling:
+                    return ensureFixedChunkSizePollingWatchFile()(directoryName, function () { return callback(directoryName); }, 
+                    /* pollingInterval */ undefined, 
+                    /*options*/ undefined);
                 case ts.WatchDirectoryKind.UseFsEvents:
                     return fsWatch(directoryName, 1 /* Directory */, createFsWatchCallbackForDirectoryWatcherCallback(directoryName, callback, options, useCaseSensitiveFileNames, getCurrentDirectory), recursive, PollingInterval.Medium, ts.getFallbackOptions(watchDirectoryOptions));
                 default:
@@ -7199,13 +7300,13 @@ var ts;
             }
             var activeSession;
             var profilePath = "./profile.cpuprofile";
-            var realpathSync = (_a = _fs.realpathSync.native) !== null && _a !== void 0 ? _a : _fs.realpathSync;
             var Buffer = require("buffer").Buffer;
             var nodeVersion = getNodeMajorVersion();
             var isNode4OrLater = nodeVersion >= 4;
             var isLinuxOrMacOs = process.platform === "linux" || process.platform === "darwin";
             var platform = _os.platform();
             var useCaseSensitiveFileNames = isFileSystemCaseSensitive();
+            var realpathSync = useCaseSensitiveFileNames ? ((_a = _fs.realpathSync.native) !== null && _a !== void 0 ? _a : _fs.realpathSync) : _fs.realpathSync;
             var fsSupportsRecursiveFsWatch = isNode4OrLater && (process.platform === "win32" || process.platform === "darwin");
             var getCurrentDirectory = ts.memoize(function () { return process.cwd(); });
             var _c = createSystemWatchFunctions({
@@ -7226,6 +7327,7 @@ var ts;
                 tscWatchFile: process.env.TSC_WATCHFILE,
                 useNonPollingWatchers: process.env.TSC_NONPOLLING_WATCHER,
                 tscWatchDirectory: process.env.TSC_WATCHDIRECTORY,
+                defaultWatchFileKind: function () { var _a, _b; return (_b = (_a = sys).defaultWatchFileKind) === null || _b === void 0 ? void 0 : _b.call(_a); },
             }), watchFile = _c.watchFile, watchDirectory = _c.watchDirectory;
             var nodeSystem = {
                 args: process.argv.slice(2),
@@ -7903,7 +8005,7 @@ var ts;
         A_yield_expression_is_only_allowed_in_a_generator_body: diag(1163, ts.DiagnosticCategory.Error, "A_yield_expression_is_only_allowed_in_a_generator_body_1163", "A 'yield' expression is only allowed in a generator body."),
         Computed_property_names_are_not_allowed_in_enums: diag(1164, ts.DiagnosticCategory.Error, "Computed_property_names_are_not_allowed_in_enums_1164", "Computed property names are not allowed in enums."),
         A_computed_property_name_in_an_ambient_context_must_refer_to_an_expression_whose_type_is_a_literal_type_or_a_unique_symbol_type: diag(1165, ts.DiagnosticCategory.Error, "A_computed_property_name_in_an_ambient_context_must_refer_to_an_expression_whose_type_is_a_literal_t_1165", "A computed property name in an ambient context must refer to an expression whose type is a literal type or a 'unique symbol' type."),
-        A_computed_property_name_in_a_class_property_declaration_must_refer_to_an_expression_whose_type_is_a_literal_type_or_a_unique_symbol_type: diag(1166, ts.DiagnosticCategory.Error, "A_computed_property_name_in_a_class_property_declaration_must_refer_to_an_expression_whose_type_is_a_1166", "A computed property name in a class property declaration must refer to an expression whose type is a literal type or a 'unique symbol' type."),
+        A_computed_property_name_in_a_class_property_declaration_must_have_a_simple_literal_type_or_a_unique_symbol_type: diag(1166, ts.DiagnosticCategory.Error, "A_computed_property_name_in_a_class_property_declaration_must_have_a_simple_literal_type_or_a_unique_1166", "A computed property name in a class property declaration must have a simple literal type or a 'unique symbol' type."),
         A_computed_property_name_in_a_method_overload_must_refer_to_an_expression_whose_type_is_a_literal_type_or_a_unique_symbol_type: diag(1168, ts.DiagnosticCategory.Error, "A_computed_property_name_in_a_method_overload_must_refer_to_an_expression_whose_type_is_a_literal_ty_1168", "A computed property name in a method overload must refer to an expression whose type is a literal type or a 'unique symbol' type."),
         A_computed_property_name_in_an_interface_must_refer_to_an_expression_whose_type_is_a_literal_type_or_a_unique_symbol_type: diag(1169, ts.DiagnosticCategory.Error, "A_computed_property_name_in_an_interface_must_refer_to_an_expression_whose_type_is_a_literal_type_or_1169", "A computed property name in an interface must refer to an expression whose type is a literal type or a 'unique symbol' type."),
         A_computed_property_name_in_a_type_literal_must_refer_to_an_expression_whose_type_is_a_literal_type_or_a_unique_symbol_type: diag(1170, ts.DiagnosticCategory.Error, "A_computed_property_name_in_a_type_literal_must_refer_to_an_expression_whose_type_is_a_literal_type__1170", "A computed property name in a type literal must refer to an expression whose type is a literal type or a 'unique symbol' type."),
@@ -7963,7 +8065,7 @@ var ts;
         A_type_predicate_is_only_allowed_in_return_type_position_for_functions_and_methods: diag(1228, ts.DiagnosticCategory.Error, "A_type_predicate_is_only_allowed_in_return_type_position_for_functions_and_methods_1228", "A type predicate is only allowed in return type position for functions and methods."),
         A_type_predicate_cannot_reference_a_rest_parameter: diag(1229, ts.DiagnosticCategory.Error, "A_type_predicate_cannot_reference_a_rest_parameter_1229", "A type predicate cannot reference a rest parameter."),
         A_type_predicate_cannot_reference_element_0_in_a_binding_pattern: diag(1230, ts.DiagnosticCategory.Error, "A_type_predicate_cannot_reference_element_0_in_a_binding_pattern_1230", "A type predicate cannot reference element '{0}' in a binding pattern."),
-        An_export_assignment_can_only_be_used_in_a_module: diag(1231, ts.DiagnosticCategory.Error, "An_export_assignment_can_only_be_used_in_a_module_1231", "An export assignment can only be used in a module."),
+        An_export_assignment_must_be_at_the_top_level_of_a_file_or_module_declaration: diag(1231, ts.DiagnosticCategory.Error, "An_export_assignment_must_be_at_the_top_level_of_a_file_or_module_declaration_1231", "An export assignment must be at the top level of a file or module declaration."),
         An_import_declaration_can_only_be_used_in_a_namespace_or_module: diag(1232, ts.DiagnosticCategory.Error, "An_import_declaration_can_only_be_used_in_a_namespace_or_module_1232", "An import declaration can only be used in a namespace or module."),
         An_export_declaration_can_only_be_used_in_a_module: diag(1233, ts.DiagnosticCategory.Error, "An_export_declaration_can_only_be_used_in_a_module_1233", "An export declaration can only be used in a module."),
         An_ambient_module_declaration_is_only_allowed_at_the_top_level_in_a_file: diag(1234, ts.DiagnosticCategory.Error, "An_ambient_module_declaration_is_only_allowed_at_the_top_level_in_a_file_1234", "An ambient module declaration is only allowed at the top level in a file."),
@@ -7989,6 +8091,7 @@ var ts;
         A_const_initializer_in_an_ambient_context_must_be_a_string_or_numeric_literal_or_literal_enum_reference: diag(1254, ts.DiagnosticCategory.Error, "A_const_initializer_in_an_ambient_context_must_be_a_string_or_numeric_literal_or_literal_enum_refere_1254", "A 'const' initializer in an ambient context must be a string or numeric literal or literal enum reference."),
         A_definite_assignment_assertion_is_not_permitted_in_this_context: diag(1255, ts.DiagnosticCategory.Error, "A_definite_assignment_assertion_is_not_permitted_in_this_context_1255", "A definite assignment assertion '!' is not permitted in this context."),
         A_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."),
+        A_default_export_must_be_at_the_top_level_of_a_file_or_module_declaration: diag(1258, ts.DiagnosticCategory.Error, "A_default_export_must_be_at_the_top_level_of_a_file_or_module_declaration_1258", "A default export must be at the top level of a file or module declaration."),
         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."),
@@ -8075,7 +8178,7 @@ var ts;
         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."),
         Provides_a_root_package_name_when_using_outFile_with_declarations: diag(1390, ts.DiagnosticCategory.Message, "Provides_a_root_package_name_when_using_outFile_with_declarations_1390", "Provides a root package name when using outFile with declarations."),
-        The_bundledPackageName_option_must_be_provided_when_using_outFile_and_node_module_resolution_with_declaration_emit: diag(1391, ts.DiagnosticCategory.Error, "The_bundledPackageName_option_must_be_provided_when_using_outFile_and_node_module_resolution_with_de_1391", "The `bundledPackageName` option must be provided when using outFile and node module resolution with declaration emit."),
+        The_bundledPackageName_option_must_be_provided_when_using_outFile_and_node_module_resolution_with_declaration_emit: diag(1391, ts.DiagnosticCategory.Error, "The_bundledPackageName_option_must_be_provided_when_using_outFile_and_node_module_resolution_with_de_1391", "The 'bundledPackageName' option must be provided when using outFile and node module resolution with declaration emit."),
         An_import_alias_cannot_use_import_type: diag(1392, ts.DiagnosticCategory.Error, "An_import_alias_cannot_use_import_type_1392", "An import alias cannot use 'import type'"),
         Imported_via_0_from_file_1: diag(1393, ts.DiagnosticCategory.Message, "Imported_via_0_from_file_1_1393", "Imported via {0} from file '{1}'"),
         Imported_via_0_from_file_1_with_packageId_2: diag(1394, ts.DiagnosticCategory.Message, "Imported_via_0_from_file_1_with_packageId_2_1394", "Imported via {0} from file '{1}' with packageId '{2}'"),
@@ -8117,6 +8220,7 @@ var ts;
         The_file_is_in_the_program_because_Colon: diag(1430, ts.DiagnosticCategory.Message, "The_file_is_in_the_program_because_Colon_1430", "The file is in the program because:"),
         for_await_loops_are_only_allowed_at_the_top_level_of_a_file_when_that_file_is_a_module_but_this_file_has_no_imports_or_exports_Consider_adding_an_empty_export_to_make_this_file_a_module: diag(1431, ts.DiagnosticCategory.Error, "for_await_loops_are_only_allowed_at_the_top_level_of_a_file_when_that_file_is_a_module_but_this_file_1431", "'for await' loops are only allowed at the top level of a file when that file is a module, but this file has no imports or exports. Consider adding an empty 'export {}' to make this file a module."),
         Top_level_for_await_loops_are_only_allowed_when_the_module_option_is_set_to_esnext_or_system_and_the_target_option_is_set_to_es2017_or_higher: diag(1432, ts.DiagnosticCategory.Error, "Top_level_for_await_loops_are_only_allowed_when_the_module_option_is_set_to_esnext_or_system_and_the_1432", "Top-level 'for await' loops are only allowed when the 'module' option is set to 'esnext' or 'system', and the 'target' option is set to 'es2017' or higher."),
+        Decorators_may_not_be_applied_to_this_parameters: diag(1433, ts.DiagnosticCategory.Error, "Decorators_may_not_be_applied_to_this_parameters_1433", "Decorators may not be applied to 'this' parameters."),
         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),
@@ -8202,8 +8306,7 @@ var ts;
         A_super_call_must_be_the_first_statement_in_the_constructor_when_a_class_contains_initialized_properties_parameter_properties_or_private_identifiers: diag(2376, ts.DiagnosticCategory.Error, "A_super_call_must_be_the_first_statement_in_the_constructor_when_a_class_contains_initialized_proper_2376", "A 'super' call must be the first statement in the constructor when a class contains initialized properties, parameter properties, or private identifiers."),
         Constructors_for_derived_classes_must_contain_a_super_call: diag(2377, ts.DiagnosticCategory.Error, "Constructors_for_derived_classes_must_contain_a_super_call_2377", "Constructors for derived classes must contain a 'super' call."),
         A_get_accessor_must_return_a_value: diag(2378, ts.DiagnosticCategory.Error, "A_get_accessor_must_return_a_value_2378", "A 'get' accessor must return a value."),
-        Getter_and_setter_accessors_do_not_agree_in_visibility: diag(2379, ts.DiagnosticCategory.Error, "Getter_and_setter_accessors_do_not_agree_in_visibility_2379", "Getter and setter accessors do not agree in visibility."),
-        get_and_set_accessor_must_have_the_same_type: diag(2380, ts.DiagnosticCategory.Error, "get_and_set_accessor_must_have_the_same_type_2380", "'get' and 'set' accessor must have the same type."),
+        The_return_type_of_a_get_accessor_must_be_assignable_to_its_set_accessor_type: diag(2380, ts.DiagnosticCategory.Error, "The_return_type_of_a_get_accessor_must_be_assignable_to_its_set_accessor_type_2380", "The return type of a 'get' accessor must be assignable to its 'set' accessor type"),
         A_signature_with_an_implementation_cannot_use_a_string_literal_type: diag(2381, ts.DiagnosticCategory.Error, "A_signature_with_an_implementation_cannot_use_a_string_literal_type_2381", "A signature with an implementation cannot use a string literal type."),
         Specialized_overload_signature_is_not_assignable_to_any_non_specialized_signature: diag(2382, ts.DiagnosticCategory.Error, "Specialized_overload_signature_is_not_assignable_to_any_non_specialized_signature_2382", "Specialized overload signature is not assignable to any non-specialized signature."),
         Overload_signatures_must_all_be_exported_or_non_exported: diag(2383, ts.DiagnosticCategory.Error, "Overload_signatures_must_all_be_exported_or_non_exported_2383", "Overload signatures must all be exported or non-exported."),
@@ -8266,7 +8369,7 @@ var ts;
         Property_0_is_protected_but_type_1_is_not_a_class_derived_from_2: diag(2443, ts.DiagnosticCategory.Error, "Property_0_is_protected_but_type_1_is_not_a_class_derived_from_2_2443", "Property '{0}' is protected but type '{1}' is not a class derived from '{2}'."),
         Property_0_is_protected_in_type_1_but_public_in_type_2: diag(2444, ts.DiagnosticCategory.Error, "Property_0_is_protected_in_type_1_but_public_in_type_2_2444", "Property '{0}' is protected in type '{1}' but public in type '{2}'."),
         Property_0_is_protected_and_only_accessible_within_class_1_and_its_subclasses: diag(2445, ts.DiagnosticCategory.Error, "Property_0_is_protected_and_only_accessible_within_class_1_and_its_subclasses_2445", "Property '{0}' is protected and only accessible within class '{1}' and its subclasses."),
-        Property_0_is_protected_and_only_accessible_through_an_instance_of_class_1: diag(2446, ts.DiagnosticCategory.Error, "Property_0_is_protected_and_only_accessible_through_an_instance_of_class_1_2446", "Property '{0}' is protected and only accessible through an instance of class '{1}'."),
+        Property_0_is_protected_and_only_accessible_through_an_instance_of_class_1_This_is_an_instance_of_class_2: diag(2446, ts.DiagnosticCategory.Error, "Property_0_is_protected_and_only_accessible_through_an_instance_of_class_1_This_is_an_instance_of_cl_2446", "Property '{0}' is protected and only accessible through an instance of class '{1}'. This is an instance of class '{2}'."),
         The_0_operator_is_not_allowed_for_boolean_types_Consider_using_1_instead: diag(2447, ts.DiagnosticCategory.Error, "The_0_operator_is_not_allowed_for_boolean_types_Consider_using_1_instead_2447", "The '{0}' operator is not allowed for boolean types. Consider using '{1}' instead."),
         Block_scoped_variable_0_used_before_its_declaration: diag(2448, ts.DiagnosticCategory.Error, "Block_scoped_variable_0_used_before_its_declaration_2448", "Block-scoped variable '{0}' used before its declaration."),
         Class_0_used_before_its_declaration: diag(2449, ts.DiagnosticCategory.Error, "Class_0_used_before_its_declaration_2449", "Class '{0}' used before its declaration."),
@@ -8366,14 +8469,13 @@ 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_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."),
         Expected_0_arguments_but_got_1: diag(2554, ts.DiagnosticCategory.Error, "Expected_0_arguments_but_got_1_2554", "Expected {0} arguments, but got {1}."),
         Expected_at_least_0_arguments_but_got_1: diag(2555, ts.DiagnosticCategory.Error, "Expected_at_least_0_arguments_but_got_1_2555", "Expected at least {0} arguments, but got {1}."),
-        Expected_0_arguments_but_got_1_or_more: diag(2556, ts.DiagnosticCategory.Error, "Expected_0_arguments_but_got_1_or_more_2556", "Expected {0} arguments, but got {1} or more."),
-        Expected_at_least_0_arguments_but_got_1_or_more: diag(2557, ts.DiagnosticCategory.Error, "Expected_at_least_0_arguments_but_got_1_or_more_2557", "Expected at least {0} arguments, but got {1} or more."),
+        A_spread_argument_must_either_have_a_tuple_type_or_be_passed_to_a_rest_parameter: diag(2556, ts.DiagnosticCategory.Error, "A_spread_argument_must_either_have_a_tuple_type_or_be_passed_to_a_rest_parameter_2556", "A spread argument must either have a tuple type or be passed to a rest parameter."),
         Expected_0_type_arguments_but_got_1: diag(2558, ts.DiagnosticCategory.Error, "Expected_0_type_arguments_but_got_1_2558", "Expected {0} type arguments, but got {1}."),
         Type_0_has_no_properties_in_common_with_type_1: diag(2559, ts.DiagnosticCategory.Error, "Type_0_has_no_properties_in_common_with_type_1_2559", "Type '{0}' has no properties in common with type '{1}'."),
         Value_of_type_0_has_no_properties_in_common_with_type_1_Did_you_mean_to_call_it: diag(2560, ts.DiagnosticCategory.Error, "Value_of_type_0_has_no_properties_in_common_with_type_1_Did_you_mean_to_call_it_2560", "Value of type '{0}' has no properties in common with type '{1}'. Did you mean to call it?"),
@@ -8396,17 +8498,17 @@ var ts;
         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."),
+        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."),
         JSDoc_type_0_circularly_references_itself: diag(2587, ts.DiagnosticCategory.Error, "JSDoc_type_0_circularly_references_itself_2587", "JSDoc type '{0}' circularly references itself."),
         Cannot_assign_to_0_because_it_is_a_constant: diag(2588, ts.DiagnosticCategory.Error, "Cannot_assign_to_0_because_it_is_a_constant_2588", "Cannot assign to '{0}' because it is a constant."),
         Type_instantiation_is_excessively_deep_and_possibly_infinite: diag(2589, ts.DiagnosticCategory.Error, "Type_instantiation_is_excessively_deep_and_possibly_infinite_2589", "Type instantiation is excessively deep and possibly infinite."),
         Expression_produces_a_union_type_that_is_too_complex_to_represent: diag(2590, ts.DiagnosticCategory.Error, "Expression_produces_a_union_type_that_is_too_complex_to_represent_2590", "Expression produces a union type that is too complex to represent."),
-        Cannot_find_name_0_Do_you_need_to_install_type_definitions_for_node_Try_npm_i_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."),
+        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."),
@@ -8439,6 +8541,12 @@ var ts;
         Variadic_element_at_position_0_in_source_does_not_match_element_at_position_1_in_target: diag(2625, ts.DiagnosticCategory.Error, "Variadic_element_at_position_0_in_source_does_not_match_element_at_position_1_in_target_2625", "Variadic element at position {0} in source does not match element at position {1} in target."),
         Type_at_position_0_in_source_is_not_compatible_with_type_at_position_1_in_target: diag(2626, ts.DiagnosticCategory.Error, "Type_at_position_0_in_source_is_not_compatible_with_type_at_position_1_in_target_2626", "Type at position {0} in source is not compatible with type at position {1} in target."),
         Type_at_positions_0_through_1_in_source_is_not_compatible_with_type_at_position_2_in_target: diag(2627, ts.DiagnosticCategory.Error, "Type_at_positions_0_through_1_in_source_is_not_compatible_with_type_at_position_2_in_target_2627", "Type at positions {0} through {1} in source is not compatible with type at position {2} in target."),
+        Cannot_assign_to_0_because_it_is_an_enum: diag(2628, ts.DiagnosticCategory.Error, "Cannot_assign_to_0_because_it_is_an_enum_2628", "Cannot assign to '{0}' because it is an enum."),
+        Cannot_assign_to_0_because_it_is_a_class: diag(2629, ts.DiagnosticCategory.Error, "Cannot_assign_to_0_because_it_is_a_class_2629", "Cannot assign to '{0}' because it is a class."),
+        Cannot_assign_to_0_because_it_is_a_function: diag(2630, ts.DiagnosticCategory.Error, "Cannot_assign_to_0_because_it_is_a_function_2630", "Cannot assign to '{0}' because it is a function."),
+        Cannot_assign_to_0_because_it_is_a_namespace: diag(2631, ts.DiagnosticCategory.Error, "Cannot_assign_to_0_because_it_is_a_namespace_2631", "Cannot assign to '{0}' because it is a namespace."),
+        Cannot_assign_to_0_because_it_is_an_import: diag(2632, ts.DiagnosticCategory.Error, "Cannot_assign_to_0_because_it_is_an_import_2632", "Cannot assign to '{0}' because it is an import."),
+        JSX_property_access_expressions_cannot_include_JSX_namespace_names: diag(2633, ts.DiagnosticCategory.Error, "JSX_property_access_expressions_cannot_include_JSX_namespace_names_2633", "JSX property access expressions cannot include JSX namespace names"),
         Cannot_augment_module_0_with_value_exports_because_it_resolves_to_a_non_module_entity: diag(2649, ts.DiagnosticCategory.Error, "Cannot_augment_module_0_with_value_exports_because_it_resolves_to_a_non_module_entity_2649", "Cannot augment module '{0}' with value exports because it resolves to a non-module entity."),
         A_member_initializer_in_a_enum_declaration_cannot_reference_members_declared_after_it_including_members_defined_in_other_enums: diag(2651, ts.DiagnosticCategory.Error, "A_member_initializer_in_a_enum_declaration_cannot_reference_members_declared_after_it_including_memb_2651", "A member initializer in a enum declaration cannot reference members declared after it, including members defined in other enums."),
         Merged_declaration_0_cannot_include_a_default_export_declaration_Consider_adding_a_separate_export_default_0_declaration_instead: diag(2652, ts.DiagnosticCategory.Error, "Merged_declaration_0_cannot_include_a_default_export_declaration_Consider_adding_a_separate_export_d_2652", "Merged declaration '{0}' cannot include a default export declaration. Consider adding a separate 'export default {0}' declaration instead."),
@@ -8485,7 +8593,7 @@ var ts;
         Namespace_0_has_no_exported_member_1: diag(2694, ts.DiagnosticCategory.Error, "Namespace_0_has_no_exported_member_1_2694", "Namespace '{0}' has no exported member '{1}'."),
         Left_side_of_comma_operator_is_unused_and_has_no_side_effects: diag(2695, ts.DiagnosticCategory.Error, "Left_side_of_comma_operator_is_unused_and_has_no_side_effects_2695", "Left side of comma operator is unused and has no side effects.", /*reportsUnnecessary*/ true),
         The_Object_type_is_assignable_to_very_few_other_types_Did_you_mean_to_use_the_any_type_instead: diag(2696, ts.DiagnosticCategory.Error, "The_Object_type_is_assignable_to_very_few_other_types_Did_you_mean_to_use_the_any_type_instead_2696", "The 'Object' type is assignable to very few other types. Did you mean to use the 'any' type instead?"),
-        An_async_function_or_method_must_return_a_Promise_Make_sure_you_have_a_declaration_for_Promise_or_include_ES2015_in_your_lib_option: diag(2697, ts.DiagnosticCategory.Error, "An_async_function_or_method_must_return_a_Promise_Make_sure_you_have_a_declaration_for_Promise_or_in_2697", "An async function or method must return a 'Promise'. Make sure you have a declaration for 'Promise' or include 'ES2015' in your `--lib` option."),
+        An_async_function_or_method_must_return_a_Promise_Make_sure_you_have_a_declaration_for_Promise_or_include_ES2015_in_your_lib_option: diag(2697, ts.DiagnosticCategory.Error, "An_async_function_or_method_must_return_a_Promise_Make_sure_you_have_a_declaration_for_Promise_or_in_2697", "An async function or method must return a 'Promise'. Make sure you have a declaration for 'Promise' or include 'ES2015' in your '--lib' option."),
         Spread_types_may_only_be_created_from_object_types: diag(2698, ts.DiagnosticCategory.Error, "Spread_types_may_only_be_created_from_object_types_2698", "Spread types may only be created from object types."),
         Static_property_0_conflicts_with_built_in_property_Function_0_of_constructor_function_1: diag(2699, ts.DiagnosticCategory.Error, "Static_property_0_conflicts_with_built_in_property_Function_0_of_constructor_function_1_2699", "Static property '{0}' conflicts with built-in property 'Function.{0}' of constructor function '{1}'."),
         Rest_types_may_only_be_created_from_object_types: diag(2700, ts.DiagnosticCategory.Error, "Rest_types_may_only_be_created_from_object_types_2700", "Rest types may only be created from object types."),
@@ -8493,14 +8601,14 @@ var ts;
         _0_only_refers_to_a_type_but_is_being_used_as_a_namespace_here: diag(2702, ts.DiagnosticCategory.Error, "_0_only_refers_to_a_type_but_is_being_used_as_a_namespace_here_2702", "'{0}' only refers to a type, but is being used as a namespace here."),
         The_operand_of_a_delete_operator_must_be_a_property_reference: diag(2703, ts.DiagnosticCategory.Error, "The_operand_of_a_delete_operator_must_be_a_property_reference_2703", "The operand of a 'delete' operator must be a property reference."),
         The_operand_of_a_delete_operator_cannot_be_a_read_only_property: diag(2704, ts.DiagnosticCategory.Error, "The_operand_of_a_delete_operator_cannot_be_a_read_only_property_2704", "The operand of a 'delete' operator cannot be a read-only property."),
-        An_async_function_or_method_in_ES5_SlashES3_requires_the_Promise_constructor_Make_sure_you_have_a_declaration_for_the_Promise_constructor_or_include_ES2015_in_your_lib_option: diag(2705, ts.DiagnosticCategory.Error, "An_async_function_or_method_in_ES5_SlashES3_requires_the_Promise_constructor_Make_sure_you_have_a_de_2705", "An async function or method in ES5/ES3 requires the 'Promise' constructor.  Make sure you have a declaration for the 'Promise' constructor or include 'ES2015' in your `--lib` option."),
+        An_async_function_or_method_in_ES5_SlashES3_requires_the_Promise_constructor_Make_sure_you_have_a_declaration_for_the_Promise_constructor_or_include_ES2015_in_your_lib_option: diag(2705, ts.DiagnosticCategory.Error, "An_async_function_or_method_in_ES5_SlashES3_requires_the_Promise_constructor_Make_sure_you_have_a_de_2705", "An async function or method in ES5/ES3 requires the 'Promise' constructor.  Make sure you have a declaration for the 'Promise' constructor or include 'ES2015' in your '--lib' option."),
         Required_type_parameters_may_not_follow_optional_type_parameters: diag(2706, ts.DiagnosticCategory.Error, "Required_type_parameters_may_not_follow_optional_type_parameters_2706", "Required type parameters may not follow optional type parameters."),
         Generic_type_0_requires_between_1_and_2_type_arguments: diag(2707, ts.DiagnosticCategory.Error, "Generic_type_0_requires_between_1_and_2_type_arguments_2707", "Generic type '{0}' requires between {1} and {2} type arguments."),
         Cannot_use_namespace_0_as_a_value: diag(2708, ts.DiagnosticCategory.Error, "Cannot_use_namespace_0_as_a_value_2708", "Cannot use namespace '{0}' as a value."),
         Cannot_use_namespace_0_as_a_type: diag(2709, ts.DiagnosticCategory.Error, "Cannot_use_namespace_0_as_a_type_2709", "Cannot use namespace '{0}' as a type."),
         _0_are_specified_twice_The_attribute_named_0_will_be_overwritten: diag(2710, ts.DiagnosticCategory.Error, "_0_are_specified_twice_The_attribute_named_0_will_be_overwritten_2710", "'{0}' are specified twice. The attribute named '{0}' will be overwritten."),
-        A_dynamic_import_call_returns_a_Promise_Make_sure_you_have_a_declaration_for_Promise_or_include_ES2015_in_your_lib_option: diag(2711, ts.DiagnosticCategory.Error, "A_dynamic_import_call_returns_a_Promise_Make_sure_you_have_a_declaration_for_Promise_or_include_ES20_2711", "A dynamic import call returns a 'Promise'. Make sure you have a declaration for 'Promise' or include 'ES2015' in your `--lib` option."),
-        A_dynamic_import_call_in_ES5_SlashES3_requires_the_Promise_constructor_Make_sure_you_have_a_declaration_for_the_Promise_constructor_or_include_ES2015_in_your_lib_option: diag(2712, ts.DiagnosticCategory.Error, "A_dynamic_import_call_in_ES5_SlashES3_requires_the_Promise_constructor_Make_sure_you_have_a_declarat_2712", "A dynamic import call in ES5/ES3 requires the 'Promise' constructor.  Make sure you have a declaration for the 'Promise' constructor or include 'ES2015' in your `--lib` option."),
+        A_dynamic_import_call_returns_a_Promise_Make_sure_you_have_a_declaration_for_Promise_or_include_ES2015_in_your_lib_option: diag(2711, ts.DiagnosticCategory.Error, "A_dynamic_import_call_returns_a_Promise_Make_sure_you_have_a_declaration_for_Promise_or_include_ES20_2711", "A dynamic import call returns a 'Promise'. Make sure you have a declaration for 'Promise' or include 'ES2015' in your '--lib' option."),
+        A_dynamic_import_call_in_ES5_SlashES3_requires_the_Promise_constructor_Make_sure_you_have_a_declaration_for_the_Promise_constructor_or_include_ES2015_in_your_lib_option: diag(2712, ts.DiagnosticCategory.Error, "A_dynamic_import_call_in_ES5_SlashES3_requires_the_Promise_constructor_Make_sure_you_have_a_declarat_2712", "A dynamic import call in ES5/ES3 requires the 'Promise' constructor.  Make sure you have a declaration for the 'Promise' constructor or include 'ES2015' in your '--lib' option."),
         Cannot_access_0_1_because_0_is_a_type_but_not_a_namespace_Did_you_mean_to_retrieve_the_type_of_the_property_1_in_0_with_0_1: diag(2713, ts.DiagnosticCategory.Error, "Cannot_access_0_1_because_0_is_a_type_but_not_a_namespace_Did_you_mean_to_retrieve_the_type_of_the_p_2713", "Cannot access '{0}.{1}' because '{0}' is a type, but not a namespace. Did you mean to retrieve the type of the property '{1}' in '{0}' with '{0}[\"{1}\"]'?"),
         The_expression_of_an_export_assignment_must_be_an_identifier_or_qualified_name_in_an_ambient_context: diag(2714, ts.DiagnosticCategory.Error, "The_expression_of_an_export_assignment_must_be_an_identifier_or_qualified_name_in_an_ambient_context_2714", "The expression of an export assignment must be an identifier or qualified name in an ambient context."),
         Abstract_property_0_in_class_1_cannot_be_accessed_in_the_constructor: diag(2715, ts.DiagnosticCategory.Error, "Abstract_property_0_in_class_1_cannot_be_accessed_in_the_constructor_2715", "Abstract property '{0}' in class '{1}' cannot be accessed in the constructor."),
@@ -8562,7 +8670,7 @@ var ts;
         The_last_overload_is_declared_here: diag(2771, ts.DiagnosticCategory.Error, "The_last_overload_is_declared_here_2771", "The last overload is declared here."),
         Overload_0_of_1_2_gave_the_following_error: diag(2772, ts.DiagnosticCategory.Error, "Overload_0_of_1_2_gave_the_following_error_2772", "Overload {0} of {1}, '{2}', gave the following error."),
         Did_you_forget_to_use_await: diag(2773, ts.DiagnosticCategory.Error, "Did_you_forget_to_use_await_2773", "Did you forget to use 'await'?"),
-        This_condition_will_always_return_true_since_the_function_is_always_defined_Did_you_mean_to_call_it_instead: diag(2774, ts.DiagnosticCategory.Error, "This_condition_will_always_return_true_since_the_function_is_always_defined_Did_you_mean_to_call_it__2774", "This condition will always return true since the function is always defined. Did you mean to call it instead?"),
+        This_condition_will_always_return_true_since_this_function_is_always_defined_Did_you_mean_to_call_it_instead: diag(2774, ts.DiagnosticCategory.Error, "This_condition_will_always_return_true_since_this_function_is_always_defined_Did_you_mean_to_call_it_2774", "This condition will always return true since this function is always defined. Did you mean to call it instead?"),
         Assertions_require_every_name_in_the_call_target_to_be_declared_with_an_explicit_type_annotation: diag(2775, ts.DiagnosticCategory.Error, "Assertions_require_every_name_in_the_call_target_to_be_declared_with_an_explicit_type_annotation_2775", "Assertions require every name in the call target to be declared with an explicit type annotation."),
         Assertions_require_the_call_target_to_be_an_identifier_or_qualified_name: diag(2776, ts.DiagnosticCategory.Error, "Assertions_require_the_call_target_to_be_an_identifier_or_qualified_name_2776", "Assertions require the call target to be an identifier or qualified name."),
         The_operand_of_an_increment_or_decrement_operator_may_not_be_an_optional_property_access: diag(2777, ts.DiagnosticCategory.Error, "The_operand_of_an_increment_or_decrement_operator_may_not_be_an_optional_property_access_2777", "The operand of an increment or decrement operator may not be an optional property access."),
@@ -8589,6 +8697,18 @@ var ts;
         The_declaration_was_marked_as_deprecated_here: diag(2798, ts.DiagnosticCategory.Error, "The_declaration_was_marked_as_deprecated_here_2798", "The declaration was marked as deprecated here."),
         Type_produces_a_tuple_type_that_is_too_large_to_represent: diag(2799, ts.DiagnosticCategory.Error, "Type_produces_a_tuple_type_that_is_too_large_to_represent_2799", "Type produces a tuple type that is too large to represent."),
         Expression_produces_a_tuple_type_that_is_too_large_to_represent: diag(2800, ts.DiagnosticCategory.Error, "Expression_produces_a_tuple_type_that_is_too_large_to_represent_2800", "Expression produces a tuple type that is too large to represent."),
+        This_condition_will_always_return_true_since_this_0_is_always_defined: diag(2801, ts.DiagnosticCategory.Error, "This_condition_will_always_return_true_since_this_0_is_always_defined_2801", "This condition will always return true since this '{0}' is always defined."),
+        Type_0_can_only_be_iterated_through_when_using_the_downlevelIteration_flag_or_with_a_target_of_es2015_or_higher: diag(2802, ts.DiagnosticCategory.Error, "Type_0_can_only_be_iterated_through_when_using_the_downlevelIteration_flag_or_with_a_target_of_es201_2802", "Type '{0}' can only be iterated through when using the '--downlevelIteration' flag or with a '--target' of 'es2015' or higher."),
+        Cannot_assign_to_private_method_0_Private_methods_are_not_writable: diag(2803, ts.DiagnosticCategory.Error, "Cannot_assign_to_private_method_0_Private_methods_are_not_writable_2803", "Cannot assign to private method '{0}'. Private methods are not writable."),
+        Duplicate_identifier_0_Static_and_instance_elements_cannot_share_the_same_private_name: diag(2804, ts.DiagnosticCategory.Error, "Duplicate_identifier_0_Static_and_instance_elements_cannot_share_the_same_private_name_2804", "Duplicate identifier '{0}'. Static and instance elements cannot share the same private name."),
+        Static_fields_with_private_names_can_t_have_initializers_when_the_useDefineForClassFields_flag_is_not_specified_with_a_target_of_esnext_Consider_adding_the_useDefineForClassFields_flag: diag(2805, ts.DiagnosticCategory.Error, "Static_fields_with_private_names_can_t_have_initializers_when_the_useDefineForClassFields_flag_is_no_2805", "Static fields with private names can't have initializers when the '--useDefineForClassFields' flag is not specified with a '--target' of 'esnext'. Consider adding the '--useDefineForClassFields' flag."),
+        Private_accessor_was_defined_without_a_getter: diag(2806, ts.DiagnosticCategory.Error, "Private_accessor_was_defined_without_a_getter_2806", "Private accessor was defined without a getter."),
+        This_syntax_requires_an_imported_helper_named_1_with_2_parameters_which_is_not_compatible_with_the_one_in_0_Consider_upgrading_your_version_of_0: diag(2807, ts.DiagnosticCategory.Error, "This_syntax_requires_an_imported_helper_named_1_with_2_parameters_which_is_not_compatible_with_the_o_2807", "This syntax requires an imported helper named '{1}' with {2} parameters, which is not compatible with the one in '{0}'. Consider upgrading your version of '{0}'."),
+        A_get_accessor_must_be_at_least_as_accessible_as_the_setter: diag(2808, ts.DiagnosticCategory.Error, "A_get_accessor_must_be_at_least_as_accessible_as_the_setter_2808", "A get accessor must be at least as accessible as the setter"),
+        Declaration_or_statement_expected_This_follows_a_block_of_statements_so_if_you_intended_to_write_a_destructuring_assignment_you_might_need_to_wrap_the_the_whole_assignment_in_parentheses: diag(2809, ts.DiagnosticCategory.Error, "Declaration_or_statement_expected_This_follows_a_block_of_statements_so_if_you_intended_to_write_a_d_2809", "Declaration or statement expected. This '=' follows a block of statements, so if you intended to write a destructuring assignment, you might need to wrap the the whole assignment in parentheses."),
+        Property_0_may_not_be_used_in_a_static_property_s_initializer_in_the_same_class_when_target_is_esnext_and_useDefineForClassFields_is_false: diag(2810, ts.DiagnosticCategory.Error, "Property_0_may_not_be_used_in_a_static_property_s_initializer_in_the_same_class_when_target_is_esnex_2810", "Property '{0}' may not be used in a static property's initializer in the same class when 'target' is 'esnext' and 'useDefineForClassFields' is 'false'."),
+        Initializer_for_property_0: diag(2811, ts.DiagnosticCategory.Error, "Initializer_for_property_0_2811", "Initializer for property '{0}'"),
+        Property_0_does_not_exist_on_type_1_Try_changing_the_lib_compiler_option_to_include_dom: diag(2812, ts.DiagnosticCategory.Error, "Property_0_does_not_exist_on_type_1_Try_changing_the_lib_compiler_option_to_include_dom_2812", "Property '{0}' does not exist on type '{1}'. Try changing the 'lib' compiler option to include 'dom'."),
         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}'."),
@@ -8683,6 +8803,11 @@ var ts;
         Type_arguments_for_0_circularly_reference_themselves: diag(4109, ts.DiagnosticCategory.Error, "Type_arguments_for_0_circularly_reference_themselves_4109", "Type arguments for '{0}' circularly reference themselves."),
         Tuple_type_arguments_circularly_reference_themselves: diag(4110, ts.DiagnosticCategory.Error, "Tuple_type_arguments_circularly_reference_themselves_4110", "Tuple type arguments circularly reference themselves."),
         Property_0_comes_from_an_index_signature_so_it_must_be_accessed_with_0: diag(4111, ts.DiagnosticCategory.Error, "Property_0_comes_from_an_index_signature_so_it_must_be_accessed_with_0_4111", "Property '{0}' comes from an index signature, so it must be accessed with ['{0}']."),
+        This_member_cannot_have_an_override_modifier_because_its_containing_class_0_does_not_extend_another_class: diag(4112, ts.DiagnosticCategory.Error, "This_member_cannot_have_an_override_modifier_because_its_containing_class_0_does_not_extend_another__4112", "This member cannot have an 'override' modifier because its containing class '{0}' does not extend another class."),
+        This_member_cannot_have_an_override_modifier_because_it_is_not_declared_in_the_base_class_0: diag(4113, ts.DiagnosticCategory.Error, "This_member_cannot_have_an_override_modifier_because_it_is_not_declared_in_the_base_class_0_4113", "This member cannot have an 'override' modifier because it is not declared in the base class '{0}'."),
+        This_member_must_have_an_override_modifier_because_it_overrides_a_member_in_the_base_class_0: diag(4114, ts.DiagnosticCategory.Error, "This_member_must_have_an_override_modifier_because_it_overrides_a_member_in_the_base_class_0_4114", "This member must have an 'override' modifier because it overrides a member in the base class '{0}'."),
+        This_parameter_property_must_have_an_override_modifier_because_it_overrides_a_member_in_base_class_0: diag(4115, ts.DiagnosticCategory.Error, "This_parameter_property_must_have_an_override_modifier_because_it_overrides_a_member_in_base_class_0_4115", "This parameter property must have an 'override' modifier because it overrides a member in base class '{0}'."),
+        This_member_must_have_an_override_modifier_because_it_overrides_an_abstract_method_that_is_declared_in_the_base_class_0: diag(4116, ts.DiagnosticCategory.Error, "This_member_must_have_an_override_modifier_because_it_overrides_an_abstract_method_that_is_declared__4116", "This member must have an 'override' modifier because it overrides an abstract method that is declared in the base class '{0}'."),
         The_current_host_does_not_support_the_0_option: diag(5001, ts.DiagnosticCategory.Error, "The_current_host_does_not_support_the_0_option_5001", "The current host does not support the '{0}' option."),
         Cannot_find_the_common_subdirectory_path_for_the_input_files: diag(5009, ts.DiagnosticCategory.Error, "Cannot_find_the_common_subdirectory_path_for_the_input_files_5009", "Cannot find the common subdirectory path for the input files."),
         File_specification_cannot_end_in_a_recursive_directory_wildcard_Asterisk_Asterisk_Colon_0: diag(5010, ts.DiagnosticCategory.Error, "File_specification_cannot_end_in_a_recursive_directory_wildcard_Asterisk_Asterisk_Colon_0_5010", "File specification cannot end in a recursive directory wildcard ('**'): '{0}'."),
@@ -8717,7 +8842,7 @@ var ts;
         Option_resolveJsonModule_can_only_be_specified_when_module_code_generation_is_commonjs_amd_es2015_or_esNext: diag(5071, ts.DiagnosticCategory.Error, "Option_resolveJsonModule_can_only_be_specified_when_module_code_generation_is_commonjs_amd_es2015_or_5071", "Option '--resolveJsonModule' can only be specified when module code generation is 'commonjs', 'amd', 'es2015' or 'esNext'."),
         Unknown_build_option_0: diag(5072, ts.DiagnosticCategory.Error, "Unknown_build_option_0_5072", "Unknown build option '{0}'."),
         Build_option_0_requires_a_value_of_type_1: diag(5073, ts.DiagnosticCategory.Error, "Build_option_0_requires_a_value_of_type_1_5073", "Build option '{0}' requires a value of type {1}."),
-        Option_incremental_can_only_be_specified_using_tsconfig_emitting_to_single_file_or_when_option_tsBuildInfoFile_is_specified: diag(5074, ts.DiagnosticCategory.Error, "Option_incremental_can_only_be_specified_using_tsconfig_emitting_to_single_file_or_when_option_tsBui_5074", "Option '--incremental' can only be specified using tsconfig, emitting to single file or when option `--tsBuildInfoFile` is specified."),
+        Option_incremental_can_only_be_specified_using_tsconfig_emitting_to_single_file_or_when_option_tsBuildInfoFile_is_specified: diag(5074, ts.DiagnosticCategory.Error, "Option_incremental_can_only_be_specified_using_tsconfig_emitting_to_single_file_or_when_option_tsBui_5074", "Option '--incremental' can only be specified using tsconfig, emitting to single file or when option '--tsBuildInfoFile' is specified."),
         _0_is_assignable_to_the_constraint_of_type_1_but_1_could_be_instantiated_with_a_different_subtype_of_constraint_2: diag(5075, ts.DiagnosticCategory.Error, "_0_is_assignable_to_the_constraint_of_type_1_but_1_could_be_instantiated_with_a_different_subtype_of_5075", "'{0}' is assignable to the constraint of type '{1}', but '{1}' could be instantiated with a different subtype of constraint '{2}'."),
         _0_and_1_operations_cannot_be_mixed_without_parentheses: diag(5076, ts.DiagnosticCategory.Error, "_0_and_1_operations_cannot_be_mixed_without_parentheses_5076", "'{0}' and '{1}' operations cannot be mixed without parentheses."),
         Unknown_build_option_0_Did_you_mean_1: diag(5077, ts.DiagnosticCategory.Error, "Unknown_build_option_0_Did_you_mean_1_5077", "Unknown build option '{0}'. Did you mean '{1}'?"),
@@ -8730,11 +8855,14 @@ var ts;
         Tuple_members_must_all_have_names_or_all_not_have_names: diag(5084, ts.DiagnosticCategory.Error, "Tuple_members_must_all_have_names_or_all_not_have_names_5084", "Tuple members must all have names or all not have names."),
         A_tuple_member_cannot_be_both_optional_and_rest: diag(5085, ts.DiagnosticCategory.Error, "A_tuple_member_cannot_be_both_optional_and_rest_5085", "A tuple member cannot be both optional and rest."),
         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."),
+        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 './'?"),
         Option_preserveConstEnums_cannot_be_disabled_when_isolatedModules_is_enabled: diag(5091, ts.DiagnosticCategory.Error, "Option_preserveConstEnums_cannot_be_disabled_when_isolatedModules_is_enabled_5091", "Option 'preserveConstEnums' cannot be disabled when 'isolatedModules' is enabled."),
+        The_root_value_of_a_0_file_must_be_an_object: diag(5092, ts.DiagnosticCategory.Error, "The_root_value_of_a_0_file_must_be_an_object_5092", "The root value of a '{0}' file must be an object."),
+        Compiler_option_0_may_only_be_used_with_build: diag(5093, ts.DiagnosticCategory.Error, "Compiler_option_0_may_only_be_used_with_build_5093", "Compiler option '--{0}' may only be used with '--build'."),
+        Compiler_option_0_may_not_be_used_with_build: diag(5094, ts.DiagnosticCategory.Error, "Compiler_option_0_may_not_be_used_with_build_5094", "Compiler option '--{0}' may not be used with '--build'."),
         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."),
@@ -8750,7 +8878,7 @@ var ts;
         Skip_type_checking_of_declaration_files: diag(6012, ts.DiagnosticCategory.Message, "Skip_type_checking_of_declaration_files_6012", "Skip type checking of declaration files."),
         Do_not_resolve_the_real_path_of_symlinks: diag(6013, ts.DiagnosticCategory.Message, "Do_not_resolve_the_real_path_of_symlinks_6013", "Do not resolve the real path of symlinks."),
         Only_emit_d_ts_declaration_files: diag(6014, ts.DiagnosticCategory.Message, "Only_emit_d_ts_declaration_files_6014", "Only emit '.d.ts' declaration files."),
-        Specify_ECMAScript_target_version_Colon_ES3_default_ES5_ES2015_ES2016_ES2017_ES2018_ES2019_ES2020_or_ESNEXT: diag(6015, ts.DiagnosticCategory.Message, "Specify_ECMAScript_target_version_Colon_ES3_default_ES5_ES2015_ES2016_ES2017_ES2018_ES2019_ES2020_or_6015", "Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', or 'ESNEXT'."),
+        Specify_ECMAScript_target_version_Colon_ES3_default_ES5_ES2015_ES2016_ES2017_ES2018_ES2019_ES2020_ES2021_or_ESNEXT: diag(6015, ts.DiagnosticCategory.Message, "Specify_ECMAScript_target_version_Colon_ES3_default_ES5_ES2015_ES2016_ES2017_ES2018_ES2019_ES2020_ES_6015", "Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019', 'ES2020', 'ES2021', or 'ESNEXT'."),
         Specify_module_code_generation_Colon_none_commonjs_amd_system_umd_es2015_es2020_or_ESNext: diag(6016, ts.DiagnosticCategory.Message, "Specify_module_code_generation_Colon_none_commonjs_amd_system_umd_es2015_es2020_or_ESNext_6016", "Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', 'es2020', or 'ESNext'."),
         Print_this_message: diag(6017, ts.DiagnosticCategory.Message, "Print_this_message_6017", "Print this message."),
         Print_the_compiler_s_version: diag(6019, ts.DiagnosticCategory.Message, "Print_the_compiler_s_version_6019", "Print the compiler's version."),
@@ -8945,9 +9073,9 @@ var ts;
         Emit_class_fields_with_Define_instead_of_Set: diag(6222, ts.DiagnosticCategory.Message, "Emit_class_fields_with_Define_instead_of_Set_6222", "Emit class fields with Define instead of Set."),
         Generates_a_CPU_profile: diag(6223, ts.DiagnosticCategory.Message, "Generates_a_CPU_profile_6223", "Generates a CPU profile."),
         Disable_solution_searching_for_this_project: diag(6224, ts.DiagnosticCategory.Message, "Disable_solution_searching_for_this_project_6224", "Disable solution searching for this project."),
-        Specify_strategy_for_watching_file_Colon_FixedPollingInterval_default_PriorityPollingInterval_DynamicPriorityPolling_UseFsEvents_UseFsEventsOnParentDirectory: diag(6225, ts.DiagnosticCategory.Message, "Specify_strategy_for_watching_file_Colon_FixedPollingInterval_default_PriorityPollingInterval_Dynami_6225", "Specify strategy for watching file: 'FixedPollingInterval' (default), 'PriorityPollingInterval', 'DynamicPriorityPolling', 'UseFsEvents', 'UseFsEventsOnParentDirectory'."),
-        Specify_strategy_for_watching_directory_on_platforms_that_don_t_support_recursive_watching_natively_Colon_UseFsEvents_default_FixedPollingInterval_DynamicPriorityPolling: diag(6226, ts.DiagnosticCategory.Message, "Specify_strategy_for_watching_directory_on_platforms_that_don_t_support_recursive_watching_natively__6226", "Specify strategy for watching directory on platforms that don't support recursive watching natively: 'UseFsEvents' (default), 'FixedPollingInterval', 'DynamicPriorityPolling'."),
-        Specify_strategy_for_creating_a_polling_watch_when_it_fails_to_create_using_file_system_events_Colon_FixedInterval_default_PriorityInterval_DynamicPriority: diag(6227, ts.DiagnosticCategory.Message, "Specify_strategy_for_creating_a_polling_watch_when_it_fails_to_create_using_file_system_events_Colon_6227", "Specify strategy for creating a polling watch when it fails to create using file system events: 'FixedInterval' (default), 'PriorityInterval', 'DynamicPriority'."),
+        Specify_strategy_for_watching_file_Colon_FixedPollingInterval_default_PriorityPollingInterval_DynamicPriorityPolling_FixedChunkSizePolling_UseFsEvents_UseFsEventsOnParentDirectory: diag(6225, ts.DiagnosticCategory.Message, "Specify_strategy_for_watching_file_Colon_FixedPollingInterval_default_PriorityPollingInterval_Dynami_6225", "Specify strategy for watching file: 'FixedPollingInterval' (default), 'PriorityPollingInterval', 'DynamicPriorityPolling', 'FixedChunkSizePolling', 'UseFsEvents', 'UseFsEventsOnParentDirectory'."),
+        Specify_strategy_for_watching_directory_on_platforms_that_don_t_support_recursive_watching_natively_Colon_UseFsEvents_default_FixedPollingInterval_DynamicPriorityPolling_FixedChunkSizePolling: diag(6226, ts.DiagnosticCategory.Message, "Specify_strategy_for_watching_directory_on_platforms_that_don_t_support_recursive_watching_natively__6226", "Specify strategy for watching directory on platforms that don't support recursive watching natively: 'UseFsEvents' (default), 'FixedPollingInterval', 'DynamicPriorityPolling', 'FixedChunkSizePolling'."),
+        Specify_strategy_for_creating_a_polling_watch_when_it_fails_to_create_using_file_system_events_Colon_FixedInterval_default_PriorityInterval_DynamicPriority_FixedChunkSize: diag(6227, ts.DiagnosticCategory.Message, "Specify_strategy_for_creating_a_polling_watch_when_it_fails_to_create_using_file_system_events_Colon_6227", "Specify strategy for creating a polling watch when it fails to create using file system events: 'FixedInterval' (default), 'PriorityInterval', 'DynamicPriority', 'FixedChunkSize'."),
         Synchronously_call_callbacks_and_update_the_state_of_directory_watchers_on_platforms_that_don_t_support_recursive_watching_natively: diag(6228, ts.DiagnosticCategory.Message, "Synchronously_call_callbacks_and_update_the_state_of_directory_watchers_on_platforms_that_don_t_supp_6228", "Synchronously call callbacks and update the state of directory watchers on platforms that don't support recursive watching natively."),
         Tag_0_expects_at_least_1_arguments_but_the_JSX_factory_2_provides_at_most_3: diag(6229, ts.DiagnosticCategory.Error, "Tag_0_expects_at_least_1_arguments_but_the_JSX_factory_2_provides_at_most_3_6229", "Tag '{0}' expects at least '{1}' arguments, but the JSX factory '{2}' provides at most '{3}'."),
         Option_0_can_only_be_specified_in_tsconfig_json_file_or_set_to_false_or_null_on_command_line: diag(6230, ts.DiagnosticCategory.Error, "Option_0_can_only_be_specified_in_tsconfig_json_file_or_set_to_false_or_null_on_command_line_6230", "Option '{0}' can only be specified in 'tsconfig.json' file or set to 'false' or 'null' on command line."),
@@ -8958,7 +9086,11 @@ var ts;
         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"),
+        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"),
+        File_0_exists_according_to_earlier_cached_lookups: diag(6239, ts.DiagnosticCategory.Message, "File_0_exists_according_to_earlier_cached_lookups_6239", "File '{0}' exists according to earlier cached lookups."),
+        File_0_does_not_exist_according_to_earlier_cached_lookups: diag(6240, ts.DiagnosticCategory.Message, "File_0_does_not_exist_according_to_earlier_cached_lookups_6240", "File '{0}' does not exist according to earlier cached lookups."),
+        Resolution_for_type_reference_directive_0_was_found_in_cache_from_location_1: diag(6241, ts.DiagnosticCategory.Message, "Resolution_for_type_reference_directive_0_was_found_in_cache_from_location_1_6241", "Resolution for type reference directive '{0}' was found in cache from location '{1}'."),
+        Resolving_type_reference_directive_0_containing_file_1: diag(6242, ts.DiagnosticCategory.Message, "Resolving_type_reference_directive_0_containing_file_1_6242", "======== Resolving type reference directive '{0}', containing file '{1}'. ========"),
         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."),
@@ -9006,14 +9138,16 @@ var ts;
         _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_signature_0_of_1_is_deprecated: diag(6387, ts.DiagnosticCategory.Suggestion, "The_signature_0_of_1_is_deprecated_6387", "The signature '{0}' of '{1}' is deprecated.", /*reportsUnnecessary*/ undefined, /*elidedInCompatabilityPyramid*/ undefined, /*reportsDeprecated*/ true),
+        Project_0_is_being_forcibly_rebuilt: diag(6388, ts.DiagnosticCategory.Message, "Project_0_is_being_forcibly_rebuilt_6388", "Project '{0}' is being forcibly rebuilt"),
         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?"),
         Print_names_of_files_and_the_reason_they_are_part_of_the_compilation: diag(6505, ts.DiagnosticCategory.Message, "Print_names_of_files_and_the_reason_they_are_part_of_the_compilation_6505", "Print names of files and the reason they are part of the compilation."),
-        Require_undeclared_properties_from_index_signatures_to_use_element_accesses: diag(6803, ts.DiagnosticCategory.Error, "Require_undeclared_properties_from_index_signatures_to_use_element_accesses_6803", "Require undeclared properties from index signatures to use element accesses."),
         Include_undefined_in_index_signature_results: diag(6800, ts.DiagnosticCategory.Message, "Include_undefined_in_index_signature_results_6800", "Include 'undefined' in index signature results"),
+        Ensure_overriding_members_in_derived_classes_are_marked_with_an_override_modifier: diag(6801, ts.DiagnosticCategory.Message, "Ensure_overriding_members_in_derived_classes_are_marked_with_an_override_modifier_6801", "Ensure overriding members in derived classes are marked with an 'override' modifier."),
+        Require_undeclared_properties_from_index_signatures_to_use_element_accesses: diag(6802, ts.DiagnosticCategory.Message, "Require_undeclared_properties_from_index_signatures_to_use_element_accesses_6802", "Require undeclared properties from index signatures to use element accesses."),
         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."),
@@ -9046,7 +9180,7 @@ var ts;
         Enables_emit_interoperability_between_CommonJS_and_ES_Modules_via_creation_of_namespace_objects_for_all_imports_Implies_allowSyntheticDefaultImports: diag(7037, ts.DiagnosticCategory.Message, "Enables_emit_interoperability_between_CommonJS_and_ES_Modules_via_creation_of_namespace_objects_for__7037", "Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'."),
         Type_originates_at_this_import_A_namespace_style_import_cannot_be_called_or_constructed_and_will_cause_a_failure_at_runtime_Consider_using_a_default_import_or_import_require_here_instead: diag(7038, ts.DiagnosticCategory.Message, "Type_originates_at_this_import_A_namespace_style_import_cannot_be_called_or_constructed_and_will_cau_7038", "Type originates at this import. A namespace-style import cannot be called or constructed, and will cause a failure at runtime. Consider using a default import or import require here instead."),
         Mapped_object_type_implicitly_has_an_any_template_type: diag(7039, ts.DiagnosticCategory.Error, "Mapped_object_type_implicitly_has_an_any_template_type_7039", "Mapped object type implicitly has an 'any' template type."),
-        If_the_0_package_actually_exposes_this_module_consider_sending_a_pull_request_to_amend_https_Colon_Slash_Slashgithub_com_SlashDefinitelyTyped_SlashDefinitelyTyped_Slashtree_Slashmaster_Slashtypes_Slash_1: diag(7040, ts.DiagnosticCategory.Error, "If_the_0_package_actually_exposes_this_module_consider_sending_a_pull_request_to_amend_https_Colon_S_7040", "If the '{0}' package actually exposes this module, consider sending a pull request to amend 'https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/{1}`"),
+        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: diag(7040, ts.DiagnosticCategory.Error, "If_the_0_package_actually_exposes_this_module_consider_sending_a_pull_request_to_amend_https_Colon_S_7040", "If the '{0}' package actually exposes this module, consider sending a pull request to amend 'https://github.com/DefinitelyTyped/DefinitelyTyped/tree/master/types/{1}'"),
         The_containing_arrow_function_captures_the_global_value_of_this: diag(7041, ts.DiagnosticCategory.Error, "The_containing_arrow_function_captures_the_global_value_of_this_7041", "The containing arrow function captures the global value of 'this'."),
         Module_0_was_resolved_to_1_but_resolveJsonModule_is_not_used: diag(7042, ts.DiagnosticCategory.Error, "Module_0_was_resolved_to_1_but_resolveJsonModule_is_not_used_7042", "Module '{0}' was resolved to '{1}', but '--resolveJsonModule' is not used."),
         Variable_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage: diag(7043, ts.DiagnosticCategory.Suggestion, "Variable_0_implicitly_has_an_1_type_but_a_better_type_may_be_inferred_from_usage_7043", "Variable '{0}' implicitly has an '{1}' type, but a better type may be inferred from usage."),
@@ -9086,7 +9220,7 @@ var ts;
         JSDoc_0_is_not_attached_to_a_class: diag(8022, ts.DiagnosticCategory.Error, "JSDoc_0_is_not_attached_to_a_class_8022", "JSDoc '@{0}' is not attached to a class."),
         JSDoc_0_1_does_not_match_the_extends_2_clause: diag(8023, ts.DiagnosticCategory.Error, "JSDoc_0_1_does_not_match_the_extends_2_clause_8023", "JSDoc '@{0} {1}' does not match the 'extends {2}' clause."),
         JSDoc_param_tag_has_name_0_but_there_is_no_parameter_with_that_name: diag(8024, ts.DiagnosticCategory.Error, "JSDoc_param_tag_has_name_0_but_there_is_no_parameter_with_that_name_8024", "JSDoc '@param' tag has name '{0}', but there is no parameter with that name."),
-        Class_declarations_cannot_have_more_than_one_augments_or_extends_tag: diag(8025, ts.DiagnosticCategory.Error, "Class_declarations_cannot_have_more_than_one_augments_or_extends_tag_8025", "Class declarations cannot have more than one `@augments` or `@extends` tag."),
+        Class_declarations_cannot_have_more_than_one_augments_or_extends_tag: diag(8025, ts.DiagnosticCategory.Error, "Class_declarations_cannot_have_more_than_one_augments_or_extends_tag_8025", "Class declarations cannot have more than one '@augments' or '@extends' tag."),
         Expected_0_type_arguments_provide_these_with_an_extends_tag: diag(8026, ts.DiagnosticCategory.Error, "Expected_0_type_arguments_provide_these_with_an_extends_tag_8026", "Expected {0} type arguments; provide these with an '@extends' tag."),
         Expected_0_1_type_arguments_provide_these_with_an_extends_tag: diag(8027, ts.DiagnosticCategory.Error, "Expected_0_1_type_arguments_provide_these_with_an_extends_tag_8027", "Expected {0}-{1} type arguments; provide these with an '@extends' tag."),
         JSDoc_may_only_appear_in_the_last_parameter_of_a_signature: diag(8028, ts.DiagnosticCategory.Error, "JSDoc_may_only_appear_in_the_last_parameter_of_a_signature_8028", "JSDoc '...' may only appear in the last parameter of a signature."),
@@ -9331,6 +9465,10 @@ var ts;
         Add_all_missing_function_declarations: diag(95157, ts.DiagnosticCategory.Message, "Add_all_missing_function_declarations_95157", "Add all missing function declarations"),
         Method_not_implemented: diag(95158, ts.DiagnosticCategory.Message, "Method_not_implemented_95158", "Method not implemented."),
         Function_not_implemented: diag(95159, ts.DiagnosticCategory.Message, "Function_not_implemented_95159", "Function not implemented."),
+        Add_override_modifier: diag(95160, ts.DiagnosticCategory.Message, "Add_override_modifier_95160", "Add 'override' modifier"),
+        Remove_override_modifier: diag(95161, ts.DiagnosticCategory.Message, "Remove_override_modifier_95161", "Remove 'override' modifier"),
+        Add_all_missing_override_modifiers: diag(95162, ts.DiagnosticCategory.Message, "Add_all_missing_override_modifiers_95162", "Add all missing 'override' modifiers"),
+        Remove_all_unnecessary_override_modifiers: diag(95163, ts.DiagnosticCategory.Message, "Remove_all_unnecessary_override_modifiers_95163", "Remove all unnecessary 'override' modifiers"),
         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?"),
@@ -9345,8 +9483,6 @@ var ts;
         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."),
-        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."),
         can_only_be_used_at_the_start_of_a_file: diag(18026, ts.DiagnosticCategory.Error, "can_only_be_used_at_the_start_of_a_file_18026", "'#!' can only be used at the start of a file."),
         Compiler_reserves_name_0_when_emitting_private_identifier_downlevel: diag(18027, ts.DiagnosticCategory.Error, "Compiler_reserves_name_0_when_emitting_private_identifier_downlevel_18027", "Compiler reserves name '{0}' when emitting private identifier downlevel."),
@@ -9358,6 +9494,7 @@ var ts;
         Only_numeric_enums_can_have_computed_members_but_this_expression_has_type_0_If_you_do_not_need_exhaustiveness_checks_consider_using_an_object_literal_instead: diag(18033, ts.DiagnosticCategory.Error, "Only_numeric_enums_can_have_computed_members_but_this_expression_has_type_0_If_you_do_not_need_exhau_18033", "Only numeric enums can have computed members, but this expression has type '{0}'. If you do not need exhaustiveness checks, consider using an object literal instead."),
         Specify_the_JSX_fragment_factory_function_to_use_when_targeting_react_JSX_emit_with_jsxFactory_compiler_option_is_specified_e_g_Fragment: diag(18034, ts.DiagnosticCategory.Message, "Specify_the_JSX_fragment_factory_function_to_use_when_targeting_react_JSX_emit_with_jsxFactory_compi_18034", "Specify the JSX fragment factory function to use when targeting 'react' JSX emit with 'jsxFactory' compiler option is specified, e.g. 'Fragment'."),
         Invalid_value_for_jsxFragmentFactory_0_is_not_a_valid_identifier_or_qualified_name: diag(18035, ts.DiagnosticCategory.Error, "Invalid_value_for_jsxFragmentFactory_0_is_not_a_valid_identifier_or_qualified_name_18035", "Invalid value for 'jsxFragmentFactory'. '{0}' is not a valid identifier or qualified-name."),
+        Class_decorators_can_t_be_used_with_static_private_identifier_Consider_removing_the_experimental_decorator: diag(18036, ts.DiagnosticCategory.Error, "Class_decorators_can_t_be_used_with_static_private_identifier_Consider_removing_the_experimental_dec_18036", "Class decorators can't be used with static private identifier. Consider removing the experimental decorator."),
     };
 })(ts || (ts = {}));
 var ts;
@@ -9425,6 +9562,7 @@ var ts;
         _a.private = 120 /* PrivateKeyword */,
         _a.protected = 121 /* ProtectedKeyword */,
         _a.public = 122 /* PublicKeyword */,
+        _a.override = 156 /* OverrideKeyword */,
         _a.readonly = 142 /* ReadonlyKeyword */,
         _a.require = 143 /* RequireKeyword */,
         _a.global = 154 /* GlobalKeyword */,
@@ -9451,7 +9589,7 @@ var ts;
         _a.yield = 124 /* YieldKeyword */,
         _a.async = 129 /* AsyncKeyword */,
         _a.await = 130 /* AwaitKeyword */,
-        _a.of = 156 /* OfKeyword */,
+        _a.of = 157 /* 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 */ })));
@@ -9767,11 +9905,11 @@ var ts;
     }
     ts.couldStartTrivia = couldStartTrivia;
     /* @internal */
-    function skipTrivia(text, pos, stopAfterLineBreak, stopAtComments) {
-        if (stopAtComments === void 0) { stopAtComments = false; }
+    function skipTrivia(text, pos, stopAfterLineBreak, stopAtComments, inJSDoc) {
         if (ts.positionIsSynthesized(pos)) {
             return pos;
         }
+        var canConsumeStar = false;
         // Keep in sync with couldStartTrivia
         while (true) {
             var ch = text.charCodeAt(pos);
@@ -9786,6 +9924,7 @@ var ts;
                     if (stopAfterLineBreak) {
                         return pos;
                     }
+                    canConsumeStar = !!inJSDoc;
                     continue;
                 case 9 /* tab */:
                 case 11 /* verticalTab */:
@@ -9805,6 +9944,7 @@ var ts;
                             }
                             pos++;
                         }
+                        canConsumeStar = false;
                         continue;
                     }
                     if (text.charCodeAt(pos + 1) === 42 /* asterisk */) {
@@ -9816,6 +9956,7 @@ var ts;
                             }
                             pos++;
                         }
+                        canConsumeStar = false;
                         continue;
                     }
                     break;
@@ -9825,12 +9966,21 @@ var ts;
                 case 62 /* greaterThan */:
                     if (isConflictMarkerTrivia(text, pos)) {
                         pos = scanConflictMarkerTrivia(text, pos);
+                        canConsumeStar = false;
                         continue;
                     }
                     break;
                 case 35 /* hash */:
                     if (pos === 0 && isShebangTrivia(text, pos)) {
                         pos = scanShebangTrivia(text, pos);
+                        canConsumeStar = false;
+                        continue;
+                    }
+                    break;
+                case 42 /* asterisk */:
+                    if (canConsumeStar) {
+                        pos++;
+                        canConsumeStar = false;
                         continue;
                     }
                     break;
@@ -11294,9 +11444,10 @@ var ts;
             pos = tokenPos;
             return token = scanTemplateAndSetTokenValue(/* isTaggedTemplate */ true);
         }
-        function reScanJsxToken() {
+        function reScanJsxToken(allowMultilineJsxText) {
+            if (allowMultilineJsxText === void 0) { allowMultilineJsxText = true; }
             pos = tokenPos = startPos;
-            return token = scanJsxToken();
+            return token = scanJsxToken(allowMultilineJsxText);
         }
         function reScanLessThanToken() {
             if (token === 47 /* LessThanLessThanToken */) {
@@ -11310,7 +11461,8 @@ var ts;
             pos = tokenPos + 1;
             return token = 57 /* QuestionToken */;
         }
-        function scanJsxToken() {
+        function scanJsxToken(allowMultilineJsxText) {
+            if (allowMultilineJsxText === void 0) { allowMultilineJsxText = true; }
             startPos = tokenPos = pos;
             if (pos >= end) {
                 return token = 1 /* EndOfFileToken */;
@@ -11330,15 +11482,9 @@ var ts;
             }
             // First non-whitespace character on this line.
             var firstNonWhitespace = 0;
-            var lastNonWhitespace = -1;
             // These initial values are special because the first line is:
             // firstNonWhitespace = 0 to indicate that we want leading whitespace,
             while (pos < end) {
-                // We want to keep track of the last non-whitespace (but including
-                // newlines character for hitting the end of the JSX Text region)
-                if (!isWhiteSpaceSingleLine(char)) {
-                    lastNonWhitespace = pos;
-                }
                 char = text.charCodeAt(pos);
                 if (char === 123 /* openBrace */) {
                     break;
@@ -11356,8 +11502,6 @@ var ts;
                 if (char === 125 /* closeBrace */) {
                     error(ts.Diagnostics.Unexpected_token_Did_you_mean_or_rbrace, pos, 1);
                 }
-                if (lastNonWhitespace > 0)
-                    lastNonWhitespace++;
                 // FirstNonWhitespace is 0, then we only see whitespaces so far. If we see a linebreak, we want to ignore that whitespaces.
                 // i.e (- : whitespace)
                 //      <div>----
@@ -11367,13 +11511,17 @@ var ts;
                 if (isLineBreak(char) && firstNonWhitespace === 0) {
                     firstNonWhitespace = -1;
                 }
+                else if (!allowMultilineJsxText && isLineBreak(char) && firstNonWhitespace > 0) {
+                    // Stop JsxText on each line during formatting. This allows the formatter to
+                    // indent each line correctly.
+                    break;
+                }
                 else if (!isWhiteSpaceLike(char)) {
                     firstNonWhitespace = pos;
                 }
                 pos++;
             }
-            var endPosition = lastNonWhitespace === -1 ? pos : lastNonWhitespace;
-            tokenValue = text.substring(startPos, endPosition);
+            tokenValue = text.substring(startPos, pos);
             return firstNonWhitespace === -1 ? 12 /* JsxTextAllWhiteSpaces */ : 11 /* JsxText */;
         }
         // Scans a JSX identifier; these differ from normal identifiers in that
@@ -11396,6 +11544,7 @@ var ts;
                         tokenValue += ":";
                         pos++;
                         namespaceSeparator = true;
+                        token = 78 /* Identifier */; // swap from keyword kind to identifier kind
                         continue;
                     }
                     var oldPos = pos;
@@ -11652,6 +11801,8 @@ var ts;
         switch (options.target) {
             case 99 /* ESNext */:
                 return "lib.esnext.full.d.ts";
+            case 8 /* ES2021 */:
+                return "lib.es2021.full.d.ts";
             case 7 /* ES2020 */:
                 return "lib.es2020.full.d.ts";
             case 6 /* ES2019 */:
@@ -11870,9 +12021,9 @@ var ts;
     }
     ts.collapseTextChangeRangesAcrossMultipleVersions = collapseTextChangeRangesAcrossMultipleVersions;
     function getTypeParameterOwner(d) {
-        if (d && d.kind === 159 /* TypeParameter */) {
+        if (d && d.kind === 160 /* TypeParameter */) {
             for (var current = d; current; current = current.parent) {
-                if (isFunctionLike(current) || isClassLike(current) || current.kind === 253 /* InterfaceDeclaration */) {
+                if (isFunctionLike(current) || isClassLike(current) || current.kind === 254 /* InterfaceDeclaration */) {
                     return current;
                 }
             }
@@ -11880,7 +12031,7 @@ var ts;
     }
     ts.getTypeParameterOwner = getTypeParameterOwner;
     function isParameterPropertyDeclaration(node, parent) {
-        return ts.hasSyntacticModifier(node, 92 /* ParameterPropertyModifier */) && parent.kind === 166 /* Constructor */;
+        return ts.hasSyntacticModifier(node, 16476 /* ParameterPropertyModifier */) && parent.kind === 167 /* Constructor */;
     }
     ts.isParameterPropertyDeclaration = isParameterPropertyDeclaration;
     function isEmptyBindingPattern(node) {
@@ -11910,14 +12061,14 @@ var ts;
             node = walkUpBindingElementsAndPatterns(node);
         }
         var flags = getFlags(node);
-        if (node.kind === 249 /* VariableDeclaration */) {
+        if (node.kind === 250 /* VariableDeclaration */) {
             node = node.parent;
         }
-        if (node && node.kind === 250 /* VariableDeclarationList */) {
+        if (node && node.kind === 251 /* VariableDeclarationList */) {
             flags |= getFlags(node);
             node = node.parent;
         }
-        if (node && node.kind === 232 /* VariableStatement */) {
+        if (node && node.kind === 233 /* VariableStatement */) {
             flags |= getFlags(node);
         }
         return flags;
@@ -12068,7 +12219,7 @@ var ts;
     }
     ts.idText = idText;
     function symbolName(symbol) {
-        if (symbol.valueDeclaration && isPrivateIdentifierPropertyDeclaration(symbol.valueDeclaration)) {
+        if (symbol.valueDeclaration && isPrivateIdentifierClassElementDeclaration(symbol.valueDeclaration)) {
             return idText(symbol.valueDeclaration.name);
         }
         return unescapeLeadingUnderscores(symbol.escapedName);
@@ -12090,30 +12241,30 @@ var ts;
         }
         // Covers remaining cases (returning undefined if none match).
         switch (hostNode.kind) {
-            case 232 /* VariableStatement */:
+            case 233 /* VariableStatement */:
                 if (hostNode.declarationList && hostNode.declarationList.declarations[0]) {
                     return getDeclarationIdentifier(hostNode.declarationList.declarations[0]);
                 }
                 break;
-            case 233 /* ExpressionStatement */:
+            case 234 /* ExpressionStatement */:
                 var expr = hostNode.expression;
-                if (expr.kind === 216 /* BinaryExpression */ && expr.operatorToken.kind === 62 /* EqualsToken */) {
+                if (expr.kind === 217 /* BinaryExpression */ && expr.operatorToken.kind === 62 /* EqualsToken */) {
                     expr = expr.left;
                 }
                 switch (expr.kind) {
-                    case 201 /* PropertyAccessExpression */:
+                    case 202 /* PropertyAccessExpression */:
                         return expr.name;
-                    case 202 /* ElementAccessExpression */:
+                    case 203 /* ElementAccessExpression */:
                         var arg = expr.argumentExpression;
                         if (ts.isIdentifier(arg)) {
                             return arg;
                         }
                 }
                 break;
-            case 207 /* ParenthesizedExpression */: {
+            case 208 /* ParenthesizedExpression */: {
                 return getDeclarationIdentifier(hostNode.expression);
             }
-            case 245 /* LabeledStatement */: {
+            case 246 /* LabeledStatement */: {
                 if (isDeclaration(hostNode.statement) || isExpression(hostNode.statement)) {
                     return getDeclarationIdentifier(hostNode.statement);
                 }
@@ -12150,16 +12301,16 @@ var ts;
         switch (declaration.kind) {
             case 78 /* Identifier */:
                 return declaration;
-            case 333 /* JSDocPropertyTag */:
-            case 326 /* JSDocParameterTag */: {
+            case 337 /* JSDocPropertyTag */:
+            case 330 /* JSDocParameterTag */: {
                 var name = declaration.name;
-                if (name.kind === 157 /* QualifiedName */) {
+                if (name.kind === 158 /* QualifiedName */) {
                     return name.right;
                 }
                 break;
             }
-            case 203 /* CallExpression */:
-            case 216 /* BinaryExpression */: {
+            case 204 /* CallExpression */:
+            case 217 /* BinaryExpression */: {
                 var expr_1 = declaration;
                 switch (ts.getAssignmentDeclarationKind(expr_1)) {
                     case 1 /* ExportsProperty */:
@@ -12175,15 +12326,15 @@ var ts;
                         return undefined;
                 }
             }
-            case 331 /* JSDocTypedefTag */:
+            case 335 /* JSDocTypedefTag */:
                 return getNameOfJSDocTypedef(declaration);
-            case 325 /* JSDocEnumTag */:
+            case 329 /* JSDocEnumTag */:
                 return nameForNamelessJSDocTypedef(declaration);
-            case 266 /* ExportAssignment */: {
+            case 267 /* ExportAssignment */: {
                 var expression = declaration.expression;
                 return ts.isIdentifier(expression) ? expression : undefined;
             }
-            case 202 /* ElementAccessExpression */:
+            case 203 /* ElementAccessExpression */:
                 var expr = declaration;
                 if (ts.isBindableStaticElementAccessExpression(expr)) {
                     return expr.argumentExpression;
@@ -12196,7 +12347,7 @@ var ts;
         if (declaration === undefined)
             return undefined;
         return getNonAssignedNameOfDeclaration(declaration) ||
-            (ts.isFunctionExpression(declaration) || ts.isClassExpression(declaration) ? getAssignedName(declaration) : undefined);
+            (ts.isFunctionExpression(declaration) || ts.isArrowFunction(declaration) || ts.isClassExpression(declaration) ? getAssignedName(declaration) : undefined);
     }
     ts.getNameOfDeclaration = getNameOfDeclaration;
     /*@internal*/
@@ -12349,6 +12500,10 @@ var ts;
         return getFirstJSDocTag(node, ts.isJSDocReadonlyTag, /*noCache*/ true);
     }
     ts.getJSDocReadonlyTagNoCache = getJSDocReadonlyTagNoCache;
+    function getJSDocOverrideTagNoCache(node) {
+        return getFirstJSDocTag(node, ts.isJSDocOverrideTag, /*noCache*/ true);
+    }
+    ts.getJSDocOverrideTagNoCache = getJSDocOverrideTagNoCache;
     /** Gets the JSDoc deprecated tag for the node if present */
     function getJSDocDeprecatedTag(node) {
         return getFirstJSDocTag(node, ts.isJSDocDeprecatedTag);
@@ -12469,6 +12624,14 @@ var ts;
         return getJSDocTags(node).filter(function (doc) { return doc.kind === kind; });
     }
     ts.getAllJSDocTagsOfKind = getAllJSDocTagsOfKind;
+    /** Gets the text of a jsdoc comment, flattening links to their text. */
+    function getTextOfJSDocComment(comment) {
+        return typeof comment === "string" ? comment
+            : comment === null || comment === void 0 ? void 0 : comment.map(function (c) {
+                return c.kind === 313 /* JSDocText */ ? c.text : "{@link " + (c.name ? ts.entityNameToString(c.name) + " " : "") + c.text + "}";
+            }).join("");
+    }
+    ts.getTextOfJSDocComment = getTextOfJSDocComment;
     /**
      * Gets the effective type parameters. If the node was parsed in a
      * JavaScript file, gets the type parameters from the `@template` tag from JSDoc.
@@ -12478,7 +12641,7 @@ var ts;
             return ts.emptyArray;
         }
         if (ts.isJSDocTypeAlias(node)) {
-            ts.Debug.assert(node.parent.kind === 311 /* JSDocComment */);
+            ts.Debug.assert(node.parent.kind === 312 /* JSDocComment */);
             return ts.flatMap(node.parent.tags, function (tag) { return ts.isJSDocTemplateTag(tag) ? tag.typeParameters : undefined; });
         }
         if (node.typeParameters) {
@@ -12504,13 +12667,13 @@ var ts;
     }
     ts.getEffectiveConstraintOfTypeParameter = getEffectiveConstraintOfTypeParameter;
     // #region
-    function isIdentifierOrPrivateIdentifier(node) {
+    function isMemberName(node) {
         return node.kind === 78 /* Identifier */ || node.kind === 79 /* PrivateIdentifier */;
     }
-    ts.isIdentifierOrPrivateIdentifier = isIdentifierOrPrivateIdentifier;
+    ts.isMemberName = isMemberName;
     /* @internal */
     function isGetOrSetAccessorDeclaration(node) {
-        return node.kind === 168 /* SetAccessor */ || node.kind === 167 /* GetAccessor */;
+        return node.kind === 169 /* SetAccessor */ || node.kind === 168 /* GetAccessor */;
     }
     ts.isGetOrSetAccessorDeclaration = isGetOrSetAccessorDeclaration;
     function isPropertyAccessChain(node) {
@@ -12528,10 +12691,10 @@ var ts;
     function isOptionalChain(node) {
         var kind = node.kind;
         return !!(node.flags & 32 /* OptionalChain */) &&
-            (kind === 201 /* PropertyAccessExpression */
-                || kind === 202 /* ElementAccessExpression */
-                || kind === 203 /* CallExpression */
-                || kind === 225 /* NonNullExpression */);
+            (kind === 202 /* PropertyAccessExpression */
+                || kind === 203 /* ElementAccessExpression */
+                || kind === 204 /* CallExpression */
+                || kind === 226 /* NonNullExpression */);
     }
     ts.isOptionalChain = isOptionalChain;
     /* @internal */
@@ -12566,7 +12729,7 @@ var ts;
     }
     ts.isOutermostOptionalChain = isOutermostOptionalChain;
     function isNullishCoalesce(node) {
-        return node.kind === 216 /* BinaryExpression */ && node.operatorToken.kind === 60 /* QuestionQuestionToken */;
+        return node.kind === 217 /* BinaryExpression */ && node.operatorToken.kind === 60 /* QuestionQuestionToken */;
     }
     ts.isNullishCoalesce = isNullishCoalesce;
     function isConstTypeReference(node) {
@@ -12583,17 +12746,17 @@ var ts;
     }
     ts.isNonNullChain = isNonNullChain;
     function isBreakOrContinueStatement(node) {
-        return node.kind === 241 /* BreakStatement */ || node.kind === 240 /* ContinueStatement */;
+        return node.kind === 242 /* BreakStatement */ || node.kind === 241 /* ContinueStatement */;
     }
     ts.isBreakOrContinueStatement = isBreakOrContinueStatement;
     function isNamedExportBindings(node) {
-        return node.kind === 269 /* NamespaceExport */ || node.kind === 268 /* NamedExports */;
+        return node.kind === 270 /* NamespaceExport */ || node.kind === 269 /* NamedExports */;
     }
     ts.isNamedExportBindings = isNamedExportBindings;
     function isUnparsedTextLike(node) {
         switch (node.kind) {
-            case 294 /* UnparsedText */:
-            case 295 /* UnparsedInternalText */:
+            case 295 /* UnparsedText */:
+            case 296 /* UnparsedInternalText */:
                 return true;
             default:
                 return false;
@@ -12602,12 +12765,12 @@ var ts;
     ts.isUnparsedTextLike = isUnparsedTextLike;
     function isUnparsedNode(node) {
         return isUnparsedTextLike(node) ||
-            node.kind === 292 /* UnparsedPrologue */ ||
-            node.kind === 296 /* UnparsedSyntheticReference */;
+            node.kind === 293 /* UnparsedPrologue */ ||
+            node.kind === 297 /* UnparsedSyntheticReference */;
     }
     ts.isUnparsedNode = isUnparsedNode;
     function isJSDocPropertyLikeTag(node) {
-        return node.kind === 333 /* JSDocPropertyTag */ || node.kind === 326 /* JSDocParameterTag */;
+        return node.kind === 337 /* JSDocPropertyTag */ || node.kind === 330 /* JSDocParameterTag */;
     }
     ts.isJSDocPropertyLikeTag = isJSDocPropertyLikeTag;
     // #endregion
@@ -12623,16 +12786,25 @@ var ts;
     ts.isNode = isNode;
     /* @internal */
     function isNodeKind(kind) {
-        return kind >= 157 /* FirstNode */;
+        return kind >= 158 /* FirstNode */;
     }
     ts.isNodeKind = isNodeKind;
+    /**
+     * True if kind is of some token syntax kind.
+     * For example, this is true for an IfKeyword but not for an IfStatement.
+     * Literals are considered tokens, except TemplateLiteral, but does include TemplateHead/Middle/Tail.
+     */
+    function isTokenKind(kind) {
+        return kind >= 0 /* FirstToken */ && kind <= 157 /* LastToken */;
+    }
+    ts.isTokenKind = isTokenKind;
     /**
      * True if node is of some token syntax kind.
      * For example, this is true for an IfKeyword but not for an IfStatement.
      * Literals are considered tokens, except TemplateLiteral, but does include TemplateHead/Middle/Tail.
      */
     function isToken(n) {
-        return n.kind >= 0 /* FirstToken */ && n.kind <= 156 /* LastToken */;
+        return isTokenKind(n.kind);
     }
     ts.isToken = isToken;
     // Node Arrays
@@ -12673,13 +12845,13 @@ var ts;
     ts.isImportOrExportSpecifier = isImportOrExportSpecifier;
     function isTypeOnlyImportOrExportDeclaration(node) {
         switch (node.kind) {
-            case 265 /* ImportSpecifier */:
-            case 270 /* ExportSpecifier */:
+            case 266 /* ImportSpecifier */:
+            case 271 /* ExportSpecifier */:
                 return node.parent.parent.isTypeOnly;
-            case 263 /* NamespaceImport */:
+            case 264 /* NamespaceImport */:
                 return node.parent.isTypeOnly;
-            case 262 /* ImportClause */:
-            case 260 /* ImportEqualsDeclaration */:
+            case 263 /* ImportClause */:
+            case 261 /* ImportEqualsDeclaration */:
                 return node.isTypeOnly;
             default:
                 return false;
@@ -12698,10 +12870,10 @@ var ts;
     ts.isGeneratedIdentifier = isGeneratedIdentifier;
     // Private Identifiers
     /*@internal*/
-    function isPrivateIdentifierPropertyDeclaration(node) {
-        return ts.isPropertyDeclaration(node) && ts.isPrivateIdentifier(node.name);
+    function isPrivateIdentifierClassElementDeclaration(node) {
+        return (ts.isPropertyDeclaration(node) || isMethodOrAccessor(node)) && ts.isPrivateIdentifier(node.name);
     }
-    ts.isPrivateIdentifierPropertyDeclaration = isPrivateIdentifierPropertyDeclaration;
+    ts.isPrivateIdentifierClassElementDeclaration = isPrivateIdentifierClassElementDeclaration;
     /*@internal*/
     function isPrivateIdentifierPropertyAccessExpression(node) {
         return ts.isPropertyAccessExpression(node) && ts.isPrivateIdentifier(node.name);
@@ -12722,6 +12894,7 @@ var ts;
             case 121 /* ProtectedKeyword */:
             case 142 /* ReadonlyKeyword */:
             case 123 /* StaticKeyword */:
+            case 156 /* OverrideKeyword */:
                 return true;
         }
         return false;
@@ -12729,12 +12902,12 @@ var ts;
     ts.isModifierKind = isModifierKind;
     /* @internal */
     function isParameterPropertyModifier(kind) {
-        return !!(ts.modifierToFlag(kind) & 92 /* ParameterPropertyModifier */);
+        return !!(ts.modifierToFlag(kind) & 16476 /* ParameterPropertyModifier */);
     }
     ts.isParameterPropertyModifier = isParameterPropertyModifier;
     /* @internal */
     function isClassMemberModifier(idToken) {
-        return isParameterPropertyModifier(idToken) || idToken === 123 /* StaticKeyword */;
+        return isParameterPropertyModifier(idToken) || idToken === 123 /* StaticKeyword */ || idToken === 156 /* OverrideKeyword */;
     }
     ts.isClassMemberModifier = isClassMemberModifier;
     function isModifier(node) {
@@ -12743,7 +12916,7 @@ var ts;
     ts.isModifier = isModifier;
     function isEntityName(node) {
         var kind = node.kind;
-        return kind === 157 /* QualifiedName */
+        return kind === 158 /* QualifiedName */
             || kind === 78 /* Identifier */;
     }
     ts.isEntityName = isEntityName;
@@ -12753,19 +12926,19 @@ var ts;
             || kind === 79 /* PrivateIdentifier */
             || kind === 10 /* StringLiteral */
             || kind === 8 /* NumericLiteral */
-            || kind === 158 /* ComputedPropertyName */;
+            || kind === 159 /* ComputedPropertyName */;
     }
     ts.isPropertyName = isPropertyName;
     function isBindingName(node) {
         var kind = node.kind;
         return kind === 78 /* Identifier */
-            || kind === 196 /* ObjectBindingPattern */
-            || kind === 197 /* ArrayBindingPattern */;
+            || kind === 197 /* ObjectBindingPattern */
+            || kind === 198 /* ArrayBindingPattern */;
     }
     ts.isBindingName = isBindingName;
     // Functions
     function isFunctionLike(node) {
-        return node && isFunctionLikeKind(node.kind);
+        return !!node && isFunctionLikeKind(node.kind);
     }
     ts.isFunctionLike = isFunctionLike;
     /* @internal */
@@ -12775,13 +12948,13 @@ var ts;
     ts.isFunctionLikeDeclaration = isFunctionLikeDeclaration;
     function isFunctionLikeDeclarationKind(kind) {
         switch (kind) {
-            case 251 /* FunctionDeclaration */:
-            case 165 /* MethodDeclaration */:
-            case 166 /* Constructor */:
-            case 167 /* GetAccessor */:
-            case 168 /* SetAccessor */:
-            case 208 /* FunctionExpression */:
-            case 209 /* ArrowFunction */:
+            case 252 /* FunctionDeclaration */:
+            case 166 /* MethodDeclaration */:
+            case 167 /* Constructor */:
+            case 168 /* GetAccessor */:
+            case 169 /* SetAccessor */:
+            case 209 /* FunctionExpression */:
+            case 210 /* ArrowFunction */:
                 return true;
             default:
                 return false;
@@ -12790,14 +12963,14 @@ var ts;
     /* @internal */
     function isFunctionLikeKind(kind) {
         switch (kind) {
-            case 164 /* MethodSignature */:
-            case 169 /* CallSignature */:
-            case 313 /* JSDocSignature */:
-            case 170 /* ConstructSignature */:
-            case 171 /* IndexSignature */:
-            case 174 /* FunctionType */:
-            case 308 /* JSDocFunctionType */:
-            case 175 /* ConstructorType */:
+            case 165 /* MethodSignature */:
+            case 170 /* CallSignature */:
+            case 315 /* JSDocSignature */:
+            case 171 /* ConstructSignature */:
+            case 172 /* IndexSignature */:
+            case 175 /* FunctionType */:
+            case 309 /* JSDocFunctionType */:
+            case 176 /* ConstructorType */:
                 return true;
             default:
                 return isFunctionLikeDeclarationKind(kind);
@@ -12812,29 +12985,29 @@ var ts;
     // Classes
     function isClassElement(node) {
         var kind = node.kind;
-        return kind === 166 /* Constructor */
-            || kind === 163 /* PropertyDeclaration */
-            || kind === 165 /* MethodDeclaration */
-            || kind === 167 /* GetAccessor */
-            || kind === 168 /* SetAccessor */
-            || kind === 171 /* IndexSignature */
-            || kind === 229 /* SemicolonClassElement */;
+        return kind === 167 /* Constructor */
+            || kind === 164 /* PropertyDeclaration */
+            || kind === 166 /* MethodDeclaration */
+            || kind === 168 /* GetAccessor */
+            || kind === 169 /* SetAccessor */
+            || kind === 172 /* IndexSignature */
+            || kind === 230 /* SemicolonClassElement */;
     }
     ts.isClassElement = isClassElement;
     function isClassLike(node) {
-        return node && (node.kind === 252 /* ClassDeclaration */ || node.kind === 221 /* ClassExpression */);
+        return node && (node.kind === 253 /* ClassDeclaration */ || node.kind === 222 /* ClassExpression */);
     }
     ts.isClassLike = isClassLike;
     function isAccessor(node) {
-        return node && (node.kind === 167 /* GetAccessor */ || node.kind === 168 /* SetAccessor */);
+        return node && (node.kind === 168 /* GetAccessor */ || node.kind === 169 /* SetAccessor */);
     }
     ts.isAccessor = isAccessor;
     /* @internal */
     function isMethodOrAccessor(node) {
         switch (node.kind) {
-            case 165 /* MethodDeclaration */:
-            case 167 /* GetAccessor */:
-            case 168 /* SetAccessor */:
+            case 166 /* MethodDeclaration */:
+            case 168 /* GetAccessor */:
+            case 169 /* SetAccessor */:
                 return true;
             default:
                 return false;
@@ -12844,11 +13017,11 @@ var ts;
     // Type members
     function isTypeElement(node) {
         var kind = node.kind;
-        return kind === 170 /* ConstructSignature */
-            || kind === 169 /* CallSignature */
-            || kind === 162 /* PropertySignature */
-            || kind === 164 /* MethodSignature */
-            || kind === 171 /* IndexSignature */;
+        return kind === 171 /* ConstructSignature */
+            || kind === 170 /* CallSignature */
+            || kind === 163 /* PropertySignature */
+            || kind === 165 /* MethodSignature */
+            || kind === 172 /* IndexSignature */;
     }
     ts.isTypeElement = isTypeElement;
     function isClassOrTypeElement(node) {
@@ -12857,12 +13030,12 @@ var ts;
     ts.isClassOrTypeElement = isClassOrTypeElement;
     function isObjectLiteralElementLike(node) {
         var kind = node.kind;
-        return kind === 288 /* PropertyAssignment */
-            || kind === 289 /* ShorthandPropertyAssignment */
-            || kind === 290 /* SpreadAssignment */
-            || kind === 165 /* MethodDeclaration */
-            || kind === 167 /* GetAccessor */
-            || kind === 168 /* SetAccessor */;
+        return kind === 289 /* PropertyAssignment */
+            || kind === 290 /* ShorthandPropertyAssignment */
+            || kind === 291 /* SpreadAssignment */
+            || kind === 166 /* MethodDeclaration */
+            || kind === 168 /* GetAccessor */
+            || kind === 169 /* SetAccessor */;
     }
     ts.isObjectLiteralElementLike = isObjectLiteralElementLike;
     // Type
@@ -12877,8 +13050,8 @@ var ts;
     ts.isTypeNode = isTypeNode;
     function isFunctionOrConstructorTypeNode(node) {
         switch (node.kind) {
-            case 174 /* FunctionType */:
-            case 175 /* ConstructorType */:
+            case 175 /* FunctionType */:
+            case 176 /* ConstructorType */:
                 return true;
         }
         return false;
@@ -12889,8 +13062,8 @@ var ts;
     function isBindingPattern(node) {
         if (node) {
             var kind = node.kind;
-            return kind === 197 /* ArrayBindingPattern */
-                || kind === 196 /* ObjectBindingPattern */;
+            return kind === 198 /* ArrayBindingPattern */
+                || kind === 197 /* ObjectBindingPattern */;
         }
         return false;
     }
@@ -12898,15 +13071,15 @@ var ts;
     /* @internal */
     function isAssignmentPattern(node) {
         var kind = node.kind;
-        return kind === 199 /* ArrayLiteralExpression */
-            || kind === 200 /* ObjectLiteralExpression */;
+        return kind === 200 /* ArrayLiteralExpression */
+            || kind === 201 /* ObjectLiteralExpression */;
     }
     ts.isAssignmentPattern = isAssignmentPattern;
     /* @internal */
     function isArrayBindingElement(node) {
         var kind = node.kind;
-        return kind === 198 /* BindingElement */
-            || kind === 222 /* OmittedExpression */;
+        return kind === 199 /* BindingElement */
+            || kind === 223 /* OmittedExpression */;
     }
     ts.isArrayBindingElement = isArrayBindingElement;
     /**
@@ -12915,9 +13088,9 @@ var ts;
     /* @internal */
     function isDeclarationBindingElement(bindingElement) {
         switch (bindingElement.kind) {
-            case 249 /* VariableDeclaration */:
-            case 160 /* Parameter */:
-            case 198 /* BindingElement */:
+            case 250 /* VariableDeclaration */:
+            case 161 /* Parameter */:
+            case 199 /* BindingElement */:
                 return true;
         }
         return false;
@@ -12938,8 +13111,8 @@ var ts;
     /* @internal */
     function isObjectBindingOrAssignmentPattern(node) {
         switch (node.kind) {
-            case 196 /* ObjectBindingPattern */:
-            case 200 /* ObjectLiteralExpression */:
+            case 197 /* ObjectBindingPattern */:
+            case 201 /* ObjectLiteralExpression */:
                 return true;
         }
         return false;
@@ -12951,8 +13124,8 @@ var ts;
     /* @internal */
     function isArrayBindingOrAssignmentPattern(node) {
         switch (node.kind) {
-            case 197 /* ArrayBindingPattern */:
-            case 199 /* ArrayLiteralExpression */:
+            case 198 /* ArrayBindingPattern */:
+            case 200 /* ArrayLiteralExpression */:
                 return true;
         }
         return false;
@@ -12961,26 +13134,26 @@ var ts;
     /* @internal */
     function isPropertyAccessOrQualifiedNameOrImportTypeNode(node) {
         var kind = node.kind;
-        return kind === 201 /* PropertyAccessExpression */
-            || kind === 157 /* QualifiedName */
-            || kind === 195 /* ImportType */;
+        return kind === 202 /* PropertyAccessExpression */
+            || kind === 158 /* QualifiedName */
+            || kind === 196 /* ImportType */;
     }
     ts.isPropertyAccessOrQualifiedNameOrImportTypeNode = isPropertyAccessOrQualifiedNameOrImportTypeNode;
     // Expression
     function isPropertyAccessOrQualifiedName(node) {
         var kind = node.kind;
-        return kind === 201 /* PropertyAccessExpression */
-            || kind === 157 /* QualifiedName */;
+        return kind === 202 /* PropertyAccessExpression */
+            || kind === 158 /* QualifiedName */;
     }
     ts.isPropertyAccessOrQualifiedName = isPropertyAccessOrQualifiedName;
     function isCallLikeExpression(node) {
         switch (node.kind) {
-            case 275 /* JsxOpeningElement */:
-            case 274 /* JsxSelfClosingElement */:
-            case 203 /* CallExpression */:
-            case 204 /* NewExpression */:
-            case 205 /* TaggedTemplateExpression */:
-            case 161 /* Decorator */:
+            case 276 /* JsxOpeningElement */:
+            case 275 /* JsxSelfClosingElement */:
+            case 204 /* CallExpression */:
+            case 205 /* NewExpression */:
+            case 206 /* TaggedTemplateExpression */:
+            case 162 /* Decorator */:
                 return true;
             default:
                 return false;
@@ -12988,12 +13161,12 @@ var ts;
     }
     ts.isCallLikeExpression = isCallLikeExpression;
     function isCallOrNewExpression(node) {
-        return node.kind === 203 /* CallExpression */ || node.kind === 204 /* NewExpression */;
+        return node.kind === 204 /* CallExpression */ || node.kind === 205 /* NewExpression */;
     }
     ts.isCallOrNewExpression = isCallOrNewExpression;
     function isTemplateLiteral(node) {
         var kind = node.kind;
-        return kind === 218 /* TemplateExpression */
+        return kind === 219 /* TemplateExpression */
             || kind === 14 /* NoSubstitutionTemplateLiteral */;
     }
     ts.isTemplateLiteral = isTemplateLiteral;
@@ -13004,33 +13177,33 @@ var ts;
     ts.isLeftHandSideExpression = isLeftHandSideExpression;
     function isLeftHandSideExpressionKind(kind) {
         switch (kind) {
-            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 202 /* PropertyAccessExpression */:
+            case 203 /* ElementAccessExpression */:
+            case 205 /* NewExpression */:
+            case 204 /* CallExpression */:
+            case 274 /* JsxElement */:
+            case 275 /* JsxSelfClosingElement */:
+            case 278 /* JsxFragment */:
+            case 206 /* TaggedTemplateExpression */:
+            case 200 /* ArrayLiteralExpression */:
+            case 208 /* ParenthesizedExpression */:
+            case 201 /* ObjectLiteralExpression */:
+            case 222 /* ClassExpression */:
+            case 209 /* FunctionExpression */:
             case 78 /* Identifier */:
             case 13 /* RegularExpressionLiteral */:
             case 8 /* NumericLiteral */:
             case 9 /* BigIntLiteral */:
             case 10 /* StringLiteral */:
             case 14 /* NoSubstitutionTemplateLiteral */:
-            case 218 /* TemplateExpression */:
+            case 219 /* TemplateExpression */:
             case 94 /* FalseKeyword */:
             case 103 /* NullKeyword */:
             case 107 /* ThisKeyword */:
             case 109 /* TrueKeyword */:
             case 105 /* SuperKeyword */:
-            case 225 /* NonNullExpression */:
-            case 226 /* MetaProperty */:
+            case 226 /* NonNullExpression */:
+            case 227 /* MetaProperty */:
             case 99 /* ImportKeyword */: // technically this is only an Expression if it's in a CallExpression
                 return true;
             default:
@@ -13044,13 +13217,13 @@ var ts;
     ts.isUnaryExpression = isUnaryExpression;
     function isUnaryExpressionKind(kind) {
         switch (kind) {
-            case 214 /* PrefixUnaryExpression */:
-            case 215 /* PostfixUnaryExpression */:
-            case 210 /* DeleteExpression */:
-            case 211 /* TypeOfExpression */:
-            case 212 /* VoidExpression */:
-            case 213 /* AwaitExpression */:
-            case 206 /* TypeAssertionExpression */:
+            case 215 /* PrefixUnaryExpression */:
+            case 216 /* PostfixUnaryExpression */:
+            case 211 /* DeleteExpression */:
+            case 212 /* TypeOfExpression */:
+            case 213 /* VoidExpression */:
+            case 214 /* AwaitExpression */:
+            case 207 /* TypeAssertionExpression */:
                 return true;
             default:
                 return isLeftHandSideExpressionKind(kind);
@@ -13059,9 +13232,9 @@ var ts;
     /* @internal */
     function isUnaryExpressionWithWrite(expr) {
         switch (expr.kind) {
-            case 215 /* PostfixUnaryExpression */:
+            case 216 /* PostfixUnaryExpression */:
                 return true;
-            case 214 /* PrefixUnaryExpression */:
+            case 215 /* PrefixUnaryExpression */:
                 return expr.operator === 45 /* PlusPlusToken */ ||
                     expr.operator === 46 /* MinusMinusToken */;
             default:
@@ -13080,15 +13253,15 @@ var ts;
     ts.isExpression = isExpression;
     function isExpressionKind(kind) {
         switch (kind) {
-            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 */:
+            case 218 /* ConditionalExpression */:
+            case 220 /* YieldExpression */:
+            case 210 /* ArrowFunction */:
+            case 217 /* BinaryExpression */:
+            case 221 /* SpreadElement */:
+            case 225 /* AsExpression */:
+            case 223 /* OmittedExpression */:
+            case 341 /* CommaListExpression */:
+            case 340 /* PartiallyEmittedExpression */:
                 return true;
             default:
                 return isUnaryExpressionKind(kind);
@@ -13096,8 +13269,8 @@ var ts;
     }
     function isAssertionExpression(node) {
         var kind = node.kind;
-        return kind === 206 /* TypeAssertionExpression */
-            || kind === 224 /* AsExpression */;
+        return kind === 207 /* TypeAssertionExpression */
+            || kind === 225 /* AsExpression */;
     }
     ts.isAssertionExpression = isAssertionExpression;
     /* @internal */
@@ -13108,13 +13281,13 @@ var ts;
     ts.isNotEmittedOrPartiallyEmittedNode = isNotEmittedOrPartiallyEmittedNode;
     function isIterationStatement(node, lookInLabeledStatements) {
         switch (node.kind) {
-            case 237 /* ForStatement */:
-            case 238 /* ForInStatement */:
-            case 239 /* ForOfStatement */:
-            case 235 /* DoStatement */:
-            case 236 /* WhileStatement */:
+            case 238 /* ForStatement */:
+            case 239 /* ForInStatement */:
+            case 240 /* ForOfStatement */:
+            case 236 /* DoStatement */:
+            case 237 /* WhileStatement */:
                 return true;
-            case 245 /* LabeledStatement */:
+            case 246 /* LabeledStatement */:
                 return lookInLabeledStatements && isIterationStatement(node.statement, lookInLabeledStatements);
         }
         return false;
@@ -13143,7 +13316,7 @@ var ts;
     ts.isExternalModuleIndicator = isExternalModuleIndicator;
     /* @internal */
     function isForInOrOfStatement(node) {
-        return node.kind === 238 /* ForInStatement */ || node.kind === 239 /* ForOfStatement */;
+        return node.kind === 239 /* ForInStatement */ || node.kind === 240 /* ForOfStatement */;
     }
     ts.isForInOrOfStatement = isForInOrOfStatement;
     // Element
@@ -13167,114 +13340,114 @@ var ts;
     /* @internal */
     function isModuleBody(node) {
         var kind = node.kind;
-        return kind === 257 /* ModuleBlock */
-            || kind === 256 /* ModuleDeclaration */
+        return kind === 258 /* ModuleBlock */
+            || kind === 257 /* ModuleDeclaration */
             || kind === 78 /* Identifier */;
     }
     ts.isModuleBody = isModuleBody;
     /* @internal */
     function isNamespaceBody(node) {
         var kind = node.kind;
-        return kind === 257 /* ModuleBlock */
-            || kind === 256 /* ModuleDeclaration */;
+        return kind === 258 /* ModuleBlock */
+            || kind === 257 /* ModuleDeclaration */;
     }
     ts.isNamespaceBody = isNamespaceBody;
     /* @internal */
     function isJSDocNamespaceBody(node) {
         var kind = node.kind;
         return kind === 78 /* Identifier */
-            || kind === 256 /* ModuleDeclaration */;
+            || kind === 257 /* ModuleDeclaration */;
     }
     ts.isJSDocNamespaceBody = isJSDocNamespaceBody;
     /* @internal */
     function isNamedImportBindings(node) {
         var kind = node.kind;
-        return kind === 264 /* NamedImports */
-            || kind === 263 /* NamespaceImport */;
+        return kind === 265 /* NamedImports */
+            || kind === 264 /* NamespaceImport */;
     }
     ts.isNamedImportBindings = isNamedImportBindings;
     /* @internal */
     function isModuleOrEnumDeclaration(node) {
-        return node.kind === 256 /* ModuleDeclaration */ || node.kind === 255 /* EnumDeclaration */;
+        return node.kind === 257 /* ModuleDeclaration */ || node.kind === 256 /* EnumDeclaration */;
     }
     ts.isModuleOrEnumDeclaration = isModuleOrEnumDeclaration;
     function isDeclarationKind(kind) {
-        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 */;
+        return kind === 210 /* ArrowFunction */
+            || kind === 199 /* BindingElement */
+            || kind === 253 /* ClassDeclaration */
+            || kind === 222 /* ClassExpression */
+            || kind === 167 /* Constructor */
+            || kind === 256 /* EnumDeclaration */
+            || kind === 292 /* EnumMember */
+            || kind === 271 /* ExportSpecifier */
+            || kind === 252 /* FunctionDeclaration */
+            || kind === 209 /* FunctionExpression */
+            || kind === 168 /* GetAccessor */
+            || kind === 263 /* ImportClause */
+            || kind === 261 /* ImportEqualsDeclaration */
+            || kind === 266 /* ImportSpecifier */
+            || kind === 254 /* InterfaceDeclaration */
+            || kind === 281 /* JsxAttribute */
+            || kind === 166 /* MethodDeclaration */
+            || kind === 165 /* MethodSignature */
+            || kind === 257 /* ModuleDeclaration */
+            || kind === 260 /* NamespaceExportDeclaration */
+            || kind === 264 /* NamespaceImport */
+            || kind === 270 /* NamespaceExport */
+            || kind === 161 /* Parameter */
+            || kind === 289 /* PropertyAssignment */
+            || kind === 164 /* PropertyDeclaration */
+            || kind === 163 /* PropertySignature */
+            || kind === 169 /* SetAccessor */
+            || kind === 290 /* ShorthandPropertyAssignment */
+            || kind === 255 /* TypeAliasDeclaration */
+            || kind === 160 /* TypeParameter */
+            || kind === 250 /* VariableDeclaration */
+            || kind === 335 /* JSDocTypedefTag */
+            || kind === 328 /* JSDocCallbackTag */
+            || kind === 337 /* JSDocPropertyTag */;
     }
     function isDeclarationStatementKind(kind) {
-        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 */;
+        return kind === 252 /* FunctionDeclaration */
+            || kind === 272 /* MissingDeclaration */
+            || kind === 253 /* ClassDeclaration */
+            || kind === 254 /* InterfaceDeclaration */
+            || kind === 255 /* TypeAliasDeclaration */
+            || kind === 256 /* EnumDeclaration */
+            || kind === 257 /* ModuleDeclaration */
+            || kind === 262 /* ImportDeclaration */
+            || kind === 261 /* ImportEqualsDeclaration */
+            || kind === 268 /* ExportDeclaration */
+            || kind === 267 /* ExportAssignment */
+            || kind === 260 /* NamespaceExportDeclaration */;
     }
     function isStatementKindButNotDeclarationKind(kind) {
-        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 */;
+        return kind === 242 /* BreakStatement */
+            || kind === 241 /* ContinueStatement */
+            || kind === 249 /* DebuggerStatement */
+            || kind === 236 /* DoStatement */
+            || kind === 234 /* ExpressionStatement */
+            || kind === 232 /* EmptyStatement */
+            || kind === 239 /* ForInStatement */
+            || kind === 240 /* ForOfStatement */
+            || kind === 238 /* ForStatement */
+            || kind === 235 /* IfStatement */
+            || kind === 246 /* LabeledStatement */
+            || kind === 243 /* ReturnStatement */
+            || kind === 245 /* SwitchStatement */
+            || kind === 247 /* ThrowStatement */
+            || kind === 248 /* TryStatement */
+            || kind === 233 /* VariableStatement */
+            || kind === 237 /* WhileStatement */
+            || kind === 244 /* WithStatement */
+            || kind === 339 /* NotEmittedStatement */
+            || kind === 343 /* EndOfDeclarationMarker */
+            || kind === 342 /* MergeDeclarationMarker */;
     }
     /* @internal */
     function isDeclaration(node) {
-        if (node.kind === 159 /* TypeParameter */) {
-            return (node.parent && node.parent.kind !== 330 /* JSDocTemplateTag */) || ts.isInJSFile(node);
+        if (node.kind === 160 /* TypeParameter */) {
+            return (node.parent && node.parent.kind !== 334 /* JSDocTemplateTag */) || ts.isInJSFile(node);
         }
         return isDeclarationKind(node.kind);
     }
@@ -13301,10 +13474,10 @@ var ts;
     }
     ts.isStatement = isStatement;
     function isBlockStatement(node) {
-        if (node.kind !== 230 /* Block */)
+        if (node.kind !== 231 /* Block */)
             return false;
         if (node.parent !== undefined) {
-            if (node.parent.kind === 247 /* TryStatement */ || node.parent.kind === 287 /* CatchClause */) {
+            if (node.parent.kind === 248 /* TryStatement */ || node.parent.kind === 288 /* CatchClause */) {
                 return false;
             }
         }
@@ -13318,15 +13491,15 @@ var ts;
         var kind = node.kind;
         return isStatementKindButNotDeclarationKind(kind)
             || isDeclarationStatementKind(kind)
-            || kind === 230 /* Block */;
+            || kind === 231 /* Block */;
     }
     ts.isStatementOrBlock = isStatementOrBlock;
     // Module references
     /* @internal */
     function isModuleReference(node) {
         var kind = node.kind;
-        return kind === 272 /* ExternalModuleReference */
-            || kind === 157 /* QualifiedName */
+        return kind === 273 /* ExternalModuleReference */
+            || kind === 158 /* QualifiedName */
             || kind === 78 /* Identifier */;
     }
     ts.isModuleReference = isModuleReference;
@@ -13336,70 +13509,76 @@ var ts;
         var kind = node.kind;
         return kind === 107 /* ThisKeyword */
             || kind === 78 /* Identifier */
-            || kind === 201 /* PropertyAccessExpression */;
+            || kind === 202 /* PropertyAccessExpression */;
     }
     ts.isJsxTagNameExpression = isJsxTagNameExpression;
     /* @internal */
     function isJsxChild(node) {
         var kind = node.kind;
-        return kind === 273 /* JsxElement */
-            || kind === 283 /* JsxExpression */
-            || kind === 274 /* JsxSelfClosingElement */
+        return kind === 274 /* JsxElement */
+            || kind === 284 /* JsxExpression */
+            || kind === 275 /* JsxSelfClosingElement */
             || kind === 11 /* JsxText */
-            || kind === 277 /* JsxFragment */;
+            || kind === 278 /* JsxFragment */;
     }
     ts.isJsxChild = isJsxChild;
     /* @internal */
     function isJsxAttributeLike(node) {
         var kind = node.kind;
-        return kind === 280 /* JsxAttribute */
-            || kind === 282 /* JsxSpreadAttribute */;
+        return kind === 281 /* JsxAttribute */
+            || kind === 283 /* JsxSpreadAttribute */;
     }
     ts.isJsxAttributeLike = isJsxAttributeLike;
     /* @internal */
     function isStringLiteralOrJsxExpression(node) {
         var kind = node.kind;
         return kind === 10 /* StringLiteral */
-            || kind === 283 /* JsxExpression */;
+            || kind === 284 /* JsxExpression */;
     }
     ts.isStringLiteralOrJsxExpression = isStringLiteralOrJsxExpression;
     function isJsxOpeningLikeElement(node) {
         var kind = node.kind;
-        return kind === 275 /* JsxOpeningElement */
-            || kind === 274 /* JsxSelfClosingElement */;
+        return kind === 276 /* JsxOpeningElement */
+            || kind === 275 /* JsxSelfClosingElement */;
     }
     ts.isJsxOpeningLikeElement = isJsxOpeningLikeElement;
     // Clauses
     function isCaseOrDefaultClause(node) {
         var kind = node.kind;
-        return kind === 284 /* CaseClause */
-            || kind === 285 /* DefaultClause */;
+        return kind === 285 /* CaseClause */
+            || kind === 286 /* DefaultClause */;
     }
     ts.isCaseOrDefaultClause = isCaseOrDefaultClause;
     // JSDoc
     /** True if node is of some JSDoc syntax kind. */
     /* @internal */
     function isJSDocNode(node) {
-        return node.kind >= 301 /* FirstJSDocNode */ && node.kind <= 333 /* LastJSDocNode */;
+        return node.kind >= 302 /* FirstJSDocNode */ && node.kind <= 337 /* LastJSDocNode */;
     }
     ts.isJSDocNode = isJSDocNode;
     /** True if node is of a kind that may contain comment text. */
     function isJSDocCommentContainingNode(node) {
-        return node.kind === 311 /* JSDocComment */ || node.kind === 310 /* JSDocNamepathType */ || isJSDocTag(node) || ts.isJSDocTypeLiteral(node) || ts.isJSDocSignature(node);
+        return node.kind === 312 /* JSDocComment */
+            || node.kind === 311 /* JSDocNamepathType */
+            || node.kind === 313 /* JSDocText */
+            || node.kind === 316 /* JSDocLink */
+            || 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 >= 314 /* FirstJSDocTagNode */ && node.kind <= 333 /* LastJSDocTagNode */;
+        return node.kind >= 317 /* FirstJSDocTagNode */ && node.kind <= 337 /* LastJSDocTagNode */;
     }
     ts.isJSDocTag = isJSDocTag;
     function isSetAccessor(node) {
-        return node.kind === 168 /* SetAccessor */;
+        return node.kind === 169 /* SetAccessor */;
     }
     ts.isSetAccessor = isSetAccessor;
     function isGetAccessor(node) {
-        return node.kind === 167 /* GetAccessor */;
+        return node.kind === 168 /* GetAccessor */;
     }
     ts.isGetAccessor = isGetAccessor;
     /** True if has jsdoc nodes attached to it. */
@@ -13425,13 +13604,13 @@ var ts;
     /** True if has initializer node attached to it. */
     function hasOnlyExpressionInitializer(node) {
         switch (node.kind) {
-            case 249 /* VariableDeclaration */:
-            case 160 /* Parameter */:
-            case 198 /* BindingElement */:
-            case 162 /* PropertySignature */:
-            case 163 /* PropertyDeclaration */:
-            case 288 /* PropertyAssignment */:
-            case 291 /* EnumMember */:
+            case 250 /* VariableDeclaration */:
+            case 161 /* Parameter */:
+            case 199 /* BindingElement */:
+            case 163 /* PropertySignature */:
+            case 164 /* PropertyDeclaration */:
+            case 289 /* PropertyAssignment */:
+            case 292 /* EnumMember */:
                 return true;
             default:
                 return false;
@@ -13439,12 +13618,12 @@ var ts;
     }
     ts.hasOnlyExpressionInitializer = hasOnlyExpressionInitializer;
     function isObjectLiteralElement(node) {
-        return node.kind === 280 /* JsxAttribute */ || node.kind === 282 /* JsxSpreadAttribute */ || isObjectLiteralElementLike(node);
+        return node.kind === 281 /* JsxAttribute */ || node.kind === 283 /* JsxSpreadAttribute */ || isObjectLiteralElementLike(node);
     }
     ts.isObjectLiteralElement = isObjectLiteralElement;
     /* @internal */
     function isTypeReferenceType(node) {
-        return node.kind === 173 /* TypeReference */ || node.kind === 223 /* ExpressionWithTypeArguments */;
+        return node.kind === 174 /* TypeReference */ || node.kind === 224 /* ExpressionWithTypeArguments */;
     }
     ts.isTypeReferenceType = isTypeReferenceType;
     var MAX_SMI_X86 = 1073741823;
@@ -13683,7 +13862,9 @@ var ts;
     }
     ts.packageIdToString = packageIdToString;
     function typeDirectiveIsEqualTo(oldResolution, newResolution) {
-        return oldResolution.resolvedFileName === newResolution.resolvedFileName && oldResolution.primary === newResolution.primary;
+        return oldResolution.resolvedFileName === newResolution.resolvedFileName
+            && oldResolution.primary === newResolution.primary
+            && oldResolution.originalPath === newResolution.originalPath;
     }
     ts.typeDirectiveIsEqualTo = typeDirectiveIsEqualTo;
     function hasChangesInResolutions(names, newResolutions, oldResolutions, comparer) {
@@ -13725,7 +13906,7 @@ var ts;
         }
     }
     function getSourceFileOfNode(node) {
-        while (node && node.kind !== 297 /* SourceFile */) {
+        while (node && node.kind !== 298 /* SourceFile */) {
             node = node.parent;
         }
         return node;
@@ -13733,11 +13914,11 @@ var ts;
     ts.getSourceFileOfNode = getSourceFileOfNode;
     function isStatementWithLocals(node) {
         switch (node.kind) {
-            case 230 /* Block */:
-            case 258 /* CaseBlock */:
-            case 237 /* ForStatement */:
-            case 238 /* ForInStatement */:
-            case 239 /* ForOfStatement */:
+            case 231 /* Block */:
+            case 259 /* CaseBlock */:
+            case 238 /* ForStatement */:
+            case 239 /* ForInStatement */:
+            case 240 /* ForOfStatement */:
                 return true;
         }
         return false;
@@ -13933,10 +14114,12 @@ 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 === 334 /* SyntaxList */ && node._children.length > 0) {
+        if (node.kind === 338 /* SyntaxList */ && node._children.length > 0) {
             return getTokenPosOfNode(node._children[0], sourceFile, includeJsDoc);
         }
-        return ts.skipTrivia((sourceFile || getSourceFileOfNode(node)).text, node.pos);
+        return ts.skipTrivia((sourceFile || getSourceFileOfNode(node)).text, node.pos, 
+        /*stopAfterLineBreak*/ false, 
+        /*stopAtComments*/ false, isInJSDoc(node));
     }
     ts.getTokenPosOfNode = getTokenPosOfNode;
     function getNonDecoratorTokenPosOfNode(node, sourceFile) {
@@ -14055,9 +14238,11 @@ var ts;
                 DataView: ["setBigInt64", "setBigUint64", "getBigInt64", "getBigUint64"],
                 RelativeTimeFormat: ["format", "formatToParts", "resolvedOptions"]
             },
-            esnext: {
+            es2021: {
                 PromiseConstructor: ["any"],
-                String: ["replaceAll"],
+                String: ["replaceAll"]
+            },
+            esnext: {
                 NumberFormat: ["formatToParts"]
             }
         };
@@ -14150,7 +14335,7 @@ var ts;
     ts.isBlockOrCatchScoped = isBlockOrCatchScoped;
     function isCatchClauseVariableDeclarationOrBindingElement(declaration) {
         var node = getRootDeclaration(declaration);
-        return node.kind === 249 /* VariableDeclaration */ && node.parent.kind === 287 /* CatchClause */;
+        return node.kind === 250 /* VariableDeclaration */ && node.parent.kind === 288 /* CatchClause */;
     }
     ts.isCatchClauseVariableDeclarationOrBindingElement = isCatchClauseVariableDeclarationOrBindingElement;
     function isAmbientModule(node) {
@@ -14182,11 +14367,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 === 256 /* ModuleDeclaration */ && (!node.body);
+        return !!node && node.kind === 257 /* ModuleDeclaration */ && (!node.body);
     }
     function isBlockScopedContainerTopLevel(node) {
-        return node.kind === 297 /* SourceFile */ ||
-            node.kind === 256 /* ModuleDeclaration */ ||
+        return node.kind === 298 /* SourceFile */ ||
+            node.kind === 257 /* ModuleDeclaration */ ||
             ts.isFunctionLike(node);
     }
     ts.isBlockScopedContainerTopLevel = isBlockScopedContainerTopLevel;
@@ -14203,16 +14388,17 @@ 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 297 /* SourceFile */:
+            case 298 /* SourceFile */:
                 return ts.isExternalModule(node.parent);
-            case 257 /* ModuleBlock */:
+            case 258 /* ModuleBlock */:
                 return isAmbientModule(node.parent.parent) && ts.isSourceFile(node.parent.parent.parent) && !ts.isExternalModule(node.parent.parent.parent);
         }
         return false;
     }
     ts.isModuleAugmentationExternal = isModuleAugmentationExternal;
     function getNonAugmentationDeclaration(symbol) {
-        return ts.find(symbol.declarations, function (d) { return !isExternalModuleAugmentation(d) && !(ts.isModuleDeclaration(d) && isGlobalScopeAugmentation(d)); });
+        var _a;
+        return (_a = symbol.declarations) === null || _a === void 0 ? void 0 : _a.find(function (d) { return !isExternalModuleAugmentation(d) && !(ts.isModuleDeclaration(d) && isGlobalScopeAugmentation(d)); });
     }
     ts.getNonAugmentationDeclaration = getNonAugmentationDeclaration;
     function isEffectiveExternalModule(node, compilerOptions) {
@@ -14258,22 +14444,22 @@ var ts;
     ts.isEffectiveStrictModeSourceFile = isEffectiveStrictModeSourceFile;
     function isBlockScope(node, parentNode) {
         switch (node.kind) {
-            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 */:
+            case 298 /* SourceFile */:
+            case 259 /* CaseBlock */:
+            case 288 /* CatchClause */:
+            case 257 /* ModuleDeclaration */:
+            case 238 /* ForStatement */:
+            case 239 /* ForInStatement */:
+            case 240 /* ForOfStatement */:
+            case 167 /* Constructor */:
+            case 166 /* MethodDeclaration */:
+            case 168 /* GetAccessor */:
+            case 169 /* SetAccessor */:
+            case 252 /* FunctionDeclaration */:
+            case 209 /* FunctionExpression */:
+            case 210 /* ArrowFunction */:
                 return true;
-            case 230 /* Block */:
+            case 231 /* Block */:
                 // function block is not considered block-scope container
                 // see comment in binder.ts: bind(...), case for SyntaxKind.Block
                 return !ts.isFunctionLike(parentNode);
@@ -14283,9 +14469,9 @@ var ts;
     ts.isBlockScope = isBlockScope;
     function isDeclarationWithTypeParameters(node) {
         switch (node.kind) {
-            case 324 /* JSDocCallbackTag */:
-            case 331 /* JSDocTypedefTag */:
-            case 313 /* JSDocSignature */:
+            case 328 /* JSDocCallbackTag */:
+            case 335 /* JSDocTypedefTag */:
+            case 315 /* JSDocSignature */:
                 return true;
             default:
                 ts.assertType(node);
@@ -14295,25 +14481,25 @@ var ts;
     ts.isDeclarationWithTypeParameters = isDeclarationWithTypeParameters;
     function isDeclarationWithTypeParameterChildren(node) {
         switch (node.kind) {
-            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 */:
+            case 170 /* CallSignature */:
+            case 171 /* ConstructSignature */:
+            case 165 /* MethodSignature */:
+            case 172 /* IndexSignature */:
+            case 175 /* FunctionType */:
+            case 176 /* ConstructorType */:
+            case 309 /* JSDocFunctionType */:
+            case 253 /* ClassDeclaration */:
+            case 222 /* ClassExpression */:
+            case 254 /* InterfaceDeclaration */:
+            case 255 /* TypeAliasDeclaration */:
+            case 334 /* JSDocTemplateTag */:
+            case 252 /* FunctionDeclaration */:
+            case 166 /* MethodDeclaration */:
+            case 167 /* Constructor */:
+            case 168 /* GetAccessor */:
+            case 169 /* SetAccessor */:
+            case 209 /* FunctionExpression */:
+            case 210 /* ArrowFunction */:
                 return true;
             default:
                 ts.assertType(node);
@@ -14323,8 +14509,8 @@ var ts;
     ts.isDeclarationWithTypeParameterChildren = isDeclarationWithTypeParameterChildren;
     function isAnyImportSyntax(node) {
         switch (node.kind) {
-            case 261 /* ImportDeclaration */:
-            case 260 /* ImportEqualsDeclaration */:
+            case 262 /* ImportDeclaration */:
+            case 261 /* ImportEqualsDeclaration */:
                 return true;
             default:
                 return false;
@@ -14333,15 +14519,15 @@ var ts;
     ts.isAnyImportSyntax = isAnyImportSyntax;
     function isLateVisibilityPaintedStatement(node) {
         switch (node.kind) {
-            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 */:
+            case 262 /* ImportDeclaration */:
+            case 261 /* ImportEqualsDeclaration */:
+            case 233 /* VariableStatement */:
+            case 253 /* ClassDeclaration */:
+            case 252 /* FunctionDeclaration */:
+            case 257 /* ModuleDeclaration */:
+            case 255 /* TypeAliasDeclaration */:
+            case 254 /* InterfaceDeclaration */:
+            case 256 /* EnumDeclaration */:
                 return true;
             default:
                 return false;
@@ -14374,7 +14560,7 @@ var ts;
     }
     ts.getNameFromIndexInfo = getNameFromIndexInfo;
     function isComputedNonLiteralName(name) {
-        return name.kind === 158 /* ComputedPropertyName */ && !isStringOrNumericLiteralLike(name.expression);
+        return name.kind === 159 /* ComputedPropertyName */ && !isStringOrNumericLiteralLike(name.expression);
     }
     ts.isComputedNonLiteralName = isComputedNonLiteralName;
     function getTextOfPropertyName(name) {
@@ -14386,7 +14572,7 @@ var ts;
             case 8 /* NumericLiteral */:
             case 14 /* NoSubstitutionTemplateLiteral */:
                 return ts.escapeLeadingUnderscores(name.text);
-            case 158 /* ComputedPropertyName */:
+            case 159 /* 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");
@@ -14402,9 +14588,9 @@ var ts;
             case 79 /* PrivateIdentifier */:
             case 78 /* Identifier */:
                 return getFullWidth(name) === 0 ? ts.idText(name) : getTextOfNode(name);
-            case 157 /* QualifiedName */:
+            case 158 /* QualifiedName */:
                 return entityNameToString(name.left) + "." + entityNameToString(name.right);
-            case 201 /* PropertyAccessExpression */:
+            case 202 /* PropertyAccessExpression */:
                 if (ts.isIdentifier(name.name) || ts.isPrivateIdentifier(name.name)) {
                     return entityNameToString(name.expression) + "." + entityNameToString(name.name);
                 }
@@ -14490,7 +14676,7 @@ var ts;
     ts.getSpanOfTokenAtPosition = getSpanOfTokenAtPosition;
     function getErrorSpanForArrowFunction(sourceFile, node) {
         var pos = ts.skipTrivia(sourceFile.text, node.pos);
-        if (node.body && node.body.kind === 230 /* Block */) {
+        if (node.body && node.body.kind === 231 /* Block */) {
             var startLine = ts.getLineAndCharacterOfPosition(sourceFile, node.body.pos).line;
             var endLine = ts.getLineAndCharacterOfPosition(sourceFile, node.body.end).line;
             if (startLine < endLine) {
@@ -14504,7 +14690,7 @@ var ts;
     function getErrorSpanForNode(sourceFile, node) {
         var errorNode = node;
         switch (node.kind) {
-            case 297 /* SourceFile */:
+            case 298 /* 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
@@ -14513,28 +14699,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 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 */:
+            case 250 /* VariableDeclaration */:
+            case 199 /* BindingElement */:
+            case 253 /* ClassDeclaration */:
+            case 222 /* ClassExpression */:
+            case 254 /* InterfaceDeclaration */:
+            case 257 /* ModuleDeclaration */:
+            case 256 /* EnumDeclaration */:
+            case 292 /* EnumMember */:
+            case 252 /* FunctionDeclaration */:
+            case 209 /* FunctionExpression */:
+            case 166 /* MethodDeclaration */:
+            case 168 /* GetAccessor */:
+            case 169 /* SetAccessor */:
+            case 255 /* TypeAliasDeclaration */:
+            case 164 /* PropertyDeclaration */:
+            case 163 /* PropertySignature */:
                 errorNode = node.name;
                 break;
-            case 209 /* ArrowFunction */:
+            case 210 /* ArrowFunction */:
                 return getErrorSpanForArrowFunction(sourceFile, node);
-            case 284 /* CaseClause */:
-            case 285 /* DefaultClause */:
+            case 285 /* CaseClause */:
+            case 286 /* 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);
@@ -14586,11 +14772,11 @@ var ts;
     }
     ts.isLet = isLet;
     function isSuperCall(n) {
-        return n.kind === 203 /* CallExpression */ && n.expression.kind === 105 /* SuperKeyword */;
+        return n.kind === 204 /* CallExpression */ && n.expression.kind === 105 /* SuperKeyword */;
     }
     ts.isSuperCall = isSuperCall;
     function isImportCall(n) {
-        return n.kind === 203 /* CallExpression */ && n.expression.kind === 99 /* ImportKeyword */;
+        return n.kind === 204 /* CallExpression */ && n.expression.kind === 99 /* ImportKeyword */;
     }
     ts.isImportCall = isImportCall;
     function isImportMeta(n) {
@@ -14604,7 +14790,7 @@ var ts;
     }
     ts.isLiteralImportTypeNode = isLiteralImportTypeNode;
     function isPrologueDirective(node) {
-        return node.kind === 233 /* ExpressionStatement */
+        return node.kind === 234 /* ExpressionStatement */
             && node.expression.kind === 10 /* StringLiteral */;
     }
     ts.isPrologueDirective = isPrologueDirective;
@@ -14632,11 +14818,12 @@ var ts;
     }
     ts.getLeadingCommentRangesOfNode = getLeadingCommentRangesOfNode;
     function getJSDocCommentRanges(node, text) {
-        var commentRanges = (node.kind === 160 /* Parameter */ ||
-            node.kind === 159 /* TypeParameter */ ||
-            node.kind === 208 /* FunctionExpression */ ||
-            node.kind === 209 /* ArrowFunction */ ||
-            node.kind === 207 /* ParenthesizedExpression */) ?
+        var commentRanges = (node.kind === 161 /* Parameter */ ||
+            node.kind === 160 /* TypeParameter */ ||
+            node.kind === 209 /* FunctionExpression */ ||
+            node.kind === 210 /* ArrowFunction */ ||
+            node.kind === 208 /* ParenthesizedExpression */ ||
+            node.kind === 250 /* VariableDeclaration */) ?
             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 '/**/'
@@ -14652,7 +14839,7 @@ 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 (172 /* FirstTypeNode */ <= node.kind && node.kind <= 195 /* LastTypeNode */) {
+        if (173 /* FirstTypeNode */ <= node.kind && node.kind <= 196 /* LastTypeNode */) {
             return true;
         }
         switch (node.kind) {
@@ -14668,32 +14855,32 @@ var ts;
             case 141 /* NeverKeyword */:
                 return true;
             case 113 /* VoidKeyword */:
-                return node.parent.kind !== 212 /* VoidExpression */;
-            case 223 /* ExpressionWithTypeArguments */:
+                return node.parent.kind !== 213 /* VoidExpression */;
+            case 224 /* ExpressionWithTypeArguments */:
                 return !isExpressionWithTypeArgumentsInClassExtendsClause(node);
-            case 159 /* TypeParameter */:
-                return node.parent.kind === 190 /* MappedType */ || node.parent.kind === 185 /* InferType */;
+            case 160 /* TypeParameter */:
+                return node.parent.kind === 191 /* MappedType */ || node.parent.kind === 186 /* 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 === 157 /* QualifiedName */ && node.parent.right === node) {
+                if (node.parent.kind === 158 /* QualifiedName */ && node.parent.right === node) {
                     node = node.parent;
                 }
-                else if (node.parent.kind === 201 /* PropertyAccessExpression */ && node.parent.name === node) {
+                else if (node.parent.kind === 202 /* 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 === 157 /* QualifiedName */ || node.kind === 201 /* PropertyAccessExpression */, "'node' was expected to be a qualified name, identifier or property access in 'isPartOfTypeNode'.");
+                ts.Debug.assert(node.kind === 78 /* Identifier */ || node.kind === 158 /* QualifiedName */ || node.kind === 202 /* PropertyAccessExpression */, "'node' was expected to be a qualified name, identifier or property access in 'isPartOfTypeNode'.");
             // falls through
-            case 157 /* QualifiedName */:
-            case 201 /* PropertyAccessExpression */:
+            case 158 /* QualifiedName */:
+            case 202 /* PropertyAccessExpression */:
             case 107 /* ThisKeyword */: {
                 var parent = node.parent;
-                if (parent.kind === 176 /* TypeQuery */) {
+                if (parent.kind === 177 /* TypeQuery */) {
                     return false;
                 }
-                if (parent.kind === 195 /* ImportType */) {
+                if (parent.kind === 196 /* ImportType */) {
                     return !parent.isTypeOf;
                 }
                 // Do not recursively call isPartOfTypeNode on the parent. In the example:
@@ -14702,40 +14889,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 (172 /* FirstTypeNode */ <= parent.kind && parent.kind <= 195 /* LastTypeNode */) {
+                if (173 /* FirstTypeNode */ <= parent.kind && parent.kind <= 196 /* LastTypeNode */) {
                     return true;
                 }
                 switch (parent.kind) {
-                    case 223 /* ExpressionWithTypeArguments */:
+                    case 224 /* ExpressionWithTypeArguments */:
                         return !isExpressionWithTypeArgumentsInClassExtendsClause(parent);
-                    case 159 /* TypeParameter */:
+                    case 160 /* TypeParameter */:
                         return node === parent.constraint;
-                    case 330 /* JSDocTemplateTag */:
+                    case 334 /* JSDocTemplateTag */:
                         return node === parent.constraint;
-                    case 163 /* PropertyDeclaration */:
-                    case 162 /* PropertySignature */:
-                    case 160 /* Parameter */:
-                    case 249 /* VariableDeclaration */:
+                    case 164 /* PropertyDeclaration */:
+                    case 163 /* PropertySignature */:
+                    case 161 /* Parameter */:
+                    case 250 /* VariableDeclaration */:
                         return node === parent.type;
-                    case 251 /* FunctionDeclaration */:
-                    case 208 /* FunctionExpression */:
-                    case 209 /* ArrowFunction */:
-                    case 166 /* Constructor */:
-                    case 165 /* MethodDeclaration */:
-                    case 164 /* MethodSignature */:
-                    case 167 /* GetAccessor */:
-                    case 168 /* SetAccessor */:
+                    case 252 /* FunctionDeclaration */:
+                    case 209 /* FunctionExpression */:
+                    case 210 /* ArrowFunction */:
+                    case 167 /* Constructor */:
+                    case 166 /* MethodDeclaration */:
+                    case 165 /* MethodSignature */:
+                    case 168 /* GetAccessor */:
+                    case 169 /* SetAccessor */:
                         return node === parent.type;
-                    case 169 /* CallSignature */:
-                    case 170 /* ConstructSignature */:
-                    case 171 /* IndexSignature */:
+                    case 170 /* CallSignature */:
+                    case 171 /* ConstructSignature */:
+                    case 172 /* IndexSignature */:
                         return node === parent.type;
-                    case 206 /* TypeAssertionExpression */:
+                    case 207 /* TypeAssertionExpression */:
                         return node === parent.type;
-                    case 203 /* CallExpression */:
-                    case 204 /* NewExpression */:
+                    case 204 /* CallExpression */:
+                    case 205 /* NewExpression */:
                         return ts.contains(parent.typeArguments, node);
-                    case 205 /* TaggedTemplateExpression */:
+                    case 206 /* TaggedTemplateExpression */:
                         // TODO (drosen): TaggedTemplateExpressions may eventually support type arguments.
                         return false;
                 }
@@ -14760,23 +14947,23 @@ var ts;
         return traverse(body);
         function traverse(node) {
             switch (node.kind) {
-                case 242 /* ReturnStatement */:
+                case 243 /* ReturnStatement */:
                     return visitor(node);
-                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 */:
+                case 259 /* CaseBlock */:
+                case 231 /* Block */:
+                case 235 /* IfStatement */:
+                case 236 /* DoStatement */:
+                case 237 /* WhileStatement */:
+                case 238 /* ForStatement */:
+                case 239 /* ForInStatement */:
+                case 240 /* ForOfStatement */:
+                case 244 /* WithStatement */:
+                case 245 /* SwitchStatement */:
+                case 285 /* CaseClause */:
+                case 286 /* DefaultClause */:
+                case 246 /* LabeledStatement */:
+                case 248 /* TryStatement */:
+                case 288 /* CatchClause */:
                     return ts.forEachChild(node, traverse);
             }
         }
@@ -14786,23 +14973,23 @@ var ts;
         return traverse(body);
         function traverse(node) {
             switch (node.kind) {
-                case 219 /* YieldExpression */:
+                case 220 /* YieldExpression */:
                     visitor(node);
                     var operand = node.expression;
                     if (operand) {
                         traverse(operand);
                     }
                     return;
-                case 255 /* EnumDeclaration */:
-                case 253 /* InterfaceDeclaration */:
-                case 256 /* ModuleDeclaration */:
-                case 254 /* TypeAliasDeclaration */:
+                case 256 /* EnumDeclaration */:
+                case 254 /* InterfaceDeclaration */:
+                case 257 /* ModuleDeclaration */:
+                case 255 /* 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 === 158 /* ComputedPropertyName */) {
+                        if (node.name && node.name.kind === 159 /* 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);
@@ -14825,10 +15012,10 @@ var ts;
      * @param node The type node.
      */
     function getRestParameterElementType(node) {
-        if (node && node.kind === 178 /* ArrayType */) {
+        if (node && node.kind === 179 /* ArrayType */) {
             return node.elementType;
         }
-        else if (node && node.kind === 173 /* TypeReference */) {
+        else if (node && node.kind === 174 /* TypeReference */) {
             return ts.singleOrUndefined(node.typeArguments);
         }
         else {
@@ -14838,12 +15025,12 @@ var ts;
     ts.getRestParameterElementType = getRestParameterElementType;
     function getMembersOfDeclaration(node) {
         switch (node.kind) {
-            case 253 /* InterfaceDeclaration */:
-            case 252 /* ClassDeclaration */:
-            case 221 /* ClassExpression */:
-            case 177 /* TypeLiteral */:
+            case 254 /* InterfaceDeclaration */:
+            case 253 /* ClassDeclaration */:
+            case 222 /* ClassExpression */:
+            case 178 /* TypeLiteral */:
                 return node.members;
-            case 200 /* ObjectLiteralExpression */:
+            case 201 /* ObjectLiteralExpression */:
                 return node.properties;
         }
     }
@@ -14851,14 +15038,14 @@ var ts;
     function isVariableLike(node) {
         if (node) {
             switch (node.kind) {
-                case 198 /* BindingElement */:
-                case 291 /* EnumMember */:
-                case 160 /* Parameter */:
-                case 288 /* PropertyAssignment */:
-                case 163 /* PropertyDeclaration */:
-                case 162 /* PropertySignature */:
-                case 289 /* ShorthandPropertyAssignment */:
-                case 249 /* VariableDeclaration */:
+                case 199 /* BindingElement */:
+                case 292 /* EnumMember */:
+                case 161 /* Parameter */:
+                case 289 /* PropertyAssignment */:
+                case 164 /* PropertyDeclaration */:
+                case 163 /* PropertySignature */:
+                case 290 /* ShorthandPropertyAssignment */:
+                case 250 /* VariableDeclaration */:
                     return true;
             }
         }
@@ -14870,8 +15057,8 @@ var ts;
     }
     ts.isVariableLikeOrAccessor = isVariableLikeOrAccessor;
     function isVariableDeclarationInVariableStatement(node) {
-        return node.parent.kind === 250 /* VariableDeclarationList */
-            && node.parent.parent.kind === 232 /* VariableStatement */;
+        return node.parent.kind === 251 /* VariableDeclarationList */
+            && node.parent.parent.kind === 233 /* VariableStatement */;
     }
     ts.isVariableDeclarationInVariableStatement = isVariableDeclarationInVariableStatement;
     function isValidESSymbolDeclaration(node) {
@@ -14882,13 +15069,13 @@ var ts;
     ts.isValidESSymbolDeclaration = isValidESSymbolDeclaration;
     function introducesArgumentsExoticObject(node) {
         switch (node.kind) {
-            case 165 /* MethodDeclaration */:
-            case 164 /* MethodSignature */:
-            case 166 /* Constructor */:
-            case 167 /* GetAccessor */:
-            case 168 /* SetAccessor */:
-            case 251 /* FunctionDeclaration */:
-            case 208 /* FunctionExpression */:
+            case 166 /* MethodDeclaration */:
+            case 165 /* MethodSignature */:
+            case 167 /* Constructor */:
+            case 168 /* GetAccessor */:
+            case 169 /* SetAccessor */:
+            case 252 /* FunctionDeclaration */:
+            case 209 /* FunctionExpression */:
                 return true;
         }
         return false;
@@ -14899,7 +15086,7 @@ var ts;
             if (beforeUnwrapLabelCallback) {
                 beforeUnwrapLabelCallback(node);
             }
-            if (node.statement.kind !== 245 /* LabeledStatement */) {
+            if (node.statement.kind !== 246 /* LabeledStatement */) {
                 return node.statement;
             }
             node = node.statement;
@@ -14907,17 +15094,17 @@ var ts;
     }
     ts.unwrapInnermostStatementOfLabel = unwrapInnermostStatementOfLabel;
     function isFunctionBlock(node) {
-        return node && node.kind === 230 /* Block */ && ts.isFunctionLike(node.parent);
+        return node && node.kind === 231 /* Block */ && ts.isFunctionLike(node.parent);
     }
     ts.isFunctionBlock = isFunctionBlock;
     function isObjectLiteralMethod(node) {
-        return node && node.kind === 165 /* MethodDeclaration */ && node.parent.kind === 200 /* ObjectLiteralExpression */;
+        return node && node.kind === 166 /* MethodDeclaration */ && node.parent.kind === 201 /* ObjectLiteralExpression */;
     }
     ts.isObjectLiteralMethod = isObjectLiteralMethod;
     function isObjectLiteralOrClassExpressionMethod(node) {
-        return node.kind === 165 /* MethodDeclaration */ &&
-            (node.parent.kind === 200 /* ObjectLiteralExpression */ ||
-                node.parent.kind === 221 /* ClassExpression */);
+        return node.kind === 166 /* MethodDeclaration */ &&
+            (node.parent.kind === 201 /* ObjectLiteralExpression */ ||
+                node.parent.kind === 222 /* ClassExpression */);
     }
     ts.isObjectLiteralOrClassExpressionMethod = isObjectLiteralOrClassExpressionMethod;
     function isIdentifierTypePredicate(predicate) {
@@ -14930,7 +15117,7 @@ var ts;
     ts.isThisTypePredicate = isThisTypePredicate;
     function getPropertyAssignment(objectLiteral, key, key2) {
         return objectLiteral.properties.filter(function (property) {
-            if (property.kind === 288 /* PropertyAssignment */) {
+            if (property.kind === 289 /* PropertyAssignment */) {
                 var propName = getTextOfPropertyName(property.name);
                 return key === propName || (!!key2 && key2 === propName);
             }
@@ -14979,14 +15166,14 @@ var ts;
     }
     ts.getContainingClass = getContainingClass;
     function getThisContainer(node, includeArrowFunctions) {
-        ts.Debug.assert(node.kind !== 297 /* SourceFile */);
+        ts.Debug.assert(node.kind !== 298 /* 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 158 /* ComputedPropertyName */:
+                case 159 /* 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
@@ -15001,9 +15188,9 @@ var ts;
                     // the *body* of the container.
                     node = node.parent;
                     break;
-                case 161 /* Decorator */:
+                case 162 /* Decorator */:
                     // Decorators are always applied outside of the body of a class or method.
-                    if (node.parent.kind === 160 /* Parameter */ && ts.isClassElement(node.parent.parent)) {
+                    if (node.parent.kind === 161 /* 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;
@@ -15014,26 +15201,26 @@ var ts;
                         node = node.parent;
                     }
                     break;
-                case 209 /* ArrowFunction */:
+                case 210 /* ArrowFunction */:
                     if (!includeArrowFunctions) {
                         continue;
                     }
                 // falls through
-                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 */:
+                case 252 /* FunctionDeclaration */:
+                case 209 /* FunctionExpression */:
+                case 257 /* ModuleDeclaration */:
+                case 164 /* PropertyDeclaration */:
+                case 163 /* PropertySignature */:
+                case 166 /* MethodDeclaration */:
+                case 165 /* MethodSignature */:
+                case 167 /* Constructor */:
+                case 168 /* GetAccessor */:
+                case 169 /* SetAccessor */:
+                case 170 /* CallSignature */:
+                case 171 /* ConstructSignature */:
+                case 172 /* IndexSignature */:
+                case 256 /* EnumDeclaration */:
+                case 298 /* SourceFile */:
                     return node;
             }
         }
@@ -15052,9 +15239,9 @@ var ts;
         var container = getThisContainer(node, /*includeArrowFunctions*/ false);
         if (container) {
             switch (container.kind) {
-                case 166 /* Constructor */:
-                case 251 /* FunctionDeclaration */:
-                case 208 /* FunctionExpression */:
+                case 167 /* Constructor */:
+                case 252 /* FunctionDeclaration */:
+                case 209 /* FunctionExpression */:
                     return container;
             }
         }
@@ -15076,27 +15263,27 @@ var ts;
                 return node;
             }
             switch (node.kind) {
-                case 158 /* ComputedPropertyName */:
+                case 159 /* ComputedPropertyName */:
                     node = node.parent;
                     break;
-                case 251 /* FunctionDeclaration */:
-                case 208 /* FunctionExpression */:
-                case 209 /* ArrowFunction */:
+                case 252 /* FunctionDeclaration */:
+                case 209 /* FunctionExpression */:
+                case 210 /* ArrowFunction */:
                     if (!stopOnFunctions) {
                         continue;
                     }
                 // falls through
-                case 163 /* PropertyDeclaration */:
-                case 162 /* PropertySignature */:
-                case 165 /* MethodDeclaration */:
-                case 164 /* MethodSignature */:
-                case 166 /* Constructor */:
-                case 167 /* GetAccessor */:
-                case 168 /* SetAccessor */:
+                case 164 /* PropertyDeclaration */:
+                case 163 /* PropertySignature */:
+                case 166 /* MethodDeclaration */:
+                case 165 /* MethodSignature */:
+                case 167 /* Constructor */:
+                case 168 /* GetAccessor */:
+                case 169 /* SetAccessor */:
                     return node;
-                case 161 /* Decorator */:
+                case 162 /* Decorator */:
                     // Decorators are always applied outside of the body of a class or method.
-                    if (node.parent.kind === 160 /* Parameter */ && ts.isClassElement(node.parent.parent)) {
+                    if (node.parent.kind === 161 /* 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;
@@ -15112,14 +15299,14 @@ var ts;
     }
     ts.getSuperContainer = getSuperContainer;
     function getImmediatelyInvokedFunctionExpression(func) {
-        if (func.kind === 208 /* FunctionExpression */ || func.kind === 209 /* ArrowFunction */) {
+        if (func.kind === 209 /* FunctionExpression */ || func.kind === 210 /* ArrowFunction */) {
             var prev = func;
             var parent = func.parent;
-            while (parent.kind === 207 /* ParenthesizedExpression */) {
+            while (parent.kind === 208 /* ParenthesizedExpression */) {
                 prev = parent;
                 parent = parent.parent;
             }
-            if (parent.kind === 203 /* CallExpression */ && parent.expression === prev) {
+            if (parent.kind === 204 /* CallExpression */ && parent.expression === prev) {
                 return parent;
             }
         }
@@ -15135,7 +15322,7 @@ var ts;
      */
     function isSuperProperty(node) {
         var kind = node.kind;
-        return (kind === 201 /* PropertyAccessExpression */ || kind === 202 /* ElementAccessExpression */)
+        return (kind === 202 /* PropertyAccessExpression */ || kind === 203 /* ElementAccessExpression */)
             && node.expression.kind === 105 /* SuperKeyword */;
     }
     ts.isSuperProperty = isSuperProperty;
@@ -15144,7 +15331,7 @@ var ts;
      */
     function isThisProperty(node) {
         var kind = node.kind;
-        return (kind === 201 /* PropertyAccessExpression */ || kind === 202 /* ElementAccessExpression */)
+        return (kind === 202 /* PropertyAccessExpression */ || kind === 203 /* ElementAccessExpression */)
             && node.expression.kind === 107 /* ThisKeyword */;
     }
     ts.isThisProperty = isThisProperty;
@@ -15153,17 +15340,25 @@ var ts;
         return !!node && ts.isVariableDeclaration(node) && ((_a = node.initializer) === null || _a === void 0 ? void 0 : _a.kind) === 107 /* ThisKeyword */;
     }
     ts.isThisInitializedDeclaration = isThisInitializedDeclaration;
+    function isThisInitializedObjectBindingExpression(node) {
+        return !!node
+            && (ts.isShorthandPropertyAssignment(node) || ts.isPropertyAssignment(node))
+            && ts.isBinaryExpression(node.parent.parent)
+            && node.parent.parent.operatorToken.kind === 62 /* EqualsToken */
+            && node.parent.parent.right.kind === 107 /* ThisKeyword */;
+    }
+    ts.isThisInitializedObjectBindingExpression = isThisInitializedObjectBindingExpression;
     function getEntityNameFromTypeNode(node) {
         switch (node.kind) {
-            case 173 /* TypeReference */:
+            case 174 /* TypeReference */:
                 return node.typeName;
-            case 223 /* ExpressionWithTypeArguments */:
+            case 224 /* 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 157 /* QualifiedName */:
+            case 158 /* QualifiedName */:
                 return node;
         }
         return undefined;
@@ -15171,10 +15366,10 @@ var ts;
     ts.getEntityNameFromTypeNode = getEntityNameFromTypeNode;
     function getInvokedExpression(node) {
         switch (node.kind) {
-            case 205 /* TaggedTemplateExpression */:
+            case 206 /* TaggedTemplateExpression */:
                 return node.tag;
-            case 275 /* JsxOpeningElement */:
-            case 274 /* JsxSelfClosingElement */:
+            case 276 /* JsxOpeningElement */:
+            case 275 /* JsxSelfClosingElement */:
                 return node.tagName;
             default:
                 return node.expression;
@@ -15187,25 +15382,25 @@ var ts;
             return false;
         }
         switch (node.kind) {
-            case 252 /* ClassDeclaration */:
+            case 253 /* ClassDeclaration */:
                 // classes are valid targets
                 return true;
-            case 163 /* PropertyDeclaration */:
+            case 164 /* PropertyDeclaration */:
                 // property declarations are valid if their parent is a class declaration.
-                return parent.kind === 252 /* ClassDeclaration */;
-            case 167 /* GetAccessor */:
-            case 168 /* SetAccessor */:
-            case 165 /* MethodDeclaration */:
+                return parent.kind === 253 /* ClassDeclaration */;
+            case 168 /* GetAccessor */:
+            case 169 /* SetAccessor */:
+            case 166 /* 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 === 252 /* ClassDeclaration */;
-            case 160 /* Parameter */:
+                    && parent.kind === 253 /* ClassDeclaration */;
+            case 161 /* 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 === 166 /* Constructor */
-                        || parent.kind === 165 /* MethodDeclaration */
-                        || parent.kind === 168 /* SetAccessor */)
-                    && grandparent.kind === 252 /* ClassDeclaration */;
+                    && (parent.kind === 167 /* Constructor */
+                        || parent.kind === 166 /* MethodDeclaration */
+                        || parent.kind === 169 /* SetAccessor */)
+                    && grandparent.kind === 253 /* ClassDeclaration */;
         }
         return false;
     }
@@ -15221,10 +15416,10 @@ var ts;
     ts.nodeOrChildIsDecorated = nodeOrChildIsDecorated;
     function childIsDecorated(node, parent) {
         switch (node.kind) {
-            case 252 /* ClassDeclaration */:
+            case 253 /* ClassDeclaration */:
                 return ts.some(node.members, function (m) { return nodeOrChildIsDecorated(m, node, parent); }); // TODO: GH#18217
-            case 165 /* MethodDeclaration */:
-            case 168 /* SetAccessor */:
+            case 166 /* MethodDeclaration */:
+            case 169 /* SetAccessor */:
                 return ts.some(node.parameters, function (p) { return nodeIsDecorated(p, node, parent); }); // TODO: GH#18217
             default:
                 return false;
@@ -15233,9 +15428,9 @@ var ts;
     ts.childIsDecorated = childIsDecorated;
     function isJSXTagName(node) {
         var parent = node.parent;
-        if (parent.kind === 275 /* JsxOpeningElement */ ||
-            parent.kind === 274 /* JsxSelfClosingElement */ ||
-            parent.kind === 276 /* JsxClosingElement */) {
+        if (parent.kind === 276 /* JsxOpeningElement */ ||
+            parent.kind === 275 /* JsxSelfClosingElement */ ||
+            parent.kind === 277 /* JsxClosingElement */) {
             return parent.tagName === node;
         }
         return false;
@@ -15248,44 +15443,44 @@ var ts;
             case 109 /* TrueKeyword */:
             case 94 /* FalseKeyword */:
             case 13 /* RegularExpressionLiteral */:
-            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 */:
+            case 200 /* ArrayLiteralExpression */:
+            case 201 /* ObjectLiteralExpression */:
+            case 202 /* PropertyAccessExpression */:
+            case 203 /* ElementAccessExpression */:
+            case 204 /* CallExpression */:
+            case 205 /* NewExpression */:
+            case 206 /* TaggedTemplateExpression */:
+            case 225 /* AsExpression */:
+            case 207 /* TypeAssertionExpression */:
+            case 226 /* NonNullExpression */:
+            case 208 /* ParenthesizedExpression */:
+            case 209 /* FunctionExpression */:
+            case 222 /* ClassExpression */:
+            case 210 /* ArrowFunction */:
+            case 213 /* VoidExpression */:
+            case 211 /* DeleteExpression */:
+            case 212 /* TypeOfExpression */:
+            case 215 /* PrefixUnaryExpression */:
+            case 216 /* PostfixUnaryExpression */:
+            case 217 /* BinaryExpression */:
+            case 218 /* ConditionalExpression */:
+            case 221 /* SpreadElement */:
+            case 219 /* TemplateExpression */:
+            case 223 /* OmittedExpression */:
+            case 274 /* JsxElement */:
+            case 275 /* JsxSelfClosingElement */:
+            case 278 /* JsxFragment */:
+            case 220 /* YieldExpression */:
+            case 214 /* AwaitExpression */:
+            case 227 /* MetaProperty */:
                 return true;
-            case 157 /* QualifiedName */:
-                while (node.parent.kind === 157 /* QualifiedName */) {
+            case 158 /* QualifiedName */:
+                while (node.parent.kind === 158 /* QualifiedName */) {
                     node = node.parent;
                 }
-                return node.parent.kind === 176 /* TypeQuery */ || isJSXTagName(node);
+                return node.parent.kind === 177 /* TypeQuery */ || isJSXTagName(node);
             case 78 /* Identifier */:
-                if (node.parent.kind === 176 /* TypeQuery */ || isJSXTagName(node)) {
+                if (node.parent.kind === 177 /* TypeQuery */ || isJSXTagName(node)) {
                     return true;
                 }
             // falls through
@@ -15303,49 +15498,49 @@ var ts;
     function isInExpressionContext(node) {
         var parent = node.parent;
         switch (parent.kind) {
-            case 249 /* VariableDeclaration */:
-            case 160 /* Parameter */:
-            case 163 /* PropertyDeclaration */:
-            case 162 /* PropertySignature */:
-            case 291 /* EnumMember */:
-            case 288 /* PropertyAssignment */:
-            case 198 /* BindingElement */:
+            case 250 /* VariableDeclaration */:
+            case 161 /* Parameter */:
+            case 164 /* PropertyDeclaration */:
+            case 163 /* PropertySignature */:
+            case 292 /* EnumMember */:
+            case 289 /* PropertyAssignment */:
+            case 199 /* BindingElement */:
                 return parent.initializer === node;
-            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 */:
+            case 234 /* ExpressionStatement */:
+            case 235 /* IfStatement */:
+            case 236 /* DoStatement */:
+            case 237 /* WhileStatement */:
+            case 243 /* ReturnStatement */:
+            case 244 /* WithStatement */:
+            case 245 /* SwitchStatement */:
+            case 285 /* CaseClause */:
+            case 247 /* ThrowStatement */:
                 return parent.expression === node;
-            case 237 /* ForStatement */:
+            case 238 /* ForStatement */:
                 var forStatement = parent;
-                return (forStatement.initializer === node && forStatement.initializer.kind !== 250 /* VariableDeclarationList */) ||
+                return (forStatement.initializer === node && forStatement.initializer.kind !== 251 /* VariableDeclarationList */) ||
                     forStatement.condition === node ||
                     forStatement.incrementor === node;
-            case 238 /* ForInStatement */:
-            case 239 /* ForOfStatement */:
+            case 239 /* ForInStatement */:
+            case 240 /* ForOfStatement */:
                 var forInStatement = parent;
-                return (forInStatement.initializer === node && forInStatement.initializer.kind !== 250 /* VariableDeclarationList */) ||
+                return (forInStatement.initializer === node && forInStatement.initializer.kind !== 251 /* VariableDeclarationList */) ||
                     forInStatement.expression === node;
-            case 206 /* TypeAssertionExpression */:
-            case 224 /* AsExpression */:
+            case 207 /* TypeAssertionExpression */:
+            case 225 /* AsExpression */:
                 return node === parent.expression;
-            case 228 /* TemplateSpan */:
+            case 229 /* TemplateSpan */:
                 return node === parent.expression;
-            case 158 /* ComputedPropertyName */:
+            case 159 /* ComputedPropertyName */:
                 return node === parent.expression;
-            case 161 /* Decorator */:
-            case 283 /* JsxExpression */:
-            case 282 /* JsxSpreadAttribute */:
-            case 290 /* SpreadAssignment */:
+            case 162 /* Decorator */:
+            case 284 /* JsxExpression */:
+            case 283 /* JsxSpreadAttribute */:
+            case 291 /* SpreadAssignment */:
                 return true;
-            case 223 /* ExpressionWithTypeArguments */:
+            case 224 /* ExpressionWithTypeArguments */:
                 return parent.expression === node && isExpressionWithTypeArgumentsInClassExtendsClause(parent);
-            case 289 /* ShorthandPropertyAssignment */:
+            case 290 /* ShorthandPropertyAssignment */:
                 return parent.objectAssignmentInitializer === node;
             default:
                 return isExpressionNode(parent);
@@ -15353,14 +15548,18 @@ var ts;
     }
     ts.isInExpressionContext = isInExpressionContext;
     function isPartOfTypeQuery(node) {
-        while (node.kind === 157 /* QualifiedName */ || node.kind === 78 /* Identifier */) {
+        while (node.kind === 158 /* QualifiedName */ || node.kind === 78 /* Identifier */) {
             node = node.parent;
         }
-        return node.kind === 176 /* TypeQuery */;
+        return node.kind === 177 /* TypeQuery */;
     }
     ts.isPartOfTypeQuery = isPartOfTypeQuery;
+    function isNamespaceReexportDeclaration(node) {
+        return ts.isNamespaceExport(node) && !!node.parent.moduleSpecifier;
+    }
+    ts.isNamespaceReexportDeclaration = isNamespaceReexportDeclaration;
     function isExternalModuleImportEqualsDeclaration(node) {
-        return node.kind === 260 /* ImportEqualsDeclaration */ && node.moduleReference.kind === 272 /* ExternalModuleReference */;
+        return node.kind === 261 /* ImportEqualsDeclaration */ && node.moduleReference.kind === 273 /* ExternalModuleReference */;
     }
     ts.isExternalModuleImportEqualsDeclaration = isExternalModuleImportEqualsDeclaration;
     function getExternalModuleImportEqualsDeclarationExpression(node) {
@@ -15369,12 +15568,11 @@ var ts;
     }
     ts.getExternalModuleImportEqualsDeclarationExpression = getExternalModuleImportEqualsDeclarationExpression;
     function getExternalModuleRequireArgument(node) {
-        return isRequireVariableDeclaration(node, /*requireStringLiteralLikeArgument*/ true)
-            && getLeftmostAccessExpression(node.initializer).arguments[0];
+        return isRequireVariableDeclaration(node) && getLeftmostAccessExpression(node.initializer).arguments[0];
     }
     ts.getExternalModuleRequireArgument = getExternalModuleRequireArgument;
     function isInternalModuleImportEqualsDeclaration(node) {
-        return node.kind === 260 /* ImportEqualsDeclaration */ && node.moduleReference.kind !== 272 /* ExternalModuleReference */;
+        return node.kind === 261 /* ImportEqualsDeclaration */ && node.moduleReference.kind !== 273 /* ExternalModuleReference */;
     }
     ts.isInternalModuleImportEqualsDeclaration = isInternalModuleImportEqualsDeclaration;
     function isSourceFileJS(file) {
@@ -15410,7 +15608,7 @@ var ts;
     }
     ts.isJSDocIndexSignature = isJSDocIndexSignature;
     function isRequireCall(callExpression, requireStringLiteralLikeArgument) {
-        if (callExpression.kind !== 203 /* CallExpression */) {
+        if (callExpression.kind !== 204 /* CallExpression */) {
             return false;
         }
         var _a = callExpression, expression = _a.expression, args = _a.arguments;
@@ -15424,18 +15622,21 @@ var ts;
         return !requireStringLiteralLikeArgument || ts.isStringLiteralLike(arg);
     }
     ts.isRequireCall = isRequireCall;
-    function isRequireVariableDeclaration(node, requireStringLiteralLikeArgument) {
-        if (node.kind === 198 /* BindingElement */) {
+    /**
+     * Returns true if the node is a VariableDeclaration initialized to a require call (see `isRequireCall`).
+     * This function does not test if the node is in a JavaScript file or not.
+     */
+    function isRequireVariableDeclaration(node) {
+        if (node.kind === 199 /* BindingElement */) {
             node = node.parent.parent;
         }
-        return ts.isVariableDeclaration(node) && !!node.initializer && isRequireCall(getLeftmostAccessExpression(node.initializer), requireStringLiteralLikeArgument);
+        return ts.isVariableDeclaration(node) && !!node.initializer && isRequireCall(getLeftmostAccessExpression(node.initializer), /*requireStringLiteralLikeArgument*/ true);
     }
     ts.isRequireVariableDeclaration = isRequireVariableDeclaration;
-    function isRequireVariableStatement(node, requireStringLiteralLikeArgument) {
-        if (requireStringLiteralLikeArgument === void 0) { requireStringLiteralLikeArgument = true; }
+    function isRequireVariableStatement(node) {
         return ts.isVariableStatement(node)
             && node.declarationList.declarations.length > 0
-            && ts.every(node.declarationList.declarations, function (decl) { return isRequireVariableDeclaration(decl, requireStringLiteralLikeArgument); });
+            && ts.every(node.declarationList.declarations, function (decl) { return isRequireVariableDeclaration(decl); });
     }
     ts.isRequireVariableStatement = isRequireVariableStatement;
     function isSingleOrDoubleQuote(charCode) {
@@ -15507,11 +15708,11 @@ var ts;
     function getExpandoInitializer(initializer, isPrototypeAssignment) {
         if (ts.isCallExpression(initializer)) {
             var e = skipParentheses(initializer.expression);
-            return e.kind === 208 /* FunctionExpression */ || e.kind === 209 /* ArrowFunction */ ? initializer : undefined;
+            return e.kind === 209 /* FunctionExpression */ || e.kind === 210 /* ArrowFunction */ ? initializer : undefined;
         }
-        if (initializer.kind === 208 /* FunctionExpression */ ||
-            initializer.kind === 221 /* ClassExpression */ ||
-            initializer.kind === 209 /* ArrowFunction */) {
+        if (initializer.kind === 209 /* FunctionExpression */ ||
+            initializer.kind === 222 /* ClassExpression */ ||
+            initializer.kind === 210 /* ArrowFunction */) {
             return initializer;
         }
         if (ts.isObjectLiteralExpression(initializer) && (initializer.properties.length === 0 || isPrototypeAssignment)) {
@@ -15632,8 +15833,7 @@ var ts;
     ts.isLiteralLikeAccess = isLiteralLikeAccess;
     /** x[0] OR x['a'] OR x[Symbol.y] */
     function isLiteralLikeElementAccess(node) {
-        return ts.isElementAccessExpression(node) && (isStringOrNumericLiteralLike(node.argumentExpression) ||
-            isWellKnownSymbolSyntactically(node.argumentExpression));
+        return ts.isElementAccessExpression(node) && isStringOrNumericLiteralLike(node.argumentExpression);
     }
     ts.isLiteralLikeElementAccess = isLiteralLikeElementAccess;
     /** Any series of property and element accesses. */
@@ -15713,9 +15913,6 @@ var ts;
                 return ts.escapeLeadingUnderscores(name.text);
             }
         }
-        if (ts.isElementAccessExpression(node) && isWellKnownSymbolSyntactically(node.argumentExpression)) {
-            return getPropertyNameForKnownSymbolName(ts.idText(node.argumentExpression.name));
-        }
         return undefined;
     }
     ts.getElementOrPropertyAccessName = getElementOrPropertyAccessName;
@@ -15765,7 +15962,7 @@ var ts;
     ts.isPrototypePropertyAssignment = isPrototypePropertyAssignment;
     function isSpecialPropertyDeclaration(expr) {
         return isInJSFile(expr) &&
-            expr.parent && expr.parent.kind === 233 /* ExpressionStatement */ &&
+            expr.parent && expr.parent.kind === 234 /* ExpressionStatement */ &&
             (!ts.isElementAccessExpression(expr) || isLiteralLikeElementAccess(expr)) &&
             !!ts.getJSDocTypeTag(expr.parent);
     }
@@ -15786,23 +15983,37 @@ var ts;
             return false;
         }
         var decl = symbol.valueDeclaration;
-        return decl.kind === 251 /* FunctionDeclaration */ || ts.isVariableDeclaration(decl) && decl.initializer && ts.isFunctionLike(decl.initializer);
+        return decl.kind === 252 /* FunctionDeclaration */ || ts.isVariableDeclaration(decl) && decl.initializer && ts.isFunctionLike(decl.initializer);
     }
     ts.isFunctionSymbol = isFunctionSymbol;
+    function tryGetModuleSpecifierFromDeclaration(node) {
+        var _a, _b, _c;
+        switch (node.kind) {
+            case 250 /* VariableDeclaration */:
+                return node.initializer.arguments[0].text;
+            case 262 /* ImportDeclaration */:
+                return (_a = ts.tryCast(node.moduleSpecifier, ts.isStringLiteralLike)) === null || _a === void 0 ? void 0 : _a.text;
+            case 261 /* ImportEqualsDeclaration */:
+                return (_c = ts.tryCast((_b = ts.tryCast(node.moduleReference, ts.isExternalModuleReference)) === null || _b === void 0 ? void 0 : _b.expression, ts.isStringLiteralLike)) === null || _c === void 0 ? void 0 : _c.text;
+            default:
+                ts.Debug.assertNever(node);
+        }
+    }
+    ts.tryGetModuleSpecifierFromDeclaration = tryGetModuleSpecifierFromDeclaration;
     function importFromModuleSpecifier(node) {
         return tryGetImportFromModuleSpecifier(node) || ts.Debug.failBadSyntaxKind(node.parent);
     }
     ts.importFromModuleSpecifier = importFromModuleSpecifier;
     function tryGetImportFromModuleSpecifier(node) {
         switch (node.parent.kind) {
-            case 261 /* ImportDeclaration */:
-            case 267 /* ExportDeclaration */:
+            case 262 /* ImportDeclaration */:
+            case 268 /* ExportDeclaration */:
                 return node.parent;
-            case 272 /* ExternalModuleReference */:
+            case 273 /* ExternalModuleReference */:
                 return node.parent.parent;
-            case 203 /* CallExpression */:
+            case 204 /* CallExpression */:
                 return isImportCall(node.parent) || isRequireCall(node.parent, /*checkArg*/ false) ? node.parent : undefined;
-            case 191 /* LiteralType */:
+            case 192 /* LiteralType */:
                 ts.Debug.assert(ts.isStringLiteral(node));
                 return ts.tryCast(node.parent.parent, ts.isImportTypeNode);
             default:
@@ -15812,16 +16023,16 @@ var ts;
     ts.tryGetImportFromModuleSpecifier = tryGetImportFromModuleSpecifier;
     function getExternalModuleName(node) {
         switch (node.kind) {
-            case 261 /* ImportDeclaration */:
-            case 267 /* ExportDeclaration */:
+            case 262 /* ImportDeclaration */:
+            case 268 /* ExportDeclaration */:
                 return node.moduleSpecifier;
-            case 260 /* ImportEqualsDeclaration */:
-                return node.moduleReference.kind === 272 /* ExternalModuleReference */ ? node.moduleReference.expression : undefined;
-            case 195 /* ImportType */:
+            case 261 /* ImportEqualsDeclaration */:
+                return node.moduleReference.kind === 273 /* ExternalModuleReference */ ? node.moduleReference.expression : undefined;
+            case 196 /* ImportType */:
                 return isLiteralImportTypeNode(node) ? node.argument.literal : undefined;
-            case 203 /* CallExpression */:
+            case 204 /* CallExpression */:
                 return node.arguments[0];
-            case 256 /* ModuleDeclaration */:
+            case 257 /* ModuleDeclaration */:
                 return node.name.kind === 10 /* StringLiteral */ ? node.name : undefined;
             default:
                 return ts.Debug.assertNever(node);
@@ -15830,11 +16041,11 @@ var ts;
     ts.getExternalModuleName = getExternalModuleName;
     function getNamespaceDeclarationNode(node) {
         switch (node.kind) {
-            case 261 /* ImportDeclaration */:
+            case 262 /* ImportDeclaration */:
                 return node.importClause && ts.tryCast(node.importClause.namedBindings, ts.isNamespaceImport);
-            case 260 /* ImportEqualsDeclaration */:
+            case 261 /* ImportEqualsDeclaration */:
                 return node;
-            case 267 /* ExportDeclaration */:
+            case 268 /* ExportDeclaration */:
                 return node.exportClause && ts.tryCast(node.exportClause, ts.isNamespaceExport);
             default:
                 return ts.Debug.assertNever(node);
@@ -15842,7 +16053,7 @@ var ts;
     }
     ts.getNamespaceDeclarationNode = getNamespaceDeclarationNode;
     function isDefaultImport(node) {
-        return node.kind === 261 /* ImportDeclaration */ && !!node.importClause && !!node.importClause.name;
+        return node.kind === 262 /* ImportDeclaration */ && !!node.importClause && !!node.importClause.name;
     }
     ts.isDefaultImport = isDefaultImport;
     function forEachImportClauseDeclaration(node, action) {
@@ -15863,13 +16074,13 @@ var ts;
     function hasQuestionToken(node) {
         if (node) {
             switch (node.kind) {
-                case 160 /* Parameter */:
-                case 165 /* MethodDeclaration */:
-                case 164 /* MethodSignature */:
-                case 289 /* ShorthandPropertyAssignment */:
-                case 288 /* PropertyAssignment */:
-                case 163 /* PropertyDeclaration */:
-                case 162 /* PropertySignature */:
+                case 161 /* Parameter */:
+                case 166 /* MethodDeclaration */:
+                case 165 /* MethodSignature */:
+                case 290 /* ShorthandPropertyAssignment */:
+                case 289 /* PropertyAssignment */:
+                case 164 /* PropertyDeclaration */:
+                case 163 /* PropertySignature */:
                     return node.questionToken !== undefined;
             }
         }
@@ -15883,7 +16094,7 @@ var ts;
     }
     ts.isJSDocConstructSignature = isJSDocConstructSignature;
     function isJSDocTypeAlias(node) {
-        return node.kind === 331 /* JSDocTypedefTag */ || node.kind === 324 /* JSDocCallbackTag */ || node.kind === 325 /* JSDocEnumTag */;
+        return node.kind === 335 /* JSDocTypedefTag */ || node.kind === 328 /* JSDocCallbackTag */ || node.kind === 329 /* JSDocEnumTag */;
     }
     ts.isJSDocTypeAlias = isJSDocTypeAlias;
     function isTypeAlias(node) {
@@ -15908,12 +16119,12 @@ var ts;
     }
     function getSingleInitializerOfVariableStatementOrPropertyDeclaration(node) {
         switch (node.kind) {
-            case 232 /* VariableStatement */:
+            case 233 /* VariableStatement */:
                 var v = getSingleVariableOfVariableStatement(node);
                 return v && v.initializer;
-            case 163 /* PropertyDeclaration */:
+            case 164 /* PropertyDeclaration */:
                 return node.initializer;
-            case 288 /* PropertyAssignment */:
+            case 289 /* PropertyAssignment */:
                 return node.initializer;
         }
     }
@@ -15925,7 +16136,7 @@ var ts;
     function getNestedModuleDeclaration(node) {
         return ts.isModuleDeclaration(node) &&
             node.body &&
-            node.body.kind === 256 /* ModuleDeclaration */
+            node.body.kind === 257 /* ModuleDeclaration */
             ? node.body
             : undefined;
     }
@@ -15940,11 +16151,11 @@ var ts;
             if (ts.hasJSDocNodes(node)) {
                 result = ts.append(result, ts.last(node.jsDoc));
             }
-            if (node.kind === 160 /* Parameter */) {
+            if (node.kind === 161 /* Parameter */) {
                 result = ts.addRange(result, (noCache ? ts.getJSDocParameterTagsNoCache : ts.getJSDocParameterTags)(node));
                 break;
             }
-            if (node.kind === 159 /* TypeParameter */) {
+            if (node.kind === 160 /* TypeParameter */) {
                 result = ts.addRange(result, (noCache ? ts.getJSDocTypeParameterTagsNoCache : ts.getJSDocTypeParameterTags)(node));
                 break;
             }
@@ -15955,10 +16166,11 @@ var ts;
     ts.getJSDocCommentsAndTags = getJSDocCommentsAndTags;
     function getNextJSDocCommentLocation(node) {
         var parent = node.parent;
-        if (parent.kind === 288 /* PropertyAssignment */ ||
-            parent.kind === 266 /* ExportAssignment */ ||
-            parent.kind === 163 /* PropertyDeclaration */ ||
-            parent.kind === 233 /* ExpressionStatement */ && node.kind === 201 /* PropertyAccessExpression */ ||
+        if (parent.kind === 289 /* PropertyAssignment */ ||
+            parent.kind === 267 /* ExportAssignment */ ||
+            parent.kind === 164 /* PropertyDeclaration */ ||
+            parent.kind === 234 /* ExpressionStatement */ && node.kind === 202 /* PropertyAccessExpression */ ||
+            parent.kind === 243 /* ReturnStatement */ ||
             getNestedModuleDeclaration(parent) ||
             ts.isBinaryExpression(node) && node.operatorToken.kind === 62 /* EqualsToken */) {
             return parent;
@@ -16045,7 +16257,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 === 309 /* JSDocVariadicType */;
+        return node.dotDotDotToken !== undefined || !!type && type.kind === 310 /* JSDocVariadicType */;
     }
     ts.isRestParameter = isRestParameter;
     function hasTypeArguments(node) {
@@ -16062,31 +16274,34 @@ var ts;
         var parent = node.parent;
         while (true) {
             switch (parent.kind) {
-                case 216 /* BinaryExpression */:
+                case 217 /* BinaryExpression */:
                     var binaryOperator = parent.operatorToken.kind;
                     return isAssignmentOperator(binaryOperator) && parent.left === node ?
                         binaryOperator === 62 /* EqualsToken */ || isLogicalOrCoalescingAssignmentOperator(binaryOperator) ? 1 /* Definite */ : 2 /* Compound */ :
                         0 /* None */;
-                case 214 /* PrefixUnaryExpression */:
-                case 215 /* PostfixUnaryExpression */:
+                case 215 /* PrefixUnaryExpression */:
+                case 216 /* PostfixUnaryExpression */:
                     var unaryOperator = parent.operator;
                     return unaryOperator === 45 /* PlusPlusToken */ || unaryOperator === 46 /* MinusMinusToken */ ? 2 /* Compound */ : 0 /* None */;
-                case 238 /* ForInStatement */:
-                case 239 /* ForOfStatement */:
+                case 239 /* ForInStatement */:
+                case 240 /* ForOfStatement */:
                     return parent.initializer === node ? 1 /* Definite */ : 0 /* None */;
-                case 207 /* ParenthesizedExpression */:
-                case 199 /* ArrayLiteralExpression */:
-                case 220 /* SpreadElement */:
-                case 225 /* NonNullExpression */:
+                case 208 /* ParenthesizedExpression */:
+                case 200 /* ArrayLiteralExpression */:
+                case 221 /* SpreadElement */:
+                case 226 /* NonNullExpression */:
                     node = parent;
                     break;
-                case 289 /* ShorthandPropertyAssignment */:
+                case 291 /* SpreadAssignment */:
+                    node = parent.parent;
+                    break;
+                case 290 /* ShorthandPropertyAssignment */:
                     if (parent.name !== node) {
                         return 0 /* None */;
                     }
                     node = parent.parent;
                     break;
-                case 288 /* PropertyAssignment */:
+                case 289 /* PropertyAssignment */:
                     if (parent.name === node) {
                         return 0 /* None */;
                     }
@@ -16113,22 +16328,22 @@ var ts;
      */
     function isNodeWithPossibleHoistedDeclaration(node) {
         switch (node.kind) {
-            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 */:
+            case 231 /* Block */:
+            case 233 /* VariableStatement */:
+            case 244 /* WithStatement */:
+            case 235 /* IfStatement */:
+            case 245 /* SwitchStatement */:
+            case 259 /* CaseBlock */:
+            case 285 /* CaseClause */:
+            case 286 /* DefaultClause */:
+            case 246 /* LabeledStatement */:
+            case 238 /* ForStatement */:
+            case 239 /* ForInStatement */:
+            case 240 /* ForOfStatement */:
+            case 236 /* DoStatement */:
+            case 237 /* WhileStatement */:
+            case 248 /* TryStatement */:
+            case 288 /* CatchClause */:
                 return true;
         }
         return false;
@@ -16145,11 +16360,11 @@ var ts;
         return node;
     }
     function walkUpParenthesizedTypes(node) {
-        return walkUp(node, 186 /* ParenthesizedType */);
+        return walkUp(node, 187 /* ParenthesizedType */);
     }
     ts.walkUpParenthesizedTypes = walkUpParenthesizedTypes;
     function walkUpParenthesizedExpressions(node) {
-        return walkUp(node, 207 /* ParenthesizedExpression */);
+        return walkUp(node, 208 /* ParenthesizedExpression */);
     }
     ts.walkUpParenthesizedExpressions = walkUpParenthesizedExpressions;
     /**
@@ -16159,7 +16374,7 @@ var ts;
      */
     function walkUpParenthesizedTypesAndGetParentAndChild(node) {
         var child;
-        while (node && node.kind === 186 /* ParenthesizedType */) {
+        while (node && node.kind === 187 /* ParenthesizedType */) {
             child = node;
             node = node.parent;
         }
@@ -16171,18 +16386,18 @@ var ts;
     }
     ts.skipParentheses = skipParentheses;
     function skipParenthesesUp(node) {
-        while (node.kind === 207 /* ParenthesizedExpression */) {
+        while (node.kind === 208 /* 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 !== 201 /* PropertyAccessExpression */ && node.kind !== 202 /* ElementAccessExpression */) {
+        if (node.kind !== 202 /* PropertyAccessExpression */ && node.kind !== 203 /* ElementAccessExpression */) {
             return false;
         }
         node = walkUpParenthesizedExpressions(node.parent);
-        return node && node.kind === 210 /* DeleteExpression */;
+        return node && node.kind === 211 /* DeleteExpression */;
     }
     ts.isDeleteTarget = isDeleteTarget;
     function isNodeDescendantOf(node, ancestor) {
@@ -16235,7 +16450,7 @@ var ts;
     ts.getDeclarationFromName = getDeclarationFromName;
     function isLiteralComputedPropertyDeclarationName(node) {
         return isStringOrNumericLiteralLike(node) &&
-            node.parent.kind === 158 /* ComputedPropertyName */ &&
+            node.parent.kind === 159 /* ComputedPropertyName */ &&
             ts.isDeclaration(node.parent.parent);
     }
     ts.isLiteralComputedPropertyDeclarationName = isLiteralComputedPropertyDeclarationName;
@@ -16243,26 +16458,26 @@ var ts;
     function isIdentifierName(node) {
         var parent = node.parent;
         switch (parent.kind) {
-            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 */:
+            case 164 /* PropertyDeclaration */:
+            case 163 /* PropertySignature */:
+            case 166 /* MethodDeclaration */:
+            case 165 /* MethodSignature */:
+            case 168 /* GetAccessor */:
+            case 169 /* SetAccessor */:
+            case 292 /* EnumMember */:
+            case 289 /* PropertyAssignment */:
+            case 202 /* PropertyAccessExpression */:
                 // Name in member declaration or property name in property access
                 return parent.name === node;
-            case 157 /* QualifiedName */:
+            case 158 /* QualifiedName */:
                 // Name on right hand side of dot in a type query or type reference
                 return parent.right === node;
-            case 198 /* BindingElement */:
-            case 265 /* ImportSpecifier */:
+            case 199 /* BindingElement */:
+            case 266 /* ImportSpecifier */:
                 // Property name in binding element or import specifier
                 return parent.propertyName === node;
-            case 270 /* ExportSpecifier */:
-            case 280 /* JsxAttribute */:
+            case 271 /* ExportSpecifier */:
+            case 281 /* JsxAttribute */:
                 // Any name in an export specifier or JSX Attribute
                 return true;
         }
@@ -16282,33 +16497,33 @@ var ts;
     // {<Identifier>}
     // {name: <EntityNameExpression>}
     function isAliasSymbolDeclaration(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) ||
+        return node.kind === 261 /* ImportEqualsDeclaration */ ||
+            node.kind === 260 /* NamespaceExportDeclaration */ ||
+            node.kind === 263 /* ImportClause */ && !!node.name ||
+            node.kind === 264 /* NamespaceImport */ ||
+            node.kind === 270 /* NamespaceExport */ ||
+            node.kind === 266 /* ImportSpecifier */ ||
+            node.kind === 271 /* ExportSpecifier */ ||
+            node.kind === 267 /* 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 === 289 /* ShorthandPropertyAssignment */ ||
-            node.kind === 288 /* PropertyAssignment */ && isAliasableExpression(node.initializer);
+            node.kind === 290 /* ShorthandPropertyAssignment */ ||
+            node.kind === 289 /* PropertyAssignment */ && isAliasableExpression(node.initializer);
     }
     ts.isAliasSymbolDeclaration = isAliasSymbolDeclaration;
     function getAliasDeclarationFromName(node) {
         switch (node.parent.kind) {
-            case 262 /* ImportClause */:
-            case 265 /* ImportSpecifier */:
-            case 263 /* NamespaceImport */:
-            case 270 /* ExportSpecifier */:
-            case 266 /* ExportAssignment */:
-            case 260 /* ImportEqualsDeclaration */:
+            case 263 /* ImportClause */:
+            case 266 /* ImportSpecifier */:
+            case 264 /* NamespaceImport */:
+            case 271 /* ExportSpecifier */:
+            case 267 /* ExportAssignment */:
+            case 261 /* ImportEqualsDeclaration */:
                 return node.parent;
-            case 157 /* QualifiedName */:
+            case 158 /* QualifiedName */:
                 do {
                     node = node.parent;
-                } while (node.parent.kind === 157 /* QualifiedName */);
+                } while (node.parent.kind === 158 /* QualifiedName */);
                 return getAliasDeclarationFromName(node);
         }
     }
@@ -16327,7 +16542,7 @@ var ts;
     }
     ts.getExportAssignmentExpression = getExportAssignmentExpression;
     function getPropertyAssignmentAliasLikeExpression(node) {
-        return node.kind === 289 /* ShorthandPropertyAssignment */ ? node.name : node.kind === 288 /* PropertyAssignment */ ? node.initializer :
+        return node.kind === 290 /* ShorthandPropertyAssignment */ ? node.name : node.kind === 289 /* PropertyAssignment */ ? node.initializer :
             node.parent.right;
     }
     ts.getPropertyAssignmentAliasLikeExpression = getPropertyAssignmentAliasLikeExpression;
@@ -16393,11 +16608,11 @@ var ts;
     }
     ts.getAncestor = getAncestor;
     function isKeyword(token) {
-        return 80 /* FirstKeyword */ <= token && token <= 156 /* LastKeyword */;
+        return 80 /* FirstKeyword */ <= token && token <= 157 /* LastKeyword */;
     }
     ts.isKeyword = isKeyword;
     function isContextualKeyword(token) {
-        return 125 /* FirstContextualKeyword */ <= token && token <= 156 /* LastContextualKeyword */;
+        return 125 /* FirstContextualKeyword */ <= token && token <= 157 /* LastContextualKeyword */;
     }
     ts.isContextualKeyword = isContextualKeyword;
     function isNonContextualKeyword(token) {
@@ -16441,14 +16656,14 @@ var ts;
         }
         var flags = 0 /* Normal */;
         switch (node.kind) {
-            case 251 /* FunctionDeclaration */:
-            case 208 /* FunctionExpression */:
-            case 165 /* MethodDeclaration */:
+            case 252 /* FunctionDeclaration */:
+            case 209 /* FunctionExpression */:
+            case 166 /* MethodDeclaration */:
                 if (node.asteriskToken) {
                     flags |= 1 /* Generator */;
                 }
             // falls through
-            case 209 /* ArrowFunction */:
+            case 210 /* ArrowFunction */:
                 if (hasSyntacticModifier(node, 256 /* Async */)) {
                     flags |= 2 /* Async */;
                 }
@@ -16462,10 +16677,10 @@ var ts;
     ts.getFunctionFlags = getFunctionFlags;
     function isAsyncFunction(node) {
         switch (node.kind) {
-            case 251 /* FunctionDeclaration */:
-            case 208 /* FunctionExpression */:
-            case 209 /* ArrowFunction */:
-            case 165 /* MethodDeclaration */:
+            case 252 /* FunctionDeclaration */:
+            case 209 /* FunctionExpression */:
+            case 210 /* ArrowFunction */:
+            case 166 /* MethodDeclaration */:
                 return node.body !== undefined
                     && node.asteriskToken === undefined
                     && hasSyntacticModifier(node, 256 /* Async */);
@@ -16488,9 +16703,6 @@ var ts;
      *   3. The computed name is *not* expressed as a NumericLiteral.
      *   4. The computed name is *not* expressed as a PlusToken or MinusToken
      *      immediately followed by a NumericLiteral.
-     *   5. The computed name is *not* expressed as `Symbol.<name>`, where `<name>`
-     *      is a property of the Symbol constructor that denotes a built-in
-     *      Symbol.
      */
     function hasDynamicName(declaration) {
         var name = ts.getNameOfDeclaration(declaration);
@@ -16498,24 +16710,14 @@ var ts;
     }
     ts.hasDynamicName = hasDynamicName;
     function isDynamicName(name) {
-        if (!(name.kind === 158 /* ComputedPropertyName */ || name.kind === 202 /* ElementAccessExpression */)) {
+        if (!(name.kind === 159 /* ComputedPropertyName */ || name.kind === 203 /* ElementAccessExpression */)) {
             return false;
         }
         var expr = ts.isElementAccessExpression(name) ? skipParentheses(name.argumentExpression) : name.expression;
         return !isStringOrNumericLiteralLike(expr) &&
-            !isSignedNumericLiteral(expr) &&
-            !isWellKnownSymbolSyntactically(expr);
+            !isSignedNumericLiteral(expr);
     }
     ts.isDynamicName = isDynamicName;
-    /**
-     * Checks if the expression is of the form:
-     *    Symbol.name
-     * where Symbol is literally the word "Symbol", and name is any identifierName
-     */
-    function isWellKnownSymbolSyntactically(node) {
-        return ts.isPropertyAccessExpression(node) && isESSymbolIdentifier(node.expression);
-    }
-    ts.isWellKnownSymbolSyntactically = isWellKnownSymbolSyntactically;
     function getPropertyNameForPropertyNameNode(name) {
         switch (name.kind) {
             case 78 /* Identifier */:
@@ -16524,12 +16726,9 @@ var ts;
             case 10 /* StringLiteral */:
             case 8 /* NumericLiteral */:
                 return ts.escapeLeadingUnderscores(name.text);
-            case 158 /* ComputedPropertyName */:
+            case 159 /* ComputedPropertyName */:
                 var nameExpression = name.expression;
-                if (isWellKnownSymbolSyntactically(nameExpression)) {
-                    return getPropertyNameForKnownSymbolName(ts.idText(nameExpression.name));
-                }
-                else if (isStringOrNumericLiteralLike(nameExpression)) {
+                if (isStringOrNumericLiteralLike(nameExpression)) {
                     return ts.escapeLeadingUnderscores(nameExpression.text);
                 }
                 else if (isSignedNumericLiteral(nameExpression)) {
@@ -16557,21 +16756,17 @@ var ts;
     }
     ts.isPropertyNameLiteral = isPropertyNameLiteral;
     function getTextOfIdentifierOrLiteral(node) {
-        return ts.isIdentifierOrPrivateIdentifier(node) ? ts.idText(node) : node.text;
+        return ts.isMemberName(node) ? ts.idText(node) : node.text;
     }
     ts.getTextOfIdentifierOrLiteral = getTextOfIdentifierOrLiteral;
     function getEscapedTextOfIdentifierOrLiteral(node) {
-        return ts.isIdentifierOrPrivateIdentifier(node) ? node.escapedText : ts.escapeLeadingUnderscores(node.text);
+        return ts.isMemberName(node) ? node.escapedText : ts.escapeLeadingUnderscores(node.text);
     }
     ts.getEscapedTextOfIdentifierOrLiteral = getEscapedTextOfIdentifierOrLiteral;
     function getPropertyNameForUniqueESSymbol(symbol) {
         return "__@" + ts.getSymbolId(symbol) + "@" + symbol.escapedName;
     }
     ts.getPropertyNameForUniqueESSymbol = getPropertyNameForUniqueESSymbol;
-    function getPropertyNameForKnownSymbolName(symbolName) {
-        return "__@" + symbolName;
-    }
-    ts.getPropertyNameForKnownSymbolName = getPropertyNameForKnownSymbolName;
     function getSymbolNameForPrivateIdentifier(containingClassSymbol, description) {
         return "__#" + ts.getSymbolId(containingClassSymbol) + "@" + description;
     }
@@ -16593,11 +16788,11 @@ var ts;
     ts.isPushOrUnshiftIdentifier = isPushOrUnshiftIdentifier;
     function isParameterDeclaration(node) {
         var root = getRootDeclaration(node);
-        return root.kind === 160 /* Parameter */;
+        return root.kind === 161 /* Parameter */;
     }
     ts.isParameterDeclaration = isParameterDeclaration;
     function getRootDeclaration(node) {
-        while (node.kind === 198 /* BindingElement */) {
+        while (node.kind === 199 /* BindingElement */) {
             node = node.parent.parent;
         }
         return node;
@@ -16605,15 +16800,15 @@ var ts;
     ts.getRootDeclaration = getRootDeclaration;
     function nodeStartsNewLexicalEnvironment(node) {
         var kind = node.kind;
-        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 */;
+        return kind === 167 /* Constructor */
+            || kind === 209 /* FunctionExpression */
+            || kind === 252 /* FunctionDeclaration */
+            || kind === 210 /* ArrowFunction */
+            || kind === 166 /* MethodDeclaration */
+            || kind === 168 /* GetAccessor */
+            || kind === 169 /* SetAccessor */
+            || kind === 257 /* ModuleDeclaration */
+            || kind === 298 /* SourceFile */;
     }
     ts.nodeStartsNewLexicalEnvironment = nodeStartsNewLexicalEnvironment;
     function nodeIsSynthesized(range) {
@@ -16632,23 +16827,23 @@ var ts;
     })(Associativity = ts.Associativity || (ts.Associativity = {}));
     function getExpressionAssociativity(expression) {
         var operator = getOperator(expression);
-        var hasArguments = expression.kind === 204 /* NewExpression */ && expression.arguments !== undefined;
+        var hasArguments = expression.kind === 205 /* NewExpression */ && expression.arguments !== undefined;
         return getOperatorAssociativity(expression.kind, operator, hasArguments);
     }
     ts.getExpressionAssociativity = getExpressionAssociativity;
     function getOperatorAssociativity(kind, operator, hasArguments) {
         switch (kind) {
-            case 204 /* NewExpression */:
+            case 205 /* NewExpression */:
                 return hasArguments ? 0 /* Left */ : 1 /* Right */;
-            case 214 /* PrefixUnaryExpression */:
-            case 211 /* TypeOfExpression */:
-            case 212 /* VoidExpression */:
-            case 210 /* DeleteExpression */:
-            case 213 /* AwaitExpression */:
-            case 217 /* ConditionalExpression */:
-            case 219 /* YieldExpression */:
+            case 215 /* PrefixUnaryExpression */:
+            case 212 /* TypeOfExpression */:
+            case 213 /* VoidExpression */:
+            case 211 /* DeleteExpression */:
+            case 214 /* AwaitExpression */:
+            case 218 /* ConditionalExpression */:
+            case 220 /* YieldExpression */:
                 return 1 /* Right */;
-            case 216 /* BinaryExpression */:
+            case 217 /* BinaryExpression */:
                 switch (operator) {
                     case 42 /* AsteriskAsteriskToken */:
                     case 62 /* EqualsToken */:
@@ -16675,15 +16870,15 @@ var ts;
     ts.getOperatorAssociativity = getOperatorAssociativity;
     function getExpressionPrecedence(expression) {
         var operator = getOperator(expression);
-        var hasArguments = expression.kind === 204 /* NewExpression */ && expression.arguments !== undefined;
+        var hasArguments = expression.kind === 205 /* NewExpression */ && expression.arguments !== undefined;
         return getOperatorPrecedence(expression.kind, operator, hasArguments);
     }
     ts.getExpressionPrecedence = getExpressionPrecedence;
     function getOperator(expression) {
-        if (expression.kind === 216 /* BinaryExpression */) {
+        if (expression.kind === 217 /* BinaryExpression */) {
             return expression.operatorToken.kind;
         }
-        else if (expression.kind === 214 /* PrefixUnaryExpression */ || expression.kind === 215 /* PostfixUnaryExpression */) {
+        else if (expression.kind === 215 /* PrefixUnaryExpression */ || expression.kind === 216 /* PostfixUnaryExpression */) {
             return expression.operator;
         }
         else {
@@ -16862,15 +17057,15 @@ var ts;
     })(OperatorPrecedence = ts.OperatorPrecedence || (ts.OperatorPrecedence = {}));
     function getOperatorPrecedence(nodeKind, operatorKind, hasArguments) {
         switch (nodeKind) {
-            case 337 /* CommaListExpression */:
+            case 341 /* CommaListExpression */:
                 return 0 /* Comma */;
-            case 220 /* SpreadElement */:
+            case 221 /* SpreadElement */:
                 return 1 /* Spread */;
-            case 219 /* YieldExpression */:
+            case 220 /* YieldExpression */:
                 return 2 /* Yield */;
-            case 217 /* ConditionalExpression */:
+            case 218 /* ConditionalExpression */:
                 return 4 /* Conditional */;
-            case 216 /* BinaryExpression */:
+            case 217 /* BinaryExpression */:
                 switch (operatorKind) {
                     case 27 /* CommaToken */:
                         return 0 /* Comma */;
@@ -16895,25 +17090,26 @@ var ts;
                         return getBinaryOperatorPrecedence(operatorKind);
                 }
             // TODO: Should prefix `++` and `--` be moved to the `Update` precedence?
-            case 206 /* TypeAssertionExpression */:
-            case 225 /* NonNullExpression */:
-            case 214 /* PrefixUnaryExpression */:
-            case 211 /* TypeOfExpression */:
-            case 212 /* VoidExpression */:
-            case 210 /* DeleteExpression */:
-            case 213 /* AwaitExpression */:
+            case 207 /* TypeAssertionExpression */:
+            case 226 /* NonNullExpression */:
+            case 215 /* PrefixUnaryExpression */:
+            case 212 /* TypeOfExpression */:
+            case 213 /* VoidExpression */:
+            case 211 /* DeleteExpression */:
+            case 214 /* AwaitExpression */:
                 return 16 /* Unary */;
-            case 215 /* PostfixUnaryExpression */:
+            case 216 /* PostfixUnaryExpression */:
                 return 17 /* Update */;
-            case 203 /* CallExpression */:
+            case 204 /* CallExpression */:
                 return 18 /* LeftHandSide */;
-            case 204 /* NewExpression */:
+            case 205 /* NewExpression */:
                 return hasArguments ? 19 /* Member */ : 18 /* LeftHandSide */;
-            case 205 /* TaggedTemplateExpression */:
-            case 201 /* PropertyAccessExpression */:
-            case 202 /* ElementAccessExpression */:
+            case 206 /* TaggedTemplateExpression */:
+            case 202 /* PropertyAccessExpression */:
+            case 203 /* ElementAccessExpression */:
+            case 227 /* MetaProperty */:
                 return 19 /* Member */;
-            case 224 /* AsExpression */:
+            case 225 /* AsExpression */:
                 return 11 /* Relational */;
             case 107 /* ThisKeyword */:
             case 105 /* SuperKeyword */:
@@ -16924,19 +17120,19 @@ var ts;
             case 8 /* NumericLiteral */:
             case 9 /* BigIntLiteral */:
             case 10 /* StringLiteral */:
-            case 199 /* ArrayLiteralExpression */:
-            case 200 /* ObjectLiteralExpression */:
-            case 208 /* FunctionExpression */:
-            case 209 /* ArrowFunction */:
-            case 221 /* ClassExpression */:
+            case 200 /* ArrayLiteralExpression */:
+            case 201 /* ObjectLiteralExpression */:
+            case 209 /* FunctionExpression */:
+            case 210 /* ArrowFunction */:
+            case 222 /* ClassExpression */:
             case 13 /* RegularExpressionLiteral */:
             case 14 /* NoSubstitutionTemplateLiteral */:
-            case 218 /* TemplateExpression */:
-            case 207 /* ParenthesizedExpression */:
-            case 222 /* OmittedExpression */:
-            case 273 /* JsxElement */:
-            case 274 /* JsxSelfClosingElement */:
-            case 277 /* JsxFragment */:
+            case 219 /* TemplateExpression */:
+            case 208 /* ParenthesizedExpression */:
+            case 223 /* OmittedExpression */:
+            case 274 /* JsxElement */:
+            case 275 /* JsxSelfClosingElement */:
+            case 278 /* JsxFragment */:
                 return 20 /* Primary */;
             default:
                 return -1 /* Invalid */;
@@ -16992,7 +17188,7 @@ var ts;
     function getSemanticJsxChildren(children) {
         return ts.filter(children, function (i) {
             switch (i.kind) {
-                case 283 /* JsxExpression */:
+                case 284 /* JsxExpression */:
                     return !!i.expression;
                 case 11 /* JsxText */:
                     return !i.containsOnlyTriviaWhiteSpaces;
@@ -17483,8 +17679,8 @@ var ts;
         return !(options.noEmitForJsFiles && isSourceFileJS(sourceFile)) &&
             !sourceFile.isDeclarationFile &&
             !host.isSourceFileFromExternalLibrary(sourceFile) &&
-            !(isJsonSourceFile(sourceFile) && host.getResolvedProjectReferenceToRedirect(sourceFile.fileName)) &&
-            (forceDtsEmit || !host.isSourceOfProjectReferenceRedirect(sourceFile.fileName));
+            (forceDtsEmit || (!(isJsonSourceFile(sourceFile) && host.getResolvedProjectReferenceToRedirect(sourceFile.fileName)) &&
+                !host.isSourceOfProjectReferenceRedirect(sourceFile.fileName)));
     }
     ts.sourceFileMayBeEmitted = sourceFileMayBeEmitted;
     function getSourceFilePathInNewDir(fileName, host, newDirPath) {
@@ -17579,10 +17775,10 @@ var ts;
         var setAccessor;
         if (hasDynamicName(accessor)) {
             firstAccessor = accessor;
-            if (accessor.kind === 167 /* GetAccessor */) {
+            if (accessor.kind === 168 /* GetAccessor */) {
                 getAccessor = accessor;
             }
-            else if (accessor.kind === 168 /* SetAccessor */) {
+            else if (accessor.kind === 169 /* SetAccessor */) {
                 setAccessor = accessor;
             }
             else {
@@ -17602,10 +17798,10 @@ var ts;
                         else if (!secondAccessor) {
                             secondAccessor = member;
                         }
-                        if (member.kind === 167 /* GetAccessor */ && !getAccessor) {
+                        if (member.kind === 168 /* GetAccessor */ && !getAccessor) {
                             getAccessor = member;
                         }
-                        if (member.kind === 168 /* SetAccessor */ && !setAccessor) {
+                        if (member.kind === 169 /* SetAccessor */ && !setAccessor) {
                             setAccessor = member;
                         }
                     }
@@ -17654,7 +17850,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 === 311 /* JSDocComment */ && tag.parent.tags.some(isJSDocTypeAlias));
+        return ts.isJSDocTemplateTag(tag) && !(tag.parent.kind === 312 /* JSDocComment */ && tag.parent.tags.some(isJSDocTypeAlias));
     }
     /**
      * Gets the effective type annotation of the value parameter of a set accessor. If the node
@@ -17877,6 +18073,18 @@ var ts;
         return hasSyntacticModifier(node, 32 /* Static */);
     }
     ts.hasStaticModifier = hasStaticModifier;
+    function hasOverrideModifier(node) {
+        return hasEffectiveModifier(node, 16384 /* Override */);
+    }
+    ts.hasOverrideModifier = hasOverrideModifier;
+    function hasAbstractModifier(node) {
+        return hasSyntacticModifier(node, 128 /* Abstract */);
+    }
+    ts.hasAbstractModifier = hasAbstractModifier;
+    function hasAmbientModifier(node) {
+        return hasSyntacticModifier(node, 2 /* Ambient */);
+    }
+    ts.hasAmbientModifier = hasAmbientModifier;
     function hasEffectiveReadonlyModifier(node) {
         return hasEffectiveModifier(node, 64 /* Readonly */);
     }
@@ -17890,7 +18098,7 @@ var ts;
     }
     ts.getSelectedSyntacticModifierFlags = getSelectedSyntacticModifierFlags;
     function getModifierFlagsWorker(node, includeJSDoc, alwaysIncludeJSDoc) {
-        if (node.kind >= 0 /* FirstToken */ && node.kind <= 156 /* LastToken */) {
+        if (node.kind >= 0 /* FirstToken */ && node.kind <= 157 /* LastToken */) {
             return 0 /* None */;
         }
         if (!(node.modifierFlagsCache & 536870912 /* HasComputedFlags */)) {
@@ -17935,6 +18143,8 @@ var ts;
                     flags |= 16 /* Protected */;
                 if (ts.getJSDocReadonlyTagNoCache(node))
                     flags |= 64 /* Readonly */;
+                if (ts.getJSDocOverrideTagNoCache(node))
+                    flags |= 16384 /* Override */;
             }
             if (ts.getJSDocDeprecatedTagNoCache(node))
                 flags |= 8192 /* Deprecated */;
@@ -17987,10 +18197,15 @@ var ts;
             case 87 /* DefaultKeyword */: return 512 /* Default */;
             case 129 /* AsyncKeyword */: return 256 /* Async */;
             case 142 /* ReadonlyKeyword */: return 64 /* Readonly */;
+            case 156 /* OverrideKeyword */: return 16384 /* Override */;
         }
         return 0 /* None */;
     }
     ts.modifierToFlag = modifierToFlag;
+    function createModifiers(modifierFlags) {
+        return modifierFlags ? ts.factory.createNodeArray(ts.factory.createModifiersFromModifierFlags(modifierFlags)) : undefined;
+    }
+    ts.createModifiers = createModifiers;
     function isLogicalOperator(token) {
         return token === 56 /* BarBarToken */
             || token === 55 /* AmpersandAmpersandToken */
@@ -18033,11 +18248,15 @@ var ts;
             && ts.isLeftHandSideExpression(node.left);
     }
     ts.isAssignmentExpression = isAssignmentExpression;
+    function isLeftHandSideOfAssignment(node) {
+        return isAssignmentExpression(node.parent) && node.parent.left === node;
+    }
+    ts.isLeftHandSideOfAssignment = isLeftHandSideOfAssignment;
     function isDestructuringAssignment(node) {
         if (isAssignmentExpression(node, /*excludeCompoundAssignment*/ true)) {
             var kind = node.left.kind;
-            return kind === 200 /* ObjectLiteralExpression */
-                || kind === 199 /* ArrayLiteralExpression */;
+            return kind === 201 /* ObjectLiteralExpression */
+                || kind === 200 /* ArrayLiteralExpression */;
         }
         return false;
     }
@@ -18054,12 +18273,12 @@ var ts;
         switch (node.kind) {
             case 78 /* Identifier */:
                 return node;
-            case 157 /* QualifiedName */:
+            case 158 /* QualifiedName */:
                 do {
                     node = node.left;
                 } while (node.kind !== 78 /* Identifier */);
                 return node;
-            case 201 /* PropertyAccessExpression */:
+            case 202 /* PropertyAccessExpression */:
                 do {
                     node = node.expression;
                 } while (node.kind !== 78 /* Identifier */);
@@ -18068,9 +18287,12 @@ var ts;
     }
     ts.getFirstIdentifier = getFirstIdentifier;
     function isDottedName(node) {
-        return node.kind === 78 /* Identifier */ || node.kind === 107 /* ThisKeyword */ || node.kind === 105 /* SuperKeyword */ ||
-            node.kind === 201 /* PropertyAccessExpression */ && isDottedName(node.expression) ||
-            node.kind === 207 /* ParenthesizedExpression */ && isDottedName(node.expression);
+        return node.kind === 78 /* Identifier */
+            || node.kind === 107 /* ThisKeyword */
+            || node.kind === 105 /* SuperKeyword */
+            || node.kind === 227 /* MetaProperty */
+            || node.kind === 202 /* PropertyAccessExpression */ && isDottedName(node.expression)
+            || node.kind === 208 /* ParenthesizedExpression */ && isDottedName(node.expression);
     }
     ts.isDottedName = isDottedName;
     function isPropertyAccessEntityNameExpression(node) {
@@ -18101,22 +18323,22 @@ var ts;
     }
     ts.isPrototypeAccess = isPrototypeAccess;
     function isRightSideOfQualifiedNameOrPropertyAccess(node) {
-        return (node.parent.kind === 157 /* QualifiedName */ && node.parent.right === node) ||
-            (node.parent.kind === 201 /* PropertyAccessExpression */ && node.parent.name === node);
+        return (node.parent.kind === 158 /* QualifiedName */ && node.parent.right === node) ||
+            (node.parent.kind === 202 /* PropertyAccessExpression */ && node.parent.name === node);
     }
     ts.isRightSideOfQualifiedNameOrPropertyAccess = isRightSideOfQualifiedNameOrPropertyAccess;
     function isEmptyObjectLiteral(expression) {
-        return expression.kind === 200 /* ObjectLiteralExpression */ &&
+        return expression.kind === 201 /* ObjectLiteralExpression */ &&
             expression.properties.length === 0;
     }
     ts.isEmptyObjectLiteral = isEmptyObjectLiteral;
     function isEmptyArrayLiteral(expression) {
-        return expression.kind === 199 /* ArrayLiteralExpression */ &&
+        return expression.kind === 200 /* ArrayLiteralExpression */ &&
             expression.elements.length === 0;
     }
     ts.isEmptyArrayLiteral = isEmptyArrayLiteral;
     function getLocalSymbolForExportDefault(symbol) {
-        if (!isExportDefaultSymbol(symbol))
+        if (!isExportDefaultSymbol(symbol) || !symbol.declarations)
             return undefined;
         for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
             var decl = _a[_i];
@@ -18443,8 +18665,8 @@ var ts;
         var parseNode = ts.getParseTreeNode(node);
         if (parseNode) {
             switch (parseNode.parent.kind) {
-                case 255 /* EnumDeclaration */:
-                case 256 /* ModuleDeclaration */:
+                case 256 /* EnumDeclaration */:
+                case 257 /* ModuleDeclaration */:
                     return parseNode === parseNode.parent.name;
             }
         }
@@ -18471,9 +18693,11 @@ var ts;
         return symbol.flags & 33554432 /* Transient */ ? symbol.checkFlags : 0;
     }
     ts.getCheckFlags = getCheckFlags;
-    function getDeclarationModifierFlagsFromSymbol(s) {
+    function getDeclarationModifierFlagsFromSymbol(s, isWrite) {
+        if (isWrite === void 0) { isWrite = false; }
         if (s.valueDeclaration) {
-            var flags = ts.getCombinedModifierFlags(s.valueDeclaration);
+            var declaration = (isWrite && s.declarations && ts.find(s.declarations, function (d) { return d.kind === 169 /* SetAccessor */; })) || s.valueDeclaration;
+            var flags = ts.getCombinedModifierFlags(declaration);
             return s.parent && s.parent.flags & 32 /* Class */ ? flags : flags & ~28 /* AccessibilityModifier */;
         }
         if (getCheckFlags(s) & 6 /* Synthetic */) {
@@ -18521,35 +18745,35 @@ var ts;
         if (!parent)
             return 0 /* Read */;
         switch (parent.kind) {
-            case 207 /* ParenthesizedExpression */:
+            case 208 /* ParenthesizedExpression */:
                 return accessKind(parent);
-            case 215 /* PostfixUnaryExpression */:
-            case 214 /* PrefixUnaryExpression */:
+            case 216 /* PostfixUnaryExpression */:
+            case 215 /* PrefixUnaryExpression */:
                 var operator = parent.operator;
                 return operator === 45 /* PlusPlusToken */ || operator === 46 /* MinusMinusToken */ ? writeOrReadWrite() : 0 /* Read */;
-            case 216 /* BinaryExpression */:
+            case 217 /* 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 201 /* PropertyAccessExpression */:
+            case 202 /* PropertyAccessExpression */:
                 return parent.name !== node ? 0 /* Read */ : accessKind(parent);
-            case 288 /* PropertyAssignment */: {
+            case 289 /* 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 289 /* ShorthandPropertyAssignment */:
+            case 290 /* 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 199 /* ArrayLiteralExpression */:
+            case 200 /* 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 === 233 /* ExpressionStatement */ ? 1 /* Write */ : 2 /* ReadWrite */;
+            return parent.parent && skipParenthesesUp(parent.parent).kind === 234 /* ExpressionStatement */ ? 1 /* Write */ : 2 /* ReadWrite */;
         }
     }
     function reverseAccessKind(a) {
@@ -18637,7 +18861,8 @@ var ts;
     }
     ts.isAbstractConstructorSymbol = isAbstractConstructorSymbol;
     function getClassLikeDeclarationOfSymbol(symbol) {
-        return ts.find(symbol.declarations, ts.isClassLike);
+        var _a;
+        return (_a = symbol.declarations) === null || _a === void 0 ? void 0 : _a.find(ts.isClassLike);
     }
     ts.getClassLikeDeclarationOfSymbol = getClassLikeDeclarationOfSymbol;
     function getObjectFlags(type) {
@@ -18680,7 +18905,6 @@ var ts;
     ts.getLastChild = getLastChild;
     function addToSeen(seen, key, value) {
         if (value === void 0) { value = true; }
-        key = String(key);
         if (seen.has(key)) {
             return false;
         }
@@ -18693,7 +18917,7 @@ var ts;
     }
     ts.isObjectTypeDeclaration = isObjectTypeDeclaration;
     function isTypeNodeKind(kind) {
-        return (kind >= 172 /* FirstTypeNode */ && kind <= 195 /* LastTypeNode */)
+        return (kind >= 173 /* FirstTypeNode */ && kind <= 196 /* LastTypeNode */)
             || kind === 128 /* AnyKeyword */
             || kind === 152 /* UnknownKeyword */
             || kind === 144 /* NumberKeyword */
@@ -18705,25 +18929,25 @@ var ts;
             || kind === 113 /* VoidKeyword */
             || 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 */;
+            || kind === 224 /* ExpressionWithTypeArguments */
+            || kind === 304 /* JSDocAllType */
+            || kind === 305 /* JSDocUnknownType */
+            || kind === 306 /* JSDocNullableType */
+            || kind === 307 /* JSDocNonNullableType */
+            || kind === 308 /* JSDocOptionalType */
+            || kind === 309 /* JSDocFunctionType */
+            || kind === 310 /* JSDocVariadicType */;
     }
     ts.isTypeNodeKind = isTypeNodeKind;
     function isAccessExpression(node) {
-        return node.kind === 201 /* PropertyAccessExpression */ || node.kind === 202 /* ElementAccessExpression */;
+        return node.kind === 202 /* PropertyAccessExpression */ || node.kind === 203 /* ElementAccessExpression */;
     }
     ts.isAccessExpression = isAccessExpression;
     function getNameOfAccessExpression(node) {
-        if (node.kind === 201 /* PropertyAccessExpression */) {
+        if (node.kind === 202 /* PropertyAccessExpression */) {
             return node.name;
         }
-        ts.Debug.assert(node.kind === 202 /* ElementAccessExpression */);
+        ts.Debug.assert(node.kind === 203 /* ElementAccessExpression */);
         return node.argumentExpression;
     }
     ts.getNameOfAccessExpression = getNameOfAccessExpression;
@@ -18738,7 +18962,7 @@ var ts;
     }
     ts.isBundleFileTextLike = isBundleFileTextLike;
     function isNamedImportsOrExports(node) {
-        return node.kind === 264 /* NamedImports */ || node.kind === 268 /* NamedExports */;
+        return node.kind === 265 /* NamedImports */ || node.kind === 269 /* NamedExports */;
     }
     ts.isNamedImportsOrExports = isNamedImportsOrExports;
     function getLeftmostAccessExpression(expr) {
@@ -18751,28 +18975,28 @@ var ts;
     function getLeftmostExpression(node, stopAtCallExpressions) {
         while (true) {
             switch (node.kind) {
-                case 215 /* PostfixUnaryExpression */:
+                case 216 /* PostfixUnaryExpression */:
                     node = node.operand;
                     continue;
-                case 216 /* BinaryExpression */:
+                case 217 /* BinaryExpression */:
                     node = node.left;
                     continue;
-                case 217 /* ConditionalExpression */:
+                case 218 /* ConditionalExpression */:
                     node = node.condition;
                     continue;
-                case 205 /* TaggedTemplateExpression */:
+                case 206 /* TaggedTemplateExpression */:
                     node = node.tag;
                     continue;
-                case 203 /* CallExpression */:
+                case 204 /* CallExpression */:
                     if (stopAtCallExpressions) {
                         return node;
                     }
                 // falls through
-                case 224 /* AsExpression */:
-                case 202 /* ElementAccessExpression */:
-                case 201 /* PropertyAccessExpression */:
-                case 225 /* NonNullExpression */:
-                case 336 /* PartiallyEmittedExpression */:
+                case 225 /* AsExpression */:
+                case 203 /* ElementAccessExpression */:
+                case 202 /* PropertyAccessExpression */:
+                case 226 /* NonNullExpression */:
+                case 340 /* PartiallyEmittedExpression */:
                     node = node.expression;
                     continue;
             }
@@ -19151,6 +19375,10 @@ var ts;
         return compilerOptions.allowJs === undefined ? !!compilerOptions.checkJs : compilerOptions.allowJs;
     }
     ts.getAllowJSCompilerOption = getAllowJSCompilerOption;
+    function getUseDefineForClassFields(compilerOptions) {
+        return compilerOptions.useDefineForClassFields === undefined ? compilerOptions.target === 99 /* ESNext */ : compilerOptions.useDefineForClassFields;
+    }
+    ts.getUseDefineForClassFields = getUseDefineForClassFields;
     function compilerOptionsAffectSemanticDiagnostics(newOptions, oldOptions) {
         return oldOptions !== newOptions &&
             ts.semanticDiagnosticsOptionDeclarations.some(function (option) { return !isJsonEqual(getCompilerOptionValue(oldOptions, option), getCompilerOptionValue(newOptions, option)); });
@@ -19172,7 +19400,7 @@ var ts;
     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;
+        var jsxImportSourcePragma = ts.isArray(jsxImportSourcePragmas) ? jsxImportSourcePragmas[jsxImportSourcePragmas.length - 1] : jsxImportSourcePragmas;
         return compilerOptions.jsx === 4 /* ReactJSX */ ||
             compilerOptions.jsx === 5 /* ReactJSXDev */ ||
             compilerOptions.jsxImportSource ||
@@ -19222,19 +19450,33 @@ var ts;
                     }
                     (symlinkedDirectories || (symlinkedDirectories = new ts.Map())).set(symlinkPath, real);
                 }
-            }
+            },
+            setSymlinkedDirectoryFromSymlinkedFile: function (symlink, real) {
+                this.setSymlinkedFile(ts.toPath(symlink, cwd, getCanonicalFileName), real);
+                var _a = guessDirectorySymlink(real, symlink, cwd, getCanonicalFileName) || ts.emptyArray, commonResolved = _a[0], commonOriginal = _a[1];
+                if (commonResolved && commonOriginal) {
+                    this.setSymlinkedDirectory(commonOriginal, {
+                        real: commonResolved,
+                        realPath: ts.toPath(commonResolved, cwd, getCanonicalFileName),
+                    });
+                }
+            },
         };
     }
     ts.createSymlinkCache = createSymlinkCache;
     function discoverProbableSymlinks(files, getCanonicalFileName, cwd) {
         var cache = createSymlinkCache(cwd, getCanonicalFileName);
-        var symlinks = ts.flatten(ts.mapDefined(files, function (sf) {
-            return sf.resolvedModules && ts.compact(ts.arrayFrom(ts.mapIterator(sf.resolvedModules.values(), function (res) {
-                return res && res.originalPath && res.resolvedFileName !== res.originalPath ? [res.resolvedFileName, res.originalPath] : undefined;
+        var symlinks = ts.flatMap(files, function (sf) {
+            var pairs = sf.resolvedModules && ts.arrayFrom(ts.mapDefinedIterator(sf.resolvedModules.values(), function (res) {
+                return (res === null || res === void 0 ? void 0 : res.originalPath) ? [res.resolvedFileName, res.originalPath] : undefined;
+            }));
+            return ts.concatenate(pairs, sf.resolvedTypeReferenceDirectiveNames && ts.arrayFrom(ts.mapDefinedIterator(sf.resolvedTypeReferenceDirectiveNames.values(), function (res) {
+                return (res === null || res === void 0 ? void 0 : res.originalPath) && res.resolvedFileName ? [res.resolvedFileName, res.originalPath] : undefined;
             })));
-        }));
+        });
         for (var _i = 0, symlinks_1 = symlinks; _i < symlinks_1.length; _i++) {
             var _a = symlinks_1[_i], resolvedPath = _a[0], originalPath = _a[1];
+            cache.setSymlinkedFile(ts.toPath(originalPath, cwd, getCanonicalFileName), resolvedPath);
             var _b = guessDirectorySymlink(resolvedPath, originalPath, cwd, getCanonicalFileName) || ts.emptyArray, commonResolved = _b[0], commonOriginal = _b[1];
             if (commonResolved && commonOriginal) {
                 cache.setSymlinkedDirectory(commonOriginal, { real: commonResolved, realPath: ts.toPath(commonResolved, cwd, getCanonicalFileName) });
@@ -19933,21 +20175,21 @@ var ts;
     }
     ts.isValidTypeOnlyAliasUseSite = isValidTypeOnlyAliasUseSite;
     function typeOnlyDeclarationIsExport(typeOnlyDeclaration) {
-        return typeOnlyDeclaration.kind === 270 /* ExportSpecifier */;
+        return typeOnlyDeclaration.kind === 271 /* ExportSpecifier */;
     }
     ts.typeOnlyDeclarationIsExport = typeOnlyDeclarationIsExport;
     function isPartOfPossiblyValidTypeOrAbstractComputedPropertyName(node) {
-        while (node.kind === 78 /* Identifier */ || node.kind === 201 /* PropertyAccessExpression */) {
+        while (node.kind === 78 /* Identifier */ || node.kind === 202 /* PropertyAccessExpression */) {
             node = node.parent;
         }
-        if (node.kind !== 158 /* ComputedPropertyName */) {
+        if (node.kind !== 159 /* ComputedPropertyName */) {
             return false;
         }
         if (hasSyntacticModifier(node.parent, 128 /* Abstract */)) {
             return true;
         }
         var containerKind = node.parent.parent.kind;
-        return containerKind === 253 /* InterfaceDeclaration */ || containerKind === 177 /* TypeLiteral */;
+        return containerKind === 254 /* InterfaceDeclaration */ || containerKind === 178 /* TypeLiteral */;
     }
     /** Returns true for an identifier in 1) an `implements` clause, and 2) an `extends` clause of an interface. */
     function isIdentifierInNonEmittingHeritageClause(node) {
@@ -19955,16 +20197,16 @@ var ts;
             return false;
         var heritageClause = ts.findAncestor(node.parent, function (parent) {
             switch (parent.kind) {
-                case 286 /* HeritageClause */:
+                case 287 /* HeritageClause */:
                     return true;
-                case 201 /* PropertyAccessExpression */:
-                case 223 /* ExpressionWithTypeArguments */:
+                case 202 /* PropertyAccessExpression */:
+                case 224 /* 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) === 253 /* InterfaceDeclaration */;
+        return (heritageClause === null || heritageClause === void 0 ? void 0 : heritageClause.token) === 116 /* ImplementsKeyword */ || (heritageClause === null || heritageClause === void 0 ? void 0 : heritageClause.parent.kind) === 254 /* InterfaceDeclaration */;
     }
     function isIdentifierTypeReference(node) {
         return ts.isTypeReferenceNode(node) && ts.isIdentifier(node.typeName);
@@ -20121,6 +20363,72 @@ var ts;
         return ts.some(ts.ignoredPaths, function (p) { return ts.stringContains(path, p); });
     }
     ts.containsIgnoredPath = containsIgnoredPath;
+    function getContainingNodeArray(node) {
+        if (!node.parent)
+            return undefined;
+        switch (node.kind) {
+            case 160 /* TypeParameter */:
+                var parent_1 = node.parent;
+                return parent_1.kind === 186 /* InferType */ ? undefined : parent_1.typeParameters;
+            case 161 /* Parameter */:
+                return node.parent.parameters;
+            case 195 /* TemplateLiteralTypeSpan */:
+                return node.parent.templateSpans;
+            case 229 /* TemplateSpan */:
+                return node.parent.templateSpans;
+            case 162 /* Decorator */:
+                return node.parent.decorators;
+            case 287 /* HeritageClause */:
+                return node.parent.heritageClauses;
+        }
+        var parent = node.parent;
+        if (ts.isJSDocTag(node)) {
+            return ts.isJSDocTypeLiteral(node.parent) ? undefined : node.parent.tags;
+        }
+        switch (parent.kind) {
+            case 178 /* TypeLiteral */:
+            case 254 /* InterfaceDeclaration */:
+                return ts.isTypeElement(node) ? parent.members : undefined;
+            case 183 /* UnionType */:
+            case 184 /* IntersectionType */:
+                return parent.types;
+            case 180 /* TupleType */:
+            case 200 /* ArrayLiteralExpression */:
+            case 341 /* CommaListExpression */:
+            case 265 /* NamedImports */:
+            case 269 /* NamedExports */:
+                return parent.elements;
+            case 201 /* ObjectLiteralExpression */:
+            case 282 /* JsxAttributes */:
+                return parent.properties;
+            case 204 /* CallExpression */:
+            case 205 /* NewExpression */:
+                return ts.isTypeNode(node) ? parent.typeArguments :
+                    parent.expression === node ? undefined :
+                        parent.arguments;
+            case 274 /* JsxElement */:
+            case 278 /* JsxFragment */:
+                return ts.isJsxChild(node) ? parent.children : undefined;
+            case 276 /* JsxOpeningElement */:
+            case 275 /* JsxSelfClosingElement */:
+                return ts.isTypeNode(node) ? parent.typeArguments : undefined;
+            case 231 /* Block */:
+            case 285 /* CaseClause */:
+            case 286 /* DefaultClause */:
+            case 258 /* ModuleBlock */:
+                return parent.statements;
+            case 259 /* CaseBlock */:
+                return parent.clauses;
+            case 253 /* ClassDeclaration */:
+            case 222 /* ClassExpression */:
+                return ts.isClassElement(node) ? parent.members : undefined;
+            case 256 /* EnumDeclaration */:
+                return ts.isEnumMember(node) ? parent.members : undefined;
+            case 298 /* SourceFile */:
+                return parent.statements;
+        }
+    }
+    ts.getContainingNodeArray = getContainingNodeArray;
 })(ts || (ts = {}));
 /* @internal */
 var ts;
@@ -20165,7 +20473,11 @@ var ts;
 var ts;
 (function (ts) {
     function createParenthesizerRules(factory) {
+        var binaryLeftOperandParenthesizerCache;
+        var binaryRightOperandParenthesizerCache;
         return {
+            getParenthesizeLeftSideOfBinaryForOperator: getParenthesizeLeftSideOfBinaryForOperator,
+            getParenthesizeRightSideOfBinaryForOperator: getParenthesizeRightSideOfBinaryForOperator,
             parenthesizeLeftSideOfBinary: parenthesizeLeftSideOfBinary,
             parenthesizeRightSideOfBinary: parenthesizeRightSideOfBinary,
             parenthesizeExpressionOfComputedPropertyName: parenthesizeExpressionOfComputedPropertyName,
@@ -20186,6 +20498,24 @@ var ts;
             parenthesizeConstituentTypesOfUnionOrIntersectionType: parenthesizeConstituentTypesOfUnionOrIntersectionType,
             parenthesizeTypeArguments: parenthesizeTypeArguments,
         };
+        function getParenthesizeLeftSideOfBinaryForOperator(operatorKind) {
+            binaryLeftOperandParenthesizerCache || (binaryLeftOperandParenthesizerCache = new ts.Map());
+            var parenthesizerRule = binaryLeftOperandParenthesizerCache.get(operatorKind);
+            if (!parenthesizerRule) {
+                parenthesizerRule = function (node) { return parenthesizeLeftSideOfBinary(operatorKind, node); };
+                binaryLeftOperandParenthesizerCache.set(operatorKind, parenthesizerRule);
+            }
+            return parenthesizerRule;
+        }
+        function getParenthesizeRightSideOfBinaryForOperator(operatorKind) {
+            binaryRightOperandParenthesizerCache || (binaryRightOperandParenthesizerCache = new ts.Map());
+            var parenthesizerRule = binaryRightOperandParenthesizerCache.get(operatorKind);
+            if (!parenthesizerRule) {
+                parenthesizerRule = function (node) { return parenthesizeRightSideOfBinary(operatorKind, /*leftSide*/ undefined, node); };
+                binaryRightOperandParenthesizerCache.set(operatorKind, parenthesizerRule);
+            }
+            return parenthesizerRule;
+        }
         /**
          * Determines whether the operand to a BinaryExpression needs to be parenthesized.
          *
@@ -20212,10 +20542,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(216 /* BinaryExpression */, binaryOperator);
-            var binaryOperatorAssociativity = ts.getOperatorAssociativity(216 /* BinaryExpression */, binaryOperator);
+            var binaryOperatorPrecedence = ts.getOperatorPrecedence(217 /* BinaryExpression */, binaryOperator);
+            var binaryOperatorAssociativity = ts.getOperatorAssociativity(217 /* BinaryExpression */, binaryOperator);
             var emittedOperand = ts.skipPartiallyEmittedExpressions(operand);
-            if (!isLeftSideOfBinary && operand.kind === 209 /* ArrowFunction */ && binaryOperatorPrecedence > 3 /* Assignment */) {
+            if (!isLeftSideOfBinary && operand.kind === 210 /* 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;
@@ -20227,7 +20557,7 @@ var ts;
                     // and is a yield expression, then we do not need parentheses.
                     if (!isLeftSideOfBinary
                         && binaryOperatorAssociativity === 1 /* Right */
-                        && operand.kind === 219 /* YieldExpression */) {
+                        && operand.kind === 220 /* YieldExpression */) {
                         return false;
                     }
                     return true;
@@ -20315,7 +20645,7 @@ var ts;
             if (ts.isLiteralKind(node.kind)) {
                 return node.kind;
             }
-            if (node.kind === 216 /* BinaryExpression */ && node.operatorToken.kind === 39 /* PlusToken */) {
+            if (node.kind === 217 /* BinaryExpression */ && node.operatorToken.kind === 39 /* PlusToken */) {
                 if (node.cachedLiteralKind !== undefined) {
                     return node.cachedLiteralKind;
                 }
@@ -20341,7 +20671,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 === 207 /* ParenthesizedExpression */) {
+            if (skipped.kind === 208 /* ParenthesizedExpression */) {
                 return operand;
             }
             return binaryOperandNeedsParentheses(binaryOperator, operand, isLeftSideOfBinary, leftOperand)
@@ -20358,7 +20688,7 @@ var ts;
             return ts.isCommaSequence(expression) ? factory.createParenthesizedExpression(expression) : expression;
         }
         function parenthesizeConditionOfConditionalExpression(condition) {
-            var conditionalPrecedence = ts.getOperatorPrecedence(217 /* ConditionalExpression */, 57 /* QuestionToken */);
+            var conditionalPrecedence = ts.getOperatorPrecedence(218 /* ConditionalExpression */, 57 /* QuestionToken */);
             var emittedCondition = ts.skipPartiallyEmittedExpressions(condition);
             var conditionPrecedence = ts.getExpressionPrecedence(emittedCondition);
             if (ts.compareValues(conditionPrecedence, conditionalPrecedence) !== 1 /* GreaterThan */) {
@@ -20391,8 +20721,8 @@ var ts;
             var needsParens = ts.isCommaSequence(check);
             if (!needsParens) {
                 switch (ts.getLeftmostExpression(check, /*stopAtCallExpression*/ false).kind) {
-                    case 221 /* ClassExpression */:
-                    case 208 /* FunctionExpression */:
+                    case 222 /* ClassExpression */:
+                    case 209 /* FunctionExpression */:
                         needsParens = true;
                 }
             }
@@ -20405,9 +20735,9 @@ var ts;
         function parenthesizeExpressionOfNew(expression) {
             var leftmostExpr = ts.getLeftmostExpression(expression, /*stopAtCallExpressions*/ true);
             switch (leftmostExpr.kind) {
-                case 203 /* CallExpression */:
+                case 204 /* CallExpression */:
                     return factory.createParenthesizedExpression(expression);
-                case 204 /* NewExpression */:
+                case 205 /* NewExpression */:
                     return !leftmostExpr.arguments
                         ? factory.createParenthesizedExpression(expression)
                         : expression; // TODO(rbuckton): Verify this assertion holds
@@ -20427,7 +20757,7 @@ var ts;
             //
             var emittedExpression = ts.skipPartiallyEmittedExpressions(expression);
             if (ts.isLeftHandSideExpression(emittedExpression)
-                && (emittedExpression.kind !== 204 /* NewExpression */ || emittedExpression.arguments)) {
+                && (emittedExpression.kind !== 205 /* NewExpression */ || emittedExpression.arguments)) {
                 // TODO(rbuckton): Verify whether this assertion holds.
                 return expression;
             }
@@ -20449,7 +20779,7 @@ var ts;
         function parenthesizeExpressionForDisallowedComma(expression) {
             var emittedExpression = ts.skipPartiallyEmittedExpressions(expression);
             var expressionPrecedence = ts.getExpressionPrecedence(emittedExpression);
-            var commaPrecedence = ts.getOperatorPrecedence(216 /* BinaryExpression */, 27 /* CommaToken */);
+            var commaPrecedence = ts.getOperatorPrecedence(217 /* BinaryExpression */, 27 /* CommaToken */);
             // TODO(rbuckton): Verifiy whether `setTextRange` is needed.
             return expressionPrecedence > commaPrecedence ? expression : ts.setTextRange(factory.createParenthesizedExpression(expression), expression);
         }
@@ -20458,44 +20788,44 @@ var ts;
             if (ts.isCallExpression(emittedExpression)) {
                 var callee = emittedExpression.expression;
                 var kind = ts.skipPartiallyEmittedExpressions(callee).kind;
-                if (kind === 208 /* FunctionExpression */ || kind === 209 /* ArrowFunction */) {
+                if (kind === 209 /* FunctionExpression */ || kind === 210 /* 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 === 200 /* ObjectLiteralExpression */ || leftmostExpressionKind === 208 /* FunctionExpression */) {
+            if (leftmostExpressionKind === 201 /* ObjectLiteralExpression */ || leftmostExpressionKind === 209 /* 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 === 200 /* ObjectLiteralExpression */)) {
+            if (!ts.isBlock(body) && (ts.isCommaSequence(body) || ts.getLeftmostExpression(body, /*stopAtCallExpressions*/ false).kind === 201 /* ObjectLiteralExpression */)) {
                 // TODO(rbuckton): Verifiy whether `setTextRange` is needed.
                 return ts.setTextRange(factory.createParenthesizedExpression(body), body);
             }
             return body;
         }
         function parenthesizeMemberOfConditionalType(member) {
-            return member.kind === 184 /* ConditionalType */ ? factory.createParenthesizedType(member) : member;
+            return member.kind === 185 /* ConditionalType */ ? factory.createParenthesizedType(member) : member;
         }
         function parenthesizeMemberOfElementType(member) {
             switch (member.kind) {
-                case 182 /* UnionType */:
-                case 183 /* IntersectionType */:
-                case 174 /* FunctionType */:
-                case 175 /* ConstructorType */:
+                case 183 /* UnionType */:
+                case 184 /* IntersectionType */:
+                case 175 /* FunctionType */:
+                case 176 /* ConstructorType */:
                     return factory.createParenthesizedType(member);
             }
             return parenthesizeMemberOfConditionalType(member);
         }
         function parenthesizeElementTypeOfArrayType(member) {
             switch (member.kind) {
-                case 176 /* TypeQuery */:
-                case 188 /* TypeOperator */:
-                case 185 /* InferType */:
+                case 177 /* TypeQuery */:
+                case 189 /* TypeOperator */:
+                case 186 /* InferType */:
                     return factory.createParenthesizedType(member);
             }
             return parenthesizeMemberOfElementType(member);
@@ -20514,6 +20844,8 @@ var ts;
     }
     ts.createParenthesizerRules = createParenthesizerRules;
     ts.nullParenthesizerRules = {
+        getParenthesizeLeftSideOfBinaryForOperator: function (_) { return ts.identity; },
+        getParenthesizeRightSideOfBinaryForOperator: function (_) { return ts.identity; },
         parenthesizeLeftSideOfBinary: function (_binaryOperator, leftSide) { return leftSide; },
         parenthesizeRightSideOfBinary: function (_binaryOperator, _leftSide, rightSide) { return rightSide; },
         parenthesizeExpressionOfComputedPropertyName: ts.identity,
@@ -20599,11 +20931,11 @@ var ts;
         }
         function convertToAssignmentPattern(node) {
             switch (node.kind) {
-                case 197 /* ArrayBindingPattern */:
-                case 199 /* ArrayLiteralExpression */:
+                case 198 /* ArrayBindingPattern */:
+                case 200 /* ArrayLiteralExpression */:
                     return convertToArrayAssignmentPattern(node);
-                case 196 /* ObjectBindingPattern */:
-                case 200 /* ObjectLiteralExpression */:
+                case 197 /* ObjectBindingPattern */:
+                case 201 /* ObjectLiteralExpression */:
                     return convertToObjectAssignmentPattern(node);
             }
         }
@@ -20944,18 +21276,18 @@ var ts;
             createExternalModuleReference: createExternalModuleReference,
             updateExternalModuleReference: updateExternalModuleReference,
             // lazily load factory members for JSDoc types with similar structure
-            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 */); },
+            get createJSDocAllType() { return getJSDocPrimaryTypeCreateFunction(304 /* JSDocAllType */); },
+            get createJSDocUnknownType() { return getJSDocPrimaryTypeCreateFunction(305 /* JSDocUnknownType */); },
+            get createJSDocNonNullableType() { return getJSDocUnaryTypeCreateFunction(307 /* JSDocNonNullableType */); },
+            get updateJSDocNonNullableType() { return getJSDocUnaryTypeUpdateFunction(307 /* JSDocNonNullableType */); },
+            get createJSDocNullableType() { return getJSDocUnaryTypeCreateFunction(306 /* JSDocNullableType */); },
+            get updateJSDocNullableType() { return getJSDocUnaryTypeUpdateFunction(306 /* JSDocNullableType */); },
+            get createJSDocOptionalType() { return getJSDocUnaryTypeCreateFunction(308 /* JSDocOptionalType */); },
+            get updateJSDocOptionalType() { return getJSDocUnaryTypeUpdateFunction(308 /* JSDocOptionalType */); },
+            get createJSDocVariadicType() { return getJSDocUnaryTypeCreateFunction(310 /* JSDocVariadicType */); },
+            get updateJSDocVariadicType() { return getJSDocUnaryTypeUpdateFunction(310 /* JSDocVariadicType */); },
+            get createJSDocNamepathType() { return getJSDocUnaryTypeCreateFunction(311 /* JSDocNamepathType */); },
+            get updateJSDocNamepathType() { return getJSDocUnaryTypeUpdateFunction(311 /* JSDocNamepathType */); },
             createJSDocFunctionType: createJSDocFunctionType,
             updateJSDocFunctionType: updateJSDocFunctionType,
             createJSDocTypeLiteral: createJSDocTypeLiteral,
@@ -20982,31 +21314,37 @@ var ts;
             updateJSDocSeeTag: updateJSDocSeeTag,
             createJSDocNameReference: createJSDocNameReference,
             updateJSDocNameReference: updateJSDocNameReference,
+            createJSDocLink: createJSDocLink,
+            updateJSDocLink: updateJSDocLink,
             // lazily load factory members for JSDoc tags with similar structure
-            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 */); },
+            get createJSDocTypeTag() { return getJSDocTypeLikeTagCreateFunction(333 /* JSDocTypeTag */); },
+            get updateJSDocTypeTag() { return getJSDocTypeLikeTagUpdateFunction(333 /* JSDocTypeTag */); },
+            get createJSDocReturnTag() { return getJSDocTypeLikeTagCreateFunction(331 /* JSDocReturnTag */); },
+            get updateJSDocReturnTag() { return getJSDocTypeLikeTagUpdateFunction(331 /* JSDocReturnTag */); },
+            get createJSDocThisTag() { return getJSDocTypeLikeTagCreateFunction(332 /* JSDocThisTag */); },
+            get updateJSDocThisTag() { return getJSDocTypeLikeTagUpdateFunction(332 /* JSDocThisTag */); },
+            get createJSDocEnumTag() { return getJSDocTypeLikeTagCreateFunction(329 /* JSDocEnumTag */); },
+            get updateJSDocEnumTag() { return getJSDocTypeLikeTagUpdateFunction(329 /* JSDocEnumTag */); },
+            get createJSDocAuthorTag() { return getJSDocSimpleTagCreateFunction(320 /* JSDocAuthorTag */); },
+            get updateJSDocAuthorTag() { return getJSDocSimpleTagUpdateFunction(320 /* JSDocAuthorTag */); },
+            get createJSDocClassTag() { return getJSDocSimpleTagCreateFunction(322 /* JSDocClassTag */); },
+            get updateJSDocClassTag() { return getJSDocSimpleTagUpdateFunction(322 /* JSDocClassTag */); },
+            get createJSDocPublicTag() { return getJSDocSimpleTagCreateFunction(323 /* JSDocPublicTag */); },
+            get updateJSDocPublicTag() { return getJSDocSimpleTagUpdateFunction(323 /* JSDocPublicTag */); },
+            get createJSDocPrivateTag() { return getJSDocSimpleTagCreateFunction(324 /* JSDocPrivateTag */); },
+            get updateJSDocPrivateTag() { return getJSDocSimpleTagUpdateFunction(324 /* JSDocPrivateTag */); },
+            get createJSDocProtectedTag() { return getJSDocSimpleTagCreateFunction(325 /* JSDocProtectedTag */); },
+            get updateJSDocProtectedTag() { return getJSDocSimpleTagUpdateFunction(325 /* JSDocProtectedTag */); },
+            get createJSDocReadonlyTag() { return getJSDocSimpleTagCreateFunction(326 /* JSDocReadonlyTag */); },
+            get updateJSDocReadonlyTag() { return getJSDocSimpleTagUpdateFunction(326 /* JSDocReadonlyTag */); },
+            get createJSDocOverrideTag() { return getJSDocSimpleTagCreateFunction(327 /* JSDocOverrideTag */); },
+            get updateJSDocOverrideTag() { return getJSDocSimpleTagUpdateFunction(327 /* JSDocOverrideTag */); },
+            get createJSDocDeprecatedTag() { return getJSDocSimpleTagCreateFunction(321 /* JSDocDeprecatedTag */); },
+            get updateJSDocDeprecatedTag() { return getJSDocSimpleTagUpdateFunction(321 /* JSDocDeprecatedTag */); },
             createJSDocUnknownTag: createJSDocUnknownTag,
             updateJSDocUnknownTag: updateJSDocUnknownTag,
+            createJSDocText: createJSDocText,
+            updateJSDocText: updateJSDocText,
             createJSDocComment: createJSDocComment,
             updateJSDocComment: updateJSDocComment,
             createJsxElement: createJsxElement,
@@ -21190,11 +21528,11 @@ var ts;
             // don't propagate child flags.
             if (name) {
                 switch (node.kind) {
-                    case 165 /* MethodDeclaration */:
-                    case 167 /* GetAccessor */:
-                    case 168 /* SetAccessor */:
-                    case 163 /* PropertyDeclaration */:
-                    case 288 /* PropertyAssignment */:
+                    case 166 /* MethodDeclaration */:
+                    case 168 /* GetAccessor */:
+                    case 169 /* SetAccessor */:
+                    case 164 /* PropertyDeclaration */:
+                    case 289 /* PropertyAssignment */:
                         if (ts.isIdentifier(name)) {
                             node.transformFlags |= propagateIdentifierNameFlags(name);
                             break;
@@ -21235,7 +21573,7 @@ var ts;
         function createBaseFunctionLikeDeclaration(kind, decorators, modifiers, name, typeParameters, parameters, type, body) {
             var node = createBaseSignatureDeclaration(kind, decorators, modifiers, name, typeParameters, parameters, type);
             node.body = body;
-            node.transformFlags |= propagateChildFlags(node.body) & ~8388608 /* ContainsPossibleTopLevelAwait */;
+            node.transformFlags |= propagateChildFlags(node.body) & ~16777216 /* ContainsPossibleTopLevelAwait */;
             if (!body)
                 node.transformFlags |= 1 /* ContainsTypeScript */;
             return node;
@@ -21288,7 +21626,7 @@ var ts;
             var node = createBaseLiteral(8 /* NumericLiteral */, typeof value === "number" ? value + "" : value);
             node.numericLiteralFlags = numericLiteralFlags;
             if (numericLiteralFlags & 384 /* BinaryOrOctalSpecifier */)
-                node.transformFlags |= 256 /* ContainsES2015 */;
+                node.transformFlags |= 512 /* ContainsES2015 */;
             return node;
         }
         // @api
@@ -21307,7 +21645,7 @@ var ts;
             var node = createBaseStringLiteral(text, isSingleQuote);
             node.hasExtendedUnicodeEscape = hasExtendedUnicodeEscape;
             if (hasExtendedUnicodeEscape)
-                node.transformFlags |= 256 /* ContainsES2015 */;
+                node.transformFlags |= 512 /* ContainsES2015 */;
             return node;
         }
         // @api
@@ -21363,7 +21701,7 @@ var ts;
                 node.typeArguments = createNodeArray(typeArguments);
             }
             if (node.originalKeywordKind === 130 /* AwaitKeyword */) {
-                node.transformFlags |= 8388608 /* ContainsPossibleTopLevelAwait */;
+                node.transformFlags |= 16777216 /* ContainsPossibleTopLevelAwait */;
             }
             return node;
         }
@@ -21386,8 +21724,11 @@ var ts;
         }
         /** Create a unique temporary variable for use in a loop. */
         // @api
-        function createLoopVariable() {
-            return createBaseGeneratedIdentifier("", 2 /* Loop */);
+        function createLoopVariable(reservedInNestedScopes) {
+            var flags = 2 /* Loop */;
+            if (reservedInNestedScopes)
+                flags |= 8 /* ReservedInNestedScopes */;
+            return createBaseGeneratedIdentifier("", flags);
         }
         /** Create a unique name based on the supplied text. */
         // @api
@@ -21412,7 +21753,7 @@ var ts;
                 ts.Debug.fail("First character of private identifier must be #: " + text);
             var node = baseFactory.createBasePrivateIdentifierNode(79 /* PrivateIdentifier */);
             node.escapedText = ts.escapeLeadingUnderscores(text);
-            node.transformFlags |= 4194304 /* ContainsClassFields */;
+            node.transformFlags |= 8388608 /* ContainsClassFields */;
             return node;
         }
         //
@@ -21422,7 +21763,7 @@ var ts;
             return baseFactory.createBaseTokenNode(kind);
         }
         function createToken(token) {
-            ts.Debug.assert(token >= 0 /* FirstToken */ && token <= 156 /* LastToken */, "Invalid token");
+            ts.Debug.assert(token >= 0 /* FirstToken */ && token <= 157 /* 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");
@@ -21432,8 +21773,8 @@ var ts;
                 case 129 /* AsyncKeyword */:
                     // 'async' modifier is ES2017 (async functions) or ES2018 (async generators)
                     transformFlags =
-                        64 /* ContainsES2017 */ |
-                            32 /* ContainsES2018 */;
+                        128 /* ContainsES2017 */ |
+                            64 /* ContainsES2018 */;
                     break;
                 case 122 /* PublicKeyword */:
                 case 120 /* PrivateKeyword */:
@@ -21447,6 +21788,7 @@ var ts;
                 case 155 /* BigIntKeyword */:
                 case 141 /* NeverKeyword */:
                 case 145 /* ObjectKeyword */:
+                case 156 /* OverrideKeyword */:
                 case 147 /* StringKeyword */:
                 case 131 /* BooleanKeyword */:
                 case 148 /* SymbolKeyword */:
@@ -21457,11 +21799,11 @@ var ts;
                     break;
                 case 123 /* StaticKeyword */:
                 case 105 /* SuperKeyword */:
-                    transformFlags = 256 /* ContainsES2015 */;
+                    transformFlags = 512 /* ContainsES2015 */;
                     break;
                 case 107 /* ThisKeyword */:
                     // 'this' indicates a lexical 'this'
-                    transformFlags = 4096 /* ContainsLexicalThis */;
+                    transformFlags = 8192 /* ContainsLexicalThis */;
                     break;
             }
             if (transformFlags) {
@@ -21529,6 +21871,9 @@ var ts;
             if (flags & 32 /* Static */) {
                 result.push(createModifier(123 /* StaticKeyword */));
             }
+            if (flags & 16384 /* Override */) {
+                result.push(createModifier(156 /* OverrideKeyword */));
+            }
             if (flags & 64 /* Readonly */) {
                 result.push(createModifier(142 /* ReadonlyKeyword */));
             }
@@ -21542,7 +21887,7 @@ var ts;
         //
         // @api
         function createQualifiedName(left, right) {
-            var node = createBaseNode(157 /* QualifiedName */);
+            var node = createBaseNode(158 /* QualifiedName */);
             node.left = left;
             node.right = asName(right);
             node.transformFlags |=
@@ -21559,12 +21904,12 @@ var ts;
         }
         // @api
         function createComputedPropertyName(expression) {
-            var node = createBaseNode(158 /* ComputedPropertyName */);
+            var node = createBaseNode(159 /* ComputedPropertyName */);
             node.expression = parenthesizerRules().parenthesizeExpressionOfComputedPropertyName(expression);
             node.transformFlags |=
                 propagateChildFlags(node.expression) |
-                    256 /* ContainsES2015 */ |
-                    32768 /* ContainsComputedPropertyName */;
+                    512 /* ContainsES2015 */ |
+                    65536 /* ContainsComputedPropertyName */;
             return node;
         }
         // @api
@@ -21578,7 +21923,7 @@ var ts;
         //
         // @api
         function createTypeParameterDeclaration(name, constraint, defaultType) {
-            var node = createBaseNamedDeclaration(159 /* TypeParameter */, 
+            var node = createBaseNamedDeclaration(160 /* TypeParameter */, 
             /*decorators*/ undefined, 
             /*modifiers*/ undefined, name);
             node.constraint = constraint;
@@ -21596,7 +21941,7 @@ var ts;
         }
         // @api
         function createParameterDeclaration(decorators, modifiers, dotDotDotToken, name, questionToken, type, initializer) {
-            var node = createBaseVariableLikeDeclaration(160 /* Parameter */, decorators, modifiers, name, type, initializer && parenthesizerRules().parenthesizeExpressionForDisallowedComma(initializer));
+            var node = createBaseVariableLikeDeclaration(161 /* Parameter */, decorators, modifiers, name, type, initializer && parenthesizerRules().parenthesizeExpressionForDisallowedComma(initializer));
             node.dotDotDotToken = dotDotDotToken;
             node.questionToken = questionToken;
             if (ts.isThisIdentifier(node.name)) {
@@ -21608,10 +21953,10 @@ var ts;
                         propagateChildFlags(node.questionToken);
                 if (questionToken)
                     node.transformFlags |= 1 /* ContainsTypeScript */;
-                if (ts.modifiersToFlags(node.modifiers) & 92 /* ParameterPropertyModifier */)
-                    node.transformFlags |= 2048 /* ContainsTypeScriptClassSyntax */;
+                if (ts.modifiersToFlags(node.modifiers) & 16476 /* ParameterPropertyModifier */)
+                    node.transformFlags |= 4096 /* ContainsTypeScriptClassSyntax */;
                 if (initializer || dotDotDotToken)
-                    node.transformFlags |= 256 /* ContainsES2015 */;
+                    node.transformFlags |= 512 /* ContainsES2015 */;
             }
             return node;
         }
@@ -21629,12 +21974,12 @@ var ts;
         }
         // @api
         function createDecorator(expression) {
-            var node = createBaseNode(161 /* Decorator */);
+            var node = createBaseNode(162 /* Decorator */);
             node.expression = parenthesizerRules().parenthesizeLeftSideOfAccess(expression);
             node.transformFlags |=
                 propagateChildFlags(node.expression) |
                     1 /* ContainsTypeScript */ |
-                    2048 /* ContainsTypeScriptClassSyntax */;
+                    4096 /* ContainsTypeScriptClassSyntax */;
             return node;
         }
         // @api
@@ -21648,7 +21993,7 @@ var ts;
         //
         // @api
         function createPropertySignature(modifiers, name, questionToken, type) {
-            var node = createBaseNamedDeclaration(162 /* PropertySignature */, 
+            var node = createBaseNamedDeclaration(163 /* PropertySignature */, 
             /*decorators*/ undefined, modifiers, name);
             node.type = type;
             node.questionToken = questionToken;
@@ -21666,15 +22011,15 @@ var ts;
         }
         // @api
         function createPropertyDeclaration(decorators, modifiers, name, questionOrExclamationToken, type, initializer) {
-            var node = createBaseVariableLikeDeclaration(163 /* PropertyDeclaration */, decorators, modifiers, name, type, initializer);
+            var node = createBaseVariableLikeDeclaration(164 /* PropertyDeclaration */, decorators, modifiers, name, type, initializer);
             node.questionToken = questionOrExclamationToken && ts.isQuestionToken(questionOrExclamationToken) ? questionOrExclamationToken : undefined;
             node.exclamationToken = questionOrExclamationToken && ts.isExclamationToken(questionOrExclamationToken) ? questionOrExclamationToken : undefined;
             node.transformFlags |=
                 propagateChildFlags(node.questionToken) |
                     propagateChildFlags(node.exclamationToken) |
-                    4194304 /* ContainsClassFields */;
+                    8388608 /* ContainsClassFields */;
             if (ts.isComputedPropertyName(node.name) || (ts.hasStaticModifier(node) && node.initializer)) {
-                node.transformFlags |= 2048 /* ContainsTypeScriptClassSyntax */;
+                node.transformFlags |= 4096 /* ContainsTypeScriptClassSyntax */;
             }
             if (questionOrExclamationToken || ts.modifiersToFlags(node.modifiers) & 2 /* Ambient */) {
                 node.transformFlags |= 1 /* ContainsTypeScript */;
@@ -21695,7 +22040,7 @@ var ts;
         }
         // @api
         function createMethodSignature(modifiers, name, questionToken, typeParameters, parameters, type) {
-            var node = createBaseSignatureDeclaration(164 /* MethodSignature */, 
+            var node = createBaseSignatureDeclaration(165 /* MethodSignature */, 
             /*decorators*/ undefined, modifiers, name, typeParameters, parameters, type);
             node.questionToken = questionToken;
             node.transformFlags = 1 /* ContainsTypeScript */;
@@ -21714,26 +22059,26 @@ var ts;
         }
         // @api
         function createMethodDeclaration(decorators, modifiers, asteriskToken, name, questionToken, typeParameters, parameters, type, body) {
-            var node = createBaseFunctionLikeDeclaration(165 /* MethodDeclaration */, decorators, modifiers, name, typeParameters, parameters, type, body);
+            var node = createBaseFunctionLikeDeclaration(166 /* MethodDeclaration */, decorators, modifiers, name, typeParameters, parameters, type, body);
             node.asteriskToken = asteriskToken;
             node.questionToken = questionToken;
             node.transformFlags |=
                 propagateChildFlags(node.asteriskToken) |
                     propagateChildFlags(node.questionToken) |
-                    256 /* ContainsES2015 */;
+                    512 /* ContainsES2015 */;
             if (questionToken) {
                 node.transformFlags |= 1 /* ContainsTypeScript */;
             }
             if (ts.modifiersToFlags(node.modifiers) & 256 /* Async */) {
                 if (asteriskToken) {
-                    node.transformFlags |= 32 /* ContainsES2018 */;
+                    node.transformFlags |= 64 /* ContainsES2018 */;
                 }
                 else {
-                    node.transformFlags |= 64 /* ContainsES2017 */;
+                    node.transformFlags |= 128 /* ContainsES2017 */;
                 }
             }
             else if (asteriskToken) {
-                node.transformFlags |= 512 /* ContainsGenerator */;
+                node.transformFlags |= 1024 /* ContainsGenerator */;
             }
             return node;
         }
@@ -21753,11 +22098,11 @@ var ts;
         }
         // @api
         function createConstructorDeclaration(decorators, modifiers, parameters, body) {
-            var node = createBaseFunctionLikeDeclaration(166 /* Constructor */, decorators, modifiers, 
+            var node = createBaseFunctionLikeDeclaration(167 /* Constructor */, decorators, modifiers, 
             /*name*/ undefined, 
             /*typeParameters*/ undefined, parameters, 
             /*type*/ undefined, body);
-            node.transformFlags |= 256 /* ContainsES2015 */;
+            node.transformFlags |= 512 /* ContainsES2015 */;
             return node;
         }
         // @api
@@ -21771,7 +22116,7 @@ var ts;
         }
         // @api
         function createGetAccessorDeclaration(decorators, modifiers, name, parameters, type, body) {
-            return createBaseFunctionLikeDeclaration(167 /* GetAccessor */, decorators, modifiers, name, 
+            return createBaseFunctionLikeDeclaration(168 /* GetAccessor */, decorators, modifiers, name, 
             /*typeParameters*/ undefined, parameters, type, body);
         }
         // @api
@@ -21787,7 +22132,7 @@ var ts;
         }
         // @api
         function createSetAccessorDeclaration(decorators, modifiers, name, parameters, body) {
-            return createBaseFunctionLikeDeclaration(168 /* SetAccessor */, decorators, modifiers, name, 
+            return createBaseFunctionLikeDeclaration(169 /* SetAccessor */, decorators, modifiers, name, 
             /*typeParameters*/ undefined, parameters, 
             /*type*/ undefined, body);
         }
@@ -21803,7 +22148,7 @@ var ts;
         }
         // @api
         function createCallSignature(typeParameters, parameters, type) {
-            var node = createBaseSignatureDeclaration(169 /* CallSignature */, 
+            var node = createBaseSignatureDeclaration(170 /* CallSignature */, 
             /*decorators*/ undefined, 
             /*modifiers*/ undefined, 
             /*name*/ undefined, typeParameters, parameters, type);
@@ -21820,7 +22165,7 @@ var ts;
         }
         // @api
         function createConstructSignature(typeParameters, parameters, type) {
-            var node = createBaseSignatureDeclaration(170 /* ConstructSignature */, 
+            var node = createBaseSignatureDeclaration(171 /* ConstructSignature */, 
             /*decorators*/ undefined, 
             /*modifiers*/ undefined, 
             /*name*/ undefined, typeParameters, parameters, type);
@@ -21837,7 +22182,7 @@ var ts;
         }
         // @api
         function createIndexSignature(decorators, modifiers, parameters, type) {
-            var node = createBaseSignatureDeclaration(171 /* IndexSignature */, decorators, modifiers, 
+            var node = createBaseSignatureDeclaration(172 /* IndexSignature */, decorators, modifiers, 
             /*name*/ undefined, 
             /*typeParameters*/ undefined, parameters, type);
             node.transformFlags = 1 /* ContainsTypeScript */;
@@ -21854,7 +22199,7 @@ var ts;
         }
         // @api
         function createTemplateLiteralTypeSpan(type, literal) {
-            var node = createBaseNode(194 /* TemplateLiteralTypeSpan */);
+            var node = createBaseNode(195 /* TemplateLiteralTypeSpan */);
             node.type = type;
             node.literal = literal;
             node.transformFlags = 1 /* ContainsTypeScript */;
@@ -21876,7 +22221,7 @@ var ts;
         }
         // @api
         function createTypePredicateNode(assertsModifier, parameterName, type) {
-            var node = createBaseNode(172 /* TypePredicate */);
+            var node = createBaseNode(173 /* TypePredicate */);
             node.assertsModifier = assertsModifier;
             node.parameterName = asName(parameterName);
             node.type = type;
@@ -21893,7 +22238,7 @@ var ts;
         }
         // @api
         function createTypeReferenceNode(typeName, typeArguments) {
-            var node = createBaseNode(173 /* TypeReference */);
+            var node = createBaseNode(174 /* TypeReference */);
             node.typeName = asName(typeName);
             node.typeArguments = typeArguments && parenthesizerRules().parenthesizeTypeArguments(createNodeArray(typeArguments));
             node.transformFlags = 1 /* ContainsTypeScript */;
@@ -21908,7 +22253,7 @@ var ts;
         }
         // @api
         function createFunctionTypeNode(typeParameters, parameters, type) {
-            var node = createBaseSignatureDeclaration(174 /* FunctionType */, 
+            var node = createBaseSignatureDeclaration(175 /* FunctionType */, 
             /*decorators*/ undefined, 
             /*modifiers*/ undefined, 
             /*name*/ undefined, typeParameters, parameters, type);
@@ -21934,7 +22279,7 @@ var ts;
                     ts.Debug.fail("Incorrect number of arguments specified.");
         }
         function createConstructorTypeNode1(modifiers, typeParameters, parameters, type) {
-            var node = createBaseSignatureDeclaration(175 /* ConstructorType */, 
+            var node = createBaseSignatureDeclaration(176 /* ConstructorType */, 
             /*decorators*/ undefined, modifiers, 
             /*name*/ undefined, typeParameters, parameters, type);
             node.transformFlags = 1 /* ContainsTypeScript */;
@@ -21968,7 +22313,7 @@ var ts;
         }
         // @api
         function createTypeQueryNode(exprName) {
-            var node = createBaseNode(176 /* TypeQuery */);
+            var node = createBaseNode(177 /* TypeQuery */);
             node.exprName = exprName;
             node.transformFlags = 1 /* ContainsTypeScript */;
             return node;
@@ -21981,7 +22326,7 @@ var ts;
         }
         // @api
         function createTypeLiteralNode(members) {
-            var node = createBaseNode(177 /* TypeLiteral */);
+            var node = createBaseNode(178 /* TypeLiteral */);
             node.members = createNodeArray(members);
             node.transformFlags = 1 /* ContainsTypeScript */;
             return node;
@@ -21994,7 +22339,7 @@ var ts;
         }
         // @api
         function createArrayTypeNode(elementType) {
-            var node = createBaseNode(178 /* ArrayType */);
+            var node = createBaseNode(179 /* ArrayType */);
             node.elementType = parenthesizerRules().parenthesizeElementTypeOfArrayType(elementType);
             node.transformFlags = 1 /* ContainsTypeScript */;
             return node;
@@ -22007,7 +22352,7 @@ var ts;
         }
         // @api
         function createTupleTypeNode(elements) {
-            var node = createBaseNode(179 /* TupleType */);
+            var node = createBaseNode(180 /* TupleType */);
             node.elements = createNodeArray(elements);
             node.transformFlags = 1 /* ContainsTypeScript */;
             return node;
@@ -22020,7 +22365,7 @@ var ts;
         }
         // @api
         function createNamedTupleMember(dotDotDotToken, name, questionToken, type) {
-            var node = createBaseNode(192 /* NamedTupleMember */);
+            var node = createBaseNode(193 /* NamedTupleMember */);
             node.dotDotDotToken = dotDotDotToken;
             node.name = name;
             node.questionToken = questionToken;
@@ -22039,7 +22384,7 @@ var ts;
         }
         // @api
         function createOptionalTypeNode(type) {
-            var node = createBaseNode(180 /* OptionalType */);
+            var node = createBaseNode(181 /* OptionalType */);
             node.type = parenthesizerRules().parenthesizeElementTypeOfArrayType(type);
             node.transformFlags = 1 /* ContainsTypeScript */;
             return node;
@@ -22052,7 +22397,7 @@ var ts;
         }
         // @api
         function createRestTypeNode(type) {
-            var node = createBaseNode(181 /* RestType */);
+            var node = createBaseNode(182 /* RestType */);
             node.type = type;
             node.transformFlags = 1 /* ContainsTypeScript */;
             return node;
@@ -22076,7 +22421,7 @@ var ts;
         }
         // @api
         function createUnionTypeNode(types) {
-            return createUnionOrIntersectionTypeNode(182 /* UnionType */, types);
+            return createUnionOrIntersectionTypeNode(183 /* UnionType */, types);
         }
         // @api
         function updateUnionTypeNode(node, types) {
@@ -22084,7 +22429,7 @@ var ts;
         }
         // @api
         function createIntersectionTypeNode(types) {
-            return createUnionOrIntersectionTypeNode(183 /* IntersectionType */, types);
+            return createUnionOrIntersectionTypeNode(184 /* IntersectionType */, types);
         }
         // @api
         function updateIntersectionTypeNode(node, types) {
@@ -22092,7 +22437,7 @@ var ts;
         }
         // @api
         function createConditionalTypeNode(checkType, extendsType, trueType, falseType) {
-            var node = createBaseNode(184 /* ConditionalType */);
+            var node = createBaseNode(185 /* ConditionalType */);
             node.checkType = parenthesizerRules().parenthesizeMemberOfConditionalType(checkType);
             node.extendsType = parenthesizerRules().parenthesizeMemberOfConditionalType(extendsType);
             node.trueType = trueType;
@@ -22111,7 +22456,7 @@ var ts;
         }
         // @api
         function createInferTypeNode(typeParameter) {
-            var node = createBaseNode(185 /* InferType */);
+            var node = createBaseNode(186 /* InferType */);
             node.typeParameter = typeParameter;
             node.transformFlags = 1 /* ContainsTypeScript */;
             return node;
@@ -22124,7 +22469,7 @@ var ts;
         }
         // @api
         function createTemplateLiteralType(head, templateSpans) {
-            var node = createBaseNode(193 /* TemplateLiteralType */);
+            var node = createBaseNode(194 /* TemplateLiteralType */);
             node.head = head;
             node.templateSpans = createNodeArray(templateSpans);
             node.transformFlags = 1 /* ContainsTypeScript */;
@@ -22140,7 +22485,7 @@ var ts;
         // @api
         function createImportTypeNode(argument, qualifier, typeArguments, isTypeOf) {
             if (isTypeOf === void 0) { isTypeOf = false; }
-            var node = createBaseNode(195 /* ImportType */);
+            var node = createBaseNode(196 /* ImportType */);
             node.argument = argument;
             node.qualifier = qualifier;
             node.typeArguments = typeArguments && parenthesizerRules().parenthesizeTypeArguments(typeArguments);
@@ -22160,7 +22505,7 @@ var ts;
         }
         // @api
         function createParenthesizedType(type) {
-            var node = createBaseNode(186 /* ParenthesizedType */);
+            var node = createBaseNode(187 /* ParenthesizedType */);
             node.type = type;
             node.transformFlags = 1 /* ContainsTypeScript */;
             return node;
@@ -22173,13 +22518,13 @@ var ts;
         }
         // @api
         function createThisTypeNode() {
-            var node = createBaseNode(187 /* ThisType */);
+            var node = createBaseNode(188 /* ThisType */);
             node.transformFlags = 1 /* ContainsTypeScript */;
             return node;
         }
         // @api
         function createTypeOperatorNode(operator, type) {
-            var node = createBaseNode(188 /* TypeOperator */);
+            var node = createBaseNode(189 /* TypeOperator */);
             node.operator = operator;
             node.type = parenthesizerRules().parenthesizeMemberOfElementType(type);
             node.transformFlags = 1 /* ContainsTypeScript */;
@@ -22193,7 +22538,7 @@ var ts;
         }
         // @api
         function createIndexedAccessTypeNode(objectType, indexType) {
-            var node = createBaseNode(189 /* IndexedAccessType */);
+            var node = createBaseNode(190 /* IndexedAccessType */);
             node.objectType = parenthesizerRules().parenthesizeMemberOfElementType(objectType);
             node.indexType = indexType;
             node.transformFlags = 1 /* ContainsTypeScript */;
@@ -22208,7 +22553,7 @@ var ts;
         }
         // @api
         function createMappedTypeNode(readonlyToken, typeParameter, nameType, questionToken, type) {
-            var node = createBaseNode(190 /* MappedType */);
+            var node = createBaseNode(191 /* MappedType */);
             node.readonlyToken = readonlyToken;
             node.typeParameter = typeParameter;
             node.nameType = nameType;
@@ -22229,7 +22574,7 @@ var ts;
         }
         // @api
         function createLiteralTypeNode(literal) {
-            var node = createBaseNode(191 /* LiteralType */);
+            var node = createBaseNode(192 /* LiteralType */);
             node.literal = literal;
             node.transformFlags = 1 /* ContainsTypeScript */;
             return node;
@@ -22245,16 +22590,16 @@ var ts;
         //
         // @api
         function createObjectBindingPattern(elements) {
-            var node = createBaseNode(196 /* ObjectBindingPattern */);
+            var node = createBaseNode(197 /* ObjectBindingPattern */);
             node.elements = createNodeArray(elements);
             node.transformFlags |=
                 propagateChildrenFlags(node.elements) |
-                    256 /* ContainsES2015 */ |
-                    131072 /* ContainsBindingPattern */;
-            if (node.transformFlags & 8192 /* ContainsRestOrSpread */) {
+                    512 /* ContainsES2015 */ |
+                    262144 /* ContainsBindingPattern */;
+            if (node.transformFlags & 16384 /* ContainsRestOrSpread */) {
                 node.transformFlags |=
-                    32 /* ContainsES2018 */ |
-                        16384 /* ContainsObjectRestOrSpread */;
+                    64 /* ContainsES2018 */ |
+                        32768 /* ContainsObjectRestOrSpread */;
             }
             return node;
         }
@@ -22266,12 +22611,12 @@ var ts;
         }
         // @api
         function createArrayBindingPattern(elements) {
-            var node = createBaseNode(197 /* ArrayBindingPattern */);
+            var node = createBaseNode(198 /* ArrayBindingPattern */);
             node.elements = createNodeArray(elements);
             node.transformFlags |=
                 propagateChildrenFlags(node.elements) |
-                    256 /* ContainsES2015 */ |
-                    131072 /* ContainsBindingPattern */;
+                    512 /* ContainsES2015 */ |
+                    262144 /* ContainsBindingPattern */;
             return node;
         }
         // @api
@@ -22282,21 +22627,21 @@ var ts;
         }
         // @api
         function createBindingElement(dotDotDotToken, propertyName, name, initializer) {
-            var node = createBaseBindingLikeDeclaration(198 /* BindingElement */, 
+            var node = createBaseBindingLikeDeclaration(199 /* BindingElement */, 
             /*decorators*/ undefined, 
-            /*modifiers*/ undefined, name, initializer);
+            /*modifiers*/ undefined, name, initializer && parenthesizerRules().parenthesizeExpressionForDisallowedComma(initializer));
             node.propertyName = asName(propertyName);
             node.dotDotDotToken = dotDotDotToken;
             node.transformFlags |=
                 propagateChildFlags(node.dotDotDotToken) |
-                    256 /* ContainsES2015 */;
+                    512 /* ContainsES2015 */;
             if (node.propertyName) {
                 node.transformFlags |= ts.isIdentifier(node.propertyName) ?
                     propagateIdentifierNameFlags(node.propertyName) :
                     propagateChildFlags(node.propertyName);
             }
             if (dotDotDotToken)
-                node.transformFlags |= 8192 /* ContainsRestOrSpread */;
+                node.transformFlags |= 16384 /* ContainsRestOrSpread */;
             return node;
         }
         // @api
@@ -22318,7 +22663,7 @@ var ts;
         }
         // @api
         function createArrayLiteralExpression(elements, multiLine) {
-            var node = createBaseExpression(199 /* ArrayLiteralExpression */);
+            var node = createBaseExpression(200 /* ArrayLiteralExpression */);
             node.elements = parenthesizerRules().parenthesizeExpressionsOfCommaDelimitedList(createNodeArray(elements));
             node.multiLine = multiLine;
             node.transformFlags |= propagateChildrenFlags(node.elements);
@@ -22332,7 +22677,7 @@ var ts;
         }
         // @api
         function createObjectLiteralExpression(properties, multiLine) {
-            var node = createBaseExpression(200 /* ObjectLiteralExpression */);
+            var node = createBaseExpression(201 /* ObjectLiteralExpression */);
             node.properties = createNodeArray(properties);
             node.multiLine = multiLine;
             node.transformFlags |= propagateChildrenFlags(node.properties);
@@ -22346,7 +22691,7 @@ var ts;
         }
         // @api
         function createPropertyAccessExpression(expression, name) {
-            var node = createBaseExpression(201 /* PropertyAccessExpression */);
+            var node = createBaseExpression(202 /* PropertyAccessExpression */);
             node.expression = parenthesizerRules().parenthesizeLeftSideOfAccess(expression);
             node.name = asName(name);
             node.transformFlags =
@@ -22358,8 +22703,8 @@ var ts;
                 // super method calls require a lexical 'this'
                 // super method calls require 'super' hoisting in ES2017 and ES2018 async functions and async generators
                 node.transformFlags |=
-                    64 /* ContainsES2017 */ |
-                        32 /* ContainsES2018 */;
+                    128 /* ContainsES2017 */ |
+                        64 /* ContainsES2018 */;
             }
             return node;
         }
@@ -22375,13 +22720,13 @@ var ts;
         }
         // @api
         function createPropertyAccessChain(expression, questionDotToken, name) {
-            var node = createBaseExpression(201 /* PropertyAccessExpression */);
+            var node = createBaseExpression(202 /* PropertyAccessExpression */);
             node.flags |= 32 /* OptionalChain */;
             node.expression = parenthesizerRules().parenthesizeLeftSideOfAccess(expression);
             node.questionDotToken = questionDotToken;
             node.name = asName(name);
             node.transformFlags |=
-                8 /* ContainsES2020 */ |
+                16 /* ContainsES2020 */ |
                     propagateChildFlags(node.expression) |
                     propagateChildFlags(node.questionDotToken) |
                     (ts.isIdentifier(node.name) ?
@@ -22402,7 +22747,7 @@ var ts;
         }
         // @api
         function createElementAccessExpression(expression, index) {
-            var node = createBaseExpression(202 /* ElementAccessExpression */);
+            var node = createBaseExpression(203 /* ElementAccessExpression */);
             node.expression = parenthesizerRules().parenthesizeLeftSideOfAccess(expression);
             node.argumentExpression = asExpression(index);
             node.transformFlags |=
@@ -22412,8 +22757,8 @@ var ts;
                 // super method calls require a lexical 'this'
                 // super method calls require 'super' hoisting in ES2017 and ES2018 async functions and async generators
                 node.transformFlags |=
-                    64 /* ContainsES2017 */ |
-                        32 /* ContainsES2018 */;
+                    128 /* ContainsES2017 */ |
+                        64 /* ContainsES2018 */;
             }
             return node;
         }
@@ -22429,7 +22774,7 @@ var ts;
         }
         // @api
         function createElementAccessChain(expression, questionDotToken, index) {
-            var node = createBaseExpression(202 /* ElementAccessExpression */);
+            var node = createBaseExpression(203 /* ElementAccessExpression */);
             node.flags |= 32 /* OptionalChain */;
             node.expression = parenthesizerRules().parenthesizeLeftSideOfAccess(expression);
             node.questionDotToken = questionDotToken;
@@ -22438,7 +22783,7 @@ var ts;
                 propagateChildFlags(node.expression) |
                     propagateChildFlags(node.questionDotToken) |
                     propagateChildFlags(node.argumentExpression) |
-                    8 /* ContainsES2020 */;
+                    16 /* ContainsES2020 */;
             return node;
         }
         // @api
@@ -22454,7 +22799,7 @@ var ts;
         }
         // @api
         function createCallExpression(expression, typeArguments, argumentsArray) {
-            var node = createBaseExpression(203 /* CallExpression */);
+            var node = createBaseExpression(204 /* CallExpression */);
             node.expression = parenthesizerRules().parenthesizeLeftSideOfAccess(expression);
             node.typeArguments = asNodeArray(typeArguments);
             node.arguments = parenthesizerRules().parenthesizeExpressionsOfCommaDelimitedList(createNodeArray(argumentsArray));
@@ -22466,10 +22811,10 @@ var ts;
                 node.transformFlags |= 1 /* ContainsTypeScript */;
             }
             if (ts.isImportKeyword(node.expression)) {
-                node.transformFlags |= 2097152 /* ContainsDynamicImport */;
+                node.transformFlags |= 4194304 /* ContainsDynamicImport */;
             }
             else if (ts.isSuperProperty(node.expression)) {
-                node.transformFlags |= 4096 /* ContainsLexicalThis */;
+                node.transformFlags |= 8192 /* ContainsLexicalThis */;
             }
             return node;
         }
@@ -22486,7 +22831,7 @@ var ts;
         }
         // @api
         function createCallChain(expression, questionDotToken, typeArguments, argumentsArray) {
-            var node = createBaseExpression(203 /* CallExpression */);
+            var node = createBaseExpression(204 /* CallExpression */);
             node.flags |= 32 /* OptionalChain */;
             node.expression = parenthesizerRules().parenthesizeLeftSideOfAccess(expression);
             node.questionDotToken = questionDotToken;
@@ -22497,12 +22842,12 @@ var ts;
                     propagateChildFlags(node.questionDotToken) |
                     propagateChildrenFlags(node.typeArguments) |
                     propagateChildrenFlags(node.arguments) |
-                    8 /* ContainsES2020 */;
+                    16 /* ContainsES2020 */;
             if (node.typeArguments) {
                 node.transformFlags |= 1 /* ContainsTypeScript */;
             }
             if (ts.isSuperProperty(node.expression)) {
-                node.transformFlags |= 4096 /* ContainsLexicalThis */;
+                node.transformFlags |= 8192 /* ContainsLexicalThis */;
             }
             return node;
         }
@@ -22518,7 +22863,7 @@ var ts;
         }
         // @api
         function createNewExpression(expression, typeArguments, argumentsArray) {
-            var node = createBaseExpression(204 /* NewExpression */);
+            var node = createBaseExpression(205 /* NewExpression */);
             node.expression = parenthesizerRules().parenthesizeExpressionOfNew(expression);
             node.typeArguments = asNodeArray(typeArguments);
             node.arguments = argumentsArray ? parenthesizerRules().parenthesizeExpressionsOfCommaDelimitedList(argumentsArray) : undefined;
@@ -22526,7 +22871,7 @@ var ts;
                 propagateChildFlags(node.expression) |
                     propagateChildrenFlags(node.typeArguments) |
                     propagateChildrenFlags(node.arguments) |
-                    8 /* ContainsES2020 */;
+                    16 /* ContainsES2020 */;
             if (node.typeArguments) {
                 node.transformFlags |= 1 /* ContainsTypeScript */;
             }
@@ -22542,7 +22887,7 @@ var ts;
         }
         // @api
         function createTaggedTemplateExpression(tag, typeArguments, template) {
-            var node = createBaseExpression(205 /* TaggedTemplateExpression */);
+            var node = createBaseExpression(206 /* TaggedTemplateExpression */);
             node.tag = parenthesizerRules().parenthesizeLeftSideOfAccess(tag);
             node.typeArguments = asNodeArray(typeArguments);
             node.template = template;
@@ -22550,12 +22895,12 @@ var ts;
                 propagateChildFlags(node.tag) |
                     propagateChildrenFlags(node.typeArguments) |
                     propagateChildFlags(node.template) |
-                    256 /* ContainsES2015 */;
+                    512 /* ContainsES2015 */;
             if (node.typeArguments) {
                 node.transformFlags |= 1 /* ContainsTypeScript */;
             }
             if (ts.hasInvalidEscape(node.template)) {
-                node.transformFlags |= 32 /* ContainsES2018 */;
+                node.transformFlags |= 64 /* ContainsES2018 */;
             }
             return node;
         }
@@ -22569,7 +22914,7 @@ var ts;
         }
         // @api
         function createTypeAssertion(type, expression) {
-            var node = createBaseExpression(206 /* TypeAssertionExpression */);
+            var node = createBaseExpression(207 /* TypeAssertionExpression */);
             node.expression = parenthesizerRules().parenthesizeOperandOfPrefixUnary(expression);
             node.type = type;
             node.transformFlags |=
@@ -22587,7 +22932,7 @@ var ts;
         }
         // @api
         function createParenthesizedExpression(expression) {
-            var node = createBaseExpression(207 /* ParenthesizedExpression */);
+            var node = createBaseExpression(208 /* ParenthesizedExpression */);
             node.expression = expression;
             node.transformFlags = propagateChildFlags(node.expression);
             return node;
@@ -22600,7 +22945,7 @@ var ts;
         }
         // @api
         function createFunctionExpression(modifiers, asteriskToken, name, typeParameters, parameters, type, body) {
-            var node = createBaseFunctionLikeDeclaration(208 /* FunctionExpression */, 
+            var node = createBaseFunctionLikeDeclaration(209 /* FunctionExpression */, 
             /*decorators*/ undefined, modifiers, name, typeParameters, parameters, type, body);
             node.asteriskToken = asteriskToken;
             node.transformFlags |= propagateChildFlags(node.asteriskToken);
@@ -22609,14 +22954,14 @@ var ts;
             }
             if (ts.modifiersToFlags(node.modifiers) & 256 /* Async */) {
                 if (node.asteriskToken) {
-                    node.transformFlags |= 32 /* ContainsES2018 */;
+                    node.transformFlags |= 64 /* ContainsES2018 */;
                 }
                 else {
-                    node.transformFlags |= 64 /* ContainsES2017 */;
+                    node.transformFlags |= 128 /* ContainsES2017 */;
                 }
             }
             else if (node.asteriskToken) {
-                node.transformFlags |= 512 /* ContainsGenerator */;
+                node.transformFlags |= 1024 /* ContainsGenerator */;
             }
             return node;
         }
@@ -22634,15 +22979,15 @@ var ts;
         }
         // @api
         function createArrowFunction(modifiers, typeParameters, parameters, type, equalsGreaterThanToken, body) {
-            var node = createBaseFunctionLikeDeclaration(209 /* ArrowFunction */, 
+            var node = createBaseFunctionLikeDeclaration(210 /* ArrowFunction */, 
             /*decorators*/ undefined, modifiers, 
             /*name*/ undefined, typeParameters, parameters, type, parenthesizerRules().parenthesizeConciseBodyOfArrowFunction(body));
             node.equalsGreaterThanToken = equalsGreaterThanToken !== null && equalsGreaterThanToken !== void 0 ? equalsGreaterThanToken : createToken(38 /* EqualsGreaterThanToken */);
             node.transformFlags |=
                 propagateChildFlags(node.equalsGreaterThanToken) |
-                    256 /* ContainsES2015 */;
+                    512 /* ContainsES2015 */;
             if (ts.modifiersToFlags(node.modifiers) & 256 /* Async */) {
-                node.transformFlags |= 64 /* ContainsES2017 */;
+                node.transformFlags |= 128 /* ContainsES2017 */;
             }
             return node;
         }
@@ -22659,7 +23004,7 @@ var ts;
         }
         // @api
         function createDeleteExpression(expression) {
-            var node = createBaseExpression(210 /* DeleteExpression */);
+            var node = createBaseExpression(211 /* DeleteExpression */);
             node.expression = parenthesizerRules().parenthesizeOperandOfPrefixUnary(expression);
             node.transformFlags |= propagateChildFlags(node.expression);
             return node;
@@ -22672,7 +23017,7 @@ var ts;
         }
         // @api
         function createTypeOfExpression(expression) {
-            var node = createBaseExpression(211 /* TypeOfExpression */);
+            var node = createBaseExpression(212 /* TypeOfExpression */);
             node.expression = parenthesizerRules().parenthesizeOperandOfPrefixUnary(expression);
             node.transformFlags |= propagateChildFlags(node.expression);
             return node;
@@ -22685,7 +23030,7 @@ var ts;
         }
         // @api
         function createVoidExpression(expression) {
-            var node = createBaseExpression(212 /* VoidExpression */);
+            var node = createBaseExpression(213 /* VoidExpression */);
             node.expression = parenthesizerRules().parenthesizeOperandOfPrefixUnary(expression);
             node.transformFlags |= propagateChildFlags(node.expression);
             return node;
@@ -22698,13 +23043,13 @@ var ts;
         }
         // @api
         function createAwaitExpression(expression) {
-            var node = createBaseExpression(213 /* AwaitExpression */);
+            var node = createBaseExpression(214 /* AwaitExpression */);
             node.expression = parenthesizerRules().parenthesizeOperandOfPrefixUnary(expression);
             node.transformFlags |=
                 propagateChildFlags(node.expression) |
-                    64 /* ContainsES2017 */ |
-                    32 /* ContainsES2018 */ |
-                    524288 /* ContainsAwait */;
+                    128 /* ContainsES2017 */ |
+                    64 /* ContainsES2018 */ |
+                    1048576 /* ContainsAwait */;
             return node;
         }
         // @api
@@ -22715,7 +23060,7 @@ var ts;
         }
         // @api
         function createPrefixUnaryExpression(operator, operand) {
-            var node = createBaseExpression(214 /* PrefixUnaryExpression */);
+            var node = createBaseExpression(215 /* PrefixUnaryExpression */);
             node.operator = operator;
             node.operand = parenthesizerRules().parenthesizeOperandOfPrefixUnary(operand);
             node.transformFlags |= propagateChildFlags(node.operand);
@@ -22729,7 +23074,7 @@ var ts;
         }
         // @api
         function createPostfixUnaryExpression(operand, operator) {
-            var node = createBaseExpression(215 /* PostfixUnaryExpression */);
+            var node = createBaseExpression(216 /* PostfixUnaryExpression */);
             node.operator = operator;
             node.operand = parenthesizerRules().parenthesizeOperandOfPostfixUnary(operand);
             node.transformFlags = propagateChildFlags(node.operand);
@@ -22743,7 +23088,7 @@ var ts;
         }
         // @api
         function createBinaryExpression(left, operator, right) {
-            var node = createBaseExpression(216 /* BinaryExpression */);
+            var node = createBaseExpression(217 /* BinaryExpression */);
             var operatorToken = asToken(operator);
             var operatorKind = operatorToken.kind;
             node.left = parenthesizerRules().parenthesizeLeftSideOfBinary(operatorKind, left);
@@ -22754,45 +23099,45 @@ var ts;
                     propagateChildFlags(node.operatorToken) |
                     propagateChildFlags(node.right);
             if (operatorKind === 60 /* QuestionQuestionToken */) {
-                node.transformFlags |= 8 /* ContainsES2020 */;
+                node.transformFlags |= 16 /* ContainsES2020 */;
             }
             else if (operatorKind === 62 /* EqualsToken */) {
                 if (ts.isObjectLiteralExpression(node.left)) {
                     node.transformFlags |=
-                        256 /* ContainsES2015 */ |
-                            32 /* ContainsES2018 */ |
-                            1024 /* ContainsDestructuringAssignment */ |
+                        512 /* ContainsES2015 */ |
+                            64 /* ContainsES2018 */ |
+                            2048 /* ContainsDestructuringAssignment */ |
                             propagateAssignmentPatternFlags(node.left);
                 }
                 else if (ts.isArrayLiteralExpression(node.left)) {
                     node.transformFlags |=
-                        256 /* ContainsES2015 */ |
-                            1024 /* ContainsDestructuringAssignment */ |
+                        512 /* ContainsES2015 */ |
+                            2048 /* ContainsDestructuringAssignment */ |
                             propagateAssignmentPatternFlags(node.left);
                 }
             }
             else if (operatorKind === 42 /* AsteriskAsteriskToken */ || operatorKind === 66 /* AsteriskAsteriskEqualsToken */) {
-                node.transformFlags |= 128 /* ContainsES2016 */;
+                node.transformFlags |= 256 /* ContainsES2016 */;
             }
             else if (ts.isLogicalOrCoalescingAssignmentOperator(operatorKind)) {
-                node.transformFlags |= 4 /* ContainsESNext */;
+                node.transformFlags |= 8 /* ContainsES2021 */;
             }
             return node;
         }
         function propagateAssignmentPatternFlags(node) {
-            if (node.transformFlags & 16384 /* ContainsObjectRestOrSpread */)
-                return 16384 /* ContainsObjectRestOrSpread */;
-            if (node.transformFlags & 32 /* ContainsES2018 */) {
+            if (node.transformFlags & 32768 /* ContainsObjectRestOrSpread */)
+                return 32768 /* ContainsObjectRestOrSpread */;
+            if (node.transformFlags & 64 /* 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 & 32768 /* ContainsObjectRestOrSpread */) {
+                            return 32768 /* ContainsObjectRestOrSpread */;
                         }
-                        if (target.transformFlags & 32 /* ContainsES2018 */) {
+                        if (target.transformFlags & 64 /* ContainsES2018 */) {
                             var flags_1 = propagateAssignmentPatternFlags(target);
                             if (flags_1)
                                 return flags_1;
@@ -22812,7 +23157,7 @@ var ts;
         }
         // @api
         function createConditionalExpression(condition, questionToken, whenTrue, colonToken, whenFalse) {
-            var node = createBaseExpression(217 /* ConditionalExpression */);
+            var node = createBaseExpression(218 /* ConditionalExpression */);
             node.condition = parenthesizerRules().parenthesizeConditionOfConditionalExpression(condition);
             node.questionToken = questionToken !== null && questionToken !== void 0 ? questionToken : createToken(57 /* QuestionToken */);
             node.whenTrue = parenthesizerRules().parenthesizeBranchOfConditionalExpression(whenTrue);
@@ -22838,13 +23183,13 @@ var ts;
         }
         // @api
         function createTemplateExpression(head, templateSpans) {
-            var node = createBaseExpression(218 /* TemplateExpression */);
+            var node = createBaseExpression(219 /* TemplateExpression */);
             node.head = head;
             node.templateSpans = createNodeArray(templateSpans);
             node.transformFlags |=
                 propagateChildFlags(node.head) |
                     propagateChildrenFlags(node.templateSpans) |
-                    256 /* ContainsES2015 */;
+                    512 /* ContainsES2015 */;
             return node;
         }
         // @api
@@ -22883,9 +23228,9 @@ var ts;
             node.text = text;
             node.rawText = rawText;
             node.templateFlags = templateFlags & 2048 /* TemplateLiteralLikeFlags */;
-            node.transformFlags |= 256 /* ContainsES2015 */;
+            node.transformFlags |= 512 /* ContainsES2015 */;
             if (node.templateFlags) {
-                node.transformFlags |= 32 /* ContainsES2018 */;
+                node.transformFlags |= 64 /* ContainsES2018 */;
             }
             return node;
         }
@@ -22908,15 +23253,15 @@ var ts;
         // @api
         function createYieldExpression(asteriskToken, expression) {
             ts.Debug.assert(!asteriskToken || !!expression, "A `YieldExpression` with an asteriskToken must have an expression.");
-            var node = createBaseExpression(219 /* YieldExpression */);
+            var node = createBaseExpression(220 /* YieldExpression */);
             node.expression = expression && parenthesizerRules().parenthesizeExpressionForDisallowedComma(expression);
             node.asteriskToken = asteriskToken;
             node.transformFlags |=
                 propagateChildFlags(node.expression) |
                     propagateChildFlags(node.asteriskToken) |
-                    256 /* ContainsES2015 */ |
-                    32 /* ContainsES2018 */ |
-                    262144 /* ContainsYield */;
+                    512 /* ContainsES2015 */ |
+                    64 /* ContainsES2018 */ |
+                    524288 /* ContainsYield */;
             return node;
         }
         // @api
@@ -22928,12 +23273,12 @@ var ts;
         }
         // @api
         function createSpreadElement(expression) {
-            var node = createBaseExpression(220 /* SpreadElement */);
+            var node = createBaseExpression(221 /* SpreadElement */);
             node.expression = parenthesizerRules().parenthesizeExpressionForDisallowedComma(expression);
             node.transformFlags |=
                 propagateChildFlags(node.expression) |
-                    256 /* ContainsES2015 */ |
-                    8192 /* ContainsRestOrSpread */;
+                    512 /* ContainsES2015 */ |
+                    16384 /* ContainsRestOrSpread */;
             return node;
         }
         // @api
@@ -22944,8 +23289,8 @@ var ts;
         }
         // @api
         function createClassExpression(decorators, modifiers, name, typeParameters, heritageClauses, members) {
-            var node = createBaseClassLikeDeclaration(221 /* ClassExpression */, decorators, modifiers, name, typeParameters, heritageClauses, members);
-            node.transformFlags |= 256 /* ContainsES2015 */;
+            var node = createBaseClassLikeDeclaration(222 /* ClassExpression */, decorators, modifiers, name, typeParameters, heritageClauses, members);
+            node.transformFlags |= 512 /* ContainsES2015 */;
             return node;
         }
         // @api
@@ -22961,17 +23306,17 @@ var ts;
         }
         // @api
         function createOmittedExpression() {
-            return createBaseExpression(222 /* OmittedExpression */);
+            return createBaseExpression(223 /* OmittedExpression */);
         }
         // @api
         function createExpressionWithTypeArguments(expression, typeArguments) {
-            var node = createBaseNode(223 /* ExpressionWithTypeArguments */);
+            var node = createBaseNode(224 /* ExpressionWithTypeArguments */);
             node.expression = parenthesizerRules().parenthesizeLeftSideOfAccess(expression);
             node.typeArguments = typeArguments && parenthesizerRules().parenthesizeTypeArguments(typeArguments);
             node.transformFlags |=
                 propagateChildFlags(node.expression) |
                     propagateChildrenFlags(node.typeArguments) |
-                    256 /* ContainsES2015 */;
+                    512 /* ContainsES2015 */;
             return node;
         }
         // @api
@@ -22983,7 +23328,7 @@ var ts;
         }
         // @api
         function createAsExpression(expression, type) {
-            var node = createBaseExpression(224 /* AsExpression */);
+            var node = createBaseExpression(225 /* AsExpression */);
             node.expression = expression;
             node.type = type;
             node.transformFlags |=
@@ -23001,7 +23346,7 @@ var ts;
         }
         // @api
         function createNonNullExpression(expression) {
-            var node = createBaseExpression(225 /* NonNullExpression */);
+            var node = createBaseExpression(226 /* NonNullExpression */);
             node.expression = parenthesizerRules().parenthesizeLeftSideOfAccess(expression);
             node.transformFlags |=
                 propagateChildFlags(node.expression) |
@@ -23019,7 +23364,7 @@ var ts;
         }
         // @api
         function createNonNullChain(expression) {
-            var node = createBaseExpression(225 /* NonNullExpression */);
+            var node = createBaseExpression(226 /* NonNullExpression */);
             node.flags |= 32 /* OptionalChain */;
             node.expression = parenthesizerRules().parenthesizeLeftSideOfAccess(expression);
             node.transformFlags |=
@@ -23036,13 +23381,13 @@ var ts;
         }
         // @api
         function createMetaProperty(keywordToken, name) {
-            var node = createBaseExpression(226 /* MetaProperty */);
+            var node = createBaseExpression(227 /* MetaProperty */);
             node.keywordToken = keywordToken;
             node.name = name;
             node.transformFlags |= propagateChildFlags(node.name);
             switch (keywordToken) {
                 case 102 /* NewKeyword */:
-                    node.transformFlags |= 256 /* ContainsES2015 */;
+                    node.transformFlags |= 512 /* ContainsES2015 */;
                     break;
                 case 99 /* ImportKeyword */:
                     node.transformFlags |= 4 /* ContainsESNext */;
@@ -23063,13 +23408,13 @@ var ts;
         //
         // @api
         function createTemplateSpan(expression, literal) {
-            var node = createBaseNode(228 /* TemplateSpan */);
+            var node = createBaseNode(229 /* TemplateSpan */);
             node.expression = expression;
             node.literal = literal;
             node.transformFlags |=
                 propagateChildFlags(node.expression) |
                     propagateChildFlags(node.literal) |
-                    256 /* ContainsES2015 */;
+                    512 /* ContainsES2015 */;
             return node;
         }
         // @api
@@ -23081,8 +23426,8 @@ var ts;
         }
         // @api
         function createSemicolonClassElement() {
-            var node = createBaseNode(229 /* SemicolonClassElement */);
-            node.transformFlags |= 256 /* ContainsES2015 */;
+            var node = createBaseNode(230 /* SemicolonClassElement */);
+            node.transformFlags |= 512 /* ContainsES2015 */;
             return node;
         }
         //
@@ -23090,7 +23435,7 @@ var ts;
         //
         // @api
         function createBlock(statements, multiLine) {
-            var node = createBaseNode(230 /* Block */);
+            var node = createBaseNode(231 /* Block */);
             node.statements = createNodeArray(statements);
             node.multiLine = multiLine;
             node.transformFlags |= propagateChildrenFlags(node.statements);
@@ -23104,7 +23449,7 @@ var ts;
         }
         // @api
         function createVariableStatement(modifiers, declarationList) {
-            var node = createBaseDeclaration(232 /* VariableStatement */, /*decorators*/ undefined, modifiers);
+            var node = createBaseDeclaration(233 /* VariableStatement */, /*decorators*/ undefined, modifiers);
             node.declarationList = ts.isArray(declarationList) ? createVariableDeclarationList(declarationList) : declarationList;
             node.transformFlags |=
                 propagateChildFlags(node.declarationList);
@@ -23122,11 +23467,11 @@ var ts;
         }
         // @api
         function createEmptyStatement() {
-            return createBaseNode(231 /* EmptyStatement */);
+            return createBaseNode(232 /* EmptyStatement */);
         }
         // @api
         function createExpressionStatement(expression) {
-            var node = createBaseNode(233 /* ExpressionStatement */);
+            var node = createBaseNode(234 /* ExpressionStatement */);
             node.expression = parenthesizerRules().parenthesizeExpressionOfExpressionStatement(expression);
             node.transformFlags |= propagateChildFlags(node.expression);
             return node;
@@ -23139,7 +23484,7 @@ var ts;
         }
         // @api
         function createIfStatement(expression, thenStatement, elseStatement) {
-            var node = createBaseNode(234 /* IfStatement */);
+            var node = createBaseNode(235 /* IfStatement */);
             node.expression = expression;
             node.thenStatement = asEmbeddedStatement(thenStatement);
             node.elseStatement = asEmbeddedStatement(elseStatement);
@@ -23159,7 +23504,7 @@ var ts;
         }
         // @api
         function createDoStatement(statement, expression) {
-            var node = createBaseNode(235 /* DoStatement */);
+            var node = createBaseNode(236 /* DoStatement */);
             node.statement = asEmbeddedStatement(statement);
             node.expression = expression;
             node.transformFlags |=
@@ -23176,7 +23521,7 @@ var ts;
         }
         // @api
         function createWhileStatement(expression, statement) {
-            var node = createBaseNode(236 /* WhileStatement */);
+            var node = createBaseNode(237 /* WhileStatement */);
             node.expression = expression;
             node.statement = asEmbeddedStatement(statement);
             node.transformFlags |=
@@ -23193,7 +23538,7 @@ var ts;
         }
         // @api
         function createForStatement(initializer, condition, incrementor, statement) {
-            var node = createBaseNode(237 /* ForStatement */);
+            var node = createBaseNode(238 /* ForStatement */);
             node.initializer = initializer;
             node.condition = condition;
             node.incrementor = incrementor;
@@ -23216,7 +23561,7 @@ var ts;
         }
         // @api
         function createForInStatement(initializer, expression, statement) {
-            var node = createBaseNode(238 /* ForInStatement */);
+            var node = createBaseNode(239 /* ForInStatement */);
             node.initializer = initializer;
             node.expression = expression;
             node.statement = asEmbeddedStatement(statement);
@@ -23236,7 +23581,7 @@ var ts;
         }
         // @api
         function createForOfStatement(awaitModifier, initializer, expression, statement) {
-            var node = createBaseNode(239 /* ForOfStatement */);
+            var node = createBaseNode(240 /* ForOfStatement */);
             node.awaitModifier = awaitModifier;
             node.initializer = initializer;
             node.expression = parenthesizerRules().parenthesizeExpressionForDisallowedComma(expression);
@@ -23246,9 +23591,9 @@ var ts;
                     propagateChildFlags(node.initializer) |
                     propagateChildFlags(node.expression) |
                     propagateChildFlags(node.statement) |
-                    256 /* ContainsES2015 */;
+                    512 /* ContainsES2015 */;
             if (awaitModifier)
-                node.transformFlags |= 32 /* ContainsES2018 */;
+                node.transformFlags |= 64 /* ContainsES2018 */;
             return node;
         }
         // @api
@@ -23262,11 +23607,11 @@ var ts;
         }
         // @api
         function createContinueStatement(label) {
-            var node = createBaseNode(240 /* ContinueStatement */);
+            var node = createBaseNode(241 /* ContinueStatement */);
             node.label = asName(label);
             node.transformFlags |=
                 propagateChildFlags(node.label) |
-                    1048576 /* ContainsHoistedDeclarationOrCompletion */;
+                    2097152 /* ContainsHoistedDeclarationOrCompletion */;
             return node;
         }
         // @api
@@ -23277,11 +23622,11 @@ var ts;
         }
         // @api
         function createBreakStatement(label) {
-            var node = createBaseNode(241 /* BreakStatement */);
+            var node = createBaseNode(242 /* BreakStatement */);
             node.label = asName(label);
             node.transformFlags |=
                 propagateChildFlags(node.label) |
-                    1048576 /* ContainsHoistedDeclarationOrCompletion */;
+                    2097152 /* ContainsHoistedDeclarationOrCompletion */;
             return node;
         }
         // @api
@@ -23292,13 +23637,13 @@ var ts;
         }
         // @api
         function createReturnStatement(expression) {
-            var node = createBaseNode(242 /* ReturnStatement */);
+            var node = createBaseNode(243 /* ReturnStatement */);
             node.expression = expression;
             // return in an ES2018 async generator must be awaited
             node.transformFlags |=
                 propagateChildFlags(node.expression) |
-                    32 /* ContainsES2018 */ |
-                    1048576 /* ContainsHoistedDeclarationOrCompletion */;
+                    64 /* ContainsES2018 */ |
+                    2097152 /* ContainsHoistedDeclarationOrCompletion */;
             return node;
         }
         // @api
@@ -23309,7 +23654,7 @@ var ts;
         }
         // @api
         function createWithStatement(expression, statement) {
-            var node = createBaseNode(243 /* WithStatement */);
+            var node = createBaseNode(244 /* WithStatement */);
             node.expression = expression;
             node.statement = asEmbeddedStatement(statement);
             node.transformFlags |=
@@ -23326,7 +23671,7 @@ var ts;
         }
         // @api
         function createSwitchStatement(expression, caseBlock) {
-            var node = createBaseNode(244 /* SwitchStatement */);
+            var node = createBaseNode(245 /* SwitchStatement */);
             node.expression = parenthesizerRules().parenthesizeExpressionForDisallowedComma(expression);
             node.caseBlock = caseBlock;
             node.transformFlags |=
@@ -23343,7 +23688,7 @@ var ts;
         }
         // @api
         function createLabeledStatement(label, statement) {
-            var node = createBaseNode(245 /* LabeledStatement */);
+            var node = createBaseNode(246 /* LabeledStatement */);
             node.label = asName(label);
             node.statement = asEmbeddedStatement(statement);
             node.transformFlags |=
@@ -23360,7 +23705,7 @@ var ts;
         }
         // @api
         function createThrowStatement(expression) {
-            var node = createBaseNode(246 /* ThrowStatement */);
+            var node = createBaseNode(247 /* ThrowStatement */);
             node.expression = expression;
             node.transformFlags |= propagateChildFlags(node.expression);
             return node;
@@ -23373,7 +23718,7 @@ var ts;
         }
         // @api
         function createTryStatement(tryBlock, catchClause, finallyBlock) {
-            var node = createBaseNode(247 /* TryStatement */);
+            var node = createBaseNode(248 /* TryStatement */);
             node.tryBlock = tryBlock;
             node.catchClause = catchClause;
             node.finallyBlock = finallyBlock;
@@ -23393,11 +23738,11 @@ var ts;
         }
         // @api
         function createDebuggerStatement() {
-            return createBaseNode(248 /* DebuggerStatement */);
+            return createBaseNode(249 /* DebuggerStatement */);
         }
         // @api
         function createVariableDeclaration(name, exclamationToken, type, initializer) {
-            var node = createBaseVariableLikeDeclaration(249 /* VariableDeclaration */, 
+            var node = createBaseVariableLikeDeclaration(250 /* VariableDeclaration */, 
             /*decorators*/ undefined, 
             /*modifiers*/ undefined, name, type, initializer && parenthesizerRules().parenthesizeExpressionForDisallowedComma(initializer));
             node.exclamationToken = exclamationToken;
@@ -23419,16 +23764,16 @@ var ts;
         // @api
         function createVariableDeclarationList(declarations, flags) {
             if (flags === void 0) { flags = 0 /* None */; }
-            var node = createBaseNode(250 /* VariableDeclarationList */);
+            var node = createBaseNode(251 /* VariableDeclarationList */);
             node.flags |= flags & 3 /* BlockScoped */;
             node.declarations = createNodeArray(declarations);
             node.transformFlags |=
                 propagateChildrenFlags(node.declarations) |
-                    1048576 /* ContainsHoistedDeclarationOrCompletion */;
+                    2097152 /* ContainsHoistedDeclarationOrCompletion */;
             if (flags & 3 /* BlockScoped */) {
                 node.transformFlags |=
-                    256 /* ContainsES2015 */ |
-                        65536 /* ContainsBlockScopedBinding */;
+                    512 /* ContainsES2015 */ |
+                        131072 /* ContainsBlockScopedBinding */;
             }
             return node;
         }
@@ -23440,7 +23785,7 @@ var ts;
         }
         // @api
         function createFunctionDeclaration(decorators, modifiers, asteriskToken, name, typeParameters, parameters, type, body) {
-            var node = createBaseFunctionLikeDeclaration(251 /* FunctionDeclaration */, decorators, modifiers, name, typeParameters, parameters, type, body);
+            var node = createBaseFunctionLikeDeclaration(252 /* FunctionDeclaration */, decorators, modifiers, name, typeParameters, parameters, type, body);
             node.asteriskToken = asteriskToken;
             if (!node.body || ts.modifiersToFlags(node.modifiers) & 2 /* Ambient */) {
                 node.transformFlags = 1 /* ContainsTypeScript */;
@@ -23448,17 +23793,17 @@ var ts;
             else {
                 node.transformFlags |=
                     propagateChildFlags(node.asteriskToken) |
-                        1048576 /* ContainsHoistedDeclarationOrCompletion */;
+                        2097152 /* ContainsHoistedDeclarationOrCompletion */;
                 if (ts.modifiersToFlags(node.modifiers) & 256 /* Async */) {
                     if (node.asteriskToken) {
-                        node.transformFlags |= 32 /* ContainsES2018 */;
+                        node.transformFlags |= 64 /* ContainsES2018 */;
                     }
                     else {
-                        node.transformFlags |= 64 /* ContainsES2017 */;
+                        node.transformFlags |= 128 /* ContainsES2017 */;
                     }
                 }
                 else if (node.asteriskToken) {
-                    node.transformFlags |= 512 /* ContainsGenerator */;
+                    node.transformFlags |= 1024 /* ContainsGenerator */;
                 }
             }
             return node;
@@ -23478,13 +23823,13 @@ var ts;
         }
         // @api
         function createClassDeclaration(decorators, modifiers, name, typeParameters, heritageClauses, members) {
-            var node = createBaseClassLikeDeclaration(252 /* ClassDeclaration */, decorators, modifiers, name, typeParameters, heritageClauses, members);
+            var node = createBaseClassLikeDeclaration(253 /* ClassDeclaration */, decorators, modifiers, name, typeParameters, heritageClauses, members);
             if (ts.modifiersToFlags(node.modifiers) & 2 /* Ambient */) {
                 node.transformFlags = 1 /* ContainsTypeScript */;
             }
             else {
-                node.transformFlags |= 256 /* ContainsES2015 */;
-                if (node.transformFlags & 2048 /* ContainsTypeScriptClassSyntax */) {
+                node.transformFlags |= 512 /* ContainsES2015 */;
+                if (node.transformFlags & 4096 /* ContainsTypeScriptClassSyntax */) {
                     node.transformFlags |= 1 /* ContainsTypeScript */;
                 }
             }
@@ -23503,7 +23848,7 @@ var ts;
         }
         // @api
         function createInterfaceDeclaration(decorators, modifiers, name, typeParameters, heritageClauses, members) {
-            var node = createBaseInterfaceOrClassLikeDeclaration(253 /* InterfaceDeclaration */, decorators, modifiers, name, typeParameters, heritageClauses);
+            var node = createBaseInterfaceOrClassLikeDeclaration(254 /* InterfaceDeclaration */, decorators, modifiers, name, typeParameters, heritageClauses);
             node.members = createNodeArray(members);
             node.transformFlags = 1 /* ContainsTypeScript */;
             return node;
@@ -23521,7 +23866,7 @@ var ts;
         }
         // @api
         function createTypeAliasDeclaration(decorators, modifiers, name, typeParameters, type) {
-            var node = createBaseGenericNamedDeclaration(254 /* TypeAliasDeclaration */, decorators, modifiers, name, typeParameters);
+            var node = createBaseGenericNamedDeclaration(255 /* TypeAliasDeclaration */, decorators, modifiers, name, typeParameters);
             node.type = type;
             node.transformFlags = 1 /* ContainsTypeScript */;
             return node;
@@ -23538,12 +23883,12 @@ var ts;
         }
         // @api
         function createEnumDeclaration(decorators, modifiers, name, members) {
-            var node = createBaseNamedDeclaration(255 /* EnumDeclaration */, decorators, modifiers, name);
+            var node = createBaseNamedDeclaration(256 /* EnumDeclaration */, decorators, modifiers, name);
             node.members = createNodeArray(members);
             node.transformFlags |=
                 propagateChildrenFlags(node.members) |
                     1 /* ContainsTypeScript */;
-            node.transformFlags &= ~8388608 /* ContainsPossibleTopLevelAwait */; // Enum declarations cannot contain `await`
+            node.transformFlags &= ~16777216 /* ContainsPossibleTopLevelAwait */; // Enum declarations cannot contain `await`
             return node;
         }
         // @api
@@ -23558,7 +23903,7 @@ var ts;
         // @api
         function createModuleDeclaration(decorators, modifiers, name, body, flags) {
             if (flags === void 0) { flags = 0 /* None */; }
-            var node = createBaseDeclaration(256 /* ModuleDeclaration */, decorators, modifiers);
+            var node = createBaseDeclaration(257 /* ModuleDeclaration */, decorators, modifiers);
             node.flags |= flags & (16 /* Namespace */ | 4 /* NestedNamespace */ | 1024 /* GlobalAugmentation */);
             node.name = name;
             node.body = body;
@@ -23571,7 +23916,7 @@ var ts;
                         propagateChildFlags(node.body) |
                         1 /* ContainsTypeScript */;
             }
-            node.transformFlags &= ~8388608 /* ContainsPossibleTopLevelAwait */; // Module declarations cannot contain `await`.
+            node.transformFlags &= ~16777216 /* ContainsPossibleTopLevelAwait */; // Module declarations cannot contain `await`.
             return node;
         }
         // @api
@@ -23585,7 +23930,7 @@ var ts;
         }
         // @api
         function createModuleBlock(statements) {
-            var node = createBaseNode(257 /* ModuleBlock */);
+            var node = createBaseNode(258 /* ModuleBlock */);
             node.statements = createNodeArray(statements);
             node.transformFlags |= propagateChildrenFlags(node.statements);
             return node;
@@ -23598,7 +23943,7 @@ var ts;
         }
         // @api
         function createCaseBlock(clauses) {
-            var node = createBaseNode(258 /* CaseBlock */);
+            var node = createBaseNode(259 /* CaseBlock */);
             node.clauses = createNodeArray(clauses);
             node.transformFlags |= propagateChildrenFlags(node.clauses);
             return node;
@@ -23611,7 +23956,7 @@ var ts;
         }
         // @api
         function createNamespaceExportDeclaration(name) {
-            var node = createBaseNamedDeclaration(259 /* NamespaceExportDeclaration */, 
+            var node = createBaseNamedDeclaration(260 /* NamespaceExportDeclaration */, 
             /*decorators*/ undefined, 
             /*modifiers*/ undefined, name);
             node.transformFlags = 1 /* ContainsTypeScript */;
@@ -23625,13 +23970,13 @@ var ts;
         }
         // @api
         function createImportEqualsDeclaration(decorators, modifiers, isTypeOnly, name, moduleReference) {
-            var node = createBaseNamedDeclaration(260 /* ImportEqualsDeclaration */, decorators, modifiers, name);
+            var node = createBaseNamedDeclaration(261 /* ImportEqualsDeclaration */, decorators, modifiers, name);
             node.isTypeOnly = isTypeOnly;
             node.moduleReference = moduleReference;
             node.transformFlags |= propagateChildFlags(node.moduleReference);
             if (!ts.isExternalModuleReference(node.moduleReference))
                 node.transformFlags |= 1 /* ContainsTypeScript */;
-            node.transformFlags &= ~8388608 /* ContainsPossibleTopLevelAwait */; // Import= declaration is always parsed in an Await context
+            node.transformFlags &= ~16777216 /* ContainsPossibleTopLevelAwait */; // Import= declaration is always parsed in an Await context
             return node;
         }
         // @api
@@ -23646,13 +23991,13 @@ var ts;
         }
         // @api
         function createImportDeclaration(decorators, modifiers, importClause, moduleSpecifier) {
-            var node = createBaseDeclaration(261 /* ImportDeclaration */, decorators, modifiers);
+            var node = createBaseDeclaration(262 /* ImportDeclaration */, decorators, modifiers);
             node.importClause = importClause;
             node.moduleSpecifier = moduleSpecifier;
             node.transformFlags |=
                 propagateChildFlags(node.importClause) |
                     propagateChildFlags(node.moduleSpecifier);
-            node.transformFlags &= ~8388608 /* ContainsPossibleTopLevelAwait */; // always parsed in an Await context
+            node.transformFlags &= ~16777216 /* ContainsPossibleTopLevelAwait */; // always parsed in an Await context
             return node;
         }
         // @api
@@ -23666,7 +24011,7 @@ var ts;
         }
         // @api
         function createImportClause(isTypeOnly, name, namedBindings) {
-            var node = createBaseNode(262 /* ImportClause */);
+            var node = createBaseNode(263 /* ImportClause */);
             node.isTypeOnly = isTypeOnly;
             node.name = name;
             node.namedBindings = namedBindings;
@@ -23676,7 +24021,7 @@ var ts;
             if (isTypeOnly) {
                 node.transformFlags |= 1 /* ContainsTypeScript */;
             }
-            node.transformFlags &= ~8388608 /* ContainsPossibleTopLevelAwait */; // always parsed in an Await context
+            node.transformFlags &= ~16777216 /* ContainsPossibleTopLevelAwait */; // always parsed in an Await context
             return node;
         }
         // @api
@@ -23689,10 +24034,10 @@ var ts;
         }
         // @api
         function createNamespaceImport(name) {
-            var node = createBaseNode(263 /* NamespaceImport */);
+            var node = createBaseNode(264 /* NamespaceImport */);
             node.name = name;
             node.transformFlags |= propagateChildFlags(node.name);
-            node.transformFlags &= ~8388608 /* ContainsPossibleTopLevelAwait */; // always parsed in an Await context
+            node.transformFlags &= ~16777216 /* ContainsPossibleTopLevelAwait */; // always parsed in an Await context
             return node;
         }
         // @api
@@ -23703,12 +24048,12 @@ var ts;
         }
         // @api
         function createNamespaceExport(name) {
-            var node = createBaseNode(269 /* NamespaceExport */);
+            var node = createBaseNode(270 /* NamespaceExport */);
             node.name = name;
             node.transformFlags |=
                 propagateChildFlags(node.name) |
                     4 /* ContainsESNext */;
-            node.transformFlags &= ~8388608 /* ContainsPossibleTopLevelAwait */; // always parsed in an Await context
+            node.transformFlags &= ~16777216 /* ContainsPossibleTopLevelAwait */; // always parsed in an Await context
             return node;
         }
         // @api
@@ -23719,10 +24064,10 @@ var ts;
         }
         // @api
         function createNamedImports(elements) {
-            var node = createBaseNode(264 /* NamedImports */);
+            var node = createBaseNode(265 /* NamedImports */);
             node.elements = createNodeArray(elements);
             node.transformFlags |= propagateChildrenFlags(node.elements);
-            node.transformFlags &= ~8388608 /* ContainsPossibleTopLevelAwait */; // always parsed in an Await context
+            node.transformFlags &= ~16777216 /* ContainsPossibleTopLevelAwait */; // always parsed in an Await context
             return node;
         }
         // @api
@@ -23733,13 +24078,13 @@ var ts;
         }
         // @api
         function createImportSpecifier(propertyName, name) {
-            var node = createBaseNode(265 /* ImportSpecifier */);
+            var node = createBaseNode(266 /* ImportSpecifier */);
             node.propertyName = propertyName;
             node.name = name;
             node.transformFlags |=
                 propagateChildFlags(node.propertyName) |
                     propagateChildFlags(node.name);
-            node.transformFlags &= ~8388608 /* ContainsPossibleTopLevelAwait */; // always parsed in an Await context
+            node.transformFlags &= ~16777216 /* ContainsPossibleTopLevelAwait */; // always parsed in an Await context
             return node;
         }
         // @api
@@ -23751,13 +24096,13 @@ var ts;
         }
         // @api
         function createExportAssignment(decorators, modifiers, isExportEquals, expression) {
-            var node = createBaseDeclaration(266 /* ExportAssignment */, decorators, modifiers);
+            var node = createBaseDeclaration(267 /* ExportAssignment */, decorators, modifiers);
             node.isExportEquals = isExportEquals;
             node.expression = isExportEquals
                 ? parenthesizerRules().parenthesizeRightSideOfBinary(62 /* EqualsToken */, /*leftSide*/ undefined, expression)
                 : parenthesizerRules().parenthesizeExpressionOfExportDefault(expression);
             node.transformFlags |= propagateChildFlags(node.expression);
-            node.transformFlags &= ~8388608 /* ContainsPossibleTopLevelAwait */; // always parsed in an Await context
+            node.transformFlags &= ~16777216 /* ContainsPossibleTopLevelAwait */; // always parsed in an Await context
             return node;
         }
         // @api
@@ -23770,14 +24115,14 @@ var ts;
         }
         // @api
         function createExportDeclaration(decorators, modifiers, isTypeOnly, exportClause, moduleSpecifier) {
-            var node = createBaseDeclaration(267 /* ExportDeclaration */, decorators, modifiers);
+            var node = createBaseDeclaration(268 /* ExportDeclaration */, decorators, modifiers);
             node.isTypeOnly = isTypeOnly;
             node.exportClause = exportClause;
             node.moduleSpecifier = moduleSpecifier;
             node.transformFlags |=
                 propagateChildFlags(node.exportClause) |
                     propagateChildFlags(node.moduleSpecifier);
-            node.transformFlags &= ~8388608 /* ContainsPossibleTopLevelAwait */; // always parsed in an Await context
+            node.transformFlags &= ~16777216 /* ContainsPossibleTopLevelAwait */; // always parsed in an Await context
             return node;
         }
         // @api
@@ -23792,10 +24137,10 @@ var ts;
         }
         // @api
         function createNamedExports(elements) {
-            var node = createBaseNode(268 /* NamedExports */);
+            var node = createBaseNode(269 /* NamedExports */);
             node.elements = createNodeArray(elements);
             node.transformFlags |= propagateChildrenFlags(node.elements);
-            node.transformFlags &= ~8388608 /* ContainsPossibleTopLevelAwait */; // always parsed in an Await context
+            node.transformFlags &= ~16777216 /* ContainsPossibleTopLevelAwait */; // always parsed in an Await context
             return node;
         }
         // @api
@@ -23806,13 +24151,13 @@ var ts;
         }
         // @api
         function createExportSpecifier(propertyName, name) {
-            var node = createBaseNode(270 /* ExportSpecifier */);
+            var node = createBaseNode(271 /* ExportSpecifier */);
             node.propertyName = asName(propertyName);
             node.name = asName(name);
             node.transformFlags |=
                 propagateChildFlags(node.propertyName) |
                     propagateChildFlags(node.name);
-            node.transformFlags &= ~8388608 /* ContainsPossibleTopLevelAwait */; // always parsed in an Await context
+            node.transformFlags &= ~16777216 /* ContainsPossibleTopLevelAwait */; // always parsed in an Await context
             return node;
         }
         // @api
@@ -23824,7 +24169,7 @@ var ts;
         }
         // @api
         function createMissingDeclaration() {
-            var node = createBaseDeclaration(271 /* MissingDeclaration */, 
+            var node = createBaseDeclaration(272 /* MissingDeclaration */, 
             /*decorators*/ undefined, 
             /*modifiers*/ undefined);
             return node;
@@ -23834,10 +24179,10 @@ var ts;
         //
         // @api
         function createExternalModuleReference(expression) {
-            var node = createBaseNode(272 /* ExternalModuleReference */);
+            var node = createBaseNode(273 /* ExternalModuleReference */);
             node.expression = expression;
             node.transformFlags |= propagateChildFlags(node.expression);
-            node.transformFlags &= ~8388608 /* ContainsPossibleTopLevelAwait */; // always parsed in an Await context
+            node.transformFlags &= ~16777216 /* ContainsPossibleTopLevelAwait */; // always parsed in an Await context
             return node;
         }
         // @api
@@ -23879,7 +24224,7 @@ var ts;
         }
         // @api
         function createJSDocFunctionType(parameters, type) {
-            var node = createBaseSignatureDeclaration(308 /* JSDocFunctionType */, 
+            var node = createBaseSignatureDeclaration(309 /* JSDocFunctionType */, 
             /*decorators*/ undefined, 
             /*modifiers*/ undefined, 
             /*name*/ undefined, 
@@ -23896,7 +24241,7 @@ var ts;
         // @api
         function createJSDocTypeLiteral(propertyTags, isArrayType) {
             if (isArrayType === void 0) { isArrayType = false; }
-            var node = createBaseNode(312 /* JSDocTypeLiteral */);
+            var node = createBaseNode(314 /* JSDocTypeLiteral */);
             node.jsDocPropertyTags = asNodeArray(propertyTags);
             node.isArrayType = isArrayType;
             return node;
@@ -23910,7 +24255,7 @@ var ts;
         }
         // @api
         function createJSDocTypeExpression(type) {
-            var node = createBaseNode(301 /* JSDocTypeExpression */);
+            var node = createBaseNode(302 /* JSDocTypeExpression */);
             node.type = type;
             return node;
         }
@@ -23922,7 +24267,7 @@ var ts;
         }
         // @api
         function createJSDocSignature(typeParameters, parameters, type) {
-            var node = createBaseNode(313 /* JSDocSignature */);
+            var node = createBaseNode(315 /* JSDocSignature */);
             node.typeParameters = asNodeArray(typeParameters);
             node.parameters = createNodeArray(parameters);
             node.type = type;
@@ -23951,7 +24296,7 @@ var ts;
         }
         // @api
         function createJSDocTemplateTag(tagName, constraint, typeParameters, comment) {
-            var node = createBaseJSDocTag(330 /* JSDocTemplateTag */, tagName !== null && tagName !== void 0 ? tagName : createIdentifier("template"), comment);
+            var node = createBaseJSDocTag(334 /* JSDocTemplateTag */, tagName !== null && tagName !== void 0 ? tagName : createIdentifier("template"), comment);
             node.constraint = constraint;
             node.typeParameters = createNodeArray(typeParameters);
             return node;
@@ -23968,7 +24313,7 @@ var ts;
         }
         // @api
         function createJSDocTypedefTag(tagName, typeExpression, fullName, comment) {
-            var node = createBaseJSDocTag(331 /* JSDocTypedefTag */, tagName !== null && tagName !== void 0 ? tagName : createIdentifier("typedef"), comment);
+            var node = createBaseJSDocTag(335 /* JSDocTypedefTag */, tagName !== null && tagName !== void 0 ? tagName : createIdentifier("typedef"), comment);
             node.typeExpression = typeExpression;
             node.fullName = fullName;
             node.name = ts.getJSDocTypeAliasName(fullName);
@@ -23986,7 +24331,7 @@ var ts;
         }
         // @api
         function createJSDocParameterTag(tagName, name, isBracketed, typeExpression, isNameFirst, comment) {
-            var node = createBaseJSDocTag(326 /* JSDocParameterTag */, tagName !== null && tagName !== void 0 ? tagName : createIdentifier("param"), comment);
+            var node = createBaseJSDocTag(330 /* JSDocParameterTag */, tagName !== null && tagName !== void 0 ? tagName : createIdentifier("param"), comment);
             node.typeExpression = typeExpression;
             node.name = name;
             node.isNameFirst = !!isNameFirst;
@@ -24007,7 +24352,7 @@ var ts;
         }
         // @api
         function createJSDocPropertyTag(tagName, name, isBracketed, typeExpression, isNameFirst, comment) {
-            var node = createBaseJSDocTag(333 /* JSDocPropertyTag */, tagName !== null && tagName !== void 0 ? tagName : createIdentifier("prop"), comment);
+            var node = createBaseJSDocTag(337 /* JSDocPropertyTag */, tagName !== null && tagName !== void 0 ? tagName : createIdentifier("prop"), comment);
             node.typeExpression = typeExpression;
             node.name = name;
             node.isNameFirst = !!isNameFirst;
@@ -24028,7 +24373,7 @@ var ts;
         }
         // @api
         function createJSDocCallbackTag(tagName, typeExpression, fullName, comment) {
-            var node = createBaseJSDocTag(324 /* JSDocCallbackTag */, tagName !== null && tagName !== void 0 ? tagName : createIdentifier("callback"), comment);
+            var node = createBaseJSDocTag(328 /* JSDocCallbackTag */, tagName !== null && tagName !== void 0 ? tagName : createIdentifier("callback"), comment);
             node.typeExpression = typeExpression;
             node.fullName = fullName;
             node.name = ts.getJSDocTypeAliasName(fullName);
@@ -24046,7 +24391,7 @@ var ts;
         }
         // @api
         function createJSDocAugmentsTag(tagName, className, comment) {
-            var node = createBaseJSDocTag(315 /* JSDocAugmentsTag */, tagName !== null && tagName !== void 0 ? tagName : createIdentifier("augments"), comment);
+            var node = createBaseJSDocTag(318 /* JSDocAugmentsTag */, tagName !== null && tagName !== void 0 ? tagName : createIdentifier("augments"), comment);
             node.class = className;
             return node;
         }
@@ -24061,13 +24406,13 @@ var ts;
         }
         // @api
         function createJSDocImplementsTag(tagName, className, comment) {
-            var node = createBaseJSDocTag(316 /* JSDocImplementsTag */, tagName !== null && tagName !== void 0 ? tagName : createIdentifier("implements"), comment);
+            var node = createBaseJSDocTag(319 /* 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);
+            var node = createBaseJSDocTag(336 /* JSDocSeeTag */, tagName !== null && tagName !== void 0 ? tagName : createIdentifier("see"), comment);
             node.name = name;
             return node;
         }
@@ -24081,7 +24426,7 @@ var ts;
         }
         // @api
         function createJSDocNameReference(name) {
-            var node = createBaseNode(302 /* JSDocNameReference */);
+            var node = createBaseNode(303 /* JSDocNameReference */);
             node.name = name;
             return node;
         }
@@ -24092,6 +24437,19 @@ var ts;
                 : node;
         }
         // @api
+        function createJSDocLink(name, text) {
+            var node = createBaseNode(316 /* JSDocLink */);
+            node.name = name;
+            node.text = text;
+            return node;
+        }
+        // @api
+        function updateJSDocLink(node, name, text) {
+            return node.name !== name
+                ? update(createJSDocLink(name, text), node)
+                : node;
+        }
+        // @api
         function updateJSDocImplementsTag(node, tagName, className, comment) {
             if (tagName === void 0) { tagName = getDefaultTagName(node); }
             return node.tagName !== tagName
@@ -24152,7 +24510,7 @@ var ts;
         }
         // @api
         function createJSDocUnknownTag(tagName, comment) {
-            var node = createBaseJSDocTag(314 /* JSDocTag */, tagName, comment);
+            var node = createBaseJSDocTag(317 /* JSDocTag */, tagName, comment);
             return node;
         }
         // @api
@@ -24163,8 +24521,20 @@ var ts;
                 : node;
         }
         // @api
+        function createJSDocText(text) {
+            var node = createBaseNode(313 /* JSDocText */);
+            node.text = text;
+            return node;
+        }
+        // @api
+        function updateJSDocText(node, text) {
+            return node.text !== text
+                ? update(createJSDocText(text), node)
+                : node;
+        }
+        // @api
         function createJSDocComment(comment, tags) {
-            var node = createBaseNode(311 /* JSDocComment */);
+            var node = createBaseNode(312 /* JSDocComment */);
             node.comment = comment;
             node.tags = asNodeArray(tags);
             return node;
@@ -24181,7 +24551,7 @@ var ts;
         //
         // @api
         function createJsxElement(openingElement, children, closingElement) {
-            var node = createBaseNode(273 /* JsxElement */);
+            var node = createBaseNode(274 /* JsxElement */);
             node.openingElement = openingElement;
             node.children = createNodeArray(children);
             node.closingElement = closingElement;
@@ -24202,7 +24572,7 @@ var ts;
         }
         // @api
         function createJsxSelfClosingElement(tagName, typeArguments, attributes) {
-            var node = createBaseNode(274 /* JsxSelfClosingElement */);
+            var node = createBaseNode(275 /* JsxSelfClosingElement */);
             node.tagName = tagName;
             node.typeArguments = asNodeArray(typeArguments);
             node.attributes = attributes;
@@ -24226,7 +24596,7 @@ var ts;
         }
         // @api
         function createJsxOpeningElement(tagName, typeArguments, attributes) {
-            var node = createBaseNode(275 /* JsxOpeningElement */);
+            var node = createBaseNode(276 /* JsxOpeningElement */);
             node.tagName = tagName;
             node.typeArguments = asNodeArray(typeArguments);
             node.attributes = attributes;
@@ -24250,7 +24620,7 @@ var ts;
         }
         // @api
         function createJsxClosingElement(tagName) {
-            var node = createBaseNode(276 /* JsxClosingElement */);
+            var node = createBaseNode(277 /* JsxClosingElement */);
             node.tagName = tagName;
             node.transformFlags |=
                 propagateChildFlags(node.tagName) |
@@ -24265,7 +24635,7 @@ var ts;
         }
         // @api
         function createJsxFragment(openingFragment, children, closingFragment) {
-            var node = createBaseNode(277 /* JsxFragment */);
+            var node = createBaseNode(278 /* JsxFragment */);
             node.openingFragment = openingFragment;
             node.children = createNodeArray(children);
             node.closingFragment = closingFragment;
@@ -24301,19 +24671,19 @@ var ts;
         }
         // @api
         function createJsxOpeningFragment() {
-            var node = createBaseNode(278 /* JsxOpeningFragment */);
+            var node = createBaseNode(279 /* JsxOpeningFragment */);
             node.transformFlags |= 2 /* ContainsJsx */;
             return node;
         }
         // @api
         function createJsxJsxClosingFragment() {
-            var node = createBaseNode(279 /* JsxClosingFragment */);
+            var node = createBaseNode(280 /* JsxClosingFragment */);
             node.transformFlags |= 2 /* ContainsJsx */;
             return node;
         }
         // @api
         function createJsxAttribute(name, initializer) {
-            var node = createBaseNode(280 /* JsxAttribute */);
+            var node = createBaseNode(281 /* JsxAttribute */);
             node.name = name;
             node.initializer = initializer;
             node.transformFlags |=
@@ -24331,7 +24701,7 @@ var ts;
         }
         // @api
         function createJsxAttributes(properties) {
-            var node = createBaseNode(281 /* JsxAttributes */);
+            var node = createBaseNode(282 /* JsxAttributes */);
             node.properties = createNodeArray(properties);
             node.transformFlags |=
                 propagateChildrenFlags(node.properties) |
@@ -24346,7 +24716,7 @@ var ts;
         }
         // @api
         function createJsxSpreadAttribute(expression) {
-            var node = createBaseNode(282 /* JsxSpreadAttribute */);
+            var node = createBaseNode(283 /* JsxSpreadAttribute */);
             node.expression = expression;
             node.transformFlags |=
                 propagateChildFlags(node.expression) |
@@ -24361,7 +24731,7 @@ var ts;
         }
         // @api
         function createJsxExpression(dotDotDotToken, expression) {
-            var node = createBaseNode(283 /* JsxExpression */);
+            var node = createBaseNode(284 /* JsxExpression */);
             node.dotDotDotToken = dotDotDotToken;
             node.expression = expression;
             node.transformFlags |=
@@ -24381,7 +24751,7 @@ var ts;
         //
         // @api
         function createCaseClause(expression, statements) {
-            var node = createBaseNode(284 /* CaseClause */);
+            var node = createBaseNode(285 /* CaseClause */);
             node.expression = parenthesizerRules().parenthesizeExpressionForDisallowedComma(expression);
             node.statements = createNodeArray(statements);
             node.transformFlags |=
@@ -24398,7 +24768,7 @@ var ts;
         }
         // @api
         function createDefaultClause(statements) {
-            var node = createBaseNode(285 /* DefaultClause */);
+            var node = createBaseNode(286 /* DefaultClause */);
             node.statements = createNodeArray(statements);
             node.transformFlags = propagateChildrenFlags(node.statements);
             return node;
@@ -24411,13 +24781,13 @@ var ts;
         }
         // @api
         function createHeritageClause(token, types) {
-            var node = createBaseNode(286 /* HeritageClause */);
+            var node = createBaseNode(287 /* HeritageClause */);
             node.token = token;
             node.types = createNodeArray(types);
             node.transformFlags |= propagateChildrenFlags(node.types);
             switch (token) {
                 case 93 /* ExtendsKeyword */:
-                    node.transformFlags |= 256 /* ContainsES2015 */;
+                    node.transformFlags |= 512 /* ContainsES2015 */;
                     break;
                 case 116 /* ImplementsKeyword */:
                     node.transformFlags |= 1 /* ContainsTypeScript */;
@@ -24435,7 +24805,7 @@ var ts;
         }
         // @api
         function createCatchClause(variableDeclaration, block) {
-            var node = createBaseNode(287 /* CatchClause */);
+            var node = createBaseNode(288 /* CatchClause */);
             variableDeclaration = !ts.isString(variableDeclaration) ? variableDeclaration : createVariableDeclaration(variableDeclaration, 
             /*exclamationToken*/ undefined, 
             /*type*/ undefined, 
@@ -24446,7 +24816,7 @@ var ts;
                 propagateChildFlags(node.variableDeclaration) |
                     propagateChildFlags(node.block);
             if (!variableDeclaration)
-                node.transformFlags |= 16 /* ContainsES2019 */;
+                node.transformFlags |= 32 /* ContainsES2019 */;
             return node;
         }
         // @api
@@ -24461,7 +24831,7 @@ var ts;
         //
         // @api
         function createPropertyAssignment(name, initializer) {
-            var node = createBaseNamedDeclaration(288 /* PropertyAssignment */, 
+            var node = createBaseNamedDeclaration(289 /* PropertyAssignment */, 
             /*decorators*/ undefined, 
             /*modifiers*/ undefined, name);
             node.initializer = parenthesizerRules().parenthesizeExpressionForDisallowedComma(initializer);
@@ -24491,13 +24861,13 @@ var ts;
         }
         // @api
         function createShorthandPropertyAssignment(name, objectAssignmentInitializer) {
-            var node = createBaseNamedDeclaration(289 /* ShorthandPropertyAssignment */, 
+            var node = createBaseNamedDeclaration(290 /* ShorthandPropertyAssignment */, 
             /*decorators*/ undefined, 
             /*modifiers*/ undefined, name);
             node.objectAssignmentInitializer = objectAssignmentInitializer && parenthesizerRules().parenthesizeExpressionForDisallowedComma(objectAssignmentInitializer);
             node.transformFlags |=
                 propagateChildFlags(node.objectAssignmentInitializer) |
-                    256 /* ContainsES2015 */;
+                    512 /* ContainsES2015 */;
             return node;
         }
         function finishUpdateShorthandPropertyAssignment(updated, original) {
@@ -24523,12 +24893,12 @@ var ts;
         }
         // @api
         function createSpreadAssignment(expression) {
-            var node = createBaseNode(290 /* SpreadAssignment */);
+            var node = createBaseNode(291 /* SpreadAssignment */);
             node.expression = parenthesizerRules().parenthesizeExpressionForDisallowedComma(expression);
             node.transformFlags |=
                 propagateChildFlags(node.expression) |
-                    32 /* ContainsES2018 */ |
-                    16384 /* ContainsObjectRestOrSpread */;
+                    64 /* ContainsES2018 */ |
+                    32768 /* ContainsObjectRestOrSpread */;
             return node;
         }
         // @api
@@ -24542,7 +24912,7 @@ var ts;
         //
         // @api
         function createEnumMember(name, initializer) {
-            var node = createBaseNode(291 /* EnumMember */);
+            var node = createBaseNode(292 /* EnumMember */);
             node.name = asName(name);
             node.initializer = initializer && parenthesizerRules().parenthesizeExpressionForDisallowedComma(initializer);
             node.transformFlags |=
@@ -24563,7 +24933,7 @@ var ts;
         //
         // @api
         function createSourceFile(statements, endOfFileToken, flags) {
-            var node = baseFactory.createBaseSourceFileNode(297 /* SourceFile */);
+            var node = baseFactory.createBaseSourceFileNode(298 /* SourceFile */);
             node.statements = createNodeArray(statements);
             node.endOfFileToken = endOfFileToken;
             node.flags |= flags;
@@ -24580,7 +24950,7 @@ var ts;
             return node;
         }
         function cloneSourceFileWithChanges(source, statements, isDeclarationFile, referencedFiles, typeReferences, hasNoDefaultLib, libReferences) {
-            var node = baseFactory.createBaseSourceFileNode(297 /* SourceFile */);
+            var node = baseFactory.createBaseSourceFileNode(298 /* SourceFile */);
             for (var p in source) {
                 if (p === "emitNode" || ts.hasProperty(node, p) || !ts.hasProperty(source, p))
                     continue;
@@ -24618,7 +24988,7 @@ var ts;
         // @api
         function createBundle(sourceFiles, prepends) {
             if (prepends === void 0) { prepends = ts.emptyArray; }
-            var node = createBaseNode(298 /* Bundle */);
+            var node = createBaseNode(299 /* Bundle */);
             node.prepends = prepends;
             node.sourceFiles = sourceFiles;
             return node;
@@ -24633,7 +25003,7 @@ var ts;
         }
         // @api
         function createUnparsedSource(prologues, syntheticReferences, texts) {
-            var node = createBaseNode(299 /* UnparsedSource */);
+            var node = createBaseNode(300 /* UnparsedSource */);
             node.prologues = prologues;
             node.syntheticReferences = syntheticReferences;
             node.texts = texts;
@@ -24651,28 +25021,28 @@ var ts;
         }
         // @api
         function createUnparsedPrologue(data) {
-            return createBaseUnparsedNode(292 /* UnparsedPrologue */, data);
+            return createBaseUnparsedNode(293 /* UnparsedPrologue */, data);
         }
         // @api
         function createUnparsedPrepend(data, texts) {
-            var node = createBaseUnparsedNode(293 /* UnparsedPrepend */, data);
+            var node = createBaseUnparsedNode(294 /* UnparsedPrepend */, data);
             node.texts = texts;
             return node;
         }
         // @api
         function createUnparsedTextLike(data, internal) {
-            return createBaseUnparsedNode(internal ? 295 /* UnparsedInternalText */ : 294 /* UnparsedText */, data);
+            return createBaseUnparsedNode(internal ? 296 /* UnparsedInternalText */ : 295 /* UnparsedText */, data);
         }
         // @api
         function createUnparsedSyntheticReference(section) {
-            var node = createBaseNode(296 /* UnparsedSyntheticReference */);
+            var node = createBaseNode(297 /* UnparsedSyntheticReference */);
             node.data = section.data;
             node.section = section;
             return node;
         }
         // @api
         function createInputFiles() {
-            var node = createBaseNode(300 /* InputFiles */);
+            var node = createBaseNode(301 /* InputFiles */);
             node.javascriptText = "";
             node.declarationText = "";
             return node;
@@ -24683,7 +25053,7 @@ var ts;
         // @api
         function createSyntheticExpression(type, isSpread, tupleNameSource) {
             if (isSpread === void 0) { isSpread = false; }
-            var node = createBaseNode(227 /* SyntheticExpression */);
+            var node = createBaseNode(228 /* SyntheticExpression */);
             node.type = type;
             node.isSpread = isSpread;
             node.tupleNameSource = tupleNameSource;
@@ -24691,7 +25061,7 @@ var ts;
         }
         // @api
         function createSyntaxList(children) {
-            var node = createBaseNode(334 /* SyntaxList */);
+            var node = createBaseNode(338 /* SyntaxList */);
             node._children = children;
             return node;
         }
@@ -24706,7 +25076,7 @@ var ts;
          */
         // @api
         function createNotEmittedStatement(original) {
-            var node = createBaseNode(335 /* NotEmittedStatement */);
+            var node = createBaseNode(339 /* NotEmittedStatement */);
             node.original = original;
             ts.setTextRange(node, original);
             return node;
@@ -24720,7 +25090,7 @@ var ts;
          */
         // @api
         function createPartiallyEmittedExpression(expression, original) {
-            var node = createBaseNode(336 /* PartiallyEmittedExpression */);
+            var node = createBaseNode(340 /* PartiallyEmittedExpression */);
             node.expression = expression;
             node.original = original;
             node.transformFlags |=
@@ -24748,7 +25118,7 @@ var ts;
         }
         // @api
         function createCommaListExpression(elements) {
-            var node = createBaseNode(337 /* CommaListExpression */);
+            var node = createBaseNode(341 /* CommaListExpression */);
             node.elements = createNodeArray(ts.sameFlatMap(elements, flattenCommaElements));
             node.transformFlags |= propagateChildrenFlags(node.elements);
             return node;
@@ -24765,7 +25135,7 @@ var ts;
          */
         // @api
         function createEndOfDeclarationMarker(original) {
-            var node = createBaseNode(339 /* EndOfDeclarationMarker */);
+            var node = createBaseNode(343 /* EndOfDeclarationMarker */);
             node.emitNode = {};
             node.original = original;
             return node;
@@ -24776,14 +25146,14 @@ var ts;
          */
         // @api
         function createMergeDeclarationMarker(original) {
-            var node = createBaseNode(338 /* MergeDeclarationMarker */);
+            var node = createBaseNode(342 /* MergeDeclarationMarker */);
             node.emitNode = {};
             node.original = original;
             return node;
         }
         // @api
         function createSyntheticReferenceExpression(expression, thisArg) {
-            var node = createBaseNode(340 /* SyntheticReferenceExpression */);
+            var node = createBaseNode(344 /* SyntheticReferenceExpression */);
             node.expression = expression;
             node.thisArg = thisArg;
             node.transformFlags |=
@@ -24805,7 +25175,7 @@ var ts;
             if (node === undefined) {
                 return node;
             }
-            var clone = ts.isSourceFile(node) ? baseFactory.createBaseSourceFileNode(297 /* SourceFile */) :
+            var clone = ts.isSourceFile(node) ? baseFactory.createBaseSourceFileNode(298 /* SourceFile */) :
                 ts.isIdentifier(node) ? baseFactory.createBaseIdentifierNode(78 /* Identifier */) :
                     ts.isPrivateIdentifier(node) ? baseFactory.createBasePrivateIdentifierNode(79 /* PrivateIdentifier */) :
                         !ts.isNodeKind(node.kind) ? baseFactory.createBaseTokenNode(node.kind) :
@@ -24912,11 +25282,11 @@ var ts;
         }
         function updateOuterExpression(outerExpression, expression) {
             switch (outerExpression.kind) {
-                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);
+                case 208 /* ParenthesizedExpression */: return updateParenthesizedExpression(outerExpression, expression);
+                case 207 /* TypeAssertionExpression */: return updateTypeAssertion(outerExpression, outerExpression.type, expression);
+                case 225 /* AsExpression */: return updateAsExpression(outerExpression, expression, outerExpression.type);
+                case 226 /* NonNullExpression */: return updateNonNullExpression(outerExpression, expression);
+                case 340 /* PartiallyEmittedExpression */: return updatePartiallyEmittedExpression(outerExpression, expression);
             }
         }
         /**
@@ -24970,13 +25340,13 @@ var ts;
                 case 9 /* BigIntLiteral */:
                 case 10 /* StringLiteral */:
                     return false;
-                case 199 /* ArrayLiteralExpression */:
+                case 200 /* ArrayLiteralExpression */:
                     var elements = target.elements;
                     if (elements.length === 0) {
                         return false;
                     }
                     return true;
-                case 200 /* ObjectLiteralExpression */:
+                case 201 /* ObjectLiteralExpression */:
                     return target.properties.length > 0;
                 default:
                     return true;
@@ -25379,23 +25749,24 @@ var ts;
     }
     function getDefaultTagNameForKind(kind) {
         switch (kind) {
-            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";
+            case 333 /* JSDocTypeTag */: return "type";
+            case 331 /* JSDocReturnTag */: return "returns";
+            case 332 /* JSDocThisTag */: return "this";
+            case 329 /* JSDocEnumTag */: return "enum";
+            case 320 /* JSDocAuthorTag */: return "author";
+            case 322 /* JSDocClassTag */: return "class";
+            case 323 /* JSDocPublicTag */: return "public";
+            case 324 /* JSDocPrivateTag */: return "private";
+            case 325 /* JSDocProtectedTag */: return "protected";
+            case 326 /* JSDocReadonlyTag */: return "readonly";
+            case 327 /* JSDocOverrideTag */: return "override";
+            case 334 /* JSDocTemplateTag */: return "template";
+            case 335 /* JSDocTypedefTag */: return "typedef";
+            case 330 /* JSDocParameterTag */: return "param";
+            case 337 /* JSDocPropertyTag */: return "prop";
+            case 328 /* JSDocCallbackTag */: return "callback";
+            case 318 /* JSDocAugmentsTag */: return "augments";
+            case 319 /* JSDocImplementsTag */: return "implements";
             default:
                 return ts.Debug.fail("Unsupported kind: " + ts.Debug.formatSyntaxKind(kind));
         }
@@ -25448,10 +25819,10 @@ var ts;
     }
     function propagateIdentifierNameFlags(node) {
         // An IdentifierName is allowed to be `await`
-        return propagateChildFlags(node) & ~8388608 /* ContainsPossibleTopLevelAwait */;
+        return propagateChildFlags(node) & ~16777216 /* ContainsPossibleTopLevelAwait */;
     }
     function propagatePropertyNameFlagsOfChild(node, transformFlags) {
-        return transformFlags | (node.transformFlags & 4096 /* PropertyNamePropagatingFlags */);
+        return transformFlags | (node.transformFlags & 8192 /* PropertyNamePropagatingFlags */);
     }
     function propagateChildFlags(child) {
         if (!child)
@@ -25475,36 +25846,36 @@ var ts;
      */
     /* @internal */
     function getTransformFlagsSubtreeExclusions(kind) {
-        if (kind >= 172 /* FirstTypeNode */ && kind <= 195 /* LastTypeNode */) {
+        if (kind >= 173 /* FirstTypeNode */ && kind <= 196 /* LastTypeNode */) {
             return -2 /* TypeExcludes */;
         }
         switch (kind) {
-            case 203 /* CallExpression */:
-            case 204 /* NewExpression */:
-            case 199 /* ArrayLiteralExpression */:
-                return 536879104 /* ArrayLiteralOrCallOrNewExcludes */;
-            case 256 /* ModuleDeclaration */:
-                return 546379776 /* ModuleExcludes */;
-            case 160 /* Parameter */:
+            case 204 /* CallExpression */:
+            case 205 /* NewExpression */:
+            case 200 /* ArrayLiteralExpression */:
+                return 536887296 /* ArrayLiteralOrCallOrNewExcludes */;
+            case 257 /* ModuleDeclaration */:
+                return 555888640 /* ModuleExcludes */;
+            case 161 /* Parameter */:
                 return 536870912 /* ParameterExcludes */;
-            case 209 /* ArrowFunction */:
-                return 547309568 /* ArrowFunctionExcludes */;
-            case 208 /* FunctionExpression */:
-            case 251 /* FunctionDeclaration */:
-                return 547313664 /* FunctionExcludes */;
-            case 250 /* VariableDeclarationList */:
-                return 537018368 /* VariableDeclarationListExcludes */;
-            case 252 /* ClassDeclaration */:
-            case 221 /* ClassExpression */:
-                return 536905728 /* ClassExcludes */;
-            case 166 /* Constructor */:
-                return 547311616 /* ConstructorExcludes */;
-            case 163 /* PropertyDeclaration */:
-                return 536875008 /* PropertyExcludes */;
-            case 165 /* MethodDeclaration */:
-            case 167 /* GetAccessor */:
-            case 168 /* SetAccessor */:
-                return 538923008 /* MethodOrAccessorExcludes */;
+            case 210 /* ArrowFunction */:
+                return 557748224 /* ArrowFunctionExcludes */;
+            case 209 /* FunctionExpression */:
+            case 252 /* FunctionDeclaration */:
+                return 557756416 /* FunctionExcludes */;
+            case 251 /* VariableDeclarationList */:
+                return 537165824 /* VariableDeclarationListExcludes */;
+            case 253 /* ClassDeclaration */:
+            case 222 /* ClassExpression */:
+                return 536940544 /* ClassExcludes */;
+            case 167 /* Constructor */:
+                return 557752320 /* ConstructorExcludes */;
+            case 164 /* PropertyDeclaration */:
+                return 536879104 /* PropertyExcludes */;
+            case 166 /* MethodDeclaration */:
+            case 168 /* GetAccessor */:
+            case 169 /* SetAccessor */:
+                return 540975104 /* MethodOrAccessorExcludes */;
             case 128 /* AnyKeyword */:
             case 144 /* NumberKeyword */:
             case 155 /* BigIntKeyword */:
@@ -25514,30 +25885,30 @@ var ts;
             case 131 /* BooleanKeyword */:
             case 148 /* SymbolKeyword */:
             case 113 /* VoidKeyword */:
-            case 159 /* TypeParameter */:
-            case 162 /* PropertySignature */:
-            case 164 /* MethodSignature */:
-            case 169 /* CallSignature */:
-            case 170 /* ConstructSignature */:
-            case 171 /* IndexSignature */:
-            case 253 /* InterfaceDeclaration */:
-            case 254 /* TypeAliasDeclaration */:
+            case 160 /* TypeParameter */:
+            case 163 /* PropertySignature */:
+            case 165 /* MethodSignature */:
+            case 170 /* CallSignature */:
+            case 171 /* ConstructSignature */:
+            case 172 /* IndexSignature */:
+            case 254 /* InterfaceDeclaration */:
+            case 255 /* TypeAliasDeclaration */:
                 return -2 /* TypeExcludes */;
-            case 200 /* ObjectLiteralExpression */:
-                return 536922112 /* ObjectLiteralExcludes */;
-            case 287 /* CatchClause */:
-                return 536887296 /* CatchClauseExcludes */;
-            case 196 /* ObjectBindingPattern */:
-            case 197 /* ArrayBindingPattern */:
-                return 536879104 /* BindingPatternExcludes */;
-            case 206 /* TypeAssertionExpression */:
-            case 224 /* AsExpression */:
-            case 336 /* PartiallyEmittedExpression */:
-            case 207 /* ParenthesizedExpression */:
+            case 201 /* ObjectLiteralExpression */:
+                return 536973312 /* ObjectLiteralExcludes */;
+            case 288 /* CatchClause */:
+                return 536903680 /* CatchClauseExcludes */;
+            case 197 /* ObjectBindingPattern */:
+            case 198 /* ArrayBindingPattern */:
+                return 536887296 /* BindingPatternExcludes */;
+            case 207 /* TypeAssertionExpression */:
+            case 225 /* AsExpression */:
+            case 340 /* PartiallyEmittedExpression */:
+            case 208 /* ParenthesizedExpression */:
             case 105 /* SuperKeyword */:
                 return 536870912 /* OuterExpressionExcludes */;
-            case 201 /* PropertyAccessExpression */:
-            case 202 /* ElementAccessExpression */:
+            case 202 /* PropertyAccessExpression */:
+            case 203 /* ElementAccessExpression */:
                 return 536870912 /* PropertyAccessExcludes */;
             default:
                 return 536870912 /* NodeExcludes */;
@@ -25836,7 +26207,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 === 297 /* SourceFile */) {
+                if (node.kind === 298 /* 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.");
@@ -26323,13 +26694,27 @@ var ts;
             /*typeArguments*/ undefined, [moduleExpression, exportsExpression]);
         }
         // Class Fields Helpers
-        function createClassPrivateFieldGetHelper(receiver, privateField) {
+        function createClassPrivateFieldGetHelper(receiver, state, kind, f) {
             context.requestEmitHelper(ts.classPrivateFieldGetHelper);
-            return factory.createCallExpression(getUnscopedHelperName("__classPrivateFieldGet"), /*typeArguments*/ undefined, [receiver, privateField]);
+            var args;
+            if (!f) {
+                args = [receiver, state, factory.createStringLiteral(kind)];
+            }
+            else {
+                args = [receiver, state, factory.createStringLiteral(kind), f];
+            }
+            return factory.createCallExpression(getUnscopedHelperName("__classPrivateFieldGet"), /*typeArguments*/ undefined, args);
         }
-        function createClassPrivateFieldSetHelper(receiver, privateField, value) {
+        function createClassPrivateFieldSetHelper(receiver, state, value, kind, f) {
             context.requestEmitHelper(ts.classPrivateFieldSetHelper);
-            return factory.createCallExpression(getUnscopedHelperName("__classPrivateFieldSet"), /*typeArguments*/ undefined, [receiver, privateField, value]);
+            var args;
+            if (!f) {
+                args = [receiver, state, value, factory.createStringLiteral(kind)];
+            }
+            else {
+                args = [receiver, state, value, factory.createStringLiteral(kind), f];
+            }
+            return factory.createCallExpression(getUnscopedHelperName("__classPrivateFieldSet"), /*typeArguments*/ undefined, args);
         }
     }
     ts.createEmitHelperFactory = createEmitHelperFactory;
@@ -26569,7 +26954,6 @@ var ts;
         scoped: false,
         text: "\n            var __importDefault = (this && this.__importDefault) || function (mod) {\n                return (mod && mod.__esModule) ? mod : { \"default\": mod };\n            };"
     };
-    // emit output for the __export helper function
     ts.exportStarHelper = {
         name: "typescript:export-star",
         importName: "__exportStar",
@@ -26578,18 +26962,116 @@ var ts;
         priority: 2,
         text: "\n            var __exportStar = (this && this.__exportStar) || function(m, exports) {\n                for (var p in m) if (p !== \"default\" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);\n            };"
     };
-    // Class fields helpers
+    /**
+     * Parameters:
+     *  @param receiver — The object from which the private member will be read.
+     *  @param state — One of the following:
+     *      - A WeakMap used to read a private instance field.
+     *      - A WeakSet used as an instance brand for private instance methods and accessors.
+     *      - A function value that should be the undecorated class constructor used to brand check private static fields, methods, and accessors.
+     *  @param kind — (optional pre TS 4.3, required for TS 4.3+) One of the following values:
+     *      - undefined — Indicates a private instance field (pre TS 4.3).
+     *      - "f" — Indicates a private field (instance or static).
+     *      - "m" — Indicates a private method (instance or static).
+     *      - "a" — Indicates a private accessor (instance or static).
+     *  @param f — (optional pre TS 4.3) Depends on the arguments for state and kind:
+     *      - If kind is "m", this should be the function corresponding to the static or instance method.
+     *      - If kind is "a", this should be the function corresponding to the getter method, or undefined if the getter was not defined.
+     *      - If kind is "f" and state is a function, this should be an object holding the value of a static field, or undefined if the static field declaration has not yet been evaluated.
+     * Usage:
+     * This helper will only ever be used by the compiler in the following ways:
+     *
+     * Reading from a private instance field (pre TS 4.3):
+     *      __classPrivateFieldGet(<any>, <WeakMap>)
+     *
+     * Reading from a private instance field (TS 4.3+):
+     *      __classPrivateFieldGet(<any>, <WeakMap>, "f")
+     *
+     * Reading from a private instance get accessor (when defined, TS 4.3+):
+     *      __classPrivateFieldGet(<any>, <WeakSet>, "a", <function>)
+     *
+     * Reading from a private instance get accessor (when not defined, TS 4.3+):
+     *      __classPrivateFieldGet(<any>, <WeakSet>, "a", void 0)
+     *      NOTE: This always results in a runtime error.
+     *
+     * Reading from a private instance method (TS 4.3+):
+     *      __classPrivateFieldGet(<any>, <WeakSet>, "m", <function>)
+     *
+     * Reading from a private static field (TS 4.3+):
+     *      __classPrivateFieldGet(<any>, <constructor>, "f", <{ value: any }>)
+     *
+     * Reading from a private static get accessor (when defined, TS 4.3+):
+     *      __classPrivateFieldGet(<any>, <constructor>, "a", <function>)
+     *
+     * Reading from a private static get accessor (when not defined, TS 4.3+):
+     *      __classPrivateFieldGet(<any>, <constructor>, "a", void 0)
+     *      NOTE: This always results in a runtime error.
+     *
+     * Reading from a private static method (TS 4.3+):
+     *      __classPrivateFieldGet(<any>, <constructor>, "m", <function>)
+     */
     ts.classPrivateFieldGetHelper = {
         name: "typescript:classPrivateFieldGet",
         importName: "__classPrivateFieldGet",
         scoped: false,
-        text: "\n            var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, privateMap) {\n                if (!privateMap.has(receiver)) {\n                    throw new TypeError(\"attempted to get private field on non-instance\");\n                }\n                return privateMap.get(receiver);\n            };"
+        text: "\n            var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {\n                if (kind === \"a\" && !f) throw new TypeError(\"Private accessor was defined without a getter\");\n                if (typeof state === \"function\" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError(\"Cannot read private member from an object whose class did not declare it\");\n                return kind === \"m\" ? f : kind === \"a\" ? f.call(receiver) : f ? f.value : state.get(receiver);\n            };"
     };
+    /**
+     * Parameters:
+     *  @param receiver — The object on which the private member will be set.
+     *  @param state — One of the following:
+     *      - A WeakMap used to store a private instance field.
+     *      - A WeakSet used as an instance brand for private instance methods and accessors.
+     *      - A function value that should be the undecorated class constructor used to brand check private static fields, methods, and accessors.
+     *  @param value — The value to set.
+     *  @param kind — (optional pre TS 4.3, required for TS 4.3+) One of the following values:
+     *       - undefined — Indicates a private instance field (pre TS 4.3).
+     *       - "f" — Indicates a private field (instance or static).
+     *       - "m" — Indicates a private method (instance or static).
+     *       - "a" — Indicates a private accessor (instance or static).
+     *   @param f — (optional pre TS 4.3) Depends on the arguments for state and kind:
+     *       - If kind is "m", this should be the function corresponding to the static or instance method.
+     *       - If kind is "a", this should be the function corresponding to the setter method, or undefined if the setter was not defined.
+     *       - If kind is "f" and state is a function, this should be an object holding the value of a static field, or undefined if the static field declaration has not yet been evaluated.
+     * Usage:
+     * This helper will only ever be used by the compiler in the following ways:
+     *
+     * Writing to a private instance field (pre TS 4.3):
+     *      __classPrivateFieldSet(<any>, <WeakMap>, <any>)
+     *
+     * Writing to a private instance field (TS 4.3+):
+     *      __classPrivateFieldSet(<any>, <WeakMap>, <any>, "f")
+     *
+     * Writing to a private instance set accessor (when defined, TS 4.3+):
+     *      __classPrivateFieldSet(<any>, <WeakSet>, <any>, "a", <function>)
+     *
+     * Writing to a private instance set accessor (when not defined, TS 4.3+):
+     *      __classPrivateFieldSet(<any>, <WeakSet>, <any>, "a", void 0)
+     *      NOTE: This always results in a runtime error.
+     *
+     * Writing to a private instance method (TS 4.3+):
+     *      __classPrivateFieldSet(<any>, <WeakSet>, <any>, "m", <function>)
+     *      NOTE: This always results in a runtime error.
+     *
+     * Writing to a private static field (TS 4.3+):
+     *      __classPrivateFieldSet(<any>, <constructor>, <any>, "f", <{ value: any }>)
+     *
+     * Writing to a private static set accessor (when defined, TS 4.3+):
+     *      __classPrivateFieldSet(<any>, <constructor>, <any>, "a", <function>)
+     *
+     * Writing to a private static set accessor (when not defined, TS 4.3+):
+     *      __classPrivateFieldSet(<any>, <constructor>, <any>, "a", void 0)
+     *      NOTE: This always results in a runtime error.
+     *
+     * Writing to a private static method (TS 4.3+):
+     *      __classPrivateFieldSet(<any>, <constructor>, <any>, "m", <function>)
+     *      NOTE: This always results in a runtime error.
+     */
     ts.classPrivateFieldSetHelper = {
         name: "typescript:classPrivateFieldSet",
         importName: "__classPrivateFieldSet",
         scoped: false,
-        text: "\n            var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, privateMap, value) {\n                if (!privateMap.has(receiver)) {\n                    throw new TypeError(\"attempted to set private field on non-instance\");\n                }\n                privateMap.set(receiver, value);\n                return value;\n            };"
+        text: "\n            var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {\n                if (kind === \"m\") throw new TypeError(\"Private method is not writable\");\n                if (kind === \"a\" && !f) throw new TypeError(\"Private accessor was defined without a setter\");\n                if (typeof state === \"function\" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError(\"Cannot write private member to an object whose class did not declare it\");\n                return (kind === \"a\" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;\n            };"
     };
     var allUnscopedEmitHelpers;
     function getAllUnscopedEmitHelpers() {
@@ -26678,25 +27160,93 @@ var ts;
         return node.kind === 17 /* TemplateTail */;
     }
     ts.isTemplateTail = isTemplateTail;
+    // Punctuation
+    function isDotDotDotToken(node) {
+        return node.kind === 25 /* DotDotDotToken */;
+    }
+    ts.isDotDotDotToken = isDotDotDotToken;
+    /*@internal*/
+    function isCommaToken(node) {
+        return node.kind === 27 /* CommaToken */;
+    }
+    ts.isCommaToken = isCommaToken;
+    function isPlusToken(node) {
+        return node.kind === 39 /* PlusToken */;
+    }
+    ts.isPlusToken = isPlusToken;
+    function isMinusToken(node) {
+        return node.kind === 40 /* MinusToken */;
+    }
+    ts.isMinusToken = isMinusToken;
+    function isAsteriskToken(node) {
+        return node.kind === 41 /* AsteriskToken */;
+    }
+    ts.isAsteriskToken = isAsteriskToken;
+    /*@internal*/
+    function isExclamationToken(node) {
+        return node.kind === 53 /* ExclamationToken */;
+    }
+    ts.isExclamationToken = isExclamationToken;
+    /*@internal*/
+    function isQuestionToken(node) {
+        return node.kind === 57 /* QuestionToken */;
+    }
+    ts.isQuestionToken = isQuestionToken;
+    /*@internal*/
+    function isColonToken(node) {
+        return node.kind === 58 /* ColonToken */;
+    }
+    ts.isColonToken = isColonToken;
+    /*@internal*/
+    function isQuestionDotToken(node) {
+        return node.kind === 28 /* QuestionDotToken */;
+    }
+    ts.isQuestionDotToken = isQuestionDotToken;
+    /*@internal*/
+    function isEqualsGreaterThanToken(node) {
+        return node.kind === 38 /* EqualsGreaterThanToken */;
+    }
+    ts.isEqualsGreaterThanToken = isEqualsGreaterThanToken;
     // Identifiers
     function isIdentifier(node) {
         return node.kind === 78 /* Identifier */;
     }
     ts.isIdentifier = isIdentifier;
-    // Names
-    function isQualifiedName(node) {
-        return node.kind === 157 /* QualifiedName */;
-    }
-    ts.isQualifiedName = isQualifiedName;
-    function isComputedPropertyName(node) {
-        return node.kind === 158 /* ComputedPropertyName */;
-    }
-    ts.isComputedPropertyName = isComputedPropertyName;
     function isPrivateIdentifier(node) {
         return node.kind === 79 /* PrivateIdentifier */;
     }
     ts.isPrivateIdentifier = isPrivateIdentifier;
-    // Tokens
+    // Reserved Words
+    /* @internal */
+    function isExportModifier(node) {
+        return node.kind === 92 /* ExportKeyword */;
+    }
+    ts.isExportModifier = isExportModifier;
+    /* @internal */
+    function isAsyncModifier(node) {
+        return node.kind === 129 /* AsyncKeyword */;
+    }
+    ts.isAsyncModifier = isAsyncModifier;
+    /* @internal */
+    function isAssertsKeyword(node) {
+        return node.kind === 127 /* AssertsKeyword */;
+    }
+    ts.isAssertsKeyword = isAssertsKeyword;
+    /* @internal */
+    function isAwaitKeyword(node) {
+        return node.kind === 130 /* AwaitKeyword */;
+    }
+    ts.isAwaitKeyword = isAwaitKeyword;
+    /* @internal */
+    function isReadonlyKeyword(node) {
+        return node.kind === 142 /* ReadonlyKeyword */;
+    }
+    ts.isReadonlyKeyword = isReadonlyKeyword;
+    /* @internal */
+    function isStaticModifier(node) {
+        return node.kind === 123 /* StaticKeyword */;
+    }
+    ts.isStaticModifier = isStaticModifier;
     /*@internal*/
     function isSuperKeyword(node) {
         return node.kind === 105 /* SuperKeyword */;
@@ -26707,597 +27257,591 @@ var ts;
         return node.kind === 99 /* ImportKeyword */;
     }
     ts.isImportKeyword = isImportKeyword;
-    /*@internal*/
-    function isCommaToken(node) {
-        return node.kind === 27 /* CommaToken */;
-    }
-    ts.isCommaToken = isCommaToken;
-    /*@internal*/
-    function isQuestionToken(node) {
-        return node.kind === 57 /* QuestionToken */;
+    // Names
+    function isQualifiedName(node) {
+        return node.kind === 158 /* QualifiedName */;
     }
-    ts.isQuestionToken = isQuestionToken;
-    /*@internal*/
-    function isExclamationToken(node) {
-        return node.kind === 53 /* ExclamationToken */;
+    ts.isQualifiedName = isQualifiedName;
+    function isComputedPropertyName(node) {
+        return node.kind === 159 /* ComputedPropertyName */;
     }
-    ts.isExclamationToken = isExclamationToken;
+    ts.isComputedPropertyName = isComputedPropertyName;
     // Signature elements
     function isTypeParameterDeclaration(node) {
-        return node.kind === 159 /* TypeParameter */;
+        return node.kind === 160 /* TypeParameter */;
     }
     ts.isTypeParameterDeclaration = isTypeParameterDeclaration;
     // TODO(rbuckton): Rename to 'isParameterDeclaration'
     function isParameter(node) {
-        return node.kind === 160 /* Parameter */;
+        return node.kind === 161 /* Parameter */;
     }
     ts.isParameter = isParameter;
     function isDecorator(node) {
-        return node.kind === 161 /* Decorator */;
+        return node.kind === 162 /* Decorator */;
     }
     ts.isDecorator = isDecorator;
     // TypeMember
     function isPropertySignature(node) {
-        return node.kind === 162 /* PropertySignature */;
+        return node.kind === 163 /* PropertySignature */;
     }
     ts.isPropertySignature = isPropertySignature;
     function isPropertyDeclaration(node) {
-        return node.kind === 163 /* PropertyDeclaration */;
+        return node.kind === 164 /* PropertyDeclaration */;
     }
     ts.isPropertyDeclaration = isPropertyDeclaration;
     function isMethodSignature(node) {
-        return node.kind === 164 /* MethodSignature */;
+        return node.kind === 165 /* MethodSignature */;
     }
     ts.isMethodSignature = isMethodSignature;
     function isMethodDeclaration(node) {
-        return node.kind === 165 /* MethodDeclaration */;
+        return node.kind === 166 /* MethodDeclaration */;
     }
     ts.isMethodDeclaration = isMethodDeclaration;
     function isConstructorDeclaration(node) {
-        return node.kind === 166 /* Constructor */;
+        return node.kind === 167 /* Constructor */;
     }
     ts.isConstructorDeclaration = isConstructorDeclaration;
     function isGetAccessorDeclaration(node) {
-        return node.kind === 167 /* GetAccessor */;
+        return node.kind === 168 /* GetAccessor */;
     }
     ts.isGetAccessorDeclaration = isGetAccessorDeclaration;
     function isSetAccessorDeclaration(node) {
-        return node.kind === 168 /* SetAccessor */;
+        return node.kind === 169 /* SetAccessor */;
     }
     ts.isSetAccessorDeclaration = isSetAccessorDeclaration;
     function isCallSignatureDeclaration(node) {
-        return node.kind === 169 /* CallSignature */;
+        return node.kind === 170 /* CallSignature */;
     }
     ts.isCallSignatureDeclaration = isCallSignatureDeclaration;
     function isConstructSignatureDeclaration(node) {
-        return node.kind === 170 /* ConstructSignature */;
+        return node.kind === 171 /* ConstructSignature */;
     }
     ts.isConstructSignatureDeclaration = isConstructSignatureDeclaration;
     function isIndexSignatureDeclaration(node) {
-        return node.kind === 171 /* IndexSignature */;
+        return node.kind === 172 /* IndexSignature */;
     }
     ts.isIndexSignatureDeclaration = isIndexSignatureDeclaration;
     // Type
     function isTypePredicateNode(node) {
-        return node.kind === 172 /* TypePredicate */;
+        return node.kind === 173 /* TypePredicate */;
     }
     ts.isTypePredicateNode = isTypePredicateNode;
     function isTypeReferenceNode(node) {
-        return node.kind === 173 /* TypeReference */;
+        return node.kind === 174 /* TypeReference */;
     }
     ts.isTypeReferenceNode = isTypeReferenceNode;
     function isFunctionTypeNode(node) {
-        return node.kind === 174 /* FunctionType */;
+        return node.kind === 175 /* FunctionType */;
     }
     ts.isFunctionTypeNode = isFunctionTypeNode;
     function isConstructorTypeNode(node) {
-        return node.kind === 175 /* ConstructorType */;
+        return node.kind === 176 /* ConstructorType */;
     }
     ts.isConstructorTypeNode = isConstructorTypeNode;
     function isTypeQueryNode(node) {
-        return node.kind === 176 /* TypeQuery */;
+        return node.kind === 177 /* TypeQuery */;
     }
     ts.isTypeQueryNode = isTypeQueryNode;
     function isTypeLiteralNode(node) {
-        return node.kind === 177 /* TypeLiteral */;
+        return node.kind === 178 /* TypeLiteral */;
     }
     ts.isTypeLiteralNode = isTypeLiteralNode;
     function isArrayTypeNode(node) {
-        return node.kind === 178 /* ArrayType */;
+        return node.kind === 179 /* ArrayType */;
     }
     ts.isArrayTypeNode = isArrayTypeNode;
     function isTupleTypeNode(node) {
-        return node.kind === 179 /* TupleType */;
+        return node.kind === 180 /* TupleType */;
     }
     ts.isTupleTypeNode = isTupleTypeNode;
     function isNamedTupleMember(node) {
-        return node.kind === 192 /* NamedTupleMember */;
+        return node.kind === 193 /* NamedTupleMember */;
     }
     ts.isNamedTupleMember = isNamedTupleMember;
     function isOptionalTypeNode(node) {
-        return node.kind === 180 /* OptionalType */;
+        return node.kind === 181 /* OptionalType */;
     }
     ts.isOptionalTypeNode = isOptionalTypeNode;
     function isRestTypeNode(node) {
-        return node.kind === 181 /* RestType */;
+        return node.kind === 182 /* RestType */;
     }
     ts.isRestTypeNode = isRestTypeNode;
     function isUnionTypeNode(node) {
-        return node.kind === 182 /* UnionType */;
+        return node.kind === 183 /* UnionType */;
     }
     ts.isUnionTypeNode = isUnionTypeNode;
     function isIntersectionTypeNode(node) {
-        return node.kind === 183 /* IntersectionType */;
+        return node.kind === 184 /* IntersectionType */;
     }
     ts.isIntersectionTypeNode = isIntersectionTypeNode;
     function isConditionalTypeNode(node) {
-        return node.kind === 184 /* ConditionalType */;
+        return node.kind === 185 /* ConditionalType */;
     }
     ts.isConditionalTypeNode = isConditionalTypeNode;
     function isInferTypeNode(node) {
-        return node.kind === 185 /* InferType */;
+        return node.kind === 186 /* InferType */;
     }
     ts.isInferTypeNode = isInferTypeNode;
     function isParenthesizedTypeNode(node) {
-        return node.kind === 186 /* ParenthesizedType */;
+        return node.kind === 187 /* ParenthesizedType */;
     }
     ts.isParenthesizedTypeNode = isParenthesizedTypeNode;
     function isThisTypeNode(node) {
-        return node.kind === 187 /* ThisType */;
+        return node.kind === 188 /* ThisType */;
     }
     ts.isThisTypeNode = isThisTypeNode;
     function isTypeOperatorNode(node) {
-        return node.kind === 188 /* TypeOperator */;
+        return node.kind === 189 /* TypeOperator */;
     }
     ts.isTypeOperatorNode = isTypeOperatorNode;
     function isIndexedAccessTypeNode(node) {
-        return node.kind === 189 /* IndexedAccessType */;
+        return node.kind === 190 /* IndexedAccessType */;
     }
     ts.isIndexedAccessTypeNode = isIndexedAccessTypeNode;
     function isMappedTypeNode(node) {
-        return node.kind === 190 /* MappedType */;
+        return node.kind === 191 /* MappedType */;
     }
     ts.isMappedTypeNode = isMappedTypeNode;
     function isLiteralTypeNode(node) {
-        return node.kind === 191 /* LiteralType */;
+        return node.kind === 192 /* LiteralType */;
     }
     ts.isLiteralTypeNode = isLiteralTypeNode;
     function isImportTypeNode(node) {
-        return node.kind === 195 /* ImportType */;
+        return node.kind === 196 /* ImportType */;
     }
     ts.isImportTypeNode = isImportTypeNode;
     function isTemplateLiteralTypeSpan(node) {
-        return node.kind === 194 /* TemplateLiteralTypeSpan */;
+        return node.kind === 195 /* TemplateLiteralTypeSpan */;
     }
     ts.isTemplateLiteralTypeSpan = isTemplateLiteralTypeSpan;
     function isTemplateLiteralTypeNode(node) {
-        return node.kind === 193 /* TemplateLiteralType */;
+        return node.kind === 194 /* TemplateLiteralType */;
     }
     ts.isTemplateLiteralTypeNode = isTemplateLiteralTypeNode;
     // Binding patterns
     function isObjectBindingPattern(node) {
-        return node.kind === 196 /* ObjectBindingPattern */;
+        return node.kind === 197 /* ObjectBindingPattern */;
     }
     ts.isObjectBindingPattern = isObjectBindingPattern;
     function isArrayBindingPattern(node) {
-        return node.kind === 197 /* ArrayBindingPattern */;
+        return node.kind === 198 /* ArrayBindingPattern */;
     }
     ts.isArrayBindingPattern = isArrayBindingPattern;
     function isBindingElement(node) {
-        return node.kind === 198 /* BindingElement */;
+        return node.kind === 199 /* BindingElement */;
     }
     ts.isBindingElement = isBindingElement;
     // Expression
     function isArrayLiteralExpression(node) {
-        return node.kind === 199 /* ArrayLiteralExpression */;
+        return node.kind === 200 /* ArrayLiteralExpression */;
     }
     ts.isArrayLiteralExpression = isArrayLiteralExpression;
     function isObjectLiteralExpression(node) {
-        return node.kind === 200 /* ObjectLiteralExpression */;
+        return node.kind === 201 /* ObjectLiteralExpression */;
     }
     ts.isObjectLiteralExpression = isObjectLiteralExpression;
     function isPropertyAccessExpression(node) {
-        return node.kind === 201 /* PropertyAccessExpression */;
+        return node.kind === 202 /* PropertyAccessExpression */;
     }
     ts.isPropertyAccessExpression = isPropertyAccessExpression;
     function isElementAccessExpression(node) {
-        return node.kind === 202 /* ElementAccessExpression */;
+        return node.kind === 203 /* ElementAccessExpression */;
     }
     ts.isElementAccessExpression = isElementAccessExpression;
     function isCallExpression(node) {
-        return node.kind === 203 /* CallExpression */;
+        return node.kind === 204 /* CallExpression */;
     }
     ts.isCallExpression = isCallExpression;
     function isNewExpression(node) {
-        return node.kind === 204 /* NewExpression */;
+        return node.kind === 205 /* NewExpression */;
     }
     ts.isNewExpression = isNewExpression;
     function isTaggedTemplateExpression(node) {
-        return node.kind === 205 /* TaggedTemplateExpression */;
+        return node.kind === 206 /* TaggedTemplateExpression */;
     }
     ts.isTaggedTemplateExpression = isTaggedTemplateExpression;
     function isTypeAssertionExpression(node) {
-        return node.kind === 206 /* TypeAssertionExpression */;
+        return node.kind === 207 /* TypeAssertionExpression */;
     }
     ts.isTypeAssertionExpression = isTypeAssertionExpression;
     function isParenthesizedExpression(node) {
-        return node.kind === 207 /* ParenthesizedExpression */;
+        return node.kind === 208 /* ParenthesizedExpression */;
     }
     ts.isParenthesizedExpression = isParenthesizedExpression;
     function isFunctionExpression(node) {
-        return node.kind === 208 /* FunctionExpression */;
+        return node.kind === 209 /* FunctionExpression */;
     }
     ts.isFunctionExpression = isFunctionExpression;
     function isArrowFunction(node) {
-        return node.kind === 209 /* ArrowFunction */;
+        return node.kind === 210 /* ArrowFunction */;
     }
     ts.isArrowFunction = isArrowFunction;
     function isDeleteExpression(node) {
-        return node.kind === 210 /* DeleteExpression */;
+        return node.kind === 211 /* DeleteExpression */;
     }
     ts.isDeleteExpression = isDeleteExpression;
     function isTypeOfExpression(node) {
-        return node.kind === 211 /* TypeOfExpression */;
+        return node.kind === 212 /* TypeOfExpression */;
     }
     ts.isTypeOfExpression = isTypeOfExpression;
     function isVoidExpression(node) {
-        return node.kind === 212 /* VoidExpression */;
+        return node.kind === 213 /* VoidExpression */;
     }
     ts.isVoidExpression = isVoidExpression;
     function isAwaitExpression(node) {
-        return node.kind === 213 /* AwaitExpression */;
+        return node.kind === 214 /* AwaitExpression */;
     }
     ts.isAwaitExpression = isAwaitExpression;
     function isPrefixUnaryExpression(node) {
-        return node.kind === 214 /* PrefixUnaryExpression */;
+        return node.kind === 215 /* PrefixUnaryExpression */;
     }
     ts.isPrefixUnaryExpression = isPrefixUnaryExpression;
     function isPostfixUnaryExpression(node) {
-        return node.kind === 215 /* PostfixUnaryExpression */;
+        return node.kind === 216 /* PostfixUnaryExpression */;
     }
     ts.isPostfixUnaryExpression = isPostfixUnaryExpression;
     function isBinaryExpression(node) {
-        return node.kind === 216 /* BinaryExpression */;
+        return node.kind === 217 /* BinaryExpression */;
     }
     ts.isBinaryExpression = isBinaryExpression;
     function isConditionalExpression(node) {
-        return node.kind === 217 /* ConditionalExpression */;
+        return node.kind === 218 /* ConditionalExpression */;
     }
     ts.isConditionalExpression = isConditionalExpression;
     function isTemplateExpression(node) {
-        return node.kind === 218 /* TemplateExpression */;
+        return node.kind === 219 /* TemplateExpression */;
     }
     ts.isTemplateExpression = isTemplateExpression;
     function isYieldExpression(node) {
-        return node.kind === 219 /* YieldExpression */;
+        return node.kind === 220 /* YieldExpression */;
     }
     ts.isYieldExpression = isYieldExpression;
     function isSpreadElement(node) {
-        return node.kind === 220 /* SpreadElement */;
+        return node.kind === 221 /* SpreadElement */;
     }
     ts.isSpreadElement = isSpreadElement;
     function isClassExpression(node) {
-        return node.kind === 221 /* ClassExpression */;
+        return node.kind === 222 /* ClassExpression */;
     }
     ts.isClassExpression = isClassExpression;
     function isOmittedExpression(node) {
-        return node.kind === 222 /* OmittedExpression */;
+        return node.kind === 223 /* OmittedExpression */;
     }
     ts.isOmittedExpression = isOmittedExpression;
     function isExpressionWithTypeArguments(node) {
-        return node.kind === 223 /* ExpressionWithTypeArguments */;
+        return node.kind === 224 /* ExpressionWithTypeArguments */;
     }
     ts.isExpressionWithTypeArguments = isExpressionWithTypeArguments;
     function isAsExpression(node) {
-        return node.kind === 224 /* AsExpression */;
+        return node.kind === 225 /* AsExpression */;
     }
     ts.isAsExpression = isAsExpression;
     function isNonNullExpression(node) {
-        return node.kind === 225 /* NonNullExpression */;
+        return node.kind === 226 /* NonNullExpression */;
     }
     ts.isNonNullExpression = isNonNullExpression;
     function isMetaProperty(node) {
-        return node.kind === 226 /* MetaProperty */;
+        return node.kind === 227 /* MetaProperty */;
     }
     ts.isMetaProperty = isMetaProperty;
     function isSyntheticExpression(node) {
-        return node.kind === 227 /* SyntheticExpression */;
+        return node.kind === 228 /* SyntheticExpression */;
     }
     ts.isSyntheticExpression = isSyntheticExpression;
     function isPartiallyEmittedExpression(node) {
-        return node.kind === 336 /* PartiallyEmittedExpression */;
+        return node.kind === 340 /* PartiallyEmittedExpression */;
     }
     ts.isPartiallyEmittedExpression = isPartiallyEmittedExpression;
     function isCommaListExpression(node) {
-        return node.kind === 337 /* CommaListExpression */;
+        return node.kind === 341 /* CommaListExpression */;
     }
     ts.isCommaListExpression = isCommaListExpression;
     // Misc
     function isTemplateSpan(node) {
-        return node.kind === 228 /* TemplateSpan */;
+        return node.kind === 229 /* TemplateSpan */;
     }
     ts.isTemplateSpan = isTemplateSpan;
     function isSemicolonClassElement(node) {
-        return node.kind === 229 /* SemicolonClassElement */;
+        return node.kind === 230 /* SemicolonClassElement */;
     }
     ts.isSemicolonClassElement = isSemicolonClassElement;
     // Elements
     function isBlock(node) {
-        return node.kind === 230 /* Block */;
+        return node.kind === 231 /* Block */;
     }
     ts.isBlock = isBlock;
     function isVariableStatement(node) {
-        return node.kind === 232 /* VariableStatement */;
+        return node.kind === 233 /* VariableStatement */;
     }
     ts.isVariableStatement = isVariableStatement;
     function isEmptyStatement(node) {
-        return node.kind === 231 /* EmptyStatement */;
+        return node.kind === 232 /* EmptyStatement */;
     }
     ts.isEmptyStatement = isEmptyStatement;
     function isExpressionStatement(node) {
-        return node.kind === 233 /* ExpressionStatement */;
+        return node.kind === 234 /* ExpressionStatement */;
     }
     ts.isExpressionStatement = isExpressionStatement;
     function isIfStatement(node) {
-        return node.kind === 234 /* IfStatement */;
+        return node.kind === 235 /* IfStatement */;
     }
     ts.isIfStatement = isIfStatement;
     function isDoStatement(node) {
-        return node.kind === 235 /* DoStatement */;
+        return node.kind === 236 /* DoStatement */;
     }
     ts.isDoStatement = isDoStatement;
     function isWhileStatement(node) {
-        return node.kind === 236 /* WhileStatement */;
+        return node.kind === 237 /* WhileStatement */;
     }
     ts.isWhileStatement = isWhileStatement;
     function isForStatement(node) {
-        return node.kind === 237 /* ForStatement */;
+        return node.kind === 238 /* ForStatement */;
     }
     ts.isForStatement = isForStatement;
     function isForInStatement(node) {
-        return node.kind === 238 /* ForInStatement */;
+        return node.kind === 239 /* ForInStatement */;
     }
     ts.isForInStatement = isForInStatement;
     function isForOfStatement(node) {
-        return node.kind === 239 /* ForOfStatement */;
+        return node.kind === 240 /* ForOfStatement */;
     }
     ts.isForOfStatement = isForOfStatement;
     function isContinueStatement(node) {
-        return node.kind === 240 /* ContinueStatement */;
+        return node.kind === 241 /* ContinueStatement */;
     }
     ts.isContinueStatement = isContinueStatement;
     function isBreakStatement(node) {
-        return node.kind === 241 /* BreakStatement */;
+        return node.kind === 242 /* BreakStatement */;
     }
     ts.isBreakStatement = isBreakStatement;
     function isReturnStatement(node) {
-        return node.kind === 242 /* ReturnStatement */;
+        return node.kind === 243 /* ReturnStatement */;
     }
     ts.isReturnStatement = isReturnStatement;
     function isWithStatement(node) {
-        return node.kind === 243 /* WithStatement */;
+        return node.kind === 244 /* WithStatement */;
     }
     ts.isWithStatement = isWithStatement;
     function isSwitchStatement(node) {
-        return node.kind === 244 /* SwitchStatement */;
+        return node.kind === 245 /* SwitchStatement */;
     }
     ts.isSwitchStatement = isSwitchStatement;
     function isLabeledStatement(node) {
-        return node.kind === 245 /* LabeledStatement */;
+        return node.kind === 246 /* LabeledStatement */;
     }
     ts.isLabeledStatement = isLabeledStatement;
     function isThrowStatement(node) {
-        return node.kind === 246 /* ThrowStatement */;
+        return node.kind === 247 /* ThrowStatement */;
     }
     ts.isThrowStatement = isThrowStatement;
     function isTryStatement(node) {
-        return node.kind === 247 /* TryStatement */;
+        return node.kind === 248 /* TryStatement */;
     }
     ts.isTryStatement = isTryStatement;
     function isDebuggerStatement(node) {
-        return node.kind === 248 /* DebuggerStatement */;
+        return node.kind === 249 /* DebuggerStatement */;
     }
     ts.isDebuggerStatement = isDebuggerStatement;
     function isVariableDeclaration(node) {
-        return node.kind === 249 /* VariableDeclaration */;
+        return node.kind === 250 /* VariableDeclaration */;
     }
     ts.isVariableDeclaration = isVariableDeclaration;
     function isVariableDeclarationList(node) {
-        return node.kind === 250 /* VariableDeclarationList */;
+        return node.kind === 251 /* VariableDeclarationList */;
     }
     ts.isVariableDeclarationList = isVariableDeclarationList;
     function isFunctionDeclaration(node) {
-        return node.kind === 251 /* FunctionDeclaration */;
+        return node.kind === 252 /* FunctionDeclaration */;
     }
     ts.isFunctionDeclaration = isFunctionDeclaration;
     function isClassDeclaration(node) {
-        return node.kind === 252 /* ClassDeclaration */;
+        return node.kind === 253 /* ClassDeclaration */;
     }
     ts.isClassDeclaration = isClassDeclaration;
     function isInterfaceDeclaration(node) {
-        return node.kind === 253 /* InterfaceDeclaration */;
+        return node.kind === 254 /* InterfaceDeclaration */;
     }
     ts.isInterfaceDeclaration = isInterfaceDeclaration;
     function isTypeAliasDeclaration(node) {
-        return node.kind === 254 /* TypeAliasDeclaration */;
+        return node.kind === 255 /* TypeAliasDeclaration */;
     }
     ts.isTypeAliasDeclaration = isTypeAliasDeclaration;
     function isEnumDeclaration(node) {
-        return node.kind === 255 /* EnumDeclaration */;
+        return node.kind === 256 /* EnumDeclaration */;
     }
     ts.isEnumDeclaration = isEnumDeclaration;
     function isModuleDeclaration(node) {
-        return node.kind === 256 /* ModuleDeclaration */;
+        return node.kind === 257 /* ModuleDeclaration */;
     }
     ts.isModuleDeclaration = isModuleDeclaration;
     function isModuleBlock(node) {
-        return node.kind === 257 /* ModuleBlock */;
+        return node.kind === 258 /* ModuleBlock */;
     }
     ts.isModuleBlock = isModuleBlock;
     function isCaseBlock(node) {
-        return node.kind === 258 /* CaseBlock */;
+        return node.kind === 259 /* CaseBlock */;
     }
     ts.isCaseBlock = isCaseBlock;
     function isNamespaceExportDeclaration(node) {
-        return node.kind === 259 /* NamespaceExportDeclaration */;
+        return node.kind === 260 /* NamespaceExportDeclaration */;
     }
     ts.isNamespaceExportDeclaration = isNamespaceExportDeclaration;
     function isImportEqualsDeclaration(node) {
-        return node.kind === 260 /* ImportEqualsDeclaration */;
+        return node.kind === 261 /* ImportEqualsDeclaration */;
     }
     ts.isImportEqualsDeclaration = isImportEqualsDeclaration;
     function isImportDeclaration(node) {
-        return node.kind === 261 /* ImportDeclaration */;
+        return node.kind === 262 /* ImportDeclaration */;
     }
     ts.isImportDeclaration = isImportDeclaration;
     function isImportClause(node) {
-        return node.kind === 262 /* ImportClause */;
+        return node.kind === 263 /* ImportClause */;
     }
     ts.isImportClause = isImportClause;
     function isNamespaceImport(node) {
-        return node.kind === 263 /* NamespaceImport */;
+        return node.kind === 264 /* NamespaceImport */;
     }
     ts.isNamespaceImport = isNamespaceImport;
     function isNamespaceExport(node) {
-        return node.kind === 269 /* NamespaceExport */;
+        return node.kind === 270 /* NamespaceExport */;
     }
     ts.isNamespaceExport = isNamespaceExport;
     function isNamedImports(node) {
-        return node.kind === 264 /* NamedImports */;
+        return node.kind === 265 /* NamedImports */;
     }
     ts.isNamedImports = isNamedImports;
     function isImportSpecifier(node) {
-        return node.kind === 265 /* ImportSpecifier */;
+        return node.kind === 266 /* ImportSpecifier */;
     }
     ts.isImportSpecifier = isImportSpecifier;
     function isExportAssignment(node) {
-        return node.kind === 266 /* ExportAssignment */;
+        return node.kind === 267 /* ExportAssignment */;
     }
     ts.isExportAssignment = isExportAssignment;
     function isExportDeclaration(node) {
-        return node.kind === 267 /* ExportDeclaration */;
+        return node.kind === 268 /* ExportDeclaration */;
     }
     ts.isExportDeclaration = isExportDeclaration;
     function isNamedExports(node) {
-        return node.kind === 268 /* NamedExports */;
+        return node.kind === 269 /* NamedExports */;
     }
     ts.isNamedExports = isNamedExports;
     function isExportSpecifier(node) {
-        return node.kind === 270 /* ExportSpecifier */;
+        return node.kind === 271 /* ExportSpecifier */;
     }
     ts.isExportSpecifier = isExportSpecifier;
     function isMissingDeclaration(node) {
-        return node.kind === 271 /* MissingDeclaration */;
+        return node.kind === 272 /* MissingDeclaration */;
     }
     ts.isMissingDeclaration = isMissingDeclaration;
     function isNotEmittedStatement(node) {
-        return node.kind === 335 /* NotEmittedStatement */;
+        return node.kind === 339 /* NotEmittedStatement */;
     }
     ts.isNotEmittedStatement = isNotEmittedStatement;
     /* @internal */
     function isSyntheticReference(node) {
-        return node.kind === 340 /* SyntheticReferenceExpression */;
+        return node.kind === 344 /* SyntheticReferenceExpression */;
     }
     ts.isSyntheticReference = isSyntheticReference;
     /* @internal */
     function isMergeDeclarationMarker(node) {
-        return node.kind === 338 /* MergeDeclarationMarker */;
+        return node.kind === 342 /* MergeDeclarationMarker */;
     }
     ts.isMergeDeclarationMarker = isMergeDeclarationMarker;
     /* @internal */
     function isEndOfDeclarationMarker(node) {
-        return node.kind === 339 /* EndOfDeclarationMarker */;
+        return node.kind === 343 /* EndOfDeclarationMarker */;
     }
     ts.isEndOfDeclarationMarker = isEndOfDeclarationMarker;
     // Module References
     function isExternalModuleReference(node) {
-        return node.kind === 272 /* ExternalModuleReference */;
+        return node.kind === 273 /* ExternalModuleReference */;
     }
     ts.isExternalModuleReference = isExternalModuleReference;
     // JSX
     function isJsxElement(node) {
-        return node.kind === 273 /* JsxElement */;
+        return node.kind === 274 /* JsxElement */;
     }
     ts.isJsxElement = isJsxElement;
     function isJsxSelfClosingElement(node) {
-        return node.kind === 274 /* JsxSelfClosingElement */;
+        return node.kind === 275 /* JsxSelfClosingElement */;
     }
     ts.isJsxSelfClosingElement = isJsxSelfClosingElement;
     function isJsxOpeningElement(node) {
-        return node.kind === 275 /* JsxOpeningElement */;
+        return node.kind === 276 /* JsxOpeningElement */;
     }
     ts.isJsxOpeningElement = isJsxOpeningElement;
     function isJsxClosingElement(node) {
-        return node.kind === 276 /* JsxClosingElement */;
+        return node.kind === 277 /* JsxClosingElement */;
     }
     ts.isJsxClosingElement = isJsxClosingElement;
     function isJsxFragment(node) {
-        return node.kind === 277 /* JsxFragment */;
+        return node.kind === 278 /* JsxFragment */;
     }
     ts.isJsxFragment = isJsxFragment;
     function isJsxOpeningFragment(node) {
-        return node.kind === 278 /* JsxOpeningFragment */;
+        return node.kind === 279 /* JsxOpeningFragment */;
     }
     ts.isJsxOpeningFragment = isJsxOpeningFragment;
     function isJsxClosingFragment(node) {
-        return node.kind === 279 /* JsxClosingFragment */;
+        return node.kind === 280 /* JsxClosingFragment */;
     }
     ts.isJsxClosingFragment = isJsxClosingFragment;
     function isJsxAttribute(node) {
-        return node.kind === 280 /* JsxAttribute */;
+        return node.kind === 281 /* JsxAttribute */;
     }
     ts.isJsxAttribute = isJsxAttribute;
     function isJsxAttributes(node) {
-        return node.kind === 281 /* JsxAttributes */;
+        return node.kind === 282 /* JsxAttributes */;
     }
     ts.isJsxAttributes = isJsxAttributes;
     function isJsxSpreadAttribute(node) {
-        return node.kind === 282 /* JsxSpreadAttribute */;
+        return node.kind === 283 /* JsxSpreadAttribute */;
     }
     ts.isJsxSpreadAttribute = isJsxSpreadAttribute;
     function isJsxExpression(node) {
-        return node.kind === 283 /* JsxExpression */;
+        return node.kind === 284 /* JsxExpression */;
     }
     ts.isJsxExpression = isJsxExpression;
     // Clauses
     function isCaseClause(node) {
-        return node.kind === 284 /* CaseClause */;
+        return node.kind === 285 /* CaseClause */;
     }
     ts.isCaseClause = isCaseClause;
     function isDefaultClause(node) {
-        return node.kind === 285 /* DefaultClause */;
+        return node.kind === 286 /* DefaultClause */;
     }
     ts.isDefaultClause = isDefaultClause;
     function isHeritageClause(node) {
-        return node.kind === 286 /* HeritageClause */;
+        return node.kind === 287 /* HeritageClause */;
     }
     ts.isHeritageClause = isHeritageClause;
     function isCatchClause(node) {
-        return node.kind === 287 /* CatchClause */;
+        return node.kind === 288 /* CatchClause */;
     }
     ts.isCatchClause = isCatchClause;
     // Property assignments
     function isPropertyAssignment(node) {
-        return node.kind === 288 /* PropertyAssignment */;
+        return node.kind === 289 /* PropertyAssignment */;
     }
     ts.isPropertyAssignment = isPropertyAssignment;
     function isShorthandPropertyAssignment(node) {
-        return node.kind === 289 /* ShorthandPropertyAssignment */;
+        return node.kind === 290 /* ShorthandPropertyAssignment */;
     }
     ts.isShorthandPropertyAssignment = isShorthandPropertyAssignment;
     function isSpreadAssignment(node) {
-        return node.kind === 290 /* SpreadAssignment */;
+        return node.kind === 291 /* SpreadAssignment */;
     }
     ts.isSpreadAssignment = isSpreadAssignment;
     // Enum
     function isEnumMember(node) {
-        return node.kind === 291 /* EnumMember */;
+        return node.kind === 292 /* EnumMember */;
     }
     ts.isEnumMember = isEnumMember;
     // Unparsed
     // TODO(rbuckton): isUnparsedPrologue
     function isUnparsedPrepend(node) {
-        return node.kind === 293 /* UnparsedPrepend */;
+        return node.kind === 294 /* UnparsedPrepend */;
     }
     ts.isUnparsedPrepend = isUnparsedPrepend;
     // TODO(rbuckton): isUnparsedText
@@ -27305,156 +27849,164 @@ var ts;
     // TODO(rbuckton): isUnparsedSyntheticReference
     // Top-level nodes
     function isSourceFile(node) {
-        return node.kind === 297 /* SourceFile */;
+        return node.kind === 298 /* SourceFile */;
     }
     ts.isSourceFile = isSourceFile;
     function isBundle(node) {
-        return node.kind === 298 /* Bundle */;
+        return node.kind === 299 /* Bundle */;
     }
     ts.isBundle = isBundle;
     function isUnparsedSource(node) {
-        return node.kind === 299 /* UnparsedSource */;
+        return node.kind === 300 /* UnparsedSource */;
     }
     ts.isUnparsedSource = isUnparsedSource;
     // TODO(rbuckton): isInputFiles
     // JSDoc Elements
     function isJSDocTypeExpression(node) {
-        return node.kind === 301 /* JSDocTypeExpression */;
+        return node.kind === 302 /* JSDocTypeExpression */;
     }
     ts.isJSDocTypeExpression = isJSDocTypeExpression;
     function isJSDocNameReference(node) {
-        return node.kind === 302 /* JSDocNameReference */;
+        return node.kind === 303 /* JSDocNameReference */;
     }
     ts.isJSDocNameReference = isJSDocNameReference;
+    function isJSDocLink(node) {
+        return node.kind === 316 /* JSDocLink */;
+    }
+    ts.isJSDocLink = isJSDocLink;
     function isJSDocAllType(node) {
-        return node.kind === 303 /* JSDocAllType */;
+        return node.kind === 304 /* JSDocAllType */;
     }
     ts.isJSDocAllType = isJSDocAllType;
     function isJSDocUnknownType(node) {
-        return node.kind === 304 /* JSDocUnknownType */;
+        return node.kind === 305 /* JSDocUnknownType */;
     }
     ts.isJSDocUnknownType = isJSDocUnknownType;
     function isJSDocNullableType(node) {
-        return node.kind === 305 /* JSDocNullableType */;
+        return node.kind === 306 /* JSDocNullableType */;
     }
     ts.isJSDocNullableType = isJSDocNullableType;
     function isJSDocNonNullableType(node) {
-        return node.kind === 306 /* JSDocNonNullableType */;
+        return node.kind === 307 /* JSDocNonNullableType */;
     }
     ts.isJSDocNonNullableType = isJSDocNonNullableType;
     function isJSDocOptionalType(node) {
-        return node.kind === 307 /* JSDocOptionalType */;
+        return node.kind === 308 /* JSDocOptionalType */;
     }
     ts.isJSDocOptionalType = isJSDocOptionalType;
     function isJSDocFunctionType(node) {
-        return node.kind === 308 /* JSDocFunctionType */;
+        return node.kind === 309 /* JSDocFunctionType */;
     }
     ts.isJSDocFunctionType = isJSDocFunctionType;
     function isJSDocVariadicType(node) {
-        return node.kind === 309 /* JSDocVariadicType */;
+        return node.kind === 310 /* JSDocVariadicType */;
     }
     ts.isJSDocVariadicType = isJSDocVariadicType;
     function isJSDocNamepathType(node) {
-        return node.kind === 310 /* JSDocNamepathType */;
+        return node.kind === 311 /* JSDocNamepathType */;
     }
     ts.isJSDocNamepathType = isJSDocNamepathType;
     function isJSDoc(node) {
-        return node.kind === 311 /* JSDocComment */;
+        return node.kind === 312 /* JSDocComment */;
     }
     ts.isJSDoc = isJSDoc;
     function isJSDocTypeLiteral(node) {
-        return node.kind === 312 /* JSDocTypeLiteral */;
+        return node.kind === 314 /* JSDocTypeLiteral */;
     }
     ts.isJSDocTypeLiteral = isJSDocTypeLiteral;
     function isJSDocSignature(node) {
-        return node.kind === 313 /* JSDocSignature */;
+        return node.kind === 315 /* JSDocSignature */;
     }
     ts.isJSDocSignature = isJSDocSignature;
     // JSDoc Tags
     function isJSDocAugmentsTag(node) {
-        return node.kind === 315 /* JSDocAugmentsTag */;
+        return node.kind === 318 /* JSDocAugmentsTag */;
     }
     ts.isJSDocAugmentsTag = isJSDocAugmentsTag;
     function isJSDocAuthorTag(node) {
-        return node.kind === 317 /* JSDocAuthorTag */;
+        return node.kind === 320 /* JSDocAuthorTag */;
     }
     ts.isJSDocAuthorTag = isJSDocAuthorTag;
     function isJSDocClassTag(node) {
-        return node.kind === 319 /* JSDocClassTag */;
+        return node.kind === 322 /* JSDocClassTag */;
     }
     ts.isJSDocClassTag = isJSDocClassTag;
     function isJSDocCallbackTag(node) {
-        return node.kind === 324 /* JSDocCallbackTag */;
+        return node.kind === 328 /* JSDocCallbackTag */;
     }
     ts.isJSDocCallbackTag = isJSDocCallbackTag;
     function isJSDocPublicTag(node) {
-        return node.kind === 320 /* JSDocPublicTag */;
+        return node.kind === 323 /* JSDocPublicTag */;
     }
     ts.isJSDocPublicTag = isJSDocPublicTag;
     function isJSDocPrivateTag(node) {
-        return node.kind === 321 /* JSDocPrivateTag */;
+        return node.kind === 324 /* JSDocPrivateTag */;
     }
     ts.isJSDocPrivateTag = isJSDocPrivateTag;
     function isJSDocProtectedTag(node) {
-        return node.kind === 322 /* JSDocProtectedTag */;
+        return node.kind === 325 /* JSDocProtectedTag */;
     }
     ts.isJSDocProtectedTag = isJSDocProtectedTag;
     function isJSDocReadonlyTag(node) {
-        return node.kind === 323 /* JSDocReadonlyTag */;
+        return node.kind === 326 /* JSDocReadonlyTag */;
     }
     ts.isJSDocReadonlyTag = isJSDocReadonlyTag;
+    function isJSDocOverrideTag(node) {
+        return node.kind === 327 /* JSDocOverrideTag */;
+    }
+    ts.isJSDocOverrideTag = isJSDocOverrideTag;
     function isJSDocDeprecatedTag(node) {
-        return node.kind === 318 /* JSDocDeprecatedTag */;
+        return node.kind === 321 /* JSDocDeprecatedTag */;
     }
     ts.isJSDocDeprecatedTag = isJSDocDeprecatedTag;
     function isJSDocSeeTag(node) {
-        return node.kind === 332 /* JSDocSeeTag */;
+        return node.kind === 336 /* JSDocSeeTag */;
     }
     ts.isJSDocSeeTag = isJSDocSeeTag;
     function isJSDocEnumTag(node) {
-        return node.kind === 325 /* JSDocEnumTag */;
+        return node.kind === 329 /* JSDocEnumTag */;
     }
     ts.isJSDocEnumTag = isJSDocEnumTag;
     function isJSDocParameterTag(node) {
-        return node.kind === 326 /* JSDocParameterTag */;
+        return node.kind === 330 /* JSDocParameterTag */;
     }
     ts.isJSDocParameterTag = isJSDocParameterTag;
     function isJSDocReturnTag(node) {
-        return node.kind === 327 /* JSDocReturnTag */;
+        return node.kind === 331 /* JSDocReturnTag */;
     }
     ts.isJSDocReturnTag = isJSDocReturnTag;
     function isJSDocThisTag(node) {
-        return node.kind === 328 /* JSDocThisTag */;
+        return node.kind === 332 /* JSDocThisTag */;
     }
     ts.isJSDocThisTag = isJSDocThisTag;
     function isJSDocTypeTag(node) {
-        return node.kind === 329 /* JSDocTypeTag */;
+        return node.kind === 333 /* JSDocTypeTag */;
     }
     ts.isJSDocTypeTag = isJSDocTypeTag;
     function isJSDocTemplateTag(node) {
-        return node.kind === 330 /* JSDocTemplateTag */;
+        return node.kind === 334 /* JSDocTemplateTag */;
     }
     ts.isJSDocTemplateTag = isJSDocTemplateTag;
     function isJSDocTypedefTag(node) {
-        return node.kind === 331 /* JSDocTypedefTag */;
+        return node.kind === 335 /* JSDocTypedefTag */;
     }
     ts.isJSDocTypedefTag = isJSDocTypedefTag;
     function isJSDocUnknownTag(node) {
-        return node.kind === 314 /* JSDocTag */;
+        return node.kind === 317 /* JSDocTag */;
     }
     ts.isJSDocUnknownTag = isJSDocUnknownTag;
     function isJSDocPropertyTag(node) {
-        return node.kind === 333 /* JSDocPropertyTag */;
+        return node.kind === 337 /* JSDocPropertyTag */;
     }
     ts.isJSDocPropertyTag = isJSDocPropertyTag;
     function isJSDocImplementsTag(node) {
-        return node.kind === 316 /* JSDocImplementsTag */;
+        return node.kind === 319 /* JSDocImplementsTag */;
     }
     ts.isJSDocImplementsTag = isJSDocImplementsTag;
     // Synthesized list
     /* @internal */
     function isSyntaxList(n) {
-        return n.kind === 334 /* SyntaxList */;
+        return n.kind === 338 /* SyntaxList */;
     }
     ts.isSyntaxList = isSyntaxList;
 })(ts || (ts = {}));
@@ -27471,7 +28023,7 @@ var ts;
             return ts.setTextRange(factory.createElementAccessExpression(target, memberName.expression), location);
         }
         else {
-            var expression = ts.setTextRange(ts.isIdentifierOrPrivateIdentifier(memberName)
+            var expression = ts.setTextRange(ts.isMemberName(memberName)
                 ? factory.createPropertyAccessExpression(target, memberName)
                 : factory.createElementAccessExpression(target, memberName), memberName);
             ts.getOrCreateEmitNode(expression).flags |= 64 /* NoNestedSourceMaps */;
@@ -27653,14 +28205,14 @@ var ts;
             ts.Debug.failBadSyntaxKind(property.name, "Private identifiers are not allowed in object literals.");
         }
         switch (property.kind) {
-            case 167 /* GetAccessor */:
-            case 168 /* SetAccessor */:
+            case 168 /* GetAccessor */:
+            case 169 /* SetAccessor */:
                 return createExpressionForAccessorDeclaration(factory, node.properties, property, receiver, !!node.multiLine);
-            case 288 /* PropertyAssignment */:
+            case 289 /* PropertyAssignment */:
                 return createExpressionForPropertyAssignment(factory, property, receiver);
-            case 289 /* ShorthandPropertyAssignment */:
+            case 290 /* ShorthandPropertyAssignment */:
                 return createExpressionForShorthandPropertyAssignment(factory, property, receiver);
-            case 165 /* MethodDeclaration */:
+            case 166 /* MethodDeclaration */:
                 return createExpressionForMethodDeclaration(factory, property, receiver);
         }
     }
@@ -27713,21 +28265,21 @@ var ts;
     }
     ts.startsWithUseStrict = startsWithUseStrict;
     function isCommaSequence(node) {
-        return node.kind === 216 /* BinaryExpression */ && node.operatorToken.kind === 27 /* CommaToken */ ||
-            node.kind === 337 /* CommaListExpression */;
+        return node.kind === 217 /* BinaryExpression */ && node.operatorToken.kind === 27 /* CommaToken */ ||
+            node.kind === 341 /* CommaListExpression */;
     }
     ts.isCommaSequence = isCommaSequence;
     function isOuterExpression(node, kinds) {
         if (kinds === void 0) { kinds = 15 /* All */; }
         switch (node.kind) {
-            case 207 /* ParenthesizedExpression */:
+            case 208 /* ParenthesizedExpression */:
                 return (kinds & 1 /* Parentheses */) !== 0;
-            case 206 /* TypeAssertionExpression */:
-            case 224 /* AsExpression */:
+            case 207 /* TypeAssertionExpression */:
+            case 225 /* AsExpression */:
                 return (kinds & 2 /* TypeAssertions */) !== 0;
-            case 225 /* NonNullExpression */:
+            case 226 /* NonNullExpression */:
                 return (kinds & 4 /* NonNullAssertions */) !== 0;
-            case 336 /* PartiallyEmittedExpression */:
+            case 340 /* PartiallyEmittedExpression */:
                 return (kinds & 8 /* PartiallyEmittedExpressions */) !== 0;
         }
         return false;
@@ -27848,10 +28400,10 @@ var ts;
             var name = namespaceDeclaration.name;
             return ts.isGeneratedIdentifier(name) ? name : factory.createIdentifier(ts.getSourceTextOfNodeFromSourceFile(sourceFile, name) || ts.idText(name));
         }
-        if (node.kind === 261 /* ImportDeclaration */ && node.importClause) {
+        if (node.kind === 262 /* ImportDeclaration */ && node.importClause) {
             return factory.getGeneratedNameForNode(node);
         }
-        if (node.kind === 267 /* ExportDeclaration */ && node.moduleSpecifier) {
+        if (node.kind === 268 /* ExportDeclaration */ && node.moduleSpecifier) {
             return factory.getGeneratedNameForNode(node);
         }
         return undefined;
@@ -27970,7 +28522,7 @@ var ts;
         }
         if (ts.isObjectLiteralElementLike(bindingElement)) {
             switch (bindingElement.kind) {
-                case 288 /* PropertyAssignment */:
+                case 289 /* PropertyAssignment */:
                     // `b` in `({ a: b } = ...)`
                     // `b` in `({ a: b = 1 } = ...)`
                     // `{b}` in `({ a: {b} } = ...)`
@@ -27982,11 +28534,11 @@ var ts;
                     // `b[0]` in `({ a: b[0] } = ...)`
                     // `b[0]` in `({ a: b[0] = 1 } = ...)`
                     return getTargetOfBindingOrAssignmentElement(bindingElement.initializer);
-                case 289 /* ShorthandPropertyAssignment */:
+                case 290 /* ShorthandPropertyAssignment */:
                     // `a` in `({ a } = ...)`
                     // `a` in `({ a = 1 } = ...)`
                     return bindingElement.name;
-                case 290 /* SpreadAssignment */:
+                case 291 /* SpreadAssignment */:
                     // `a` in `({ ...a } = ...)`
                     return getTargetOfBindingOrAssignmentElement(bindingElement.expression);
             }
@@ -28018,12 +28570,12 @@ var ts;
      */
     function getRestIndicatorOfBindingOrAssignmentElement(bindingElement) {
         switch (bindingElement.kind) {
-            case 160 /* Parameter */:
-            case 198 /* BindingElement */:
+            case 161 /* Parameter */:
+            case 199 /* BindingElement */:
                 // `...` in `let [...a] = ...`
                 return bindingElement.dotDotDotToken;
-            case 220 /* SpreadElement */:
-            case 290 /* SpreadAssignment */:
+            case 221 /* SpreadElement */:
+            case 291 /* SpreadAssignment */:
                 // `...` in `[...a] = ...`
                 return bindingElement;
         }
@@ -28041,7 +28593,7 @@ var ts;
     ts.getPropertyNameOfBindingOrAssignmentElement = getPropertyNameOfBindingOrAssignmentElement;
     function tryGetPropertyNameOfBindingOrAssignmentElement(bindingElement) {
         switch (bindingElement.kind) {
-            case 198 /* BindingElement */:
+            case 199 /* BindingElement */:
                 // `a` in `let { a: b } = ...`
                 // `[a]` in `let { [a]: b } = ...`
                 // `"a"` in `let { "a": b } = ...`
@@ -28056,7 +28608,7 @@ var ts;
                         : propertyName;
                 }
                 break;
-            case 288 /* PropertyAssignment */:
+            case 289 /* PropertyAssignment */:
                 // `a` in `({ a: b } = ...)`
                 // `[a]` in `({ [a]: b } = ...)`
                 // `"a"` in `({ "a": b } = ...)`
@@ -28071,7 +28623,7 @@ var ts;
                         : propertyName;
                 }
                 break;
-            case 290 /* SpreadAssignment */:
+            case 291 /* SpreadAssignment */:
                 // `a` in `({ ...a } = ...)`
                 if (bindingElement.name && ts.isPrivateIdentifier(bindingElement.name)) {
                     return ts.Debug.failBadSyntaxKind(bindingElement.name);
@@ -28094,13 +28646,13 @@ var ts;
      */
     function getElementsOfBindingOrAssignmentPattern(name) {
         switch (name.kind) {
-            case 196 /* ObjectBindingPattern */:
-            case 197 /* ArrayBindingPattern */:
-            case 199 /* ArrayLiteralExpression */:
+            case 197 /* ObjectBindingPattern */:
+            case 198 /* ArrayBindingPattern */:
+            case 200 /* ArrayLiteralExpression */:
                 // `a` in `{a}`
                 // `a` in `[a]`
                 return name.elements;
-            case 200 /* ObjectLiteralExpression */:
+            case 201 /* ObjectLiteralExpression */:
                 // `a` in `{a}`
                 return name.properties;
         }
@@ -28121,46 +28673,294 @@ var ts;
     ts.getJSDocTypeAliasName = getJSDocTypeAliasName;
     function canHaveModifiers(node) {
         var kind = node.kind;
-        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 */;
+        return kind === 161 /* Parameter */
+            || kind === 163 /* PropertySignature */
+            || kind === 164 /* PropertyDeclaration */
+            || kind === 165 /* MethodSignature */
+            || kind === 166 /* MethodDeclaration */
+            || kind === 167 /* Constructor */
+            || kind === 168 /* GetAccessor */
+            || kind === 169 /* SetAccessor */
+            || kind === 172 /* IndexSignature */
+            || kind === 209 /* FunctionExpression */
+            || kind === 210 /* ArrowFunction */
+            || kind === 222 /* ClassExpression */
+            || kind === 233 /* VariableStatement */
+            || kind === 252 /* FunctionDeclaration */
+            || kind === 253 /* ClassDeclaration */
+            || kind === 254 /* InterfaceDeclaration */
+            || kind === 255 /* TypeAliasDeclaration */
+            || kind === 256 /* EnumDeclaration */
+            || kind === 257 /* ModuleDeclaration */
+            || kind === 261 /* ImportEqualsDeclaration */
+            || kind === 262 /* ImportDeclaration */
+            || kind === 267 /* ExportAssignment */
+            || kind === 268 /* ExportDeclaration */;
     }
     ts.canHaveModifiers = canHaveModifiers;
-    /* @internal */
-    function isExportModifier(node) {
-        return node.kind === 92 /* ExportKeyword */;
-    }
-    ts.isExportModifier = isExportModifier;
-    /* @internal */
-    function isAsyncModifier(node) {
-        return node.kind === 129 /* AsyncKeyword */;
-    }
-    ts.isAsyncModifier = isAsyncModifier;
-    /* @internal */
-    function isStaticModifier(node) {
-        return node.kind === 123 /* StaticKeyword */;
+    ts.isTypeNodeOrTypeParameterDeclaration = ts.or(ts.isTypeNode, ts.isTypeParameterDeclaration);
+    ts.isQuestionOrExclamationToken = ts.or(ts.isQuestionToken, ts.isExclamationToken);
+    ts.isIdentifierOrThisTypeNode = ts.or(ts.isIdentifier, ts.isThisTypeNode);
+    ts.isReadonlyKeywordOrPlusOrMinusToken = ts.or(ts.isReadonlyKeyword, ts.isPlusToken, ts.isMinusToken);
+    ts.isQuestionOrPlusOrMinusToken = ts.or(ts.isQuestionToken, ts.isPlusToken, ts.isMinusToken);
+    ts.isModuleName = ts.or(ts.isIdentifier, ts.isStringLiteral);
+    function isLiteralTypeLikeExpression(node) {
+        var kind = node.kind;
+        return kind === 103 /* NullKeyword */
+            || kind === 109 /* TrueKeyword */
+            || kind === 94 /* FalseKeyword */
+            || ts.isLiteralExpression(node)
+            || ts.isPrefixUnaryExpression(node);
+    }
+    ts.isLiteralTypeLikeExpression = isLiteralTypeLikeExpression;
+    function isExponentiationOperator(kind) {
+        return kind === 42 /* AsteriskAsteriskToken */;
+    }
+    function isMultiplicativeOperator(kind) {
+        return kind === 41 /* AsteriskToken */
+            || kind === 43 /* SlashToken */
+            || kind === 44 /* PercentToken */;
+    }
+    function isMultiplicativeOperatorOrHigher(kind) {
+        return isExponentiationOperator(kind)
+            || isMultiplicativeOperator(kind);
+    }
+    function isAdditiveOperator(kind) {
+        return kind === 39 /* PlusToken */
+            || kind === 40 /* MinusToken */;
+    }
+    function isAdditiveOperatorOrHigher(kind) {
+        return isAdditiveOperator(kind)
+            || isMultiplicativeOperatorOrHigher(kind);
+    }
+    function isShiftOperator(kind) {
+        return kind === 47 /* LessThanLessThanToken */
+            || kind === 48 /* GreaterThanGreaterThanToken */
+            || kind === 49 /* GreaterThanGreaterThanGreaterThanToken */;
+    }
+    function isShiftOperatorOrHigher(kind) {
+        return isShiftOperator(kind)
+            || isAdditiveOperatorOrHigher(kind);
+    }
+    function isRelationalOperator(kind) {
+        return kind === 29 /* LessThanToken */
+            || kind === 32 /* LessThanEqualsToken */
+            || kind === 31 /* GreaterThanToken */
+            || kind === 33 /* GreaterThanEqualsToken */
+            || kind === 101 /* InstanceOfKeyword */
+            || kind === 100 /* InKeyword */;
+    }
+    function isRelationalOperatorOrHigher(kind) {
+        return isRelationalOperator(kind)
+            || isShiftOperatorOrHigher(kind);
+    }
+    function isEqualityOperator(kind) {
+        return kind === 34 /* EqualsEqualsToken */
+            || kind === 36 /* EqualsEqualsEqualsToken */
+            || kind === 35 /* ExclamationEqualsToken */
+            || kind === 37 /* ExclamationEqualsEqualsToken */;
+    }
+    function isEqualityOperatorOrHigher(kind) {
+        return isEqualityOperator(kind)
+            || isRelationalOperatorOrHigher(kind);
+    }
+    function isBitwiseOperator(kind) {
+        return kind === 50 /* AmpersandToken */
+            || kind === 51 /* BarToken */
+            || kind === 52 /* CaretToken */;
+    }
+    function isBitwiseOperatorOrHigher(kind) {
+        return isBitwiseOperator(kind)
+            || isEqualityOperatorOrHigher(kind);
+    }
+    // NOTE: The version in utilities includes ExclamationToken, which is not a binary operator.
+    function isLogicalOperator(kind) {
+        return kind === 55 /* AmpersandAmpersandToken */
+            || kind === 56 /* BarBarToken */;
+    }
+    function isLogicalOperatorOrHigher(kind) {
+        return isLogicalOperator(kind)
+            || isBitwiseOperatorOrHigher(kind);
+    }
+    function isAssignmentOperatorOrHigher(kind) {
+        return kind === 60 /* QuestionQuestionToken */
+            || isLogicalOperatorOrHigher(kind)
+            || ts.isAssignmentOperator(kind);
+    }
+    function isBinaryOperator(kind) {
+        return isAssignmentOperatorOrHigher(kind)
+            || kind === 27 /* CommaToken */;
+    }
+    function isBinaryOperatorToken(node) {
+        return isBinaryOperator(node.kind);
+    }
+    ts.isBinaryOperatorToken = isBinaryOperatorToken;
+    var BinaryExpressionState;
+    (function (BinaryExpressionState) {
+        /**
+         * Handles walking into a `BinaryExpression`.
+         * @param machine State machine handler functions
+         * @param frame The current frame
+         * @returns The new frame
+         */
+        function enter(machine, stackIndex, stateStack, nodeStack, userStateStack, _resultHolder, outerState) {
+            var prevUserState = stackIndex > 0 ? userStateStack[stackIndex - 1] : undefined;
+            ts.Debug.assertEqual(stateStack[stackIndex], enter);
+            userStateStack[stackIndex] = machine.onEnter(nodeStack[stackIndex], prevUserState, outerState);
+            stateStack[stackIndex] = nextState(machine, enter);
+            return stackIndex;
+        }
+        BinaryExpressionState.enter = enter;
+        /**
+         * Handles walking the `left` side of a `BinaryExpression`.
+         * @param machine State machine handler functions
+         * @param frame The current frame
+         * @returns The new frame
+         */
+        function left(machine, stackIndex, stateStack, nodeStack, userStateStack, _resultHolder, _outerState) {
+            ts.Debug.assertEqual(stateStack[stackIndex], left);
+            ts.Debug.assertIsDefined(machine.onLeft);
+            stateStack[stackIndex] = nextState(machine, left);
+            var nextNode = machine.onLeft(nodeStack[stackIndex].left, userStateStack[stackIndex], nodeStack[stackIndex]);
+            if (nextNode) {
+                checkCircularity(stackIndex, nodeStack, nextNode);
+                return pushStack(stackIndex, stateStack, nodeStack, userStateStack, nextNode);
+            }
+            return stackIndex;
+        }
+        BinaryExpressionState.left = left;
+        /**
+         * Handles walking the `operatorToken` of a `BinaryExpression`.
+         * @param machine State machine handler functions
+         * @param frame The current frame
+         * @returns The new frame
+         */
+        function operator(machine, stackIndex, stateStack, nodeStack, userStateStack, _resultHolder, _outerState) {
+            ts.Debug.assertEqual(stateStack[stackIndex], operator);
+            ts.Debug.assertIsDefined(machine.onOperator);
+            stateStack[stackIndex] = nextState(machine, operator);
+            machine.onOperator(nodeStack[stackIndex].operatorToken, userStateStack[stackIndex], nodeStack[stackIndex]);
+            return stackIndex;
+        }
+        BinaryExpressionState.operator = operator;
+        /**
+         * Handles walking the `right` side of a `BinaryExpression`.
+         * @param machine State machine handler functions
+         * @param frame The current frame
+         * @returns The new frame
+         */
+        function right(machine, stackIndex, stateStack, nodeStack, userStateStack, _resultHolder, _outerState) {
+            ts.Debug.assertEqual(stateStack[stackIndex], right);
+            ts.Debug.assertIsDefined(machine.onRight);
+            stateStack[stackIndex] = nextState(machine, right);
+            var nextNode = machine.onRight(nodeStack[stackIndex].right, userStateStack[stackIndex], nodeStack[stackIndex]);
+            if (nextNode) {
+                checkCircularity(stackIndex, nodeStack, nextNode);
+                return pushStack(stackIndex, stateStack, nodeStack, userStateStack, nextNode);
+            }
+            return stackIndex;
+        }
+        BinaryExpressionState.right = right;
+        /**
+         * Handles walking out of a `BinaryExpression`.
+         * @param machine State machine handler functions
+         * @param frame The current frame
+         * @returns The new frame
+         */
+        function exit(machine, stackIndex, stateStack, nodeStack, userStateStack, resultHolder, _outerState) {
+            ts.Debug.assertEqual(stateStack[stackIndex], exit);
+            stateStack[stackIndex] = nextState(machine, exit);
+            var result = machine.onExit(nodeStack[stackIndex], userStateStack[stackIndex]);
+            if (stackIndex > 0) {
+                stackIndex--;
+                if (machine.foldState) {
+                    var side = stateStack[stackIndex] === exit ? "right" : "left";
+                    userStateStack[stackIndex] = machine.foldState(userStateStack[stackIndex], result, side);
+                }
+            }
+            else {
+                resultHolder.value = result;
+            }
+            return stackIndex;
+        }
+        BinaryExpressionState.exit = exit;
+        /**
+         * Handles a frame that is already done.
+         * @returns The `done` state.
+         */
+        function done(_machine, stackIndex, stateStack, _nodeStack, _userStateStack, _resultHolder, _outerState) {
+            ts.Debug.assertEqual(stateStack[stackIndex], done);
+            return stackIndex;
+        }
+        BinaryExpressionState.done = done;
+        function nextState(machine, currentState) {
+            switch (currentState) {
+                case enter:
+                    if (machine.onLeft)
+                        return left;
+                // falls through
+                case left:
+                    if (machine.onOperator)
+                        return operator;
+                // falls through
+                case operator:
+                    if (machine.onRight)
+                        return right;
+                // falls through
+                case right: return exit;
+                case exit: return done;
+                case done: return done;
+                default: ts.Debug.fail("Invalid state");
+            }
+        }
+        BinaryExpressionState.nextState = nextState;
+        function pushStack(stackIndex, stateStack, nodeStack, userStateStack, node) {
+            stackIndex++;
+            stateStack[stackIndex] = enter;
+            nodeStack[stackIndex] = node;
+            userStateStack[stackIndex] = undefined;
+            return stackIndex;
+        }
+        function checkCircularity(stackIndex, nodeStack, node) {
+            if (ts.Debug.shouldAssert(2 /* Aggressive */)) {
+                while (stackIndex >= 0) {
+                    ts.Debug.assert(nodeStack[stackIndex] !== node, "Circular traversal detected.");
+                    stackIndex--;
+                }
+            }
+        }
+    })(BinaryExpressionState || (BinaryExpressionState = {}));
+    /**
+     * Holds state machine handler functions
+     */
+    var BinaryExpressionStateMachine = /** @class */ (function () {
+        function BinaryExpressionStateMachine(onEnter, onLeft, onOperator, onRight, onExit, foldState) {
+            this.onEnter = onEnter;
+            this.onLeft = onLeft;
+            this.onOperator = onOperator;
+            this.onRight = onRight;
+            this.onExit = onExit;
+            this.foldState = foldState;
+        }
+        return BinaryExpressionStateMachine;
+    }());
+    function createBinaryExpressionTrampoline(onEnter, onLeft, onOperator, onRight, onExit, foldState) {
+        var machine = new BinaryExpressionStateMachine(onEnter, onLeft, onOperator, onRight, onExit, foldState);
+        return trampoline;
+        function trampoline(node, outerState) {
+            var resultHolder = { value: undefined };
+            var stateStack = [BinaryExpressionState.enter];
+            var nodeStack = [node];
+            var userStateStack = [undefined];
+            var stackIndex = 0;
+            while (stateStack[stackIndex] !== BinaryExpressionState.done) {
+                stackIndex = stateStack[stackIndex](machine, stackIndex, stateStack, nodeStack, userStateStack, resultHolder, outerState);
+            }
+            ts.Debug.assertEqual(stackIndex, 0);
+            return resultHolder.value;
+        }
     }
-    ts.isStaticModifier = isStaticModifier;
+    ts.createBinaryExpressionTrampoline = createBinaryExpressionTrampoline;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
@@ -28242,19 +29042,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 <= 156 /* LastToken */) {
+        if (!node || node.kind <= 157 /* LastToken */) {
             return;
         }
         switch (node.kind) {
-            case 157 /* QualifiedName */:
+            case 158 /* QualifiedName */:
                 return visitNode(cbNode, node.left) ||
                     visitNode(cbNode, node.right);
-            case 159 /* TypeParameter */:
+            case 160 /* TypeParameter */:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.constraint) ||
                     visitNode(cbNode, node.default) ||
                     visitNode(cbNode, node.expression);
-            case 289 /* ShorthandPropertyAssignment */:
+            case 290 /* ShorthandPropertyAssignment */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
@@ -28262,9 +29062,9 @@ var ts;
                     visitNode(cbNode, node.exclamationToken) ||
                     visitNode(cbNode, node.equalsToken) ||
                     visitNode(cbNode, node.objectAssignmentInitializer);
-            case 290 /* SpreadAssignment */:
+            case 291 /* SpreadAssignment */:
                 return visitNode(cbNode, node.expression);
-            case 160 /* Parameter */:
+            case 161 /* Parameter */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.dotDotDotToken) ||
@@ -28272,7 +29072,7 @@ var ts;
                     visitNode(cbNode, node.questionToken) ||
                     visitNode(cbNode, node.type) ||
                     visitNode(cbNode, node.initializer);
-            case 163 /* PropertyDeclaration */:
+            case 164 /* PropertyDeclaration */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
@@ -28280,51 +29080,51 @@ var ts;
                     visitNode(cbNode, node.exclamationToken) ||
                     visitNode(cbNode, node.type) ||
                     visitNode(cbNode, node.initializer);
-            case 162 /* PropertySignature */:
+            case 163 /* 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 288 /* PropertyAssignment */:
+            case 289 /* 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 249 /* VariableDeclaration */:
+            case 250 /* 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 198 /* BindingElement */:
+            case 199 /* 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 174 /* FunctionType */:
-            case 175 /* ConstructorType */:
-            case 169 /* CallSignature */:
-            case 170 /* ConstructSignature */:
-            case 171 /* IndexSignature */:
+            case 175 /* FunctionType */:
+            case 176 /* ConstructorType */:
+            case 170 /* CallSignature */:
+            case 171 /* ConstructSignature */:
+            case 172 /* 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 165 /* MethodDeclaration */:
-            case 164 /* MethodSignature */:
-            case 166 /* Constructor */:
-            case 167 /* GetAccessor */:
-            case 168 /* SetAccessor */:
-            case 208 /* FunctionExpression */:
-            case 251 /* FunctionDeclaration */:
-            case 209 /* ArrowFunction */:
+            case 166 /* MethodDeclaration */:
+            case 165 /* MethodSignature */:
+            case 167 /* Constructor */:
+            case 168 /* GetAccessor */:
+            case 169 /* SetAccessor */:
+            case 209 /* FunctionExpression */:
+            case 252 /* FunctionDeclaration */:
+            case 210 /* ArrowFunction */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.asteriskToken) ||
@@ -28336,374 +29136,390 @@ var ts;
                     visitNode(cbNode, node.type) ||
                     visitNode(cbNode, node.equalsGreaterThanToken) ||
                     visitNode(cbNode, node.body);
-            case 173 /* TypeReference */:
+            case 174 /* TypeReference */:
                 return visitNode(cbNode, node.typeName) ||
                     visitNodes(cbNode, cbNodes, node.typeArguments);
-            case 172 /* TypePredicate */:
+            case 173 /* TypePredicate */:
                 return visitNode(cbNode, node.assertsModifier) ||
                     visitNode(cbNode, node.parameterName) ||
                     visitNode(cbNode, node.type);
-            case 176 /* TypeQuery */:
+            case 177 /* TypeQuery */:
                 return visitNode(cbNode, node.exprName);
-            case 177 /* TypeLiteral */:
+            case 178 /* TypeLiteral */:
                 return visitNodes(cbNode, cbNodes, node.members);
-            case 178 /* ArrayType */:
+            case 179 /* ArrayType */:
                 return visitNode(cbNode, node.elementType);
-            case 179 /* TupleType */:
+            case 180 /* TupleType */:
                 return visitNodes(cbNode, cbNodes, node.elements);
-            case 182 /* UnionType */:
-            case 183 /* IntersectionType */:
+            case 183 /* UnionType */:
+            case 184 /* IntersectionType */:
                 return visitNodes(cbNode, cbNodes, node.types);
-            case 184 /* ConditionalType */:
+            case 185 /* ConditionalType */:
                 return visitNode(cbNode, node.checkType) ||
                     visitNode(cbNode, node.extendsType) ||
                     visitNode(cbNode, node.trueType) ||
                     visitNode(cbNode, node.falseType);
-            case 185 /* InferType */:
+            case 186 /* InferType */:
                 return visitNode(cbNode, node.typeParameter);
-            case 195 /* ImportType */:
+            case 196 /* ImportType */:
                 return visitNode(cbNode, node.argument) ||
                     visitNode(cbNode, node.qualifier) ||
                     visitNodes(cbNode, cbNodes, node.typeArguments);
-            case 186 /* ParenthesizedType */:
-            case 188 /* TypeOperator */:
+            case 187 /* ParenthesizedType */:
+            case 189 /* TypeOperator */:
                 return visitNode(cbNode, node.type);
-            case 189 /* IndexedAccessType */:
+            case 190 /* IndexedAccessType */:
                 return visitNode(cbNode, node.objectType) ||
                     visitNode(cbNode, node.indexType);
-            case 190 /* MappedType */:
+            case 191 /* MappedType */:
                 return visitNode(cbNode, node.readonlyToken) ||
                     visitNode(cbNode, node.typeParameter) ||
                     visitNode(cbNode, node.nameType) ||
                     visitNode(cbNode, node.questionToken) ||
                     visitNode(cbNode, node.type);
-            case 191 /* LiteralType */:
+            case 192 /* LiteralType */:
                 return visitNode(cbNode, node.literal);
-            case 192 /* NamedTupleMember */:
+            case 193 /* NamedTupleMember */:
                 return visitNode(cbNode, node.dotDotDotToken) ||
                     visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.questionToken) ||
                     visitNode(cbNode, node.type);
-            case 196 /* ObjectBindingPattern */:
-            case 197 /* ArrayBindingPattern */:
+            case 197 /* ObjectBindingPattern */:
+            case 198 /* ArrayBindingPattern */:
                 return visitNodes(cbNode, cbNodes, node.elements);
-            case 199 /* ArrayLiteralExpression */:
+            case 200 /* ArrayLiteralExpression */:
                 return visitNodes(cbNode, cbNodes, node.elements);
-            case 200 /* ObjectLiteralExpression */:
+            case 201 /* ObjectLiteralExpression */:
                 return visitNodes(cbNode, cbNodes, node.properties);
-            case 201 /* PropertyAccessExpression */:
+            case 202 /* PropertyAccessExpression */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.questionDotToken) ||
                     visitNode(cbNode, node.name);
-            case 202 /* ElementAccessExpression */:
+            case 203 /* ElementAccessExpression */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.questionDotToken) ||
                     visitNode(cbNode, node.argumentExpression);
-            case 203 /* CallExpression */:
-            case 204 /* NewExpression */:
+            case 204 /* CallExpression */:
+            case 205 /* NewExpression */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.questionDotToken) ||
                     visitNodes(cbNode, cbNodes, node.typeArguments) ||
                     visitNodes(cbNode, cbNodes, node.arguments);
-            case 205 /* TaggedTemplateExpression */:
+            case 206 /* TaggedTemplateExpression */:
                 return visitNode(cbNode, node.tag) ||
                     visitNode(cbNode, node.questionDotToken) ||
                     visitNodes(cbNode, cbNodes, node.typeArguments) ||
                     visitNode(cbNode, node.template);
-            case 206 /* TypeAssertionExpression */:
+            case 207 /* TypeAssertionExpression */:
                 return visitNode(cbNode, node.type) ||
                     visitNode(cbNode, node.expression);
-            case 207 /* ParenthesizedExpression */:
+            case 208 /* ParenthesizedExpression */:
                 return visitNode(cbNode, node.expression);
-            case 210 /* DeleteExpression */:
+            case 211 /* DeleteExpression */:
                 return visitNode(cbNode, node.expression);
-            case 211 /* TypeOfExpression */:
+            case 212 /* TypeOfExpression */:
                 return visitNode(cbNode, node.expression);
-            case 212 /* VoidExpression */:
+            case 213 /* VoidExpression */:
                 return visitNode(cbNode, node.expression);
-            case 214 /* PrefixUnaryExpression */:
+            case 215 /* PrefixUnaryExpression */:
                 return visitNode(cbNode, node.operand);
-            case 219 /* YieldExpression */:
+            case 220 /* YieldExpression */:
                 return visitNode(cbNode, node.asteriskToken) ||
                     visitNode(cbNode, node.expression);
-            case 213 /* AwaitExpression */:
+            case 214 /* AwaitExpression */:
                 return visitNode(cbNode, node.expression);
-            case 215 /* PostfixUnaryExpression */:
+            case 216 /* PostfixUnaryExpression */:
                 return visitNode(cbNode, node.operand);
-            case 216 /* BinaryExpression */:
+            case 217 /* BinaryExpression */:
                 return visitNode(cbNode, node.left) ||
                     visitNode(cbNode, node.operatorToken) ||
                     visitNode(cbNode, node.right);
-            case 224 /* AsExpression */:
+            case 225 /* AsExpression */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.type);
-            case 225 /* NonNullExpression */:
+            case 226 /* NonNullExpression */:
                 return visitNode(cbNode, node.expression);
-            case 226 /* MetaProperty */:
+            case 227 /* MetaProperty */:
                 return visitNode(cbNode, node.name);
-            case 217 /* ConditionalExpression */:
+            case 218 /* ConditionalExpression */:
                 return visitNode(cbNode, node.condition) ||
                     visitNode(cbNode, node.questionToken) ||
                     visitNode(cbNode, node.whenTrue) ||
                     visitNode(cbNode, node.colonToken) ||
                     visitNode(cbNode, node.whenFalse);
-            case 220 /* SpreadElement */:
+            case 221 /* SpreadElement */:
                 return visitNode(cbNode, node.expression);
-            case 230 /* Block */:
-            case 257 /* ModuleBlock */:
+            case 231 /* Block */:
+            case 258 /* ModuleBlock */:
                 return visitNodes(cbNode, cbNodes, node.statements);
-            case 297 /* SourceFile */:
+            case 298 /* SourceFile */:
                 return visitNodes(cbNode, cbNodes, node.statements) ||
                     visitNode(cbNode, node.endOfFileToken);
-            case 232 /* VariableStatement */:
+            case 233 /* VariableStatement */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.declarationList);
-            case 250 /* VariableDeclarationList */:
+            case 251 /* VariableDeclarationList */:
                 return visitNodes(cbNode, cbNodes, node.declarations);
-            case 233 /* ExpressionStatement */:
+            case 234 /* ExpressionStatement */:
                 return visitNode(cbNode, node.expression);
-            case 234 /* IfStatement */:
+            case 235 /* IfStatement */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.thenStatement) ||
                     visitNode(cbNode, node.elseStatement);
-            case 235 /* DoStatement */:
+            case 236 /* DoStatement */:
                 return visitNode(cbNode, node.statement) ||
                     visitNode(cbNode, node.expression);
-            case 236 /* WhileStatement */:
+            case 237 /* WhileStatement */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.statement);
-            case 237 /* ForStatement */:
+            case 238 /* ForStatement */:
                 return visitNode(cbNode, node.initializer) ||
                     visitNode(cbNode, node.condition) ||
                     visitNode(cbNode, node.incrementor) ||
                     visitNode(cbNode, node.statement);
-            case 238 /* ForInStatement */:
+            case 239 /* ForInStatement */:
                 return visitNode(cbNode, node.initializer) ||
                     visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.statement);
-            case 239 /* ForOfStatement */:
+            case 240 /* ForOfStatement */:
                 return visitNode(cbNode, node.awaitModifier) ||
                     visitNode(cbNode, node.initializer) ||
                     visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.statement);
-            case 240 /* ContinueStatement */:
-            case 241 /* BreakStatement */:
+            case 241 /* ContinueStatement */:
+            case 242 /* BreakStatement */:
                 return visitNode(cbNode, node.label);
-            case 242 /* ReturnStatement */:
+            case 243 /* ReturnStatement */:
                 return visitNode(cbNode, node.expression);
-            case 243 /* WithStatement */:
+            case 244 /* WithStatement */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.statement);
-            case 244 /* SwitchStatement */:
+            case 245 /* SwitchStatement */:
                 return visitNode(cbNode, node.expression) ||
                     visitNode(cbNode, node.caseBlock);
-            case 258 /* CaseBlock */:
+            case 259 /* CaseBlock */:
                 return visitNodes(cbNode, cbNodes, node.clauses);
-            case 284 /* CaseClause */:
+            case 285 /* CaseClause */:
                 return visitNode(cbNode, node.expression) ||
                     visitNodes(cbNode, cbNodes, node.statements);
-            case 285 /* DefaultClause */:
+            case 286 /* DefaultClause */:
                 return visitNodes(cbNode, cbNodes, node.statements);
-            case 245 /* LabeledStatement */:
+            case 246 /* LabeledStatement */:
                 return visitNode(cbNode, node.label) ||
                     visitNode(cbNode, node.statement);
-            case 246 /* ThrowStatement */:
+            case 247 /* ThrowStatement */:
                 return visitNode(cbNode, node.expression);
-            case 247 /* TryStatement */:
+            case 248 /* TryStatement */:
                 return visitNode(cbNode, node.tryBlock) ||
                     visitNode(cbNode, node.catchClause) ||
                     visitNode(cbNode, node.finallyBlock);
-            case 287 /* CatchClause */:
+            case 288 /* CatchClause */:
                 return visitNode(cbNode, node.variableDeclaration) ||
                     visitNode(cbNode, node.block);
-            case 161 /* Decorator */:
+            case 162 /* Decorator */:
                 return visitNode(cbNode, node.expression);
-            case 252 /* ClassDeclaration */:
-            case 221 /* ClassExpression */:
+            case 253 /* ClassDeclaration */:
+            case 222 /* 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 253 /* InterfaceDeclaration */:
+            case 254 /* 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 254 /* TypeAliasDeclaration */:
+            case 255 /* 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 255 /* EnumDeclaration */:
+            case 256 /* EnumDeclaration */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNodes(cbNode, cbNodes, node.members);
-            case 291 /* EnumMember */:
+            case 292 /* EnumMember */:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.initializer);
-            case 256 /* ModuleDeclaration */:
+            case 257 /* ModuleDeclaration */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.body);
-            case 260 /* ImportEqualsDeclaration */:
+            case 261 /* ImportEqualsDeclaration */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.moduleReference);
-            case 261 /* ImportDeclaration */:
+            case 262 /* ImportDeclaration */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.importClause) ||
                     visitNode(cbNode, node.moduleSpecifier);
-            case 262 /* ImportClause */:
+            case 263 /* ImportClause */:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.namedBindings);
-            case 259 /* NamespaceExportDeclaration */:
+            case 260 /* NamespaceExportDeclaration */:
                 return visitNode(cbNode, node.name);
-            case 263 /* NamespaceImport */:
+            case 264 /* NamespaceImport */:
                 return visitNode(cbNode, node.name);
-            case 269 /* NamespaceExport */:
+            case 270 /* NamespaceExport */:
                 return visitNode(cbNode, node.name);
-            case 264 /* NamedImports */:
-            case 268 /* NamedExports */:
+            case 265 /* NamedImports */:
+            case 269 /* NamedExports */:
                 return visitNodes(cbNode, cbNodes, node.elements);
-            case 267 /* ExportDeclaration */:
+            case 268 /* ExportDeclaration */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.exportClause) ||
                     visitNode(cbNode, node.moduleSpecifier);
-            case 265 /* ImportSpecifier */:
-            case 270 /* ExportSpecifier */:
+            case 266 /* ImportSpecifier */:
+            case 271 /* ExportSpecifier */:
                 return visitNode(cbNode, node.propertyName) ||
                     visitNode(cbNode, node.name);
-            case 266 /* ExportAssignment */:
+            case 267 /* ExportAssignment */:
                 return visitNodes(cbNode, cbNodes, node.decorators) ||
                     visitNodes(cbNode, cbNodes, node.modifiers) ||
                     visitNode(cbNode, node.expression);
-            case 218 /* TemplateExpression */:
+            case 219 /* TemplateExpression */:
                 return visitNode(cbNode, node.head) || visitNodes(cbNode, cbNodes, node.templateSpans);
-            case 228 /* TemplateSpan */:
+            case 229 /* TemplateSpan */:
                 return visitNode(cbNode, node.expression) || visitNode(cbNode, node.literal);
-            case 193 /* TemplateLiteralType */:
+            case 194 /* TemplateLiteralType */:
                 return visitNode(cbNode, node.head) || visitNodes(cbNode, cbNodes, node.templateSpans);
-            case 194 /* TemplateLiteralTypeSpan */:
+            case 195 /* TemplateLiteralTypeSpan */:
                 return visitNode(cbNode, node.type) || visitNode(cbNode, node.literal);
-            case 158 /* ComputedPropertyName */:
+            case 159 /* ComputedPropertyName */:
                 return visitNode(cbNode, node.expression);
-            case 286 /* HeritageClause */:
+            case 287 /* HeritageClause */:
                 return visitNodes(cbNode, cbNodes, node.types);
-            case 223 /* ExpressionWithTypeArguments */:
+            case 224 /* ExpressionWithTypeArguments */:
                 return visitNode(cbNode, node.expression) ||
                     visitNodes(cbNode, cbNodes, node.typeArguments);
-            case 272 /* ExternalModuleReference */:
+            case 273 /* ExternalModuleReference */:
                 return visitNode(cbNode, node.expression);
-            case 271 /* MissingDeclaration */:
+            case 272 /* MissingDeclaration */:
                 return visitNodes(cbNode, cbNodes, node.decorators);
-            case 337 /* CommaListExpression */:
+            case 341 /* CommaListExpression */:
                 return visitNodes(cbNode, cbNodes, node.elements);
-            case 273 /* JsxElement */:
+            case 274 /* JsxElement */:
                 return visitNode(cbNode, node.openingElement) ||
                     visitNodes(cbNode, cbNodes, node.children) ||
                     visitNode(cbNode, node.closingElement);
-            case 277 /* JsxFragment */:
+            case 278 /* JsxFragment */:
                 return visitNode(cbNode, node.openingFragment) ||
                     visitNodes(cbNode, cbNodes, node.children) ||
                     visitNode(cbNode, node.closingFragment);
-            case 274 /* JsxSelfClosingElement */:
-            case 275 /* JsxOpeningElement */:
+            case 275 /* JsxSelfClosingElement */:
+            case 276 /* JsxOpeningElement */:
                 return visitNode(cbNode, node.tagName) ||
                     visitNodes(cbNode, cbNodes, node.typeArguments) ||
                     visitNode(cbNode, node.attributes);
-            case 281 /* JsxAttributes */:
+            case 282 /* JsxAttributes */:
                 return visitNodes(cbNode, cbNodes, node.properties);
-            case 280 /* JsxAttribute */:
+            case 281 /* JsxAttribute */:
                 return visitNode(cbNode, node.name) ||
                     visitNode(cbNode, node.initializer);
-            case 282 /* JsxSpreadAttribute */:
+            case 283 /* JsxSpreadAttribute */:
                 return visitNode(cbNode, node.expression);
-            case 283 /* JsxExpression */:
+            case 284 /* JsxExpression */:
                 return visitNode(cbNode, node.dotDotDotToken) ||
                     visitNode(cbNode, node.expression);
-            case 276 /* JsxClosingElement */:
+            case 277 /* JsxClosingElement */:
                 return visitNode(cbNode, node.tagName);
-            case 180 /* OptionalType */:
-            case 181 /* RestType */:
-            case 301 /* JSDocTypeExpression */:
-            case 306 /* JSDocNonNullableType */:
-            case 305 /* JSDocNullableType */:
-            case 307 /* JSDocOptionalType */:
-            case 309 /* JSDocVariadicType */:
+            case 181 /* OptionalType */:
+            case 182 /* RestType */:
+            case 302 /* JSDocTypeExpression */:
+            case 307 /* JSDocNonNullableType */:
+            case 306 /* JSDocNullableType */:
+            case 308 /* JSDocOptionalType */:
+            case 310 /* JSDocVariadicType */:
                 return visitNode(cbNode, node.type);
-            case 308 /* JSDocFunctionType */:
+            case 309 /* JSDocFunctionType */:
                 return visitNodes(cbNode, cbNodes, node.parameters) ||
                     visitNode(cbNode, node.type);
-            case 311 /* JSDocComment */:
-                return visitNodes(cbNode, cbNodes, node.tags);
-            case 332 /* JSDocSeeTag */:
+            case 312 /* JSDocComment */:
+                return (typeof node.comment === "string" ? undefined : visitNodes(cbNode, cbNodes, node.comment))
+                    || visitNodes(cbNode, cbNodes, node.tags);
+            case 336 /* JSDocSeeTag */:
                 return visitNode(cbNode, node.tagName) ||
-                    visitNode(cbNode, node.name);
-            case 302 /* JSDocNameReference */:
+                    visitNode(cbNode, node.name) ||
+                    (typeof node.comment === "string" ? undefined : visitNodes(cbNode, cbNodes, node.comment));
+            case 303 /* JSDocNameReference */:
                 return visitNode(cbNode, node.name);
-            case 326 /* JSDocParameterTag */:
-            case 333 /* JSDocPropertyTag */:
+            case 330 /* JSDocParameterTag */:
+            case 337 /* JSDocPropertyTag */:
                 return visitNode(cbNode, node.tagName) ||
                     (node.isNameFirst
                         ? visitNode(cbNode, node.name) ||
-                            visitNode(cbNode, node.typeExpression)
+                            visitNode(cbNode, node.typeExpression) ||
+                            (typeof node.comment === "string" ? undefined : visitNodes(cbNode, cbNodes, node.comment))
                         : visitNode(cbNode, node.typeExpression) ||
-                            visitNode(cbNode, node.name));
-            case 317 /* JSDocAuthorTag */:
-                return visitNode(cbNode, node.tagName);
-            case 316 /* JSDocImplementsTag */:
+                            visitNode(cbNode, node.name)) ||
+                    (typeof node.comment === "string" ? undefined : visitNodes(cbNode, cbNodes, node.comment));
+            case 320 /* JSDocAuthorTag */:
                 return visitNode(cbNode, node.tagName) ||
-                    visitNode(cbNode, node.class);
-            case 315 /* JSDocAugmentsTag */:
+                    (typeof node.comment === "string" ? undefined : visitNodes(cbNode, cbNodes, node.comment));
+            case 319 /* JSDocImplementsTag */:
                 return visitNode(cbNode, node.tagName) ||
-                    visitNode(cbNode, node.class);
-            case 330 /* JSDocTemplateTag */:
+                    visitNode(cbNode, node.class) ||
+                    (typeof node.comment === "string" ? undefined : visitNodes(cbNode, cbNodes, node.comment));
+            case 318 /* JSDocAugmentsTag */:
+                return visitNode(cbNode, node.tagName) ||
+                    visitNode(cbNode, node.class) ||
+                    (typeof node.comment === "string" ? undefined : visitNodes(cbNode, cbNodes, node.comment));
+            case 334 /* JSDocTemplateTag */:
                 return visitNode(cbNode, node.tagName) ||
                     visitNode(cbNode, node.constraint) ||
-                    visitNodes(cbNode, cbNodes, node.typeParameters);
-            case 331 /* JSDocTypedefTag */:
+                    visitNodes(cbNode, cbNodes, node.typeParameters) ||
+                    (typeof node.comment === "string" ? undefined : visitNodes(cbNode, cbNodes, node.comment));
+            case 335 /* JSDocTypedefTag */:
                 return visitNode(cbNode, node.tagName) ||
                     (node.typeExpression &&
-                        node.typeExpression.kind === 301 /* JSDocTypeExpression */
+                        node.typeExpression.kind === 302 /* JSDocTypeExpression */
                         ? visitNode(cbNode, node.typeExpression) ||
-                            visitNode(cbNode, node.fullName)
+                            visitNode(cbNode, node.fullName) ||
+                            (typeof node.comment === "string" ? undefined : visitNodes(cbNode, cbNodes, node.comment))
                         : visitNode(cbNode, node.fullName) ||
-                            visitNode(cbNode, node.typeExpression));
-            case 324 /* JSDocCallbackTag */:
+                            visitNode(cbNode, node.typeExpression)) ||
+                    (typeof node.comment === "string" ? undefined : visitNodes(cbNode, cbNodes, node.comment));
+            case 328 /* JSDocCallbackTag */:
                 return visitNode(cbNode, node.tagName) ||
                     visitNode(cbNode, node.fullName) ||
-                    visitNode(cbNode, node.typeExpression);
-            case 327 /* JSDocReturnTag */:
-            case 329 /* JSDocTypeTag */:
-            case 328 /* JSDocThisTag */:
-            case 325 /* JSDocEnumTag */:
+                    visitNode(cbNode, node.typeExpression) ||
+                    (typeof node.comment === "string" ? undefined : visitNodes(cbNode, cbNodes, node.comment));
+            case 331 /* JSDocReturnTag */:
+            case 333 /* JSDocTypeTag */:
+            case 332 /* JSDocThisTag */:
+            case 329 /* JSDocEnumTag */:
                 return visitNode(cbNode, node.tagName) ||
-                    visitNode(cbNode, node.typeExpression);
-            case 313 /* JSDocSignature */:
+                    visitNode(cbNode, node.typeExpression) ||
+                    (typeof node.comment === "string" ? undefined : visitNodes(cbNode, cbNodes, node.comment));
+            case 315 /* JSDocSignature */:
                 return ts.forEach(node.typeParameters, cbNode) ||
                     ts.forEach(node.parameters, cbNode) ||
                     visitNode(cbNode, node.type);
-            case 312 /* JSDocTypeLiteral */:
+            case 316 /* JSDocLink */:
+                return visitNode(cbNode, node.name);
+            case 314 /* JSDocTypeLiteral */:
                 return ts.forEach(node.jsDocPropertyTags, cbNode);
-            case 314 /* JSDocTag */:
-            case 319 /* JSDocClassTag */:
-            case 320 /* JSDocPublicTag */:
-            case 321 /* JSDocPrivateTag */:
-            case 322 /* JSDocProtectedTag */:
-            case 323 /* JSDocReadonlyTag */:
-                return visitNode(cbNode, node.tagName);
-            case 336 /* PartiallyEmittedExpression */:
+            case 317 /* JSDocTag */:
+            case 322 /* JSDocClassTag */:
+            case 323 /* JSDocPublicTag */:
+            case 324 /* JSDocPrivateTag */:
+            case 325 /* JSDocProtectedTag */:
+            case 326 /* JSDocReadonlyTag */:
+            case 321 /* JSDocDeprecatedTag */:
+                return visitNode(cbNode, node.tagName)
+                    || (typeof node.comment === "string" ? undefined : visitNodes(cbNode, cbNodes, node.comment));
+            case 340 /* PartiallyEmittedExpression */:
                 return visitNode(cbNode, node.expression);
         }
     }
@@ -28752,7 +29568,7 @@ var ts;
                         continue;
                     return res;
                 }
-                if (current.kind >= 157 /* FirstNode */) {
+                if (current.kind >= 158 /* FirstNode */) {
                     // add children in reverse order to the queue, so popping gives the first child
                     for (var _i = 0, _a = gatherPossibleChildren(current); _i < _a.length; _i++) {
                         var child = _a[_i];
@@ -28969,11 +29785,12 @@ var ts;
         // attached to the EOF token.
         var parseErrorBeforeNextFinishedNode = false;
         function parseSourceFile(fileName, sourceText, languageVersion, syntaxCursor, setParentNodes, scriptKind) {
+            var _a;
             if (setParentNodes === void 0) { setParentNodes = false; }
             scriptKind = ts.ensureScriptKind(fileName, scriptKind);
             if (scriptKind === 6 /* JSON */) {
                 var result_3 = parseJsonText(fileName, sourceText, languageVersion, syntaxCursor, setParentNodes);
-                ts.convertToObjectWorker(result_3, result_3.parseDiagnostics, /*returnValue*/ false, /*knownRootOptions*/ undefined, /*jsonConversionNotifier*/ undefined);
+                ts.convertToObjectWorker(result_3, (_a = result_3.statements[0]) === null || _a === void 0 ? void 0 : _a.expression, result_3.parseDiagnostics, /*returnValue*/ false, /*knownRootOptions*/ undefined, /*jsonConversionNotifier*/ undefined);
                 result_3.referencedFiles = ts.emptyArray;
                 result_3.typeReferenceDirectives = ts.emptyArray;
                 result_3.libReferenceDirectives = ts.emptyArray;
@@ -29013,35 +29830,54 @@ var ts;
                 endOfFileToken = parseTokenNode();
             }
             else {
-                var expression = void 0;
-                switch (token()) {
-                    case 22 /* OpenBracketToken */:
-                        expression = parseArrayLiteralExpression();
-                        break;
-                    case 109 /* TrueKeyword */:
-                    case 94 /* FalseKeyword */:
-                    case 103 /* NullKeyword */:
-                        expression = parseTokenNode();
-                        break;
-                    case 40 /* MinusToken */:
-                        if (lookAhead(function () { return nextToken() === 8 /* NumericLiteral */ && nextToken() !== 58 /* ColonToken */; })) {
-                            expression = parsePrefixUnaryExpression();
-                        }
-                        else {
-                            expression = parseObjectLiteralExpression();
-                        }
-                        break;
-                    case 8 /* NumericLiteral */:
-                    case 10 /* StringLiteral */:
-                        if (lookAhead(function () { return nextToken() !== 58 /* ColonToken */; })) {
-                            expression = parseLiteralNode();
+                // Loop and synthesize an ArrayLiteralExpression if there are more than
+                // one top-level expressions to ensure all input text is consumed.
+                var expressions = void 0;
+                while (token() !== 1 /* EndOfFileToken */) {
+                    var expression_1 = void 0;
+                    switch (token()) {
+                        case 22 /* OpenBracketToken */:
+                            expression_1 = parseArrayLiteralExpression();
+                            break;
+                        case 109 /* TrueKeyword */:
+                        case 94 /* FalseKeyword */:
+                        case 103 /* NullKeyword */:
+                            expression_1 = parseTokenNode();
                             break;
+                        case 40 /* MinusToken */:
+                            if (lookAhead(function () { return nextToken() === 8 /* NumericLiteral */ && nextToken() !== 58 /* ColonToken */; })) {
+                                expression_1 = parsePrefixUnaryExpression();
+                            }
+                            else {
+                                expression_1 = parseObjectLiteralExpression();
+                            }
+                            break;
+                        case 8 /* NumericLiteral */:
+                        case 10 /* StringLiteral */:
+                            if (lookAhead(function () { return nextToken() !== 58 /* ColonToken */; })) {
+                                expression_1 = parseLiteralNode();
+                                break;
+                            }
+                        // falls through
+                        default:
+                            expression_1 = parseObjectLiteralExpression();
+                            break;
+                    }
+                    // Error recovery: collect multiple top-level expressions
+                    if (expressions && ts.isArray(expressions)) {
+                        expressions.push(expression_1);
+                    }
+                    else if (expressions) {
+                        expressions = [expressions, expression_1];
+                    }
+                    else {
+                        expressions = expression_1;
+                        if (token() !== 1 /* EndOfFileToken */) {
+                            parseErrorAtCurrentToken(ts.Diagnostics.Unexpected_token);
                         }
-                    // falls through
-                    default:
-                        expression = parseObjectLiteralExpression();
-                        break;
+                    }
                 }
+                var expression = ts.isArray(expressions) ? finishNode(factory.createArrayLiteralExpression(expressions), pos) : ts.Debug.checkDefined(expressions);
                 var statement = factory.createExpressionStatement(expression);
                 finishNode(statement, pos);
                 statements = createNodeArray([statement], pos);
@@ -29236,7 +30072,7 @@ var ts;
             return factory.updateSourceFile(sourceFile, ts.setTextRange(factory.createNodeArray(statements), sourceFile.statements));
             function containsPossibleTopLevelAwait(node) {
                 return !(node.flags & 32768 /* AwaitContext */)
-                    && !!(node.transformFlags & 8388608 /* ContainsPossibleTopLevelAwait */);
+                    && !!(node.transformFlags & 16777216 /* ContainsPossibleTopLevelAwait */);
             }
             function findNextStatementWithAwait(statements, start) {
                 for (var i = start; i < statements.length; i++) {
@@ -29277,7 +30113,7 @@ var ts;
             ts.setTextRangePosWidth(sourceFile, 0, sourceText.length);
             setExternalModuleIndicator(sourceFile);
             // If we parsed this as an external module, it may contain top-level await
-            if (!isDeclarationFile && isExternalModule(sourceFile) && sourceFile.transformFlags & 8388608 /* ContainsPossibleTopLevelAwait */) {
+            if (!isDeclarationFile && isExternalModule(sourceFile) && sourceFile.transformFlags & 16777216 /* ContainsPossibleTopLevelAwait */) {
                 sourceFile = reparseTopLevelAwait(sourceFile);
             }
             sourceFile.text = sourceText;
@@ -29648,7 +30484,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 === 271 /* MissingDeclaration */ ? factory.createMissingDeclaration() :
+                            kind === 272 /* MissingDeclaration */ ? factory.createMissingDeclaration() :
                                 factory.createToken(kind);
             return finishNode(result, pos);
         }
@@ -30035,8 +30871,7 @@ var ts;
             var listPos = getNodePos();
             while (!isListTerminator(kind)) {
                 if (isListElement(kind, /*inErrorRecovery*/ false)) {
-                    var element = parseListElement(kind, parseElement);
-                    list.push(element);
+                    list.push(parseListElement(kind, parseElement));
                     continue;
                 }
                 if (abortParsingListOrMoveToNextToken(kind)) {
@@ -30186,14 +31021,14 @@ var ts;
         function isReusableClassMember(node) {
             if (node) {
                 switch (node.kind) {
-                    case 166 /* Constructor */:
-                    case 171 /* IndexSignature */:
-                    case 167 /* GetAccessor */:
-                    case 168 /* SetAccessor */:
-                    case 163 /* PropertyDeclaration */:
-                    case 229 /* SemicolonClassElement */:
+                    case 167 /* Constructor */:
+                    case 172 /* IndexSignature */:
+                    case 168 /* GetAccessor */:
+                    case 169 /* SetAccessor */:
+                    case 164 /* PropertyDeclaration */:
+                    case 230 /* SemicolonClassElement */:
                         return true;
-                    case 165 /* MethodDeclaration */:
+                    case 166 /* 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.
@@ -30208,8 +31043,8 @@ var ts;
         function isReusableSwitchClause(node) {
             if (node) {
                 switch (node.kind) {
-                    case 284 /* CaseClause */:
-                    case 285 /* DefaultClause */:
+                    case 285 /* CaseClause */:
+                    case 286 /* DefaultClause */:
                         return true;
                 }
             }
@@ -30218,58 +31053,58 @@ var ts;
         function isReusableStatement(node) {
             if (node) {
                 switch (node.kind) {
-                    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 */:
+                    case 252 /* FunctionDeclaration */:
+                    case 233 /* VariableStatement */:
+                    case 231 /* Block */:
+                    case 235 /* IfStatement */:
+                    case 234 /* ExpressionStatement */:
+                    case 247 /* ThrowStatement */:
+                    case 243 /* ReturnStatement */:
+                    case 245 /* SwitchStatement */:
+                    case 242 /* BreakStatement */:
+                    case 241 /* ContinueStatement */:
+                    case 239 /* ForInStatement */:
+                    case 240 /* ForOfStatement */:
+                    case 238 /* ForStatement */:
+                    case 237 /* WhileStatement */:
+                    case 244 /* WithStatement */:
+                    case 232 /* EmptyStatement */:
+                    case 248 /* TryStatement */:
+                    case 246 /* LabeledStatement */:
+                    case 236 /* DoStatement */:
+                    case 249 /* DebuggerStatement */:
+                    case 262 /* ImportDeclaration */:
+                    case 261 /* ImportEqualsDeclaration */:
+                    case 268 /* ExportDeclaration */:
+                    case 267 /* ExportAssignment */:
+                    case 257 /* ModuleDeclaration */:
+                    case 253 /* ClassDeclaration */:
+                    case 254 /* InterfaceDeclaration */:
+                    case 256 /* EnumDeclaration */:
+                    case 255 /* TypeAliasDeclaration */:
                         return true;
                 }
             }
             return false;
         }
         function isReusableEnumMember(node) {
-            return node.kind === 291 /* EnumMember */;
+            return node.kind === 292 /* EnumMember */;
         }
         function isReusableTypeMember(node) {
             if (node) {
                 switch (node.kind) {
-                    case 170 /* ConstructSignature */:
-                    case 164 /* MethodSignature */:
-                    case 171 /* IndexSignature */:
-                    case 162 /* PropertySignature */:
-                    case 169 /* CallSignature */:
+                    case 171 /* ConstructSignature */:
+                    case 165 /* MethodSignature */:
+                    case 172 /* IndexSignature */:
+                    case 163 /* PropertySignature */:
+                    case 170 /* CallSignature */:
                         return true;
                 }
             }
             return false;
         }
         function isReusableVariableDeclaration(node) {
-            if (node.kind !== 249 /* VariableDeclaration */) {
+            if (node.kind !== 250 /* VariableDeclaration */) {
                 return false;
             }
             // Very subtle incremental parsing bug.  Consider the following code:
@@ -30290,7 +31125,7 @@ var ts;
             return variableDeclarator.initializer === undefined;
         }
         function isReusableParameter(node) {
-            if (node.kind !== 160 /* Parameter */) {
+            if (node.kind !== 161 /* Parameter */) {
                 return false;
             }
             // See the comment in isReusableVariableDeclaration for why we do this.
@@ -30571,14 +31406,14 @@ var ts;
         // If true, we should abort parsing an error function.
         function typeHasArrowFunctionBlockingParseError(node) {
             switch (node.kind) {
-                case 173 /* TypeReference */:
+                case 174 /* TypeReference */:
                     return ts.nodeIsMissing(node.typeName);
-                case 174 /* FunctionType */:
-                case 175 /* ConstructorType */: {
+                case 175 /* FunctionType */:
+                case 176 /* ConstructorType */: {
                     var _a = node, parameters = _a.parameters, type = _a.type;
                     return isMissingList(parameters) || typeHasArrowFunctionBlockingParseError(type);
                 }
-                case 186 /* ParenthesizedType */:
+                case 187 /* ParenthesizedType */:
                     return typeHasArrowFunctionBlockingParseError(node.type);
                 default:
                     return false;
@@ -30759,19 +31594,21 @@ var ts;
         function parseParameterWorker(inOuterAwaitContext) {
             var pos = getNodePos();
             var hasJSDoc = hasPrecedingJSDocComment();
+            // FormalParameter [Yield,Await]:
+            //      BindingElement[?Yield,?Await]
+            // Decorators are parsed in the outer [Await] context, the rest of the parameter is parsed in the function's [Await] context.
+            var decorators = inOuterAwaitContext ? doInAwaitContext(parseDecorators) : parseDecorators();
             if (token() === 107 /* ThisKeyword */) {
-                var node_1 = factory.createParameterDeclaration(
-                /*decorators*/ undefined, 
+                var node_1 = factory.createParameterDeclaration(decorators, 
                 /*modifiers*/ undefined, 
                 /*dotDotDotToken*/ undefined, createIdentifier(/*isIdentifier*/ true), 
                 /*questionToken*/ undefined, parseTypeAnnotation(), 
                 /*initializer*/ undefined);
+                if (decorators) {
+                    parseErrorAtRange(decorators[0], ts.Diagnostics.Decorators_may_not_be_applied_to_this_parameters);
+                }
                 return withJSDoc(finishNode(node_1, pos), hasJSDoc);
             }
-            // FormalParameter [Yield,Await]:
-            //      BindingElement[?Yield,?Await]
-            // Decorators are parsed in the outer [Await] context, the rest of the parameter is parsed in the function's [Await] context.
-            var decorators = inOuterAwaitContext ? doInAwaitContext(parseDecorators) : parseDecorators();
             var savedTopLevel = topLevel;
             topLevel = false;
             var modifiers = parseModifiers();
@@ -30858,14 +31695,14 @@ var ts;
         function parseSignatureMember(kind) {
             var pos = getNodePos();
             var hasJSDoc = hasPrecedingJSDocComment();
-            if (kind === 170 /* ConstructSignature */) {
+            if (kind === 171 /* ConstructSignature */) {
                 parseExpected(102 /* NewKeyword */);
             }
             var typeParameters = parseTypeParameters();
             var parameters = parseParameters(4 /* Type */);
             var type = parseReturnType(58 /* ColonToken */, /*isType*/ true);
             parseTypeMemberSemicolon();
-            var node = kind === 169 /* CallSignature */
+            var node = kind === 170 /* CallSignature */
                 ? factory.createCallSignature(typeParameters, parameters, type)
                 : factory.createConstructSignature(typeParameters, parameters, type);
             return withJSDoc(finishNode(node, pos), hasJSDoc);
@@ -30956,7 +31793,10 @@ var ts;
         }
         function isTypeMemberStart() {
             // Return true if we have the start of a signature member
-            if (token() === 20 /* OpenParenToken */ || token() === 29 /* LessThanToken */) {
+            if (token() === 20 /* OpenParenToken */ ||
+                token() === 29 /* LessThanToken */ ||
+                token() === 134 /* GetKeyword */ ||
+                token() === 146 /* SetKeyword */) {
                 return true;
             }
             var idToken = false;
@@ -30988,14 +31828,20 @@ var ts;
         }
         function parseTypeMember() {
             if (token() === 20 /* OpenParenToken */ || token() === 29 /* LessThanToken */) {
-                return parseSignatureMember(169 /* CallSignature */);
+                return parseSignatureMember(170 /* CallSignature */);
             }
             if (token() === 102 /* NewKeyword */ && lookAhead(nextTokenIsOpenParenOrLessThan)) {
-                return parseSignatureMember(170 /* ConstructSignature */);
+                return parseSignatureMember(171 /* ConstructSignature */);
             }
             var pos = getNodePos();
             var hasJSDoc = hasPrecedingJSDocComment();
             var modifiers = parseModifiers();
+            if (parseContextualModifier(134 /* GetKeyword */)) {
+                return parseAccessorDeclaration(pos, hasJSDoc, /*decorators*/ undefined, modifiers, 168 /* GetAccessor */);
+            }
+            if (parseContextualModifier(146 /* SetKeyword */)) {
+                return parseAccessorDeclaration(pos, hasJSDoc, /*decorators*/ undefined, modifiers, 169 /* SetAccessor */);
+            }
             if (isIndexSignature()) {
                 return parseIndexSignatureDeclaration(pos, hasJSDoc, /*decorators*/ undefined, modifiers);
             }
@@ -32028,7 +32874,7 @@ var ts;
             return parseBinaryExpressionRest(precedence, leftOperand, pos);
         }
         function isInOrOfKeyword(t) {
-            return t === 100 /* InKeyword */ || t === 156 /* OfKeyword */;
+            return t === 100 /* InKeyword */ || t === 157 /* OfKeyword */;
         }
         function parseBinaryExpressionRest(precedence, leftOperand, pos) {
             while (true) {
@@ -32168,7 +33014,7 @@ var ts;
             if (token() === 42 /* AsteriskAsteriskToken */) {
                 var pos = ts.skipTrivia(sourceText, simpleUnaryExpression.pos);
                 var end = simpleUnaryExpression.end;
-                if (simpleUnaryExpression.kind === 206 /* TypeAssertionExpression */) {
+                if (simpleUnaryExpression.kind === 207 /* 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 {
@@ -32419,7 +33265,7 @@ var ts;
             var pos = getNodePos();
             var opening = parseJsxOpeningOrSelfClosingElementOrOpeningFragment(inExpressionContext);
             var result;
-            if (opening.kind === 275 /* JsxOpeningElement */) {
+            if (opening.kind === 276 /* JsxOpeningElement */) {
                 var children = parseJsxChildren(opening);
                 var closingElement = parseJsxClosingElement(inExpressionContext);
                 if (!tagNamesAreEquivalent(opening.tagName, closingElement.tagName)) {
@@ -32427,11 +33273,11 @@ var ts;
                 }
                 result = finishNode(factory.createJsxElement(opening, children, closingElement), pos);
             }
-            else if (opening.kind === 278 /* JsxOpeningFragment */) {
+            else if (opening.kind === 279 /* JsxOpeningFragment */) {
                 result = finishNode(factory.createJsxFragment(opening, parseJsxChildren(opening), parseJsxClosingFragment(inExpressionContext)), pos);
             }
             else {
-                ts.Debug.assert(opening.kind === 274 /* JsxSelfClosingElement */);
+                ts.Debug.assert(opening.kind === 275 /* JsxSelfClosingElement */);
                 // Nothing else to do for self-closing elements
                 result = opening;
             }
@@ -32931,10 +33777,10 @@ var ts;
             var decorators = parseDecorators();
             var modifiers = parseModifiers();
             if (parseContextualModifier(134 /* GetKeyword */)) {
-                return parseAccessorDeclaration(pos, hasJSDoc, decorators, modifiers, 167 /* GetAccessor */);
+                return parseAccessorDeclaration(pos, hasJSDoc, decorators, modifiers, 168 /* GetAccessor */);
             }
             if (parseContextualModifier(146 /* SetKeyword */)) {
-                return parseAccessorDeclaration(pos, hasJSDoc, decorators, modifiers, 168 /* SetAccessor */);
+                return parseAccessorDeclaration(pos, hasJSDoc, decorators, modifiers, 169 /* SetAccessor */);
             }
             var asteriskToken = parseOptionalToken(41 /* AsteriskToken */);
             var tokenIsIdentifier = isIdentifier();
@@ -33052,6 +33898,7 @@ var ts;
         // STATEMENTS
         function parseBlock(ignoreMissingOpenBrace, diagnosticMessage) {
             var pos = getNodePos();
+            var hasJSDoc = hasPrecedingJSDocComment();
             var openBracePosition = scanner.getTokenPos();
             if (parseExpected(18 /* OpenBraceToken */, diagnosticMessage) || ignoreMissingOpenBrace) {
                 var multiLine = scanner.hasPrecedingLineBreak();
@@ -33062,11 +33909,16 @@ var ts;
                         ts.addRelatedInfo(lastError, ts.createDetachedDiagnostic(fileName, openBracePosition, 1, ts.Diagnostics.The_parser_expected_to_find_a_to_match_the_token_here));
                     }
                 }
-                return finishNode(factory.createBlock(statements, multiLine), pos);
+                var result = withJSDoc(finishNode(factory.createBlock(statements, multiLine), pos), hasJSDoc);
+                if (token() === 62 /* EqualsToken */) {
+                    parseErrorAtCurrentToken(ts.Diagnostics.Declaration_or_statement_expected_This_follows_a_block_of_statements_so_if_you_intended_to_write_a_destructuring_assignment_you_might_need_to_wrap_the_the_whole_assignment_in_parentheses);
+                    nextToken();
+                }
+                return result;
             }
             else {
                 var statements = createMissingList();
-                return finishNode(factory.createBlock(statements, /*multiLine*/ undefined), pos);
+                return withJSDoc(finishNode(factory.createBlock(statements, /*multiLine*/ undefined), pos), hasJSDoc);
             }
         }
         function parseFunctionBlock(flags, diagnosticMessage) {
@@ -33093,21 +33945,24 @@ var ts;
         }
         function parseEmptyStatement() {
             var pos = getNodePos();
+            var hasJSDoc = hasPrecedingJSDocComment();
             parseExpected(26 /* SemicolonToken */);
-            return finishNode(factory.createEmptyStatement(), pos);
+            return withJSDoc(finishNode(factory.createEmptyStatement(), pos), hasJSDoc);
         }
         function parseIfStatement() {
             var pos = getNodePos();
+            var hasJSDoc = hasPrecedingJSDocComment();
             parseExpected(98 /* IfKeyword */);
             parseExpected(20 /* OpenParenToken */);
             var expression = allowInAnd(parseExpression);
             parseExpected(21 /* CloseParenToken */);
             var thenStatement = parseStatement();
             var elseStatement = parseOptional(90 /* ElseKeyword */) ? parseStatement() : undefined;
-            return finishNode(factory.createIfStatement(expression, thenStatement, elseStatement), pos);
+            return withJSDoc(finishNode(factory.createIfStatement(expression, thenStatement, elseStatement), pos), hasJSDoc);
         }
         function parseDoStatement() {
             var pos = getNodePos();
+            var hasJSDoc = hasPrecedingJSDocComment();
             parseExpected(89 /* DoKeyword */);
             var statement = parseStatement();
             parseExpected(114 /* WhileKeyword */);
@@ -33119,19 +33974,21 @@ var ts;
             // spec but allowed in consensus reality. Approved -- this is the de-facto standard whereby
             //  do;while(0)x will have a semicolon inserted before x.
             parseOptional(26 /* SemicolonToken */);
-            return finishNode(factory.createDoStatement(statement, expression), pos);
+            return withJSDoc(finishNode(factory.createDoStatement(statement, expression), pos), hasJSDoc);
         }
         function parseWhileStatement() {
             var pos = getNodePos();
+            var hasJSDoc = hasPrecedingJSDocComment();
             parseExpected(114 /* WhileKeyword */);
             parseExpected(20 /* OpenParenToken */);
             var expression = allowInAnd(parseExpression);
             parseExpected(21 /* CloseParenToken */);
             var statement = parseStatement();
-            return finishNode(factory.createWhileStatement(expression, statement), pos);
+            return withJSDoc(finishNode(factory.createWhileStatement(expression, statement), pos), hasJSDoc);
         }
         function parseForOrForInOrForOfStatement() {
             var pos = getNodePos();
+            var hasJSDoc = hasPrecedingJSDocComment();
             parseExpected(96 /* ForKeyword */);
             var awaitToken = parseOptionalToken(130 /* AwaitKeyword */);
             parseExpected(20 /* OpenParenToken */);
@@ -33145,7 +34002,7 @@ var ts;
                 }
             }
             var node;
-            if (awaitToken ? parseExpected(156 /* OfKeyword */) : parseOptional(156 /* OfKeyword */)) {
+            if (awaitToken ? parseExpected(157 /* OfKeyword */) : parseOptional(157 /* OfKeyword */)) {
                 var expression = allowInAnd(parseAssignmentExpressionOrHigher);
                 parseExpected(21 /* CloseParenToken */);
                 node = factory.createForOfStatement(awaitToken, initializer, expression, parseStatement());
@@ -33167,33 +34024,36 @@ var ts;
                 parseExpected(21 /* CloseParenToken */);
                 node = factory.createForStatement(initializer, condition, incrementor, parseStatement());
             }
-            return finishNode(node, pos);
+            return withJSDoc(finishNode(node, pos), hasJSDoc);
         }
         function parseBreakOrContinueStatement(kind) {
             var pos = getNodePos();
-            parseExpected(kind === 241 /* BreakStatement */ ? 80 /* BreakKeyword */ : 85 /* ContinueKeyword */);
+            var hasJSDoc = hasPrecedingJSDocComment();
+            parseExpected(kind === 242 /* BreakStatement */ ? 80 /* BreakKeyword */ : 85 /* ContinueKeyword */);
             var label = canParseSemicolon() ? undefined : parseIdentifier();
             parseSemicolon();
-            var node = kind === 241 /* BreakStatement */
+            var node = kind === 242 /* BreakStatement */
                 ? factory.createBreakStatement(label)
                 : factory.createContinueStatement(label);
-            return finishNode(node, pos);
+            return withJSDoc(finishNode(node, pos), hasJSDoc);
         }
         function parseReturnStatement() {
             var pos = getNodePos();
+            var hasJSDoc = hasPrecedingJSDocComment();
             parseExpected(104 /* ReturnKeyword */);
             var expression = canParseSemicolon() ? undefined : allowInAnd(parseExpression);
             parseSemicolon();
-            return finishNode(factory.createReturnStatement(expression), pos);
+            return withJSDoc(finishNode(factory.createReturnStatement(expression), pos), hasJSDoc);
         }
         function parseWithStatement() {
             var pos = getNodePos();
+            var hasJSDoc = hasPrecedingJSDocComment();
             parseExpected(115 /* WithKeyword */);
             parseExpected(20 /* OpenParenToken */);
             var expression = allowInAnd(parseExpression);
             parseExpected(21 /* CloseParenToken */);
             var statement = doInsideOfContext(16777216 /* InWithStatement */, parseStatement);
-            return finishNode(factory.createWithStatement(expression, statement), pos);
+            return withJSDoc(finishNode(factory.createWithStatement(expression, statement), pos), hasJSDoc);
         }
         function parseCaseClause() {
             var pos = getNodePos();
@@ -33222,17 +34082,19 @@ var ts;
         }
         function parseSwitchStatement() {
             var pos = getNodePos();
+            var hasJSDoc = hasPrecedingJSDocComment();
             parseExpected(106 /* SwitchKeyword */);
             parseExpected(20 /* OpenParenToken */);
             var expression = allowInAnd(parseExpression);
             parseExpected(21 /* CloseParenToken */);
             var caseBlock = parseCaseBlock();
-            return finishNode(factory.createSwitchStatement(expression, caseBlock), pos);
+            return withJSDoc(finishNode(factory.createSwitchStatement(expression, caseBlock), pos), hasJSDoc);
         }
         function parseThrowStatement() {
             // ThrowStatement[Yield] :
             //      throw [no LineTerminator here]Expression[In, ?Yield];
             var pos = getNodePos();
+            var hasJSDoc = hasPrecedingJSDocComment();
             parseExpected(108 /* ThrowKeyword */);
             // Because of automatic semicolon insertion, we need to report error if this
             // throw could be terminated with a semicolon.  Note: we can't call 'parseExpression'
@@ -33245,11 +34107,12 @@ var ts;
                 expression = finishNode(factory.createIdentifier(""), getNodePos());
             }
             parseSemicolon();
-            return finishNode(factory.createThrowStatement(expression), pos);
+            return withJSDoc(finishNode(factory.createThrowStatement(expression), pos), hasJSDoc);
         }
         // TODO: Review for error recovery
         function parseTryStatement() {
             var pos = getNodePos();
+            var hasJSDoc = hasPrecedingJSDocComment();
             parseExpected(110 /* TryKeyword */);
             var tryBlock = parseBlock(/*ignoreMissingOpenBrace*/ false);
             var catchClause = token() === 82 /* CatchKeyword */ ? parseCatchClause() : undefined;
@@ -33260,7 +34123,7 @@ var ts;
                 parseExpected(95 /* FinallyKeyword */);
                 finallyBlock = parseBlock(/*ignoreMissingOpenBrace*/ false);
             }
-            return finishNode(factory.createTryStatement(tryBlock, catchClause, finallyBlock), pos);
+            return withJSDoc(finishNode(factory.createTryStatement(tryBlock, catchClause, finallyBlock), pos), hasJSDoc);
         }
         function parseCatchClause() {
             var pos = getNodePos();
@@ -33279,9 +34142,10 @@ var ts;
         }
         function parseDebuggerStatement() {
             var pos = getNodePos();
+            var hasJSDoc = hasPrecedingJSDocComment();
             parseExpected(86 /* DebuggerKeyword */);
             parseSemicolon();
-            return finishNode(factory.createDebuggerStatement(), pos);
+            return withJSDoc(finishNode(factory.createDebuggerStatement(), pos), hasJSDoc);
         }
         function parseExpressionOrLabeledStatement() {
             // Avoiding having to do the lookahead for a labeled statement by just trying to parse
@@ -33489,9 +34353,9 @@ var ts;
                 case 96 /* ForKeyword */:
                     return parseForOrForInOrForOfStatement();
                 case 85 /* ContinueKeyword */:
-                    return parseBreakOrContinueStatement(240 /* ContinueStatement */);
+                    return parseBreakOrContinueStatement(241 /* ContinueStatement */);
                 case 80 /* BreakKeyword */:
-                    return parseBreakOrContinueStatement(241 /* BreakStatement */);
+                    return parseBreakOrContinueStatement(242 /* BreakStatement */);
                 case 104 /* ReturnKeyword */:
                     return parseReturnStatement();
                 case 115 /* WithKeyword */:
@@ -33611,7 +34475,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(271 /* MissingDeclaration */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.Declaration_expected);
+                        var missing = createMissingNode(272 /* MissingDeclaration */, /*reportAtCurrentPosition*/ true, ts.Diagnostics.Declaration_expected);
                         ts.setTextRangePos(missing, pos);
                         missing.decorators = decorators;
                         missing.modifiers = modifiers;
@@ -33693,6 +34557,7 @@ var ts;
         }
         function parseVariableDeclaration(allowExclamation) {
             var pos = getNodePos();
+            var hasJSDoc = hasPrecedingJSDocComment();
             var name = parseIdentifierOrPattern(ts.Diagnostics.Private_identifiers_are_not_allowed_in_variable_declarations);
             var exclamationToken;
             if (allowExclamation && name.kind === 78 /* Identifier */ &&
@@ -33702,7 +34567,7 @@ var ts;
             var type = parseTypeAnnotation();
             var initializer = isInOrOfKeyword(token()) ? undefined : parseInitializer();
             var node = factory.createVariableDeclaration(name, exclamationToken, type, initializer);
-            return finishNode(node, pos);
+            return withJSDoc(finishNode(node, pos), hasJSDoc);
         }
         function parseVariableDeclarationList(inForStatementInitializer) {
             var pos = getNodePos();
@@ -33730,7 +34595,7 @@ var ts;
             // this context.
             // The checker will then give an error that there is an empty declaration list.
             var declarations;
-            if (token() === 156 /* OfKeyword */ && lookAhead(canFollowContextualOfKeyword)) {
+            if (token() === 157 /* OfKeyword */ && lookAhead(canFollowContextualOfKeyword)) {
                 declarations = createMissingList();
             }
             else {
@@ -33834,12 +34699,12 @@ var ts;
             var parameters = parseParameters(0 /* None */);
             var type = parseReturnType(58 /* ColonToken */, /*isType*/ false);
             var body = parseFunctionBlockOrSemicolon(0 /* None */);
-            var node = kind === 167 /* GetAccessor */
+            var node = kind === 168 /* 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 === 168 /* SetAccessor */)
+            if (type && node.kind === 169 /* SetAccessor */)
                 node.type = type;
             return withJSDoc(finishNode(node, pos), hasJSDoc);
         }
@@ -33982,10 +34847,10 @@ var ts;
             var decorators = parseDecorators();
             var modifiers = parseModifiers(/*permitInvalidConstAsModifier*/ true);
             if (parseContextualModifier(134 /* GetKeyword */)) {
-                return parseAccessorDeclaration(pos, hasJSDoc, decorators, modifiers, 167 /* GetAccessor */);
+                return parseAccessorDeclaration(pos, hasJSDoc, decorators, modifiers, 168 /* GetAccessor */);
             }
             if (parseContextualModifier(146 /* SetKeyword */)) {
-                return parseAccessorDeclaration(pos, hasJSDoc, decorators, modifiers, 168 /* SetAccessor */);
+                return parseAccessorDeclaration(pos, hasJSDoc, decorators, modifiers, 169 /* SetAccessor */);
             }
             if (token() === 132 /* ConstructorKeyword */ || token() === 10 /* StringLiteral */) {
                 var constructorDeclaration = tryParseConstructorDeclaration(pos, hasJSDoc, decorators, modifiers);
@@ -34024,10 +34889,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, 221 /* ClassExpression */);
+            return parseClassDeclarationOrExpression(getNodePos(), hasPrecedingJSDocComment(), /*decorators*/ undefined, /*modifiers*/ undefined, 222 /* ClassExpression */);
         }
         function parseClassDeclaration(pos, hasJSDoc, decorators, modifiers) {
-            return parseClassDeclarationOrExpression(pos, hasJSDoc, decorators, modifiers, 252 /* ClassDeclaration */);
+            return parseClassDeclarationOrExpression(pos, hasJSDoc, decorators, modifiers, 253 /* ClassDeclaration */);
         }
         function parseClassDeclarationOrExpression(pos, hasJSDoc, decorators, modifiers, kind) {
             var savedAwaitContext = inAwaitContext();
@@ -34049,7 +34914,7 @@ var ts;
                 members = createMissingList();
             }
             setAwaitContext(savedAwaitContext);
-            var node = kind === 252 /* ClassDeclaration */
+            var node = kind === 253 /* ClassDeclaration */
                 ? factory.createClassDeclaration(decorators, modifiers, name, typeParameters, heritageClauses, members)
                 : factory.createClassExpression(decorators, modifiers, name, typeParameters, heritageClauses, members);
             return withJSDoc(finishNode(node, pos), hasJSDoc);
@@ -34288,7 +35153,7 @@ var ts;
             var namedBindings;
             if (!identifier ||
                 parseOptional(27 /* CommaToken */)) {
-                namedBindings = token() === 41 /* AsteriskToken */ ? parseNamespaceImport() : parseNamedImportsOrExports(264 /* NamedImports */);
+                namedBindings = token() === 41 /* AsteriskToken */ ? parseNamespaceImport() : parseNamedImportsOrExports(265 /* NamedImports */);
             }
             return finishNode(factory.createImportClause(isTypeOnly, identifier, namedBindings), pos);
         }
@@ -34336,16 +35201,16 @@ var ts;
             // ImportsList:
             //  ImportSpecifier
             //  ImportsList, ImportSpecifier
-            var node = kind === 264 /* NamedImports */
+            var node = kind === 265 /* 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(270 /* ExportSpecifier */);
+            return parseImportOrExportSpecifier(271 /* ExportSpecifier */);
         }
         function parseImportSpecifier() {
-            return parseImportOrExportSpecifier(265 /* ImportSpecifier */);
+            return parseImportOrExportSpecifier(266 /* ImportSpecifier */);
         }
         function parseImportOrExportSpecifier(kind) {
             var pos = getNodePos();
@@ -34372,10 +35237,10 @@ var ts;
             else {
                 name = identifierName;
             }
-            if (kind === 265 /* ImportSpecifier */ && checkIdentifierIsKeyword) {
+            if (kind === 266 /* ImportSpecifier */ && checkIdentifierIsKeyword) {
                 parseErrorAt(checkIdentifierStart, checkIdentifierEnd, ts.Diagnostics.Identifier_expected);
             }
-            var node = kind === 265 /* ImportSpecifier */
+            var node = kind === 266 /* ImportSpecifier */
                 ? factory.createImportSpecifier(propertyName, name)
                 : factory.createExportSpecifier(propertyName, name);
             return finishNode(node, pos);
@@ -34398,7 +35263,7 @@ var ts;
                 moduleSpecifier = parseModuleSpecifier();
             }
             else {
-                exportClause = parseNamedImportsOrExports(268 /* NamedExports */);
+                exportClause = parseNamedImportsOrExports(269 /* 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.
@@ -34587,7 +35452,10 @@ var ts;
                 var tags;
                 var tagsPos;
                 var tagsEnd;
+                var linkEnd;
+                var commentsPos;
                 var comments = [];
+                var parts = [];
                 // + 3 for leading /**, - 5 in total for /** */
                 return scanner.scanRange(start + 3, length - 5, function () {
                     // Initially we can parse out a tag.  We also have seen a starting asterisk.
@@ -34616,6 +35484,8 @@ var ts;
                             case 59 /* AtToken */:
                                 if (state === 0 /* BeginningOfLine */ || state === 1 /* SawAsterisk */) {
                                     removeTrailingWhitespace(comments);
+                                    if (!commentsPos)
+                                        commentsPos = getNodePos();
                                     addTag(parseTag(indent));
                                     // NOTE: According to usejsdoc.org, a tag goes to end of line, except the last tag.
                                     // Real-world comments may break this rule, so "BeginningOfLine" will not be a real line beginning
@@ -34658,6 +35528,22 @@ var ts;
                                 break;
                             case 1 /* EndOfFileToken */:
                                 break loop;
+                            case 18 /* OpenBraceToken */:
+                                state = 2 /* SavingComments */;
+                                var commentEnd = scanner.getStartPos();
+                                var linkStart = scanner.getTextPos() - 1;
+                                var link = parseJSDocLink(linkStart);
+                                if (link) {
+                                    if (!linkEnd) {
+                                        removeLeadingNewlines(comments);
+                                    }
+                                    parts.push(finishNode(factory.createJSDocText(comments.join("")), linkEnd !== null && linkEnd !== void 0 ? linkEnd : start, commentEnd));
+                                    parts.push(link);
+                                    comments = [];
+                                    linkEnd = scanner.getTextPos();
+                                    break;
+                                }
+                            // fallthrough if it's not a {@link sequence
                             default:
                                 // Anything else is doc comment text. We just save it. Because it
                                 // wasn't a tag, we can no longer parse a tag on this line until we hit the next
@@ -34668,9 +35554,14 @@ var ts;
                         }
                         nextTokenJSDoc();
                     }
-                    removeLeadingNewlines(comments);
                     removeTrailingWhitespace(comments);
-                    return createJSDocComment();
+                    if (parts.length && comments.length) {
+                        parts.push(finishNode(factory.createJSDocText(comments.join("")), linkEnd !== null && linkEnd !== void 0 ? linkEnd : start, commentsPos));
+                    }
+                    if (parts.length && tags)
+                        ts.Debug.assertIsDefined(commentsPos, "having parsed tags implies that the end of the comment span should be set");
+                    var tagsArray = tags && createNodeArray(tags, tagsPos, tagsEnd);
+                    return finishNode(factory.createJSDocComment(parts.length ? createNodeArray(parts, start, commentsPos) : comments.length ? comments.join("") : undefined, tagsArray), start, end);
                 });
                 function removeLeadingNewlines(comments) {
                     while (comments.length && (comments[0] === "\n" || comments[0] === "\r")) {
@@ -34682,11 +35573,6 @@ var ts;
                         comments.pop();
                     }
                 }
-                function createJSDocComment() {
-                    var comment = comments.length ? comments.join("") : undefined;
-                    var tagsArray = tags && createNodeArray(tags, tagsPos, tagsEnd);
-                    return finishNode(factory.createJSDocComment(comment, tagsArray), start, end);
-                }
                 function isNextNonwhitespaceTokenEndOfFile() {
                     // We must use infinite lookahead, as there could be any number of newlines :(
                     while (true) {
@@ -34766,6 +35652,9 @@ var ts;
                         case "readonly":
                             tag = parseSimpleTag(start, factory.createJSDocReadonlyTag, tagName, margin, indentText);
                             break;
+                        case "override":
+                            tag = parseSimpleTag(start, factory.createJSDocOverrideTag, tagName, margin, indentText);
+                            break;
                         case "deprecated":
                             hasDeprecatedTag = true;
                             tag = parseSimpleTag(start, factory.createJSDocDeprecatedTag, tagName, margin, indentText);
@@ -34813,7 +35702,10 @@ var ts;
                     return parseTagComments(margin, indentText.slice(margin));
                 }
                 function parseTagComments(indent, initialMargin) {
+                    var commentsPos = getNodePos();
                     var comments = [];
+                    var parts = [];
+                    var linkEnd;
                     var state = 0 /* BeginningOfLine */;
                     var previousWhitespace = true;
                     var margin;
@@ -34841,8 +35733,9 @@ var ts;
                                 indent = 0;
                                 break;
                             case 59 /* AtToken */:
-                                if (state === 3 /* SavingBackticks */ || !previousWhitespace && state === 2 /* SavingComments */) {
-                                    // @ doesn't start a new tag inside ``, and inside a comment, only after whitespace
+                                if (state === 3 /* SavingBackticks */
+                                    || state === 2 /* SavingComments */ && (!previousWhitespace || lookAhead(isNextJSDocTokenWhitespace))) {
+                                    // @ doesn't start a new tag inside ``, and inside a comment, only after whitespace or not before whitespace
                                     comments.push(scanner.getTokenText());
                                     break;
                                 }
@@ -34866,13 +35759,18 @@ var ts;
                                 break;
                             case 18 /* OpenBraceToken */:
                                 state = 2 /* SavingComments */;
-                                if (lookAhead(function () { return nextTokenJSDoc() === 59 /* AtToken */ && ts.tokenIsIdentifierOrKeyword(nextTokenJSDoc()) && scanner.getTokenText() === "link"; })) {
-                                    pushComment(scanner.getTokenText());
-                                    nextTokenJSDoc();
+                                var commentEnd = scanner.getStartPos();
+                                var linkStart = scanner.getTextPos() - 1;
+                                var link = parseJSDocLink(linkStart);
+                                if (link) {
+                                    parts.push(finishNode(factory.createJSDocText(comments.join("")), linkEnd !== null && linkEnd !== void 0 ? linkEnd : commentsPos, commentEnd));
+                                    parts.push(link);
+                                    comments = [];
+                                    linkEnd = scanner.getTextPos();
+                                }
+                                else {
                                     pushComment(scanner.getTokenText());
-                                    nextTokenJSDoc();
                                 }
-                                pushComment(scanner.getTokenText());
                                 break;
                             case 61 /* BacktickToken */:
                                 if (state === 3 /* SavingBackticks */) {
@@ -34904,11 +35802,46 @@ var ts;
                     }
                     removeLeadingNewlines(comments);
                     removeTrailingWhitespace(comments);
-                    return comments.length === 0 ? undefined : comments.join("");
+                    if (parts.length) {
+                        if (comments.length) {
+                            parts.push(finishNode(factory.createJSDocText(comments.join("")), linkEnd !== null && linkEnd !== void 0 ? linkEnd : commentsPos));
+                        }
+                        return createNodeArray(parts, commentsPos, scanner.getTextPos());
+                    }
+                    else if (comments.length) {
+                        return comments.join("");
+                    }
+                }
+                function isNextJSDocTokenWhitespace() {
+                    var next = nextTokenJSDoc();
+                    return next === 5 /* WhitespaceTrivia */ || next === 4 /* NewLineTrivia */;
+                }
+                function parseJSDocLink(start) {
+                    if (!tryParse(parseJSDocLinkPrefix)) {
+                        return undefined;
+                    }
+                    nextTokenJSDoc(); // start at token after link, then skip any whitespace
+                    skipWhitespace();
+                    // parseEntityName logs an error for non-identifier, so create a MissingNode ourselves to avoid the error
+                    var name = ts.tokenIsIdentifierOrKeyword(token())
+                        ? parseEntityName(/*allowReservedWords*/ true)
+                        : undefined;
+                    var text = [];
+                    while (token() !== 19 /* CloseBraceToken */ && token() !== 4 /* NewLineTrivia */ && token() !== 1 /* EndOfFileToken */) {
+                        text.push(scanner.getTokenText());
+                        nextTokenJSDoc();
+                    }
+                    return finishNode(factory.createJSDocLink(name, text.join("")), start, scanner.getTextPos());
+                }
+                function parseJSDocLinkPrefix() {
+                    skipWhitespaceOrAsterisk();
+                    return token() === 18 /* OpenBraceToken */
+                        && nextTokenJSDoc() === 59 /* AtToken */
+                        && ts.tokenIsIdentifierOrKeyword(nextTokenJSDoc())
+                        && scanner.getTokenValue() === "link";
                 }
                 function parseUnknownTag(start, tagName, indent, indentText) {
-                    var end = getNodePos();
-                    return finishNode(factory.createJSDocUnknownTag(tagName, parseTrailingTagComments(start, end, indent, indentText)), start, end);
+                    return finishNode(factory.createJSDocUnknownTag(tagName, parseTrailingTagComments(start, getNodePos(), indent, indentText)), start);
                 }
                 function addTag(tag) {
                     if (!tag) {
@@ -34953,7 +35886,7 @@ var ts;
                     switch (node.kind) {
                         case 145 /* ObjectKeyword */:
                             return true;
-                        case 178 /* ArrayType */:
+                        case 179 /* ArrayType */:
                             return isObjectOrObjectArrayTypeReference(node.elementType);
                         default:
                             return ts.isTypeReferenceNode(node) && ts.isIdentifier(node.typeName) && node.typeName.escapedText === "Object" && !node.typeArguments;
@@ -34965,7 +35898,7 @@ var ts;
                     skipWhitespaceOrAsterisk();
                     var _a = parseBracketNameInPropertyAndParamTag(), name = _a.name, isBracketed = _a.isBracketed;
                     var indentText = skipWhitespaceOrAsterisk();
-                    if (isNameFirst) {
+                    if (isNameFirst && !lookAhead(parseJSDocLinkPrefix)) {
                         typeExpression = tryParseTypeExpression();
                     }
                     var comment = parseTrailingTagComments(start, getNodePos(), indent, indentText);
@@ -34985,12 +35918,12 @@ var ts;
                         var child = void 0;
                         var children = void 0;
                         while (child = tryParse(function () { return parseChildParameterOrPropertyTag(target, indent, name); })) {
-                            if (child.kind === 326 /* JSDocParameterTag */ || child.kind === 333 /* JSDocPropertyTag */) {
+                            if (child.kind === 330 /* JSDocParameterTag */ || child.kind === 337 /* JSDocPropertyTag */) {
                                 children = ts.append(children, child);
                             }
                         }
                         if (children) {
-                            var literal = finishNode(factory.createJSDocTypeLiteral(children, typeExpression.type.kind === 178 /* ArrayType */), pos);
+                            var literal = finishNode(factory.createJSDocTypeLiteral(children, typeExpression.type.kind === 179 /* ArrayType */), pos);
                             return finishNode(factory.createJSDocTypeExpression(literal), pos);
                         }
                     }
@@ -35000,27 +35933,34 @@ var ts;
                         parseErrorAt(tagName.pos, scanner.getTokenPos(), ts.Diagnostics._0_tag_already_specified, tagName.escapedText);
                     }
                     var typeExpression = tryParseTypeExpression();
-                    var end = getNodePos();
-                    return finishNode(factory.createJSDocReturnTag(tagName, typeExpression, parseTrailingTagComments(start, end, indent, indentText)), start, end);
+                    return finishNode(factory.createJSDocReturnTag(tagName, typeExpression, parseTrailingTagComments(start, getNodePos(), indent, indentText)), start);
                 }
                 function parseTypeTag(start, tagName, indent, indentText) {
                     if (ts.some(tags, ts.isJSDocTypeTag)) {
                         parseErrorAt(tagName.pos, scanner.getTokenPos(), ts.Diagnostics._0_tag_already_specified, tagName.escapedText);
                     }
                     var typeExpression = parseJSDocTypeExpression(/*mayOmitBraces*/ true);
-                    var end = getNodePos();
-                    var comments = indent !== undefined && indentText !== undefined ? parseTrailingTagComments(start, end, indent, indentText) : undefined;
-                    return finishNode(factory.createJSDocTypeTag(tagName, typeExpression, comments), start, end);
+                    var comments = indent !== undefined && indentText !== undefined ? parseTrailingTagComments(start, getNodePos(), indent, indentText) : undefined;
+                    return finishNode(factory.createJSDocTypeTag(tagName, typeExpression, comments), start);
                 }
                 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);
+                    var isLink = lookAhead(function () { return nextTokenJSDoc() === 59 /* AtToken */ && ts.tokenIsIdentifierOrKeyword(nextTokenJSDoc()) && scanner.getTokenValue() === "link"; });
+                    var nameExpression = isLink ? undefined : parseJSDocNameReference();
+                    var comments = indent !== undefined && indentText !== undefined ? parseTrailingTagComments(start, getNodePos(), indent, indentText) : undefined;
+                    return finishNode(factory.createJSDocSeeTag(tagName, nameExpression, comments), start);
                 }
                 function parseAuthorTag(start, tagName, indent, indentText) {
-                    var comments = parseAuthorNameAndEmail() + (parseTrailingTagComments(start, end, indent, indentText) || "");
-                    return finishNode(factory.createJSDocAuthorTag(tagName, comments || undefined), start);
+                    var commentStart = getNodePos();
+                    var textOnly = parseAuthorNameAndEmail();
+                    var commentEnd = scanner.getStartPos();
+                    var comments = parseTrailingTagComments(start, commentEnd, indent, indentText);
+                    if (!comments) {
+                        commentEnd = scanner.getStartPos();
+                    }
+                    var allParts = typeof comments !== "string"
+                        ? createNodeArray(ts.concatenate([finishNode(textOnly, commentStart, commentEnd)], comments), commentStart) // cast away readonly
+                        : textOnly.text + comments;
+                    return finishNode(factory.createJSDocAuthorTag(tagName, allParts), start);
                 }
                 function parseAuthorNameAndEmail() {
                     var comments = [];
@@ -35041,17 +35981,15 @@ var ts;
                         comments.push(scanner.getTokenText());
                         token = nextTokenJSDoc();
                     }
-                    return comments.join("");
+                    return factory.createJSDocText(comments.join(""));
                 }
                 function parseImplementsTag(start, tagName, margin, indentText) {
                     var className = parseExpressionWithTypeArgumentsForAugments();
-                    var end = getNodePos();
-                    return finishNode(factory.createJSDocImplementsTag(tagName, className, parseTrailingTagComments(start, end, margin, indentText)), start, end);
+                    return finishNode(factory.createJSDocImplementsTag(tagName, className, parseTrailingTagComments(start, getNodePos(), margin, indentText)), start);
                 }
                 function parseAugmentsTag(start, tagName, margin, indentText) {
                     var className = parseExpressionWithTypeArgumentsForAugments();
-                    var end = getNodePos();
-                    return finishNode(factory.createJSDocAugmentsTag(tagName, className, parseTrailingTagComments(start, end, margin, indentText)), start, end);
+                    return finishNode(factory.createJSDocAugmentsTag(tagName, className, parseTrailingTagComments(start, getNodePos(), margin, indentText)), start);
                 }
                 function parseExpressionWithTypeArgumentsForAugments() {
                     var usedBrace = parseOptional(18 /* OpenBraceToken */);
@@ -35075,20 +36013,17 @@ var ts;
                     return node;
                 }
                 function parseSimpleTag(start, createTag, tagName, margin, indentText) {
-                    var end = getNodePos();
-                    return finishNode(createTag(tagName, parseTrailingTagComments(start, end, margin, indentText)), start, end);
+                    return finishNode(createTag(tagName, parseTrailingTagComments(start, getNodePos(), margin, indentText)), start);
                 }
                 function parseThisTag(start, tagName, margin, indentText) {
                     var typeExpression = parseJSDocTypeExpression(/*mayOmitBraces*/ true);
                     skipWhitespace();
-                    var end = getNodePos();
-                    return finishNode(factory.createJSDocThisTag(tagName, typeExpression, parseTrailingTagComments(start, end, margin, indentText)), start, end);
+                    return finishNode(factory.createJSDocThisTag(tagName, typeExpression, parseTrailingTagComments(start, getNodePos(), margin, indentText)), start);
                 }
                 function parseEnumTag(start, tagName, margin, indentText) {
                     var typeExpression = parseJSDocTypeExpression(/*mayOmitBraces*/ true);
                     skipWhitespace();
-                    var end = getNodePos();
-                    return finishNode(factory.createJSDocEnumTag(tagName, typeExpression, parseTrailingTagComments(start, end, margin, indentText)), start, end);
+                    return finishNode(factory.createJSDocEnumTag(tagName, typeExpression, parseTrailingTagComments(start, getNodePos(), margin, indentText)), start);
                 }
                 function parseTypedefTag(start, tagName, indent, indentText) {
                     var _a;
@@ -35105,7 +36040,7 @@ var ts;
                         var hasChildren = false;
                         while (child = tryParse(function () { return parseChildPropertyTag(indent); })) {
                             hasChildren = true;
-                            if (child.kind === 329 /* JSDocTypeTag */) {
+                            if (child.kind === 333 /* JSDocTypeTag */) {
                                 if (childTypeTag) {
                                     parseErrorAtCurrentToken(ts.Diagnostics.A_JSDoc_typedef_comment_may_not_contain_multiple_type_tags);
                                     var lastError = ts.lastOrUndefined(parseDiagnostics);
@@ -35123,7 +36058,7 @@ var ts;
                             }
                         }
                         if (hasChildren) {
-                            var isArrayType = typeExpression && typeExpression.type.kind === 178 /* ArrayType */;
+                            var isArrayType = typeExpression && typeExpression.type.kind === 179 /* ArrayType */;
                             var jsdocTypeLiteral = factory.createJSDocTypeLiteral(jsDocPropertyTags, isArrayType);
                             typeExpression = childTypeTag && childTypeTag.typeExpression && !isObjectOrObjectArrayTypeReference(childTypeTag.typeExpression.type) ?
                                 childTypeTag.typeExpression :
@@ -35176,17 +36111,16 @@ var ts;
                     var returnTag = tryParse(function () {
                         if (parseOptionalJsdoc(59 /* AtToken */)) {
                             var tag = parseTag(indent);
-                            if (tag && tag.kind === 327 /* JSDocReturnTag */) {
+                            if (tag && tag.kind === 331 /* JSDocReturnTag */) {
                                 return tag;
                             }
                         }
                     });
                     var typeExpression = finishNode(factory.createJSDocSignature(/*typeParameters*/ undefined, parameters, returnTag), start);
-                    var end = getNodePos();
                     if (!comment) {
-                        comment = parseTrailingTagComments(start, end, indent, indentText);
+                        comment = parseTrailingTagComments(start, getNodePos(), indent, indentText);
                     }
-                    return finishNode(factory.createJSDocCallbackTag(tagName, typeExpression, fullName, comment), start, end);
+                    return finishNode(factory.createJSDocCallbackTag(tagName, typeExpression, fullName, comment), start);
                 }
                 function escapedTextsEqual(a, b) {
                     while (!ts.isIdentifier(a) || !ts.isIdentifier(b)) {
@@ -35211,7 +36145,7 @@ var ts;
                             case 59 /* AtToken */:
                                 if (canParseTag) {
                                     var child = tryParseChildTag(target, indent);
-                                    if (child && (child.kind === 326 /* JSDocParameterTag */ || child.kind === 333 /* JSDocPropertyTag */) &&
+                                    if (child && (child.kind === 330 /* JSDocParameterTag */ || child.kind === 337 /* JSDocPropertyTag */) &&
                                         target !== 4 /* CallbackParameter */ &&
                                         name && (ts.isIdentifier(child.name) || !escapedTextsEqual(name, child.name.left))) {
                                         return false;
@@ -35268,6 +36202,9 @@ var ts;
                 function parseTemplateTagTypeParameter() {
                     var typeParameterPos = getNodePos();
                     var name = parseJSDocIdentifierName(ts.Diagnostics.Unexpected_token_A_type_parameter_name_was_expected_without_curly_braces);
+                    if (ts.nodeIsMissing(name)) {
+                        return undefined;
+                    }
                     return finishNode(factory.createTypeParameterDeclaration(name, /*constraint*/ undefined, /*defaultType*/ undefined), typeParameterPos);
                 }
                 function parseTemplateTagTypeParameters() {
@@ -35275,7 +36212,10 @@ var ts;
                     var typeParameters = [];
                     do {
                         skipWhitespace();
-                        typeParameters.push(parseTemplateTagTypeParameter());
+                        var node = parseTemplateTagTypeParameter();
+                        if (node !== undefined) {
+                            typeParameters.push(node);
+                        }
                         skipWhitespaceOrAsterisk();
                     } while (parseOptionalJsdoc(27 /* CommaToken */));
                     return createNodeArray(typeParameters, pos);
@@ -35294,8 +36234,7 @@ var ts;
                     // TODO: Consider only parsing a single type parameter if there is a constraint.
                     var constraint = token() === 18 /* OpenBraceToken */ ? parseJSDocTypeExpression() : undefined;
                     var typeParameters = parseTemplateTagTypeParameters();
-                    var end = getNodePos();
-                    return finishNode(factory.createJSDocTemplateTag(tagName, constraint, typeParameters, parseTrailingTagComments(start, end, indent, indentText)), start, end);
+                    return finishNode(factory.createJSDocTemplateTag(tagName, constraint, typeParameters, parseTrailingTagComments(start, getNodePos(), indent, indentText)), start);
                 }
                 function parseOptionalJsdoc(t) {
                     if (token() === t) {
@@ -36110,6 +37049,7 @@ var ts;
         ["es2018", "lib.es2018.d.ts"],
         ["es2019", "lib.es2019.d.ts"],
         ["es2020", "lib.es2020.d.ts"],
+        ["es2021", "lib.es2021.d.ts"],
         ["esnext", "lib.esnext.d.ts"],
         // Host only
         ["dom", "lib.dom.d.ts"],
@@ -36149,14 +37089,17 @@ var ts;
         ["es2020.string", "lib.es2020.string.d.ts"],
         ["es2020.symbol.wellknown", "lib.es2020.symbol.wellknown.d.ts"],
         ["es2020.intl", "lib.es2020.intl.d.ts"],
+        ["es2021.promise", "lib.es2021.promise.d.ts"],
+        ["es2021.string", "lib.es2021.string.d.ts"],
+        ["es2021.weakref", "lib.es2021.weakref.d.ts"],
         ["esnext.array", "lib.es2019.array.d.ts"],
         ["esnext.symbol", "lib.es2019.symbol.d.ts"],
         ["esnext.asynciterable", "lib.es2018.asynciterable.d.ts"],
         ["esnext.intl", "lib.esnext.intl.d.ts"],
         ["esnext.bigint", "lib.es2020.bigint.d.ts"],
-        ["esnext.string", "lib.esnext.string.d.ts"],
-        ["esnext.promise", "lib.esnext.promise.d.ts"],
-        ["esnext.weakref", "lib.esnext.weakref.d.ts"]
+        ["esnext.string", "lib.es2021.string.d.ts"],
+        ["esnext.promise", "lib.es2021.promise.d.ts"],
+        ["esnext.weakref", "lib.es2021.weakref.d.ts"]
     ];
     /**
      * An array of supported "lib" reference file names used to determine the order for inclusion
@@ -36180,11 +37123,12 @@ var ts;
                 fixedpollinginterval: ts.WatchFileKind.FixedPollingInterval,
                 prioritypollinginterval: ts.WatchFileKind.PriorityPollingInterval,
                 dynamicprioritypolling: ts.WatchFileKind.DynamicPriorityPolling,
+                fixedchunksizepolling: ts.WatchFileKind.FixedChunkSizePolling,
                 usefsevents: ts.WatchFileKind.UseFsEvents,
                 usefseventsonparentdirectory: ts.WatchFileKind.UseFsEventsOnParentDirectory,
             })),
             category: ts.Diagnostics.Advanced_Options,
-            description: ts.Diagnostics.Specify_strategy_for_watching_file_Colon_FixedPollingInterval_default_PriorityPollingInterval_DynamicPriorityPolling_UseFsEvents_UseFsEventsOnParentDirectory,
+            description: ts.Diagnostics.Specify_strategy_for_watching_file_Colon_FixedPollingInterval_default_PriorityPollingInterval_DynamicPriorityPolling_FixedChunkSizePolling_UseFsEvents_UseFsEventsOnParentDirectory,
         },
         {
             name: "watchDirectory",
@@ -36192,9 +37136,10 @@ var ts;
                 usefsevents: ts.WatchDirectoryKind.UseFsEvents,
                 fixedpollinginterval: ts.WatchDirectoryKind.FixedPollingInterval,
                 dynamicprioritypolling: ts.WatchDirectoryKind.DynamicPriorityPolling,
+                fixedchunksizepolling: ts.WatchDirectoryKind.FixedChunkSizePolling,
             })),
             category: ts.Diagnostics.Advanced_Options,
-            description: ts.Diagnostics.Specify_strategy_for_watching_directory_on_platforms_that_don_t_support_recursive_watching_natively_Colon_UseFsEvents_default_FixedPollingInterval_DynamicPriorityPolling,
+            description: ts.Diagnostics.Specify_strategy_for_watching_directory_on_platforms_that_don_t_support_recursive_watching_natively_Colon_UseFsEvents_default_FixedPollingInterval_DynamicPriorityPolling_FixedChunkSizePolling,
         },
         {
             name: "fallbackPolling",
@@ -36202,9 +37147,10 @@ var ts;
                 fixedinterval: ts.PollingWatchKind.FixedInterval,
                 priorityinterval: ts.PollingWatchKind.PriorityInterval,
                 dynamicpriority: ts.PollingWatchKind.DynamicPriority,
+                fixedchunksize: ts.PollingWatchKind.FixedChunkSize,
             })),
             category: ts.Diagnostics.Advanced_Options,
-            description: ts.Diagnostics.Specify_strategy_for_creating_a_polling_watch_when_it_fails_to_create_using_file_system_events_Colon_FixedInterval_default_PriorityInterval_DynamicPriority,
+            description: ts.Diagnostics.Specify_strategy_for_creating_a_polling_watch_when_it_fails_to_create_using_file_system_events_Colon_FixedInterval_default_PriorityInterval_DynamicPriority_FixedChunkSize,
         },
         {
             name: "synchronousWatchDirectory",
@@ -36363,6 +37309,7 @@ var ts;
             es2018: 5 /* ES2018 */,
             es2019: 6 /* ES2019 */,
             es2020: 7 /* ES2020 */,
+            es2021: 8 /* ES2021 */,
             esnext: 99 /* ESNext */,
         })),
         affectsSourceFile: true,
@@ -36371,10 +37318,10 @@ var ts;
         paramType: ts.Diagnostics.VERSION,
         showInSimplifiedHelpView: true,
         category: ts.Diagnostics.Basic_Options,
-        description: ts.Diagnostics.Specify_ECMAScript_target_version_Colon_ES3_default_ES5_ES2015_ES2016_ES2017_ES2018_ES2019_ES2020_or_ESNEXT,
+        description: ts.Diagnostics.Specify_ECMAScript_target_version_Colon_ES3_default_ES5_ES2015_ES2016_ES2017_ES2018_ES2019_ES2020_ES2021_or_ESNEXT,
     };
-    /* @internal */
-    ts.optionDeclarations = __spreadArray(__spreadArray([], ts.commonOptionsWithBuild), [
+    var commandOptionsWithoutBuild = [
+        // CommandLine only options
         {
             name: "all",
             type: "boolean",
@@ -36737,6 +37684,14 @@ var ts;
             category: ts.Diagnostics.Additional_Checks,
             description: ts.Diagnostics.Include_undefined_in_index_signature_results
         },
+        {
+            name: "noImplicitOverride",
+            type: "boolean",
+            affectsSemanticDiagnostics: true,
+            showInSimplifiedHelpView: false,
+            category: ts.Diagnostics.Additional_Checks,
+            description: ts.Diagnostics.Ensure_overriding_members_in_derived_classes_are_marked_with_an_override_modifier
+        },
         {
             name: "noPropertyAccessFromIndexSignature",
             type: "boolean",
@@ -37152,7 +38107,9 @@ var ts;
             },
             description: ts.Diagnostics.List_of_language_service_plugins
         },
-    ]);
+    ];
+    /* @internal */
+    ts.optionDeclarations = __spreadArray(__spreadArray([], ts.commonOptionsWithBuild), commandOptionsWithoutBuild);
     /* @internal */
     ts.semanticDiagnosticsOptionDeclarations = ts.optionDeclarations.filter(function (option) { return !!option.affectsSemanticDiagnostics; });
     /* @internal */
@@ -37167,8 +38124,7 @@ var ts;
     ts.transpileOptionValueCompilerOptions = ts.optionDeclarations.filter(function (option) {
         return ts.hasProperty(option, "transpileOptionValue");
     });
-    /* @internal */
-    ts.buildOpts = __spreadArray(__spreadArray([], ts.commonOptionsWithBuild), [
+    var commandOptionsOnlyBuild = [
         {
             name: "verbose",
             shortName: "v",
@@ -37196,7 +38152,9 @@ var ts;
             description: ts.Diagnostics.Delete_the_outputs_of_all_projects,
             type: "boolean"
         }
-    ]);
+    ];
+    /* @internal */
+    ts.buildOpts = __spreadArray(__spreadArray([], ts.commonOptionsWithBuild), commandOptionsOnlyBuild);
     /* @internal */
     ts.typeAcquisitionDeclarations = [
         {
@@ -37250,6 +38208,10 @@ var ts;
         return optionsNameMapCache || (optionsNameMapCache = createOptionNameMap(ts.optionDeclarations));
     }
     ts.getOptionsNameMap = getOptionsNameMap;
+    var compilerOptionsAlternateMode = {
+        diagnostic: ts.Diagnostics.Compiler_option_0_may_only_be_used_with_build,
+        getOptionsNameMap: getBuildOptionsNameMap
+    };
     /* @internal */
     ts.defaultInitCompilerOptions = {
         module: ts.ModuleKind.CommonJS,
@@ -37311,6 +38273,10 @@ var ts;
         return option.name;
     }
     function createUnknownOptionError(unknownOption, diagnostics, createDiagnostics, unknownOptionErrorText) {
+        var _a;
+        if ((_a = diagnostics.alternateMode) === null || _a === void 0 ? void 0 : _a.getOptionsNameMap().optionsNameMap.has(unknownOption.toLowerCase())) {
+            return createDiagnostics(diagnostics.alternateMode.diagnostic, unknownOption);
+        }
         var possibleOption = ts.getSpellingSuggestion(unknownOption, diagnostics.optionDeclarations, getOptionName);
         return possibleOption ?
             createDiagnostics(diagnostics.unknownDidYouMeanDiagnostic, unknownOptionErrorText || unknownOption, possibleOption.name) :
@@ -37465,6 +38431,7 @@ var ts;
     }
     /*@internal*/
     ts.compilerOptionsDidYouMeanDiagnostics = {
+        alternateMode: compilerOptionsAlternateMode,
         getOptionsNameMap: getOptionsNameMap,
         optionDeclarations: ts.optionDeclarations,
         unknownOptionDiagnostic: ts.Diagnostics.Unknown_compiler_option_0,
@@ -37497,7 +38464,12 @@ var ts;
     function getBuildOptionsNameMap() {
         return buildOptionsNameMapCache || (buildOptionsNameMapCache = createOptionNameMap(ts.buildOpts));
     }
+    var buildOptionsAlternateMode = {
+        diagnostic: ts.Diagnostics.Compiler_option_0_may_not_be_used_with_build,
+        getOptionsNameMap: getOptionsNameMap
+    };
     var buildOptionsDidYouMeanDiagnostics = {
+        alternateMode: buildOptionsAlternateMode,
         getOptionsNameMap: getBuildOptionsNameMap,
         optionDeclarations: ts.buildOpts,
         unknownOptionDiagnostic: ts.Diagnostics.Unknown_build_option_0,
@@ -37573,7 +38545,7 @@ var ts;
     function parseConfigFileTextToJson(fileName, jsonText) {
         var jsonSourceFile = ts.parseJsonText(fileName, jsonText);
         return {
-            config: convertToObject(jsonSourceFile, jsonSourceFile.parseDiagnostics),
+            config: convertConfigFileToObject(jsonSourceFile, jsonSourceFile.parseDiagnostics, /*reportOptionsErrors*/ false, /*optionsIterator*/ undefined),
             error: jsonSourceFile.parseDiagnostics.length ? jsonSourceFile.parseDiagnostics[0] : undefined
         };
     }
@@ -37703,11 +38675,31 @@ var ts;
         }
         return _tsconfigRootOptions;
     }
+    function convertConfigFileToObject(sourceFile, errors, reportOptionsErrors, optionsIterator) {
+        var _a;
+        var rootExpression = (_a = sourceFile.statements[0]) === null || _a === void 0 ? void 0 : _a.expression;
+        var knownRootOptions = reportOptionsErrors ? getTsconfigRootOptionsMap() : undefined;
+        if (rootExpression && rootExpression.kind !== 201 /* ObjectLiteralExpression */) {
+            errors.push(ts.createDiagnosticForNodeInSourceFile(sourceFile, rootExpression, ts.Diagnostics.The_root_value_of_a_0_file_must_be_an_object, ts.getBaseFileName(sourceFile.fileName) === "jsconfig.json" ? "jsconfig.json" : "tsconfig.json"));
+            // Last-ditch error recovery. Somewhat useful because the JSON parser will recover from some parse errors by
+            // synthesizing a top-level array literal expression. There's a reasonable chance the first element of that
+            // array is a well-formed configuration object, made into an array element by stray characters.
+            if (ts.isArrayLiteralExpression(rootExpression)) {
+                var firstObject = ts.find(rootExpression.elements, ts.isObjectLiteralExpression);
+                if (firstObject) {
+                    return convertToObjectWorker(sourceFile, firstObject, errors, /*returnValue*/ true, knownRootOptions, optionsIterator);
+                }
+            }
+            return {};
+        }
+        return convertToObjectWorker(sourceFile, rootExpression, errors, /*returnValue*/ true, knownRootOptions, optionsIterator);
+    }
     /**
      * Convert the json syntax tree into the json value
      */
     function convertToObject(sourceFile, errors) {
-        return convertToObjectWorker(sourceFile, errors, /*returnValue*/ true, /*knownRootOptions*/ undefined, /*jsonConversionNotifier*/ undefined);
+        var _a;
+        return convertToObjectWorker(sourceFile, (_a = sourceFile.statements[0]) === null || _a === void 0 ? void 0 : _a.expression, errors, /*returnValue*/ true, /*knownRootOptions*/ undefined, /*jsonConversionNotifier*/ undefined);
     }
     ts.convertToObject = convertToObject;
     /**
@@ -37716,18 +38708,18 @@ var ts;
      * Otherwise it just checks the errors and returns undefined
      */
     /*@internal*/
-    function convertToObjectWorker(sourceFile, errors, returnValue, knownRootOptions, jsonConversionNotifier) {
-        if (!sourceFile.statements.length) {
+    function convertToObjectWorker(sourceFile, rootExpression, errors, returnValue, knownRootOptions, jsonConversionNotifier) {
+        if (!rootExpression) {
             return returnValue ? {} : undefined;
         }
-        return convertPropertyValueToJson(sourceFile.statements[0].expression, knownRootOptions);
+        return convertPropertyValueToJson(rootExpression, knownRootOptions);
         function isRootOptionMap(knownOptions) {
             return knownRootOptions && knownRootOptions.elementOptions === knownOptions;
         }
         function convertObjectLiteralExpressionToJson(node, knownOptions, extraKeyDiagnostics, parentOption) {
             var result = returnValue ? {} : undefined;
             var _loop_4 = function (element) {
-                if (element.kind !== 288 /* PropertyAssignment */) {
+                if (element.kind !== 289 /* PropertyAssignment */) {
                     errors.push(ts.createDiagnosticForNodeInSourceFile(sourceFile, element, ts.Diagnostics.Property_assignment_expected));
                     return "continue";
                 }
@@ -37821,13 +38813,13 @@ var ts;
                 case 8 /* NumericLiteral */:
                     reportInvalidOptionValue(option && option.type !== "number");
                     return validateValue(Number(valueExpression.text));
-                case 214 /* PrefixUnaryExpression */:
+                case 215 /* PrefixUnaryExpression */:
                     if (valueExpression.operator !== 40 /* MinusToken */ || valueExpression.operand.kind !== 8 /* NumericLiteral */) {
                         break; // not valid JSON syntax
                     }
                     reportInvalidOptionValue(option && option.type !== "number");
                     return validateValue(-Number(valueExpression.operand.text));
-                case 200 /* ObjectLiteralExpression */:
+                case 201 /* ObjectLiteralExpression */:
                     reportInvalidOptionValue(option && option.type !== "object");
                     var objectLiteralExpression = valueExpression;
                     // Currently having element option declaration in the tsconfig with type "object"
@@ -37844,7 +38836,7 @@ var ts;
                         return validateValue(convertObjectLiteralExpressionToJson(objectLiteralExpression, /* knownOptions*/ undefined, 
                         /*extraKeyDiagnosticMessage */ undefined, /*parentOption*/ undefined));
                     }
-                case 199 /* ArrayLiteralExpression */:
+                case 200 /* ArrayLiteralExpression */:
                     reportInvalidOptionValue(option && option.type !== "list");
                     return validateValue(convertArrayLiteralExpressionToJson(valueExpression.elements, option && option.element));
             }
@@ -38481,7 +39473,7 @@ var ts;
                 }
             }
         };
-        var json = convertToObjectWorker(sourceFile, errors, /*returnValue*/ true, getTsconfigRootOptionsMap(), optionsIterator);
+        var json = convertConfigFileToObject(sourceFile, errors, /*reportOptionsErrors*/ true, optionsIterator);
         if (!typeAcquisition) {
             if (typingOptionstypeAcquisition) {
                 typeAcquisition = (typingOptionstypeAcquisition.enableAutoDiscovery !== undefined) ?
@@ -39228,13 +40220,24 @@ var ts;
      * This is possible in case if resolution is performed for directives specified via 'types' parameter. In this case initial path for secondary lookups
      * is assumed to be the same as root directory of the project.
      */
-    function resolveTypeReferenceDirective(typeReferenceDirectiveName, containingFile, options, host, redirectedReference) {
+    function resolveTypeReferenceDirective(typeReferenceDirectiveName, containingFile, options, host, redirectedReference, cache) {
         var traceEnabled = isTraceEnabled(options, host);
         if (redirectedReference) {
             options = redirectedReference.commandLine.options;
         }
-        var failedLookupLocations = [];
-        var moduleResolutionState = { compilerOptions: options, host: host, traceEnabled: traceEnabled, failedLookupLocations: failedLookupLocations };
+        var containingDirectory = containingFile ? ts.getDirectoryPath(containingFile) : undefined;
+        var perFolderCache = containingDirectory ? cache && cache.getOrCreateCacheForDirectory(containingDirectory, redirectedReference) : undefined;
+        var result = perFolderCache && perFolderCache.get(typeReferenceDirectiveName);
+        if (result) {
+            if (traceEnabled) {
+                trace(host, ts.Diagnostics.Resolving_type_reference_directive_0_containing_file_1, typeReferenceDirectiveName, containingFile);
+                if (redirectedReference)
+                    trace(host, ts.Diagnostics.Using_compiler_options_of_project_reference_redirect_0, redirectedReference.sourceFile.fileName);
+                trace(host, ts.Diagnostics.Resolution_for_type_reference_directive_0_was_found_in_cache_from_location_1, typeReferenceDirectiveName, containingDirectory);
+                traceResult(result);
+            }
+            return result;
+        }
         var typeRoots = getEffectiveTypeRoots(options, host);
         if (traceEnabled) {
             if (containingFile === undefined) {
@@ -39257,6 +40260,8 @@ var ts;
                 trace(host, ts.Diagnostics.Using_compiler_options_of_project_reference_redirect_0, redirectedReference.sourceFile.fileName);
             }
         }
+        var failedLookupLocations = [];
+        var moduleResolutionState = { compilerOptions: options, host: host, traceEnabled: traceEnabled, failedLookupLocations: failedLookupLocations, packageJsonInfoCache: cache };
         var resolved = primaryLookup();
         var primary = true;
         if (!resolved) {
@@ -39267,17 +40272,31 @@ var ts;
         if (resolved) {
             var fileName = resolved.fileName, packageId = resolved.packageId;
             var resolvedFileName = options.preserveSymlinks ? fileName : realPath(fileName, host, traceEnabled);
-            if (traceEnabled) {
-                if (packageId) {
-                    trace(host, ts.Diagnostics.Type_reference_directive_0_was_successfully_resolved_to_1_with_Package_ID_2_primary_Colon_3, typeReferenceDirectiveName, resolvedFileName, ts.packageIdToString(packageId), primary);
-                }
-                else {
-                    trace(host, ts.Diagnostics.Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2, typeReferenceDirectiveName, resolvedFileName, primary);
-                }
+            resolvedTypeReferenceDirective = {
+                primary: primary,
+                resolvedFileName: resolvedFileName,
+                originalPath: fileName === resolvedFileName ? undefined : fileName,
+                packageId: packageId,
+                isExternalLibraryImport: pathContainsNodeModules(fileName),
+            };
+        }
+        result = { resolvedTypeReferenceDirective: resolvedTypeReferenceDirective, failedLookupLocations: failedLookupLocations };
+        perFolderCache === null || perFolderCache === void 0 ? void 0 : perFolderCache.set(typeReferenceDirectiveName, result);
+        if (traceEnabled)
+            traceResult(result);
+        return result;
+        function traceResult(result) {
+            var _a;
+            if (!((_a = result.resolvedTypeReferenceDirective) === null || _a === void 0 ? void 0 : _a.resolvedFileName)) {
+                trace(host, ts.Diagnostics.Type_reference_directive_0_was_not_resolved, typeReferenceDirectiveName);
+            }
+            else if (result.resolvedTypeReferenceDirective.packageId) {
+                trace(host, ts.Diagnostics.Type_reference_directive_0_was_successfully_resolved_to_1_with_Package_ID_2_primary_Colon_3, typeReferenceDirectiveName, result.resolvedTypeReferenceDirective.resolvedFileName, ts.packageIdToString(result.resolvedTypeReferenceDirective.packageId), result.resolvedTypeReferenceDirective.primary);
+            }
+            else {
+                trace(host, ts.Diagnostics.Type_reference_directive_0_was_successfully_resolved_to_1_primary_Colon_2, typeReferenceDirectiveName, result.resolvedTypeReferenceDirective.resolvedFileName, result.resolvedTypeReferenceDirective.primary);
             }
-            resolvedTypeReferenceDirective = { primary: primary, resolvedFileName: resolvedFileName, packageId: packageId, isExternalLibraryImport: pathContainsNodeModules(fileName) };
         }
-        return { resolvedTypeReferenceDirective: resolvedTypeReferenceDirective, failedLookupLocations: failedLookupLocations };
         function primaryLookup() {
             // Check primary library paths
             if (typeRoots && typeRoots.length) {
@@ -39307,20 +40326,16 @@ var ts;
                 if (traceEnabled) {
                     trace(host, ts.Diagnostics.Looking_up_in_node_modules_folder_initial_location_0, initialLocationForSecondaryLookup);
                 }
-                var result = void 0;
+                var result_4;
                 if (!ts.isExternalModuleNameRelative(typeReferenceDirectiveName)) {
                     var searchResult = loadModuleFromNearestNodeModulesDirectory(Extensions.DtsOnly, typeReferenceDirectiveName, initialLocationForSecondaryLookup, moduleResolutionState, /*cache*/ undefined, /*redirectedReference*/ undefined);
-                    result = searchResult && searchResult.value;
+                    result_4 = searchResult && searchResult.value;
                 }
                 else {
                     var candidate = ts.normalizePathAndParts(ts.combinePaths(initialLocationForSecondaryLookup, typeReferenceDirectiveName)).path;
-                    result = nodeLoadModuleByRelativeName(Extensions.DtsOnly, candidate, /*onlyRecordFailures*/ false, moduleResolutionState, /*considerPackageJson*/ true);
-                }
-                var resolvedFile = resolvedTypeScriptOnly(result);
-                if (!resolvedFile && traceEnabled) {
-                    trace(host, ts.Diagnostics.Type_reference_directive_0_was_not_resolved, typeReferenceDirectiveName);
+                    result_4 = nodeLoadModuleByRelativeName(Extensions.DtsOnly, candidate, /*onlyRecordFailures*/ false, moduleResolutionState, /*considerPackageJson*/ true);
                 }
-                return resolvedFile;
+                return resolvedTypeScriptOnly(result_4);
             }
             else {
                 if (traceEnabled) {
@@ -39375,22 +40390,21 @@ var ts;
         return result;
     }
     ts.getAutomaticTypeDirectiveNames = getAutomaticTypeDirectiveNames;
-    function createModuleResolutionCache(currentDirectory, getCanonicalFileName, options) {
-        return createModuleResolutionCacheWithMaps(createCacheWithRedirects(options), createCacheWithRedirects(options), currentDirectory, getCanonicalFileName);
-    }
-    ts.createModuleResolutionCache = createModuleResolutionCache;
     /*@internal*/
     function createCacheWithRedirects(options) {
         var ownMap = new ts.Map();
         var redirectsMap = new ts.Map();
         return {
-            ownMap: ownMap,
+            getOwnMap: getOwnMap,
             redirectsMap: redirectsMap,
             getOrCreateMapOfCacheRedirects: getOrCreateMapOfCacheRedirects,
             clear: clear,
             setOwnOptions: setOwnOptions,
             setOwnMap: setOwnMap
         };
+        function getOwnMap() {
+            return ownMap;
+        }
         function setOwnOptions(newOptions) {
             options = newOptions;
         }
@@ -39416,26 +40430,88 @@ var ts;
         }
     }
     ts.createCacheWithRedirects = createCacheWithRedirects;
-    /*@internal*/
-    function createModuleResolutionCacheWithMaps(directoryToModuleNameMap, moduleNameToDirectoryMap, currentDirectory, getCanonicalFileName) {
-        return { getOrCreateCacheForDirectory: getOrCreateCacheForDirectory, getOrCreateCacheForModuleName: getOrCreateCacheForModuleName, directoryToModuleNameMap: directoryToModuleNameMap, moduleNameToDirectoryMap: moduleNameToDirectoryMap };
+    function createPackageJsonInfoCache(currentDirectory, getCanonicalFileName) {
+        var cache;
+        return { getPackageJsonInfo: getPackageJsonInfo, setPackageJsonInfo: setPackageJsonInfo, clear: clear };
+        function getPackageJsonInfo(packageJsonPath) {
+            return cache === null || cache === void 0 ? void 0 : cache.get(ts.toPath(packageJsonPath, currentDirectory, getCanonicalFileName));
+        }
+        function setPackageJsonInfo(packageJsonPath, info) {
+            (cache || (cache = new ts.Map())).set(ts.toPath(packageJsonPath, currentDirectory, getCanonicalFileName), info);
+        }
+        function clear() {
+            cache = undefined;
+        }
+    }
+    function getOrCreateCache(cacheWithRedirects, redirectedReference, key, create) {
+        var cache = cacheWithRedirects.getOrCreateMapOfCacheRedirects(redirectedReference);
+        var result = cache.get(key);
+        if (!result) {
+            result = create();
+            cache.set(key, result);
+        }
+        return result;
+    }
+    function updateRedirectsMap(options, directoryToModuleNameMap, moduleNameToDirectoryMap) {
+        if (!options.configFile)
+            return;
+        if (directoryToModuleNameMap.redirectsMap.size === 0) {
+            // The own map will be for projectCompilerOptions
+            ts.Debug.assert(!moduleNameToDirectoryMap || moduleNameToDirectoryMap.redirectsMap.size === 0);
+            ts.Debug.assert(directoryToModuleNameMap.getOwnMap().size === 0);
+            ts.Debug.assert(!moduleNameToDirectoryMap || moduleNameToDirectoryMap.getOwnMap().size === 0);
+            directoryToModuleNameMap.redirectsMap.set(options.configFile.path, directoryToModuleNameMap.getOwnMap());
+            moduleNameToDirectoryMap === null || moduleNameToDirectoryMap === void 0 ? void 0 : moduleNameToDirectoryMap.redirectsMap.set(options.configFile.path, moduleNameToDirectoryMap.getOwnMap());
+        }
+        else {
+            // Set correct own map
+            ts.Debug.assert(!moduleNameToDirectoryMap || moduleNameToDirectoryMap.redirectsMap.size > 0);
+            var ref = {
+                sourceFile: options.configFile,
+                commandLine: { options: options }
+            };
+            directoryToModuleNameMap.setOwnMap(directoryToModuleNameMap.getOrCreateMapOfCacheRedirects(ref));
+            moduleNameToDirectoryMap === null || moduleNameToDirectoryMap === void 0 ? void 0 : moduleNameToDirectoryMap.setOwnMap(moduleNameToDirectoryMap.getOrCreateMapOfCacheRedirects(ref));
+        }
+        directoryToModuleNameMap.setOwnOptions(options);
+        moduleNameToDirectoryMap === null || moduleNameToDirectoryMap === void 0 ? void 0 : moduleNameToDirectoryMap.setOwnOptions(options);
+    }
+    function createPerDirectoryResolutionCache(currentDirectory, getCanonicalFileName, directoryToModuleNameMap) {
+        return {
+            getOrCreateCacheForDirectory: getOrCreateCacheForDirectory,
+            clear: clear,
+            update: update,
+        };
+        function clear() {
+            directoryToModuleNameMap.clear();
+        }
+        function update(options) {
+            updateRedirectsMap(options, directoryToModuleNameMap);
+        }
         function getOrCreateCacheForDirectory(directoryName, redirectedReference) {
             var path = ts.toPath(directoryName, currentDirectory, getCanonicalFileName);
             return getOrCreateCache(directoryToModuleNameMap, redirectedReference, path, function () { return new ts.Map(); });
         }
+    }
+    function createModuleResolutionCache(currentDirectory, getCanonicalFileName, options, directoryToModuleNameMap, moduleNameToDirectoryMap) {
+        var preDirectoryResolutionCache = createPerDirectoryResolutionCache(currentDirectory, getCanonicalFileName, directoryToModuleNameMap || (directoryToModuleNameMap = createCacheWithRedirects(options)));
+        moduleNameToDirectoryMap || (moduleNameToDirectoryMap = createCacheWithRedirects(options));
+        var packageJsonInfoCache = createPackageJsonInfoCache(currentDirectory, getCanonicalFileName);
+        return __assign(__assign(__assign({}, packageJsonInfoCache), preDirectoryResolutionCache), { getOrCreateCacheForModuleName: getOrCreateCacheForModuleName,
+            clear: clear,
+            update: update, getPackageJsonInfoCache: function () { return packageJsonInfoCache; } });
+        function clear() {
+            preDirectoryResolutionCache.clear();
+            moduleNameToDirectoryMap.clear();
+            packageJsonInfoCache.clear();
+        }
+        function update(options) {
+            updateRedirectsMap(options, directoryToModuleNameMap, moduleNameToDirectoryMap);
+        }
         function getOrCreateCacheForModuleName(nonRelativeModuleName, redirectedReference) {
             ts.Debug.assert(!ts.isExternalModuleNameRelative(nonRelativeModuleName));
             return getOrCreateCache(moduleNameToDirectoryMap, redirectedReference, nonRelativeModuleName, createPerModuleNameCache);
         }
-        function getOrCreateCache(cacheWithRedirects, redirectedReference, key, create) {
-            var cache = cacheWithRedirects.getOrCreateMapOfCacheRedirects(redirectedReference);
-            var result = cache.get(key);
-            if (!result) {
-                result = create();
-                cache.set(key, result);
-            }
-            return result;
-        }
         function createPerModuleNameCache() {
             var directoryPathMap = new ts.Map();
             return { get: get, set: set };
@@ -39502,7 +40578,17 @@ var ts;
             }
         }
     }
-    ts.createModuleResolutionCacheWithMaps = createModuleResolutionCacheWithMaps;
+    ts.createModuleResolutionCache = createModuleResolutionCache;
+    function createTypeReferenceDirectiveResolutionCache(currentDirectory, getCanonicalFileName, options, packageJsonInfoCache, directoryToModuleNameMap) {
+        var preDirectoryResolutionCache = createPerDirectoryResolutionCache(currentDirectory, getCanonicalFileName, directoryToModuleNameMap || (directoryToModuleNameMap = createCacheWithRedirects(options)));
+        packageJsonInfoCache || (packageJsonInfoCache = createPackageJsonInfoCache(currentDirectory, getCanonicalFileName));
+        return __assign(__assign(__assign({}, packageJsonInfoCache), preDirectoryResolutionCache), { clear: clear });
+        function clear() {
+            preDirectoryResolutionCache.clear();
+            packageJsonInfoCache.clear();
+        }
+    }
+    ts.createTypeReferenceDirectiveResolutionCache = createTypeReferenceDirectiveResolutionCache;
     function resolveModuleNameFromCache(moduleName, containingFile, cache) {
         var containingDirectory = ts.getDirectoryPath(containingFile);
         var perFolderCache = cache && cache.getOrCreateCacheForDirectory(containingDirectory);
@@ -39780,7 +40866,7 @@ var ts;
         var _a, _b;
         var traceEnabled = isTraceEnabled(compilerOptions, host);
         var failedLookupLocations = [];
-        var state = { compilerOptions: compilerOptions, host: host, traceEnabled: traceEnabled, failedLookupLocations: failedLookupLocations };
+        var state = { compilerOptions: compilerOptions, host: host, traceEnabled: traceEnabled, failedLookupLocations: failedLookupLocations, packageJsonInfoCache: cache };
         var result = ts.forEach(extensions, function (ext) { return tryResolve(ext); });
         return createResolvedModuleWithFailedLookupLocations((_a = result === null || result === void 0 ? void 0 : result.value) === null || _a === void 0 ? void 0 : _a.resolved, (_b = result === null || result === void 0 ? void 0 : result.value) === null || _b === void 0 ? void 0 : _b.isExternalLibraryImport, failedLookupLocations, state.resultFromCache);
         function tryResolve(extensions) {
@@ -39840,7 +40926,7 @@ var ts;
             }
             var resolvedFromFile = loadModuleFromFile(extensions, candidate, onlyRecordFailures, state);
             if (resolvedFromFile) {
-                var packageDirectory = considerPackageJson ? parseNodeModuleFromPath(resolvedFromFile) : undefined;
+                var packageDirectory = considerPackageJson ? parseNodeModuleFromPath(resolvedFromFile.path) : undefined;
                 var packageInfo = packageDirectory ? getPackageJsonInfo(packageDirectory, /*onlyRecordFailures*/ false, state) : undefined;
                 return withPackageId(packageInfo, resolvedFromFile);
             }
@@ -39873,8 +40959,9 @@ var ts;
      *   For `/node_modules/@types/foo/bar/index.d.ts` this is packageDirectory: "@types/foo"
      *   For `/node_modules/foo/bar/index.d.ts` this is packageDirectory: "foo"
      */
+    /* @internal */
     function parseNodeModuleFromPath(resolved) {
-        var path = ts.normalizePath(resolved.path);
+        var path = ts.normalizePath(resolved);
         var idx = path.lastIndexOf(ts.nodeModulesPathPart);
         if (idx === -1) {
             return undefined;
@@ -39886,6 +40973,7 @@ var ts;
         }
         return path.slice(0, indexAfterPackageName);
     }
+    ts.parseNodeModuleFromPath = parseNodeModuleFromPath;
     function moveToNextDirectorySeparatorIfAvailable(path, prevSeparatorIndex) {
         var nextSeparatorIndex = path.indexOf(ts.directorySeparator, prevSeparatorIndex + 1);
         return nextSeparatorIndex === -1 ? prevSeparatorIndex : nextSeparatorIndex;
@@ -39969,21 +41057,43 @@ var ts;
         return withPackageId(packageInfo, loadNodeModuleFromDirectoryWorker(extensions, candidate, onlyRecordFailures, state, packageJsonContent, versionPaths));
     }
     function getPackageJsonInfo(packageDirectory, onlyRecordFailures, state) {
+        var _a, _b, _c;
         var host = state.host, traceEnabled = state.traceEnabled;
-        var directoryExists = !onlyRecordFailures && ts.directoryProbablyExists(packageDirectory, host);
         var packageJsonPath = ts.combinePaths(packageDirectory, "package.json");
+        if (onlyRecordFailures) {
+            state.failedLookupLocations.push(packageJsonPath);
+            return undefined;
+        }
+        var existing = (_a = state.packageJsonInfoCache) === null || _a === void 0 ? void 0 : _a.getPackageJsonInfo(packageJsonPath);
+        if (existing !== undefined) {
+            if (typeof existing !== "boolean") {
+                if (traceEnabled)
+                    trace(host, ts.Diagnostics.File_0_exists_according_to_earlier_cached_lookups, packageJsonPath);
+                return existing;
+            }
+            else {
+                if (existing && traceEnabled)
+                    trace(host, ts.Diagnostics.File_0_does_not_exist_according_to_earlier_cached_lookups, packageJsonPath);
+                state.failedLookupLocations.push(packageJsonPath);
+                return undefined;
+            }
+        }
+        var directoryExists = ts.directoryProbablyExists(packageDirectory, host);
         if (directoryExists && host.fileExists(packageJsonPath)) {
             var packageJsonContent = ts.readJson(packageJsonPath, host);
             if (traceEnabled) {
                 trace(host, ts.Diagnostics.Found_package_json_at_0, packageJsonPath);
             }
             var versionPaths = readPackageJsonTypesVersionPaths(packageJsonContent, state);
-            return { packageDirectory: packageDirectory, packageJsonContent: packageJsonContent, versionPaths: versionPaths };
+            var result = { packageDirectory: packageDirectory, packageJsonContent: packageJsonContent, versionPaths: versionPaths };
+            (_b = state.packageJsonInfoCache) === null || _b === void 0 ? void 0 : _b.setPackageJsonInfo(packageJsonPath, result);
+            return result;
         }
         else {
             if (directoryExists && traceEnabled) {
                 trace(host, ts.Diagnostics.File_0_does_not_exist, packageJsonPath);
             }
+            (_c = state.packageJsonInfoCache) === null || _c === void 0 ? void 0 : _c.setPackageJsonInfo(packageJsonPath, directoryExists);
             // record package json as one of failed lookup locations - in the future if this file will appear it will invalidate resolution results
             state.failedLookupLocations.push(packageJsonPath);
         }
@@ -40232,7 +41342,7 @@ var ts;
     function classicNameResolver(moduleName, containingFile, compilerOptions, host, cache, redirectedReference) {
         var traceEnabled = isTraceEnabled(compilerOptions, host);
         var failedLookupLocations = [];
-        var state = { compilerOptions: compilerOptions, host: host, traceEnabled: traceEnabled, failedLookupLocations: failedLookupLocations };
+        var state = { compilerOptions: compilerOptions, host: host, traceEnabled: traceEnabled, failedLookupLocations: failedLookupLocations, packageJsonInfoCache: cache };
         var containingDirectory = ts.getDirectoryPath(containingFile);
         var resolved = tryResolve(Extensions.TypeScript) || tryResolve(Extensions.JavaScript);
         // No originalPath because classic resolution doesn't resolve realPath
@@ -40273,13 +41383,13 @@ var ts;
      * This is the minumum code needed to expose that functionality; the rest is in the host.
      */
     /* @internal */
-    function loadModuleFromGlobalCache(moduleName, projectName, compilerOptions, host, globalCache) {
+    function loadModuleFromGlobalCache(moduleName, projectName, compilerOptions, host, globalCache, packageJsonInfoCache) {
         var traceEnabled = isTraceEnabled(compilerOptions, host);
         if (traceEnabled) {
             trace(host, ts.Diagnostics.Auto_discovery_for_typings_is_enabled_in_project_0_Running_extra_resolution_pass_for_module_1_using_cache_location_2, projectName, moduleName, globalCache);
         }
         var failedLookupLocations = [];
-        var state = { compilerOptions: compilerOptions, host: host, traceEnabled: traceEnabled, failedLookupLocations: failedLookupLocations };
+        var state = { compilerOptions: compilerOptions, host: host, traceEnabled: traceEnabled, failedLookupLocations: failedLookupLocations, packageJsonInfoCache: packageJsonInfoCache };
         var resolved = loadModuleFromImmediateNodeModulesDirectory(Extensions.DtsOnly, moduleName, globalCache, state, /*typesScopeOnly*/ false);
         return createResolvedModuleWithFailedLookupLocations(resolved, /*isExternalLibraryImport*/ true, failedLookupLocations, state.resultFromCache);
     }
@@ -40325,26 +41435,26 @@ var ts;
         // A module is uninstantiated if it contains only
         switch (node.kind) {
             // 1. interface declarations, type alias declarations
-            case 253 /* InterfaceDeclaration */:
-            case 254 /* TypeAliasDeclaration */:
+            case 254 /* InterfaceDeclaration */:
+            case 255 /* TypeAliasDeclaration */:
                 return 0 /* NonInstantiated */;
             // 2. const enum declarations
-            case 255 /* EnumDeclaration */:
+            case 256 /* EnumDeclaration */:
                 if (ts.isEnumConst(node)) {
                     return 2 /* ConstEnumOnly */;
                 }
                 break;
             // 3. non-exported import declarations
-            case 261 /* ImportDeclaration */:
-            case 260 /* ImportEqualsDeclaration */:
+            case 262 /* ImportDeclaration */:
+            case 261 /* 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 267 /* ExportDeclaration */:
+            case 268 /* ExportDeclaration */:
                 var exportDeclaration = node;
-                if (!exportDeclaration.moduleSpecifier && exportDeclaration.exportClause && exportDeclaration.exportClause.kind === 268 /* NamedExports */) {
+                if (!exportDeclaration.moduleSpecifier && exportDeclaration.exportClause && exportDeclaration.exportClause.kind === 269 /* NamedExports */) {
                     var state = 0 /* NonInstantiated */;
                     for (var _i = 0, _a = exportDeclaration.exportClause.elements; _i < _a.length; _i++) {
                         var specifier = _a[_i];
@@ -40360,7 +41470,7 @@ var ts;
                 }
                 break;
             // 5. other uninstantiated module declarations.
-            case 257 /* ModuleBlock */: {
+            case 258 /* ModuleBlock */: {
                 var state_1 = 0 /* NonInstantiated */;
                 ts.forEachChild(node, function (n) {
                     var childState = getModuleInstanceStateCached(n, visited);
@@ -40382,7 +41492,7 @@ var ts;
                 });
                 return state_1;
             }
-            case 256 /* ModuleDeclaration */:
+            case 257 /* ModuleDeclaration */:
                 return getModuleInstanceState(node, visited);
             case 78 /* Identifier */:
                 // Only jsdoc typedef definition can exist in jsdoc namespace, and it should
@@ -40500,6 +41610,7 @@ var ts;
         var classifiableNames;
         var unreachableFlow = { flags: 1 /* Unreachable */ };
         var reportedUnreachableFlow = { flags: 1 /* Unreachable */ };
+        var bindBinaryExpressionFlow = createBindBinaryExpressionFlow();
         /**
          * Inside the binder, we may create a diagnostic for an as-yet unbound node (with potentially no parent pointers, implying no accessible source file)
          * If so, the node _must_ be in the current file (as that's the only way anything could have traversed to it to yield it as the error node)
@@ -40582,7 +41693,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 === 266 /* ExportAssignment */) {
+            if (node.kind === 267 /* ExportAssignment */) {
                 return node.isExportEquals ? "export=" /* ExportEquals */ : "default" /* Default */;
             }
             var name = ts.getNameOfDeclaration(node);
@@ -40591,7 +41702,7 @@ var ts;
                     var moduleName = ts.getTextOfIdentifierOrLiteral(name);
                     return (ts.isGlobalScopeAugmentation(node) ? "__global" : "\"" + moduleName + "\"");
                 }
-                if (name.kind === 158 /* ComputedPropertyName */) {
+                if (name.kind === 159 /* ComputedPropertyName */) {
                     var nameExpression = name.expression;
                     // treat computed property names where expression is string/numeric literal as just string/numeric literal
                     if (ts.isStringOrNumericLiteralLike(nameExpression)) {
@@ -40600,11 +41711,9 @@ var ts;
                     if (ts.isSignedNumericLiteral(nameExpression)) {
                         return ts.tokenToString(nameExpression.operator) + nameExpression.operand.text;
                     }
-                    ts.Debug.assert(ts.isWellKnownSymbolSyntactically(nameExpression));
-                    return ts.getPropertyNameForKnownSymbolName(ts.idText(nameExpression.name));
-                }
-                if (ts.isWellKnownSymbolSyntactically(name)) {
-                    return ts.getPropertyNameForKnownSymbolName(ts.idText(name.name));
+                    else {
+                        ts.Debug.fail("Only computed properties with literal names have declaration names");
+                    }
                 }
                 if (ts.isPrivateIdentifier(name)) {
                     // containingClass exists because private names only allowed inside classes
@@ -40619,36 +41728,36 @@ var ts;
                 return ts.isPropertyNameLiteral(name) ? ts.getEscapedTextOfIdentifierOrLiteral(name) : undefined;
             }
             switch (node.kind) {
-                case 166 /* Constructor */:
+                case 167 /* Constructor */:
                     return "__constructor" /* Constructor */;
-                case 174 /* FunctionType */:
-                case 169 /* CallSignature */:
-                case 313 /* JSDocSignature */:
+                case 175 /* FunctionType */:
+                case 170 /* CallSignature */:
+                case 315 /* JSDocSignature */:
                     return "__call" /* Call */;
-                case 175 /* ConstructorType */:
-                case 170 /* ConstructSignature */:
+                case 176 /* ConstructorType */:
+                case 171 /* ConstructSignature */:
                     return "__new" /* New */;
-                case 171 /* IndexSignature */:
+                case 172 /* IndexSignature */:
                     return "__index" /* Index */;
-                case 267 /* ExportDeclaration */:
+                case 268 /* ExportDeclaration */:
                     return "__export" /* ExportStar */;
-                case 297 /* SourceFile */:
+                case 298 /* SourceFile */:
                     // json file should behave as
                     // module.exports = ...
                     return "export=" /* ExportEquals */;
-                case 216 /* BinaryExpression */:
+                case 217 /* BinaryExpression */:
                     if (ts.getAssignmentDeclarationKind(node) === 2 /* ModuleExports */) {
                         // module.exports = ...
                         return "export=" /* ExportEquals */;
                     }
                     ts.Debug.fail("Unknown binary declaration kind");
                     break;
-                case 308 /* JSDocFunctionType */:
+                case 309 /* JSDocFunctionType */:
                     return (ts.isJSDocConstructSignature(node) ? "__new" /* New */ : "__call" /* Call */);
-                case 160 /* Parameter */:
+                case 161 /* 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 === 308 /* 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 === 309 /* 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;
@@ -40748,7 +41857,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 === 266 /* ExportAssignment */ && !node.isExportEquals)) {
+                                    (node.kind === 267 /* ExportAssignment */ && !node.isExportEquals)) {
                                     message_1 = ts.Diagnostics.A_module_cannot_have_multiple_default_exports;
                                     messageNeedsName_1 = false;
                                     multipleDefaultExports_1 = true;
@@ -40787,7 +41896,7 @@ var ts;
         function declareModuleMember(node, symbolFlags, symbolExcludes) {
             var hasExportModifier = !!(ts.getCombinedModifierFlags(node) & 1 /* Export */) || jsdocTreatAsExported(node);
             if (symbolFlags & 2097152 /* Alias */) {
-                if (node.kind === 270 /* ExportSpecifier */ || (node.kind === 260 /* ImportEqualsDeclaration */ && hasExportModifier)) {
+                if (node.kind === 271 /* ExportSpecifier */ || (node.kind === 261 /* ImportEqualsDeclaration */ && hasExportModifier)) {
                     return declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes);
                 }
                 else {
@@ -40876,7 +41985,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 !== 209 /* ArrowFunction */) {
+                if (node.kind !== 210 /* ArrowFunction */) {
                     thisParentContainer = container;
                 }
                 container = blockScopeContainer = node;
@@ -40909,7 +42018,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 === 166 /* Constructor */ || (ts.isInJSFile(node) && (node.kind === 251 /* FunctionDeclaration */ || node.kind === 208 /* FunctionExpression */)) ? createBranchLabel() : undefined;
+                currentReturnTarget = isIIFE || node.kind === 167 /* Constructor */ || (ts.isInJSFile(node) && (node.kind === 252 /* FunctionDeclaration */ || node.kind === 209 /* FunctionExpression */)) ? createBranchLabel() : undefined;
                 currentExceptionTarget = undefined;
                 currentBreakTarget = undefined;
                 currentContinueTarget = undefined;
@@ -40924,13 +42033,14 @@ var ts;
                         node.flags |= 512 /* HasExplicitReturn */;
                     node.endFlowNode = currentFlow;
                 }
-                if (node.kind === 297 /* SourceFile */) {
+                if (node.kind === 298 /* SourceFile */) {
                     node.flags |= emitFlags;
+                    node.endFlowNode = currentFlow;
                 }
                 if (currentReturnTarget) {
                     addAntecedent(currentReturnTarget, currentFlow);
                     currentFlow = finishFlowLabel(currentReturnTarget);
-                    if (node.kind === 166 /* Constructor */ || (ts.isInJSFile(node) && (node.kind === 251 /* FunctionDeclaration */ || node.kind === 208 /* FunctionExpression */))) {
+                    if (node.kind === 167 /* Constructor */ || (ts.isInJSFile(node) && (node.kind === 252 /* FunctionDeclaration */ || node.kind === 209 /* FunctionExpression */))) {
                         node.returnFlowNode = currentFlow;
                     }
                 }
@@ -40957,8 +42067,8 @@ var ts;
             blockScopeContainer = savedBlockScopeContainer;
         }
         function bindEachFunctionsFirst(nodes) {
-            bindEach(nodes, function (n) { return n.kind === 251 /* FunctionDeclaration */ ? bind(n) : undefined; });
-            bindEach(nodes, function (n) { return n.kind !== 251 /* FunctionDeclaration */ ? bind(n) : undefined; });
+            bindEach(nodes, function (n) { return n.kind === 252 /* FunctionDeclaration */ ? bind(n) : undefined; });
+            bindEach(nodes, function (n) { return n.kind !== 252 /* FunctionDeclaration */ ? bind(n) : undefined; });
         }
         function bindEach(nodes, bindFunction) {
             if (bindFunction === void 0) { bindFunction = bind; }
@@ -40981,59 +42091,59 @@ var ts;
                 inAssignmentPattern = saveInAssignmentPattern;
                 return;
             }
-            if (node.kind >= 232 /* FirstStatement */ && node.kind <= 248 /* LastStatement */ && !options.allowUnreachableCode) {
+            if (node.kind >= 233 /* FirstStatement */ && node.kind <= 249 /* LastStatement */ && !options.allowUnreachableCode) {
                 node.flowNode = currentFlow;
             }
             switch (node.kind) {
-                case 236 /* WhileStatement */:
+                case 237 /* WhileStatement */:
                     bindWhileStatement(node);
                     break;
-                case 235 /* DoStatement */:
+                case 236 /* DoStatement */:
                     bindDoStatement(node);
                     break;
-                case 237 /* ForStatement */:
+                case 238 /* ForStatement */:
                     bindForStatement(node);
                     break;
-                case 238 /* ForInStatement */:
-                case 239 /* ForOfStatement */:
+                case 239 /* ForInStatement */:
+                case 240 /* ForOfStatement */:
                     bindForInOrForOfStatement(node);
                     break;
-                case 234 /* IfStatement */:
+                case 235 /* IfStatement */:
                     bindIfStatement(node);
                     break;
-                case 242 /* ReturnStatement */:
-                case 246 /* ThrowStatement */:
+                case 243 /* ReturnStatement */:
+                case 247 /* ThrowStatement */:
                     bindReturnOrThrow(node);
                     break;
-                case 241 /* BreakStatement */:
-                case 240 /* ContinueStatement */:
+                case 242 /* BreakStatement */:
+                case 241 /* ContinueStatement */:
                     bindBreakOrContinueStatement(node);
                     break;
-                case 247 /* TryStatement */:
+                case 248 /* TryStatement */:
                     bindTryStatement(node);
                     break;
-                case 244 /* SwitchStatement */:
+                case 245 /* SwitchStatement */:
                     bindSwitchStatement(node);
                     break;
-                case 258 /* CaseBlock */:
+                case 259 /* CaseBlock */:
                     bindCaseBlock(node);
                     break;
-                case 284 /* CaseClause */:
+                case 285 /* CaseClause */:
                     bindCaseClause(node);
                     break;
-                case 233 /* ExpressionStatement */:
+                case 234 /* ExpressionStatement */:
                     bindExpressionStatement(node);
                     break;
-                case 245 /* LabeledStatement */:
+                case 246 /* LabeledStatement */:
                     bindLabeledStatement(node);
                     break;
-                case 214 /* PrefixUnaryExpression */:
+                case 215 /* PrefixUnaryExpression */:
                     bindPrefixUnaryExpressionFlow(node);
                     break;
-                case 215 /* PostfixUnaryExpression */:
+                case 216 /* PostfixUnaryExpression */:
                     bindPostfixUnaryExpressionFlow(node);
                     break;
-                case 216 /* BinaryExpression */:
+                case 217 /* BinaryExpression */:
                     if (ts.isDestructuringAssignment(node)) {
                         // Carry over whether we are in an assignment pattern to
                         // binary expressions that could actually be an initializer
@@ -41043,47 +42153,47 @@ var ts;
                     }
                     bindBinaryExpressionFlow(node);
                     break;
-                case 210 /* DeleteExpression */:
+                case 211 /* DeleteExpression */:
                     bindDeleteExpressionFlow(node);
                     break;
-                case 217 /* ConditionalExpression */:
+                case 218 /* ConditionalExpression */:
                     bindConditionalExpressionFlow(node);
                     break;
-                case 249 /* VariableDeclaration */:
+                case 250 /* VariableDeclaration */:
                     bindVariableDeclarationFlow(node);
                     break;
-                case 201 /* PropertyAccessExpression */:
-                case 202 /* ElementAccessExpression */:
+                case 202 /* PropertyAccessExpression */:
+                case 203 /* ElementAccessExpression */:
                     bindAccessExpressionFlow(node);
                     break;
-                case 203 /* CallExpression */:
+                case 204 /* CallExpression */:
                     bindCallExpressionFlow(node);
                     break;
-                case 225 /* NonNullExpression */:
+                case 226 /* NonNullExpression */:
                     bindNonNullExpressionFlow(node);
                     break;
-                case 331 /* JSDocTypedefTag */:
-                case 324 /* JSDocCallbackTag */:
-                case 325 /* JSDocEnumTag */:
+                case 335 /* JSDocTypedefTag */:
+                case 328 /* JSDocCallbackTag */:
+                case 329 /* JSDocEnumTag */:
                     bindJSDocTypeAlias(node);
                     break;
                 // In source files and blocks, bind functions first to match hoisting that occurs at runtime
-                case 297 /* SourceFile */: {
+                case 298 /* SourceFile */: {
                     bindEachFunctionsFirst(node.statements);
                     bind(node.endOfFileToken);
                     break;
                 }
-                case 230 /* Block */:
-                case 257 /* ModuleBlock */:
+                case 231 /* Block */:
+                case 258 /* ModuleBlock */:
                     bindEachFunctionsFirst(node.statements);
                     break;
-                case 198 /* BindingElement */:
+                case 199 /* BindingElement */:
                     bindBindingElementFlow(node);
                     break;
-                case 200 /* ObjectLiteralExpression */:
-                case 199 /* ArrayLiteralExpression */:
-                case 288 /* PropertyAssignment */:
-                case 220 /* SpreadElement */:
+                case 201 /* ObjectLiteralExpression */:
+                case 200 /* ArrayLiteralExpression */:
+                case 289 /* PropertyAssignment */:
+                case 221 /* 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;
@@ -41100,29 +42210,29 @@ var ts;
                 case 78 /* Identifier */:
                 case 79 /* PrivateIdentifier */:
                 case 107 /* ThisKeyword */:
-                case 201 /* PropertyAccessExpression */:
-                case 202 /* ElementAccessExpression */:
+                case 202 /* PropertyAccessExpression */:
+                case 203 /* ElementAccessExpression */:
                     return containsNarrowableReference(expr);
-                case 203 /* CallExpression */:
+                case 204 /* CallExpression */:
                     return hasNarrowableArgument(expr);
-                case 207 /* ParenthesizedExpression */:
-                case 225 /* NonNullExpression */:
+                case 208 /* ParenthesizedExpression */:
+                case 226 /* NonNullExpression */:
                     return isNarrowingExpression(expr.expression);
-                case 216 /* BinaryExpression */:
+                case 217 /* BinaryExpression */:
                     return isNarrowingBinaryExpression(expr);
-                case 214 /* PrefixUnaryExpression */:
+                case 215 /* PrefixUnaryExpression */:
                     return expr.operator === 53 /* ExclamationToken */ && isNarrowingExpression(expr.operand);
-                case 211 /* TypeOfExpression */:
+                case 212 /* TypeOfExpression */:
                     return isNarrowingExpression(expr.expression);
             }
             return false;
         }
         function isNarrowableReference(expr) {
-            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);
+            return ts.isDottedName(expr)
+                || (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);
         }
         function containsNarrowableReference(expr) {
             return isNarrowableReference(expr) || ts.isOptionalChain(expr) && containsNarrowableReference(expr.expression);
@@ -41136,7 +42246,7 @@ var ts;
                     }
                 }
             }
-            if (expr.expression.kind === 201 /* PropertyAccessExpression */ &&
+            if (expr.expression.kind === 202 /* PropertyAccessExpression */ &&
                 containsNarrowableReference(expr.expression.expression)) {
                 return true;
             }
@@ -41172,9 +42282,9 @@ var ts;
         }
         function isNarrowableOperand(expr) {
             switch (expr.kind) {
-                case 207 /* ParenthesizedExpression */:
+                case 208 /* ParenthesizedExpression */:
                     return isNarrowableOperand(expr.expression);
-                case 216 /* BinaryExpression */:
+                case 217 /* BinaryExpression */:
                     switch (expr.operatorToken.kind) {
                         case 62 /* EqualsToken */:
                             return isNarrowableOperand(expr.left);
@@ -41250,26 +42360,26 @@ var ts;
         function isStatementCondition(node) {
             var parent = node.parent;
             switch (parent.kind) {
-                case 234 /* IfStatement */:
-                case 236 /* WhileStatement */:
-                case 235 /* DoStatement */:
+                case 235 /* IfStatement */:
+                case 237 /* WhileStatement */:
+                case 236 /* DoStatement */:
                     return parent.expression === node;
-                case 237 /* ForStatement */:
-                case 217 /* ConditionalExpression */:
+                case 238 /* ForStatement */:
+                case 218 /* ConditionalExpression */:
                     return parent.condition === node;
             }
             return false;
         }
         function isLogicalExpression(node) {
             while (true) {
-                if (node.kind === 207 /* ParenthesizedExpression */) {
+                if (node.kind === 208 /* ParenthesizedExpression */) {
                     node = node.expression;
                 }
-                else if (node.kind === 214 /* PrefixUnaryExpression */ && node.operator === 53 /* ExclamationToken */) {
+                else if (node.kind === 215 /* PrefixUnaryExpression */ && node.operator === 53 /* ExclamationToken */) {
                     node = node.operand;
                 }
                 else {
-                    return node.kind === 216 /* BinaryExpression */ && (node.operatorToken.kind === 55 /* AmpersandAmpersandToken */ ||
+                    return node.kind === 217 /* BinaryExpression */ && (node.operatorToken.kind === 55 /* AmpersandAmpersandToken */ ||
                         node.operatorToken.kind === 56 /* BarBarToken */ ||
                         node.operatorToken.kind === 60 /* QuestionQuestionToken */);
                 }
@@ -41316,7 +42426,7 @@ var ts;
         }
         function setContinueTarget(node, target) {
             var label = activeLabelList;
-            while (label && node.parent.kind === 245 /* LabeledStatement */) {
+            while (label && node.parent.kind === 246 /* LabeledStatement */) {
                 label.continueTarget = target;
                 label = label.next;
                 node = node.parent;
@@ -41367,12 +42477,12 @@ var ts;
             bind(node.expression);
             addAntecedent(preLoopLabel, currentFlow);
             currentFlow = preLoopLabel;
-            if (node.kind === 239 /* ForOfStatement */) {
+            if (node.kind === 240 /* ForOfStatement */) {
                 bind(node.awaitModifier);
             }
             addAntecedent(postLoopLabel, currentFlow);
             bind(node.initializer);
-            if (node.initializer.kind !== 250 /* VariableDeclarationList */) {
+            if (node.initializer.kind !== 251 /* VariableDeclarationList */) {
                 bindAssignmentTargetFlow(node.initializer);
             }
             bindIterativeStatement(node.statement, postLoopLabel, preLoopLabel);
@@ -41394,7 +42504,7 @@ var ts;
         }
         function bindReturnOrThrow(node) {
             bind(node.expression);
-            if (node.kind === 242 /* ReturnStatement */) {
+            if (node.kind === 243 /* ReturnStatement */) {
                 hasExplicitReturn = true;
                 if (currentReturnTarget) {
                     addAntecedent(currentReturnTarget, currentFlow);
@@ -41411,7 +42521,7 @@ var ts;
             return undefined;
         }
         function bindBreakOrContinueFlow(node, breakTarget, continueTarget) {
-            var flowLabel = node.kind === 241 /* BreakStatement */ ? breakTarget : continueTarget;
+            var flowLabel = node.kind === 242 /* BreakStatement */ ? breakTarget : continueTarget;
             if (flowLabel) {
                 addAntecedent(flowLabel, currentFlow);
                 currentFlow = unreachableFlow;
@@ -41516,7 +42626,7 @@ var ts;
             preSwitchCaseFlow = currentFlow;
             bind(node.caseBlock);
             addAntecedent(postSwitchLabel, currentFlow);
-            var hasDefault = ts.forEach(node.caseBlock.clauses, function (c) { return c.kind === 285 /* DefaultClause */; });
+            var hasDefault = ts.forEach(node.caseBlock.clauses, function (c) { return c.kind === 286 /* 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.
@@ -41564,9 +42674,9 @@ var ts;
         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.kind === 203 /* CallExpression */) {
+            if (node.kind === 204 /* CallExpression */) {
                 var call = node;
-                if (ts.isDottedName(call.expression) && call.expression.kind !== 105 /* SuperKeyword */) {
+                if (call.expression.kind !== 105 /* SuperKeyword */ && ts.isDottedName(call.expression)) {
                     currentFlow = createFlowCall(currentFlow, call);
                 }
             }
@@ -41590,7 +42700,7 @@ var ts;
             currentFlow = finishFlowLabel(postStatementLabel);
         }
         function bindDestructuringTargetFlow(node) {
-            if (node.kind === 216 /* BinaryExpression */ && node.operatorToken.kind === 62 /* EqualsToken */) {
+            if (node.kind === 217 /* BinaryExpression */ && node.operatorToken.kind === 62 /* EqualsToken */) {
                 bindAssignmentTargetFlow(node.left);
             }
             else {
@@ -41601,10 +42711,10 @@ var ts;
             if (isNarrowableReference(node)) {
                 currentFlow = createFlowMutation(16 /* Assignment */, currentFlow, node);
             }
-            else if (node.kind === 199 /* ArrayLiteralExpression */) {
+            else if (node.kind === 200 /* ArrayLiteralExpression */) {
                 for (var _i = 0, _a = node.elements; _i < _a.length; _i++) {
                     var e = _a[_i];
-                    if (e.kind === 220 /* SpreadElement */) {
+                    if (e.kind === 221 /* SpreadElement */) {
                         bindAssignmentTargetFlow(e.expression);
                     }
                     else {
@@ -41612,16 +42722,16 @@ var ts;
                     }
                 }
             }
-            else if (node.kind === 200 /* ObjectLiteralExpression */) {
+            else if (node.kind === 201 /* ObjectLiteralExpression */) {
                 for (var _b = 0, _c = node.properties; _b < _c.length; _b++) {
                     var p = _c[_b];
-                    if (p.kind === 288 /* PropertyAssignment */) {
+                    if (p.kind === 289 /* PropertyAssignment */) {
                         bindDestructuringTargetFlow(p.initializer);
                     }
-                    else if (p.kind === 289 /* ShorthandPropertyAssignment */) {
+                    else if (p.kind === 290 /* ShorthandPropertyAssignment */) {
                         bindAssignmentTargetFlow(p.name);
                     }
-                    else if (p.kind === 290 /* SpreadAssignment */) {
+                    else if (p.kind === 291 /* SpreadAssignment */) {
                         bindAssignmentTargetFlow(p.expression);
                     }
                 }
@@ -41686,128 +42796,102 @@ var ts;
             }
             bindAssignmentTargetFlow(node.left);
         }
-        var BindBinaryExpressionFlowState;
-        (function (BindBinaryExpressionFlowState) {
-            BindBinaryExpressionFlowState[BindBinaryExpressionFlowState["BindThenBindChildren"] = 0] = "BindThenBindChildren";
-            BindBinaryExpressionFlowState[BindBinaryExpressionFlowState["MaybeBindLeft"] = 1] = "MaybeBindLeft";
-            BindBinaryExpressionFlowState[BindBinaryExpressionFlowState["BindToken"] = 2] = "BindToken";
-            BindBinaryExpressionFlowState[BindBinaryExpressionFlowState["BindRight"] = 3] = "BindRight";
-            BindBinaryExpressionFlowState[BindBinaryExpressionFlowState["FinishBind"] = 4] = "FinishBind";
-        })(BindBinaryExpressionFlowState || (BindBinaryExpressionFlowState = {}));
-        function bindBinaryExpressionFlow(node) {
-            var workStacks = {
-                expr: [node],
-                state: [1 /* MaybeBindLeft */],
-                inStrictMode: [undefined],
-                parent: [undefined],
-            };
-            var stackIndex = 0;
-            while (stackIndex >= 0) {
-                node = workStacks.expr[stackIndex];
-                switch (workStacks.state[stackIndex]) {
-                    case 0 /* BindThenBindChildren */: {
-                        // This state is used only when recuring, to emulate the work that `bind` does before
-                        // reaching `bindChildren`. A normal call to `bindBinaryExpressionFlow` will already have done this work.
-                        ts.setParent(node, parent);
-                        var saveInStrictMode = inStrictMode;
-                        bindWorker(node);
-                        var saveParent = parent;
-                        parent = node;
-                        advanceState(1 /* MaybeBindLeft */, saveInStrictMode, saveParent);
-                        break;
-                    }
-                    case 1 /* MaybeBindLeft */: {
-                        var operator = node.operatorToken.kind;
-                        // TODO: bindLogicalExpression is recursive - if we want to handle deeply nested `&&` expressions
-                        // we'll need to handle the `bindLogicalExpression` scenarios in this state machine, too
-                        // For now, though, since the common cases are chained `+`, leaving it recursive is fine
-                        if (operator === 55 /* AmpersandAmpersandToken */ || operator === 56 /* BarBarToken */ || operator === 60 /* QuestionQuestionToken */ ||
-                            ts.isLogicalOrCoalescingAssignmentOperator(operator)) {
-                            if (isTopLevelLogicalExpression(node)) {
-                                var postExpressionLabel = createBranchLabel();
-                                bindLogicalLikeExpression(node, postExpressionLabel, postExpressionLabel);
-                                currentFlow = finishFlowLabel(postExpressionLabel);
-                            }
-                            else {
-                                bindLogicalLikeExpression(node, currentTrueTarget, currentFalseTarget);
-                            }
-                            completeNode();
-                        }
-                        else {
-                            advanceState(2 /* BindToken */);
-                            maybeBind(node.left);
-                        }
-                        break;
+        function createBindBinaryExpressionFlow() {
+            return ts.createBinaryExpressionTrampoline(onEnter, onLeft, onOperator, onRight, onExit, /*foldState*/ undefined);
+            function onEnter(node, state) {
+                if (state) {
+                    state.stackIndex++;
+                    // Emulate the work that `bind` does before reaching `bindChildren`. A normal call to
+                    // `bindBinaryExpressionFlow` will already have done this work.
+                    ts.setParent(node, parent);
+                    var saveInStrictMode = inStrictMode;
+                    bindWorker(node);
+                    var saveParent = parent;
+                    parent = node;
+                    state.skip = false;
+                    state.inStrictModeStack[state.stackIndex] = saveInStrictMode;
+                    state.parentStack[state.stackIndex] = saveParent;
+                }
+                else {
+                    state = {
+                        stackIndex: 0,
+                        skip: false,
+                        inStrictModeStack: [undefined],
+                        parentStack: [undefined]
+                    };
+                }
+                // TODO: bindLogicalExpression is recursive - if we want to handle deeply nested `&&` expressions
+                // we'll need to handle the `bindLogicalExpression` scenarios in this state machine, too
+                // For now, though, since the common cases are chained `+`, leaving it recursive is fine
+                var operator = node.operatorToken.kind;
+                if (operator === 55 /* AmpersandAmpersandToken */ ||
+                    operator === 56 /* BarBarToken */ ||
+                    operator === 60 /* QuestionQuestionToken */ ||
+                    ts.isLogicalOrCoalescingAssignmentOperator(operator)) {
+                    if (isTopLevelLogicalExpression(node)) {
+                        var postExpressionLabel = createBranchLabel();
+                        bindLogicalLikeExpression(node, postExpressionLabel, postExpressionLabel);
+                        currentFlow = finishFlowLabel(postExpressionLabel);
                     }
-                    case 2 /* BindToken */: {
-                        if (node.operatorToken.kind === 27 /* CommaToken */) {
-                            maybeBindExpressionFlowIfCall(node.left);
-                        }
-                        advanceState(3 /* BindRight */);
-                        maybeBind(node.operatorToken);
-                        break;
+                    else {
+                        bindLogicalLikeExpression(node, currentTrueTarget, currentFalseTarget);
                     }
-                    case 3 /* BindRight */: {
-                        advanceState(4 /* FinishBind */);
-                        maybeBind(node.right);
-                        break;
+                    state.skip = true;
+                }
+                return state;
+            }
+            function onLeft(left, state, _node) {
+                if (!state.skip) {
+                    return maybeBind(left);
+                }
+            }
+            function onOperator(operatorToken, state, node) {
+                if (!state.skip) {
+                    if (operatorToken.kind === 27 /* CommaToken */) {
+                        maybeBindExpressionFlowIfCall(node.left);
                     }
-                    case 4 /* FinishBind */: {
-                        var operator = node.operatorToken.kind;
-                        if (ts.isAssignmentOperator(operator) && !ts.isAssignmentTarget(node)) {
-                            bindAssignmentTargetFlow(node.left);
-                            if (operator === 62 /* EqualsToken */ && node.left.kind === 202 /* ElementAccessExpression */) {
-                                var elementAccess = node.left;
-                                if (isNarrowableOperand(elementAccess.expression)) {
-                                    currentFlow = createFlowMutation(256 /* ArrayMutation */, currentFlow, node);
-                                }
+                    bind(operatorToken);
+                }
+            }
+            function onRight(right, state, _node) {
+                if (!state.skip) {
+                    return maybeBind(right);
+                }
+            }
+            function onExit(node, state) {
+                if (!state.skip) {
+                    var operator = node.operatorToken.kind;
+                    if (ts.isAssignmentOperator(operator) && !ts.isAssignmentTarget(node)) {
+                        bindAssignmentTargetFlow(node.left);
+                        if (operator === 62 /* EqualsToken */ && node.left.kind === 203 /* ElementAccessExpression */) {
+                            var elementAccess = node.left;
+                            if (isNarrowableOperand(elementAccess.expression)) {
+                                currentFlow = createFlowMutation(256 /* ArrayMutation */, currentFlow, node);
                             }
                         }
-                        completeNode();
-                        break;
                     }
-                    default: return ts.Debug.fail("Invalid state " + workStacks.state[stackIndex] + " for bindBinaryExpressionFlow");
-                }
-            }
-            /**
-             * Note that `advanceState` sets the _current_ head state, and that `maybeBind` potentially pushes on a new
-             * head state; so `advanceState` must be called before any `maybeBind` during a state's execution.
-             */
-            function advanceState(state, isInStrictMode, parent) {
-                workStacks.state[stackIndex] = state;
-                if (isInStrictMode !== undefined) {
-                    workStacks.inStrictMode[stackIndex] = isInStrictMode;
                 }
-                if (parent !== undefined) {
-                    workStacks.parent[stackIndex] = parent;
+                var savedInStrictMode = state.inStrictModeStack[state.stackIndex];
+                var savedParent = state.parentStack[state.stackIndex];
+                if (savedInStrictMode !== undefined) {
+                    inStrictMode = savedInStrictMode;
                 }
-            }
-            function completeNode() {
-                if (workStacks.inStrictMode[stackIndex] !== undefined) {
-                    inStrictMode = workStacks.inStrictMode[stackIndex];
-                    parent = workStacks.parent[stackIndex];
+                if (savedParent !== undefined) {
+                    parent = savedParent;
                 }
-                stackIndex--;
+                state.skip = false;
+                state.stackIndex--;
             }
-            /**
-             * If `node` is a BinaryExpression, adds it to the local work stack, otherwise recursively binds it
-             */
             function maybeBind(node) {
                 if (node && ts.isBinaryExpression(node) && !ts.isDestructuringAssignment(node)) {
-                    stackIndex++;
-                    workStacks.expr[stackIndex] = node;
-                    workStacks.state[stackIndex] = 0 /* BindThenBindChildren */;
-                    workStacks.inStrictMode[stackIndex] = undefined;
-                    workStacks.parent[stackIndex] = undefined;
-                }
-                else {
-                    bind(node);
+                    return node;
                 }
+                bind(node);
             }
         }
         function bindDeleteExpressionFlow(node) {
             bindEachChild(node);
-            if (node.expression.kind === 201 /* PropertyAccessExpression */) {
+            if (node.expression.kind === 202 /* PropertyAccessExpression */) {
                 bindAssignmentTargetFlow(node.expression);
             }
         }
@@ -41864,7 +42948,7 @@ var ts;
         }
         function bindJSDocTypeAlias(node) {
             ts.setParent(node.tagName, node);
-            if (node.kind !== 325 /* JSDocEnumTag */ && node.fullName) {
+            if (node.kind !== 329 /* JSDocEnumTag */ && node.fullName) {
                 ts.setParent(node.fullName, node);
                 ts.setParentRecursive(node.fullName, /*incremental*/ false);
             }
@@ -41872,7 +42956,7 @@ var ts;
         function bindJSDocClassTag(node) {
             bindEachChild(node);
             var host = ts.getHostSignatureFromJSDoc(node);
-            if (host && host.kind !== 165 /* MethodDeclaration */) {
+            if (host && host.kind !== 166 /* MethodDeclaration */) {
                 addDeclarationToSymbol(host.symbol, host, 32 /* Class */);
             }
         }
@@ -41885,15 +42969,15 @@ var ts;
         }
         function bindOptionalChainRest(node) {
             switch (node.kind) {
-                case 201 /* PropertyAccessExpression */:
+                case 202 /* PropertyAccessExpression */:
                     bind(node.questionDotToken);
                     bind(node.name);
                     break;
-                case 202 /* ElementAccessExpression */:
+                case 203 /* ElementAccessExpression */:
                     bind(node.questionDotToken);
                     bind(node.argumentExpression);
                     break;
-                case 203 /* CallExpression */:
+                case 204 /* CallExpression */:
                     bind(node.questionDotToken);
                     bindEach(node.typeArguments);
                     bindEach(node.arguments);
@@ -41958,7 +43042,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 === 208 /* FunctionExpression */ || expr.kind === 209 /* ArrowFunction */) {
+                if (expr.kind === 209 /* FunctionExpression */ || expr.kind === 210 /* ArrowFunction */) {
                     bindEach(node.typeArguments);
                     bindEach(node.arguments);
                     bind(node.expression);
@@ -41970,7 +43054,7 @@ var ts;
                     }
                 }
             }
-            if (node.expression.kind === 201 /* PropertyAccessExpression */) {
+            if (node.expression.kind === 202 /* PropertyAccessExpression */) {
                 var propertyAccess = node.expression;
                 if (ts.isIdentifier(propertyAccess.name) && isNarrowableOperand(propertyAccess.expression) && ts.isPushOrUnshiftIdentifier(propertyAccess.name)) {
                     currentFlow = createFlowMutation(256 /* ArrayMutation */, currentFlow, node);
@@ -41979,54 +43063,54 @@ var ts;
         }
         function getContainerFlags(node) {
             switch (node.kind) {
-                case 221 /* ClassExpression */:
-                case 252 /* ClassDeclaration */:
-                case 255 /* EnumDeclaration */:
-                case 200 /* ObjectLiteralExpression */:
-                case 177 /* TypeLiteral */:
-                case 312 /* JSDocTypeLiteral */:
-                case 281 /* JsxAttributes */:
+                case 222 /* ClassExpression */:
+                case 253 /* ClassDeclaration */:
+                case 256 /* EnumDeclaration */:
+                case 201 /* ObjectLiteralExpression */:
+                case 178 /* TypeLiteral */:
+                case 314 /* JSDocTypeLiteral */:
+                case 282 /* JsxAttributes */:
                     return 1 /* IsContainer */;
-                case 253 /* InterfaceDeclaration */:
+                case 254 /* InterfaceDeclaration */:
                     return 1 /* IsContainer */ | 64 /* IsInterface */;
-                case 256 /* ModuleDeclaration */:
-                case 254 /* TypeAliasDeclaration */:
-                case 190 /* MappedType */:
+                case 257 /* ModuleDeclaration */:
+                case 255 /* TypeAliasDeclaration */:
+                case 191 /* MappedType */:
                     return 1 /* IsContainer */ | 32 /* HasLocals */;
-                case 297 /* SourceFile */:
+                case 298 /* SourceFile */:
                     return 1 /* IsContainer */ | 4 /* IsControlFlowContainer */ | 32 /* HasLocals */;
-                case 165 /* MethodDeclaration */:
+                case 166 /* MethodDeclaration */:
                     if (ts.isObjectLiteralOrClassExpressionMethod(node)) {
                         return 1 /* IsContainer */ | 4 /* IsControlFlowContainer */ | 32 /* HasLocals */ | 8 /* IsFunctionLike */ | 128 /* IsObjectLiteralOrClassExpressionMethod */;
                     }
                 // falls through
-                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 */:
+                case 167 /* Constructor */:
+                case 252 /* FunctionDeclaration */:
+                case 165 /* MethodSignature */:
+                case 168 /* GetAccessor */:
+                case 169 /* SetAccessor */:
+                case 170 /* CallSignature */:
+                case 315 /* JSDocSignature */:
+                case 309 /* JSDocFunctionType */:
+                case 175 /* FunctionType */:
+                case 171 /* ConstructSignature */:
+                case 172 /* IndexSignature */:
+                case 176 /* ConstructorType */:
                     return 1 /* IsContainer */ | 4 /* IsControlFlowContainer */ | 32 /* HasLocals */ | 8 /* IsFunctionLike */;
-                case 208 /* FunctionExpression */:
-                case 209 /* ArrowFunction */:
+                case 209 /* FunctionExpression */:
+                case 210 /* ArrowFunction */:
                     return 1 /* IsContainer */ | 4 /* IsControlFlowContainer */ | 32 /* HasLocals */ | 8 /* IsFunctionLike */ | 16 /* IsFunctionExpression */;
-                case 257 /* ModuleBlock */:
+                case 258 /* ModuleBlock */:
                     return 4 /* IsControlFlowContainer */;
-                case 163 /* PropertyDeclaration */:
+                case 164 /* PropertyDeclaration */:
                     return node.initializer ? 4 /* IsControlFlowContainer */ : 0;
-                case 287 /* CatchClause */:
-                case 237 /* ForStatement */:
-                case 238 /* ForInStatement */:
-                case 239 /* ForOfStatement */:
-                case 258 /* CaseBlock */:
+                case 288 /* CatchClause */:
+                case 238 /* ForStatement */:
+                case 239 /* ForInStatement */:
+                case 240 /* ForOfStatement */:
+                case 259 /* CaseBlock */:
                     return 2 /* IsBlockScopedContainer */;
-                case 230 /* Block */:
+                case 231 /* 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
@@ -42059,45 +43143,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 256 /* ModuleDeclaration */:
+                case 257 /* ModuleDeclaration */:
                     return declareModuleMember(node, symbolFlags, symbolExcludes);
-                case 297 /* SourceFile */:
+                case 298 /* SourceFile */:
                     return declareSourceFileMember(node, symbolFlags, symbolExcludes);
-                case 221 /* ClassExpression */:
-                case 252 /* ClassDeclaration */:
+                case 222 /* ClassExpression */:
+                case 253 /* ClassDeclaration */:
                     return declareClassMember(node, symbolFlags, symbolExcludes);
-                case 255 /* EnumDeclaration */:
+                case 256 /* EnumDeclaration */:
                     return declareSymbol(container.symbol.exports, container.symbol, node, symbolFlags, symbolExcludes);
-                case 177 /* TypeLiteral */:
-                case 312 /* JSDocTypeLiteral */:
-                case 200 /* ObjectLiteralExpression */:
-                case 253 /* InterfaceDeclaration */:
-                case 281 /* JsxAttributes */:
+                case 178 /* TypeLiteral */:
+                case 314 /* JSDocTypeLiteral */:
+                case 201 /* ObjectLiteralExpression */:
+                case 254 /* InterfaceDeclaration */:
+                case 282 /* 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 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 */:
+                case 175 /* FunctionType */:
+                case 176 /* ConstructorType */:
+                case 170 /* CallSignature */:
+                case 171 /* ConstructSignature */:
+                case 315 /* JSDocSignature */:
+                case 172 /* IndexSignature */:
+                case 166 /* MethodDeclaration */:
+                case 165 /* MethodSignature */:
+                case 167 /* Constructor */:
+                case 168 /* GetAccessor */:
+                case 169 /* SetAccessor */:
+                case 252 /* FunctionDeclaration */:
+                case 209 /* FunctionExpression */:
+                case 210 /* ArrowFunction */:
+                case 309 /* JSDocFunctionType */:
+                case 335 /* JSDocTypedefTag */:
+                case 328 /* JSDocCallbackTag */:
+                case 255 /* TypeAliasDeclaration */:
+                case 191 /* 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
@@ -42198,7 +43282,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 === 290 /* SpreadAssignment */ || prop.name.kind !== 78 /* Identifier */) {
+                    if (prop.kind === 291 /* SpreadAssignment */ || prop.name.kind !== 78 /* Identifier */) {
                         continue;
                     }
                     var identifier = prop.name;
@@ -42210,7 +43294,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 === 288 /* PropertyAssignment */ || prop.kind === 289 /* ShorthandPropertyAssignment */ || prop.kind === 165 /* MethodDeclaration */
+                    var currentKind = prop.kind === 289 /* PropertyAssignment */ || prop.kind === 290 /* ShorthandPropertyAssignment */ || prop.kind === 166 /* MethodDeclaration */
                         ? 1 /* Property */
                         : 2 /* Accessor */;
                     var existingKind = seen.get(identifier.escapedText);
@@ -42242,10 +43326,10 @@ var ts;
         }
         function bindBlockScopedDeclaration(node, symbolFlags, symbolExcludes) {
             switch (blockScopeContainer.kind) {
-                case 256 /* ModuleDeclaration */:
+                case 257 /* ModuleDeclaration */:
                     declareModuleMember(node, symbolFlags, symbolExcludes);
                     break;
-                case 297 /* SourceFile */:
+                case 298 /* SourceFile */:
                     if (ts.isExternalOrCommonJsModule(container)) {
                         declareModuleMember(node, symbolFlags, symbolExcludes);
                         break;
@@ -42270,9 +43354,9 @@ var ts;
             var saveCurrentFlow = currentFlow;
             for (var _i = 0, delayedTypeAliases_1 = delayedTypeAliases; _i < delayedTypeAliases_1.length; _i++) {
                 var typeAlias = delayedTypeAliases_1[_i];
-                var host = ts.getJSDocHost(typeAlias);
-                container = (host && ts.findAncestor(host.parent, function (n) { return !!(getContainerFlags(n) & 1 /* IsContainer */); })) || file;
-                blockScopeContainer = (host && ts.getEnclosingBlockScopeContainer(host)) || file;
+                var host = typeAlias.parent.parent;
+                container = ts.findAncestor(host.parent, function (n) { return !!(getContainerFlags(n) & 1 /* IsContainer */); }) || file;
+                blockScopeContainer = ts.getEnclosingBlockScopeContainer(host) || file;
                 currentFlow = initFlowNode({ flags: 2 /* Start */ });
                 parent = typeAlias;
                 bind(typeAlias.typeExpression);
@@ -42444,8 +43528,8 @@ var ts;
         function checkStrictModeFunctionDeclaration(node) {
             if (languageVersion < 2 /* ES2015 */) {
                 // Report error if function is not top level function declaration
-                if (blockScopeContainer.kind !== 297 /* SourceFile */ &&
-                    blockScopeContainer.kind !== 256 /* ModuleDeclaration */ &&
+                if (blockScopeContainer.kind !== 298 /* SourceFile */ &&
+                    blockScopeContainer.kind !== 257 /* 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.
@@ -42540,7 +43624,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 > 156 /* LastToken */) {
+            if (node.kind > 157 /* LastToken */) {
                 var saveParent = parent;
                 parent = node;
                 var containerFlags = getContainerFlags(node);
@@ -42616,22 +43700,23 @@ var ts;
                     }
                 // falls through
                 case 107 /* ThisKeyword */:
-                    if (currentFlow && (ts.isExpression(node) || parent.kind === 289 /* ShorthandPropertyAssignment */)) {
+                    if (currentFlow && (ts.isExpression(node) || parent.kind === 290 /* ShorthandPropertyAssignment */)) {
                         node.flowNode = currentFlow;
                     }
                     return checkContextualIdentifier(node);
-                case 157 /* QualifiedName */:
-                    if (currentFlow && parent.kind === 176 /* TypeQuery */) {
+                case 158 /* QualifiedName */:
+                    if (currentFlow && parent.kind === 177 /* TypeQuery */) {
                         node.flowNode = currentFlow;
                     }
                     break;
+                case 227 /* MetaProperty */:
                 case 105 /* SuperKeyword */:
                     node.flowNode = currentFlow;
                     break;
                 case 79 /* PrivateIdentifier */:
                     return checkPrivateIdentifier(node);
-                case 201 /* PropertyAccessExpression */:
-                case 202 /* ElementAccessExpression */:
+                case 202 /* PropertyAccessExpression */:
+                case 203 /* ElementAccessExpression */:
                     var expr = node;
                     if (currentFlow && isNarrowableReference(expr)) {
                         expr.flowNode = currentFlow;
@@ -42646,7 +43731,7 @@ var ts;
                         declareSymbol(file.locals, /*parent*/ undefined, expr.expression, 1 /* FunctionScopedVariable */ | 134217728 /* ModuleExports */, 111550 /* FunctionScopedVariableExcludes */);
                     }
                     break;
-                case 216 /* BinaryExpression */:
+                case 217 /* BinaryExpression */:
                     var specialKind = ts.getAssignmentDeclarationKind(node);
                     switch (specialKind) {
                         case 1 /* ExportsProperty */:
@@ -42682,78 +43767,78 @@ var ts;
                             ts.Debug.fail("Unknown binary expression special property assignment kind");
                     }
                     return checkStrictModeBinaryExpression(node);
-                case 287 /* CatchClause */:
+                case 288 /* CatchClause */:
                     return checkStrictModeCatchClause(node);
-                case 210 /* DeleteExpression */:
+                case 211 /* DeleteExpression */:
                     return checkStrictModeDeleteExpression(node);
                 case 8 /* NumericLiteral */:
                     return checkStrictModeNumericLiteral(node);
-                case 215 /* PostfixUnaryExpression */:
+                case 216 /* PostfixUnaryExpression */:
                     return checkStrictModePostfixUnaryExpression(node);
-                case 214 /* PrefixUnaryExpression */:
+                case 215 /* PrefixUnaryExpression */:
                     return checkStrictModePrefixUnaryExpression(node);
-                case 243 /* WithStatement */:
+                case 244 /* WithStatement */:
                     return checkStrictModeWithStatement(node);
-                case 245 /* LabeledStatement */:
+                case 246 /* LabeledStatement */:
                     return checkStrictModeLabeledStatement(node);
-                case 187 /* ThisType */:
+                case 188 /* ThisType */:
                     seenThisKeyword = true;
                     return;
-                case 172 /* TypePredicate */:
+                case 173 /* TypePredicate */:
                     break; // Binding the children will handle everything
-                case 159 /* TypeParameter */:
+                case 160 /* TypeParameter */:
                     return bindTypeParameter(node);
-                case 160 /* Parameter */:
+                case 161 /* Parameter */:
                     return bindParameter(node);
-                case 249 /* VariableDeclaration */:
+                case 250 /* VariableDeclaration */:
                     return bindVariableDeclarationOrBindingElement(node);
-                case 198 /* BindingElement */:
+                case 199 /* BindingElement */:
                     node.flowNode = currentFlow;
                     return bindVariableDeclarationOrBindingElement(node);
-                case 163 /* PropertyDeclaration */:
-                case 162 /* PropertySignature */:
+                case 164 /* PropertyDeclaration */:
+                case 163 /* PropertySignature */:
                     return bindPropertyWorker(node);
-                case 288 /* PropertyAssignment */:
-                case 289 /* ShorthandPropertyAssignment */:
+                case 289 /* PropertyAssignment */:
+                case 290 /* ShorthandPropertyAssignment */:
                     return bindPropertyOrMethodOrAccessor(node, 4 /* Property */, 0 /* PropertyExcludes */);
-                case 291 /* EnumMember */:
+                case 292 /* EnumMember */:
                     return bindPropertyOrMethodOrAccessor(node, 8 /* EnumMember */, 900095 /* EnumMemberExcludes */);
-                case 169 /* CallSignature */:
-                case 170 /* ConstructSignature */:
-                case 171 /* IndexSignature */:
+                case 170 /* CallSignature */:
+                case 171 /* ConstructSignature */:
+                case 172 /* IndexSignature */:
                     return declareSymbolAndAddToSymbolTable(node, 131072 /* Signature */, 0 /* None */);
-                case 165 /* MethodDeclaration */:
-                case 164 /* MethodSignature */:
+                case 166 /* MethodDeclaration */:
+                case 165 /* 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 251 /* FunctionDeclaration */:
+                case 252 /* FunctionDeclaration */:
                     return bindFunctionDeclaration(node);
-                case 166 /* Constructor */:
+                case 167 /* Constructor */:
                     return declareSymbolAndAddToSymbolTable(node, 16384 /* Constructor */, /*symbolExcludes:*/ 0 /* None */);
-                case 167 /* GetAccessor */:
+                case 168 /* GetAccessor */:
                     return bindPropertyOrMethodOrAccessor(node, 32768 /* GetAccessor */, 46015 /* GetAccessorExcludes */);
-                case 168 /* SetAccessor */:
+                case 169 /* SetAccessor */:
                     return bindPropertyOrMethodOrAccessor(node, 65536 /* SetAccessor */, 78783 /* SetAccessorExcludes */);
-                case 174 /* FunctionType */:
-                case 308 /* JSDocFunctionType */:
-                case 313 /* JSDocSignature */:
-                case 175 /* ConstructorType */:
+                case 175 /* FunctionType */:
+                case 309 /* JSDocFunctionType */:
+                case 315 /* JSDocSignature */:
+                case 176 /* ConstructorType */:
                     return bindFunctionOrConstructorType(node);
-                case 177 /* TypeLiteral */:
-                case 312 /* JSDocTypeLiteral */:
-                case 190 /* MappedType */:
+                case 178 /* TypeLiteral */:
+                case 314 /* JSDocTypeLiteral */:
+                case 191 /* MappedType */:
                     return bindAnonymousTypeWorker(node);
-                case 319 /* JSDocClassTag */:
+                case 322 /* JSDocClassTag */:
                     return bindJSDocClassTag(node);
-                case 200 /* ObjectLiteralExpression */:
+                case 201 /* ObjectLiteralExpression */:
                     return bindObjectLiteralExpression(node);
-                case 208 /* FunctionExpression */:
-                case 209 /* ArrowFunction */:
+                case 209 /* FunctionExpression */:
+                case 210 /* ArrowFunction */:
                     return bindFunctionExpression(node);
-                case 203 /* CallExpression */:
+                case 204 /* CallExpression */:
                     var assignmentKind = ts.getAssignmentDeclarationKind(node);
                     switch (assignmentKind) {
                         case 7 /* ObjectDefinePropertyValue */:
@@ -42772,65 +43857,65 @@ var ts;
                     }
                     break;
                 // Members of classes, interfaces, and modules
-                case 221 /* ClassExpression */:
-                case 252 /* ClassDeclaration */:
+                case 222 /* ClassExpression */:
+                case 253 /* ClassDeclaration */:
                     // All classes are automatically in strict mode in ES6.
                     inStrictMode = true;
                     return bindClassLikeDeclaration(node);
-                case 253 /* InterfaceDeclaration */:
+                case 254 /* InterfaceDeclaration */:
                     return bindBlockScopedDeclaration(node, 64 /* Interface */, 788872 /* InterfaceExcludes */);
-                case 254 /* TypeAliasDeclaration */:
+                case 255 /* TypeAliasDeclaration */:
                     return bindBlockScopedDeclaration(node, 524288 /* TypeAlias */, 788968 /* TypeAliasExcludes */);
-                case 255 /* EnumDeclaration */:
+                case 256 /* EnumDeclaration */:
                     return bindEnumDeclaration(node);
-                case 256 /* ModuleDeclaration */:
+                case 257 /* ModuleDeclaration */:
                     return bindModuleDeclaration(node);
                 // Jsx-attributes
-                case 281 /* JsxAttributes */:
+                case 282 /* JsxAttributes */:
                     return bindJsxAttributes(node);
-                case 280 /* JsxAttribute */:
+                case 281 /* JsxAttribute */:
                     return bindJsxAttribute(node, 4 /* Property */, 0 /* PropertyExcludes */);
                 // Imports and exports
-                case 260 /* ImportEqualsDeclaration */:
-                case 263 /* NamespaceImport */:
-                case 265 /* ImportSpecifier */:
-                case 270 /* ExportSpecifier */:
+                case 261 /* ImportEqualsDeclaration */:
+                case 264 /* NamespaceImport */:
+                case 266 /* ImportSpecifier */:
+                case 271 /* ExportSpecifier */:
                     return declareSymbolAndAddToSymbolTable(node, 2097152 /* Alias */, 2097152 /* AliasExcludes */);
-                case 259 /* NamespaceExportDeclaration */:
+                case 260 /* NamespaceExportDeclaration */:
                     return bindNamespaceExportDeclaration(node);
-                case 262 /* ImportClause */:
+                case 263 /* ImportClause */:
                     return bindImportClause(node);
-                case 267 /* ExportDeclaration */:
+                case 268 /* ExportDeclaration */:
                     return bindExportDeclaration(node);
-                case 266 /* ExportAssignment */:
+                case 267 /* ExportAssignment */:
                     return bindExportAssignment(node);
-                case 297 /* SourceFile */:
+                case 298 /* SourceFile */:
                     updateStrictModeStatementList(node.statements);
                     return bindSourceFileIfExternalModule();
-                case 230 /* Block */:
+                case 231 /* Block */:
                     if (!ts.isFunctionLike(node.parent)) {
                         return;
                     }
                 // falls through
-                case 257 /* ModuleBlock */:
+                case 258 /* ModuleBlock */:
                     return updateStrictModeStatementList(node.statements);
-                case 326 /* JSDocParameterTag */:
-                    if (node.parent.kind === 313 /* JSDocSignature */) {
+                case 330 /* JSDocParameterTag */:
+                    if (node.parent.kind === 315 /* JSDocSignature */) {
                         return bindParameter(node);
                     }
-                    if (node.parent.kind !== 312 /* JSDocTypeLiteral */) {
+                    if (node.parent.kind !== 314 /* JSDocTypeLiteral */) {
                         break;
                     }
                 // falls through
-                case 333 /* JSDocPropertyTag */:
+                case 337 /* JSDocPropertyTag */:
                     var propTag = node;
-                    var flags = propTag.isBracketed || propTag.typeExpression && propTag.typeExpression.type.kind === 307 /* JSDocOptionalType */ ?
+                    var flags = propTag.isBracketed || propTag.typeExpression && propTag.typeExpression.type.kind === 308 /* JSDocOptionalType */ ?
                         4 /* Property */ | 16777216 /* Optional */ :
                         4 /* Property */;
                     return declareSymbolAndAddToSymbolTable(propTag, flags, 0 /* PropertyExcludes */);
-                case 331 /* JSDocTypedefTag */:
-                case 324 /* JSDocCallbackTag */:
-                case 325 /* JSDocEnumTag */:
+                case 335 /* JSDocTypedefTag */:
+                case 328 /* JSDocCallbackTag */:
+                case 329 /* JSDocEnumTag */:
                     return (delayedTypeAliases || (delayedTypeAliases = [])).push(node);
             }
         }
@@ -42858,8 +43943,8 @@ var ts;
         }
         function bindExportAssignment(node) {
             if (!container.symbol || !container.symbol.exports) {
-                // Export assignment in some sort of block construct
-                bindAnonymousDeclaration(node, 2097152 /* Alias */, getDeclarationName(node));
+                // Incorrect export assignment in some sort of block construct
+                bindAnonymousDeclaration(node, 111551 /* Value */, getDeclarationName(node));
             }
             else {
                 var flags = ts.exportAssignmentIsAlias(node)
@@ -42993,8 +44078,8 @@ var ts;
             }
             var thisContainer = ts.getThisContainer(node, /*includeArrowFunctions*/ false);
             switch (thisContainer.kind) {
-                case 251 /* FunctionDeclaration */:
-                case 208 /* FunctionExpression */:
+                case 252 /* FunctionDeclaration */:
+                case 209 /* 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 */) {
@@ -43016,11 +44101,11 @@ var ts;
                         addDeclarationToSymbol(constructorSymbol, constructorSymbol.valueDeclaration, 32 /* Class */);
                     }
                     break;
-                case 166 /* Constructor */:
-                case 163 /* PropertyDeclaration */:
-                case 165 /* MethodDeclaration */:
-                case 167 /* GetAccessor */:
-                case 168 /* SetAccessor */:
+                case 167 /* Constructor */:
+                case 164 /* PropertyDeclaration */:
+                case 166 /* MethodDeclaration */:
+                case 168 /* GetAccessor */:
+                case 169 /* SetAccessor */:
                     // this.foo assignment in a JavaScript class
                     // Bind this property to the containing class
                     var containingClass = thisContainer.parent;
@@ -43032,7 +44117,7 @@ var ts;
                         declareSymbol(symbolTable, containingClass.symbol, node, 4 /* Property */ | 67108864 /* Assignment */, 0 /* None */, /*isReplaceableByMethod*/ true);
                     }
                     break;
-                case 297 /* SourceFile */:
+                case 298 /* 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;
@@ -43061,7 +44146,7 @@ var ts;
             if (node.expression.kind === 107 /* ThisKeyword */) {
                 bindThisPropertyAssignment(node);
             }
-            else if (ts.isBindableStaticAccessExpression(node) && node.parent.parent.kind === 297 /* SourceFile */) {
+            else if (ts.isBindableStaticAccessExpression(node) && node.parent.parent.kind === 298 /* SourceFile */) {
                 if (ts.isPrototypeAccess(node.expression)) {
                     bindPrototypePropertyAssignment(node, node.parent);
                 }
@@ -43101,7 +44186,7 @@ var ts;
         }
         function bindObjectDefinePropertyAssignment(node) {
             var namespaceSymbol = lookupSymbolForPropertyAccess(node.arguments[0]);
-            var isToplevel = node.parent.parent.kind === 297 /* SourceFile */;
+            var isToplevel = node.parent.parent.kind === 298 /* SourceFile */;
             namespaceSymbol = bindPotentiallyMissingNamespaces(namespaceSymbol, node.arguments[0], isToplevel, /*isPrototypeProperty*/ false, /*containerIsClass*/ false);
             bindPotentiallyNewExpandoMemberToNamespace(node, namespaceSymbol, /*isPrototypeProperty*/ false);
         }
@@ -43210,8 +44295,8 @@ var ts;
         }
         function isTopLevelNamespaceAssignment(propertyAccess) {
             return ts.isBinaryExpression(propertyAccess.parent)
-                ? getParentOfBinaryExpression(propertyAccess.parent).parent.kind === 297 /* SourceFile */
-                : propertyAccess.parent.parent.kind === 297 /* SourceFile */;
+                ? getParentOfBinaryExpression(propertyAccess.parent).parent.kind === 298 /* SourceFile */
+                : propertyAccess.parent.parent.kind === 298 /* SourceFile */;
         }
         function bindPropertyAssignment(name, propertyAccess, isPrototypeProperty, containerIsClass) {
             var namespaceSymbol = lookupSymbolForPropertyAccess(name, container) || lookupSymbolForPropertyAccess(name, blockScopeContainer);
@@ -43290,7 +44375,7 @@ var ts;
             }
         }
         function bindClassLikeDeclaration(node) {
-            if (node.kind === 252 /* ClassDeclaration */) {
+            if (node.kind === 253 /* ClassDeclaration */) {
                 bindBlockScopedDeclaration(node, 32 /* Class */, 899503 /* ClassExcludes */);
             }
             else {
@@ -43332,7 +44417,7 @@ var ts;
                 checkStrictModeEvalOrArguments(node, node.name);
             }
             if (!ts.isBindingPattern(node.name)) {
-                if (ts.isInJSFile(node) && ts.isRequireVariableDeclaration(node, /*requireStringLiteralLikeArgument*/ true) && !ts.getJSDocTypeTag(node)) {
+                if (ts.isInJSFile(node) && ts.isRequireVariableDeclaration(node) && !ts.getJSDocTypeTag(node)) {
                     declareSymbolAndAddToSymbolTable(node, 2097152 /* Alias */, 2097152 /* AliasExcludes */);
                 }
                 else if (ts.isBlockOrCatchScoped(node)) {
@@ -43356,7 +44441,7 @@ var ts;
             }
         }
         function bindParameter(node) {
-            if (node.kind === 326 /* JSDocParameterTag */ && container.kind !== 313 /* JSDocSignature */) {
+            if (node.kind === 330 /* JSDocParameterTag */ && container.kind !== 315 /* JSDocSignature */) {
                 return;
             }
             if (inStrictMode && !(node.flags & 8388608 /* Ambient */)) {
@@ -43433,7 +44518,7 @@ var ts;
                     declareSymbolAndAddToSymbolTable(node, 262144 /* TypeParameter */, 526824 /* TypeParameterExcludes */);
                 }
             }
-            else if (node.parent.kind === 185 /* InferType */) {
+            else if (node.parent.kind === 186 /* InferType */) {
                 var container_2 = getInferTypeContainer(node.parent);
                 if (container_2) {
                     if (!container_2.locals) {
@@ -43461,11 +44546,11 @@ var ts;
             if (currentFlow === unreachableFlow) {
                 var reportError = 
                 // report error on all statements except empty ones
-                (ts.isStatementButNotDeclaration(node) && node.kind !== 231 /* EmptyStatement */) ||
+                (ts.isStatementButNotDeclaration(node) && node.kind !== 232 /* EmptyStatement */) ||
                     // report error on class declarations
-                    node.kind === 252 /* ClassDeclaration */ ||
+                    node.kind === 253 /* ClassDeclaration */ ||
                     // report error on instantiated modules or const-enums only modules if preserveConstEnums is set
-                    (node.kind === 256 /* ModuleDeclaration */ && shouldReportErrorOnModuleDeclaration(node));
+                    (node.kind === 257 /* ModuleDeclaration */ && shouldReportErrorOnModuleDeclaration(node));
                 if (reportError) {
                     currentFlow = reportedUnreachableFlow;
                     if (!options.allowUnreachableCode) {
@@ -43509,12 +44594,12 @@ var ts;
     }
     function isPurelyTypeDeclaration(s) {
         switch (s.kind) {
-            case 253 /* InterfaceDeclaration */:
-            case 254 /* TypeAliasDeclaration */:
+            case 254 /* InterfaceDeclaration */:
+            case 255 /* TypeAliasDeclaration */:
                 return true;
-            case 256 /* ModuleDeclaration */:
+            case 257 /* ModuleDeclaration */:
                 return getModuleInstanceState(s) !== 1 /* Instantiated */;
-            case 255 /* EnumDeclaration */:
+            case 256 /* EnumDeclaration */:
                 return ts.hasSyntacticModifier(s, 2048 /* Const */);
             default:
                 return false;
@@ -43714,7 +44799,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 === 176 /* TypeQuery */) {
+                    if (d.type && d.type.kind === 177 /* TypeQuery */) {
                         var query = d.type;
                         var entity = getResolvedSymbol(getFirstIdentifier(query.exprName));
                         visitSymbol(entity);
@@ -43941,6 +45026,7 @@ var ts;
         DeclarationMeaning[DeclarationMeaning["SetAccessor"] = 2] = "SetAccessor";
         DeclarationMeaning[DeclarationMeaning["PropertyAssignment"] = 4] = "PropertyAssignment";
         DeclarationMeaning[DeclarationMeaning["Method"] = 8] = "Method";
+        DeclarationMeaning[DeclarationMeaning["PrivateStatic"] = 16] = "PrivateStatic";
         DeclarationMeaning[DeclarationMeaning["GetOrSetAccessor"] = 3] = "GetOrSetAccessor";
         DeclarationMeaning[DeclarationMeaning["PropertyAssignmentOrMethod"] = 12] = "PropertyAssignmentOrMethod";
     })(DeclarationMeaning || (DeclarationMeaning = {}));
@@ -44032,12 +45118,12 @@ var ts;
         var instantiationCount = 0;
         var instantiationDepth = 0;
         var currentNode;
-        var typeCatalog = []; // NB: id is index + 1
         var emptySymbols = ts.createSymbolTable();
         var arrayVariances = [1 /* Covariant */];
         var compilerOptions = host.getCompilerOptions();
         var languageVersion = ts.getEmitScriptTarget(compilerOptions);
         var moduleKind = ts.getEmitModuleKind(compilerOptions);
+        var useDefineForClassFields = ts.getUseDefineForClassFields(compilerOptions);
         var allowSyntheticDefaultImports = ts.getAllowSyntheticDefaultImports(compilerOptions);
         var strictNullChecks = ts.getStrictOptionValue(compilerOptions, "strictNullChecks");
         var strictFunctionTypes = ts.getStrictOptionValue(compilerOptions, "strictFunctionTypes");
@@ -44046,7 +45132,8 @@ var ts;
         var noImplicitAny = ts.getStrictOptionValue(compilerOptions, "noImplicitAny");
         var noImplicitThis = ts.getStrictOptionValue(compilerOptions, "noImplicitThis");
         var keyofStringsOnly = !!compilerOptions.keyofStringsOnly;
-        var freshObjectLiteralFlag = compilerOptions.suppressExcessPropertyErrors ? 0 : 32768 /* FreshLiteral */;
+        var freshObjectLiteralFlag = compilerOptions.suppressExcessPropertyErrors ? 0 : 16384 /* FreshLiteral */;
+        var checkBinaryExpression = createCheckBinaryExpression();
         var emitResolver = createResolver();
         var nodeBuilder = createNodeBuilder();
         var globals = ts.createSymbolTable();
@@ -44069,7 +45156,6 @@ 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 ({
@@ -44233,6 +45319,7 @@ var ts;
                 return node && getContextualTypeForJsxAttribute(node);
             },
             isContextSensitive: isContextSensitive,
+            getTypeOfPropertyOfContextualType: getTypeOfPropertyOfContextualType,
             getFullyQualifiedName: getFullyQualifiedName,
             getResolvedSignature: function (node, candidatesOutArray, argumentCount) {
                 return getResolvedSignatureWorker(node, candidatesOutArray, argumentCount, 0 /* Normal */);
@@ -44276,6 +45363,7 @@ var ts;
             },
             tryGetMemberInModuleExports: function (name, symbol) { return tryGetMemberInModuleExports(ts.escapeLeadingUnderscores(name), symbol); },
             tryGetMemberInModuleExportsAndProperties: function (name, symbol) { return tryGetMemberInModuleExportsAndProperties(ts.escapeLeadingUnderscores(name), symbol); },
+            tryFindAmbientModule: function (moduleName) { return tryFindAmbientModule(moduleName, /*withAugmentations*/ true); },
             tryFindAmbientModuleWithoutAugmentations: function (moduleName) {
                 // we deliberately exclude augmentations
                 // since we are only interested in declarations of the module itself
@@ -44394,6 +45482,7 @@ var ts;
         var templateLiteralTypes = new ts.Map();
         var stringMappingTypes = new ts.Map();
         var substitutionTypes = new ts.Map();
+        var subtypeReductionCache = new ts.Map();
         var evolvingArrayTypes = [];
         var undefinedProperties = new ts.Map();
         var unknownSymbol = createSymbol(4 /* Property */, "unknown");
@@ -44402,14 +45491,14 @@ var ts;
         var autoType = createIntrinsicType(1 /* Any */, "any");
         var wildcardType = createIntrinsicType(1 /* Any */, "any");
         var errorType = createIntrinsicType(1 /* Any */, "error");
-        var nonInferrableAnyType = createIntrinsicType(1 /* Any */, "any", 524288 /* ContainsWideningType */);
+        var nonInferrableAnyType = createIntrinsicType(1 /* Any */, "any", 131072 /* 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 */);
+        var undefinedWideningType = strictNullChecks ? undefinedType : createIntrinsicType(32768 /* Undefined */, "undefined", 131072 /* ContainsWideningType */);
         var optionalType = createIntrinsicType(32768 /* Undefined */, "undefined");
         var nullType = createIntrinsicType(65536 /* Null */, "null");
-        var nullWideningType = strictNullChecks ? nullType : createIntrinsicType(65536 /* Null */, "null", 524288 /* ContainsWideningType */);
+        var nullWideningType = strictNullChecks ? nullType : createIntrinsicType(65536 /* Null */, "null", 131072 /* ContainsWideningType */);
         var stringType = createIntrinsicType(4 /* String */, "string");
         var numberType = createIntrinsicType(8 /* Number */, "number");
         var bigintType = createIntrinsicType(64 /* BigInt */, "bigint");
@@ -44435,7 +45524,7 @@ var ts;
         var voidType = createIntrinsicType(16384 /* Void */, "void");
         var neverType = createIntrinsicType(131072 /* Never */, "never");
         var silentNeverType = createIntrinsicType(131072 /* Never */, "never");
-        var nonInferrableType = createIntrinsicType(131072 /* Never */, "never", 2097152 /* NonInferrableType */);
+        var nonInferrableType = createIntrinsicType(131072 /* Never */, "never", 524288 /* NonInferrableType */);
         var implicitNeverType = createIntrinsicType(131072 /* Never */, "never");
         var unreachableNeverType = createIntrinsicType(131072 /* Never */, "never");
         var nonPrimitiveType = createIntrinsicType(67108864 /* NonPrimitive */, "object");
@@ -44447,7 +45536,7 @@ var ts;
         var permissiveMapper = makeFunctionTypeMapper(function (t) { return t.flags & 262144 /* TypeParameter */ ? wildcardType : t; });
         var emptyObjectType = createAnonymousType(undefined, emptySymbols, ts.emptyArray, ts.emptyArray, undefined, undefined);
         var emptyJsxObjectType = createAnonymousType(undefined, emptySymbols, ts.emptyArray, ts.emptyArray, undefined, undefined);
-        emptyJsxObjectType.objectFlags |= 4096 /* JsxAttributes */;
+        emptyJsxObjectType.objectFlags |= 2048 /* JsxAttributes */;
         var emptyTypeLiteralSymbol = createSymbol(2048 /* TypeLiteral */, "__type" /* Type */);
         emptyTypeLiteralSymbol.members = ts.createSymbolTable();
         var emptyTypeLiteralType = createAnonymousType(emptyTypeLiteralSymbol, emptySymbols, ts.emptyArray, ts.emptyArray, undefined, undefined);
@@ -44456,7 +45545,7 @@ var ts;
         var anyFunctionType = createAnonymousType(undefined, emptySymbols, ts.emptyArray, ts.emptyArray, undefined, undefined);
         // The anyFunctionType contains the anyFunctionType by definition. The flag is further propagated
         // in getPropagatingFlagsOfTypes, and it is checked in inferFromTypes.
-        anyFunctionType.objectFlags |= 2097152 /* NonInferrableType */;
+        anyFunctionType.objectFlags |= 524288 /* NonInferrableType */;
         var noConstraintType = createAnonymousType(undefined, emptySymbols, ts.emptyArray, ts.emptyArray, undefined, undefined);
         var circularConstraintType = createAnonymousType(undefined, emptySymbols, ts.emptyArray, ts.emptyArray, undefined, undefined);
         var resolvingDefaultType = createAnonymousType(undefined, emptySymbols, ts.emptyArray, ts.emptyArray, undefined, undefined);
@@ -44536,6 +45625,7 @@ var ts;
         // This allows users to just specify library files they want to used through --lib
         // and they will not get an error from not having unrelated library files
         var deferredGlobalESSymbolConstructorSymbol;
+        var deferredGlobalESSymbolConstructorTypeSymbol;
         var deferredGlobalESSymbolType;
         var deferredGlobalTypedPropertyDescriptorType;
         var deferredGlobalPromiseType;
@@ -44587,7 +45677,7 @@ var ts;
         var flowNodePostSuper = [];
         var potentialThisCollisions = [];
         var potentialNewTargetCollisions = [];
-        var potentialWeakMapCollisions = [];
+        var potentialWeakMapSetCollisions = [];
         var awaitedTypeStack = [];
         var diagnostics = ts.createDiagnosticCollection();
         var suggestionDiagnostics = ts.createDiagnosticCollection();
@@ -44866,7 +45956,7 @@ var ts;
                 // as we will already report a "Declaration name conflicts..." error, and this error
                 // won't make much sense.
                 if (target !== globalThisSymbol) {
-                    error(ts.getNameOfDeclaration(source.declarations[0]), ts.Diagnostics.Cannot_augment_module_0_with_value_exports_because_it_resolves_to_a_non_module_entity, symbolToString(target));
+                    error(source.declarations && ts.getNameOfDeclaration(source.declarations[0]), ts.Diagnostics.Cannot_augment_module_0_with_value_exports_because_it_resolves_to_a_non_module_entity, symbolToString(target));
                 }
             }
             else { // error
@@ -44900,9 +45990,11 @@ var ts;
             }
             return target;
             function addDuplicateLocations(locs, symbol) {
-                for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
-                    var decl = _a[_i];
-                    ts.pushIfUnique(locs, decl);
+                if (symbol.declarations) {
+                    for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
+                        var decl = _a[_i];
+                        ts.pushIfUnique(locs, decl);
+                    }
                 }
             }
         }
@@ -44948,9 +46040,9 @@ var ts;
             });
         }
         function mergeModuleAugmentation(moduleName) {
-            var _a, _b;
+            var _a, _b, _c;
             var moduleAugmentation = moduleName.parent;
-            if (moduleAugmentation.symbol.declarations[0] !== moduleAugmentation) {
+            if (((_a = moduleAugmentation.symbol.declarations) === null || _a === void 0 ? void 0 : _a[0]) !== moduleAugmentation) {
                 // this is a combined symbol for multiple augmentations within the same file.
                 // its symbol already has accumulated information for all declarations
                 // so we need to add it just once - do the work only for first declaration
@@ -44987,11 +46079,11 @@ var ts;
                         patternAmbientModuleAugmentations.set(moduleName.text, merged);
                     }
                     else {
-                        if (((_a = mainModule_1.exports) === null || _a === void 0 ? void 0 : _a.get("__export" /* ExportStar */)) && ((_b = moduleAugmentation.symbol.exports) === null || _b === void 0 ? void 0 : _b.size)) {
+                        if (((_b = mainModule_1.exports) === null || _b === void 0 ? void 0 : _b.get("__export" /* ExportStar */)) && ((_c = moduleAugmentation.symbol.exports) === null || _c === void 0 ? void 0 : _c.size)) {
                             // We may need to merge the module augmentation's exports into the target symbols of the resolved exports
                             var resolvedExports = getResolvedMembersOrExportsOfSymbol(mainModule_1, "resolvedExports" /* resolvedExports */);
-                            for (var _i = 0, _c = ts.arrayFrom(moduleAugmentation.symbol.exports.entries()); _i < _c.length; _i++) {
-                                var _d = _c[_i], key = _d[0], value = _d[1];
+                            for (var _i = 0, _d = ts.arrayFrom(moduleAugmentation.symbol.exports.entries()); _i < _d.length; _i++) {
+                                var _e = _d[_i], key = _e[0], value = _e[1];
                                 if (resolvedExports.has(key) && !mainModule_1.exports.has(key)) {
                                     mergeSymbol(resolvedExports.get(key), value);
                                 }
@@ -45032,7 +46124,7 @@ var ts;
             return nodeLinks[nodeId] || (nodeLinks[nodeId] = new NodeLinks());
         }
         function isGlobalSourceFile(node) {
-            return node.kind === 297 /* SourceFile */ && !ts.isExternalOrCommonJsModule(node);
+            return node.kind === 298 /* SourceFile */ && !ts.isExternalOrCommonJsModule(node);
         }
         function getSymbol(symbols, name, meaning) {
             if (meaning) {
@@ -45091,17 +46183,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 === 198 /* BindingElement */) {
+                if (declaration.kind === 199 /* 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, 198 /* BindingElement */);
+                    var errorBindingElement = ts.getAncestor(usage, 199 /* 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, 249 /* VariableDeclaration */), usage);
+                    return isBlockScopedNameDeclaredBeforeUse(ts.getAncestor(declaration, 250 /* VariableDeclaration */), usage);
                 }
-                else if (declaration.kind === 249 /* VariableDeclaration */) {
+                else if (declaration.kind === 250 /* VariableDeclaration */) {
                     // still might be illegal if usage is in the initializer of the variable declaration (eg var a = a)
                     return !isImmediatelyUsedInInitializerOfBlockScopedVariable(declaration, usage);
                 }
@@ -45115,7 +46207,7 @@ var ts;
                 }
                 else if (ts.isParameterPropertyDeclaration(declaration, declaration.parent)) {
                     // foo = this.bar is illegal in esnext+useDefineForClassFields when bar is a parameter property
-                    return !(compilerOptions.target === 99 /* ESNext */ && !!compilerOptions.useDefineForClassFields
+                    return !(compilerOptions.target === 99 /* ESNext */ && useDefineForClassFields
                         && ts.getContainingClass(declaration) === ts.getContainingClass(usage)
                         && isUsedInFunctionOrInstanceProperty(usage, declaration));
                 }
@@ -45131,19 +46223,19 @@ 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 === 270 /* ExportSpecifier */ || (usage.parent.kind === 266 /* ExportAssignment */ && usage.parent.isExportEquals)) {
+            if (usage.parent.kind === 271 /* ExportSpecifier */ || (usage.parent.kind === 267 /* 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 === 266 /* ExportAssignment */ && usage.isExportEquals) {
+            if (usage.kind === 267 /* ExportAssignment */ && usage.isExportEquals) {
                 return true;
             }
             if (!!(usage.flags & 4194304 /* JSDoc */) || isInTypeQuery(usage) || usageInTypeDeclaration()) {
                 return true;
             }
             if (isUsedInFunctionOrInstanceProperty(usage, declaration)) {
-                if (compilerOptions.target === 99 /* ESNext */ && !!compilerOptions.useDefineForClassFields
+                if (compilerOptions.target === 99 /* ESNext */ && useDefineForClassFields
                     && ts.getContainingClass(declaration)
                     && (ts.isPropertyDeclaration(declaration) || ts.isParameterPropertyDeclaration(declaration, declaration.parent))) {
                     return !isPropertyImmediatelyReferencedWithinDeclaration(declaration, usage, /*stopAtAnyPropertyDeclaration*/ true);
@@ -45158,9 +46250,9 @@ var ts;
             }
             function isImmediatelyUsedInInitializerOfBlockScopedVariable(declaration, usage) {
                 switch (declaration.parent.parent.kind) {
-                    case 232 /* VariableStatement */:
-                    case 237 /* ForStatement */:
-                    case 239 /* ForOfStatement */:
+                    case 233 /* VariableStatement */:
+                    case 238 /* ForStatement */:
+                    case 240 /* 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)) {
@@ -45181,16 +46273,16 @@ var ts;
                         return true;
                     }
                     var initializerOfProperty = current.parent &&
-                        current.parent.kind === 163 /* PropertyDeclaration */ &&
+                        current.parent.kind === 164 /* PropertyDeclaration */ &&
                         current.parent.initializer === current;
                     if (initializerOfProperty) {
                         if (ts.hasSyntacticModifier(current.parent, 32 /* Static */)) {
-                            if (declaration.kind === 165 /* MethodDeclaration */) {
+                            if (declaration.kind === 166 /* MethodDeclaration */) {
                                 return true;
                             }
                         }
                         else {
-                            var isDeclarationInstanceProperty = declaration.kind === 163 /* PropertyDeclaration */ && !ts.hasSyntacticModifier(declaration, 32 /* Static */);
+                            var isDeclarationInstanceProperty = declaration.kind === 164 /* PropertyDeclaration */ && !ts.hasSyntacticModifier(declaration, 32 /* Static */);
                             if (!isDeclarationInstanceProperty || ts.getContainingClass(usage) !== ts.getContainingClass(declaration)) {
                                 return true;
                             }
@@ -45212,19 +46304,19 @@ var ts;
                         return "quit";
                     }
                     switch (node.kind) {
-                        case 209 /* ArrowFunction */:
+                        case 210 /* ArrowFunction */:
                             return true;
-                        case 163 /* PropertyDeclaration */:
+                        case 164 /* 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 230 /* Block */:
+                        case 231 /* Block */:
                             switch (node.parent.kind) {
-                                case 167 /* GetAccessor */:
-                                case 165 /* MethodDeclaration */:
-                                case 168 /* SetAccessor */:
+                                case 168 /* GetAccessor */:
+                                case 166 /* MethodDeclaration */:
+                                case 169 /* SetAccessor */:
                                     return true;
                                 default:
                                     return false;
@@ -45239,7 +46331,11 @@ var ts;
         function useOuterVariableScopeInParameter(result, location, lastLocation) {
             var target = ts.getEmitScriptTarget(compilerOptions);
             var functionLocation = location;
-            if (ts.isParameter(lastLocation) && functionLocation.body && result.valueDeclaration.pos >= functionLocation.body.pos && result.valueDeclaration.end <= functionLocation.body.end) {
+            if (ts.isParameter(lastLocation)
+                && functionLocation.body
+                && result.valueDeclaration
+                && result.valueDeclaration.pos >= functionLocation.body.pos
+                && result.valueDeclaration.end <= functionLocation.body.end) {
                 // check for several cases where we introduce temporaries that require moving the name/initializer of the parameter to the body
                 // - static field in a class expression
                 // - optional chaining pre-es2020
@@ -45260,21 +46356,21 @@ var ts;
             }
             function requiresScopeChangeWorker(node) {
                 switch (node.kind) {
-                    case 209 /* ArrowFunction */:
-                    case 208 /* FunctionExpression */:
-                    case 251 /* FunctionDeclaration */:
-                    case 166 /* Constructor */:
+                    case 210 /* ArrowFunction */:
+                    case 209 /* FunctionExpression */:
+                    case 252 /* FunctionDeclaration */:
+                    case 167 /* Constructor */:
                         // do not descend into these
                         return false;
-                    case 165 /* MethodDeclaration */:
-                    case 167 /* GetAccessor */:
-                    case 168 /* SetAccessor */:
-                    case 288 /* PropertyAssignment */:
+                    case 166 /* MethodDeclaration */:
+                    case 168 /* GetAccessor */:
+                    case 169 /* SetAccessor */:
+                    case 289 /* PropertyAssignment */:
                         return requiresScopeChangeWorker(node.name);
-                    case 163 /* PropertyDeclaration */:
+                    case 164 /* PropertyDeclaration */:
                         // static properties in classes introduce temporary variables
                         if (ts.hasStaticModifier(node)) {
-                            return target < 99 /* ESNext */ || !compilerOptions.useDefineForClassFields;
+                            return target < 99 /* ESNext */ || !useDefineForClassFields;
                         }
                         return requiresScopeChangeWorker(node.name);
                     default:
@@ -45303,6 +46399,7 @@ var ts;
             return resolveNameHelper(location, name, meaning, nameNotFoundMessage, nameArg, isUse, excludeGlobals, getSymbol, suggestedNameNotFoundMessage);
         }
         function resolveNameHelper(location, name, meaning, nameNotFoundMessage, nameArg, isUse, excludeGlobals, lookup, suggestedNameNotFoundMessage) {
+            var _a;
             var originalLocation = location; // needed for did-you-mean error reporting, which gathers candidates starting from the original location
             var result;
             var lastLocation;
@@ -45325,12 +46422,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 !== 311 /* JSDocComment */) {
+                            if (meaning & result.flags & 788968 /* Type */ && lastLocation.kind !== 312 /* JSDocComment */) {
                                 useResult = result.flags & 262144 /* TypeParameter */
                                     // type parameters are visible in parameter list, return type and type parameter list
                                     ? lastLocation === location.type ||
-                                        lastLocation.kind === 160 /* Parameter */ ||
-                                        lastLocation.kind === 159 /* TypeParameter */
+                                        lastLocation.kind === 161 /* Parameter */ ||
+                                        lastLocation.kind === 160 /* TypeParameter */
                                     // local types not visible outside the function body
                                     : false;
                             }
@@ -45345,13 +46442,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 === 160 /* Parameter */ ||
+                                        lastLocation.kind === 161 /* Parameter */ ||
                                             (lastLocation === location.type &&
                                                 !!ts.findAncestor(result.valueDeclaration, ts.isParameter));
                                 }
                             }
                         }
-                        else if (location.kind === 184 /* ConditionalType */) {
+                        else if (location.kind === 185 /* 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;
@@ -45366,14 +46463,14 @@ var ts;
                 }
                 withinDeferredContext = withinDeferredContext || getIsDeferredContext(location, lastLocation);
                 switch (location.kind) {
-                    case 297 /* SourceFile */:
+                    case 298 /* SourceFile */:
                         if (!ts.isExternalOrCommonJsModule(location))
                             break;
                         isInExternalModule = true;
                     // falls through
-                    case 256 /* ModuleDeclaration */:
+                    case 257 /* ModuleDeclaration */:
                         var moduleExports = getSymbolOfNode(location).exports || emptySymbols;
-                        if (location.kind === 297 /* SourceFile */ || (ts.isModuleDeclaration(location) && location.flags & 8388608 /* Ambient */ && !ts.isGlobalScopeAugmentation(location))) {
+                        if (location.kind === 298 /* 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 */)) {
@@ -45397,13 +46494,13 @@ var ts;
                             var moduleExport = moduleExports.get(name);
                             if (moduleExport &&
                                 moduleExport.flags === 2097152 /* Alias */ &&
-                                (ts.getDeclarationOfKind(moduleExport, 270 /* ExportSpecifier */) || ts.getDeclarationOfKind(moduleExport, 269 /* NamespaceExport */))) {
+                                (ts.getDeclarationOfKind(moduleExport, 271 /* ExportSpecifier */) || ts.getDeclarationOfKind(moduleExport, 270 /* NamespaceExport */))) {
                                 break;
                             }
                         }
                         // ES6 exports are also visible locally (except for 'default'), but commonjs exports are not (except typedefs)
                         if (name !== "default" /* Default */ && (result = lookup(moduleExports, name, meaning & 2623475 /* ModuleMember */))) {
-                            if (ts.isSourceFile(location) && location.commonJsModuleIndicator && !result.declarations.some(ts.isJSDocTypeAlias)) {
+                            if (ts.isSourceFile(location) && location.commonJsModuleIndicator && !((_a = result.declarations) === null || _a === void 0 ? void 0 : _a.some(ts.isJSDocTypeAlias))) {
                                 result = undefined;
                             }
                             else {
@@ -45411,12 +46508,12 @@ var ts;
                             }
                         }
                         break;
-                    case 255 /* EnumDeclaration */:
+                    case 256 /* EnumDeclaration */:
                         if (result = lookup(getSymbolOfNode(location).exports, name, meaning & 8 /* EnumMember */)) {
                             break loop;
                         }
                         break;
-                    case 163 /* PropertyDeclaration */:
+                    case 164 /* 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
@@ -45433,9 +46530,9 @@ var ts;
                             }
                         }
                         break;
-                    case 252 /* ClassDeclaration */:
-                    case 221 /* ClassExpression */:
-                    case 253 /* InterfaceDeclaration */:
+                    case 253 /* ClassDeclaration */:
+                    case 222 /* ClassExpression */:
+                    case 254 /* 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!
@@ -45454,7 +46551,7 @@ var ts;
                             }
                             break loop;
                         }
-                        if (location.kind === 221 /* ClassExpression */ && meaning & 32 /* Class */) {
+                        if (location.kind === 222 /* ClassExpression */ && meaning & 32 /* Class */) {
                             var className = location.name;
                             if (className && name === className.escapedText) {
                                 result = location.symbol;
@@ -45462,7 +46559,7 @@ var ts;
                             }
                         }
                         break;
-                    case 223 /* ExpressionWithTypeArguments */:
+                    case 224 /* 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;
@@ -45482,9 +46579,9 @@ var ts;
                     //       [foo<T>()]() { } // <-- Reference to T from class's own computed property
                     //   }
                     //
-                    case 158 /* ComputedPropertyName */:
+                    case 159 /* ComputedPropertyName */:
                         grandparent = location.parent.parent;
-                        if (ts.isClassLike(grandparent) || grandparent.kind === 253 /* InterfaceDeclaration */) {
+                        if (ts.isClassLike(grandparent) || grandparent.kind === 254 /* 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);
@@ -45492,24 +46589,24 @@ var ts;
                             }
                         }
                         break;
-                    case 209 /* ArrowFunction */:
+                    case 210 /* 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 165 /* MethodDeclaration */:
-                    case 166 /* Constructor */:
-                    case 167 /* GetAccessor */:
-                    case 168 /* SetAccessor */:
-                    case 251 /* FunctionDeclaration */:
+                    case 166 /* MethodDeclaration */:
+                    case 167 /* Constructor */:
+                    case 168 /* GetAccessor */:
+                    case 169 /* SetAccessor */:
+                    case 252 /* FunctionDeclaration */:
                         if (meaning & 3 /* Variable */ && name === "arguments") {
                             result = argumentsSymbol;
                             break loop;
                         }
                         break;
-                    case 208 /* FunctionExpression */:
+                    case 209 /* FunctionExpression */:
                         if (meaning & 3 /* Variable */ && name === "arguments") {
                             result = argumentsSymbol;
                             break loop;
@@ -45522,7 +46619,7 @@ var ts;
                             }
                         }
                         break;
-                    case 161 /* Decorator */:
+                    case 162 /* Decorator */:
                         // Decorators are resolved at the class declaration. Resolving at the parameter
                         // or member would result in looking up locals in the method.
                         //
@@ -45531,7 +46628,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 === 160 /* Parameter */) {
+                        if (location.parent && location.parent.kind === 161 /* Parameter */) {
                             location = location.parent;
                         }
                         //
@@ -45546,20 +46643,20 @@ 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 === 252 /* ClassDeclaration */)) {
+                        if (location.parent && (ts.isClassElement(location.parent) || location.parent.kind === 253 /* ClassDeclaration */)) {
                             location = location.parent;
                         }
                         break;
-                    case 331 /* JSDocTypedefTag */:
-                    case 324 /* JSDocCallbackTag */:
-                    case 325 /* JSDocEnumTag */:
+                    case 335 /* JSDocTypedefTag */:
+                    case 328 /* JSDocCallbackTag */:
+                    case 329 /* JSDocEnumTag */:
                         // js type aliases do not resolve names from their host, so skip past it
                         var root = ts.getJSDocRoot(location);
                         if (root) {
                             location = root.parent;
                         }
                         break;
-                    case 160 /* Parameter */:
+                    case 161 /* Parameter */:
                         if (lastLocation && (lastLocation === location.initializer ||
                             lastLocation === location.name && ts.isBindingPattern(lastLocation))) {
                             if (!associatedDeclarationForContainingInitializerOrBindingName) {
@@ -45567,7 +46664,7 @@ var ts;
                             }
                         }
                         break;
-                    case 198 /* BindingElement */:
+                    case 199 /* BindingElement */:
                         if (lastLocation && (lastLocation === location.initializer ||
                             lastLocation === location.name && ts.isBindingPattern(lastLocation))) {
                             if (ts.isParameterDeclaration(location) && !associatedDeclarationForContainingInitializerOrBindingName) {
@@ -45575,7 +46672,7 @@ var ts;
                             }
                         }
                         break;
-                    case 185 /* InferType */:
+                    case 186 /* InferType */:
                         if (meaning & 262144 /* TypeParameter */) {
                             var parameterName = location.typeParameter.name;
                             if (parameterName && name === parameterName.escapedText) {
@@ -45599,7 +46696,7 @@ var ts;
             }
             if (!result) {
                 if (lastLocation) {
-                    ts.Debug.assert(lastLocation.kind === 297 /* SourceFile */);
+                    ts.Debug.assert(lastLocation.kind === 298 /* SourceFile */);
                     if (lastLocation.commonJsModuleIndicator && name === "exports" && meaning & lastLocation.symbol.flags) {
                         return lastLocation.symbol;
                     }
@@ -45658,7 +46755,7 @@ var ts;
             }
             // Perform extra checks only if error reporting was requested
             if (nameNotFoundMessage) {
-                if (propertyWithInvalidInitializer && !(compilerOptions.target === 99 /* ESNext */ && compilerOptions.useDefineForClassFields)) {
+                if (propertyWithInvalidInitializer && !(compilerOptions.target === 99 /* ESNext */ && useDefineForClassFields)) {
                     // We have a match, but the reference occurred within a property initializer and the identifier also binds
                     // to a local variable in the constructor where the code will be emitted. Note that this is actually allowed
                     // with ESNext+useDefineForClassFields because the scope semantics are different.
@@ -45728,10 +46825,10 @@ var ts;
             }
         }
         function getIsDeferredContext(location, lastLocation) {
-            if (location.kind !== 209 /* ArrowFunction */ && location.kind !== 208 /* FunctionExpression */) {
+            if (location.kind !== 210 /* ArrowFunction */ && location.kind !== 209 /* 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 === 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
+                    (location.kind === 164 /* 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;
@@ -45744,12 +46841,12 @@ var ts;
         }
         function isSelfReferenceLocation(node) {
             switch (node.kind) {
-                case 251 /* FunctionDeclaration */:
-                case 252 /* ClassDeclaration */:
-                case 253 /* InterfaceDeclaration */:
-                case 255 /* EnumDeclaration */:
-                case 254 /* TypeAliasDeclaration */:
-                case 256 /* ModuleDeclaration */: // For `namespace N { N; }`
+                case 252 /* FunctionDeclaration */:
+                case 253 /* ClassDeclaration */:
+                case 254 /* InterfaceDeclaration */:
+                case 256 /* EnumDeclaration */:
+                case 255 /* TypeAliasDeclaration */:
+                case 257 /* ModuleDeclaration */: // For `namespace N { N; }`
                     return true;
                 default:
                     return false;
@@ -45759,12 +46856,14 @@ var ts;
             return ts.isString(nameArg) ? ts.unescapeLeadingUnderscores(nameArg) : ts.declarationNameToString(nameArg);
         }
         function isTypeParameterSymbolDeclaredInContainer(symbol, container) {
-            for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
-                var decl = _a[_i];
-                if (decl.kind === 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
+            if (symbol.declarations) {
+                for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
+                    var decl = _a[_i];
+                    if (decl.kind === 160 /* 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
+                        }
                     }
                 }
             }
@@ -45817,9 +46916,9 @@ var ts;
         function getEntityNameForExtendingInterface(node) {
             switch (node.kind) {
                 case 78 /* Identifier */:
-                case 201 /* PropertyAccessExpression */:
+                case 202 /* PropertyAccessExpression */:
                     return node.parent ? getEntityNameForExtendingInterface(node.parent) : undefined;
-                case 223 /* ExpressionWithTypeArguments */:
+                case 224 /* ExpressionWithTypeArguments */:
                     if (ts.isEntityNameExpression(node.expression)) {
                         return node.expression;
                     }
@@ -45863,7 +46962,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 === 270 /* ExportSpecifier */) {
+            if (isPrimitiveTypeName(name) && errorLocation.parent.kind === 271 /* ExportSpecifier */) {
                 error(errorLocation, ts.Diagnostics.Cannot_export_0_Only_local_declarations_can_be_exported_from_a_module, name);
                 return true;
             }
@@ -45932,13 +47031,14 @@ var ts;
             return false;
         }
         function checkResolvedBlockScopedVariable(result, errorLocation) {
+            var _a;
             ts.Debug.assert(!!(result.flags & 2 /* BlockScopedVariable */ || result.flags & 32 /* Class */ || result.flags & 384 /* Enum */));
             if (result.flags & (16 /* Function */ | 1 /* FunctionScopedVariable */ | 67108864 /* Assignment */) && result.flags & 32 /* Class */) {
                 // constructor functions aren't block scoped
                 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 === 255 /* EnumDeclaration */); });
+            var declaration = (_a = result.declarations) === null || _a === void 0 ? void 0 : _a.find(function (d) { return ts.isBlockOrCatchScoped(d) || ts.isClassLike(d) || (d.kind === 256 /* EnumDeclaration */); });
             if (declaration === undefined)
                 return ts.Debug.fail("checkResolvedBlockScopedVariable could not find block-scoped declaration");
             if (!(declaration.flags & 8388608 /* Ambient */) && !isBlockScopedNameDeclaredBeforeUse(declaration, errorLocation)) {
@@ -45973,20 +47073,20 @@ var ts;
         }
         function getAnyImportSyntax(node) {
             switch (node.kind) {
-                case 260 /* ImportEqualsDeclaration */:
+                case 261 /* ImportEqualsDeclaration */:
                     return node;
-                case 262 /* ImportClause */:
+                case 263 /* ImportClause */:
                     return node.parent;
-                case 263 /* NamespaceImport */:
+                case 264 /* NamespaceImport */:
                     return node.parent.parent;
-                case 265 /* ImportSpecifier */:
+                case 266 /* ImportSpecifier */:
                     return node.parent.parent.parent;
                 default:
                     return undefined;
             }
         }
         function getDeclarationOfAliasSymbol(symbol) {
-            return ts.find(symbol.declarations, isAliasSymbolDeclaration);
+            return symbol.declarations && ts.findLast(symbol.declarations, isAliasSymbolDeclaration);
         }
         /**
          * An alias symbol is created by one of the following declarations:
@@ -46001,25 +47101,26 @@ var ts;
          * module.exports = <EntityNameExpression>
          * {<Identifier>}
          * {name: <EntityNameExpression>}
+         * const { x } = require ...
          */
         function isAliasSymbolDeclaration(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)
+            return node.kind === 261 /* ImportEqualsDeclaration */
+                || node.kind === 260 /* NamespaceExportDeclaration */
+                || node.kind === 263 /* ImportClause */ && !!node.name
+                || node.kind === 264 /* NamespaceImport */
+                || node.kind === 270 /* NamespaceExport */
+                || node.kind === 266 /* ImportSpecifier */
+                || node.kind === 271 /* ExportSpecifier */
+                || node.kind === 267 /* 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 === 289 /* ShorthandPropertyAssignment */
-                || node.kind === 288 /* PropertyAssignment */ && isAliasableOrJsExpression(node.initializer)
-                || ts.isRequireVariableDeclaration(node, /*requireStringLiteralLikeArgument*/ true);
+                || node.kind === 290 /* ShorthandPropertyAssignment */
+                || node.kind === 289 /* PropertyAssignment */ && isAliasableOrJsExpression(node.initializer)
+                || ts.isRequireVariableDeclaration(node);
         }
         function isAliasableOrJsExpression(e) {
             return ts.isAliasableExpression(e) || ts.isFunctionExpression(e) && isJSConstructor(e);
@@ -46032,7 +47133,7 @@ var ts;
                     ? resolveSymbol(getPropertyOfType(resolveExternalModuleTypeByLiteral(name), commonJSPropertyAccess.name.escapedText))
                     : undefined;
             }
-            if (ts.isVariableDeclaration(node) || node.moduleReference.kind === 272 /* ExternalModuleReference */) {
+            if (ts.isVariableDeclaration(node) || node.moduleReference.kind === 273 /* ExternalModuleReference */) {
                 var immediate = resolveExternalModuleName(node, ts.getExternalModuleRequireArgument(node) || ts.getExternalModuleImportEqualsDeclarationExpression(node));
                 var resolved_4 = resolveExternalModuleSymbol(immediate);
                 markSymbolOfAliasDeclarationIfTypeOnly(node, immediate, resolved_4, /*overwriteEmpty*/ false);
@@ -46099,6 +47200,7 @@ var ts;
             return !file.externalModuleIndicator && !resolveExportByName(moduleSymbol, ts.escapeLeadingUnderscores("__esModule"), /*sourceNode*/ undefined, dontResolveAlias);
         }
         function getTargetOfImportClause(node, dontResolveAlias) {
+            var _a;
             var moduleSymbol = resolveExternalModuleName(node, node.parent.moduleSpecifier);
             if (moduleSymbol) {
                 var exportDefaultSymbol = void 0;
@@ -46108,7 +47210,7 @@ var ts;
                 else {
                     exportDefaultSymbol = resolveExportByName(moduleSymbol, "default" /* Default */, node, dontResolveAlias);
                 }
-                var file = ts.find(moduleSymbol.declarations, ts.isSourceFile);
+                var file = (_a = moduleSymbol.declarations) === null || _a === void 0 ? void 0 : _a.find(ts.isSourceFile);
                 var hasSyntheticDefault = canHaveSyntheticDefault(file, moduleSymbol, dontResolveAlias);
                 if (!exportDefaultSymbol && !hasSyntheticDefault) {
                     if (hasExportAssignmentSymbol(moduleSymbol)) {
@@ -46116,7 +47218,9 @@ var ts;
                         var exportEqualsSymbol = moduleSymbol.exports.get("export=" /* ExportEquals */);
                         var exportAssignment = exportEqualsSymbol.valueDeclaration;
                         var err = error(node.name, ts.Diagnostics.Module_0_can_only_be_default_imported_using_the_1_flag, symbolToString(moduleSymbol), compilerOptionName);
-                        ts.addRelatedInfo(err, ts.createDiagnosticForNode(exportAssignment, ts.Diagnostics.This_module_is_declared_with_using_export_and_can_only_be_used_with_a_default_import_when_using_the_0_flag, compilerOptionName));
+                        if (exportAssignment) {
+                            ts.addRelatedInfo(err, ts.createDiagnosticForNode(exportAssignment, ts.Diagnostics.This_module_is_declared_with_using_export_and_can_only_be_used_with_a_default_import_when_using_the_0_flag, compilerOptionName));
+                        }
                     }
                     else {
                         reportNonDefaultExport(moduleSymbol, node);
@@ -46133,7 +47237,7 @@ var ts;
             }
         }
         function reportNonDefaultExport(moduleSymbol, node) {
-            var _a, _b;
+            var _a, _b, _c;
             if ((_a = moduleSymbol.exports) === null || _a === void 0 ? void 0 : _a.has(node.symbol.escapedName)) {
                 error(node.name, ts.Diagnostics.Module_0_has_no_default_export_Did_you_mean_to_use_import_1_from_0_instead, symbolToString(moduleSymbol), symbolToString(node.symbol));
             }
@@ -46141,7 +47245,7 @@ var ts;
                 var diagnostic = error(node.name, ts.Diagnostics.Module_0_has_no_default_export, symbolToString(moduleSymbol));
                 var exportStar = (_b = moduleSymbol.exports) === null || _b === void 0 ? void 0 : _b.get("__export" /* ExportStar */);
                 if (exportStar) {
-                    var defaultExport = ts.find(exportStar.declarations, function (decl) {
+                    var defaultExport = (_c = exportStar.declarations) === null || _c === void 0 ? void 0 : _c.find(function (decl) {
                         var _a, _b;
                         return !!(ts.isExportDeclaration(decl) && decl.moduleSpecifier &&
                             ((_b = (_a = resolveExternalModuleName(decl, decl.moduleSpecifier)) === null || _a === void 0 ? void 0 : _a.exports) === null || _b === void 0 ? void 0 : _b.has("default" /* Default */)));
@@ -46219,7 +47323,7 @@ var ts;
             }
         }
         function getExternalModuleMember(node, specifier, dontResolveAlias) {
-            var _a;
+            var _a, _b;
             if (dontResolveAlias === void 0) { dontResolveAlias = false; }
             var moduleSpecifier = ts.getExternalModuleRequireArgument(node) || node.moduleSpecifier;
             var moduleSymbol = resolveExternalModuleName(node, moduleSpecifier); // TODO: GH#18217
@@ -46228,7 +47332,7 @@ var ts;
                 return undefined;
             }
             var suppressInteropError = name.escapedText === "default" /* Default */ && !!(compilerOptions.allowSyntheticDefaultImports || compilerOptions.esModuleInterop);
-            var targetSymbol = resolveESModuleSymbol(moduleSymbol, moduleSpecifier, dontResolveAlias, suppressInteropError);
+            var targetSymbol = resolveESModuleSymbol(moduleSymbol, moduleSpecifier, /*dontResolveAlias*/ false, suppressInteropError);
             if (targetSymbol) {
                 if (name.escapedText) {
                     if (ts.isShorthandAmbientModuleSymbol(moduleSymbol)) {
@@ -46246,7 +47350,7 @@ var ts;
                     symbolFromVariable = resolveSymbol(symbolFromVariable, dontResolveAlias);
                     var symbolFromModule = getExportOfModule(targetSymbol, name, specifier, dontResolveAlias);
                     if (symbolFromModule === undefined && name.escapedText === "default" /* Default */) {
-                        var file = ts.find(moduleSymbol.declarations, ts.isSourceFile);
+                        var file = (_a = moduleSymbol.declarations) === null || _a === void 0 ? void 0 : _a.find(ts.isSourceFile);
                         if (canHaveSyntheticDefault(file, moduleSymbol, dontResolveAlias)) {
                             symbolFromModule = resolveExternalModuleSymbol(moduleSymbol, dontResolveAlias) || resolveSymbol(moduleSymbol, dontResolveAlias);
                         }
@@ -46266,7 +47370,7 @@ var ts;
                             }
                         }
                         else {
-                            if ((_a = moduleSymbol.exports) === null || _a === void 0 ? void 0 : _a.has("default" /* Default */)) {
+                            if ((_b = moduleSymbol.exports) === null || _b === void 0 ? void 0 : _b.has("default" /* Default */)) {
                                 error(name, ts.Diagnostics.Module_0_has_no_exported_member_1_Did_you_mean_to_use_import_1_from_0_instead, moduleName, declarationName);
                             }
                             else {
@@ -46279,8 +47383,8 @@ var ts;
             }
         }
         function reportNonExportedMember(node, name, declarationName, moduleSymbol, moduleName) {
-            var _a;
-            var localSymbol = (_a = moduleSymbol.valueDeclaration.locals) === null || _a === void 0 ? void 0 : _a.get(name.escapedText);
+            var _a, _b;
+            var localSymbol = (_b = (_a = moduleSymbol.valueDeclaration) === null || _a === void 0 ? void 0 : _a.locals) === null || _b === void 0 ? void 0 : _b.get(name.escapedText);
             var exports = moduleSymbol.exports;
             if (localSymbol) {
                 var exportedEqualsSymbol = exports === null || exports === void 0 ? void 0 : exports.get("export=" /* ExportEquals */);
@@ -46292,9 +47396,11 @@ var ts;
                     var exportedSymbol = exports ? ts.find(symbolsToArray(exports), function (symbol) { return !!getSymbolIfSameReference(symbol, localSymbol); }) : undefined;
                     var diagnostic = exportedSymbol ? error(name, ts.Diagnostics.Module_0_declares_1_locally_but_it_is_exported_as_2, moduleName, declarationName, symbolToString(exportedSymbol)) :
                         error(name, ts.Diagnostics.Module_0_declares_1_locally_but_it_is_not_exported, moduleName, declarationName);
-                    ts.addRelatedInfo.apply(void 0, __spreadArray([diagnostic], ts.map(localSymbol.declarations, function (decl, index) {
-                        return ts.createDiagnosticForNode(decl, index === 0 ? ts.Diagnostics._0_is_declared_here : ts.Diagnostics.and_here, declarationName);
-                    })));
+                    if (localSymbol.declarations) {
+                        ts.addRelatedInfo.apply(void 0, __spreadArray([diagnostic], ts.map(localSymbol.declarations, function (decl, index) {
+                            return ts.createDiagnosticForNode(decl, index === 0 ? ts.Diagnostics._0_is_declared_here : ts.Diagnostics.and_here, declarationName);
+                        })));
+                    }
                 }
             }
             else {
@@ -46381,31 +47487,31 @@ var ts;
         function getTargetOfAliasDeclaration(node, dontRecursivelyResolve) {
             if (dontRecursivelyResolve === void 0) { dontRecursivelyResolve = false; }
             switch (node.kind) {
-                case 260 /* ImportEqualsDeclaration */:
-                case 249 /* VariableDeclaration */:
+                case 261 /* ImportEqualsDeclaration */:
+                case 250 /* VariableDeclaration */:
                     return getTargetOfImportEqualsDeclaration(node, dontRecursivelyResolve);
-                case 262 /* ImportClause */:
+                case 263 /* ImportClause */:
                     return getTargetOfImportClause(node, dontRecursivelyResolve);
-                case 263 /* NamespaceImport */:
+                case 264 /* NamespaceImport */:
                     return getTargetOfNamespaceImport(node, dontRecursivelyResolve);
-                case 269 /* NamespaceExport */:
+                case 270 /* NamespaceExport */:
                     return getTargetOfNamespaceExport(node, dontRecursivelyResolve);
-                case 265 /* ImportSpecifier */:
-                case 198 /* BindingElement */:
+                case 266 /* ImportSpecifier */:
+                case 199 /* BindingElement */:
                     return getTargetOfImportSpecifier(node, dontRecursivelyResolve);
-                case 270 /* ExportSpecifier */:
+                case 271 /* ExportSpecifier */:
                     return getTargetOfExportSpecifier(node, 111551 /* Value */ | 788968 /* Type */ | 1920 /* Namespace */, dontRecursivelyResolve);
-                case 266 /* ExportAssignment */:
-                case 216 /* BinaryExpression */:
+                case 267 /* ExportAssignment */:
+                case 217 /* BinaryExpression */:
                     return getTargetOfExportAssignment(node, dontRecursivelyResolve);
-                case 259 /* NamespaceExportDeclaration */:
+                case 260 /* NamespaceExportDeclaration */:
                     return getTargetOfNamespaceExportDeclaration(node, dontRecursivelyResolve);
-                case 289 /* ShorthandPropertyAssignment */:
+                case 290 /* ShorthandPropertyAssignment */:
                     return resolveEntityName(node.name, 111551 /* Value */ | 788968 /* Type */ | 1920 /* Namespace */, /*ignoreErrors*/ true, dontRecursivelyResolve);
-                case 288 /* PropertyAssignment */:
+                case 289 /* PropertyAssignment */:
                     return getTargetOfPropertyAssignment(node, dontRecursivelyResolve);
-                case 202 /* ElementAccessExpression */:
-                case 201 /* PropertyAccessExpression */:
+                case 203 /* ElementAccessExpression */:
+                case 202 /* PropertyAccessExpression */:
                     return getTargetOfAccessExpression(node, dontRecursivelyResolve);
                 default:
                     return ts.Debug.fail();
@@ -46557,13 +47663,13 @@ var ts;
                 entityName = entityName.parent;
             }
             // Check for case 1 and 3 in the above example
-            if (entityName.kind === 78 /* Identifier */ || entityName.parent.kind === 157 /* QualifiedName */) {
+            if (entityName.kind === 78 /* Identifier */ || entityName.parent.kind === 158 /* 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 === 260 /* ImportEqualsDeclaration */);
+                ts.Debug.assert(entityName.parent.kind === 261 /* ImportEqualsDeclaration */);
                 return resolveEntityName(entityName, 111551 /* Value */ | 788968 /* Type */ | 1920 /* Namespace */, /*ignoreErrors*/ false, dontResolveAlias);
             }
         }
@@ -46587,9 +47693,9 @@ var ts;
                     return getMergedSymbol(symbolFromJSPrototype);
                 }
             }
-            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;
+            else if (name.kind === 158 /* QualifiedName */ || name.kind === 202 /* PropertyAccessExpression */) {
+                var left = name.kind === 158 /* QualifiedName */ ? name.left : name.expression;
+                var right = name.kind === 158 /* QualifiedName */ ? name.right : name.name;
                 var namespace = resolveEntityName(left, namespaceMeaning, ignoreErrors, /*dontResolveAlias*/ false, location);
                 if (!namespace || ts.nodeIsMissing(right)) {
                     return undefined;
@@ -46597,18 +47703,17 @@ var ts;
                 else if (namespace === unknownSymbol) {
                     return namespace;
                 }
-                if (ts.isInJSFile(name)) {
-                    if (namespace.valueDeclaration &&
-                        ts.isVariableDeclaration(namespace.valueDeclaration) &&
-                        namespace.valueDeclaration.initializer &&
-                        isCommonJsRequire(namespace.valueDeclaration.initializer)) {
-                        var moduleName = namespace.valueDeclaration.initializer.arguments[0];
-                        var moduleSym = resolveExternalModuleName(moduleName, moduleName);
-                        if (moduleSym) {
-                            var resolvedModuleSymbol = resolveExternalModuleSymbol(moduleSym);
-                            if (resolvedModuleSymbol) {
-                                namespace = resolvedModuleSymbol;
-                            }
+                if (namespace.valueDeclaration &&
+                    ts.isInJSFile(namespace.valueDeclaration) &&
+                    ts.isVariableDeclaration(namespace.valueDeclaration) &&
+                    namespace.valueDeclaration.initializer &&
+                    isCommonJsRequire(namespace.valueDeclaration.initializer)) {
+                    var moduleName = namespace.valueDeclaration.initializer.arguments[0];
+                    var moduleSym = resolveExternalModuleName(moduleName, moduleName);
+                    if (moduleSym) {
+                        var resolvedModuleSymbol = resolveExternalModuleSymbol(moduleSym);
+                        if (resolvedModuleSymbol) {
+                            namespace = resolvedModuleSymbol;
                         }
                     }
                 }
@@ -46629,7 +47734,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 === 266 /* ExportAssignment */)) {
+            if (!ts.nodeIsSynthesized(name) && ts.isEntityName(name) && (symbol.flags & 2097152 /* Alias */ || name.parent.kind === 267 /* ExportAssignment */)) {
                 markSymbolOfAliasDeclarationIfTypeOnly(ts.getAliasDeclarationFromName(name), symbol, /*finalTarget*/ undefined, /*overwriteEmpty*/ true);
             }
             return (symbol.flags & meaning) || dontResolveAlias ? symbol : resolveAlias(symbol);
@@ -46866,7 +47971,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, 297 /* SourceFile */)) {
+                if (!suppressInteropError && !(symbol.flags & (1536 /* Module */ | 3 /* Variable */)) && !ts.getDeclarationOfKind(symbol, 298 /* SourceFile */)) {
                     var compilerOptionName = moduleKind >= ts.ModuleKind.ES2015
                         ? "allowSyntheticDefaultImports"
                         : "esModuleInterop";
@@ -46917,7 +48022,10 @@ var ts;
             var exports = getExportsOfModuleAsArray(moduleSymbol);
             var exportEquals = resolveExternalModuleSymbol(moduleSymbol);
             if (exportEquals !== moduleSymbol) {
-                ts.addRange(exports, getPropertiesOfType(getTypeOfSymbol(exportEquals)));
+                var type = getTypeOfSymbol(exportEquals);
+                if (shouldTreatPropertiesOfExternalModuleAsExports(type)) {
+                    ts.addRange(exports, getPropertiesOfType(type));
+                }
             }
             return exports;
         }
@@ -46937,11 +48045,14 @@ var ts;
                 return undefined;
             }
             var type = getTypeOfSymbol(exportEquals);
-            return type.flags & 131068 /* Primitive */ ||
-                ts.getObjectFlags(type) & 1 /* Class */ ||
-                isArrayOrTupleLikeType(type)
-                ? undefined
-                : getPropertyOfType(type, memberName);
+            return shouldTreatPropertiesOfExternalModuleAsExports(type) ? getPropertyOfType(type, memberName) : undefined;
+        }
+        function shouldTreatPropertiesOfExternalModuleAsExports(resolvedExternalModuleType) {
+            return !(resolvedExternalModuleType.flags & 131068 /* Primitive */ ||
+                ts.getObjectFlags(resolvedExternalModuleType) & 1 /* Class */ ||
+                // `isArrayOrTupleLikeType` is too expensive to use in this auto-imports hot path
+                isArrayType(resolvedExternalModuleType) ||
+                isTupleType(resolvedExternalModuleType));
         }
         function getExportsOfSymbol(symbol) {
             return symbol.flags & 6256 /* LateBindingContainer */ ? getResolvedMembersOrExportsOfSymbol(symbol, "resolvedExports" /* resolvedExports */) :
@@ -46999,11 +48110,13 @@ var ts;
                 if (exportStars) {
                     var nestedSymbols = ts.createSymbolTable();
                     var lookupTable_1 = new ts.Map();
-                    for (var _i = 0, _a = exportStars.declarations; _i < _a.length; _i++) {
-                        var node = _a[_i];
-                        var resolvedModule = resolveExternalModuleName(node, node.moduleSpecifier);
-                        var exportedSymbols = visit(resolvedModule);
-                        extendExportSymbols(nestedSymbols, exportedSymbols, lookupTable_1, node);
+                    if (exportStars.declarations) {
+                        for (var _i = 0, _a = exportStars.declarations; _i < _a.length; _i++) {
+                            var node = _a[_i];
+                            var resolvedModule = resolveExternalModuleName(node, node.moduleSpecifier);
+                            var exportedSymbols = visit(resolvedModule);
+                            extendExportSymbols(nestedSymbols, exportedSymbols, lookupTable_1, node);
+                        }
                     }
                     lookupTable_1.forEach(function (_a, id) {
                         var exportsWithDuplicate = _a.exportsWithDuplicate;
@@ -47086,11 +48199,28 @@ var ts;
                 var additionalContainers = ts.mapDefined(container.declarations, fileSymbolIfFileSymbolExportEqualsContainer);
                 var reexportContainers = enclosingDeclaration && getAlternativeContainingModules(symbol, enclosingDeclaration);
                 var objectLiteralContainer = getVariableDeclarationOfObjectLiteral(container, meaning);
-                if (enclosingDeclaration && getAccessibleSymbolChain(container, enclosingDeclaration, 1920 /* Namespace */, /*externalOnly*/ false)) {
+                if (enclosingDeclaration &&
+                    container.flags & getQualifiedLeftMeaning(meaning) &&
+                    getAccessibleSymbolChain(container, enclosingDeclaration, 1920 /* Namespace */, /*externalOnly*/ false)) {
                     return ts.append(ts.concatenate(ts.concatenate([container], additionalContainers), reexportContainers), objectLiteralContainer); // This order expresses a preference for the real container if it is in scope
                 }
-                var res = ts.append(ts.append(additionalContainers, container), objectLiteralContainer);
-                return ts.concatenate(res, reexportContainers);
+                // we potentially have a symbol which is a member of the instance side of something - look for a variable in scope with the container's type
+                // which may be acting like a namespace (eg, `Symbol` acts like a namespace when looking up `Symbol.toStringTag`)
+                var firstVariableMatch = !(container.flags & getQualifiedLeftMeaning(meaning))
+                    && container.flags & 788968 /* Type */
+                    && getDeclaredTypeOfSymbol(container).flags & 524288 /* Object */
+                    && meaning === 111551 /* Value */
+                    ? forEachSymbolTableInScope(enclosingDeclaration, function (t) {
+                        return ts.forEachEntry(t, function (s) {
+                            if (s.flags & getQualifiedLeftMeaning(meaning) && getTypeOfSymbol(s) === getDeclaredTypeOfSymbol(container)) {
+                                return s;
+                            }
+                        });
+                    }) : undefined;
+                var res = firstVariableMatch ? __spreadArray(__spreadArray([firstVariableMatch], additionalContainers), [container]) : __spreadArray(__spreadArray([], additionalContainers), [container]);
+                res = ts.append(res, objectLiteralContainer);
+                res = ts.addRange(res, reexportContainers);
+                return res;
             }
             var candidates = ts.mapDefined(symbol.declarations, function (d) {
                 if (!ts.isAmbientModule(d) && d.parent && hasNonGlobalAugmentationExternalModuleSymbol(d.parent)) {
@@ -47168,7 +48298,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 === 166 /* Constructor */ && ts.nodeIsPresent(member.body)) {
+                if (member.kind === 167 /* Constructor */ && ts.nodeIsPresent(member.body)) {
                     return member;
                 }
             }
@@ -47177,7 +48307,9 @@ var ts;
             var result = new Type(checker, flags);
             typeCount++;
             result.id = typeCount;
-            typeCatalog.push(result);
+            if (produceDiagnostics) { // Only record types from one checker
+                ts.tracing === null || ts.tracing === void 0 ? void 0 : ts.tracing.recordType(result);
+            }
             return result;
         }
         function createOriginType(flags) {
@@ -47237,6 +48369,11 @@ var ts;
             });
             return result || ts.emptyArray;
         }
+        function getNamedOrIndexSignatureMembers(members) {
+            var result = getNamedMembers(members);
+            var index = getIndexSymbolFromSymbolTable(members);
+            return index ? ts.concatenate(result, [index]) : result;
+        }
         function setStructuredTypeMembers(type, members, callSignatures, constructSignatures, stringIndexInfo, numberIndexInfo) {
             var resolved = type;
             resolved.members = members;
@@ -47271,28 +48408,28 @@ var ts;
             var _loop_8 = function (location) {
                 // Locals of a source file are not in scope (because they get merged into the global symbol table)
                 if (location.locals && !isGlobalSourceFile(location)) {
-                    if (result = callback(location.locals)) {
+                    if (result = callback(location.locals, /*ignoreQualification*/ undefined, /*isLocalNameLookup*/ true)) {
                         return { value: result };
                     }
                 }
                 switch (location.kind) {
-                    case 297 /* SourceFile */:
+                    case 298 /* SourceFile */:
                         if (!ts.isExternalOrCommonJsModule(location)) {
                             break;
                         }
                     // falls through
-                    case 256 /* ModuleDeclaration */:
+                    case 257 /* 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
                         // to one another anyway)
-                        if (result = callback((sym === null || sym === void 0 ? void 0 : sym.exports) || emptySymbols)) {
+                        if (result = callback((sym === null || sym === void 0 ? void 0 : sym.exports) || emptySymbols, /*ignoreQualification*/ undefined, /*isLocalNameLookup*/ true)) {
                             return { value: result };
                         }
                         break;
-                    case 252 /* ClassDeclaration */:
-                    case 221 /* ClassExpression */:
-                    case 253 /* InterfaceDeclaration */:
+                    case 253 /* ClassDeclaration */:
+                    case 222 /* ClassExpression */:
+                    case 254 /* 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
@@ -47318,7 +48455,7 @@ var ts;
                 if (typeof state_2 === "object")
                     return state_2.value;
             }
-            return callback(globals);
+            return callback(globals, /*ignoreQualification*/ undefined, /*isLocalNameLookup*/ true);
         }
         function getQualifiedLeftMeaning(rightMeaning) {
             // If we are looking in value space, the parent meaning is value, other wise it is namespace
@@ -47338,11 +48475,11 @@ var ts;
             /**
              * @param {ignoreQualification} boolean Set when a symbol is being looked for through the exports of another symbol (meaning we have a route to qualify it already)
              */
-            function getAccessibleSymbolChainFromSymbolTable(symbols, ignoreQualification) {
+            function getAccessibleSymbolChainFromSymbolTable(symbols, ignoreQualification, isLocalNameLookup) {
                 if (!ts.pushIfUnique(visitedSymbolTables, symbols)) {
                     return undefined;
                 }
-                var result = trySymbolTable(symbols, ignoreQualification);
+                var result = trySymbolTable(symbols, ignoreQualification, isLocalNameLookup);
                 visitedSymbolTables.pop();
                 return result;
             }
@@ -47360,7 +48497,7 @@ var ts;
                     !ts.some(symbolFromSymbolTable.declarations, hasNonGlobalAugmentationExternalModuleSymbol) &&
                     (ignoreQualification || canQualifySymbol(getMergedSymbol(symbolFromSymbolTable), meaning));
             }
-            function trySymbolTable(symbols, ignoreQualification) {
+            function trySymbolTable(symbols, ignoreQualification, isLocalNameLookup) {
                 // If symbol is directly available by its name in the symbol table
                 if (isAccessible(symbols.get(symbol.escapedName), /*resolvedAliasSymbol*/ undefined, ignoreQualification)) {
                     return [symbol];
@@ -47373,9 +48510,11 @@ var ts;
                         && !(ts.isUMDExportSymbol(symbolFromSymbolTable) && enclosingDeclaration && ts.isExternalModule(ts.getSourceFileOfNode(enclosingDeclaration)))
                         // If `!useOnlyExternalAliasing`, we can use any type of alias to get the name
                         && (!useOnlyExternalAliasing || ts.some(symbolFromSymbolTable.declarations, ts.isExternalModuleImportEqualsDeclaration))
+                        // If we're looking up a local name to reference directly, omit namespace reexports, otherwise when we're trawling through an export list to make a dotted name, we can keep it
+                        && (isLocalNameLookup ? !ts.some(symbolFromSymbolTable.declarations, ts.isNamespaceReexportDeclaration) : true)
                         // 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, 270 /* ExportSpecifier */))) {
+                        && (ignoreQualification || !ts.getDeclarationOfKind(symbolFromSymbolTable, 271 /* ExportSpecifier */))) {
                         var resolvedImportedSymbol = resolveAlias(symbolFromSymbolTable);
                         var candidate = getCandidateListForSymbol(symbolFromSymbolTable, resolvedImportedSymbol, ignoreQualification);
                         if (candidate) {
@@ -47419,7 +48558,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, 270 /* ExportSpecifier */)) ? resolveAlias(symbolFromSymbolTable) : symbolFromSymbolTable;
+                symbolFromSymbolTable = (symbolFromSymbolTable.flags & 2097152 /* Alias */ && !ts.getDeclarationOfKind(symbolFromSymbolTable, 271 /* ExportSpecifier */)) ? resolveAlias(symbolFromSymbolTable) : symbolFromSymbolTable;
                 if (symbolFromSymbolTable.flags & meaning) {
                     qualify = true;
                     return true;
@@ -47434,10 +48573,10 @@ var ts;
                 for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                     var declaration = _a[_i];
                     switch (declaration.kind) {
-                        case 163 /* PropertyDeclaration */:
-                        case 165 /* MethodDeclaration */:
-                        case 167 /* GetAccessor */:
-                        case 168 /* SetAccessor */:
+                        case 164 /* PropertyDeclaration */:
+                        case 166 /* MethodDeclaration */:
+                        case 168 /* GetAccessor */:
+                        case 169 /* SetAccessor */:
                             continue;
                         default:
                             return false;
@@ -47475,7 +48614,7 @@ var ts;
                         return hasAccessibleDeclarations;
                     }
                 }
-                else if (allowModules) {
+                if (allowModules) {
                     if (ts.some(symbol.declarations, hasNonGlobalAugmentationExternalModuleSymbol)) {
                         if (shouldComputeAliasesToMakeVisible) {
                             earlyModuleBail = true;
@@ -47567,10 +48706,10 @@ var ts;
             return node && getSymbolOfNode(node);
         }
         function hasExternalModuleSymbol(declaration) {
-            return ts.isAmbientModule(declaration) || (declaration.kind === 297 /* SourceFile */ && ts.isExternalOrCommonJsModule(declaration));
+            return ts.isAmbientModule(declaration) || (declaration.kind === 298 /* SourceFile */ && ts.isExternalOrCommonJsModule(declaration));
         }
         function hasNonGlobalAugmentationExternalModuleSymbol(declaration) {
-            return ts.isModuleWithStringLiteralName(declaration) || (declaration.kind === 297 /* SourceFile */ && ts.isExternalOrCommonJsModule(declaration));
+            return ts.isModuleWithStringLiteralName(declaration) || (declaration.kind === 298 /* SourceFile */ && ts.isExternalOrCommonJsModule(declaration));
         }
         function hasVisibleDeclarations(symbol, shouldComputeAliasToMakeVisible) {
             var aliasesToMakeVisible;
@@ -47626,14 +48765,14 @@ var ts;
         function isEntityNameVisible(entityName, enclosingDeclaration) {
             // get symbol of the first identifier of the entityName
             var meaning;
-            if (entityName.parent.kind === 176 /* TypeQuery */ ||
+            if (entityName.parent.kind === 177 /* TypeQuery */ ||
                 ts.isExpressionWithTypeArgumentsInClassExtendsClause(entityName.parent) ||
-                entityName.parent.kind === 158 /* ComputedPropertyName */) {
+                entityName.parent.kind === 159 /* ComputedPropertyName */) {
                 // Typeof value
                 meaning = 111551 /* Value */ | 1048576 /* ExportValue */;
             }
-            else if (entityName.kind === 157 /* QualifiedName */ || entityName.kind === 201 /* PropertyAccessExpression */ ||
-                entityName.parent.kind === 260 /* ImportEqualsDeclaration */) {
+            else if (entityName.kind === 158 /* QualifiedName */ || entityName.kind === 202 /* PropertyAccessExpression */ ||
+                entityName.parent.kind === 261 /* ImportEqualsDeclaration */) {
                 // Left identifier from type reference or TypeAlias
                 // Entity name of the import declaration
                 meaning = 1920 /* Namespace */;
@@ -47674,7 +48813,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) === 297 /* SourceFile */ ? ts.createPrinter({ removeComments: true, neverAsciiEscape: true }) : ts.createPrinter({ removeComments: true });
+                var printer = (enclosingDeclaration === null || enclosingDeclaration === void 0 ? void 0 : enclosingDeclaration.kind) === 298 /* 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;
@@ -47686,10 +48825,10 @@ var ts;
             function signatureToStringWorker(writer) {
                 var sigOutput;
                 if (flags & 262144 /* WriteArrowStyleSignature */) {
-                    sigOutput = kind === 1 /* Construct */ ? 175 /* ConstructorType */ : 174 /* FunctionType */;
+                    sigOutput = kind === 1 /* Construct */ ? 176 /* ConstructorType */ : 175 /* FunctionType */;
                 }
                 else {
-                    sigOutput = kind === 1 /* Construct */ ? 170 /* ConstructSignature */ : 169 /* CallSignature */;
+                    sigOutput = kind === 1 /* Construct */ ? 171 /* ConstructSignature */ : 170 /* CallSignature */;
                 }
                 var sig = nodeBuilder.signatureToSignatureDeclaration(signature, sigOutput, enclosingDeclaration, toNodeBuilderFlags(flags) | 70221824 /* IgnoreErrors */ | 512 /* WriteTypeParametersInQualifiedName */);
                 var printer = ts.createPrinter({ removeComments: true, omitTrailingSemicolon: true });
@@ -47729,14 +48868,14 @@ var ts;
             return typeToString(type, /*enclosingDeclaration*/ undefined, 64 /* UseFullyQualifiedType */);
         }
         function symbolValueDeclarationIsContextSensitive(symbol) {
-            return symbol && symbol.valueDeclaration && ts.isExpression(symbol.valueDeclaration) && !isContextSensitive(symbol.valueDeclaration);
+            return symbol && !!symbol.valueDeclaration && ts.isExpression(symbol.valueDeclaration) && !isContextSensitive(symbol.valueDeclaration);
         }
         function toNodeBuilderFlags(flags) {
             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 */));
+            return !!type.symbol && !!(type.symbol.flags & 32 /* Class */) && (type === getDeclaredTypeOfClassOrInterface(type.symbol) || (!!(type.flags & 524288 /* Object */) && !!(ts.getObjectFlags(type) & 16777216 /* IsClassInstanceClone */)));
         }
         function createNodeBuilder() {
             return {
@@ -48070,7 +49209,9 @@ var ts;
                             return symbolToTypeNode(symbol, context, isInstanceType);
                         }
                         // Always use 'typeof T' for type of class, enum, and module objects
-                        else if (symbol.flags & 32 /* Class */ && !getBaseTypeVariableOfClass(symbol) && !(symbol.valueDeclaration.kind === 221 /* ClassExpression */ && context.flags & 2048 /* WriteClassExpressionAsTypeLiteral */) ||
+                        else if (symbol.flags & 32 /* Class */
+                            && !getBaseTypeVariableOfClass(symbol)
+                            && !(symbol.valueDeclaration && symbol.valueDeclaration.kind === 222 /* ClassExpression */ && context.flags & 2048 /* WriteClassExpressionAsTypeLiteral */) ||
                             symbol.flags & (384 /* Enum */ | 512 /* ValueModule */) ||
                             shouldWriteTypeOfFunctionSymbol()) {
                             return symbolToTypeNode(symbol, context, isInstanceType);
@@ -48101,7 +49242,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 === 297 /* SourceFile */ || declaration.parent.kind === 257 /* ModuleBlock */;
+                                    return declaration.parent.kind === 298 /* SourceFile */ || declaration.parent.kind === 258 /* ModuleBlock */;
                                 }));
                         if (isStaticMethodSymbol || isNonLocalFunctionSymbol) {
                             // typeof is allowed only for static/non local functions
@@ -48152,12 +49293,12 @@ var ts;
                         }
                         if (resolved.callSignatures.length === 1 && !resolved.constructSignatures.length) {
                             var signature = resolved.callSignatures[0];
-                            var signatureNode = signatureToSignatureDeclarationHelper(signature, 174 /* FunctionType */, context);
+                            var signatureNode = signatureToSignatureDeclarationHelper(signature, 175 /* FunctionType */, context);
                             return signatureNode;
                         }
                         if (resolved.constructSignatures.length === 1 && !resolved.callSignatures.length) {
                             var signature = resolved.constructSignatures[0];
-                            var signatureNode = signatureToSignatureDeclarationHelper(signature, 175 /* ConstructorType */, context);
+                            var signatureNode = signatureToSignatureDeclarationHelper(signature, 176 /* ConstructorType */, context);
                             return signatureNode;
                         }
                     }
@@ -48337,17 +49478,17 @@ var ts;
                     var typeElements = [];
                     for (var _i = 0, _a = resolvedType.callSignatures; _i < _a.length; _i++) {
                         var signature = _a[_i];
-                        typeElements.push(signatureToSignatureDeclarationHelper(signature, 169 /* CallSignature */, context));
+                        typeElements.push(signatureToSignatureDeclarationHelper(signature, 170 /* CallSignature */, context));
                     }
                     for (var _b = 0, _c = resolvedType.constructSignatures; _b < _c.length; _b++) {
                         var signature = _c[_b];
                         if (signature.flags & 4 /* Abstract */)
                             continue;
-                        typeElements.push(signatureToSignatureDeclarationHelper(signature, 170 /* ConstructSignature */, context));
+                        typeElements.push(signatureToSignatureDeclarationHelper(signature, 171 /* ConstructSignature */, context));
                     }
                     if (resolvedType.stringIndexInfo) {
                         var indexSignature = void 0;
-                        if (resolvedType.objectFlags & 2048 /* ReverseMapped */) {
+                        if (resolvedType.objectFlags & 1024 /* ReverseMapped */) {
                             indexSignature = indexInfoToIndexSignatureDeclarationHelper(createIndexInfo(anyType, resolvedType.stringIndexInfo.isReadonly, resolvedType.stringIndexInfo.declaration), 0 /* String */, context, createElidedInformationPlaceholder(context));
                         }
                         else {
@@ -48391,15 +49532,29 @@ var ts;
                 }
                 return ts.factory.createKeywordTypeNode(128 /* AnyKeyword */);
             }
+            function shouldUsePlaceholderForProperty(propertySymbol, context) {
+                var _a;
+                // Use placeholders for reverse mapped types we've either already descended into, or which
+                // are nested reverse mappings within a mapping over a non-anonymous type. The later is a restriction mostly just to
+                // reduce the blowup in printback size from doing, eg, a deep reverse mapping over `Window`.
+                // Since anonymous types usually come from expressions, this allows us to preserve the output
+                // for deep mappings which likely come from expressions, while truncating those parts which
+                // come from mappings over library functions.
+                return !!(ts.getCheckFlags(propertySymbol) & 8192 /* ReverseMapped */)
+                    && (ts.contains(context.reverseMappedStack, propertySymbol)
+                        || (((_a = context.reverseMappedStack) === null || _a === void 0 ? void 0 : _a[0])
+                            && !(ts.getObjectFlags(ts.last(context.reverseMappedStack).propertyType) & 16 /* Anonymous */)));
+            }
             function addPropertyToElementList(propertySymbol, context, typeElements) {
+                var _a;
                 var propertyIsReverseMapped = !!(ts.getCheckFlags(propertySymbol) & 8192 /* ReverseMapped */);
-                var propertyType = propertyIsReverseMapped && context.flags & 33554432 /* InReverseMappedType */ ?
+                var propertyType = shouldUsePlaceholderForProperty(propertySymbol, context) ?
                     anyType : getTypeOfSymbol(propertySymbol);
                 var saveEnclosingDeclaration = context.enclosingDeclaration;
                 context.enclosingDeclaration = undefined;
                 if (context.tracker.trackSymbol && ts.getCheckFlags(propertySymbol) & 4096 /* Late */ && isLateBoundName(propertySymbol.escapedName)) {
                     var decl = ts.first(propertySymbol.declarations);
-                    if (hasLateBindableName(decl)) {
+                    if (propertySymbol.declarations && hasLateBindableName(decl)) {
                         if (ts.isBinaryExpression(decl)) {
                             var name = ts.getNameOfDeclaration(decl);
                             if (name && ts.isElementAccessExpression(name) && ts.isPropertyAccessEntityNameExpression(name.argumentExpression)) {
@@ -48411,29 +49566,34 @@ var ts;
                         }
                     }
                 }
-                context.enclosingDeclaration = saveEnclosingDeclaration;
+                context.enclosingDeclaration = propertySymbol.valueDeclaration || ((_a = propertySymbol.declarations) === null || _a === void 0 ? void 0 : _a[0]) || saveEnclosingDeclaration;
                 var propertyName = getPropertyNameNodeForSymbol(propertySymbol, context);
+                context.enclosingDeclaration = saveEnclosingDeclaration;
                 context.approximateLength += (ts.symbolName(propertySymbol).length + 1);
                 var optionalToken = propertySymbol.flags & 16777216 /* Optional */ ? ts.factory.createToken(57 /* QuestionToken */) : undefined;
                 if (propertySymbol.flags & (16 /* Function */ | 8192 /* Method */) && !getPropertiesOfObjectType(propertyType).length && !isReadonlySymbol(propertySymbol)) {
                     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, 164 /* MethodSignature */, context, { name: propertyName, questionToken: optionalToken });
+                        var methodDeclaration = signatureToSignatureDeclarationHelper(signature, 165 /* MethodSignature */, context, { name: propertyName, questionToken: optionalToken });
                         typeElements.push(preserveCommentsOn(methodDeclaration));
                     }
                 }
                 else {
-                    var savedFlags = context.flags;
-                    context.flags |= propertyIsReverseMapped ? 33554432 /* InReverseMappedType */ : 0;
                     var propertyTypeNode = void 0;
-                    if (propertyIsReverseMapped && !!(savedFlags & 33554432 /* InReverseMappedType */)) {
+                    if (shouldUsePlaceholderForProperty(propertySymbol, context)) {
                         propertyTypeNode = createElidedInformationPlaceholder(context);
                     }
                     else {
+                        if (propertyIsReverseMapped) {
+                            context.reverseMappedStack || (context.reverseMappedStack = []);
+                            context.reverseMappedStack.push(propertySymbol);
+                        }
                         propertyTypeNode = propertyType ? serializeTypeForDeclaration(context, propertyType, propertySymbol, saveEnclosingDeclaration) : ts.factory.createKeywordTypeNode(128 /* AnyKeyword */);
+                        if (propertyIsReverseMapped) {
+                            context.reverseMappedStack.pop();
+                        }
                     }
-                    context.flags = savedFlags;
                     var modifiers = isReadonlySymbol(propertySymbol) ? [ts.factory.createToken(142 /* ReadonlyKeyword */)] : undefined;
                     if (modifiers) {
                         context.approximateLength += 9;
@@ -48442,9 +49602,10 @@ var ts;
                     typeElements.push(preserveCommentsOn(propertySignature));
                 }
                 function preserveCommentsOn(node) {
-                    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;
+                    var _a;
+                    if (ts.some(propertySymbol.declarations, function (d) { return d.kind === 337 /* JSDocPropertyTag */; })) {
+                        var d = (_a = propertySymbol.declarations) === null || _a === void 0 ? void 0 : _a.find(function (d) { return d.kind === 337 /* JSDocPropertyTag */; });
+                        var commentText = ts.getTextOfJSDocComment(d.comment);
                         if (commentText) {
                             ts.setSyntheticLeadingComments(node, [{ kind: 3 /* MultiLineCommentTrivia */, text: "*\n * " + commentText.replace(/\n/g, "\n * ") + "\n ", pos: -1, end: -1, hasTrailingNewLine: true }]);
                         }
@@ -48473,25 +49634,25 @@ var ts;
                     var mayHaveNameCollisions = !(context.flags & 64 /* UseFullyQualifiedType */);
                     /** Map from type reference identifier text to [type, index in `result` where the type node is] */
                     var seenNames = mayHaveNameCollisions ? ts.createUnderscoreEscapedMultiMap() : undefined;
-                    var result_4 = [];
+                    var result_5 = [];
                     var i = 0;
                     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));
+                            result_5.push(ts.factory.createTypeReferenceNode("... " + (types.length - i) + " more ...", /*typeArguments*/ undefined));
                             var typeNode_1 = typeToTypeNodeHelper(types[types.length - 1], context);
                             if (typeNode_1) {
-                                result_4.push(typeNode_1);
+                                result_5.push(typeNode_1);
                             }
                             break;
                         }
                         context.approximateLength += 2; // Account for whitespace + separator
                         var typeNode = typeToTypeNodeHelper(type, context);
                         if (typeNode) {
-                            result_4.push(typeNode);
+                            result_5.push(typeNode);
                             if (seenNames && ts.isIdentifierTypeReference(typeNode)) {
-                                seenNames.add(typeNode.typeName.escapedText, [type, result_4.length - 1]);
+                                seenNames.add(typeNode.typeName.escapedText, [type, result_5.length - 1]);
                             }
                         }
                     }
@@ -48513,13 +49674,13 @@ var ts;
                             })) {
                                 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);
+                                    result_5[resultIndex] = typeToTypeNodeHelper(type, context);
                                 }
                             }
                         });
                         context.flags = saveContextFlags;
                     }
-                    return result_4;
+                    return result_5;
                 }
             }
             function typesAreSameReference(a, b) {
@@ -48561,7 +49722,7 @@ var ts;
                 }
                 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); });
+                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 === 167 /* 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);
@@ -48588,25 +49749,25 @@ var ts;
                     }
                 }
                 var modifiers = options === null || options === void 0 ? void 0 : options.modifiers;
-                if ((kind === 175 /* ConstructorType */) && signature.flags & 4 /* Abstract */) {
+                if ((kind === 176 /* ConstructorType */) && signature.flags & 4 /* Abstract */) {
                     var flags = ts.modifiersToFlags(modifiers);
                     modifiers = ts.factory.createModifiersFromModifierFlags(flags | 128 /* Abstract */);
                 }
                 context.approximateLength += 3; // Usually a signature contributes a few more characters than this, but 3 is the minimum
-                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(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, 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, modifiers, parameters, /*body*/ undefined) :
-                                    kind === 167 /* GetAccessor */ ? ts.factory.createGetAccessorDeclaration(/*decorators*/ undefined, 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, 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, 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(modifiers, typeParameters, parameters, returnTypeNode !== null && returnTypeNode !== void 0 ? returnTypeNode : ts.factory.createTypeReferenceNode(ts.factory.createIdentifier(""))) :
-                                                            kind === 251 /* FunctionDeclaration */ ? ts.factory.createFunctionDeclaration(/*decorators*/ undefined, 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(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(modifiers, typeParameters, parameters, returnTypeNode, /*equalsGreaterThanToken*/ undefined, ts.factory.createBlock([])) :
+                var node = kind === 170 /* CallSignature */ ? ts.factory.createCallSignature(typeParameters, parameters, returnTypeNode) :
+                    kind === 171 /* ConstructSignature */ ? ts.factory.createConstructSignature(typeParameters, parameters, returnTypeNode) :
+                        kind === 165 /* MethodSignature */ ? ts.factory.createMethodSignature(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 === 166 /* MethodDeclaration */ ? ts.factory.createMethodDeclaration(/*decorators*/ undefined, 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 === 167 /* Constructor */ ? ts.factory.createConstructorDeclaration(/*decorators*/ undefined, modifiers, parameters, /*body*/ undefined) :
+                                    kind === 168 /* GetAccessor */ ? ts.factory.createGetAccessorDeclaration(/*decorators*/ undefined, modifiers, (_c = options === null || options === void 0 ? void 0 : options.name) !== null && _c !== void 0 ? _c : ts.factory.createIdentifier(""), parameters, returnTypeNode, /*body*/ undefined) :
+                                        kind === 169 /* SetAccessor */ ? ts.factory.createSetAccessorDeclaration(/*decorators*/ undefined, modifiers, (_d = options === null || options === void 0 ? void 0 : options.name) !== null && _d !== void 0 ? _d : ts.factory.createIdentifier(""), parameters, /*body*/ undefined) :
+                                            kind === 172 /* IndexSignature */ ? ts.factory.createIndexSignature(/*decorators*/ undefined, modifiers, parameters, returnTypeNode) :
+                                                kind === 309 /* JSDocFunctionType */ ? ts.factory.createJSDocFunctionType(parameters, returnTypeNode) :
+                                                    kind === 175 /* FunctionType */ ? ts.factory.createFunctionTypeNode(typeParameters, parameters, returnTypeNode !== null && returnTypeNode !== void 0 ? returnTypeNode : ts.factory.createTypeReferenceNode(ts.factory.createIdentifier(""))) :
+                                                        kind === 176 /* ConstructorType */ ? ts.factory.createConstructorTypeNode(modifiers, typeParameters, parameters, returnTypeNode !== null && returnTypeNode !== void 0 ? returnTypeNode : ts.factory.createTypeReferenceNode(ts.factory.createIdentifier(""))) :
+                                                            kind === 252 /* FunctionDeclaration */ ? ts.factory.createFunctionDeclaration(/*decorators*/ undefined, 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 === 209 /* FunctionExpression */ ? ts.factory.createFunctionExpression(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 === 210 /* ArrowFunction */ ? ts.factory.createArrowFunction(modifiers, typeParameters, parameters, returnTypeNode, /*equalsGreaterThanToken*/ undefined, ts.factory.createBlock([])) :
                                                                         ts.Debug.assertNever(kind);
                 if (typeArguments) {
                     node.typeArguments = ts.factory.createNodeArray(typeArguments);
@@ -48628,9 +49789,9 @@ var ts;
                 return typeParameterToDeclarationWithConstraint(type, context, constraintNode);
             }
             function symbolToParameterDeclaration(parameterSymbol, context, preserveModifierFlags, privateSymbolVisitor, bundledImports) {
-                var parameterDeclaration = ts.getDeclarationOfKind(parameterSymbol, 160 /* Parameter */);
+                var parameterDeclaration = ts.getDeclarationOfKind(parameterSymbol, 161 /* Parameter */);
                 if (!parameterDeclaration && !ts.isTransientSymbol(parameterSymbol)) {
-                    parameterDeclaration = ts.getDeclarationOfKind(parameterSymbol, 326 /* JSDocParameterTag */);
+                    parameterDeclaration = ts.getDeclarationOfKind(parameterSymbol, 330 /* JSDocParameterTag */);
                 }
                 var parameterType = getTypeOfSymbol(parameterSymbol);
                 if (parameterDeclaration && isRequiredInitializedParameter(parameterDeclaration)) {
@@ -48645,7 +49806,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 === 157 /* QualifiedName */ ? ts.setEmitFlags(ts.factory.cloneNode(parameterDeclaration.name.right), 16777216 /* NoAsciiEscaping */) :
+                        parameterDeclaration.name.kind === 158 /* QualifiedName */ ? ts.setEmitFlags(ts.factory.cloneNode(parameterDeclaration.name.right), 16777216 /* NoAsciiEscaping */) :
                             cloneBindingName(parameterDeclaration.name) :
                     ts.symbolName(parameterSymbol) :
                     ts.symbolName(parameterSymbol);
@@ -48810,11 +49971,11 @@ var ts;
             }
             function getSpecifierForModuleSymbol(symbol, context) {
                 var _a;
-                var file = ts.getDeclarationOfKind(symbol, 297 /* SourceFile */);
+                var file = ts.getDeclarationOfKind(symbol, 298 /* SourceFile */);
                 if (!file) {
                     var equivalentFileSymbol = ts.firstDefined(symbol.declarations, function (d) { return getFileSymbolIfFileSymbolExportEqualsContainer(d, symbol); });
                     if (equivalentFileSymbol) {
-                        file = ts.getDeclarationOfKind(equivalentFileSymbol, 297 /* SourceFile */);
+                        file = ts.getDeclarationOfKind(equivalentFileSymbol, 298 /* SourceFile */);
                     }
                 }
                 if (file && file.moduleName !== undefined) {
@@ -48825,8 +49986,8 @@ var ts;
                     if (context.tracker.trackReferencedAmbientModule) {
                         var ambientDecls = ts.filter(symbol.declarations, ts.isAmbientModule);
                         if (ts.length(ambientDecls)) {
-                            for (var _i = 0, ambientDecls_1 = ambientDecls; _i < ambientDecls_1.length; _i++) {
-                                var decl = ambientDecls_1[_i];
+                            for (var _i = 0, _b = ambientDecls; _i < _b.length; _i++) {
+                                var decl = _b[_i];
                                 context.tracker.trackReferencedAmbientModule(decl, symbol);
                             }
                         }
@@ -48853,7 +50014,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, checker, specifierCompilerOptions, contextFile, moduleResolverHost, { importModuleSpecifierPreference: isBundle_1 ? "non-relative" : "relative", importModuleSpecifierEnding: isBundle_1 ? "minimal" : undefined }));
+                    specifier = ts.first(ts.moduleSpecifiers.getModuleSpecifiers(symbol, checker, specifierCompilerOptions, contextFile, moduleResolverHost, { importModuleSpecifierPreference: isBundle_1 ? "non-relative" : "project-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);
                 }
@@ -48997,7 +50158,7 @@ var ts;
                 var chain = lookupSymbolChain(symbol, context, meaning);
                 if (expectsIdentifier && chain.length !== 1
                     && !context.encounteredError
-                    && !(context.flags & 65536 /* AllowQualifedNameInPlaceOfIdentifier */)) {
+                    && !(context.flags & 65536 /* AllowQualifiedNameInPlaceOfIdentifier */)) {
                     context.encounteredError = true;
                 }
                 return createEntityNameFromSymbolChain(chain, chain.length - 1);
@@ -49077,9 +50238,6 @@ var ts;
                 if (fromNameType) {
                     return fromNameType;
                 }
-                if (ts.isKnownSymbol(symbol)) {
-                    return ts.factory.createComputedPropertyName(ts.factory.createPropertyAccessExpression(ts.factory.createIdentifier("Symbol"), symbol.escapedName.substr(3)));
-                }
                 var rawName = ts.unescapeLeadingUnderscores(symbol.escapedName);
                 var stringNamed = !!ts.length(symbol.declarations) && ts.every(symbol.declarations, isStringNamed);
                 return createPropertyNameNodeForIdentifierOrLiteral(rawName, stringNamed, singleQuote);
@@ -49146,13 +50304,13 @@ var ts;
             function serializeTypeForDeclaration(context, type, symbol, enclosingDeclaration, includePrivateSymbol, bundled) {
                 if (type !== errorType && enclosingDeclaration) {
                     var declWithExistingAnnotation = getDeclarationWithTypeAnnotation(symbol, enclosingDeclaration);
-                    if (declWithExistingAnnotation && !ts.isFunctionLikeDeclaration(declWithExistingAnnotation)) {
+                    if (declWithExistingAnnotation && !ts.isFunctionLikeDeclaration(declWithExistingAnnotation) && !ts.isGetAccessorDeclaration(declWithExistingAnnotation)) {
                         // try to reuse the existing annotation
                         var existing = ts.getEffectiveTypeAnnotationNode(declWithExistingAnnotation);
                         if (getTypeFromTypeNode(existing) === type && existingTypeNodeIsNotReferenceOrIsReferenceWithCompatibleTypeArgumentCount(existing, type)) {
-                            var result_5 = serializeExistingTypeNode(context, existing, includePrivateSymbol, bundled);
-                            if (result_5) {
-                                return result_5;
+                            var result_6 = serializeExistingTypeNode(context, existing, includePrivateSymbol, bundled);
+                            if (result_6) {
+                                return result_6;
                             }
                         }
                     }
@@ -49169,10 +50327,14 @@ var ts;
             function serializeReturnTypeForSignature(context, type, signature, includePrivateSymbol, bundled) {
                 if (type !== errorType && context.enclosingDeclaration) {
                     var annotation = signature.declaration && ts.getEffectiveReturnTypeNode(signature.declaration);
-                    if (!!ts.findAncestor(annotation, function (n) { return n === context.enclosingDeclaration; }) && annotation && instantiateType(getTypeFromTypeNode(annotation), signature.mapper) === type && existingTypeNodeIsNotReferenceOrIsReferenceWithCompatibleTypeArgumentCount(annotation, type)) {
-                        var result = serializeExistingTypeNode(context, annotation, includePrivateSymbol, bundled);
-                        if (result) {
-                            return result;
+                    if (!!ts.findAncestor(annotation, function (n) { return n === context.enclosingDeclaration; }) && annotation) {
+                        var annotated = getTypeFromTypeNode(annotation);
+                        var thisInstantiated = annotated.flags & 262144 /* TypeParameter */ && annotated.isThisType ? instantiateType(annotated, signature.mapper) : annotated;
+                        if (thisInstantiated === type && existingTypeNodeIsNotReferenceOrIsReferenceWithCompatibleTypeArgumentCount(annotation, type)) {
+                            var result = serializeExistingTypeNode(context, annotation, includePrivateSymbol, bundled);
+                            if (result) {
+                                return result;
+                            }
                         }
                     }
                 }
@@ -49216,7 +50378,7 @@ var ts;
                 return transformed === existing ? ts.setTextRange(ts.factory.cloneNode(existing), existing) : transformed;
                 function visitExistingNodeTreeSymbols(node) {
                     // We don't _actually_ support jsdoc namepath types, emit `any` instead
-                    if (ts.isJSDocAllType(node) || node.kind === 310 /* JSDocNamepathType */) {
+                    if (ts.isJSDocAllType(node) || node.kind === 311 /* JSDocNamepathType */) {
                         return ts.factory.createKeywordTypeNode(128 /* AnyKeyword */);
                     }
                     if (ts.isJSDocUnknownType(node)) {
@@ -49335,8 +50497,8 @@ var ts;
                 }
             }
             function symbolTableToDeclarationStatements(symbolTable, context, bundled) {
-                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);
+                var serializePropertySymbolForClass = makeSerializePropertySymbol(ts.factory.createPropertyDeclaration, 166 /* MethodDeclaration */, /*useAcessors*/ true);
+                var serializePropertySymbolForInterfaceWorker = makeSerializePropertySymbol(function (_decorators, mods, name, question, type) { return ts.factory.createPropertySignature(mods, name, question, type); }, 165 /* 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
@@ -49557,6 +50719,7 @@ var ts;
                 // If it's a class/interface/function: emit a class/interface/function with a `default` modifier
                 // These forms can merge, eg (`export default 12; export default interface A {}`)
                 function serializeSymbolWorker(symbol, isPrivate, propertyAsAlias) {
+                    var _a, _b;
                     var symbolName = ts.unescapeLeadingUnderscores(symbol.escapedName);
                     var isDefault = symbol.escapedName === "default" /* Default */;
                     if (isPrivate && !(context.flags & 131072 /* AllowAnonymousIdentifier */) && ts.isStringANonContextualKeyword(symbolName) && !isDefault) {
@@ -49615,9 +50778,9 @@ var ts;
                                 if (textRange && ts.isVariableDeclarationList(textRange.parent) && textRange.parent.declarations.length === 1) {
                                     textRange = textRange.parent.parent;
                                 }
-                                var propertyAccessRequire = ts.find(symbol.declarations, ts.isPropertyAccessExpression);
+                                var propertyAccessRequire = (_a = symbol.declarations) === null || _a === void 0 ? void 0 : _a.find(ts.isPropertyAccessExpression);
                                 if (propertyAccessRequire && ts.isBinaryExpression(propertyAccessRequire.parent) && ts.isIdentifier(propertyAccessRequire.parent.right)
-                                    && type.symbol && ts.isSourceFile(type.symbol.valueDeclaration)) {
+                                    && ((_b = type.symbol) === null || _b === void 0 ? void 0 : _b.valueDeclaration) && ts.isSourceFile(type.symbol.valueDeclaration)) {
                                     var alias = localName === propertyAccessRequire.parent.right.escapedText ? undefined : propertyAccessRequire.parent.right;
                                     addResult(ts.factory.createExportDeclaration(
                                     /*decorators*/ undefined, 
@@ -49667,7 +50830,10 @@ var ts;
                         serializeEnum(symbol, symbolName, modifierFlags);
                     }
                     if (symbol.flags & 32 /* Class */) {
-                        if (symbol.flags & 4 /* Property */ && ts.isBinaryExpression(symbol.valueDeclaration.parent) && ts.isClassExpression(symbol.valueDeclaration.parent.right)) {
+                        if (symbol.flags & 4 /* Property */
+                            && symbol.valueDeclaration
+                            && ts.isBinaryExpression(symbol.valueDeclaration.parent)
+                            && ts.isClassExpression(symbol.valueDeclaration.parent.right)) {
                             // Looks like a `module.exports.Sub = class {}` - if we serialize `symbol` as a class, the result will have no members,
                             // since the classiness is actually from the target of the effective alias the symbol is. yes. A BlockScopedVariable|Class|Property
                             // _really_ acts like an Alias, and none of a BlockScopedVariable, Class, or Property. This is the travesty of JS binding today.
@@ -49693,12 +50859,14 @@ var ts;
                     if (symbol.flags & 8388608 /* ExportStar */) {
                         // synthesize export * from "moduleReference"
                         // Straightforward - only one thing to do - make an export declaration
-                        for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
-                            var node = _a[_i];
-                            var resolvedModule = resolveExternalModuleName(node, node.moduleSpecifier);
-                            if (!resolvedModule)
-                                continue;
-                            addResult(ts.factory.createExportDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, /*isTypeOnly*/ false, /*exportClause*/ undefined, ts.factory.createStringLiteral(getSpecifierForModuleSymbol(resolvedModule, context))), 0 /* None */);
+                        if (symbol.declarations) {
+                            for (var _i = 0, _c = symbol.declarations; _i < _c.length; _i++) {
+                                var node = _c[_i];
+                                var resolvedModule = resolveExternalModuleName(node, node.moduleSpecifier);
+                                if (!resolvedModule)
+                                    continue;
+                                addResult(ts.factory.createExportDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, /*isTypeOnly*/ false, /*exportClause*/ undefined, ts.factory.createStringLiteral(getSpecifierForModuleSymbol(resolvedModule, context))), 0 /* None */);
+                            }
                         }
                     }
                     if (needsPostExportDefault) {
@@ -49760,11 +50928,12 @@ var ts;
                     results.push(node);
                 }
                 function serializeTypeAlias(symbol, symbolName, modifierFlags) {
+                    var _a;
                     var aliasType = getDeclaredTypeOfTypeAlias(symbol);
                     var typeParams = getSymbolLinks(symbol).typeParameters;
                     var typeParamDecls = ts.map(typeParams, function (p) { return typeParameterToDeclaration(p, context); });
-                    var jsdocAliasDecl = ts.find(symbol.declarations, ts.isJSDocTypeAlias);
-                    var commentText = jsdocAliasDecl ? jsdocAliasDecl.comment || jsdocAliasDecl.parent.comment : undefined;
+                    var jsdocAliasDecl = (_a = symbol.declarations) === null || _a === void 0 ? void 0 : _a.find(ts.isJSDocTypeAlias);
+                    var commentText = ts.getTextOfJSDocComment(jsdocAliasDecl ? jsdocAliasDecl.comment || jsdocAliasDecl.parent.comment : undefined);
                     var oldFlags = context.flags;
                     context.flags |= 8388608 /* InTypeAlias */;
                     var oldEnclosingDecl = context.enclosingDeclaration;
@@ -49784,8 +50953,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, 169 /* CallSignature */);
-                    var constructSignatures = serializeSignatures(1 /* Construct */, interfaceType, baseType, 170 /* ConstructSignature */);
+                    var callSignatures = serializeSignatures(0 /* Call */, interfaceType, baseType, 170 /* CallSignature */);
+                    var constructSignatures = serializeSignatures(1 /* Construct */, interfaceType, baseType, 171 /* 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(
@@ -49854,9 +51023,8 @@ 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, 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);
+                        var decl = signatureToSignatureDeclarationHelper(sig, 252 /* FunctionDeclaration */, context, { name: ts.factory.createIdentifier(localName), privateSymbolVisitor: includePrivateSymbol, bundledImports: bundled });
+                        addResult(ts.setTextRange(decl, getSignatureTextRangeLocation(sig)), modifierFlags);
                     }
                     // Module symbol emit will take care of module-y members, provided it has exports
                     if (!(symbol.flags & (512 /* ValueModule */ | 1024 /* NamespaceModule */) && !!symbol.exports && !!symbol.exports.size)) {
@@ -49864,6 +51032,18 @@ var ts;
                         serializeAsNamespaceDeclaration(props, localName, modifierFlags, /*suppressNewPrivateContext*/ true);
                     }
                 }
+                function getSignatureTextRangeLocation(signature) {
+                    if (signature.declaration && signature.declaration.parent) {
+                        if (ts.isBinaryExpression(signature.declaration.parent) && ts.getAssignmentDeclarationKind(signature.declaration.parent) === 5 /* Property */) {
+                            return signature.declaration.parent;
+                        }
+                        // for expressions assigned to `var`s, use the `var` as the text range
+                        if (ts.isVariableDeclaration(signature.declaration.parent) && signature.declaration.parent.parent) {
+                            return signature.declaration.parent.parent;
+                        }
+                    }
+                    return signature.declaration;
+                }
                 function serializeAsNamespaceDeclaration(props, localName, modifierFlags, suppressNewPrivateContext) {
                     if (ts.length(props)) {
                         var localVsRemoteMap = ts.arrayToMultiMap(props, function (p) {
@@ -49950,8 +51130,8 @@ var ts;
                     return undefined;
                 }
                 function serializeAsClass(symbol, localName, modifierFlags) {
-                    var _a;
-                    var originalDecl = ts.find(symbol.declarations, ts.isClassLike);
+                    var _a, _b;
+                    var originalDecl = (_a = symbol.declarations) === null || _a === void 0 ? void 0 : _a.find(ts.isClassLike);
                     var oldEnclosing = context.enclosingDeclaration;
                     context.enclosingDeclaration = originalDecl || oldEnclosing;
                     var localParams = getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(symbol);
@@ -49962,7 +51142,7 @@ var ts;
                     var implementsExpressions = originalImplements && sanitizeJSDocImplements(originalImplements)
                         || ts.mapDefined(getImplementsTypes(classType), serializeImplementedType);
                     var staticType = getTypeOfSymbol(symbol);
-                    var isClass = !!((_a = staticType.symbol) === null || _a === void 0 ? void 0 : _a.valueDeclaration) && ts.isClassLike(staticType.symbol.valueDeclaration);
+                    var isClass = !!((_b = staticType.symbol) === null || _b === void 0 ? void 0 : _b.valueDeclaration) && ts.isClassLike(staticType.symbol.valueDeclaration);
                     var staticBaseType = isClass
                         ? getBaseConstructorTypeOfClass(staticType)
                         : anyType;
@@ -49973,14 +51153,14 @@ var ts;
                         // a union/intersection base type, but inherited properties
                         // don't matter here.
                         var valueDecl = s.valueDeclaration;
-                        return valueDecl && !(ts.isNamedDeclaration(valueDecl) && ts.isPrivateIdentifier(valueDecl.name));
+                        return !!valueDecl && !(ts.isNamedDeclaration(valueDecl) && ts.isPrivateIdentifier(valueDecl.name));
                     });
                     var hasPrivateIdentifier = ts.some(symbolProps, function (s) {
                         // `valueDeclaration` could be undefined if inherited from
                         // a union/intersection base type, but inherited properties
                         // don't matter here.
                         var valueDecl = s.valueDeclaration;
-                        return valueDecl && ts.isNamedDeclaration(valueDecl) && ts.isPrivateIdentifier(valueDecl.name);
+                        return !!valueDecl && ts.isNamedDeclaration(valueDecl) && ts.isPrivateIdentifier(valueDecl.name);
                     });
                     // Boil down all private properties into a single one.
                     var privateProperties = hasPrivateIdentifier ?
@@ -50003,7 +51183,7 @@ 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, staticBaseType, 166 /* Constructor */);
+                        serializeSignatures(1 /* Construct */, staticType, staticBaseType, 167 /* Constructor */);
                     var indexSignatures = serializeIndexSignatures(classType, baseTypes[0]);
                     context.enclosingDeclaration = oldEnclosing;
                     addResult(ts.setTextRange(ts.factory.createClassDeclaration(
@@ -50030,8 +51210,8 @@ 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 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 */) {
+                        case 199 /* BindingElement */:
+                            if (((_b = (_a = node.parent) === null || _a === void 0 ? void 0 : _a.parent) === null || _b === void 0 ? void 0 : _b.kind) === 250 /* VariableDeclaration */) {
                                 // const { SomeClass } = require('./lib');
                                 var specifier_1 = getSpecifierForModuleSymbol(target.parent || target, context); // './lib'
                                 var propertyName = node.propertyName;
@@ -50043,13 +51223,13 @@ var ts;
                             // 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 */) {
+                        case 290 /* ShorthandPropertyAssignment */:
+                            if (((_e = (_d = node.parent) === null || _d === void 0 ? void 0 : _d.parent) === null || _e === void 0 ? void 0 : _e.kind) === 217 /* BinaryExpression */) {
                                 // module.exports = { SomeClass }
                                 serializeExportSpecifier(ts.unescapeLeadingUnderscores(symbol.escapedName), targetName);
                             }
                             break;
-                        case 249 /* VariableDeclaration */:
+                        case 250 /* VariableDeclaration */:
                             // commonjs require: const x = require('y')
                             if (ts.isPropertyAccessExpression(node.initializer)) {
                                 // const x = require('y').z
@@ -50069,7 +51249,7 @@ var ts;
                                 break;
                             }
                         // else fall through and treat commonjs require just like import=
-                        case 260 /* ImportEqualsDeclaration */:
+                        case 261 /* 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)) {
@@ -50086,13 +51266,13 @@ var ts;
                                 ? symbolToName(target, context, 67108863 /* All */, /*expectsIdentifier*/ false)
                                 : ts.factory.createExternalModuleReference(ts.factory.createStringLiteral(getSpecifierForModuleSymbol(target, context)))), isLocalImport ? modifierFlags : 0 /* None */);
                             break;
-                        case 259 /* NamespaceExportDeclaration */:
+                        case 260 /* 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 262 /* ImportClause */:
+                        case 263 /* ImportClause */:
                             addResult(ts.factory.createImportDeclaration(
                             /*decorators*/ undefined, 
                             /*modifiers*/ undefined, ts.factory.createImportClause(/*isTypeOnly*/ false, ts.factory.createIdentifier(localName), /*namedBindings*/ undefined), 
@@ -50101,18 +51281,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 263 /* NamespaceImport */:
+                        case 264 /* 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 269 /* NamespaceExport */:
+                        case 270 /* 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 265 /* ImportSpecifier */:
+                        case 266 /* ImportSpecifier */:
                             addResult(ts.factory.createImportDeclaration(
                             /*decorators*/ undefined, 
                             /*modifiers*/ undefined, ts.factory.createImportClause(
@@ -50121,7 +51301,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 270 /* ExportSpecifier */:
+                        case 271 /* 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;
@@ -50129,12 +51309,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 266 /* ExportAssignment */:
+                        case 267 /* ExportAssignment */:
                             serializeMaybeAliasAssignment(symbol);
                             break;
-                        case 216 /* BinaryExpression */:
-                        case 201 /* PropertyAccessExpression */:
-                        case 202 /* ElementAccessExpression */:
+                        case 217 /* BinaryExpression */:
+                        case 202 /* PropertyAccessExpression */:
+                        case 203 /* 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
@@ -50268,6 +51448,7 @@ var ts;
                 }
                 function makeSerializePropertySymbol(createProperty, methodKind, useAccessors) {
                     return function serializePropertySymbol(p, isStatic, baseType) {
+                        var _a, _b, _c, _d, _e;
                         var modifierFlags = ts.getDeclarationModifierFlagsFromSymbol(p);
                         var isPrivate = !!(modifierFlags & 8 /* Private */);
                         if (isStatic && (p.flags & (788968 /* Type */ | 1920 /* Namespace */ | 2097152 /* Alias */))) {
@@ -50284,7 +51465,7 @@ var ts;
                         }
                         var flag = (modifierFlags & ~256 /* Async */) | (isStatic ? 32 /* Static */ : 0);
                         var name = getPropertyNameNodeForSymbol(p, context);
-                        var firstPropertyLikeDecl = ts.find(p.declarations, ts.or(ts.isPropertyDeclaration, ts.isAccessor, ts.isVariableDeclaration, ts.isPropertySignature, ts.isBinaryExpression, ts.isPropertyAccessExpression));
+                        var firstPropertyLikeDecl = (_a = p.declarations) === null || _a === void 0 ? void 0 : _a.find(ts.or(ts.isPropertyDeclaration, ts.isAccessor, ts.isVariableDeclaration, ts.isPropertySignature, ts.isBinaryExpression, ts.isPropertyAccessExpression));
                         if (p.flags & 98304 /* Accessor */ && useAccessors) {
                             var result = [];
                             if (p.flags & 65536 /* SetAccessor */) {
@@ -50294,13 +51475,13 @@ var ts;
                                     /*modifiers*/ undefined, 
                                     /*dotDotDotToken*/ undefined, "arg", 
                                     /*questionToken*/ undefined, isPrivate ? undefined : serializeTypeForDeclaration(context, getTypeOfSymbol(p), p, enclosingDeclaration, includePrivateSymbol, bundled))], 
-                                /*body*/ undefined), ts.find(p.declarations, ts.isSetAccessor) || firstPropertyLikeDecl));
+                                /*body*/ undefined), ((_b = p.declarations) === null || _b === void 0 ? void 0 : _b.find(ts.isSetAccessor)) || firstPropertyLikeDecl));
                             }
                             if (p.flags & 32768 /* GetAccessor */) {
                                 var isPrivate_1 = modifierFlags & 8 /* Private */;
                                 result.push(ts.setTextRange(ts.factory.createGetAccessorDeclaration(
                                 /*decorators*/ undefined, ts.factory.createModifiersFromModifierFlags(flag), name, [], isPrivate_1 ? undefined : serializeTypeForDeclaration(context, getTypeOfSymbol(p), p, enclosingDeclaration, includePrivateSymbol, bundled), 
-                                /*body*/ undefined), ts.find(p.declarations, ts.isGetAccessor) || firstPropertyLikeDecl));
+                                /*body*/ undefined), ((_c = p.declarations) === null || _c === void 0 ? void 0 : _c.find(ts.isGetAccessor)) || firstPropertyLikeDecl));
                             }
                             return result;
                         }
@@ -50311,7 +51492,7 @@ var ts;
                             /*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
                             // interface members can't have initializers, however class members _can_
-                            /*initializer*/ undefined), ts.find(p.declarations, ts.or(ts.isPropertyDeclaration, ts.isVariableDeclaration)) || firstPropertyLikeDecl);
+                            /*initializer*/ undefined), ((_d = p.declarations) === null || _d === void 0 ? void 0 : _d.find(ts.or(ts.isPropertyDeclaration, ts.isVariableDeclaration))) || firstPropertyLikeDecl);
                         }
                         if (p.flags & (8192 /* Method */ | 16 /* Function */)) {
                             var type = getTypeOfSymbol(p);
@@ -50320,7 +51501,7 @@ var ts;
                                 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, 
                                 /*type*/ undefined, 
-                                /*initializer*/ undefined), ts.find(p.declarations, ts.isFunctionLikeDeclaration) || signatures[0] && signatures[0].declaration || p.declarations[0]);
+                                /*initializer*/ undefined), ((_e = p.declarations) === null || _e === void 0 ? void 0 : _e.find(ts.isFunctionLikeDeclaration)) || signatures[0] && signatures[0].declaration || p.declarations && p.declarations[0]);
                             }
                             var results_1 = [];
                             for (var _i = 0, signatures_3 = signatures; _i < signatures_3.length; _i++) {
@@ -50331,7 +51512,8 @@ var ts;
                                     questionToken: p.flags & 16777216 /* Optional */ ? ts.factory.createToken(57 /* QuestionToken */) : undefined,
                                     modifiers: flag ? ts.factory.createModifiersFromModifierFlags(flag) : undefined
                                 });
-                                results_1.push(ts.setTextRange(decl, sig.declaration));
+                                var location = sig.declaration && ts.isPrototypePropertyAssignment(sig.declaration.parent) ? sig.declaration.parent : sig.declaration;
+                                results_1.push(ts.setTextRange(decl, location));
                             }
                             return results_1;
                         }
@@ -50547,9 +51729,9 @@ var ts;
             return "public";
         }
         function getTypeAliasForTypeLiteral(type) {
-            if (type.symbol && type.symbol.flags & 2048 /* TypeLiteral */) {
+            if (type.symbol && type.symbol.flags & 2048 /* TypeLiteral */ && type.symbol.declarations) {
                 var node = ts.walkUpParenthesizedTypes(type.symbol.declarations[0].parent);
-                if (node.kind === 254 /* TypeAliasDeclaration */) {
+                if (node.kind === 255 /* TypeAliasDeclaration */) {
                     return getSymbolOfNode(node);
                 }
             }
@@ -50557,11 +51739,11 @@ var ts;
         }
         function isTopLevelInExternalModuleAugmentation(node) {
             return node && node.parent &&
-                node.parent.kind === 257 /* ModuleBlock */ &&
+                node.parent.kind === 258 /* ModuleBlock */ &&
                 ts.isExternalModuleAugmentation(node.parent.parent);
         }
         function isDefaultBindingContext(location) {
-            return location.kind === 297 /* SourceFile */ || ts.isAmbientModule(location);
+            return location.kind === 298 /* SourceFile */ || ts.isAmbientModule(location);
         }
         function getNameOfSymbolFromNameType(symbol, context) {
             var nameType = getSymbolLinks(symbol).nameType;
@@ -50620,17 +51802,17 @@ var ts;
                 if (!declaration) {
                     declaration = symbol.declarations[0]; // Declaration may be nameless, but we'll try anyway
                 }
-                if (declaration.parent && declaration.parent.kind === 249 /* VariableDeclaration */) {
+                if (declaration.parent && declaration.parent.kind === 250 /* VariableDeclaration */) {
                     return ts.declarationNameToString(declaration.parent.name);
                 }
                 switch (declaration.kind) {
-                    case 221 /* ClassExpression */:
-                    case 208 /* FunctionExpression */:
-                    case 209 /* ArrowFunction */:
+                    case 222 /* ClassExpression */:
+                    case 209 /* FunctionExpression */:
+                    case 210 /* ArrowFunction */:
                         if (context && !context.encounteredError && !(context.flags & 131072 /* AllowAnonymousIdentifier */)) {
                             context.encounteredError = true;
                         }
-                        return declaration.kind === 221 /* ClassExpression */ ? "(Anonymous class)" : "(Anonymous function)";
+                        return declaration.kind === 222 /* ClassExpression */ ? "(Anonymous class)" : "(Anonymous function)";
                 }
             }
             var name = getNameOfSymbolFromNameType(symbol, context);
@@ -50647,28 +51829,28 @@ var ts;
             return false;
             function determineIfDeclarationIsVisible() {
                 switch (node.kind) {
-                    case 324 /* JSDocCallbackTag */:
-                    case 331 /* JSDocTypedefTag */:
-                    case 325 /* JSDocEnumTag */:
+                    case 328 /* JSDocCallbackTag */:
+                    case 335 /* JSDocTypedefTag */:
+                    case 329 /* 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 198 /* BindingElement */:
+                    case 199 /* BindingElement */:
                         return isDeclarationVisible(node.parent.parent);
-                    case 249 /* VariableDeclaration */:
+                    case 250 /* 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 256 /* ModuleDeclaration */:
-                    case 252 /* ClassDeclaration */:
-                    case 253 /* InterfaceDeclaration */:
-                    case 254 /* TypeAliasDeclaration */:
-                    case 251 /* FunctionDeclaration */:
-                    case 255 /* EnumDeclaration */:
-                    case 260 /* ImportEqualsDeclaration */:
+                    case 257 /* ModuleDeclaration */:
+                    case 253 /* ClassDeclaration */:
+                    case 254 /* InterfaceDeclaration */:
+                    case 255 /* TypeAliasDeclaration */:
+                    case 252 /* FunctionDeclaration */:
+                    case 256 /* EnumDeclaration */:
+                    case 261 /* ImportEqualsDeclaration */:
                         // external module augmentation is always visible
                         if (ts.isExternalModuleAugmentation(node)) {
                             return true;
@@ -50676,55 +51858,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 !== 260 /* ImportEqualsDeclaration */ && parent.kind !== 297 /* SourceFile */ && parent.flags & 8388608 /* Ambient */)) {
+                            !(node.kind !== 261 /* ImportEqualsDeclaration */ && parent.kind !== 298 /* 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 163 /* PropertyDeclaration */:
-                    case 162 /* PropertySignature */:
-                    case 167 /* GetAccessor */:
-                    case 168 /* SetAccessor */:
-                    case 165 /* MethodDeclaration */:
-                    case 164 /* MethodSignature */:
+                    case 164 /* PropertyDeclaration */:
+                    case 163 /* PropertySignature */:
+                    case 168 /* GetAccessor */:
+                    case 169 /* SetAccessor */:
+                    case 166 /* MethodDeclaration */:
+                    case 165 /* 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 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 */:
+                    case 167 /* Constructor */:
+                    case 171 /* ConstructSignature */:
+                    case 170 /* CallSignature */:
+                    case 172 /* IndexSignature */:
+                    case 161 /* Parameter */:
+                    case 258 /* ModuleBlock */:
+                    case 175 /* FunctionType */:
+                    case 176 /* ConstructorType */:
+                    case 178 /* TypeLiteral */:
+                    case 174 /* TypeReference */:
+                    case 179 /* ArrayType */:
+                    case 180 /* TupleType */:
+                    case 183 /* UnionType */:
+                    case 184 /* IntersectionType */:
+                    case 187 /* ParenthesizedType */:
+                    case 193 /* 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 262 /* ImportClause */:
-                    case 263 /* NamespaceImport */:
-                    case 265 /* ImportSpecifier */:
+                    case 263 /* ImportClause */:
+                    case 264 /* NamespaceImport */:
+                    case 266 /* ImportSpecifier */:
                         return false;
                     // Type parameters are always visible
-                    case 159 /* TypeParameter */:
+                    case 160 /* TypeParameter */:
                     // Source file and namespace export are always visible
                     // falls through
-                    case 297 /* SourceFile */:
-                    case 259 /* NamespaceExportDeclaration */:
+                    case 298 /* SourceFile */:
+                    case 260 /* NamespaceExportDeclaration */:
                         return true;
                     // Export assignments do not create name bindings outside the module
-                    case 266 /* ExportAssignment */:
+                    case 267 /* ExportAssignment */:
                         return false;
                     default:
                         return false;
@@ -50733,10 +51915,10 @@ var ts;
         }
         function collectLinkedAliases(node, setVisibility) {
             var exportSymbol;
-            if (node.parent && node.parent.kind === 266 /* ExportAssignment */) {
+            if (node.parent && node.parent.kind === 267 /* ExportAssignment */) {
                 exportSymbol = resolveName(node, node.escapedText, 111551 /* Value */ | 788968 /* Type */ | 1920 /* Namespace */ | 2097152 /* Alias */, /*nameNotFoundMessage*/ undefined, node, /*isUse*/ false);
             }
-            else if (node.parent.kind === 270 /* ExportSpecifier */) {
+            else if (node.parent.kind === 271 /* ExportSpecifier */) {
                 exportSymbol = getTargetOfExportSpecifier(node.parent, 111551 /* Value */ | 788968 /* Type */ | 1920 /* Namespace */ | 2097152 /* Alias */);
             }
             var result;
@@ -50841,12 +52023,12 @@ var ts;
         function getDeclarationContainer(node) {
             return ts.findAncestor(ts.getRootDeclaration(node), function (node) {
                 switch (node.kind) {
-                    case 249 /* VariableDeclaration */:
-                    case 250 /* VariableDeclarationList */:
-                    case 265 /* ImportSpecifier */:
-                    case 264 /* NamedImports */:
-                    case 263 /* NamespaceImport */:
-                    case 262 /* ImportClause */:
+                    case 250 /* VariableDeclaration */:
+                    case 251 /* VariableDeclarationList */:
+                    case 266 /* ImportSpecifier */:
+                    case 265 /* NamedImports */:
+                    case 264 /* NamespaceImport */:
+                    case 263 /* ImportClause */:
                         return false;
                     default:
                         return true;
@@ -50909,9 +52091,16 @@ var ts;
             var stringIndexInfo = getIndexInfoOfType(source, 0 /* String */);
             var numberIndexInfo = getIndexInfoOfType(source, 1 /* Number */);
             var result = createAnonymousType(symbol, members, ts.emptyArray, ts.emptyArray, stringIndexInfo, numberIndexInfo);
-            result.objectFlags |= 131072 /* ObjectRestType */;
+            result.objectFlags |= 8388608 /* ObjectRestType */;
             return result;
         }
+        function isGenericTypeWithUndefinedConstraint(type) {
+            return !!(type.flags & 465829888 /* Instantiable */) && maybeTypeOfKind(getBaseConstraintOfType(type) || unknownType, 32768 /* Undefined */);
+        }
+        function getNonUndefinedType(type) {
+            var typeOrConstraint = someType(type, isGenericTypeWithUndefinedConstraint) ? mapType(type, function (t) { return t.flags & 465829888 /* Instantiable */ ? getBaseConstraintOrType(t) : t; }) : type;
+            return getTypeWithFacts(typeOrConstraint, 524288 /* NEUndefined */);
+        }
         // Determine the control flow type associated with a destructuring declaration or assignment. The following
         // forms of destructuring are possible:
         //   let { x } = obj;  // BindingElement
@@ -50946,23 +52135,23 @@ var ts;
         function getParentElementAccess(node) {
             var ancestor = node.parent.parent;
             switch (ancestor.kind) {
-                case 198 /* BindingElement */:
-                case 288 /* PropertyAssignment */:
+                case 199 /* BindingElement */:
+                case 289 /* PropertyAssignment */:
                     return getSyntheticElementAccess(ancestor);
-                case 199 /* ArrayLiteralExpression */:
+                case 200 /* ArrayLiteralExpression */:
                     return getSyntheticElementAccess(node.parent);
-                case 249 /* VariableDeclaration */:
+                case 250 /* VariableDeclaration */:
                     return ancestor.initializer;
-                case 216 /* BinaryExpression */:
+                case 217 /* BinaryExpression */:
                     return ancestor.right;
             }
         }
         function getDestructuringPropertyName(node) {
             var parent = node.parent;
-            if (node.kind === 198 /* BindingElement */ && parent.kind === 196 /* ObjectBindingPattern */) {
+            if (node.kind === 199 /* BindingElement */ && parent.kind === 197 /* ObjectBindingPattern */) {
                 return getLiteralPropertyNameText(node.propertyName || node.name);
             }
-            if (node.kind === 288 /* PropertyAssignment */ || node.kind === 289 /* ShorthandPropertyAssignment */) {
+            if (node.kind === 289 /* PropertyAssignment */ || node.kind === 290 /* ShorthandPropertyAssignment */) {
                 return getLiteralPropertyNameText(node.name);
             }
             return "" + parent.elements.indexOf(node);
@@ -50988,7 +52177,7 @@ var ts;
                 parentType = getTypeWithFacts(parentType, 524288 /* NEUndefined */);
             }
             var type;
-            if (pattern.kind === 196 /* ObjectBindingPattern */) {
+            if (pattern.kind === 197 /* ObjectBindingPattern */) {
                 if (declaration.dotDotDotToken) {
                     parentType = getReducedType(parentType);
                     if (parentType.flags & 2 /* Unknown */ || !isValidSpreadType(parentType)) {
@@ -51008,7 +52197,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, /*noUncheckedIndexedAccessCandidate*/ undefined, name, /*aliasSymbol*/ undefined, /*aliasTypeArguments*/ undefined, 16 /* ExpressionPosition */), declaration.name);
+                    var declaredType = getIndexedAccessType(parentType, indexType, /*noUncheckedIndexedAccessCandidate*/ undefined, name, /*aliasSymbol*/ undefined, /*aliasTypeArguments*/ undefined, 16 /* ExpressionPosition */);
                     type = getFlowTypeOfDestructuring(declaration, declaredType);
                 }
             }
@@ -51029,7 +52218,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, /*noUncheckedIndexedAccessCandidate*/ undefined, declaration.name, accessFlags | 16 /* ExpressionPosition */) || errorType, declaration.name);
+                    var declaredType = getIndexedAccessTypeOrUndefined(parentType, indexType, /*noUncheckedIndexedAccessCandidate*/ undefined, declaration.name, accessFlags | 16 /* ExpressionPosition */) || errorType;
                     type = getFlowTypeOfDestructuring(declaration, declaredType);
                 }
                 else {
@@ -51042,11 +52231,9 @@ var ts;
             if (ts.getEffectiveTypeAnnotationNode(ts.walkUpBindingElementsAndPatterns(declaration))) {
                 // In strict null checking mode, if a default value of a non-undefined type is specified, remove
                 // undefined from the final type.
-                return strictNullChecks && !(getFalsyFlags(checkDeclarationInitializer(declaration)) & 32768 /* Undefined */) ?
-                    getTypeWithFacts(type, 524288 /* NEUndefined */) :
-                    type;
+                return strictNullChecks && !(getFalsyFlags(checkDeclarationInitializer(declaration)) & 32768 /* Undefined */) ? getNonUndefinedType(type) : type;
             }
-            return widenTypeInferredFromInitializer(declaration, getUnionType([getTypeWithFacts(type, 524288 /* NEUndefined */), checkDeclarationInitializer(declaration)], 2 /* Subtype */));
+            return widenTypeInferredFromInitializer(declaration, getUnionType([getNonUndefinedType(type), checkDeclarationInitializer(declaration)], 2 /* Subtype */));
         }
         function getTypeForDeclarationFromJSDocComment(declaration) {
             var jsdocType = ts.getJSDocType(declaration);
@@ -51061,7 +52248,7 @@ var ts;
         }
         function isEmptyArrayLiteral(node) {
             var expr = ts.skipParentheses(node);
-            return expr.kind === 199 /* ArrayLiteralExpression */ && expr.elements.length === 0;
+            return expr.kind === 200 /* ArrayLiteralExpression */ && expr.elements.length === 0;
         }
         function addOptionality(type, optional) {
             if (optional === void 0) { optional = true; }
@@ -51071,11 +52258,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 === 238 /* ForInStatement */) {
+            if (ts.isVariableDeclaration(declaration) && declaration.parent.parent.kind === 239 /* 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 === 239 /* ForOfStatement */) {
+            if (ts.isVariableDeclaration(declaration) && declaration.parent.parent.kind === 240 /* 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,
@@ -51112,8 +52299,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 === 168 /* SetAccessor */ && hasBindableName(func)) {
-                    var getter = ts.getDeclarationOfKind(getSymbolOfNode(declaration.parent), 167 /* GetAccessor */);
+                if (func.kind === 169 /* SetAccessor */ && hasBindableName(func)) {
+                    var getter = ts.getDeclarationOfKind(getSymbolOfNode(declaration.parent), 168 /* GetAccessor */);
                     if (getter) {
                         var getterSignature = getSignatureFromDeclaration(getter);
                         var thisParameter = getAccessorThisParameter(func);
@@ -51184,7 +52371,7 @@ var ts;
                     links.isConstructorDeclaredProperty = !!getDeclaringConstructor(symbol) && ts.every(symbol.declarations, function (declaration) {
                         return ts.isBinaryExpression(declaration) &&
                             isPossiblyAliasedThisProperty(declaration) &&
-                            (declaration.left.kind !== 202 /* ElementAccessExpression */ || ts.isStringOrNumericLiteralLike(declaration.left.argumentExpression)) &&
+                            (declaration.left.kind !== 203 /* ElementAccessExpression */ || ts.isStringOrNumericLiteralLike(declaration.left.argumentExpression)) &&
                             !getAnnotatedTypeForAssignmentDeclaration(/*declaredType*/ undefined, declaration, symbol, declaration);
                     });
                 }
@@ -51200,13 +52387,33 @@ var ts;
                 !declaration.initializer && (noImplicitAny || ts.isInJSFile(declaration));
         }
         function getDeclaringConstructor(symbol) {
+            if (!symbol.declarations) {
+                return;
+            }
             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 === 166 /* Constructor */ || isJSConstructor(container))) {
+                if (container && (container.kind === 167 /* Constructor */ || isJSConstructor(container))) {
                     return container;
                 }
             }
+            ;
+        }
+        /** Create a synthetic property access flow node after the last statement of the file */
+        function getFlowTypeFromCommonJSExport(symbol) {
+            var file = ts.getSourceFileOfNode(symbol.declarations[0]);
+            var accessName = ts.unescapeLeadingUnderscores(symbol.escapedName);
+            var areAllModuleExports = symbol.declarations.every(function (d) { return ts.isInJSFile(d) && ts.isAccessExpression(d) && ts.isModuleExportsAccessExpression(d.expression); });
+            var reference = areAllModuleExports
+                ? ts.factory.createPropertyAccessExpression(ts.factory.createPropertyAccessExpression(ts.factory.createIdentifier("module"), ts.factory.createIdentifier("exports")), accessName)
+                : ts.factory.createPropertyAccessExpression(ts.factory.createIdentifier("exports"), accessName);
+            if (areAllModuleExports) {
+                ts.setParent(reference.expression.expression, reference.expression);
+            }
+            ts.setParent(reference.expression, reference);
+            ts.setParent(reference, file);
+            reference.flowNode = file.endFlowNode;
+            return getFlowTypeOfReference(reference, autoType, undefinedType);
         }
         function getFlowTypeInConstructor(symbol, constructor) {
             var accessName = ts.startsWith(symbol.escapedName, "__#")
@@ -51224,7 +52431,10 @@ var ts;
             return everyType(flowType, isNullableType) ? undefined : convertAutoToAny(flowType);
         }
         function getFlowTypeOfProperty(reference, prop) {
-            var initialType = prop && (!isAutoTypedProperty(prop) || ts.getEffectiveModifierFlags(prop.valueDeclaration) & 2 /* Ambient */) && getTypeOfPropertyInBaseClass(prop) || undefinedType;
+            var initialType = (prop === null || prop === void 0 ? void 0 : prop.valueDeclaration)
+                && (!isAutoTypedProperty(prop) || ts.getEffectiveModifierFlags(prop.valueDeclaration) & 2 /* Ambient */)
+                && getTypeOfPropertyInBaseClass(prop)
+                || undefinedType;
             return getFlowTypeOfReference(reference, autoType, initialType);
         }
         function getWidenedTypeForAssignmentDeclaration(symbol, resolvedSymbol) {
@@ -51235,7 +52445,7 @@ var ts;
                 if (tag && tag.typeExpression) {
                     return getTypeFromTypeNode(tag.typeExpression);
                 }
-                var containerObjectType = getJSContainerObjectType(symbol.valueDeclaration, symbol, container);
+                var containerObjectType = symbol.valueDeclaration && getJSContainerObjectType(symbol.valueDeclaration, symbol, container);
                 return containerObjectType || getWidenedLiteralType(checkExpressionCached(container));
             }
             var type;
@@ -51247,40 +52457,42 @@ var ts;
                 type = getFlowTypeInConstructor(symbol, getDeclaringConstructor(symbol));
             }
             if (!type) {
-                var jsdocType = void 0;
                 var types = void 0;
-                for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
-                    var declaration = _a[_i];
-                    var expression = (ts.isBinaryExpression(declaration) || ts.isCallExpression(declaration)) ? declaration :
-                        ts.isAccessExpression(declaration) ? ts.isBinaryExpression(declaration.parent) ? declaration.parent : declaration :
-                            undefined;
-                    if (!expression) {
-                        continue; // Non-assignment declaration merged in (eg, an Identifier to mark the thing as a namespace) - skip over it and pull type info from elsewhere
-                    }
-                    var kind = ts.isAccessExpression(expression)
-                        ? ts.getAssignmentDeclarationPropertyAccessKind(expression)
-                        : ts.getAssignmentDeclarationKind(expression);
-                    if (kind === 4 /* ThisProperty */ || ts.isBinaryExpression(expression) && isPossiblyAliasedThisProperty(expression, kind)) {
-                        if (isDeclarationInConstructor(expression)) {
-                            definedInConstructor = true;
+                if (symbol.declarations) {
+                    var jsdocType = void 0;
+                    for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
+                        var declaration = _a[_i];
+                        var expression = (ts.isBinaryExpression(declaration) || ts.isCallExpression(declaration)) ? declaration :
+                            ts.isAccessExpression(declaration) ? ts.isBinaryExpression(declaration.parent) ? declaration.parent : declaration :
+                                undefined;
+                        if (!expression) {
+                            continue; // Non-assignment declaration merged in (eg, an Identifier to mark the thing as a namespace) - skip over it and pull type info from elsewhere
                         }
-                        else {
-                            definedInMethod = true;
+                        var kind = ts.isAccessExpression(expression)
+                            ? ts.getAssignmentDeclarationPropertyAccessKind(expression)
+                            : ts.getAssignmentDeclarationKind(expression);
+                        if (kind === 4 /* ThisProperty */ || ts.isBinaryExpression(expression) && isPossiblyAliasedThisProperty(expression, kind)) {
+                            if (isDeclarationInConstructor(expression)) {
+                                definedInConstructor = true;
+                            }
+                            else {
+                                definedInMethod = true;
+                            }
+                        }
+                        if (!ts.isCallExpression(expression)) {
+                            jsdocType = getAnnotatedTypeForAssignmentDeclaration(jsdocType, expression, symbol, declaration);
+                        }
+                        if (!jsdocType) {
+                            (types || (types = [])).push((ts.isBinaryExpression(expression) || ts.isCallExpression(expression)) ? getInitializerTypeFromAssignmentDeclaration(symbol, resolvedSymbol, expression, kind) : neverType);
                         }
                     }
-                    if (!ts.isCallExpression(expression)) {
-                        jsdocType = getAnnotatedTypeForAssignmentDeclaration(jsdocType, expression, symbol, declaration);
-                    }
-                    if (!jsdocType) {
-                        (types || (types = [])).push((ts.isBinaryExpression(expression) || ts.isCallExpression(expression)) ? getInitializerTypeFromAssignmentDeclaration(symbol, resolvedSymbol, expression, kind) : neverType);
-                    }
+                    type = jsdocType;
                 }
-                type = jsdocType;
                 if (!type) {
                     if (!ts.length(types)) {
                         return errorType; // No types from any declarations :(
                     }
-                    var constructorTypes = definedInConstructor ? getConstructorDefinedThisAssignmentTypes(types, symbol.declarations) : undefined;
+                    var constructorTypes = definedInConstructor && symbol.declarations ? getConstructorDefinedThisAssignmentTypes(types, symbol.declarations) : undefined;
                     // use only the constructor types unless they were only assigned null | undefined (including widening variants)
                     if (definedInMethod) {
                         var propType = getTypeOfPropertyInBaseClass(symbol);
@@ -51294,7 +52506,7 @@ var ts;
                 }
             }
             var widened = getWidenedType(addOptionality(type, definedInMethod && !definedInConstructor));
-            if (filterType(widened, function (t) { return !!(t.flags & ~98304 /* Nullable */); }) === neverType) {
+            if (symbol.valueDeclaration && filterType(widened, function (t) { return !!(t.flags & ~98304 /* Nullable */); }) === neverType) {
                 reportImplicitAny(symbol.valueDeclaration, anyType);
                 return anyType;
             }
@@ -51318,10 +52530,11 @@ var ts;
                 mergeSymbolTable(exports, s.exports);
             }
             var type = createAnonymousType(symbol, exports, ts.emptyArray, ts.emptyArray, undefined, undefined);
-            type.objectFlags |= 16384 /* JSLiteral */;
+            type.objectFlags |= 8192 /* JSLiteral */;
             return type;
         }
         function getAnnotatedTypeForAssignmentDeclaration(declaredType, expression, symbol, declaration) {
+            var _a;
             var typeNode = ts.getEffectiveTypeAnnotationNode(expression.parent);
             if (typeNode) {
                 var type = getWidenedType(getTypeFromTypeNode(typeNode));
@@ -51332,7 +52545,7 @@ var ts;
                     errorNextVariableOrPropertyDeclarationMustHaveSameType(/*firstDeclaration*/ undefined, declaredType, declaration, type);
                 }
             }
-            if (symbol.parent) {
+            if ((_a = symbol.parent) === null || _a === void 0 ? void 0 : _a.valueDeclaration) {
                 var typeNode_2 = ts.getEffectiveTypeAnnotationNode(symbol.parent.valueDeclaration);
                 if (typeNode_2) {
                     return getTypeOfPropertyOfType(getTypeFromTypeNode(typeNode_2), symbol.escapedName);
@@ -51396,7 +52609,7 @@ var ts;
                             // but we may have a JS file with `module.exports = { a: true }` along with a TypeScript module augmentation
                             // declaring an `export const a: number`. In that case, we issue a duplicate identifier error, because
                             // it's unclear what that's supposed to mean, so it's probably a mistake.
-                            if (ts.getSourceFileOfNode(s.valueDeclaration) !== ts.getSourceFileOfNode(exportedMember.valueDeclaration)) {
+                            if (s.valueDeclaration && exportedMember.valueDeclaration && ts.getSourceFileOfNode(s.valueDeclaration) !== ts.getSourceFileOfNode(exportedMember.valueDeclaration)) {
                                 var unescapedName = ts.unescapeLeadingUnderscores(s.escapedName);
                                 var exportedMemberName = ((_a = ts.tryCast(exportedMember.valueDeclaration, ts.isNamedDeclaration)) === null || _a === void 0 ? void 0 : _a.name) || exportedMember.valueDeclaration;
                                 ts.addRelatedInfo(error(s.valueDeclaration, ts.Diagnostics.Duplicate_identifier_0, unescapedName), ts.createDiagnosticForNode(exportedMemberName, ts.Diagnostics._0_was_also_declared_here, unescapedName));
@@ -51418,9 +52631,9 @@ var ts;
                 });
                 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
+                result.objectFlags |= (ts.getObjectFlags(type) & 8192 /* 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
+                    result.objectFlags |= 16777216 /* IsClassInstanceClone */; // Propagate the knowledge that this type is equivalent to the symbol's class instance type
                 }
                 return result;
             }
@@ -51439,9 +52652,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 === 166 /* Constructor */ ||
-                thisContainer.kind === 251 /* FunctionDeclaration */ ||
-                (thisContainer.kind === 208 /* FunctionExpression */ && !ts.isPrototypePropertyAssignment(thisContainer.parent));
+            return thisContainer.kind === 167 /* Constructor */ ||
+                thisContainer.kind === 252 /* FunctionDeclaration */ ||
+                (thisContainer.kind === 209 /* FunctionExpression */ && !ts.isPrototypePropertyAssignment(thisContainer.parent));
         }
         function getConstructorDefinedThisAssignmentTypes(types, declarations) {
             ts.Debug.assert(types.length === declarations.length);
@@ -51479,7 +52692,7 @@ var ts;
         function getTypeFromObjectBindingPattern(pattern, includePatternInType, reportErrors) {
             var members = ts.createSymbolTable();
             var stringIndexInfo;
-            var objectFlags = 128 /* ObjectLiteral */ | 1048576 /* ContainsObjectOrArrayLiteral */;
+            var objectFlags = 128 /* ObjectLiteral */ | 262144 /* ContainsObjectOrArrayLiteral */;
             ts.forEach(pattern.elements, function (e) {
                 var name = e.propertyName || e.name;
                 if (e.dotDotDotToken) {
@@ -51503,7 +52716,7 @@ var ts;
             result.objectFlags |= objectFlags;
             if (includePatternInType) {
                 result.pattern = pattern;
-                result.objectFlags |= 1048576 /* ContainsObjectOrArrayLiteral */;
+                result.objectFlags |= 262144 /* ContainsObjectOrArrayLiteral */;
             }
             return result;
         }
@@ -51511,7 +52724,7 @@ var ts;
         function getTypeFromArrayBindingPattern(pattern, includePatternInType, reportErrors) {
             var elements = pattern.elements;
             var lastElement = ts.lastOrUndefined(elements);
-            var restElement = lastElement && lastElement.kind === 198 /* BindingElement */ && lastElement.dotDotDotToken ? lastElement : undefined;
+            var restElement = lastElement && lastElement.kind === 199 /* BindingElement */ && lastElement.dotDotDotToken ? lastElement : undefined;
             if (elements.length === 0 || elements.length === 1 && restElement) {
                 return languageVersion >= 2 /* ES2015 */ ? createIterableType(anyType) : anyArrayType;
             }
@@ -51522,7 +52735,7 @@ var ts;
             if (includePatternInType) {
                 result = cloneTypeReference(result);
                 result.pattern = pattern;
-                result.objectFlags |= 1048576 /* ContainsObjectOrArrayLiteral */;
+                result.objectFlags |= 262144 /* ContainsObjectOrArrayLiteral */;
             }
             return result;
         }
@@ -51536,7 +52749,7 @@ var ts;
         function getTypeFromBindingPattern(pattern, includePatternInType, reportErrors) {
             if (includePatternInType === void 0) { includePatternInType = false; }
             if (reportErrors === void 0) { reportErrors = false; }
-            return pattern.kind === 196 /* ObjectBindingPattern */
+            return pattern.kind === 197 /* ObjectBindingPattern */
                 ? getTypeFromObjectBindingPattern(pattern, includePatternInType, reportErrors)
                 : getTypeFromArrayBindingPattern(pattern, includePatternInType, reportErrors);
         }
@@ -51552,8 +52765,17 @@ var ts;
         function getWidenedTypeForVariableLikeDeclaration(declaration, reportErrors) {
             return widenTypeForVariableLikeDeclaration(getTypeForVariableLikeDeclaration(declaration, /*includeOptionality*/ true), declaration, reportErrors);
         }
+        function isGlobalSymbolConstructor(node) {
+            var symbol = getSymbolOfNode(node);
+            var globalSymbol = getGlobalESSymbolConstructorTypeSymbol(/*reportErrors*/ false);
+            return globalSymbol && symbol && symbol === globalSymbol;
+        }
         function widenTypeForVariableLikeDeclaration(type, declaration, reportErrors) {
             if (type) {
+                // TODO: If back compat with pre-3.0/4.0 libs isn't required, remove the following SymbolConstructor special case transforming `symbol` into `unique symbol`
+                if (type.flags & 4096 /* ESSymbol */ && isGlobalSymbolConstructor(declaration.parent)) {
+                    type = getESSymbolLikeTypeForNode(declaration);
+                }
                 if (reportErrors) {
                     reportErrorsFromWidening(declaration, type);
                 }
@@ -51575,7 +52797,7 @@ var ts;
         }
         function declarationBelongsToPrivateAmbientMember(declaration) {
             var root = ts.getRootDeclaration(declaration);
-            var memberDeclaration = root.kind === 160 /* Parameter */ ? root.parent : root;
+            var memberDeclaration = root.kind === 161 /* Parameter */ ? root.parent : root;
             return isPrivateWithinAmbient(memberDeclaration);
         }
         function tryGetTypeFromEffectiveTypeNode(declaration) {
@@ -51606,7 +52828,7 @@ var ts;
             if (symbol === requireSymbol) {
                 return anyType;
             }
-            if (symbol.flags & 134217728 /* ModuleExports */) {
+            if (symbol.flags & 134217728 /* ModuleExports */ && symbol.valueDeclaration) {
                 var fileSymbol = getSymbolOfNode(ts.getSourceFileOfNode(symbol.valueDeclaration));
                 var result = createSymbol(fileSymbol.flags, "exports");
                 result.declarations = fileSymbol.declarations ? fileSymbol.declarations.slice() : [];
@@ -51623,12 +52845,14 @@ var ts;
                 return createAnonymousType(symbol, members, ts.emptyArray, ts.emptyArray, undefined, undefined);
             }
             // Handle catch clause variables
+            ts.Debug.assertIsDefined(symbol.valueDeclaration);
             var declaration = symbol.valueDeclaration;
             if (ts.isCatchClauseVariableDeclarationOrBindingElement(declaration)) {
-                var decl = declaration;
-                if (!decl.type)
+                var typeNode = ts.getEffectiveTypeAnnotationNode(declaration);
+                if (typeNode === undefined) {
                     return anyType;
-                var type_1 = getTypeOfNode(decl.type);
+                }
+                var type_1 = getTypeOfNode(typeNode);
                 // an errorType will make `checkTryStatement` issue an error
                 return isTypeAny(type_1) || type_1 === unknownType ? type_1 : errorType;
             }
@@ -51648,7 +52872,7 @@ var ts;
                 return reportCircularityError(symbol);
             }
             var type;
-            if (declaration.kind === 266 /* ExportAssignment */) {
+            if (declaration.kind === 267 /* ExportAssignment */) {
                 type = widenTypeForVariableLikeDeclaration(checkExpressionCached(declaration.expression), declaration);
             }
             else if (ts.isBinaryExpression(declaration) ||
@@ -51703,7 +52927,7 @@ var ts;
                 type = getTypeOfEnumMember(symbol);
             }
             else if (ts.isAccessor(declaration)) {
-                type = resolveTypeOfAccessors(symbol);
+                type = resolveTypeOfAccessors(symbol) || ts.Debug.fail("Non-write accessor resolution must always produce a type");
             }
             else {
                 return ts.Debug.fail("Unhandled declaration kind! " + ts.Debug.formatSyntaxKind(declaration.kind) + " for " + ts.Debug.formatSymbol(symbol));
@@ -51719,7 +52943,7 @@ var ts;
         }
         function getAnnotatedAccessorTypeNode(accessor) {
             if (accessor) {
-                if (accessor.kind === 167 /* GetAccessor */) {
+                if (accessor.kind === 168 /* GetAccessor */) {
                     var getterTypeAnnotation = ts.getEffectiveReturnTypeNode(accessor);
                     return getterTypeAnnotation;
                 }
@@ -51743,63 +52967,78 @@ var ts;
         }
         function getTypeOfAccessors(symbol) {
             var links = getSymbolLinks(symbol);
-            return links.type || (links.type = getTypeOfAccessorsWorker(symbol));
+            return links.type || (links.type = getTypeOfAccessorsWorker(symbol) || ts.Debug.fail("Read type of accessor must always produce a type"));
+        }
+        function getTypeOfSetAccessor(symbol) {
+            var links = getSymbolLinks(symbol);
+            return links.writeType || (links.writeType = getTypeOfAccessorsWorker(symbol, /*writing*/ true));
         }
-        function getTypeOfAccessorsWorker(symbol) {
+        function getTypeOfAccessorsWorker(symbol, writing) {
+            if (writing === void 0) { writing = false; }
             if (!pushTypeResolution(symbol, 0 /* Type */)) {
                 return errorType;
             }
-            var type = resolveTypeOfAccessors(symbol);
+            var type = resolveTypeOfAccessors(symbol, writing);
             if (!popTypeResolution()) {
                 type = anyType;
                 if (noImplicitAny) {
-                    var getter = ts.getDeclarationOfKind(symbol, 167 /* GetAccessor */);
+                    var getter = ts.getDeclarationOfKind(symbol, 168 /* 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, 167 /* GetAccessor */);
-            var setter = ts.getDeclarationOfKind(symbol, 168 /* SetAccessor */);
+        function resolveTypeOfAccessors(symbol, writing) {
+            if (writing === void 0) { writing = false; }
+            var getter = ts.getDeclarationOfKind(symbol, 168 /* GetAccessor */);
+            var setter = ts.getDeclarationOfKind(symbol, 169 /* SetAccessor */);
+            var setterType = getAnnotatedAccessorType(setter);
+            // For write operations, prioritize type annotations on the setter
+            if (writing && setterType) {
+                return instantiateTypeIfNeeded(setterType, symbol);
+            }
+            // Else defer to the getter type
             if (getter && ts.isInJSFile(getter)) {
                 var jsDocType = getTypeForDeclarationFromJSDocComment(getter);
                 if (jsDocType) {
-                    return jsDocType;
+                    return instantiateTypeIfNeeded(jsDocType, symbol);
                 }
             }
-            // First try to see if the user specified a return type on the get-accessor.
-            var getterReturnType = getAnnotatedAccessorType(getter);
-            if (getterReturnType) {
-                return getterReturnType;
+            // Try to see if the user specified a return type on the get-accessor.
+            var getterType = getAnnotatedAccessorType(getter);
+            if (getterType) {
+                return instantiateTypeIfNeeded(getterType, symbol);
             }
-            else {
-                // If the user didn't specify a return type, try to use the set-accessor's parameter type.
-                var setterParameterType = getAnnotatedAccessorType(setter);
-                if (setterParameterType) {
-                    return setterParameterType;
+            // If the user didn't specify a return type, try to use the set-accessor's parameter type.
+            if (setterType) {
+                return setterType;
+            }
+            // If there are no specified types, try to infer it from the body of the get accessor if it exists.
+            if (getter && getter.body) {
+                var returnTypeFromBody = getReturnTypeFromBody(getter);
+                return instantiateTypeIfNeeded(returnTypeFromBody, symbol);
+            }
+            // Otherwise, fall back to 'any'.
+            if (setter) {
+                if (!isPrivateWithinAmbient(setter)) {
+                    errorOrSuggestion(noImplicitAny, setter, ts.Diagnostics.Property_0_implicitly_has_type_any_because_its_set_accessor_lacks_a_parameter_type_annotation, symbolToString(symbol));
                 }
-                else {
-                    // If there are no specified types, try to infer it from the body of the get accessor if it exists.
-                    if (getter && getter.body) {
-                        return getReturnTypeFromBody(getter);
-                    }
-                    // Otherwise, fall back to 'any'.
-                    else {
-                        if (setter) {
-                            if (!isPrivateWithinAmbient(setter)) {
-                                errorOrSuggestion(noImplicitAny, setter, ts.Diagnostics.Property_0_implicitly_has_type_any_because_its_set_accessor_lacks_a_parameter_type_annotation, symbolToString(symbol));
-                            }
-                        }
-                        else {
-                            ts.Debug.assert(!!getter, "there must exist a getter as we are current checking either setter or getter in this function");
-                            if (!isPrivateWithinAmbient(getter)) {
-                                errorOrSuggestion(noImplicitAny, getter, ts.Diagnostics.Property_0_implicitly_has_type_any_because_its_get_accessor_lacks_a_return_type_annotation, symbolToString(symbol));
-                            }
-                        }
-                        return anyType;
-                    }
+                return anyType;
+            }
+            else if (getter) {
+                ts.Debug.assert(!!getter, "there must exist a getter as we are current checking either setter or getter in this function");
+                if (!isPrivateWithinAmbient(getter)) {
+                    errorOrSuggestion(noImplicitAny, getter, ts.Diagnostics.Property_0_implicitly_has_type_any_because_its_get_accessor_lacks_a_return_type_annotation, symbolToString(symbol));
+                }
+                return anyType;
+            }
+            return undefined;
+            function instantiateTypeIfNeeded(type, symbol) {
+                if (ts.getCheckFlags(symbol) & 1 /* Instantiated */) {
+                    var links = getSymbolLinks(symbol);
+                    return instantiateType(type, links.mapper);
                 }
+                return type;
             }
         }
         function getBaseTypeVariableOfClass(symbol) {
@@ -51829,9 +53068,9 @@ var ts;
             if (symbol.flags & 1536 /* Module */ && ts.isShorthandAmbientModuleSymbol(symbol)) {
                 return anyType;
             }
-            else if (declaration && (declaration.kind === 216 /* BinaryExpression */ ||
+            else if (declaration && (declaration.kind === 217 /* BinaryExpression */ ||
                 ts.isAccessExpression(declaration) &&
-                    declaration.parent.kind === 216 /* BinaryExpression */)) {
+                    declaration.parent.kind === 217 /* BinaryExpression */)) {
                 return getWidenedTypeForAssignmentDeclaration(symbol);
             }
             else if (symbol.flags & 512 /* ValueModule */ && declaration && ts.isSourceFile(declaration) && declaration.commonJsModuleIndicator) {
@@ -51865,14 +53104,16 @@ var ts;
             var links = getSymbolLinks(symbol);
             if (!links.type) {
                 var targetSymbol = resolveAlias(symbol);
+                var exportSymbol = symbol.declarations && getTargetOfAliasDeclaration(getDeclarationOfAliasSymbol(symbol), /*dontResolveAlias*/ true);
                 // It only makes sense to get the type of a value symbol. If the result of resolving
                 // the alias is not a value, then it has no type. To get the type associated with a
                 // type symbol, call getDeclaredTypeOfSymbol.
                 // This check is important because without it, a call to getTypeOfSymbol could end
                 // up recursively calling getTypeOfAlias, causing a stack overflow.
-                links.type = targetSymbol.flags & 111551 /* Value */
-                    ? getTypeOfSymbol(targetSymbol)
-                    : errorType;
+                links.type = (exportSymbol === null || exportSymbol === void 0 ? void 0 : exportSymbol.declarations) && isDuplicatedCommonJSExport(exportSymbol.declarations) && symbol.declarations.length ? getFlowTypeFromCommonJSExport(exportSymbol)
+                    : isDuplicatedCommonJSExport(symbol.declarations) ? autoType
+                        : targetSymbol.flags & 111551 /* Value */ ? getTypeOfSymbol(targetSymbol)
+                            : errorType;
             }
             return links.type;
         }
@@ -51898,7 +53139,7 @@ var ts;
                 return errorType;
             }
             // Check if variable has initializer that circularly references the variable itself
-            if (noImplicitAny && (declaration.kind !== 160 /* Parameter */ || declaration.initializer)) {
+            if (noImplicitAny && (declaration.kind !== 161 /* 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
@@ -51915,6 +53156,15 @@ var ts;
             }
             return links.type;
         }
+        function getSetAccessorTypeOfSymbol(symbol) {
+            if (symbol.flags & 98304 /* Accessor */) {
+                var type = getTypeOfSetAccessor(symbol);
+                if (type) {
+                    return type;
+                }
+            }
+            return getTypeOfSymbol(symbol);
+        }
         function getTypeOfSymbol(symbol) {
             var checkFlags = ts.getCheckFlags(symbol);
             if (checkFlags & 65536 /* DeferredType */) {
@@ -51997,66 +53247,72 @@ var ts;
                     return undefined;
                 }
                 switch (node.kind) {
-                    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 */:
+                    case 253 /* ClassDeclaration */:
+                    case 222 /* ClassExpression */:
+                    case 254 /* InterfaceDeclaration */:
+                    case 170 /* CallSignature */:
+                    case 171 /* ConstructSignature */:
+                    case 165 /* MethodSignature */:
+                    case 175 /* FunctionType */:
+                    case 176 /* ConstructorType */:
+                    case 309 /* JSDocFunctionType */:
+                    case 252 /* FunctionDeclaration */:
+                    case 166 /* MethodDeclaration */:
+                    case 209 /* FunctionExpression */:
+                    case 210 /* ArrowFunction */:
+                    case 255 /* TypeAliasDeclaration */:
+                    case 334 /* JSDocTemplateTag */:
+                    case 335 /* JSDocTypedefTag */:
+                    case 329 /* JSDocEnumTag */:
+                    case 328 /* JSDocCallbackTag */:
+                    case 191 /* MappedType */:
+                    case 185 /* ConditionalType */: {
                         var outerTypeParameters = getOuterTypeParameters(node, includeThisTypes);
-                        if (node.kind === 190 /* MappedType */) {
+                        if (node.kind === 191 /* MappedType */) {
                             return ts.append(outerTypeParameters, getDeclaredTypeOfTypeParameter(getSymbolOfNode(node.typeParameter)));
                         }
-                        else if (node.kind === 184 /* ConditionalType */) {
+                        else if (node.kind === 185 /* ConditionalType */) {
                             return ts.concatenate(outerTypeParameters, getInferTypeParameters(node));
                         }
-                        else if (node.kind === 232 /* VariableStatement */ && !ts.isInJSFile(node)) {
-                            break;
-                        }
                         var outerAndOwnTypeParameters = appendTypeParameters(outerTypeParameters, ts.getEffectiveTypeParameterDeclarations(node));
                         var thisType = includeThisTypes &&
-                            (node.kind === 252 /* ClassDeclaration */ || node.kind === 221 /* ClassExpression */ || node.kind === 253 /* InterfaceDeclaration */ || isJSConstructor(node)) &&
+                            (node.kind === 253 /* ClassDeclaration */ || node.kind === 222 /* ClassExpression */ || node.kind === 254 /* InterfaceDeclaration */ || isJSConstructor(node)) &&
                             getDeclaredTypeOfClassOrInterface(getSymbolOfNode(node)).thisType;
                         return thisType ? ts.append(outerAndOwnTypeParameters, thisType) : outerAndOwnTypeParameters;
-                    case 326 /* JSDocParameterTag */:
+                    }
+                    case 330 /* JSDocParameterTag */:
                         var paramSymbol = ts.getParameterSymbolFromJSDoc(node);
                         if (paramSymbol) {
                             node = paramSymbol.valueDeclaration;
                         }
                         break;
+                    case 312 /* JSDocComment */: {
+                        var outerTypeParameters = getOuterTypeParameters(node, includeThisTypes);
+                        return node.tags
+                            ? appendTypeParameters(outerTypeParameters, ts.flatMap(node.tags, function (t) { return ts.isJSDocTemplateTag(t) ? t.typeParameters : undefined; }))
+                            : outerTypeParameters;
+                    }
                 }
             }
         }
         // 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, 253 /* InterfaceDeclaration */);
+            var declaration = symbol.flags & 32 /* Class */ ? symbol.valueDeclaration : ts.getDeclarationOfKind(symbol, 254 /* InterfaceDeclaration */);
             ts.Debug.assert(!!declaration, "Class was missing valueDeclaration -OR- non-class had no interface declarations");
             return getOuterTypeParameters(declaration);
         }
         // The local type parameters are the combined set of type parameters from all declarations of the class,
         // interface, or type alias.
         function getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(symbol) {
+            if (!symbol.declarations) {
+                return;
+            }
             var result;
             for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                 var node = _a[_i];
-                if (node.kind === 253 /* InterfaceDeclaration */ ||
-                    node.kind === 252 /* ClassDeclaration */ ||
-                    node.kind === 221 /* ClassExpression */ ||
+                if (node.kind === 254 /* InterfaceDeclaration */ ||
+                    node.kind === 253 /* ClassDeclaration */ ||
+                    node.kind === 222 /* ClassExpression */ ||
                     isJSConstructor(node) ||
                     ts.isTypeAlias(node)) {
                     var declaration = node;
@@ -52150,7 +53406,9 @@ var ts;
                                 ctorReturn = getReturnTypeOfSignature(ctorSig[0]);
                             }
                         }
-                        ts.addRelatedInfo(err, ts.createDiagnosticForNode(baseConstructorType.symbol.declarations[0], ts.Diagnostics.Did_you_mean_for_0_to_be_constrained_to_type_new_args_Colon_any_1, symbolToString(baseConstructorType.symbol), typeToString(ctorReturn)));
+                        if (baseConstructorType.symbol.declarations) {
+                            ts.addRelatedInfo(err, ts.createDiagnosticForNode(baseConstructorType.symbol.declarations[0], ts.Diagnostics.Did_you_mean_for_0_to_be_constrained_to_type_new_args_Colon_any_1, symbolToString(baseConstructorType.symbol), typeToString(ctorReturn)));
+                        }
                     }
                     return type.resolvedBaseConstructorType = errorType;
                 }
@@ -52160,20 +53418,22 @@ var ts;
         }
         function getImplementsTypes(type) {
             var resolvedImplementsTypes = ts.emptyArray;
-            for (var _i = 0, _a = type.symbol.declarations; _i < _a.length; _i++) {
-                var declaration = _a[_i];
-                var implementsTypeNodes = ts.getEffectiveImplementsTypeNodes(declaration);
-                if (!implementsTypeNodes)
-                    continue;
-                for (var _b = 0, implementsTypeNodes_1 = implementsTypeNodes; _b < implementsTypeNodes_1.length; _b++) {
-                    var node = implementsTypeNodes_1[_b];
-                    var implementsType = getTypeFromTypeNode(node);
-                    if (implementsType !== errorType) {
-                        if (resolvedImplementsTypes === ts.emptyArray) {
-                            resolvedImplementsTypes = [implementsType];
-                        }
-                        else {
-                            resolvedImplementsTypes.push(implementsType);
+            if (type.symbol.declarations) {
+                for (var _i = 0, _a = type.symbol.declarations; _i < _a.length; _i++) {
+                    var declaration = _a[_i];
+                    var implementsTypeNodes = ts.getEffectiveImplementsTypeNodes(declaration);
+                    if (!implementsTypeNodes)
+                        continue;
+                    for (var _b = 0, implementsTypeNodes_1 = implementsTypeNodes; _b < implementsTypeNodes_1.length; _b++) {
+                        var node = implementsTypeNodes_1[_b];
+                        var implementsType = getTypeFromTypeNode(node);
+                        if (implementsType !== errorType) {
+                            if (resolvedImplementsTypes === ts.emptyArray) {
+                                resolvedImplementsTypes = [implementsType];
+                            }
+                            else {
+                                resolvedImplementsTypes.push(implementsType);
+                            }
                         }
                     }
                 }
@@ -52200,10 +53460,10 @@ var ts;
                     else {
                         ts.Debug.fail("type must be class or interface");
                     }
-                    if (!popTypeResolution()) {
+                    if (!popTypeResolution() && type.symbol.declarations) {
                         for (var _i = 0, _a = type.symbol.declarations; _i < _a.length; _i++) {
                             var declaration = _a[_i];
-                            if (declaration.kind === 252 /* ClassDeclaration */ || declaration.kind === 253 /* InterfaceDeclaration */) {
+                            if (declaration.kind === 253 /* ClassDeclaration */ || declaration.kind === 254 /* InterfaceDeclaration */) {
                                 reportCircularBaseType(declaration, type);
                             }
                         }
@@ -52296,29 +53556,31 @@ var ts;
         }
         function resolveBaseTypesOfInterface(type) {
             type.resolvedBaseTypes = type.resolvedBaseTypes || ts.emptyArray;
-            for (var _i = 0, _a = type.symbol.declarations; _i < _a.length; _i++) {
-                var declaration = _a[_i];
-                if (declaration.kind === 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));
-                        if (baseType !== errorType) {
-                            if (isValidBaseType(baseType)) {
-                                if (type !== baseType && !hasBaseType(baseType, type)) {
-                                    if (type.resolvedBaseTypes === ts.emptyArray) {
-                                        type.resolvedBaseTypes = [baseType];
+            if (type.symbol.declarations) {
+                for (var _i = 0, _a = type.symbol.declarations; _i < _a.length; _i++) {
+                    var declaration = _a[_i];
+                    if (declaration.kind === 254 /* 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));
+                            if (baseType !== errorType) {
+                                if (isValidBaseType(baseType)) {
+                                    if (type !== baseType && !hasBaseType(baseType, type)) {
+                                        if (type.resolvedBaseTypes === ts.emptyArray) {
+                                            type.resolvedBaseTypes = [baseType];
+                                        }
+                                        else {
+                                            type.resolvedBaseTypes.push(baseType);
+                                        }
                                     }
                                     else {
-                                        type.resolvedBaseTypes.push(baseType);
+                                        reportCircularBaseType(declaration, type);
                                     }
                                 }
                                 else {
-                                    reportCircularBaseType(declaration, type);
+                                    error(node, ts.Diagnostics.An_interface_can_only_extend_an_object_type_or_intersection_of_object_types_with_statically_known_members);
                                 }
                             }
-                            else {
-                                error(node, ts.Diagnostics.An_interface_can_only_extend_an_object_type_or_intersection_of_object_types_with_statically_known_members);
-                            }
                         }
                     }
                 }
@@ -52332,9 +53594,12 @@ var ts;
          * and if none of the base interfaces have a "this" type.
          */
         function isThislessInterface(symbol) {
+            if (!symbol.declarations) {
+                return true;
+            }
             for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                 var declaration = _a[_i];
-                if (declaration.kind === 253 /* InterfaceDeclaration */) {
+                if (declaration.kind === 254 /* InterfaceDeclaration */) {
                     if (declaration.flags & 128 /* ContainsThis */) {
                         return false;
                     }
@@ -52359,7 +53624,7 @@ var ts;
             var originalLinks = links;
             if (!links.declaredType) {
                 var kind = symbol.flags & 32 /* Class */ ? 1 /* Class */ : 2 /* Interface */;
-                var merged = mergeJSSymbols(symbol, getAssignedClassSymbol(symbol.valueDeclaration));
+                var merged = mergeJSSymbols(symbol, symbol.valueDeclaration && getAssignedClassSymbol(symbol.valueDeclaration));
                 if (merged) {
                     // note:we overwrite links because we just cloned the symbol
                     symbol = links = merged;
@@ -52389,6 +53654,7 @@ var ts;
             return links.declaredType;
         }
         function getDeclaredTypeOfTypeAlias(symbol) {
+            var _a;
             var links = getSymbolLinks(symbol);
             if (!links.declaredType) {
                 // Note that we use the links object as the target here because the symbol object is used as the unique
@@ -52396,7 +53662,7 @@ var ts;
                 if (!pushTypeResolution(symbol, 2 /* DeclaredType */)) {
                     return errorType;
                 }
-                var declaration = ts.Debug.checkDefined(ts.find(symbol.declarations, ts.isTypeAlias), "Type alias symbol with no valid declaration found");
+                var declaration = ts.Debug.checkDefined((_a = symbol.declarations) === null || _a === void 0 ? void 0 : _a.find(ts.isTypeAlias), "Type alias symbol with no valid declaration found");
                 var typeNode = ts.isJSDocTypeAlias(declaration) ? declaration.typeExpression : declaration.type;
                 // If typeNode is missing, we will error in checkJSDocTypedefTag.
                 var type = typeNode ? getTypeFromTypeNode(typeNode) : errorType;
@@ -52422,7 +53688,7 @@ var ts;
             if (ts.isStringLiteralLike(expr)) {
                 return true;
             }
-            else if (expr.kind === 216 /* BinaryExpression */) {
+            else if (expr.kind === 217 /* BinaryExpression */) {
                 return isStringConcatExpression(expr.left) && isStringConcatExpression(expr.right);
             }
             return false;
@@ -52437,12 +53703,12 @@ var ts;
                 case 8 /* NumericLiteral */:
                 case 14 /* NoSubstitutionTemplateLiteral */:
                     return true;
-                case 214 /* PrefixUnaryExpression */:
+                case 215 /* 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 216 /* BinaryExpression */:
+                case 217 /* BinaryExpression */:
                     return isStringConcatExpression(expr);
                 default:
                     return false;
@@ -52454,16 +53720,18 @@ var ts;
                 return links.enumKind;
             }
             var hasNonLiteralMember = false;
-            for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
-                var declaration = _a[_i];
-                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)) {
-                            return links.enumKind = 1 /* Literal */;
-                        }
-                        if (!isLiteralEnumMember(member)) {
-                            hasNonLiteralMember = true;
+            if (symbol.declarations) {
+                for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
+                    var declaration = _a[_i];
+                    if (declaration.kind === 256 /* EnumDeclaration */) {
+                        for (var _b = 0, _c = declaration.members; _b < _c.length; _b++) {
+                            var member = _c[_b];
+                            if (member.initializer && ts.isStringLiteralLike(member.initializer)) {
+                                return links.enumKind = 1 /* Literal */;
+                            }
+                            if (!isLiteralEnumMember(member)) {
+                                hasNonLiteralMember = true;
+                            }
                         }
                     }
                 }
@@ -52481,15 +53749,17 @@ var ts;
             if (getEnumKind(symbol) === 1 /* Literal */) {
                 enumCount++;
                 var memberTypeList = [];
-                for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
-                    var declaration = _a[_i];
-                    if (declaration.kind === 255 /* EnumDeclaration */) {
-                        for (var _b = 0, _c = declaration.members; _b < _c.length; _b++) {
-                            var member = _c[_b];
-                            var value = getEnumMemberValue(member);
-                            var memberType = getFreshTypeOfLiteralType(getLiteralType(value !== undefined ? value : 0, enumCount, getSymbolOfNode(member)));
-                            getSymbolLinks(getSymbolOfNode(member)).declaredType = memberType;
-                            memberTypeList.push(getRegularTypeOfLiteralType(memberType));
+                if (symbol.declarations) {
+                    for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
+                        var declaration = _a[_i];
+                        if (declaration.kind === 256 /* EnumDeclaration */) {
+                            for (var _b = 0, _c = declaration.members; _b < _c.length; _b++) {
+                                var member = _c[_b];
+                                var value = getEnumMemberValue(member);
+                                var memberType = getFreshTypeOfLiteralType(getLiteralType(value !== undefined ? value : 0, enumCount, getSymbolOfNode(member)));
+                                getSymbolLinks(getSymbolOfNode(member)).declaredType = memberType;
+                                memberTypeList.push(getRegularTypeOfLiteralType(memberType));
+                            }
                         }
                     }
                 }
@@ -52566,11 +53836,11 @@ var ts;
                 case 113 /* VoidKeyword */:
                 case 150 /* UndefinedKeyword */:
                 case 141 /* NeverKeyword */:
-                case 191 /* LiteralType */:
+                case 192 /* LiteralType */:
                     return true;
-                case 178 /* ArrayType */:
+                case 179 /* ArrayType */:
                     return isThislessType(node.elementType);
-                case 173 /* TypeReference */:
+                case 174 /* TypeReference */:
                     return !node.typeArguments || node.typeArguments.every(isThislessType);
             }
             return false;
@@ -52596,7 +53866,7 @@ var ts;
         function isThislessFunctionLikeDeclaration(node) {
             var returnType = ts.getEffectiveReturnTypeNode(node);
             var typeParameters = ts.getEffectiveTypeParameterDeclarations(node);
-            return (node.kind === 166 /* Constructor */ || (!!returnType && isThislessType(returnType))) &&
+            return (node.kind === 167 /* Constructor */ || (!!returnType && isThislessType(returnType))) &&
                 node.parameters.every(isThislessVariableLikeDeclaration) &&
                 typeParameters.every(isThislessTypeParameter);
         }
@@ -52612,14 +53882,14 @@ var ts;
                 var declaration = symbol.declarations[0];
                 if (declaration) {
                     switch (declaration.kind) {
-                        case 163 /* PropertyDeclaration */:
-                        case 162 /* PropertySignature */:
+                        case 164 /* PropertyDeclaration */:
+                        case 163 /* PropertySignature */:
                             return isThislessVariableLikeDeclaration(declaration);
-                        case 165 /* MethodDeclaration */:
-                        case 164 /* MethodSignature */:
-                        case 166 /* Constructor */:
-                        case 167 /* GetAccessor */:
-                        case 168 /* SetAccessor */:
+                        case 166 /* MethodDeclaration */:
+                        case 165 /* MethodSignature */:
+                        case 167 /* Constructor */:
+                        case 168 /* GetAccessor */:
+                        case 169 /* SetAccessor */:
                             return isThislessFunctionLikeDeclaration(declaration);
                     }
                 }
@@ -52645,7 +53915,7 @@ var ts;
             }
         }
         function isStaticPrivateIdentifierProperty(s) {
-            return !!s.valueDeclaration && ts.isPrivateIdentifierPropertyDeclaration(s.valueDeclaration) && ts.hasSyntacticModifier(s.valueDeclaration, 32 /* Static */);
+            return !!s.valueDeclaration && ts.isPrivateIdentifierClassElementDeclaration(s.valueDeclaration) && ts.hasSyntacticModifier(s.valueDeclaration, 32 /* Static */);
         }
         function resolveDeclaredMembers(type) {
             if (!type.declaredProperties) {
@@ -52970,7 +54240,8 @@ var ts;
             sig.resolvedMinArgumentCount = undefined;
             sig.target = undefined;
             sig.mapper = undefined;
-            sig.unionSignatures = undefined;
+            sig.compositeSignatures = undefined;
+            sig.compositeKind = undefined;
             return sig;
         }
         function cloneSignature(sig) {
@@ -52978,12 +54249,14 @@ var ts;
             /*resolvedTypePredicate*/ undefined, sig.minArgumentCount, sig.flags & 39 /* PropagatingFlags */);
             result.target = sig.target;
             result.mapper = sig.mapper;
-            result.unionSignatures = sig.unionSignatures;
+            result.compositeSignatures = sig.compositeSignatures;
+            result.compositeKind = sig.compositeKind;
             return result;
         }
         function createUnionSignature(signature, unionSignatures) {
             var result = cloneSignature(signature);
-            result.unionSignatures = unionSignatures;
+            result.compositeSignatures = unionSignatures;
+            result.compositeKind = 1048576 /* Union */;
             result.target = undefined;
             result.mapper = undefined;
             return result;
@@ -53142,7 +54415,7 @@ var ts;
                     if (signatures !== masterList) {
                         var signature_1 = signatures[0];
                         ts.Debug.assert(!!signature_1, "getUnionSignatures bails early on empty signature lists and should not have empty lists on second pass");
-                        results = signature_1.typeParameters && ts.some(results, function (s) { return !!s.typeParameters && !compareTypeParametersIdentical(signature_1.typeParameters, s.typeParameters); }) ? undefined : ts.map(results, function (sig) { return combineSignaturesOfUnionMembers(sig, signature_1); });
+                        results = !!signature_1.typeParameters && ts.some(results, function (s) { return !!s.typeParameters && !compareTypeParametersIdentical(signature_1.typeParameters, s.typeParameters); }) ? undefined : ts.map(results, function (sig) { return combineSignaturesOfUnionMembers(sig, signature_1); });
                         if (!results) {
                             return "break";
                         }
@@ -53159,9 +54432,12 @@ var ts;
             return result || ts.emptyArray;
         }
         function compareTypeParametersIdentical(sourceParams, targetParams) {
-            if (sourceParams.length !== targetParams.length) {
+            if (ts.length(sourceParams) !== ts.length(targetParams)) {
                 return false;
             }
+            if (!sourceParams || !targetParams) {
+                return true;
+            }
             var mapper = createTypeMapper(targetParams, sourceParams);
             for (var i = 0; i < sourceParams.length; i++) {
                 var source = sourceParams[i];
@@ -53243,9 +54519,10 @@ var ts;
             var result = createSignature(declaration, typeParams, thisParam, params, 
             /*resolvedReturnType*/ undefined, 
             /*resolvedTypePredicate*/ undefined, minArgCount, (left.flags | right.flags) & 39 /* PropagatingFlags */);
-            result.unionSignatures = ts.concatenate(left.unionSignatures || [left], [right]);
+            result.compositeKind = 1048576 /* Union */;
+            result.compositeSignatures = ts.concatenate(left.compositeKind !== 2097152 /* Intersection */ && left.compositeSignatures || [left], [right]);
             if (paramMapper) {
-                result.mapper = left.mapper && left.unionSignatures ? combineTypeMappers(left.mapper, paramMapper) : paramMapper;
+                result.mapper = left.compositeKind !== 2097152 /* Intersection */ && left.mapper && left.compositeSignatures ? combineTypeMappers(left.mapper, paramMapper) : paramMapper;
             }
             return result;
         }
@@ -53378,6 +54655,7 @@ var ts;
                 // Combinations of function, class, enum and module
                 var members = emptySymbols;
                 var stringIndexInfo = void 0;
+                var numberIndexInfo = void 0;
                 if (symbol.exports) {
                     members = getExportsOfSymbol(symbol);
                     if (symbol === globalThisSymbol) {
@@ -53390,20 +54668,31 @@ var ts;
                         members = varsOnly_1;
                     }
                 }
+                var baseConstructorIndexInfo = void 0;
                 setStructuredTypeMembers(type, members, ts.emptyArray, ts.emptyArray, undefined, undefined);
                 if (symbol.flags & 32 /* Class */) {
                     var classType = getDeclaredTypeOfClassOrInterface(symbol);
                     var baseConstructorType = getBaseConstructorTypeOfClass(classType);
                     if (baseConstructorType.flags & (524288 /* Object */ | 2097152 /* Intersection */ | 8650752 /* TypeVariable */)) {
-                        members = ts.createSymbolTable(getNamedMembers(members));
+                        members = ts.createSymbolTable(getNamedOrIndexSignatureMembers(members));
                         addInheritedMembers(members, getPropertiesOfType(baseConstructorType));
                     }
                     else if (baseConstructorType === anyType) {
-                        stringIndexInfo = createIndexInfo(anyType, /*isReadonly*/ false);
+                        baseConstructorIndexInfo = createIndexInfo(anyType, /*isReadonly*/ false);
+                    }
+                }
+                var indexSymbol = getIndexSymbolFromSymbolTable(members);
+                if (indexSymbol) {
+                    stringIndexInfo = getIndexInfoOfIndexSymbol(indexSymbol, 0 /* String */);
+                    numberIndexInfo = getIndexInfoOfIndexSymbol(indexSymbol, 1 /* Number */);
+                }
+                else {
+                    stringIndexInfo = baseConstructorIndexInfo;
+                    if (symbol.flags & 384 /* Enum */ && (getDeclaredTypeOfSymbol(symbol).flags & 32 /* Enum */ ||
+                        ts.some(type.properties, function (prop) { return !!(getTypeOfSymbol(prop).flags & 296 /* NumberLike */); }))) {
+                        numberIndexInfo = enumNumberIndexInfo;
                     }
                 }
-                var numberIndexInfo = symbol.flags & 384 /* Enum */ && (getDeclaredTypeOfSymbol(symbol).flags & 32 /* Enum */ ||
-                    ts.some(type.properties, function (prop) { return !!(getTypeOfSymbol(prop).flags & 296 /* NumberLike */); })) ? enumNumberIndexInfo : undefined;
                 setStructuredTypeMembers(type, members, ts.emptyArray, ts.emptyArray, stringIndexInfo, numberIndexInfo);
                 // We resolve the members before computing the signatures because a signature may use
                 // typeof with a qualified name expression that circularly references the type we are
@@ -53428,6 +54717,18 @@ var ts;
                 }
             }
         }
+        function replaceIndexedAccess(instantiable, type, replacement) {
+            // map type.indexType to 0
+            // map type.objectType to `[TReplacement]`
+            // thus making the indexed access `[TReplacement][0]` or `TReplacement`
+            return instantiateType(instantiable, createTypeMapper([type.indexType, type.objectType], [getLiteralType(0), createTupleType([replacement])]));
+        }
+        function getIndexInfoOfIndexSymbol(indexSymbol, indexKind) {
+            var declaration = getIndexDeclarationOfIndexSymbol(indexSymbol, indexKind);
+            if (!declaration)
+                return undefined;
+            return createIndexInfo(declaration.type ? getTypeFromTypeNode(declaration.type) : anyType, ts.hasEffectiveModifier(declaration, 64 /* Readonly */), declaration);
+        }
         function resolveReverseMappedTypeMembers(type) {
             var indexInfo = getIndexInfoOfType(type.source, 0 /* String */);
             var modifiers = getMappedTypeModifiers(type.mappedType);
@@ -53442,8 +54743,21 @@ var ts;
                 inferredProp.declarations = prop.declarations;
                 inferredProp.nameType = getSymbolLinks(prop).nameType;
                 inferredProp.propertyType = getTypeOfSymbol(prop);
-                inferredProp.mappedType = type.mappedType;
-                inferredProp.constraintType = type.constraintType;
+                if (type.constraintType.type.flags & 8388608 /* IndexedAccess */
+                    && type.constraintType.type.objectType.flags & 262144 /* TypeParameter */
+                    && type.constraintType.type.indexType.flags & 262144 /* TypeParameter */) {
+                    // A reverse mapping of `{[K in keyof T[K_1]]: T[K_1]}` is the same as that of `{[K in keyof T]: T}`, since all we care about is
+                    // inferring to the "type parameter" (or indexed access) shared by the constraint and template. So, to reduce the number of
+                    // type identities produced, we simplify such indexed access occurences
+                    var newTypeParam = type.constraintType.type.objectType;
+                    var newMappedType = replaceIndexedAccess(type.mappedType, type.constraintType.type, newTypeParam);
+                    inferredProp.mappedType = newMappedType;
+                    inferredProp.constraintType = getIndexType(newTypeParam);
+                }
+                else {
+                    inferredProp.mappedType = type.mappedType;
+                    inferredProp.constraintType = type.constraintType;
+                }
                 members.set(prop.escapedName, inferredProp);
             }
             setStructuredTypeMembers(type, members, ts.emptyArray, ts.emptyArray, stringIndexInfo, undefined);
@@ -53605,7 +54919,7 @@ var ts;
         }
         function isMappedTypeWithKeyofConstraintDeclaration(type) {
             var constraintDeclaration = getConstraintDeclarationForMappedType(type); // TODO: GH#18217
-            return constraintDeclaration.kind === 188 /* TypeOperator */ &&
+            return constraintDeclaration.kind === 189 /* TypeOperator */ &&
                 constraintDeclaration.operator === 138 /* KeyOfKeyword */;
         }
         function getModifiersTypeFromMappedType(type) {
@@ -53657,7 +54971,7 @@ var ts;
                     else if (type.objectFlags & 3 /* ClassOrInterface */) {
                         resolveClassOrInterfaceMembers(type);
                     }
-                    else if (type.objectFlags & 2048 /* ReverseMapped */) {
+                    else if (type.objectFlags & 1024 /* ReverseMapped */) {
                         resolveReverseMappedTypeMembers(type);
                     }
                     else if (type.objectFlags & 16 /* Anonymous */) {
@@ -54076,6 +55390,7 @@ var ts;
             return getReducedType(getApparentType(getReducedType(type)));
         }
         function createUnionOrIntersectionProperty(containingType, name, skipObjectFunctionPropertyAugment) {
+            var _a, _b;
             var singleProp;
             var propSet;
             var indexTypes;
@@ -54084,8 +55399,9 @@ var ts;
             var optionalFlag = isUnion ? 0 /* None */ : 16777216 /* Optional */;
             var syntheticFlag = 4 /* SyntheticMethod */;
             var checkFlags = 0;
-            for (var _i = 0, _a = containingType.types; _i < _a.length; _i++) {
-                var current = _a[_i];
+            var mergedInstantiations = false;
+            for (var _i = 0, _c = containingType.types; _i < _c.length; _i++) {
+                var current = _c[_i];
                 var type = getApparentType(current);
                 if (!(type === errorType || type.flags & 131072 /* Never */)) {
                     var prop = getPropertyOfType(type, name, skipObjectFunctionPropertyAugment);
@@ -54101,13 +55417,25 @@ var ts;
                             singleProp = prop;
                         }
                         else if (prop !== singleProp) {
-                            if (!propSet) {
-                                propSet = new ts.Map();
-                                propSet.set(getSymbolId(singleProp), singleProp);
+                            var isInstantiation = (getTargetSymbol(prop) || prop) === (getTargetSymbol(singleProp) || singleProp);
+                            // If the symbols are instances of one another with identical types - consider the symbols
+                            // equivalent and just use the first one, which thus allows us to avoid eliding private
+                            // members when intersecting a (this-)instantiations of a class with it's raw base or another instance
+                            if (isInstantiation && compareProperties(singleProp, prop, function (a, b) { return a === b ? -1 /* True */ : 0 /* False */; }) === -1 /* True */) {
+                                // If we merged instantiations of a generic type, we replicate the symbol parent resetting behavior we used
+                                // to do when we recorded multiple distinct symbols so that we still get, eg, `Array<T>.length` printed
+                                // back and not `Array<string>.length` when we're looking at a `.length` access on a `string[] | number[]`
+                                mergedInstantiations = !!singleProp.parent && !!ts.length(getLocalTypeParametersOfClassOrInterfaceOrTypeAlias(singleProp.parent));
                             }
-                            var id = getSymbolId(prop);
-                            if (!propSet.has(id)) {
-                                propSet.set(id, prop);
+                            else {
+                                if (!propSet) {
+                                    propSet = new ts.Map();
+                                    propSet.set(getSymbolId(singleProp), singleProp);
+                                }
+                                var id = getSymbolId(prop);
+                                if (!propSet.has(id)) {
+                                    propSet.set(id, prop);
+                                }
                             }
                         }
                         checkFlags |= (isReadonlySymbol(prop) ? 8 /* Readonly */ : 0) |
@@ -54125,7 +55453,7 @@ var ts;
                             checkFlags |= 32 /* WritePartial */ | (indexInfo.isReadonly ? 8 /* Readonly */ : 0);
                             indexTypes = ts.append(indexTypes, isTupleType(type) ? getRestTypeOfTupleType(type) || undefinedType : indexInfo.type);
                         }
-                        else if (isObjectLiteralType(type)) {
+                        else if (isObjectLiteralType(type) && !(ts.getObjectFlags(type) & 4194304 /* ContainsSpread */)) {
                             checkFlags |= 32 /* WritePartial */;
                             indexTypes = ts.append(indexTypes, undefinedType);
                         }
@@ -54141,7 +55469,19 @@ var ts;
                 return undefined;
             }
             if (!propSet && !(checkFlags & 16 /* ReadPartial */) && !indexTypes) {
-                return singleProp;
+                if (mergedInstantiations) {
+                    // No symbol from a union/intersection should have a `.parent` set (since unions/intersections don't act as symbol parents)
+                    // Unless that parent is "reconstituted" from the "first value declaration" on the symbol (which is likely different than its instantiated parent!)
+                    // They also have a `.containingType` set, which affects some services endpoints behavior, like `getRootSymbol`
+                    var clone_1 = createSymbolWithType(singleProp, singleProp.type);
+                    clone_1.parent = (_b = (_a = singleProp.valueDeclaration) === null || _a === void 0 ? void 0 : _a.symbol) === null || _b === void 0 ? void 0 : _b.parent;
+                    clone_1.containingType = containingType;
+                    clone_1.mapper = singleProp.mapper;
+                    return clone_1;
+                }
+                else {
+                    return singleProp;
+                }
             }
             var props = propSet ? ts.arrayFrom(propSet.values()) : [singleProp];
             var declarations;
@@ -54150,8 +55490,8 @@ var ts;
             var propTypes = [];
             var firstValueDeclaration;
             var hasNonUniformValueDeclaration = false;
-            for (var _b = 0, props_1 = props; _b < props_1.length; _b++) {
-                var prop = props_1[_b];
+            for (var _d = 0, props_1 = props; _d < props_1.length; _d++) {
+                var prop = props_1[_d];
                 if (!firstValueDeclaration) {
                     firstValueDeclaration = prop.valueDeclaration;
                 }
@@ -54228,15 +55568,15 @@ var ts;
          * no constituent property has type 'never', but the intersection of the constituent property types is 'never'.
          */
         function getReducedType(type) {
-            if (type.flags & 1048576 /* Union */ && type.objectFlags & 268435456 /* ContainsIntersections */) {
+            if (type.flags & 1048576 /* Union */ && type.objectFlags & 67108864 /* ContainsIntersections */) {
                 return type.resolvedReducedType || (type.resolvedReducedType = getReducedUnionType(type));
             }
             else if (type.flags & 2097152 /* Intersection */) {
-                if (!(type.objectFlags & 268435456 /* IsNeverIntersectionComputed */)) {
-                    type.objectFlags |= 268435456 /* IsNeverIntersectionComputed */ |
-                        (ts.some(getPropertiesOfUnionOrIntersectionType(type), isNeverReducedProperty) ? 536870912 /* IsNeverIntersection */ : 0);
+                if (!(type.objectFlags & 67108864 /* IsNeverIntersectionComputed */)) {
+                    type.objectFlags |= 67108864 /* IsNeverIntersectionComputed */ |
+                        (ts.some(getPropertiesOfUnionOrIntersectionType(type), isNeverReducedProperty) ? 134217728 /* IsNeverIntersection */ : 0);
                 }
-                return type.objectFlags & 536870912 /* IsNeverIntersection */ ? neverType : type;
+                return type.objectFlags & 134217728 /* IsNeverIntersection */ ? neverType : type;
             }
             return type;
         }
@@ -54266,7 +55606,7 @@ var ts;
             return !prop.valueDeclaration && !!(ts.getCheckFlags(prop) & 1024 /* ContainsPrivate */);
         }
         function elaborateNeverIntersection(errorInfo, type) {
-            if (ts.getObjectFlags(type) & 536870912 /* IsNeverIntersection */) {
+            if (type.flags & 2097152 /* Intersection */ && ts.getObjectFlags(type) & 134217728 /* IsNeverIntersection */) {
                 var neverProp = ts.find(getPropertiesOfUnionOrIntersectionType(type), isDiscriminantWithNeverType);
                 if (neverProp) {
                     return ts.chainDiagnosticMessages(errorInfo, ts.Diagnostics.The_intersection_0_was_reduced_to_never_because_property_1_has_conflicting_types_in_some_constituents, typeToString(type, /*enclosingDeclaration*/ undefined, 536870912 /* NoTypeReduction */), symbolToString(neverProp));
@@ -54353,7 +55693,8 @@ var ts;
                 for (var _i = 0, _a = getPropertiesOfType(type); _i < _a.length; _i++) {
                     var prop = _a[_i];
                     if (kind === 0 /* String */ || isNumericLiteralName(prop.escapedName)) {
-                        propTypes.push(getTypeOfSymbol(prop));
+                        var propType = getTypeOfSymbol(prop);
+                        propTypes.push(prop.flags & 16777216 /* Optional */ ? getTypeWithFacts(propType, 524288 /* NEUndefined */) : propType);
                     }
                 }
                 if (kind === 0 /* String */) {
@@ -54387,10 +55728,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 === 307 /* JSDocOptionalType */
+            node.type && node.type.kind === 308 /* JSDocOptionalType */
                 || ts.getJSDocParameterTags(node).some(function (_a) {
                     var isBracketed = _a.isBracketed, typeExpression = _a.typeExpression;
-                    return isBracketed || !!typeExpression && typeExpression.type.kind === 307 /* JSDocOptionalType */;
+                    return isBracketed || !!typeExpression && typeExpression.type.kind === 308 /* JSDocOptionalType */;
                 }));
         }
         function tryFindAmbientModule(moduleName, withAugmentations) {
@@ -54422,12 +55763,15 @@ var ts;
             }
             return false;
         }
+        function isOptionalPropertyDeclaration(node) {
+            return ts.isPropertyDeclaration(node) && node.questionToken;
+        }
         function isOptionalJSDocPropertyLikeTag(node) {
             if (!ts.isJSDocPropertyLikeTag(node)) {
                 return false;
             }
             var isBracketed = node.isBracketed, typeExpression = node.typeExpression;
-            return isBracketed || !!typeExpression && typeExpression.type.kind === 307 /* JSDocOptionalType */;
+            return isBracketed || !!typeExpression && typeExpression.type.kind === 308 /* JSDocOptionalType */;
         }
         function createTypePredicate(kind, parameterName, parameterIndex, type) {
             return { kind: kind, parameterName: parameterName, parameterIndex: parameterIndex, type: type };
@@ -54509,7 +55853,7 @@ var ts;
                     else {
                         parameters.push(paramSymbol);
                     }
-                    if (type && type.kind === 191 /* LiteralType */) {
+                    if (type && type.kind === 192 /* LiteralType */) {
                         flags |= 2 /* HasLiteralTypes */;
                     }
                     // Record a new minimum argument count if this is not an optional parameter
@@ -54522,16 +55866,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 === 167 /* GetAccessor */ || declaration.kind === 168 /* SetAccessor */) &&
+                if ((declaration.kind === 168 /* GetAccessor */ || declaration.kind === 169 /* SetAccessor */) &&
                     hasBindableName(declaration) &&
                     (!hasThisParameter || !thisParameter)) {
-                    var otherKind = declaration.kind === 167 /* GetAccessor */ ? 168 /* SetAccessor */ : 167 /* GetAccessor */;
+                    var otherKind = declaration.kind === 168 /* GetAccessor */ ? 169 /* SetAccessor */ : 168 /* GetAccessor */;
                     var other = ts.getDeclarationOfKind(getSymbolOfNode(declaration), otherKind);
                     if (other) {
                         thisParameter = getAnnotatedAccessorThisParameter(other);
                     }
                 }
-                var classType = declaration.kind === 166 /* Constructor */ ?
+                var classType = declaration.kind === 167 /* Constructor */ ?
                     getDeclaredTypeOfClassOrInterface(getMergedSymbol(declaration.parent.symbol))
                     : undefined;
                 var typeParameters = classType ? classType.localTypeParameters : getTypeParametersFromDeclaration(declaration);
@@ -54576,8 +55920,7 @@ var ts;
             if (!(ts.isInJSFile(node) && ts.isFunctionLikeDeclaration(node)))
                 return undefined;
             var typeTag = ts.getJSDocTypeTag(node);
-            var signature = typeTag && typeTag.typeExpression && getSingleCallSignature(getTypeFromTypeNode(typeTag.typeExpression));
-            return signature && getErasedSignature(signature);
+            return (typeTag === null || typeTag === void 0 ? void 0 : typeTag.typeExpression) && getSingleCallSignature(getTypeFromTypeNode(typeTag.typeExpression));
         }
         function getReturnTypeOfTypeTag(node) {
             var signature = getSignatureOfTypeTag(node);
@@ -54600,14 +55943,14 @@ var ts;
                 switch (node.kind) {
                     case 78 /* Identifier */:
                         return node.escapedText === argumentsSymbol.escapedName && getResolvedSymbol(node) === argumentsSymbol;
-                    case 163 /* PropertyDeclaration */:
-                    case 165 /* MethodDeclaration */:
-                    case 167 /* GetAccessor */:
-                    case 168 /* SetAccessor */:
-                        return node.name.kind === 158 /* ComputedPropertyName */
+                    case 164 /* PropertyDeclaration */:
+                    case 166 /* MethodDeclaration */:
+                    case 168 /* GetAccessor */:
+                    case 169 /* SetAccessor */:
+                        return node.name.kind === 159 /* ComputedPropertyName */
                             && traverse(node.name);
-                    case 201 /* PropertyAccessExpression */:
-                    case 202 /* ElementAccessExpression */:
+                    case 202 /* PropertyAccessExpression */:
+                    case 203 /* ElementAccessExpression */:
                         return traverse(node.expression);
                     default:
                         return !ts.nodeStartsNewLexicalEnvironment(node) && !ts.isPartOfTypeNode(node) && !!ts.forEachChild(node, traverse);
@@ -54615,7 +55958,7 @@ var ts;
             }
         }
         function getSignaturesOfSymbol(symbol) {
-            if (!symbol)
+            if (!symbol || !symbol.declarations)
                 return ts.emptyArray;
             var result = [];
             for (var i = 0; i < symbol.declarations.length; i++) {
@@ -54656,8 +55999,8 @@ var ts;
                     var targetTypePredicate = getTypePredicateOfSignature(signature.target);
                     signature.resolvedTypePredicate = targetTypePredicate ? instantiateTypePredicate(targetTypePredicate, signature.mapper) : noTypePredicate;
                 }
-                else if (signature.unionSignatures) {
-                    signature.resolvedTypePredicate = getUnionTypePredicate(signature.unionSignatures) || noTypePredicate;
+                else if (signature.compositeSignatures) {
+                    signature.resolvedTypePredicate = getUnionOrIntersectionTypePredicate(signature.compositeSignatures, signature.compositeKind) || noTypePredicate;
                 }
                 else {
                     var type = signature.declaration && ts.getEffectiveReturnTypeNode(signature.declaration);
@@ -54679,17 +56022,20 @@ var ts;
         function createTypePredicateFromTypePredicateNode(node, signature) {
             var parameterName = node.parameterName;
             var type = node.type && getTypeFromTypeNode(node.type);
-            return parameterName.kind === 187 /* ThisType */ ?
+            return parameterName.kind === 188 /* 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);
         }
+        function getUnionOrIntersectionType(types, kind, unionReduction) {
+            return kind !== 2097152 /* Intersection */ ? getUnionType(types, unionReduction) : getIntersectionType(types);
+        }
         function getReturnTypeOfSignature(signature) {
             if (!signature.resolvedReturnType) {
                 if (!pushTypeResolution(signature, 3 /* ResolvedReturnType */)) {
                     return errorType;
                 }
                 var type = signature.target ? instantiateType(getReturnTypeOfSignature(signature.target), signature.mapper) :
-                    signature.unionSignatures ? instantiateType(getUnionType(ts.map(signature.unionSignatures, getReturnTypeOfSignature), 2 /* Subtype */), signature.mapper) :
+                    signature.compositeSignatures ? instantiateType(getUnionOrIntersectionType(ts.map(signature.compositeSignatures, getReturnTypeOfSignature), signature.compositeKind, 2 /* Subtype */), signature.mapper) :
                         getReturnTypeFromAnnotation(signature.declaration) ||
                             (ts.nodeIsMissing(signature.declaration.body) ? anyType : getReturnTypeFromBody(signature.declaration));
                 if (signature.flags & 8 /* IsInnerCallChain */) {
@@ -54722,7 +56068,7 @@ var ts;
             return signature.resolvedReturnType;
         }
         function getReturnTypeFromAnnotation(declaration) {
-            if (declaration.kind === 166 /* Constructor */) {
+            if (declaration.kind === 167 /* Constructor */) {
                 return getDeclaredTypeOfClassOrInterface(getMergedSymbol(declaration.parent.symbol));
             }
             if (ts.isJSDocConstructSignature(declaration)) {
@@ -54732,12 +56078,12 @@ var ts;
             if (typeNode) {
                 return getTypeFromTypeNode(typeNode);
             }
-            if (declaration.kind === 167 /* GetAccessor */ && hasBindableName(declaration)) {
+            if (declaration.kind === 168 /* GetAccessor */ && hasBindableName(declaration)) {
                 var jsDocType = ts.isInJSFile(declaration) && getTypeForDeclarationFromJSDocComment(declaration);
                 if (jsDocType) {
                     return jsDocType;
                 }
-                var setter = ts.getDeclarationOfKind(getSymbolOfNode(declaration), 168 /* SetAccessor */);
+                var setter = ts.getDeclarationOfKind(getSymbolOfNode(declaration), 169 /* SetAccessor */);
                 var setterType = getAnnotatedAccessorType(setter);
                 if (setterType) {
                     return setterType;
@@ -54814,9 +56160,20 @@ var ts;
         function getBaseSignature(signature) {
             var typeParameters = signature.typeParameters;
             if (typeParameters) {
-                var typeEraser_1 = createTypeEraser(typeParameters);
-                var baseConstraints = ts.map(typeParameters, function (tp) { return instantiateType(getBaseConstraintOfType(tp), typeEraser_1) || unknownType; });
-                return instantiateSignature(signature, createTypeMapper(typeParameters, baseConstraints), /*eraseTypeParameters*/ true);
+                if (signature.baseSignatureCache) {
+                    return signature.baseSignatureCache;
+                }
+                var typeEraser = createTypeEraser(typeParameters);
+                var baseConstraintMapper_1 = createTypeMapper(typeParameters, ts.map(typeParameters, function (tp) { return getConstraintOfTypeParameter(tp) || unknownType; }));
+                var baseConstraints = ts.map(typeParameters, function (tp) { return instantiateType(tp, baseConstraintMapper_1) || unknownType; });
+                // Run N type params thru the immediate constraint mapper up to N times
+                // This way any noncircular interdependent type parameters are definitely resolved to their external dependencies
+                for (var i = 0; i < typeParameters.length - 1; i++) {
+                    baseConstraints = instantiateTypes(baseConstraints, baseConstraintMapper_1);
+                }
+                // and then apply a type eraser to remove any remaining circularly dependent type parameters
+                baseConstraints = instantiateTypes(baseConstraints, typeEraser);
+                return signature.baseSignatureCache = instantiateSignature(signature, createTypeMapper(typeParameters, baseConstraints), /*eraseTypeParameters*/ true);
             }
             return signature;
         }
@@ -54827,7 +56184,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 === 166 /* Constructor */ || kind === 170 /* ConstructSignature */ || kind === 175 /* ConstructorType */;
+                var isConstructor = kind === 167 /* Constructor */ || kind === 171 /* ConstructSignature */ || kind === 176 /* ConstructorType */;
                 var type = createObjectType(16 /* Anonymous */);
                 type.members = emptySymbols;
                 type.properties = ts.emptyArray;
@@ -54838,12 +56195,22 @@ var ts;
             return signature.isolatedSignatureType;
         }
         function getIndexSymbol(symbol) {
-            return symbol.members.get("__index" /* Index */);
+            return symbol.members ? getIndexSymbolFromSymbolTable(symbol.members) : undefined;
+        }
+        function getIndexSymbolFromSymbolTable(symbolTable) {
+            return symbolTable.get("__index" /* Index */);
         }
         function getIndexDeclarationOfSymbol(symbol, kind) {
+            var indexSymbol = symbol && getIndexSymbol(symbol);
+            return indexSymbol && getIndexDeclarationOfIndexSymbol(indexSymbol, kind);
+        }
+        function getIndexDeclarationOfSymbolTable(symbolTable, kind) {
+            var indexSymbol = symbolTable && getIndexSymbolFromSymbolTable(symbolTable);
+            return indexSymbol && getIndexDeclarationOfIndexSymbol(indexSymbol, kind);
+        }
+        function getIndexDeclarationOfIndexSymbol(indexSymbol, kind) {
             var syntaxKind = kind === 1 /* Number */ ? 144 /* NumberKeyword */ : 147 /* StringKeyword */;
-            var indexSymbol = getIndexSymbol(symbol);
-            if (indexSymbol) {
+            if (indexSymbol === null || indexSymbol === void 0 ? void 0 : indexSymbol.declarations) {
                 for (var _i = 0, _a = indexSymbol.declarations; _i < _a.length; _i++) {
                     var decl = _a[_i];
                     var node = ts.cast(decl, ts.isIndexSignatureDeclaration);
@@ -54871,17 +56238,18 @@ var ts;
             return ts.mapDefined(ts.filter(type.symbol && type.symbol.declarations, ts.isTypeParameterDeclaration), ts.getEffectiveConstraintOfTypeParameter)[0];
         }
         function getInferredTypeParameterConstraint(typeParameter) {
+            var _a;
             var inferences;
-            if (typeParameter.symbol) {
-                for (var _i = 0, _a = typeParameter.symbol.declarations; _i < _a.length; _i++) {
-                    var declaration = _a[_i];
-                    if (declaration.parent.kind === 185 /* InferType */) {
+            if ((_a = typeParameter.symbol) === null || _a === void 0 ? void 0 : _a.declarations) {
+                for (var _i = 0, _b = typeParameter.symbol.declarations; _i < _b.length; _i++) {
+                    var declaration = _b[_i];
+                    if (declaration.parent.kind === 186 /* 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 _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 _c = ts.walkUpParenthesizedTypesAndGetParentAndChild(declaration.parent.parent), _d = _c[0], childTypeParameter = _d === void 0 ? declaration.parent : _d, grandParent = _c[1];
+                        if (grandParent.kind === 174 /* TypeReference */) {
                             var typeReference = grandParent;
                             var typeParameters = getTypeParametersForTypeReference(typeReference);
                             if (typeParameters) {
@@ -54906,21 +56274,32 @@ 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 === 160 /* Parameter */ && grandParent.dotDotDotToken ||
-                            grandParent.kind === 181 /* RestType */ ||
-                            grandParent.kind === 192 /* NamedTupleMember */ && grandParent.dotDotDotToken) {
+                        else if (grandParent.kind === 161 /* Parameter */ && grandParent.dotDotDotToken ||
+                            grandParent.kind === 182 /* RestType */ ||
+                            grandParent.kind === 193 /* 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 */) {
+                        else if (grandParent.kind === 195 /* TemplateLiteralTypeSpan */) {
                             inferences = ts.append(inferences, stringType);
                         }
                         // When an 'infer T' declaration is in the constraint position of a mapped type, we infer a 'keyof any'
                         // constraint.
-                        else if (grandParent.kind === 159 /* TypeParameter */ && grandParent.parent.kind === 190 /* MappedType */) {
+                        else if (grandParent.kind === 160 /* TypeParameter */ && grandParent.parent.kind === 191 /* MappedType */) {
                             inferences = ts.append(inferences, keyofConstraintType);
                         }
+                        // When an 'infer T' declaration is the template of a mapped type, and that mapped type is the extends
+                        // clause of a conditional whose check type is also a mapped type, give it a constraint equal to the template
+                        // of the check type's mapped type
+                        else if (grandParent.kind === 191 /* MappedType */ && grandParent.type &&
+                            ts.skipParentheses(grandParent.type) === declaration.parent && grandParent.parent.kind === 185 /* ConditionalType */ &&
+                            grandParent.parent.extendsType === grandParent && grandParent.parent.checkType.kind === 191 /* MappedType */ &&
+                            grandParent.parent.checkType.type) {
+                            var checkMappedType_1 = grandParent.parent.checkType;
+                            var nodeType = getTypeFromTypeNode(checkMappedType_1.type);
+                            inferences = ts.append(inferences, instantiateType(nodeType, makeUnaryTypeMapper(getDeclaredTypeOfTypeParameter(getSymbolOfNode(checkMappedType_1.typeParameter)), checkMappedType_1.typeParameter.constraint ? getTypeFromTypeNode(checkMappedType_1.typeParameter.constraint) : keyofConstraintType)));
+                        }
                     }
                 }
             }
@@ -54943,7 +56322,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 === 190 /* MappedType */ ? keyofConstraintType : unknownType;
+                            type = constraintDeclaration.parent.parent.kind === 191 /* MappedType */ ? keyofConstraintType : unknownType;
                         }
                         typeParameter.constraint = type;
                     }
@@ -54952,7 +56331,7 @@ var ts;
             return typeParameter.constraint === noConstraintType ? undefined : typeParameter.constraint;
         }
         function getParentSymbolOfTypeParameter(typeParameter) {
-            var tp = ts.getDeclarationOfKind(typeParameter.symbol, 159 /* TypeParameter */);
+            var tp = ts.getDeclarationOfKind(typeParameter.symbol, 160 /* TypeParameter */);
             var host = ts.isJSDocTemplateTag(tp.parent) ? ts.getHostSignatureFromJSDoc(tp.parent) : tp.parent;
             return host && getSymbolOfNode(host);
         }
@@ -54994,7 +56373,7 @@ var ts;
                     result |= ts.getObjectFlags(type);
                 }
             }
-            return result & 3670016 /* PropagatingFlags */;
+            return result & 917504 /* PropagatingFlags */;
         }
         function createTypeReference(target, typeArguments) {
             var id = getTypeListId(typeArguments);
@@ -55038,8 +56417,8 @@ var ts;
                 }
                 var node = type.node;
                 var typeArguments = !node ? ts.emptyArray :
-                    node.kind === 173 /* TypeReference */ ? ts.concatenate(type.target.outerTypeParameters, getEffectiveTypeArguments(node, type.target.localTypeParameters)) :
-                        node.kind === 178 /* ArrayType */ ? [getTypeFromTypeNode(node.elementType)] :
+                    node.kind === 174 /* TypeReference */ ? ts.concatenate(type.target.outerTypeParameters, getEffectiveTypeArguments(node, type.target.localTypeParameters)) :
+                        node.kind === 179 /* ArrayType */ ? [getTypeFromTypeNode(node.elementType)] :
                             ts.map(node.elements, getTypeFromTypeNode);
                 if (popTypeResolution()) {
                     type.resolvedTypeArguments = type.mapper ? instantiateTypes(typeArguments, type.mapper) : typeArguments;
@@ -55081,7 +56460,7 @@ var ts;
                         return errorType;
                     }
                 }
-                if (node.kind === 173 /* TypeReference */ && isDeferredTypeReferenceNode(node, ts.length(node.typeArguments) !== typeParameters.length)) {
+                if (node.kind === 174 /* 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
@@ -55123,16 +56502,26 @@ var ts;
                         ts.Diagnostics.Generic_type_0_requires_between_1_and_2_type_arguments, symbolToString(symbol), minTypeArgumentCount, typeParameters.length);
                     return errorType;
                 }
+                // We refrain from associating a local type alias with an instantiation of a top-level type alias
+                // because the local alias may end up being referenced in an inferred return type where it is not
+                // accessible--which in turn may lead to a large structural expansion of the type when generating
+                // a .d.ts file. See #43622 for an example.
                 var aliasSymbol = getAliasSymbolForTypeNode(node);
-                return getTypeAliasInstantiation(symbol, typeArgumentsFromTypeReferenceNode(node), aliasSymbol, getTypeArgumentsForAliasSymbol(aliasSymbol));
+                var newAliasSymbol = aliasSymbol && (isLocalTypeAlias(symbol) || !isLocalTypeAlias(aliasSymbol)) ? aliasSymbol : undefined;
+                return getTypeAliasInstantiation(symbol, typeArgumentsFromTypeReferenceNode(node), newAliasSymbol, getTypeArgumentsForAliasSymbol(newAliasSymbol));
             }
             return checkNoTypeArguments(node, symbol) ? type : errorType;
         }
+        function isLocalTypeAlias(symbol) {
+            var _a;
+            var declaration = (_a = symbol.declarations) === null || _a === void 0 ? void 0 : _a.find(ts.isTypeAlias);
+            return !!(declaration && ts.getContainingFunction(declaration));
+        }
         function getTypeReferenceName(node) {
             switch (node.kind) {
-                case 173 /* TypeReference */:
+                case 174 /* TypeReference */:
                     return node.typeName;
-                case 223 /* ExpressionWithTypeArguments */:
+                case 224 /* ExpressionWithTypeArguments */:
                     // We only support expressions that are simple qualified names. For other
                     // expressions this produces undefined.
                     var expr = node.expression;
@@ -55188,7 +56577,7 @@ var ts;
                 var valueType = getTypeOfSymbol(symbol);
                 var typeType = valueType;
                 if (symbol.valueDeclaration) {
-                    var isImportTypeWithQualifier = node.kind === 195 /* ImportType */ && node.qualifier;
+                    var isImportTypeWithQualifier = node.kind === 196 /* ImportType */ && node.qualifier;
                     // valueType might not have a symbol, eg, {import('./b').STRING_LITERAL}
                     if (valueType.symbol && valueType.symbol !== symbol && isImportTypeWithQualifier) {
                         typeType = getTypeReferenceType(node, valueType.symbol);
@@ -55214,7 +56603,7 @@ var ts;
             return result;
         }
         function isUnaryTupleTypeNode(node) {
-            return node.kind === 179 /* TupleType */ && node.elements.length === 1;
+            return node.kind === 180 /* TupleType */ && node.elements.length === 1;
         }
         function getImpliedConstraint(type, checkNode, extendsNode) {
             return isUnaryTupleTypeNode(checkNode) && isUnaryTupleTypeNode(extendsNode) ? getImpliedConstraint(type, checkNode.elements[0], extendsNode.elements[0]) :
@@ -55223,9 +56612,17 @@ var ts;
         }
         function getConditionalFlowTypeOfType(type, node) {
             var constraints;
-            while (node && !ts.isStatement(node) && node.kind !== 311 /* JSDocComment */) {
+            var covariant = true;
+            while (node && !ts.isStatement(node) && node.kind !== 312 /* JSDocComment */) {
                 var parent = node.parent;
-                if (parent.kind === 184 /* ConditionalType */ && node === parent.trueType) {
+                // only consider variance flipped by parameter locations - `keyof` types would usually be considered variance inverting, but
+                // often get used in indexed accesses where they behave sortof invariantly, but our checking is lax
+                if (parent.kind === 161 /* Parameter */) {
+                    covariant = !covariant;
+                }
+                // Always substitute on type parameters, regardless of variance, since even
+                // in contravariant positions, they may rely on substituted constraints to be valid
+                if ((covariant || type.flags & 8650752 /* TypeVariable */) && parent.kind === 185 /* ConditionalType */ && node === parent.trueType) {
                     var constraint = getImpliedConstraint(type, parent.checkType, parent.extendsType);
                     if (constraint) {
                         constraints = ts.append(constraints, constraint);
@@ -55236,7 +56633,7 @@ var ts;
             return constraints ? getSubstitutionType(type, getIntersectionType(ts.append(constraints, type))) : type;
         }
         function isJSDocTypeReference(node) {
-            return !!(node.flags & 4194304 /* JSDoc */) && (node.kind === 173 /* TypeReference */ || node.kind === 195 /* ImportType */);
+            return !!(node.flags & 4194304 /* JSDoc */) && (node.kind === 174 /* TypeReference */ || node.kind === 196 /* ImportType */);
         }
         function checkNoTypeArguments(node, symbol) {
             if (node.typeArguments) {
@@ -55346,13 +56743,15 @@ var ts;
         function getTypeOfGlobalSymbol(symbol, arity) {
             function getTypeDeclaration(symbol) {
                 var declarations = symbol.declarations;
-                for (var _i = 0, declarations_3 = declarations; _i < declarations_3.length; _i++) {
-                    var declaration = declarations_3[_i];
-                    switch (declaration.kind) {
-                        case 252 /* ClassDeclaration */:
-                        case 253 /* InterfaceDeclaration */:
-                        case 255 /* EnumDeclaration */:
-                            return declaration;
+                if (declarations) {
+                    for (var _i = 0, declarations_3 = declarations; _i < declarations_3.length; _i++) {
+                        var declaration = declarations_3[_i];
+                        switch (declaration.kind) {
+                            case 253 /* ClassDeclaration */:
+                            case 254 /* InterfaceDeclaration */:
+                            case 256 /* EnumDeclaration */:
+                                return declaration;
+                        }
                     }
                 }
             }
@@ -55396,6 +56795,9 @@ var ts;
         function getGlobalESSymbolConstructorSymbol(reportErrors) {
             return deferredGlobalESSymbolConstructorSymbol || (deferredGlobalESSymbolConstructorSymbol = getGlobalValueSymbol("Symbol", reportErrors));
         }
+        function getGlobalESSymbolConstructorTypeSymbol(reportErrors) {
+            return deferredGlobalESSymbolConstructorTypeSymbol || (deferredGlobalESSymbolConstructorTypeSymbol = getGlobalTypeSymbol("SymbolConstructor", reportErrors));
+        }
         function getGlobalESSymbolType(reportErrors) {
             return deferredGlobalESSymbolType || (deferredGlobalESSymbolType = getGlobalType("Symbol", /*arity*/ 0, reportErrors)) || emptyObjectType;
         }
@@ -55472,11 +56874,11 @@ var ts;
         }
         function getTupleElementFlags(node) {
             switch (node.kind) {
-                case 180 /* OptionalType */:
+                case 181 /* OptionalType */:
                     return 2 /* Optional */;
-                case 181 /* RestType */:
+                case 182 /* RestType */:
                     return getRestTypeElementFlags(node);
-                case 192 /* NamedTupleMember */:
+                case 193 /* NamedTupleMember */:
                     return node.questionToken ? 2 /* Optional */ :
                         node.dotDotDotToken ? getRestTypeElementFlags(node) :
                             1 /* Required */;
@@ -55494,14 +56896,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 !== 192 /* NamedTupleMember */; });
+            var missingName = ts.some(node.elements, function (e) { return e.kind !== 193 /* 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 === 178 /* ArrayType */ ? mayResolveTypeAlias(node.elementType) :
-                node.kind === 179 /* TupleType */ ? ts.some(node.elements, mayResolveTypeAlias) :
+            return !!getAliasSymbolForTypeNode(node) || isResolvedByTypeAlias(node) && (node.kind === 179 /* ArrayType */ ? mayResolveTypeAlias(node.elementType) :
+                node.kind === 180 /* 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
@@ -55510,18 +56912,18 @@ var ts;
         function isResolvedByTypeAlias(node) {
             var parent = node.parent;
             switch (parent.kind) {
-                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 */:
+                case 187 /* ParenthesizedType */:
+                case 193 /* NamedTupleMember */:
+                case 174 /* TypeReference */:
+                case 183 /* UnionType */:
+                case 184 /* IntersectionType */:
+                case 190 /* IndexedAccessType */:
+                case 185 /* ConditionalType */:
+                case 189 /* TypeOperator */:
+                case 179 /* ArrayType */:
+                case 180 /* TupleType */:
                     return isResolvedByTypeAlias(parent);
-                case 254 /* TypeAliasDeclaration */:
+                case 255 /* TypeAliasDeclaration */:
                     return true;
             }
             return false;
@@ -55530,28 +56932,28 @@ var ts;
         // of a type alias.
         function mayResolveTypeAlias(node) {
             switch (node.kind) {
-                case 173 /* TypeReference */:
+                case 174 /* TypeReference */:
                     return isJSDocTypeReference(node) || !!(resolveTypeReferenceName(node.typeName, 788968 /* Type */).flags & 524288 /* TypeAlias */);
-                case 176 /* TypeQuery */:
+                case 177 /* TypeQuery */:
                     return true;
-                case 188 /* TypeOperator */:
+                case 189 /* 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 */:
+                case 187 /* ParenthesizedType */:
+                case 181 /* OptionalType */:
+                case 193 /* NamedTupleMember */:
+                case 308 /* JSDocOptionalType */:
+                case 306 /* JSDocNullableType */:
+                case 307 /* JSDocNonNullableType */:
+                case 302 /* JSDocTypeExpression */:
                     return mayResolveTypeAlias(node.type);
-                case 181 /* RestType */:
-                    return node.type.kind !== 178 /* ArrayType */ || mayResolveTypeAlias(node.type.elementType);
-                case 182 /* UnionType */:
-                case 183 /* IntersectionType */:
+                case 182 /* RestType */:
+                    return node.type.kind !== 179 /* ArrayType */ || mayResolveTypeAlias(node.type.elementType);
+                case 183 /* UnionType */:
+                case 184 /* IntersectionType */:
                     return ts.some(node.types, mayResolveTypeAlias);
-                case 189 /* IndexedAccessType */:
+                case 190 /* IndexedAccessType */:
                     return mayResolveTypeAlias(node.objectType) || mayResolveTypeAlias(node.indexType);
-                case 184 /* ConditionalType */:
+                case 185 /* ConditionalType */:
                     return mayResolveTypeAlias(node.checkType) || mayResolveTypeAlias(node.extendsType) ||
                         mayResolveTypeAlias(node.trueType) || mayResolveTypeAlias(node.falseType);
             }
@@ -55564,12 +56966,12 @@ var ts;
                 if (target === emptyGenericType) {
                     links.resolvedType = emptyObjectType;
                 }
-                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 :
+                else if (!(node.kind === 180 /* TupleType */ && ts.some(node.elements, function (e) { return !!(getTupleElementFlags(e) & 8 /* Variadic */); })) && isDeferredTypeReferenceNode(node)) {
+                    links.resolvedType = node.kind === 180 /* TupleType */ && node.elements.length === 0 ? target :
                         createDeferredTypeReference(target, node, /*mapper*/ undefined);
                 }
                 else {
-                    var elementTypes = node.kind === 178 /* ArrayType */ ? [getTypeFromTypeNode(node.elementType)] : ts.map(node.elements, getTypeFromTypeNode);
+                    var elementTypes = node.kind === 179 /* ArrayType */ ? [getTypeFromTypeNode(node.elementType)] : ts.map(node.elements, getTypeFromTypeNode);
                     links.resolvedType = createNormalizedTypeReference(target, elementTypes);
                 }
             }
@@ -55813,7 +57215,7 @@ var ts;
                 if (type === wildcardType)
                     includes |= 8388608 /* IncludesWildcard */;
                 if (!strictNullChecks && flags & 98304 /* Nullable */) {
-                    if (!(ts.getObjectFlags(type) & 524288 /* ContainsWideningType */))
+                    if (!(ts.getObjectFlags(type) & 131072 /* ContainsWideningType */))
                         includes |= 4194304 /* IncludesNonWideningType */;
                 }
                 else {
@@ -55836,6 +57238,11 @@ var ts;
             return includes;
         }
         function removeSubtypes(types, hasObjectTypes) {
+            var id = getTypeListId(types);
+            var match = subtypeReductionCache.get(id);
+            if (match) {
+                return match;
+            }
             // We assume that redundant primitive types have already been removed from the types array and that there
             // are no any and unknown types in the array. Thus, the only possible supertypes for primitive types are empty
             // object types, and if none of those are present we can exclude primitive types from the subtype check.
@@ -55847,6 +57254,13 @@ var ts;
                 i--;
                 var source = types[i];
                 if (hasEmptyObject || source.flags & 469499904 /* StructuredOrInstantiable */) {
+                    // Find the first property with a unit type, if any. When constituents have a property by the same name
+                    // but of a different unit type, we can quickly disqualify them from subtype checks. This helps subtype
+                    // reduction of large discriminated union types.
+                    var keyProperty = source.flags & (524288 /* Object */ | 2097152 /* Intersection */ | 58982400 /* InstantiableNonPrimitive */) ?
+                        ts.find(getPropertiesOfType(source), function (p) { return isUnitType(getTypeOfSymbol(p)); }) :
+                        undefined;
+                    var keyPropertyType = keyProperty && getRegularTypeOfLiteralType(getTypeOfSymbol(keyProperty));
                     for (var _i = 0, types_11 = types; _i < types_11.length; _i++) {
                         var target = types_11[_i];
                         if (source !== target) {
@@ -55859,10 +57273,16 @@ var ts;
                                 if (estimatedCount > 1000000) {
                                     ts.tracing === null || ts.tracing === void 0 ? void 0 : ts.tracing.instant("checkTypes" /* CheckTypes */, "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;
+                                    return undefined;
                                 }
                             }
                             count++;
+                            if (keyProperty && target.flags & (524288 /* Object */ | 2097152 /* Intersection */ | 58982400 /* InstantiableNonPrimitive */)) {
+                                var t = getTypeOfPropertyOfType(target, keyProperty.escapedName);
+                                if (t && isUnitType(t) && getRegularTypeOfLiteralType(t) !== keyPropertyType) {
+                                    continue;
+                                }
+                            }
                             if (isTypeRelatedTo(source, target, strictSubtypeRelation) && (!(ts.getObjectFlags(getTargetType(source)) & 1 /* Class */) ||
                                 !(ts.getObjectFlags(getTargetType(target)) & 1 /* Class */) ||
                                 isTypeDerivedFrom(source, target))) {
@@ -55873,7 +57293,8 @@ var ts;
                     }
                 }
             }
-            return true;
+            subtypeReductionCache.set(id, types);
+            return types;
         }
         function removeRedundantLiteralTypes(types, includes, reduceVoidUndefined) {
             var i = types.length;
@@ -55951,16 +57372,15 @@ var ts;
                 if (includes & 3 /* AnyOrUnknown */) {
                     return includes & 1 /* Any */ ? includes & 8388608 /* IncludesWildcard */ ? wildcardType : anyType : unknownType;
                 }
-                if (unionReduction & (1 /* Literal */ | 2 /* Subtype */)) {
-                    if (includes & (2944 /* Literal */ | 8192 /* UniqueESSymbol */) || includes & 16384 /* Void */ && includes & 32768 /* Undefined */) {
-                        removeRedundantLiteralTypes(typeSet, includes, !!(unionReduction & 2 /* Subtype */));
-                    }
-                    if (includes & 128 /* StringLiteral */ && includes & 134217728 /* TemplateLiteral */) {
-                        removeStringLiteralsMatchedByTemplateLiterals(typeSet);
-                    }
+                if (includes & (2944 /* Literal */ | 8192 /* UniqueESSymbol */) || includes & 16384 /* Void */ && includes & 32768 /* Undefined */) {
+                    removeRedundantLiteralTypes(typeSet, includes, !!(unionReduction & 2 /* Subtype */));
+                }
+                if (includes & 128 /* StringLiteral */ && includes & 134217728 /* TemplateLiteral */) {
+                    removeStringLiteralsMatchedByTemplateLiterals(typeSet);
                 }
-                if (unionReduction & 2 /* Subtype */) {
-                    if (!removeSubtypes(typeSet, !!(includes & 524288 /* Object */))) {
+                if (unionReduction === 2 /* Subtype */) {
+                    typeSet = removeSubtypes(typeSet, !!(includes & 524288 /* Object */));
+                    if (!typeSet) {
                         return errorType;
                     }
                 }
@@ -55997,18 +57417,23 @@ var ts;
                     origin = createOriginUnionOrIntersectionType(1048576 /* Union */, reducedTypes);
                 }
             }
-            var objectFlags = (includes & 468598819 /* NotPrimitiveUnion */ ? 0 : 262144 /* PrimitiveUnion */) |
-                (includes & 2097152 /* Intersection */ ? 268435456 /* ContainsIntersections */ : 0);
+            var objectFlags = (includes & 468598819 /* NotPrimitiveUnion */ ? 0 : 65536 /* PrimitiveUnion */) |
+                (includes & 2097152 /* Intersection */ ? 67108864 /* ContainsIntersections */ : 0);
             return getUnionTypeFromSortedList(typeSet, objectFlags, aliasSymbol, aliasTypeArguments, origin);
         }
-        function getUnionTypePredicate(signatures) {
+        function getUnionOrIntersectionTypePredicate(signatures, kind) {
             var first;
             var types = [];
             for (var _i = 0, signatures_6 = signatures; _i < signatures_6.length; _i++) {
                 var sig = signatures_6[_i];
                 var pred = getTypePredicateOfSignature(sig);
                 if (!pred || pred.kind === 2 /* AssertsThis */ || pred.kind === 3 /* AssertsIdentifier */) {
-                    continue;
+                    if (kind !== 2097152 /* Intersection */) {
+                        continue;
+                    }
+                    else {
+                        return; // intersections demand all members be type predicates for the result to have a predicate
+                    }
                 }
                 if (first) {
                     if (!typePredicateKindsMatch(first, pred)) {
@@ -56022,11 +57447,11 @@ var ts;
                 types.push(pred.type);
             }
             if (!first) {
-                // No union signatures had a type predicate.
+                // No signatures had a type predicate.
                 return undefined;
             }
-            var unionType = getUnionType(types);
-            return createTypePredicate(first.kind, first.parameterName, first.parameterIndex, unionType);
+            var compositeType = getUnionOrIntersectionType(types, kind);
+            return createTypePredicate(first.kind, first.parameterName, first.parameterIndex, compositeType);
         }
         function typePredicateKindsMatch(a, b) {
             return a.kind === b.kind && a.parameterIndex === b.parameterIndex;
@@ -56051,7 +57476,7 @@ var ts;
             var typeKey = !origin ? getTypeListId(types) :
                 origin.flags & 1048576 /* Union */ ? "|" + getTypeListId(origin.types) :
                     origin.flags & 2097152 /* Intersection */ ? "&" + getTypeListId(origin.types) :
-                        "#" + origin.type.id;
+                        "#" + origin.type.id + "|" + getTypeListId(types); // origin type id alone is insufficient, as `keyof x` may resolve to multiple WIP values while `x` is still resolving
             var id = typeKey + getAliasId(aliasSymbol, aliasTypeArguments);
             var type = unionTypes.get(id);
             if (!type) {
@@ -56178,7 +57603,7 @@ var ts;
         // other unions and return true. Otherwise, do nothing and return false.
         function intersectUnionsOfPrimitiveTypes(types) {
             var unionTypes;
-            var index = ts.findIndex(types, function (t) { return !!(ts.getObjectFlags(t) & 262144 /* PrimitiveUnion */); });
+            var index = ts.findIndex(types, function (t) { return !!(ts.getObjectFlags(t) & 65536 /* PrimitiveUnion */); });
             if (index < 0) {
                 return false;
             }
@@ -56187,7 +57612,7 @@ var ts;
             // the unionTypes array.
             while (i < types.length) {
                 var t = types[i];
-                if (ts.getObjectFlags(t) & 262144 /* PrimitiveUnion */) {
+                if (ts.getObjectFlags(t) & 65536 /* PrimitiveUnion */) {
                     (unionTypes || (unionTypes = [types[index]])).push(t);
                     ts.orderedRemoveItemAt(types, i);
                 }
@@ -56216,7 +57641,7 @@ var ts;
                 }
             }
             // Finally replace the first union with the result
-            types[index] = getUnionTypeFromSortedList(result, 262144 /* PrimitiveUnion */);
+            types[index] = getUnionTypeFromSortedList(result, 65536 /* PrimitiveUnion */);
             return true;
         }
         function createIntersectionType(types, aliasSymbol, aliasTypeArguments) {
@@ -56417,13 +57842,13 @@ var ts;
         function getLiteralTypeFromProperty(prop, include) {
             if (!(ts.getDeclarationModifierFlagsFromSymbol(prop) & 24 /* NonPublicAccessibilityModifier */)) {
                 var type = getSymbolLinks(getLateBoundSymbol(prop)).nameType;
-                if (!type && !ts.isKnownSymbol(prop)) {
+                if (!type) {
                     if (prop.escapedName === "default" /* Default */) {
                         type = getLiteralType("default");
                     }
                     else {
                         var name = prop.valueDeclaration && ts.getNameOfDeclaration(prop.valueDeclaration);
-                        type = name && getLiteralTypeFromPropertyName(name) || getLiteralType(ts.symbolName(prop));
+                        type = name && getLiteralTypeFromPropertyName(name) || (!ts.isKnownSymbol(prop) ? getLiteralType(ts.symbolName(prop)) : undefined);
                     }
                 }
                 if (type && type.flags & include) {
@@ -56554,10 +57979,8 @@ var ts;
             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;
+                        type.flags & (512 /* BooleanLiteral */ | 98304 /* Nullable */) ? type.intrinsicName :
+                            undefined;
         }
         function createTemplateLiteralType(texts, types) {
             var type = createType(134217728 /* TemplateLiteral */);
@@ -56616,7 +58039,7 @@ var ts;
             if (noImplicitAny) {
                 return false; // Flag is meaningless under `noImplicitAny` mode
             }
-            if (ts.getObjectFlags(type) & 16384 /* JSLiteral */) {
+            if (ts.getObjectFlags(type) & 8192 /* JSLiteral */) {
                 return true;
             }
             if (type.flags & 1048576 /* Union */) {
@@ -56632,15 +58055,12 @@ var ts;
             return false;
         }
         function getPropertyNameFromIndex(indexType, accessNode) {
-            var accessExpression = accessNode && accessNode.kind === 202 /* ElementAccessExpression */ ? accessNode : undefined;
             return isTypeUsableAsPropertyName(indexType) ?
                 getPropertyNameFromType(indexType) :
-                accessExpression && checkThatExpressionIsProperSymbolReference(accessExpression.argumentExpression, indexType, /*reportError*/ false) ?
-                    ts.getPropertyNameForKnownSymbolName(ts.idText(accessExpression.argumentExpression.name)) :
-                    accessNode && ts.isPropertyName(accessNode) ?
-                        // late bound names are handled in the first branch, so here we only need to handle normal names
-                        ts.getPropertyNameForPropertyNameNode(accessNode) :
-                        undefined;
+                accessNode && ts.isPropertyName(accessNode) ?
+                    // late bound names are handled in the first branch, so here we only need to handle normal names
+                    ts.getPropertyNameForPropertyNameNode(accessNode) :
+                    undefined;
         }
         function isUncalledFunctionReference(node, symbol) {
             if (symbol.flags & (16 /* Function */ | 8192 /* Method */)) {
@@ -56654,17 +58074,17 @@ var ts;
         }
         function getPropertyTypeForIndexType(originalObjectType, objectType, indexType, fullIndexType, suppressNoImplicitAnyError, accessNode, accessFlags, noUncheckedIndexedAccessCandidate, reportDeprecated) {
             var _a;
-            var accessExpression = accessNode && accessNode.kind === 202 /* ElementAccessExpression */ ? accessNode : undefined;
+            var accessExpression = accessNode && accessNode.kind === 203 /* 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 && getDeclarationNodeFlagsFromSymbol(prop) & 134217728 /* Deprecated */ && isUncalledFunctionReference(accessNode, prop)) {
+                    if (reportDeprecated && accessNode && prop.declarations && 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);
                         addDeprecatedSuggestion(deprecatedNode, prop.declarations, propName);
                     }
                     if (accessExpression) {
-                        markPropertyAsReferenced(prop, accessExpression, /*isThisAccess*/ accessExpression.expression.kind === 107 /* ThisKeyword */);
+                        markPropertyAsReferenced(prop, accessExpression, isSelfTypeAccess(accessExpression.expression, objectType.symbol));
                         if (isAssignmentToReadonlyEntity(accessExpression, prop, ts.getAssignmentTargetKind(accessExpression))) {
                             error(accessExpression.argumentExpression, ts.Diagnostics.Cannot_assign_to_0_because_it_is_a_read_only_property, symbolToString(prop));
                             return undefined;
@@ -56814,13 +58234,13 @@ var ts;
             }
         }
         function getIndexNodeForAccessExpression(accessNode) {
-            return accessNode.kind === 202 /* ElementAccessExpression */ ? accessNode.argumentExpression :
-                accessNode.kind === 189 /* IndexedAccessType */ ? accessNode.indexType :
-                    accessNode.kind === 158 /* ComputedPropertyName */ ? accessNode.expression :
+            return accessNode.kind === 203 /* ElementAccessExpression */ ? accessNode.argumentExpression :
+                accessNode.kind === 190 /* IndexedAccessType */ ? accessNode.indexType :
+                    accessNode.kind === 159 /* ComputedPropertyName */ ? accessNode.expression :
                         accessNode;
         }
         function isPatternLiteralPlaceholderType(type) {
-            return templateConstraintType.types.indexOf(type) !== -1 || !!(type.flags & 1 /* Any */);
+            return !!(type.flags & (1 /* Any */ | 4 /* String */ | 8 /* Number */ | 64 /* BigInt */));
         }
         function isPatternLiteralType(type) {
             return !!(type.flags & 134217728 /* TemplateLiteral */) && ts.every(type.types, isPatternLiteralPlaceholderType);
@@ -56833,6 +58253,13 @@ var ts;
                 }
                 return !!(type.objectFlags & 8388608 /* IsGenericObjectType */);
             }
+            if (type.flags & 33554432 /* Substitution */) {
+                if (!(type.objectFlags & 4194304 /* IsGenericObjectTypeComputed */)) {
+                    type.objectFlags |= 4194304 /* IsGenericObjectTypeComputed */ |
+                        (isGenericObjectType(type.substitute) || isGenericObjectType(type.baseType) ? 8388608 /* IsGenericObjectType */ : 0);
+                }
+                return !!(type.objectFlags & 8388608 /* IsGenericObjectType */);
+            }
             return !!(type.flags & 58982400 /* InstantiableNonPrimitive */) || isGenericMappedType(type) || isGenericTupleType(type);
         }
         function isGenericIndexType(type) {
@@ -56843,6 +58270,13 @@ var ts;
                 }
                 return !!(type.objectFlags & 33554432 /* IsGenericIndexType */);
             }
+            if (type.flags & 33554432 /* Substitution */) {
+                if (!(type.objectFlags & 16777216 /* IsGenericIndexTypeComputed */)) {
+                    type.objectFlags |= 16777216 /* IsGenericIndexTypeComputed */ |
+                        (isGenericIndexType(type.substitute) || isGenericIndexType(type.baseType) ? 33554432 /* IsGenericIndexType */ : 0);
+                }
+                return !!(type.objectFlags & 33554432 /* IsGenericIndexType */);
+            }
             return !!(type.flags & (58982400 /* InstantiableNonPrimitive */ | 4194304 /* Index */ | 134217728 /* TemplateLiteral */ | 268435456 /* StringMapping */)) && !isPatternLiteralType(type);
         }
         function isThisTypeParameter(type) {
@@ -56918,6 +58352,12 @@ var ts;
             }
             return type[cache] = type;
         }
+        function isConditionalTypeAlwaysTrueDisregardingInferTypes(type) {
+            var extendsInferParamMapper = type.root.inferTypeParameters && createTypeMapper(type.root.inferTypeParameters, ts.map(type.root.inferTypeParameters, function () { return wildcardType; }));
+            var checkType = type.checkType;
+            var extendsType = type.extendsType;
+            return isTypeAssignableTo(getRestrictiveInstantiation(checkType), getRestrictiveInstantiation(instantiateType(extendsType, extendsInferParamMapper)));
+        }
         function getSimplifiedConditionalType(type, writing) {
             var checkType = type.checkType;
             var extendsType = type.extendsType;
@@ -56988,7 +58428,7 @@ 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 !== 189 /* IndexedAccessType */ ?
+            if (isGenericIndexType(indexType) || (accessNode && accessNode.kind !== 190 /* IndexedAccessType */ ?
                 isGenericTupleType(objectType) && !indexTypeLessThan(indexType, objectType.target.fixedLength) :
                 isGenericObjectType(objectType) && !(isTupleType(objectType) && indexTypeLessThan(indexType, objectType.target.fixedLength)))) {
                 if (objectType.flags & 3 /* AnyOrUnknown */) {
@@ -57073,9 +58513,9 @@ var ts;
         }
         function isTypicalNondistributiveConditional(root) {
             return !root.isDistributive
-                && root.node.checkType.kind === 179 /* TupleType */
+                && root.node.checkType.kind === 180 /* TupleType */
                 && ts.length(root.node.checkType.elements) === 1
-                && root.node.extendsType.kind === 179 /* TupleType */
+                && root.node.extendsType.kind === 180 /* TupleType */
                 && ts.length(root.node.extendsType.elements) === 1;
         }
         /**
@@ -57094,7 +58534,7 @@ var ts;
             // purposes of resolution. This means such types aren't subject to the instatiation depth limiter.
             while (true) {
                 var isUnwrapped = isTypicalNondistributiveConditional(root);
-                var checkType = instantiateType(unwrapNondistributiveConditionalTuple(root, root.checkType), mapper);
+                var checkType = instantiateType(unwrapNondistributiveConditionalTuple(root, getActualTypeVariable(root.checkType)), mapper);
                 var checkTypeInstantiable = isGenericObjectType(checkType) || isGenericIndexType(checkType);
                 var extendsType = instantiateType(unwrapNondistributiveConditionalTuple(root, root.extendsType), mapper);
                 if (checkType === wildcardType || extendsType === wildcardType) {
@@ -57107,9 +58547,12 @@ var ts;
                         // We don't want inferences from constraints as they may cause us to eagerly resolve the
                         // conditional type instead of deferring resolution. Also, we always want strict function
                         // types rules (i.e. proper contravariance) for inferences.
-                        inferTypes(context.inferences, checkType, extendsType, 256 /* NoConstraints */ | 512 /* AlwaysStrict */);
+                        inferTypes(context.inferences, checkType, extendsType, 512 /* NoConstraints */ | 1024 /* AlwaysStrict */);
                     }
-                    combinedMapper = mergeTypeMappers(mapper, context.mapper);
+                    // It's possible for 'infer T' type paramteters to be given uninstantiated constraints when the
+                    // those type parameters are used in type references (see getInferredTypeParameterConstraint). For
+                    // that reason we need context.mapper to be first in the combined mapper. See #42636 for examples.
+                    combinedMapper = mapper ? combineTypeMappers(context.mapper, mapper) : context.mapper;
                 }
                 // Instantiate the extends type including inferences for 'infer T' type parameters
                 var inferredExtendsType = combinedMapper ? instantiateType(unwrapNondistributiveConditionalTuple(root, root.extendsType), combinedMapper) : extendsType;
@@ -57361,7 +58804,7 @@ var ts;
                     }
                 }
                 var spread = createAnonymousType(type.symbol, members, ts.emptyArray, ts.emptyArray, getIndexInfoOfType(type, 0 /* String */), getIndexInfoOfType(type, 1 /* Number */));
-                spread.objectFlags |= 128 /* ObjectLiteral */ | 1048576 /* ContainsObjectOrArrayLiteral */;
+                spread.objectFlags |= 128 /* ObjectLiteral */ | 262144 /* ContainsObjectOrArrayLiteral */;
                 return spread;
             }
         }
@@ -57467,14 +58910,15 @@ var ts;
                 }
             }
             var spread = createAnonymousType(symbol, members, ts.emptyArray, ts.emptyArray, getIndexInfoWithReadonly(stringIndexInfo, readonly), getIndexInfoWithReadonly(numberIndexInfo, readonly));
-            spread.objectFlags |= 128 /* ObjectLiteral */ | 1048576 /* ContainsObjectOrArrayLiteral */ | 1024 /* ContainsSpread */ | objectFlags;
+            spread.objectFlags |= 128 /* ObjectLiteral */ | 262144 /* ContainsObjectOrArrayLiteral */ | 4194304 /* ContainsSpread */ | objectFlags;
             return spread;
         }
         /** We approximate own properties as non-methods plus methods that are inside the object literal */
         function isSpreadableProperty(prop) {
-            return !ts.some(prop.declarations, ts.isPrivateIdentifierPropertyDeclaration) &&
+            var _a;
+            return !ts.some(prop.declarations, ts.isPrivateIdentifierClassElementDeclaration) &&
                 (!(prop.flags & (8192 /* Method */ | 32768 /* GetAccessor */ | 65536 /* SetAccessor */)) ||
-                    !prop.declarations.some(function (decl) { return ts.isClassLike(decl.parent); }));
+                    !((_a = prop.declarations) === null || _a === void 0 ? void 0 : _a.some(function (decl) { return ts.isClassLike(decl.parent); })));
         }
         function getSpreadSymbol(prop, readonly) {
             var isSetonlyAccessor = prop.flags & 65536 /* SetAccessor */ && !(prop.flags & 32768 /* GetAccessor */);
@@ -57562,7 +59006,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 === 253 /* InterfaceDeclaration */)) {
+            if (parent && (ts.isClassLike(parent) || parent.kind === 254 /* InterfaceDeclaration */)) {
                 if (!ts.hasSyntacticModifier(container, 32 /* Static */) &&
                     (!ts.isConstructorDeclaration(container) || ts.isNodeDescendantOf(node, container.body))) {
                     return getDeclaredTypeOfClassOrInterface(getSymbolOfNode(parent)).thisType;
@@ -57597,17 +59041,17 @@ var ts;
         }
         function getArrayElementTypeNode(node) {
             switch (node.kind) {
-                case 186 /* ParenthesizedType */:
+                case 187 /* ParenthesizedType */:
                     return getArrayElementTypeNode(node.type);
-                case 179 /* TupleType */:
+                case 180 /* TupleType */:
                     if (node.elements.length === 1) {
                         node = node.elements[0];
-                        if (node.kind === 181 /* RestType */ || node.kind === 192 /* NamedTupleMember */ && node.dotDotDotToken) {
+                        if (node.kind === 182 /* RestType */ || node.kind === 193 /* NamedTupleMember */ && node.dotDotDotToken) {
                             return getArrayElementTypeNode(node.type);
                         }
                     }
                     break;
-                case 178 /* ArrayType */:
+                case 179 /* ArrayType */:
                     return node.elementType;
             }
             return undefined;
@@ -57625,8 +59069,8 @@ var ts;
         function getTypeFromTypeNodeWorker(node) {
             switch (node.kind) {
                 case 128 /* AnyKeyword */:
-                case 303 /* JSDocAllType */:
-                case 304 /* JSDocUnknownType */:
+                case 304 /* JSDocAllType */:
+                case 305 /* JSDocUnknownType */:
                     return anyType;
                 case 152 /* UnknownKeyword */:
                     return unknownType;
@@ -57653,70 +59097,70 @@ var ts;
                     return node.flags & 131072 /* JavaScriptFile */ && !noImplicitAny ? anyType : nonPrimitiveType;
                 case 136 /* IntrinsicKeyword */:
                     return intrinsicMarkerType;
-                case 187 /* ThisType */:
+                case 188 /* 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 191 /* LiteralType */:
+                case 192 /* LiteralType */:
                     return getTypeFromLiteralTypeNode(node);
-                case 173 /* TypeReference */:
+                case 174 /* TypeReference */:
                     return getTypeFromTypeReference(node);
-                case 172 /* TypePredicate */:
+                case 173 /* TypePredicate */:
                     return node.assertsModifier ? voidType : booleanType;
-                case 223 /* ExpressionWithTypeArguments */:
+                case 224 /* ExpressionWithTypeArguments */:
                     return getTypeFromTypeReference(node);
-                case 176 /* TypeQuery */:
+                case 177 /* TypeQuery */:
                     return getTypeFromTypeQueryNode(node);
-                case 178 /* ArrayType */:
-                case 179 /* TupleType */:
+                case 179 /* ArrayType */:
+                case 180 /* TupleType */:
                     return getTypeFromArrayOrTupleTypeNode(node);
-                case 180 /* OptionalType */:
+                case 181 /* OptionalType */:
                     return getTypeFromOptionalTypeNode(node);
-                case 182 /* UnionType */:
+                case 183 /* UnionType */:
                     return getTypeFromUnionTypeNode(node);
-                case 183 /* IntersectionType */:
+                case 184 /* IntersectionType */:
                     return getTypeFromIntersectionTypeNode(node);
-                case 305 /* JSDocNullableType */:
+                case 306 /* JSDocNullableType */:
                     return getTypeFromJSDocNullableTypeNode(node);
-                case 307 /* JSDocOptionalType */:
+                case 308 /* JSDocOptionalType */:
                     return addOptionality(getTypeFromTypeNode(node.type));
-                case 192 /* NamedTupleMember */:
+                case 193 /* NamedTupleMember */:
                     return getTypeFromNamedTupleTypeNode(node);
-                case 186 /* ParenthesizedType */:
-                case 306 /* JSDocNonNullableType */:
-                case 301 /* JSDocTypeExpression */:
+                case 187 /* ParenthesizedType */:
+                case 307 /* JSDocNonNullableType */:
+                case 302 /* JSDocTypeExpression */:
                     return getTypeFromTypeNode(node.type);
-                case 181 /* RestType */:
+                case 182 /* RestType */:
                     return getTypeFromRestTypeNode(node);
-                case 309 /* JSDocVariadicType */:
+                case 310 /* JSDocVariadicType */:
                     return getTypeFromJSDocVariadicType(node);
-                case 174 /* FunctionType */:
-                case 175 /* ConstructorType */:
-                case 177 /* TypeLiteral */:
-                case 312 /* JSDocTypeLiteral */:
-                case 308 /* JSDocFunctionType */:
-                case 313 /* JSDocSignature */:
+                case 175 /* FunctionType */:
+                case 176 /* ConstructorType */:
+                case 178 /* TypeLiteral */:
+                case 314 /* JSDocTypeLiteral */:
+                case 309 /* JSDocFunctionType */:
+                case 315 /* JSDocSignature */:
                     return getTypeFromTypeLiteralOrFunctionOrConstructorTypeNode(node);
-                case 188 /* TypeOperator */:
+                case 189 /* TypeOperator */:
                     return getTypeFromTypeOperatorNode(node);
-                case 189 /* IndexedAccessType */:
+                case 190 /* IndexedAccessType */:
                     return getTypeFromIndexedAccessTypeNode(node);
-                case 190 /* MappedType */:
+                case 191 /* MappedType */:
                     return getTypeFromMappedTypeNode(node);
-                case 184 /* ConditionalType */:
+                case 185 /* ConditionalType */:
                     return getTypeFromConditionalTypeNode(node);
-                case 185 /* InferType */:
+                case 186 /* InferType */:
                     return getTypeFromInferTypeNode(node);
-                case 193 /* TemplateLiteralType */:
+                case 194 /* TemplateLiteralType */:
                     return getTypeFromTemplateTypeNode(node);
-                case 195 /* ImportType */:
+                case 196 /* 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 157 /* QualifiedName */:
-                case 201 /* PropertyAccessExpression */:
+                case 158 /* QualifiedName */:
+                case 202 /* PropertyAccessExpression */:
                     var symbol = getSymbolAtLocation(node);
                     return symbol ? getDeclaredTypeOfSymbol(symbol) : errorType;
                 default:
@@ -57886,8 +59330,9 @@ var ts;
                     outerTypeParameters = ts.addRange(outerTypeParameters, templateTagParameters);
                 }
                 typeParameters = outerTypeParameters || ts.emptyArray;
-                typeParameters = (target.objectFlags & 4 /* Reference */ || target.symbol.flags & 2048 /* TypeLiteral */) && !target.aliasTypeArguments ?
-                    ts.filter(typeParameters, function (tp) { return isTypeParameterPossiblyReferenced(tp, declaration); }) :
+                var allDeclarations_1 = type.objectFlags & 4 /* Reference */ ? [declaration] : type.symbol.declarations;
+                typeParameters = (target.objectFlags & 4 /* Reference */ || target.symbol.flags & 8192 /* Method */ || target.symbol.flags & 2048 /* TypeLiteral */) && !target.aliasTypeArguments ?
+                    ts.filter(typeParameters, function (tp) { return ts.some(allDeclarations_1, function (d) { return isTypeParameterPossiblyReferenced(tp, d); }); }) :
                     typeParameters;
                 links.outerTypeParameters = typeParameters;
             }
@@ -57917,9 +59362,9 @@ var ts;
             return type;
         }
         function maybeTypeParameterReference(node) {
-            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);
+            return !(node.kind === 158 /* QualifiedName */ ||
+                node.parent.kind === 174 /* TypeReference */ && node.parent.typeArguments && node === node.parent.typeName ||
+                node.parent.kind === 196 /* 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
@@ -57928,22 +59373,25 @@ 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 === 230 /* Block */ || n.kind === 184 /* ConditionalType */ && ts.forEachChild(n.extendsType, containsReference)) {
+                    if (!n || n.kind === 231 /* Block */ || n.kind === 185 /* ConditionalType */ && ts.forEachChild(n.extendsType, containsReference)) {
                         return true;
                     }
                 }
-                return !!ts.forEachChild(node, containsReference);
+                return containsReference(node);
             }
             return true;
             function containsReference(node) {
                 switch (node.kind) {
-                    case 187 /* ThisType */:
+                    case 188 /* 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 176 /* TypeQuery */:
+                    case 177 /* TypeQuery */:
                         return true;
+                    case 166 /* MethodDeclaration */:
+                    case 165 /* MethodSignature */:
+                        return (!node.type && !!node.body) || !!ts.forEachChild(node, containsReference);
                 }
                 return !!ts.forEachChild(node, containsReference);
             }
@@ -58123,6 +59571,9 @@ var ts;
                         var newTypeArguments = instantiateTypes(resolvedTypeArguments, mapper);
                         return newTypeArguments !== resolvedTypeArguments ? createNormalizedTypeReference(type.target, newTypeArguments) : type;
                     }
+                    if (objectFlags & 1024 /* ReverseMapped */) {
+                        return instantiateReverseMappedType(type, mapper);
+                    }
                     return getObjectTypeInstantiation(type, mapper, aliasSymbol, aliasTypeArguments);
                 }
                 return type;
@@ -58172,6 +59623,21 @@ var ts;
             }
             return type;
         }
+        function instantiateReverseMappedType(type, mapper) {
+            var innerMappedType = instantiateType(type.mappedType, mapper);
+            if (!(ts.getObjectFlags(innerMappedType) & 32 /* Mapped */)) {
+                return type;
+            }
+            var innerIndexType = instantiateType(type.constraintType, mapper);
+            if (!(innerIndexType.flags & 4194304 /* Index */)) {
+                return type;
+            }
+            var instantiated = inferTypeForHomomorphicMappedType(instantiateType(type.source, mapper), innerMappedType, innerIndexType);
+            if (instantiated) {
+                return instantiated;
+            }
+            return type; // Nested invocation of `inferTypeForHomomorphicMappedType` or the `source` instantiated into something unmappable
+        }
         function getPermissiveInstantiation(type) {
             return type.flags & (131068 /* Primitive */ | 3 /* AnyOrUnknown */ | 131072 /* Never */) ? type :
                 type.permissiveInstantiation || (type.permissiveInstantiation = instantiateType(type, permissiveMapper));
@@ -58198,35 +59664,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 !== 165 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
+            ts.Debug.assert(node.kind !== 166 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
             switch (node.kind) {
-                case 208 /* FunctionExpression */:
-                case 209 /* ArrowFunction */:
-                case 165 /* MethodDeclaration */:
-                case 251 /* FunctionDeclaration */: // Function declarations can have context when annotated with a jsdoc @type
+                case 209 /* FunctionExpression */:
+                case 210 /* ArrowFunction */:
+                case 166 /* MethodDeclaration */:
+                case 252 /* FunctionDeclaration */: // Function declarations can have context when annotated with a jsdoc @type
                     return isContextSensitiveFunctionLikeDeclaration(node);
-                case 200 /* ObjectLiteralExpression */:
+                case 201 /* ObjectLiteralExpression */:
                     return ts.some(node.properties, isContextSensitive);
-                case 199 /* ArrayLiteralExpression */:
+                case 200 /* ArrayLiteralExpression */:
                     return ts.some(node.elements, isContextSensitive);
-                case 217 /* ConditionalExpression */:
+                case 218 /* ConditionalExpression */:
                     return isContextSensitive(node.whenTrue) ||
                         isContextSensitive(node.whenFalse);
-                case 216 /* BinaryExpression */:
+                case 217 /* BinaryExpression */:
                     return (node.operatorToken.kind === 56 /* BarBarToken */ || node.operatorToken.kind === 60 /* QuestionQuestionToken */) &&
                         (isContextSensitive(node.left) || isContextSensitive(node.right));
-                case 288 /* PropertyAssignment */:
+                case 289 /* PropertyAssignment */:
                     return isContextSensitive(node.initializer);
-                case 207 /* ParenthesizedExpression */:
+                case 208 /* ParenthesizedExpression */:
                     return isContextSensitive(node.expression);
-                case 281 /* JsxAttributes */:
+                case 282 /* JsxAttributes */:
                     return ts.some(node.properties, isContextSensitive) || ts.isJsxOpeningElement(node.parent) && ts.some(node.parent.parent.children, isContextSensitive);
-                case 280 /* JsxAttribute */: {
+                case 281 /* 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 283 /* JsxExpression */: {
+                case 284 /* JsxExpression */: {
                     // It is possible to that node.expression is undefined (e.g <div x={} />)
                     var expression = node.expression;
                     return !!expression && isContextSensitive(expression);
@@ -58245,7 +59711,7 @@ var ts;
                 if (ts.some(node.parameters, function (p) { return !ts.getEffectiveTypeAnnotationNode(p); })) {
                     return true;
                 }
-                if (node.kind !== 209 /* ArrowFunction */) {
+                if (node.kind !== 210 /* 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);
@@ -58258,7 +59724,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 !== 230 /* Block */ && isContextSensitive(node.body);
+            return !node.typeParameters && !ts.getEffectiveReturnTypeNode(node) && !!node.body && node.body.kind !== 231 /* Block */ && isContextSensitive(node.body);
         }
         function isContextSensitiveFunctionOrObjectLiteralMethod(func) {
             return (ts.isInJSFile(func) && ts.isFunctionDeclaration(func) || isFunctionExpressionOrArrowFunction(func) || ts.isObjectLiteralMethod(func)) &&
@@ -58361,23 +59827,23 @@ var ts;
                 return true;
             }
             switch (node.kind) {
-                case 283 /* JsxExpression */:
-                case 207 /* ParenthesizedExpression */:
+                case 284 /* JsxExpression */:
+                case 208 /* ParenthesizedExpression */:
                     return elaborateError(node.expression, source, target, relation, headMessage, containingMessageChain, errorOutputContainer);
-                case 216 /* BinaryExpression */:
+                case 217 /* BinaryExpression */:
                     switch (node.operatorToken.kind) {
                         case 62 /* EqualsToken */:
                         case 27 /* CommaToken */:
                             return elaborateError(node.right, source, target, relation, headMessage, containingMessageChain, errorOutputContainer);
                     }
                     break;
-                case 200 /* ObjectLiteralExpression */:
+                case 201 /* ObjectLiteralExpression */:
                     return elaborateObjectLiteral(node, source, target, relation, containingMessageChain, errorOutputContainer);
-                case 199 /* ArrayLiteralExpression */:
+                case 200 /* ArrayLiteralExpression */:
                     return elaborateArrayLiteral(node, source, target, relation, containingMessageChain, errorOutputContainer);
-                case 281 /* JsxAttributes */:
+                case 282 /* JsxAttributes */:
                     return elaborateJsxComponents(node, source, target, relation, containingMessageChain, errorOutputContainer);
-                case 209 /* ArrowFunction */:
+                case 210 /* ArrowFunction */:
                     return elaborateArrowFunction(node, source, target, relation, containingMessageChain, errorOutputContainer);
             }
             return false;
@@ -58577,7 +60043,7 @@ var ts;
         }
         function getElaborationElementForJsxChild(child, nameType, getInvalidTextDiagnostic) {
             switch (child.kind) {
-                case 283 /* JsxExpression */:
+                case 284 /* JsxExpression */:
                     // child is of the type of the expression
                     return { errorNode: child, innerExpression: child.expression, nameType: nameType };
                 case 11 /* JsxText */:
@@ -58586,9 +60052,9 @@ var ts;
                     }
                     // child is a string
                     return { errorNode: child, innerExpression: undefined, nameType: nameType, errorMessage: getInvalidTextDiagnostic() };
-                case 273 /* JsxElement */:
-                case 274 /* JsxSelfClosingElement */:
-                case 277 /* JsxFragment */:
+                case 274 /* JsxElement */:
+                case 275 /* JsxSelfClosingElement */:
+                case 278 /* JsxFragment */:
                     // child is of type JSX.Element
                     return { errorNode: child, innerExpression: child, nameType: nameType };
                 default:
@@ -58736,11 +60202,11 @@ var ts;
                         }
                         _b = prop.kind;
                         switch (_b) {
-                            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];
+                            case 169 /* SetAccessor */: return [3 /*break*/, 2];
+                            case 168 /* GetAccessor */: return [3 /*break*/, 2];
+                            case 166 /* MethodDeclaration */: return [3 /*break*/, 2];
+                            case 290 /* ShorthandPropertyAssignment */: return [3 /*break*/, 2];
+                            case 289 /* PropertyAssignment */: return [3 /*break*/, 4];
                         }
                         return [3 /*break*/, 6];
                     case 2: return [4 /*yield*/, { errorNode: prop.name, innerExpression: undefined, nameType: type }];
@@ -58817,8 +60283,8 @@ var ts;
                 return 0 /* False */;
             }
             var kind = target.declaration ? target.declaration.kind : 0 /* Unknown */;
-            var strictVariance = !(checkMode & 3 /* Callback */) && strictFunctionTypes && kind !== 165 /* MethodDeclaration */ &&
-                kind !== 164 /* MethodSignature */ && kind !== 166 /* Constructor */;
+            var strictVariance = !(checkMode & 3 /* Callback */) && strictFunctionTypes && kind !== 166 /* MethodDeclaration */ &&
+                kind !== 165 /* MethodSignature */ && kind !== 167 /* Constructor */;
             var result = -1 /* True */;
             var sourceThisType = getThisTypeOfSignature(source);
             if (sourceThisType && sourceThisType !== voidType) {
@@ -59051,7 +60517,7 @@ var ts;
                 // Type number or any numeric literal type is assignable to any numeric enum type or any
                 // numeric enum literal type. This rule exists for backwards compatibility reasons because
                 // bit-flag enum types sometimes look like literal enum types with numeric literal values.
-                if (s & (8 /* Number */ | 256 /* NumberLiteral */) && !(s & 1024 /* EnumLiteral */) && (t & 32 /* Enum */ || t & 256 /* NumberLiteral */ && t & 1024 /* EnumLiteral */))
+                if (s & (8 /* Number */ | 256 /* NumberLiteral */) && !(s & 1024 /* EnumLiteral */) && (t & 32 /* Enum */ || relation === assignableRelation && t & 256 /* NumberLiteral */ && t & 1024 /* EnumLiteral */))
                     return true;
             }
             return false;
@@ -59088,7 +60554,7 @@ var ts;
             return false;
         }
         function isIgnoredJsxProperty(source, sourceProp) {
-            return ts.getObjectFlags(source) & 4096 /* JsxAttributes */ && !isUnhyphenatedJsxName(sourceProp.escapedName);
+            return ts.getObjectFlags(source) & 2048 /* JsxAttributes */ && !isUnhyphenatedJsxName(sourceProp.escapedName);
         }
         function getNormalizedType(type, writing) {
             while (true) {
@@ -59098,6 +60564,7 @@ var ts;
                             type.flags & 33554432 /* Substitution */ ? writing ? type.baseType : type.substitute :
                                 type.flags & 25165824 /* Simplifiable */ ? getSimplifiedType(type, writing) :
                                     type;
+                t = getSingleBaseForNonAugmentingSubtype(t) || t;
                 if (t === type)
                     break;
                 type = t;
@@ -59271,6 +60738,14 @@ var ts;
                             }
                             break;
                         }
+                        case ts.Diagnostics.Type_at_position_0_in_source_is_not_compatible_with_type_at_position_1_in_target.code: {
+                            secondaryRootErrors.unshift([ts.Diagnostics.Type_at_position_0_in_source_is_not_compatible_with_type_at_position_1_in_target, args[0], args[1]]);
+                            break;
+                        }
+                        case ts.Diagnostics.Type_at_positions_0_through_1_in_source_is_not_compatible_with_type_at_position_2_in_target.code: {
+                            secondaryRootErrors.unshift([ts.Diagnostics.Type_at_positions_0_through_1_in_source_is_not_compatible_with_type_at_position_2_in_target, args[0], args[1], args[2]]);
+                            break;
+                        }
                         default:
                             return ts.Debug.fail("Unhandled Diagnostic: " + msg.code);
                     }
@@ -59331,6 +60806,7 @@ var ts;
                         reportError(ts.Diagnostics._0_is_assignable_to_the_constraint_of_type_1_but_1_could_be_instantiated_with_a_different_subtype_of_constraint_2, needsOriginalSource ? sourceType : generalizedSourceType, targetType, typeToString(constraint));
                     }
                     else {
+                        errorInfo = undefined;
                         reportError(ts.Diagnostics._0_could_be_instantiated_with_an_arbitrary_type_which_could_be_unrelated_to_1, targetType, generalizedSourceType);
                     }
                 }
@@ -59406,7 +60882,7 @@ var ts;
                     if (isSimpleTypeRelatedTo(originalSource, originalTarget, relation, reportErrors ? reportError : undefined)) {
                         return -1 /* True */;
                     }
-                    reportErrorResults(originalSource, originalTarget, 0 /* False */, !!(ts.getObjectFlags(originalSource) & 4096 /* JsxAttributes */));
+                    reportErrorResults(originalSource, originalTarget, 0 /* False */, !!(ts.getObjectFlags(originalSource) & 2048 /* JsxAttributes */));
                     return 0 /* False */;
                 }
                 // Normalize the source and target types: Turn fresh literal types into regular literal types,
@@ -59441,16 +60917,16 @@ var ts;
                     target.types.length <= 3 && maybeTypeOfKind(target, 98304 /* Nullable */)) {
                     var nullStrippedTarget = extractTypesOfKind(target, ~98304 /* Nullable */);
                     if (!(nullStrippedTarget.flags & (1048576 /* Union */ | 131072 /* Never */))) {
-                        if (source === nullStrippedTarget)
-                            return -1 /* True */;
-                        target = nullStrippedTarget;
+                        target = getNormalizedType(nullStrippedTarget, /*writing*/ true);
                     }
+                    if (source === nullStrippedTarget)
+                        return -1 /* True */;
                 }
                 if (relation === comparableRelation && !(target.flags & 131072 /* Never */) && isSimpleTypeRelatedTo(target, source, relation) ||
                     isSimpleTypeRelatedTo(source, target, relation, reportErrors ? reportError : undefined))
                     return -1 /* True */;
-                var isComparingJsxAttributes = !!(ts.getObjectFlags(source) & 4096 /* JsxAttributes */);
-                var isPerformingExcessPropertyChecks = !(intersectionState & 2 /* Target */) && (isObjectLiteralType(source) && ts.getObjectFlags(source) & 32768 /* FreshLiteral */);
+                var isComparingJsxAttributes = !!(ts.getObjectFlags(source) & 2048 /* JsxAttributes */);
+                var isPerformingExcessPropertyChecks = !(intersectionState & 2 /* Target */) && (isObjectLiteralType(source) && ts.getObjectFlags(source) & 16384 /* FreshLiteral */);
                 if (isPerformingExcessPropertyChecks) {
                     if (hasExcessProperties(source, target, reportErrors)) {
                         if (reportErrors) {
@@ -59535,7 +61011,7 @@ var ts;
                 // We suppress recursive intersection property checks because they can generate lots of work when relating
                 // recursive intersections that are structurally similar but not exactly identical. See #37854.
                 if (result && !inPropertyCheck && (target.flags & 2097152 /* Intersection */ && (isPerformingExcessPropertyChecks || isPerformingCommonPropertyChecks) ||
-                    isNonGenericObjectType(target) && !isArrayType(target) && !isTupleType(target) && source.flags & 2097152 /* Intersection */ && getApparentType(source).flags & 3670016 /* StructuredType */ && !ts.some(source.types, function (t) { return !!(ts.getObjectFlags(t) & 2097152 /* NonInferrableType */); }))) {
+                    isNonGenericObjectType(target) && !isArrayType(target) && !isTupleType(target) && source.flags & 2097152 /* Intersection */ && getApparentType(source).flags & 3670016 /* StructuredType */ && !ts.some(source.types, function (t) { return !!(ts.getObjectFlags(t) & 524288 /* NonInferrableType */); }))) {
                     inPropertyCheck = true;
                     result &= recursiveTypeRelatedTo(source, target, reportErrors, 4 /* PropertyCheck */);
                     inPropertyCheck = false;
@@ -59544,8 +61020,10 @@ var ts;
                 return result;
                 function reportErrorResults(source, target, result, isComparingJsxAttributes) {
                     if (!result && reportErrors) {
-                        source = originalSource.aliasSymbol ? originalSource : source;
-                        target = originalTarget.aliasSymbol ? originalTarget : target;
+                        var sourceHasBase = !!getSingleBaseForNonAugmentingSubtype(originalSource);
+                        var targetHasBase = !!getSingleBaseForNonAugmentingSubtype(originalTarget);
+                        source = (originalSource.aliasSymbol || sourceHasBase) ? originalSource : source;
+                        target = (originalTarget.aliasSymbol || targetHasBase) ? originalTarget : target;
                         var maybeSuppress = overrideNextErrorInfo > 0;
                         if (maybeSuppress) {
                             overrideNextErrorInfo--;
@@ -59592,7 +61070,7 @@ var ts;
                 if ((source.flags & 3145728 /* UnionOrIntersection */) && (target.flags & 3145728 /* UnionOrIntersection */)) {
                     var sourceUnionOrIntersection = source;
                     var targetUnionOrIntersection = target;
-                    if (sourceUnionOrIntersection.objectFlags & targetUnionOrIntersection.objectFlags & 262144 /* PrimitiveUnion */) {
+                    if (sourceUnionOrIntersection.objectFlags & targetUnionOrIntersection.objectFlags & 65536 /* PrimitiveUnion */) {
                         // There's a fast path for comparing primitive unions
                         return;
                     }
@@ -59617,11 +61095,11 @@ var ts;
                 }
                 traceUnionsOrIntersectionsTooLarge(source, target);
                 if (flags & 3145728 /* UnionOrIntersection */) {
-                    var result_6 = eachTypeRelatedToSomeType(source, target);
-                    if (result_6) {
-                        result_6 &= eachTypeRelatedToSomeType(target, source);
+                    var result_7 = eachTypeRelatedToSomeType(source, target);
+                    if (result_7) {
+                        result_7 &= eachTypeRelatedToSomeType(target, source);
                     }
-                    return result_6;
+                    return result_7;
                 }
                 return recursiveTypeRelatedTo(source, target, /*reportErrors*/ false, 0 /* None */);
             }
@@ -59635,10 +61113,11 @@ var ts;
                 return getUnionType(ts.reduceLeft(types, appendPropType, /*initial*/ undefined) || ts.emptyArray);
             }
             function hasExcessProperties(source, target, reportErrors) {
-                if (!isExcessPropertyCheckTarget(target) || !noImplicitAny && ts.getObjectFlags(target) & 16384 /* JSLiteral */) {
+                var _a;
+                if (!isExcessPropertyCheckTarget(target) || !noImplicitAny && ts.getObjectFlags(target) & 8192 /* JSLiteral */) {
                     return false; // Disable excess property checks on JS literals to simulate having an implicit "index signature" - but only outside of noImplicitAny
                 }
-                var isComparingJsxAttributes = !!(ts.getObjectFlags(source) & 4096 /* JsxAttributes */);
+                var isComparingJsxAttributes = !!(ts.getObjectFlags(source) & 2048 /* JsxAttributes */);
                 if ((relation === assignableRelation || relation === comparableRelation) &&
                     (isTypeSubsetOf(globalObjectType, target) || (!isComparingJsxAttributes && isEmptyObjectType(target)))) {
                     return false;
@@ -59681,7 +61160,7 @@ var ts;
                                 }
                                 else {
                                     // use the property's value declaration if the property is assigned inside the literal itself
-                                    var objectLiteralDeclaration_1 = source.symbol && ts.firstOrUndefined(source.symbol.declarations);
+                                    var objectLiteralDeclaration_1 = ((_a = source.symbol) === null || _a === void 0 ? void 0 : _a.declarations) && ts.firstOrUndefined(source.symbol.declarations);
                                     var suggestion = void 0;
                                     if (prop.valueDeclaration && ts.findAncestor(prop.valueDeclaration, function (d) { return d === objectLiteralDeclaration_1; }) && ts.getSourceFileOfNode(objectLiteralDeclaration_1) === ts.getSourceFileOfNode(errorNode)) {
                                         var propDeclaration = prop.valueDeclaration;
@@ -59710,8 +61189,8 @@ var ts;
                         }
                     }
                 };
-                for (var _i = 0, _a = getPropertiesOfType(source); _i < _a.length; _i++) {
-                    var prop = _a[_i];
+                for (var _i = 0, _b = getPropertiesOfType(source); _i < _b.length; _i++) {
+                    var prop = _b[_i];
                     var state_5 = _loop_16(prop);
                     if (typeof state_5 === "object")
                         return state_5.value;
@@ -59736,8 +61215,17 @@ var ts;
             }
             function typeRelatedToSomeType(source, target, reportErrors) {
                 var targetTypes = target.types;
-                if (target.flags & 1048576 /* Union */ && containsType(targetTypes, source)) {
-                    return -1 /* True */;
+                if (target.flags & 1048576 /* Union */) {
+                    if (containsType(targetTypes, source)) {
+                        return -1 /* True */;
+                    }
+                    var match = getMatchingUnionConstituentForType(target, source);
+                    if (match) {
+                        var related = isRelatedTo(source, match, /*reportErrors*/ false);
+                        if (related) {
+                            return related;
+                        }
+                    }
                 }
                 for (var _i = 0, targetTypes_1 = targetTypes; _i < targetTypes_1.length; _i++) {
                     var type = targetTypes_1[_i];
@@ -59911,9 +61399,16 @@ var ts;
                     targetStack = [];
                 }
                 else {
+                    // generate a key where all type parameter id positions are replaced with unconstrained type parameter ids
+                    // this isn't perfect - nested type references passed as type arguments will muck up the indexes and thus
+                    // prevent finding matches- but it should hit up the common cases
+                    var broadestEquivalentId = id.split(",").map(function (i) { return i.replace(/-\d+/g, function (_match, offset) {
+                        var index = ts.length(id.slice(0, offset).match(/[-=]/g) || undefined);
+                        return "=" + index;
+                    }); }).join(",");
                     for (var i = 0; i < maybeCount; i++) {
                         // If source and target are already being compared, consider them related with assumptions
-                        if (id === maybeKeys[i]) {
+                        if (id === maybeKeys[i] || broadestEquivalentId === maybeKeys[i]) {
                             return 3 /* Maybe */;
                         }
                     }
@@ -60002,8 +61497,21 @@ var ts;
                     if (target.flags & 2097152 /* Intersection */) {
                         return typeRelatedToEachType(getRegularTypeOfObjectLiteral(source), target, reportErrors, 2 /* Target */);
                     }
-                    // Source is an intersection. Check to see if any constituents of the intersection are immediately related
-                    // to the target.
+                    // Source is an intersection. For the comparable relation, if the target is a primitive type we hoist the
+                    // constraints of all non-primitive types in the source into a new intersection. We do this because the
+                    // intersection may further constrain the constraints of the non-primitive types. For example, given a type
+                    // parameter 'T extends 1 | 2', the intersection 'T & 1' should be reduced to '1' such that it doesn't
+                    // appear to be comparable to '2'.
+                    if (relation === comparableRelation && target.flags & 131068 /* Primitive */) {
+                        var constraints = ts.sameMap(source.types, function (t) { return t.flags & 131068 /* Primitive */ ? t : getBaseConstraintOfType(t) || unknownType; });
+                        if (constraints !== source.types) {
+                            source = getIntersectionType(constraints);
+                            if (!(source.flags & 2097152 /* Intersection */)) {
+                                return isRelatedTo(source, target, /*reportErrors*/ false);
+                            }
+                        }
+                    }
+                    // Check to see if any constituents of the intersection are immediately related to the target.
                     //
                     // Don't report errors though. Checking whether a constituent is related to the source is not actually
                     // useful and leads to some confusing error messages. Instead it is better to let the below checks
@@ -60023,21 +61531,21 @@ var ts;
                     if (flags & 4194304 /* Index */) {
                         return isRelatedTo(source.type, target.type, /*reportErrors*/ false);
                     }
-                    var result_7 = 0 /* False */;
+                    var result_8 = 0 /* False */;
                     if (flags & 8388608 /* IndexedAccess */) {
-                        if (result_7 = isRelatedTo(source.objectType, target.objectType, /*reportErrors*/ false)) {
-                            if (result_7 &= isRelatedTo(source.indexType, target.indexType, /*reportErrors*/ false)) {
-                                return result_7;
+                        if (result_8 = isRelatedTo(source.objectType, target.objectType, /*reportErrors*/ false)) {
+                            if (result_8 &= isRelatedTo(source.indexType, target.indexType, /*reportErrors*/ false)) {
+                                return result_8;
                             }
                         }
                     }
                     if (flags & 16777216 /* Conditional */) {
                         if (source.root.isDistributive === target.root.isDistributive) {
-                            if (result_7 = isRelatedTo(source.checkType, target.checkType, /*reportErrors*/ false)) {
-                                if (result_7 &= isRelatedTo(source.extendsType, target.extendsType, /*reportErrors*/ false)) {
-                                    if (result_7 &= isRelatedTo(getTrueTypeFromConditionalType(source), getTrueTypeFromConditionalType(target), /*reportErrors*/ false)) {
-                                        if (result_7 &= isRelatedTo(getFalseTypeFromConditionalType(source), getFalseTypeFromConditionalType(target), /*reportErrors*/ false)) {
-                                            return result_7;
+                            if (result_8 = isRelatedTo(source.checkType, target.checkType, /*reportErrors*/ false)) {
+                                if (result_8 &= isRelatedTo(source.extendsType, target.extendsType, /*reportErrors*/ false)) {
+                                    if (result_8 &= isRelatedTo(getTrueTypeFromConditionalType(source), getTrueTypeFromConditionalType(target), /*reportErrors*/ false)) {
+                                        if (result_8 &= isRelatedTo(getFalseTypeFromConditionalType(source), getFalseTypeFromConditionalType(target), /*reportErrors*/ false)) {
+                                            return result_8;
                                         }
                                     }
                                 }
@@ -60117,6 +61625,20 @@ var ts;
                     }
                 }
                 else if (target.flags & 8388608 /* IndexedAccess */) {
+                    if (source.flags & 8388608 /* IndexedAccess */) {
+                        // Relate components directly before falling back to constraint relationships
+                        // A type S[K] is related to a type T[J] if S is related to T and K is related to J.
+                        if (result = isRelatedTo(source.objectType, target.objectType, reportErrors)) {
+                            result &= isRelatedTo(source.indexType, target.indexType, reportErrors);
+                        }
+                        if (result) {
+                            resetErrorInfo(saveErrorInfo);
+                            return result;
+                        }
+                        if (reportErrors) {
+                            originalErrorInfo = errorInfo;
+                        }
+                    }
                     // A type S is related to a type T[K] if S is related to C, where C is the base
                     // constraint of T[K] for writing.
                     if (relation === assignableRelation || relation === comparableRelation) {
@@ -60127,11 +61649,24 @@ var ts;
                         if (!isGenericObjectType(baseObjectType) && !isGenericIndexType(baseIndexType)) {
                             var accessFlags = 2 /* Writing */ | (baseObjectType !== objectType ? 1 /* NoIndexSignatures */ : 0);
                             var constraint = getIndexedAccessTypeOrUndefined(baseObjectType, baseIndexType, target.noUncheckedIndexedAccessCandidate, /*accessNode*/ undefined, accessFlags);
-                            if (constraint && (result = isRelatedTo(source, constraint, reportErrors))) {
-                                return result;
+                            if (constraint) {
+                                if (reportErrors && originalErrorInfo) {
+                                    // create a new chain for the constraint error
+                                    resetErrorInfo(saveErrorInfo);
+                                }
+                                if (result = isRelatedTo(source, constraint, reportErrors)) {
+                                    return result;
+                                }
+                                // prefer the shorter chain of the constraint comparison chain, and the direct comparison chain
+                                if (reportErrors && originalErrorInfo && errorInfo) {
+                                    errorInfo = countMessageChainBreadth([originalErrorInfo]) <= countMessageChainBreadth([errorInfo]) ? originalErrorInfo : errorInfo;
+                                }
                             }
                         }
                     }
+                    if (reportErrors) {
+                        originalErrorInfo = undefined;
+                    }
                 }
                 else if (isGenericMappedType(target) && !target.declaration.nameType) {
                     // A source type T is related to a target type { [P in X]: T[P] }
@@ -60175,27 +61710,48 @@ 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 */;
-                        }
+                else if (target.flags & 16777216 /* Conditional */) {
+                    var c = target;
+                    // Check if the conditional is always true or always false but still deferred for distribution purposes
+                    var skipTrue = !isTypeAssignableTo(getPermissiveInstantiation(c.checkType), getPermissiveInstantiation(c.extendsType));
+                    var skipFalse = !skipTrue && isConditionalTypeAlwaysTrueDisregardingInferTypes(c);
+                    // Instantiate with a replacement mapper if the conditional is distributive, replacing the check type with a clone of itself,
+                    // this way {x: string | number, y: string | number} -> (T extends T ? { x: T, y: T } : never) appropriately _fails_ when
+                    // T = string | number (since that will end up distributing and producing `{x: string, y: string} | {x: number, y: number}`,
+                    // to which `{x: string | number, y: string | number}` isn't assignable)
+                    var distributionMapper = void 0;
+                    var checkVar = getActualTypeVariable(c.root.checkType);
+                    if (c.root.isDistributive && checkVar.flags & 262144 /* TypeParameter */) {
+                        var newParam = cloneTypeParameter(checkVar);
+                        distributionMapper = prependTypeMapping(checkVar, newParam, c.mapper);
+                        newParam.mapper = distributionMapper;
+                    }
+                    // TODO: Find a nice way to include potential conditional type breakdowns in error output, if they seem good (they usually don't)
+                    var localResult = void 0;
+                    if (skipTrue || (localResult = isRelatedTo(source, distributionMapper ? instantiateType(getTypeFromTypeNode(c.root.node.trueType), distributionMapper) : getTrueTypeFromConditionalType(c), /*reportErrors*/ false))) {
+                        if (!skipFalse) {
+                            localResult = (localResult || 3 /* Maybe */) & isRelatedTo(source, distributionMapper ? instantiateType(getTypeFromTypeNode(c.root.node.falseType), distributionMapper) : getFalseTypeFromConditionalType(c), /*reportErrors*/ false);
+                        }
+                    }
+                    if (localResult) {
+                        resetErrorInfo(saveErrorInfo);
+                        return localResult;
                     }
                 }
-                if (source.flags & 8650752 /* TypeVariable */) {
-                    if (source.flags & 8388608 /* IndexedAccess */ && target.flags & 8388608 /* IndexedAccess */) {
-                        // A type S[K] is related to a type T[J] if S is related to T and K is related to J.
-                        if (result = isRelatedTo(source.objectType, target.objectType, reportErrors)) {
-                            result &= isRelatedTo(source.indexType, target.indexType, reportErrors);
-                        }
-                        if (result) {
-                            resetErrorInfo(saveErrorInfo);
-                            return result;
-                        }
+                else if (target.flags & 134217728 /* TemplateLiteral */) {
+                    if (source.flags & 134217728 /* TemplateLiteral */) {
+                        // Report unreliable variance for type variables referenced in template literal type placeholders.
+                        // For example, `foo-${number}` is related to `foo-${string}` even though number isn't related to string.
+                        instantiateType(source, makeFunctionTypeMapper(reportUnreliableMarkers));
                     }
-                    else {
+                    var result_9 = inferTypesFromTemplateLiteralType(source, target);
+                    if (result_9 && ts.every(result_9, function (r, i) { return isValidTypeForTemplateLiteralPlaceholder(r, target.types[i]); })) {
+                        return -1 /* True */;
+                    }
+                }
+                if (source.flags & 8650752 /* TypeVariable */) {
+                    // IndexedAccess comparisons are handled above in the `target.flags & TypeFlage.IndexedAccess` branch
+                    if (!(source.flags & 8388608 /* IndexedAccess */ && target.flags & 8388608 /* IndexedAccess */)) {
                         var constraint = getConstraintOfType(source);
                         if (!constraint || (source.flags & 262144 /* TypeParameter */ && constraint.flags & 1 /* Any */)) {
                             // A type variable with no constraint is not related to the non-primitive object type.
@@ -60210,7 +61766,7 @@ var ts;
                             return result;
                         }
                         // slower, fuller, this-instantiated check (necessary when comparing raw `this` types from base classes), see `subclassWithPolymorphicThisIsAssignable.ts` test for example
-                        else if (result = isRelatedTo(getTypeWithThisArgument(constraint, source), target, reportErrors, /*headMessage*/ undefined, intersectionState)) {
+                        else if (result = isRelatedTo(getTypeWithThisArgument(constraint, source), target, reportErrors && !(target.flags & source.flags & 262144 /* TypeParameter */), /*headMessage*/ undefined, intersectionState)) {
                             resetErrorInfo(saveErrorInfo);
                             return result;
                         }
@@ -60223,17 +61779,13 @@ var ts;
                     }
                 }
                 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;
+                    if (!(target.flags & 134217728 /* TemplateLiteral */)) {
+                        var baseConstraint = getBaseConstraintOfType(source);
+                        var constraint = baseConstraint && baseConstraint !== source ? baseConstraint : stringType;
+                        if (result = isRelatedTo(constraint, target, reportErrors)) {
+                            resetErrorInfo(saveErrorInfo);
+                            return result;
+                        }
                     }
                 }
                 else if (source.flags & 268435456 /* StringMapping */) {
@@ -60262,7 +61814,7 @@ var ts;
                         if (sourceParams) {
                             // If the source has infer type parameters, we instantiate them in the context of the target
                             var ctx = createInferenceContext(sourceParams, /*signature*/ undefined, 0 /* None */, isRelatedTo);
-                            inferTypes(ctx.inferences, target.extendsType, sourceExtends, 256 /* NoConstraints */ | 512 /* AlwaysStrict */);
+                            inferTypes(ctx.inferences, target.extendsType, sourceExtends, 512 /* NoConstraints */ | 1024 /* AlwaysStrict */);
                             sourceExtends = instantiateType(sourceExtends, ctx.mapper);
                             mapper = ctx.mapper;
                         }
@@ -60320,7 +61872,7 @@ var ts;
                         return 0 /* False */;
                     }
                     if (ts.getObjectFlags(source) & 4 /* Reference */ && ts.getObjectFlags(target) & 4 /* Reference */ && source.target === target.target &&
-                        !(ts.getObjectFlags(source) & 8192 /* MarkerType */ || ts.getObjectFlags(target) & 8192 /* MarkerType */)) {
+                        !(ts.getObjectFlags(source) & 4096 /* MarkerType */ || ts.getObjectFlags(target) & 4096 /* MarkerType */)) {
                         // We have type references to the same generic type, and the type references are not marker
                         // type references (which are intended by be compared structurally). Obtain the variance
                         // information for the type parameters and relate the type arguments accordingly.
@@ -60348,7 +61900,7 @@ var ts;
                     }
                     // Consider a fresh empty object literal type "closed" under the subtype relationship - this way `{} <- {[idx: string]: any} <- fresh({})`
                     // and not `{} <- fresh({}) <- {[idx: string]: any}`
-                    else if ((relation === subtypeRelation || relation === strictSubtypeRelation) && isEmptyObjectType(target) && ts.getObjectFlags(target) & 32768 /* FreshLiteral */ && !isEmptyObjectType(source)) {
+                    else if ((relation === subtypeRelation || relation === strictSubtypeRelation) && isEmptyObjectType(target) && ts.getObjectFlags(target) & 16384 /* FreshLiteral */ && !isEmptyObjectType(source)) {
                         return 0 /* False */;
                     }
                     // Even if relationship doesn't hold for unions, intersections, or generic type references,
@@ -60386,14 +61938,19 @@ 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_9 = typeRelatedToDiscriminatedType(source, objectOnlyTarget);
-                            if (result_9) {
-                                return result_9;
+                            var result_10 = typeRelatedToDiscriminatedType(source, objectOnlyTarget);
+                            if (result_10) {
+                                return result_10;
                             }
                         }
                     }
                 }
                 return 0 /* False */;
+                function countMessageChainBreadth(info) {
+                    if (!info)
+                        return 0;
+                    return ts.reduceLeft(info, function (value, chain) { return value + 1 + countMessageChainBreadth(chain.next); }, 0);
+                }
                 function relateVariances(sourceTypeArguments, targetTypeArguments, variances, intersectionState) {
                     if (result = typeArgumentsRelatedTo(sourceTypeArguments, targetTypeArguments, variances, reportErrors, intersectionState)) {
                         return result;
@@ -60455,13 +62012,13 @@ var ts;
                 var modifiersRelated = relation === comparableRelation || (relation === identityRelation ? getMappedTypeModifiers(source) === getMappedTypeModifiers(target) :
                     getCombinedMappedTypeOptionality(source) <= getCombinedMappedTypeOptionality(target));
                 if (modifiersRelated) {
-                    var result_10;
+                    var result_11;
                     var targetConstraint = getConstraintTypeFromMappedType(target);
                     var sourceConstraint = instantiateType(getConstraintTypeFromMappedType(source), makeFunctionTypeMapper(getCombinedMappedTypeOptionality(source) < 0 ? reportUnmeasurableMarkers : reportUnreliableMarkers));
-                    if (result_10 = isRelatedTo(targetConstraint, sourceConstraint, reportErrors)) {
+                    if (result_11 = isRelatedTo(targetConstraint, sourceConstraint, reportErrors)) {
                         var mapper = createTypeMapper([getTypeParameterFromMappedType(source)], [getTypeParameterFromMappedType(target)]);
                         if (instantiateType(getNameTypeFromMappedType(source), mapper) === instantiateType(getNameTypeFromMappedType(target), mapper)) {
-                            return result_10 & isRelatedTo(instantiateType(getTemplateTypeFromMappedType(source), mapper), getTemplateTypeFromMappedType(target), reportErrors);
+                            return result_11 & isRelatedTo(instantiateType(getTemplateTypeFromMappedType(source), mapper), getTemplateTypeFromMappedType(target), reportErrors);
                         }
                     }
                 }
@@ -60601,7 +62158,7 @@ var ts;
                     ts.Debug.assertIsDefined(links.deferralParent);
                     ts.Debug.assertIsDefined(links.deferralConstituents);
                     var unionParent = !!(links.deferralParent.flags & 1048576 /* Union */);
-                    var result_11 = unionParent ? 0 /* False */ : -1 /* True */;
+                    var result_12 = 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];
@@ -60611,7 +62168,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_11 &= related;
+                            result_12 &= related;
                         }
                         else {
                             if (related) {
@@ -60619,17 +62176,17 @@ var ts;
                             }
                         }
                     }
-                    if (unionParent && !result_11 && targetIsOptional) {
-                        result_11 = isRelatedTo(source, undefinedType);
+                    if (unionParent && !result_12 && targetIsOptional) {
+                        result_12 = isRelatedTo(source, undefinedType);
                     }
-                    if (unionParent && !result_11 && reportErrors) {
+                    if (unionParent && !result_12 && 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_11;
+                    return result_12;
                 }
                 else {
                     return isRelatedTo(source, addOptionality(getTypeOfSymbol(targetProp), targetIsOptional), reportErrors, /*headMessage*/ undefined, intersectionState);
@@ -60960,7 +62517,7 @@ var ts;
                     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 */)) {
+                        (((_a = targetSignature.declaration) === null || _a === void 0 ? void 0 : _a.kind) === 167 /* Constructor */ || ((_b = sourceSignature.declaration) === null || _b === void 0 ? void 0 : _b.kind) === 167 /* Constructor */)) {
                         var constructSignatureToString = function (signature) {
                             return signatureToString(signature, /*enclosingDeclaration*/ undefined, 262144 /* WriteArrowStyleSignature */, kind);
                         };
@@ -61068,10 +62625,17 @@ var ts;
                     return indexTypesIdenticalTo(source, target, kind);
                 }
                 var targetType = getIndexTypeOfType(target, kind);
-                if (!targetType || targetType.flags & 1 /* Any */ && !sourceIsPrimitive) {
-                    // Index signature of type any permits assignment from everything but primitives
+                if (!targetType) {
                     return -1 /* True */;
                 }
+                if (targetType.flags & 1 /* Any */ && !sourceIsPrimitive) {
+                    // An index signature of type `any` permits assignment from everything but primitives,
+                    // provided that there is also a `string` index signature of type `any`.
+                    var stringIndexType = kind === 0 /* String */ ? targetType : getIndexTypeOfType(target, 0 /* String */);
+                    if (stringIndexType && stringIndexType.flags & 1 /* Any */) {
+                        return -1 /* True */;
+                    }
+                }
                 if (isGenericMappedType(source)) {
                     // A generic mapped type { [P in K]: T } is related to a type with an index signature
                     // { [x: string]: U }, and optionally with an index signature { [x: number]: V },
@@ -61226,7 +62790,7 @@ var ts;
         // type, and flag the result as a marker type reference.
         function getMarkerTypeReference(type, source, target) {
             var result = createTypeReference(type, ts.map(type.typeParameters, function (t) { return t === source ? target : t; }));
-            result.objectFlags |= 8192 /* MarkerType */;
+            result.objectFlags |= 4096 /* MarkerType */;
             return result;
         }
         function getAliasVariances(symbol) {
@@ -61314,7 +62878,7 @@ var ts;
             return !!(ts.getObjectFlags(type) & 4 /* Reference */) && !type.node;
         }
         function isTypeReferenceWithGenericArguments(type) {
-            return isNonDeferredTypeReference(type) && ts.some(getTypeArguments(type), function (t) { return isUnconstrainedTypeParameter(t) || isTypeReferenceWithGenericArguments(t); });
+            return isNonDeferredTypeReference(type) && ts.some(getTypeArguments(type), function (t) { return !!(t.flags & 262144 /* TypeParameter */) || isTypeReferenceWithGenericArguments(t); });
         }
         /**
          * getTypeReferenceId(A<T, number, U>) returns "111=0-12=1"
@@ -61400,8 +62964,8 @@ var ts;
         }
         // Return true if the given class derives from each of the declaring classes of the protected
         // constituents of the given property.
-        function isClassDerivedFromDeclaringClasses(checkClass, prop) {
-            return forEachProperty(prop, function (p) { return ts.getDeclarationModifierFlagsFromSymbol(p) & 16 /* Protected */ ?
+        function isClassDerivedFromDeclaringClasses(checkClass, prop, writing) {
+            return forEachProperty(prop, function (p) { return ts.getDeclarationModifierFlagsFromSymbol(p, writing) & 16 /* Protected */ ?
                 !hasBaseType(checkClass, getDeclaringClass(p)) : false; }) ? undefined : checkClass;
         }
         // Return true if the given type is deeply nested. We consider this to be the case when structural type comparisons
@@ -61419,23 +62983,26 @@ var ts;
         function isDeeplyNestedType(type, stack, depth) {
             if (depth >= 5) {
                 var identity_1 = getRecursionIdentity(type);
-                if (identity_1) {
-                    var count = 0;
-                    for (var i = 0; i < depth; i++) {
-                        if (getRecursionIdentity(stack[i]) === identity_1) {
-                            count++;
-                            if (count >= 5) {
-                                return true;
-                            }
+                var count = 0;
+                for (var i = 0; i < depth; i++) {
+                    if (getRecursionIdentity(stack[i]) === identity_1) {
+                        count++;
+                        if (count >= 5) {
+                            return true;
                         }
                     }
                 }
             }
             return false;
         }
-        // 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.
+        // The recursion identity of a type is an object identity that is shared among multiple instantiations of the type.
+        // We track recursion identities in order to identify deeply nested and possibly infinite type instantiations with
+        // the same origin. For example, when type parameters are in scope in an object type such as { x: T }, all
+        // instantiations of that type have the same recursion identity. The default recursion identity is the object
+        // identity of the type, meaning that every type is unique. Generally, types with constituents that could circularly
+        // reference the type have a recursion identity that differs from the object identity.
         function getRecursionIdentity(type) {
+            // Object and array literals are known not to contain recursive references and don't need a recursion identity.
             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
@@ -61453,6 +63020,9 @@ var ts;
                     return type.target;
                 }
             }
+            if (type.flags & 262144 /* TypeParameter */) {
+                return type.symbol;
+            }
             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 {
@@ -61464,7 +63034,7 @@ var ts;
                 // The root object represents the origin of the conditional type
                 return type.root;
             }
-            return undefined;
+            return type;
         }
         function isPropertyIdenticalTo(sourceProp, targetProp) {
             return compareProperties(sourceProp, targetProp, compareTypesIdentical) !== 0 /* False */;
@@ -61603,6 +63173,9 @@ var ts;
         // of those literal types. Otherwise, return the leftmost type for which no type to the
         // right is a supertype.
         function getSupertypeOrUnion(types) {
+            if (types.length === 1) {
+                return types[0];
+            }
             return literalTypesWithSameBaseType(types) ?
                 getUnionType(types) :
                 ts.reduceLeft(types, function (s, t) { return isTypeSubtypeOf(s, t) ? t : s; });
@@ -61637,9 +63210,32 @@ var ts;
             // or if it is not the undefined or null type and if it is assignable to ReadonlyArray<any>
             return isArrayType(type) || !(type.flags & 98304 /* Nullable */) && isTypeAssignableTo(type, anyReadonlyArrayType);
         }
+        function getSingleBaseForNonAugmentingSubtype(type) {
+            if (!(ts.getObjectFlags(type) & 4 /* Reference */) || !(ts.getObjectFlags(type.target) & 3 /* ClassOrInterface */)) {
+                return undefined;
+            }
+            if (ts.getObjectFlags(type) & 33554432 /* IdenticalBaseTypeCalculated */) {
+                return ts.getObjectFlags(type) & 67108864 /* IdenticalBaseTypeExists */ ? type.cachedEquivalentBaseType : undefined;
+            }
+            type.objectFlags |= 33554432 /* IdenticalBaseTypeCalculated */;
+            var target = type.target;
+            var bases = getBaseTypes(target);
+            if (bases.length !== 1) {
+                return undefined;
+            }
+            if (getMembersOfSymbol(type.symbol).size) {
+                return undefined; // If the interface has any members, they may subtype members in the base, so we should do a full structural comparison
+            }
+            var instantiatedBase = !ts.length(target.typeParameters) ? bases[0] : instantiateType(bases[0], createTypeMapper(target.typeParameters, getTypeArguments(type).slice(0, target.typeParameters.length)));
+            if (ts.length(getTypeArguments(type)) > ts.length(target.typeParameters)) {
+                instantiatedBase = getTypeWithThisArgument(instantiatedBase, ts.last(getTypeArguments(type)));
+            }
+            type.objectFlags |= 67108864 /* IdenticalBaseTypeExists */;
+            return type.cachedEquivalentBaseType = instantiatedBase;
+        }
         function isEmptyArrayLiteralType(type) {
-            var elementType = isArrayType(type) ? getTypeArguments(type)[0] : undefined;
-            return elementType === undefinedWideningType || elementType === implicitNeverType;
+            var elementType = getElementTypeOfArrayType(type);
+            return strictNullChecks ? elementType === implicitNeverType : elementType === undefinedWideningType;
         }
         function isTupleLikeType(type) {
             return isTupleType(type) || !!getPropertyOfType(type, "0");
@@ -61663,6 +63259,13 @@ var ts;
         function isUnitType(type) {
             return !!(type.flags & 109440 /* Unit */);
         }
+        function isUnitLikeType(type) {
+            return type.flags & 2097152 /* Intersection */ ? ts.some(type.types, isUnitType) :
+                !!(type.flags & 109440 /* Unit */);
+        }
+        function extractUnitType(type) {
+            return type.flags & 2097152 /* Intersection */ ? ts.find(type.types, isUnitType) || type : type;
+        }
         function isLiteralType(type) {
             return type.flags & 16 /* Boolean */ ? true :
                 type.flags & 1048576 /* Union */ ? type.flags & 1024 /* EnumLiteral */ ? true : ts.every(type.types, isUnitType) :
@@ -61813,14 +63416,17 @@ var ts;
             return type.flags & 32768 /* Undefined */ ? type : getUnionType([type, undefinedType]);
         }
         function getGlobalNonNullableTypeInstantiation(type) {
+            // First reduce away any constituents that are assignable to 'undefined' or 'null'. This not only eliminates
+            // 'undefined' and 'null', but also higher-order types such as a type parameter 'U extends undefined | null'
+            // that isn't eliminated by a NonNullable<T> instantiation.
+            var reducedType = getTypeWithFacts(type, 2097152 /* NEUndefinedOrNull */);
             if (!deferredGlobalNonNullableTypeAlias) {
                 deferredGlobalNonNullableTypeAlias = getGlobalSymbol("NonNullable", 524288 /* TypeAlias */, /*diagnostic*/ undefined) || unknownSymbol;
             }
-            // Use NonNullable global type alias if available to improve quick info/declaration emit
-            if (deferredGlobalNonNullableTypeAlias !== unknownSymbol) {
-                return getTypeAliasInstantiation(deferredGlobalNonNullableTypeAlias, [type]);
-            }
-            return getTypeWithFacts(type, 2097152 /* NEUndefinedOrNull */); // Type alias unavailable, fall back to non-higher-order behavior
+            // If the NonNullable<T> type is available, return an instantiation. Otherwise just return the reduced type.
+            return deferredGlobalNonNullableTypeAlias !== unknownSymbol ?
+                getTypeAliasInstantiation(deferredGlobalNonNullableTypeAlias, [reducedType]) :
+                reducedType;
         }
         function getNonNullableType(type) {
             return strictNullChecks ? getGlobalNonNullableTypeInstantiation(type) : type;
@@ -61873,7 +63479,7 @@ var ts;
         function isObjectTypeWithInferableIndex(type) {
             return type.flags & 2097152 /* Intersection */ ? ts.every(type.types, isObjectTypeWithInferableIndex) :
                 !!(type.symbol && (type.symbol.flags & (4096 /* ObjectLiteral */ | 2048 /* TypeLiteral */ | 384 /* Enum */ | 512 /* ValueModule */)) !== 0 &&
-                    !typeHasCallOrConstructSignatures(type)) || !!(ts.getObjectFlags(type) & 2048 /* ReverseMapped */ && isObjectTypeWithInferableIndex(type.source));
+                    !typeHasCallOrConstructSignatures(type)) || !!(ts.getObjectFlags(type) & 1024 /* ReverseMapped */ && isObjectTypeWithInferableIndex(type.source));
         }
         function createSymbolWithType(source, type) {
             var symbol = createSymbol(source.flags, source.escapedName, ts.getCheckFlags(source) & 8 /* Readonly */);
@@ -61906,7 +63512,7 @@ var ts;
          * Leave signatures alone since they are not subject to the check.
          */
         function getRegularTypeOfObjectLiteral(type) {
-            if (!(isObjectLiteralType(type) && ts.getObjectFlags(type) & 32768 /* FreshLiteral */)) {
+            if (!(isObjectLiteralType(type) && ts.getObjectFlags(type) & 16384 /* FreshLiteral */)) {
                 return type;
             }
             var regularType = type.regularType;
@@ -61917,7 +63523,7 @@ var ts;
             var members = transformTypeOfMembers(type, getRegularTypeOfObjectLiteral);
             var regularNew = createAnonymousType(resolved.symbol, members, resolved.callSignatures, resolved.constructSignatures, resolved.stringIndexInfo, resolved.numberIndexInfo);
             regularNew.flags = resolved.flags;
-            regularNew.objectFlags |= resolved.objectFlags & ~32768 /* FreshLiteral */;
+            regularNew.objectFlags |= resolved.objectFlags & ~16384 /* FreshLiteral */;
             type.regularType = regularNew;
             return regularNew;
         }
@@ -61947,7 +63553,7 @@ var ts;
                 var names = new ts.Map();
                 for (var _i = 0, _a = getSiblingsOfContext(context); _i < _a.length; _i++) {
                     var t = _a[_i];
-                    if (isObjectLiteralType(t) && !(ts.getObjectFlags(t) & 1024 /* ContainsSpread */)) {
+                    if (isObjectLiteralType(t) && !(ts.getObjectFlags(t) & 4194304 /* ContainsSpread */)) {
                         for (var _b = 0, _c = getPropertiesOfType(t); _b < _c.length; _b++) {
                             var prop = _c[_b];
                             names.set(prop.escapedName, prop);
@@ -61996,14 +63602,14 @@ var ts;
             var stringIndexInfo = getIndexInfoOfType(type, 0 /* String */);
             var numberIndexInfo = getIndexInfoOfType(type, 1 /* Number */);
             var result = createAnonymousType(type.symbol, members, ts.emptyArray, ts.emptyArray, stringIndexInfo && createIndexInfo(getWidenedType(stringIndexInfo.type), stringIndexInfo.isReadonly), numberIndexInfo && createIndexInfo(getWidenedType(numberIndexInfo.type), numberIndexInfo.isReadonly));
-            result.objectFlags |= (ts.getObjectFlags(type) & (16384 /* JSLiteral */ | 2097152 /* NonInferrableType */)); // Retain js literal flag through widening
+            result.objectFlags |= (ts.getObjectFlags(type) & (8192 /* JSLiteral */ | 524288 /* NonInferrableType */)); // Retain js literal flag through widening
             return result;
         }
         function getWidenedType(type) {
             return getWidenedTypeWithContext(type, /*context*/ undefined);
         }
         function getWidenedTypeWithContext(type, context) {
-            if (ts.getObjectFlags(type) & 1572864 /* RequiresWidening */) {
+            if (ts.getObjectFlags(type) & 393216 /* RequiresWidening */) {
                 if (context === undefined && type.widened) {
                     return type.widened;
                 }
@@ -62048,7 +63654,7 @@ var ts;
          */
         function reportWideningErrorsInType(type) {
             var errorReported = false;
-            if (ts.getObjectFlags(type) & 524288 /* ContainsWideningType */) {
+            if (ts.getObjectFlags(type) & 131072 /* ContainsWideningType */) {
                 if (type.flags & 1048576 /* Union */) {
                     if (ts.some(type.types, isEmptyObjectType)) {
                         errorReported = true;
@@ -62074,7 +63680,7 @@ var ts;
                     for (var _d = 0, _e = getPropertiesOfObjectType(type); _d < _e.length; _d++) {
                         var p = _e[_d];
                         var t = getTypeOfSymbol(p);
-                        if (ts.getObjectFlags(t) & 524288 /* ContainsWideningType */) {
+                        if (ts.getObjectFlags(t) & 131072 /* ContainsWideningType */) {
                             if (!reportWideningErrorsInType(t)) {
                                 error(p.valueDeclaration, ts.Diagnostics.Object_literal_s_property_0_implicitly_has_an_1_type, symbolToString(p), typeToString(getWidenedType(t)));
                             }
@@ -62093,12 +63699,12 @@ var ts;
             }
             var diagnostic;
             switch (declaration.kind) {
-                case 216 /* BinaryExpression */:
-                case 163 /* PropertyDeclaration */:
-                case 162 /* PropertySignature */:
+                case 217 /* BinaryExpression */:
+                case 164 /* PropertyDeclaration */:
+                case 163 /* 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 160 /* Parameter */:
+                case 161 /* Parameter */:
                     var param = declaration;
                     if (ts.isIdentifier(param.name) &&
                         (ts.isCallSignatureDeclaration(param.parent) || ts.isMethodSignature(param.parent) || ts.isFunctionTypeNode(param.parent)) &&
@@ -62113,23 +63719,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 198 /* BindingElement */:
+                case 199 /* 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 308 /* JSDocFunctionType */:
+                case 309 /* JSDocFunctionType */:
                     error(declaration, ts.Diagnostics.Function_type_which_lacks_return_type_annotation_implicitly_has_an_0_return_type, typeAsString);
                     return;
-                case 251 /* FunctionDeclaration */:
-                case 165 /* MethodDeclaration */:
-                case 164 /* MethodSignature */:
-                case 167 /* GetAccessor */:
-                case 168 /* SetAccessor */:
-                case 208 /* FunctionExpression */:
-                case 209 /* ArrowFunction */:
+                case 252 /* FunctionDeclaration */:
+                case 166 /* MethodDeclaration */:
+                case 165 /* MethodSignature */:
+                case 168 /* GetAccessor */:
+                case 169 /* SetAccessor */:
+                case 209 /* FunctionExpression */:
+                case 210 /* 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);
@@ -62143,7 +63749,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 190 /* MappedType */:
+                case 191 /* MappedType */:
                     if (noImplicitAny) {
                         error(declaration, ts.Diagnostics.Mapped_object_type_implicitly_has_an_any_template_type);
                     }
@@ -62154,7 +63760,7 @@ var ts;
             errorOrSuggestion(noImplicitAny, declaration, diagnostic, ts.declarationNameToString(ts.getNameOfDeclaration(declaration)), typeAsString);
         }
         function reportErrorsFromWidening(declaration, type, wideningKind) {
-            if (produceDiagnostics && noImplicitAny && ts.getObjectFlags(type) & 524288 /* ContainsWideningType */ && (!wideningKind || !getContextualSignatureForFunctionLikeDeclaration(declaration))) {
+            if (produceDiagnostics && noImplicitAny && ts.getObjectFlags(type) & 131072 /* ContainsWideningType */ && (!wideningKind || !getContextualSignatureForFunctionLikeDeclaration(declaration))) {
                 // Report implicit any error within type if possible, otherwise report error on declaration
                 if (!reportWideningErrorsInType(type)) {
                     reportImplicitAny(declaration, type, wideningKind);
@@ -62270,23 +63876,23 @@ var ts;
         // results for union and intersection types for performance reasons.
         function couldContainTypeVariables(type) {
             var objectFlags = ts.getObjectFlags(type);
-            if (objectFlags & 67108864 /* CouldContainTypeVariablesComputed */) {
-                return !!(objectFlags & 134217728 /* CouldContainTypeVariables */);
+            if (objectFlags & 1048576 /* CouldContainTypeVariablesComputed */) {
+                return !!(objectFlags & 2097152 /* CouldContainTypeVariables */);
             }
             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 */)) ||
+                    objectFlags & (32 /* Mapped */ | 1024 /* ReverseMapped */ | 8388608 /* ObjectRestType */)) ||
                 type.flags & 3145728 /* UnionOrIntersection */ && !(type.flags & 1024 /* EnumLiteral */) && !isNonGenericTopLevelType(type) && ts.some(type.types, couldContainTypeVariables));
             if (type.flags & 3899393 /* ObjectFlagsType */) {
-                type.objectFlags |= 67108864 /* CouldContainTypeVariablesComputed */ | (result ? 134217728 /* CouldContainTypeVariables */ : 0);
+                type.objectFlags |= 1048576 /* CouldContainTypeVariablesComputed */ | (result ? 2097152 /* CouldContainTypeVariables */ : 0);
             }
             return result;
         }
         function isNonGenericTopLevelType(type) {
             if (type.aliasSymbol && !type.aliasTypeArguments) {
-                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"; }));
+                var declaration = ts.getDeclarationOfKind(type.aliasSymbol, 255 /* TypeAliasDeclaration */);
+                return !!(declaration && ts.findAncestor(declaration.parent, function (n) { return n.kind === 298 /* SourceFile */ ? true : n.kind === 257 /* ModuleDeclaration */ ? false : "quit"; }));
             }
             return false;
         }
@@ -62339,7 +63945,7 @@ var ts;
         // literal { a: 123, b: x => true } is marked non-inferable because it contains a context sensitive
         // arrow function, but is considered partially inferable because property 'a' has an inferable type.
         function isPartiallyInferableType(type) {
-            return !(ts.getObjectFlags(type) & 2097152 /* NonInferrableType */) ||
+            return !(ts.getObjectFlags(type) & 524288 /* NonInferrableType */) ||
                 isObjectLiteralType(type) && ts.some(getPropertiesOfType(type), function (prop) { return isPartiallyInferableType(getTypeOfSymbol(prop)); }) ||
                 isTupleType(type) && ts.some(getTypeArguments(type), isPartiallyInferableType);
         }
@@ -62363,14 +63969,18 @@ var ts;
             }
             // For all other object types we infer a new object type where the reverse mapping has been
             // applied to the type of each property.
-            var reversed = createObjectType(2048 /* ReverseMapped */ | 16 /* Anonymous */, /*symbol*/ undefined);
+            var reversed = createObjectType(1024 /* ReverseMapped */ | 16 /* Anonymous */, /*symbol*/ undefined);
             reversed.source = source;
             reversed.mappedType = target;
             reversed.constraintType = constraint;
             return reversed;
         }
         function getTypeOfReverseMappedSymbol(symbol) {
-            return inferReverseMappedType(symbol.propertyType, symbol.mappedType, symbol.constraintType);
+            var links = getSymbolLinks(symbol);
+            if (!links.type) {
+                links.type = inferReverseMappedType(symbol.propertyType, symbol.mappedType, symbol.constraintType);
+            }
+            return links.type;
         }
         function inferReverseMappedType(sourceType, target, constraint) {
             var typeParameter = getIndexedAccessType(constraint.type, getTypeParameterFromMappedType(target));
@@ -62462,51 +64072,113 @@ var ts;
             // * 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)))
+        function isValidTypeForTemplateLiteralPlaceholder(source, target) {
+            if (source === target || target.flags & (1 /* Any */ | 4 /* String */)) {
+                return true;
+            }
+            if (source.flags & 128 /* StringLiteral */) {
+                var value = source.value;
+                return !!(target.flags & 8 /* Number */ && value !== "" && isFinite(+value) ||
+                    target.flags & 64 /* BigInt */ && value !== "" && isValidBigIntString(value) ||
+                    target.flags & (512 /* BooleanLiteral */ | 98304 /* Nullable */) && value === target.intrinsicName);
+            }
+            if (source.flags & 134217728 /* TemplateLiteral */) {
+                var texts = source.texts;
+                return texts.length === 2 && texts[0] === "" && texts[1] === "" && isTypeAssignableTo(source.types[0], target);
+            }
+            return isTypeAssignableTo(source, target);
+        }
+        function inferTypesFromTemplateLiteralType(source, target) {
+            return source.flags & 128 /* StringLiteral */ ? inferFromLiteralPartsToTemplateLiteral([source.value], ts.emptyArray, target) :
+                source.flags & 134217728 /* TemplateLiteral */ ?
+                    ts.arraysEqual(source.texts, target.texts) ? ts.map(source.types, getStringLikeTypeForType) :
+                        inferFromLiteralPartsToTemplateLiteral(source.texts, source.types, target) :
+                    undefined;
+        }
+        function getStringLikeTypeForType(type) {
+            return type.flags & (1 /* Any */ | 402653316 /* StringLike */) ? type : getTemplateLiteralType(["", ""], [type]);
+        }
+        // This function infers from the text parts and type parts of a source literal to a target template literal. The number
+        // of text parts is always one more than the number of type parts, and a source string literal is treated as a source
+        // with one text part and zero type parts. The function returns an array of inferred string or template literal types
+        // corresponding to the placeholders in the target template literal, or undefined if the source doesn't match the target.
+        //
+        // We first check that the starting source text part matches the starting target text part, and that the ending source
+        // text part ends matches the ending target text part. We then iterate through the remaining target text parts, finding
+        // a match for each in the source and inferring string or template literal types created from the segments of the source
+        // that occur between the matches. During this iteration, seg holds the index of the current text part in the sourceTexts
+        // array and pos holds the current character position in the current text part.
+        //
+        // Consider inference from type `<<${string}>.<${number}-${number}>>` to type `<${string}.${string}>`, i.e.
+        //   sourceTexts = ['<<', '>.<', '-', '>>']
+        //   sourceTypes = [string, number, number]
+        //   target.texts = ['<', '.', '>']
+        // We first match '<' in the target to the start of '<<' in the source and '>' in the target to the end of '>>' in
+        // the source. The first match for the '.' in target occurs at character 1 in the source text part at index 1, and thus
+        // the first inference is the template literal type `<${string}>`. The remainder of the source makes up the second
+        // inference, the template literal type `<${number}-${number}>`.
+        function inferFromLiteralPartsToTemplateLiteral(sourceTexts, sourceTypes, target) {
+            var lastSourceIndex = sourceTexts.length - 1;
+            var sourceStartText = sourceTexts[0];
+            var sourceEndText = sourceTexts[lastSourceIndex];
+            var targetTexts = target.texts;
+            var lastTargetIndex = targetTexts.length - 1;
+            var targetStartText = targetTexts[0];
+            var targetEndText = targetTexts[lastTargetIndex];
+            if (lastSourceIndex === 0 && sourceStartText.length < targetStartText.length + targetEndText.length ||
+                !sourceStartText.startsWith(targetStartText) || !sourceEndText.endsWith(targetEndText))
                 return undefined;
+            var remainingEndText = sourceEndText.slice(0, sourceEndText.length - targetEndText.length);
             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)
+            var seg = 0;
+            var pos = targetStartText.length;
+            for (var i = 1; i < lastTargetIndex; i++) {
+                var delim = targetTexts[i];
+                if (delim.length > 0) {
+                    var s = seg;
+                    var p = pos;
+                    while (true) {
+                        p = getSourceText(s).indexOf(delim, p);
+                        if (p >= 0)
+                            break;
+                        s++;
+                        if (s === sourceTexts.length)
+                            return undefined;
+                        p = 0;
+                    }
+                    addMatch(s, p);
+                    pos += delim.length;
+                }
+                else if (pos < getSourceText(seg).length) {
+                    addMatch(seg, pos + 1);
+                }
+                else if (seg < lastSourceIndex) {
+                    addMatch(seg + 1, 0);
+                }
+                else {
                     return undefined;
-                matches.push(getLiteralType(str.slice(pos, delimPos)));
-                pos = delimPos + delim.length;
+                }
             }
-            matches.push(getLiteralType(str.slice(pos)));
+            addMatch(lastSourceIndex, getSourceText(lastSourceIndex).length);
             return matches;
+            function getSourceText(index) {
+                return index < lastSourceIndex ? sourceTexts[index] : remainingEndText;
+            }
+            function addMatch(s, p) {
+                var matchType = s === seg ?
+                    getLiteralType(getSourceText(s).slice(pos, p)) :
+                    getTemplateLiteralType(__spreadArray(__spreadArray([sourceTexts[seg].slice(pos)], sourceTexts.slice(seg + 1, s)), [getSourceText(s).slice(0, p)]), sourceTypes.slice(seg, s));
+                matches.push(matchType);
+                seg = s;
+                pos = p;
+            }
         }
         function inferTypes(inferences, originalSource, originalTarget, priority, contravariant) {
             if (priority === void 0) { priority = 0; }
             if (contravariant === void 0) { contravariant = false; }
             var bivariant = false;
             var propagationType;
-            var inferencePriority = 1024 /* MaxValue */;
+            var inferencePriority = 2048 /* MaxValue */;
             var allowComplexConstraintInference = true;
             var visited;
             var sourceStack;
@@ -62593,8 +64265,8 @@ var ts;
                     // not contain anyFunctionType when we come back to this argument for its second round
                     // of inference. Also, we exclude inferences for silentNeverType (which is used as a wildcard
                     // when constructing types from type parameters that had no inference candidates).
-                    if (ts.getObjectFlags(source) & 2097152 /* NonInferrableType */ || source === nonInferrableAnyType || source === silentNeverType ||
-                        (priority & 64 /* ReturnType */ && (source === autoType || source === autoArrayType)) || isFromInferenceBlockedSource(source)) {
+                    if (ts.getObjectFlags(source) & 524288 /* NonInferrableType */ || source === nonInferrableAnyType || source === silentNeverType ||
+                        (priority & 128 /* ReturnType */ && (source === autoType || source === autoArrayType)) || isFromInferenceBlockedSource(source)) {
                         return;
                     }
                     var inference = getInferenceInfoForType(target);
@@ -62621,7 +64293,7 @@ var ts;
                                     clearCachedInferences(inferences);
                                 }
                             }
-                            if (!(priority & 64 /* ReturnType */) && target.flags & 262144 /* TypeParameter */ && inference.topLevel && !isTypeParameterAtTopLevel(originalTarget, target)) {
+                            if (!(priority & 128 /* ReturnType */) && target.flags & 262144 /* TypeParameter */ && inference.topLevel && !isTypeParameterAtTopLevel(originalTarget, target)) {
                                 inference.topLevel = false;
                                 clearCachedInferences(inferences);
                             }
@@ -62661,7 +64333,7 @@ var ts;
                 else if ((isLiteralType(source) || source.flags & 4 /* String */) && target.flags & 4194304 /* Index */) {
                     var empty = createEmptyObjectTypeFromStringLiteral(source);
                     contravariant = !contravariant;
-                    inferWithPriority(empty, target.type, 128 /* LiteralKeyof */);
+                    inferWithPriority(empty, target.type, 256 /* LiteralKeyof */);
                     contravariant = !contravariant;
                 }
                 else if (source.flags & 8388608 /* IndexedAccess */ && target.flags & 8388608 /* IndexedAccess */) {
@@ -62673,6 +64345,13 @@ var ts;
                         inferFromTypes(source.type, target.type);
                     }
                 }
+                else if (source.flags & 33554432 /* Substitution */) {
+                    inferFromTypes(source.baseType, target);
+                    var oldPriority = priority;
+                    priority |= 4 /* SubstituteSource */;
+                    inferFromTypes(source.substitute, target); // Make substitute inference at a lower priority
+                    priority = oldPriority;
+                }
                 else if (target.flags & 16777216 /* Conditional */) {
                     invokeOnce(source, target, inferToConditionalType);
                 }
@@ -62692,7 +64371,7 @@ var ts;
                 }
                 else {
                     source = getReducedType(source);
-                    if (!(priority & 256 /* NoConstraints */ && source.flags & (2097152 /* Intersection */ | 465829888 /* Instantiable */))) {
+                    if (!(priority & 512 /* 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`
@@ -62730,26 +64409,22 @@ var ts;
                 }
                 (visited || (visited = new ts.Map())).set(key, -1 /* Circularity */);
                 var saveInferencePriority = inferencePriority;
-                inferencePriority = 1024 /* MaxValue */;
+                inferencePriority = 2048 /* MaxValue */;
                 // 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))
+                var sourceIdentity = getRecursionIdentity(source);
+                var targetIdentity = getRecursionIdentity(target);
+                if (ts.contains(sourceStack, sourceIdentity))
                     expandingFlags |= 1 /* Source */;
-                if (targetIdentity && ts.contains(targetStack, targetIdentity))
+                if (ts.contains(targetStack, targetIdentity))
                     expandingFlags |= 2 /* Target */;
                 if (expandingFlags !== 3 /* Both */) {
-                    if (sourceIdentity)
-                        (sourceStack || (sourceStack = [])).push(sourceIdentity);
-                    if (targetIdentity)
-                        (targetStack || (targetStack = [])).push(targetIdentity);
+                    (sourceStack || (sourceStack = [])).push(sourceIdentity);
+                    (targetStack || (targetStack = [])).push(targetIdentity);
                     action(source, target);
-                    if (targetIdentity)
-                        targetStack.pop();
-                    if (sourceIdentity)
-                        sourceStack.pop();
+                    targetStack.pop();
+                    sourceStack.pop();
                 }
                 else {
                     inferencePriority = -1 /* Circularity */;
@@ -62789,7 +64464,7 @@ var ts;
                 }
             }
             function inferFromContravariantTypes(source, target) {
-                if (strictFunctionTypes || priority & 512 /* AlwaysStrict */) {
+                if (strictFunctionTypes || priority & 1024 /* AlwaysStrict */) {
                     contravariant = !contravariant;
                     inferFromTypes(source, target);
                     contravariant = !contravariant;
@@ -62841,7 +64516,7 @@ var ts;
                         else {
                             for (var i = 0; i < sources.length; i++) {
                                 var saveInferencePriority = inferencePriority;
-                                inferencePriority = 1024 /* MaxValue */;
+                                inferencePriority = 2048 /* MaxValue */;
                                 inferFromTypes(sources[i], t);
                                 if (inferencePriority === priority)
                                     matched_1[i] = true;
@@ -62920,9 +64595,9 @@ var ts;
                             // We assign a lower priority to inferences made from types containing non-inferrable
                             // types because we may only have a partial result (i.e. we may have failed to make
                             // reverse inferences for some properties).
-                            inferWithPriority(inferredType, inference.typeParameter, ts.getObjectFlags(source) & 2097152 /* NonInferrableType */ ?
-                                8 /* PartialHomomorphicMappedType */ :
-                                4 /* HomomorphicMappedType */);
+                            inferWithPriority(inferredType, inference.typeParameter, ts.getObjectFlags(source) & 524288 /* NonInferrableType */ ?
+                                16 /* PartialHomomorphicMappedType */ :
+                                8 /* HomomorphicMappedType */);
                         }
                     }
                     return true;
@@ -62930,7 +64605,7 @@ var ts;
                 if (constraintType.flags & 262144 /* TypeParameter */) {
                     // We're inferring from some source type S to a mapped type { [P in K]: X }, where K is a type
                     // parameter. First infer from 'keyof S' to K.
-                    inferWithPriority(getIndexType(source), constraintType, 16 /* MappedTypeConstraint */);
+                    inferWithPriority(getIndexType(source), constraintType, 32 /* MappedTypeConstraint */);
                     // If K is constrained to a type C, also infer to C. Thus, for a mapped type { [P in K]: X },
                     // where K extends keyof T, we make the same inferences as for a homomorphic mapped type
                     // { [P in keyof T]: X }. This enables us to make meaningful inferences when the target is a
@@ -62959,16 +64634,14 @@ var ts;
                 }
                 else {
                     var savePriority = priority;
-                    priority |= contravariant ? 32 /* ContravariantConditional */ : 0;
+                    priority |= contravariant ? 64 /* ContravariantConditional */ : 0;
                     var targetTypes = [getTrueTypeFromConditionalType(target), getFalseTypeFromConditionalType(target)];
                     inferToMultipleTypes(source, targetTypes, target.flags);
                     priority = savePriority;
                 }
             }
             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 matches = inferTypesFromTemplateLiteralType(source, target);
                 var types = target.types;
                 for (var i = 0; i < types.length; i++) {
                     inferFromTypes(matches ? matches[i] : neverType, types[i]);
@@ -63084,7 +64757,7 @@ var ts;
                 var sourceLen = sourceSignatures.length;
                 var targetLen = targetSignatures.length;
                 var len = sourceLen < targetLen ? sourceLen : targetLen;
-                var skipParameters = !!(ts.getObjectFlags(source) & 2097152 /* NonInferrableType */);
+                var skipParameters = !!(ts.getObjectFlags(source) & 524288 /* NonInferrableType */);
                 for (var i = 0; i < len; i++) {
                     inferFromSignature(getBaseSignature(sourceSignatures[sourceLen - len + i]), getErasedSignature(targetSignatures[targetLen - len + i]), skipParameters);
                 }
@@ -63094,7 +64767,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 === 165 /* MethodDeclaration */ || kind === 164 /* MethodSignature */ || kind === 166 /* Constructor */;
+                    bivariant = bivariant || kind === 166 /* MethodDeclaration */ || kind === 165 /* MethodSignature */ || kind === 167 /* Constructor */;
                     applyToParameterTypes(source, target, inferFromContravariantTypes);
                     bivariant = saveBivariant;
                 }
@@ -63135,7 +64808,7 @@ var ts;
             return !!(ts.getObjectFlags(type) & 128 /* ObjectLiteral */);
         }
         function isObjectOrArrayLiteralType(type) {
-            return !!(ts.getObjectFlags(type) & (128 /* ObjectLiteral */ | 65536 /* ArrayLiteral */));
+            return !!(ts.getObjectFlags(type) & (128 /* ObjectLiteral */ | 32768 /* ArrayLiteral */));
         }
         function unionObjectAndArrayLiteralCandidates(candidates) {
             if (candidates.length > 1) {
@@ -63148,7 +64821,7 @@ var ts;
             return candidates;
         }
         function getContravariantInference(inference) {
-            return inference.priority & 208 /* PriorityImpliesCombination */ ? getIntersectionType(inference.contraCandidates) : getCommonSubtype(inference.contraCandidates);
+            return inference.priority & 416 /* PriorityImpliesCombination */ ? getIntersectionType(inference.contraCandidates) : getCommonSubtype(inference.contraCandidates);
         }
         function getCovariantInference(inference, signature) {
             // Extract all object and array literal types and replace them with a single widened and normalized type.
@@ -63165,7 +64838,7 @@ var ts;
                     candidates;
             // If all inferences were made from a position that implies a combined result, infer a union type.
             // Otherwise, infer a common supertype.
-            var unwidenedType = inference.priority & 208 /* PriorityImpliesCombination */ ?
+            var unwidenedType = inference.priority & 416 /* PriorityImpliesCombination */ ?
                 getUnionType(baseCandidates, 2 /* Subtype */) :
                 getCommonSupertype(baseCandidates);
             return getWidenedType(unwidenedType);
@@ -63274,7 +64947,7 @@ var ts;
                 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 === 289 /* ShorthandPropertyAssignment */) {
+                    if (node.parent.kind === 290 /* ShorthandPropertyAssignment */) {
                         return ts.Diagnostics.No_value_exists_in_scope_for_the_shorthand_property_0_Either_declare_one_or_provide_an_initializer;
                     }
                     else {
@@ -63295,26 +64968,24 @@ 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 === 176 /* TypeQuery */ ? true : n.kind === 78 /* Identifier */ || n.kind === 157 /* QualifiedName */ ? false : "quit"; });
+            return !!ts.findAncestor(node, function (n) { return n.kind === 177 /* TypeQuery */ ? true : n.kind === 78 /* Identifier */ || n.kind === 158 /* QualifiedName */ ? false : "quit"; });
         }
         // Return the flow cache key for a "dotted name" (i.e. a sequence of identifiers
         // separated by dots). The key consists of the id of the symbol referenced by the
         // leftmost identifier followed by zero or more property names separated by dots.
-        // The result is undefined if the reference isn't a dotted name. We prefix nodes
-        // occurring in an apparent type position with '@' because the control flow type
-        // of such nodes may be based on the apparent type instead of the declared type.
+        // The result is undefined if the reference isn't a dotted name.
         function getFlowCacheKey(node, declaredType, initialType, flowContainer) {
             switch (node.kind) {
                 case 78 /* Identifier */:
                     var symbol = getResolvedSymbol(node);
-                    return symbol !== unknownSymbol ? (flowContainer ? getNodeId(flowContainer) : "-1") + "|" + getTypeId(declaredType) + "|" + getTypeId(initialType) + "|" + (isConstraintPosition(node) ? "@" : "") + getSymbolId(symbol) : undefined;
+                    return symbol !== unknownSymbol ? (flowContainer ? getNodeId(flowContainer) : "-1") + "|" + getTypeId(declaredType) + "|" + getTypeId(initialType) + "|" + getSymbolId(symbol) : undefined;
                 case 107 /* ThisKeyword */:
                     return "0|" + (flowContainer ? getNodeId(flowContainer) : "-1") + "|" + getTypeId(declaredType) + "|" + getTypeId(initialType);
-                case 225 /* NonNullExpression */:
-                case 207 /* ParenthesizedExpression */:
+                case 226 /* NonNullExpression */:
+                case 208 /* ParenthesizedExpression */:
                     return getFlowCacheKey(node.expression, declaredType, initialType, flowContainer);
-                case 201 /* PropertyAccessExpression */:
-                case 202 /* ElementAccessExpression */:
+                case 202 /* PropertyAccessExpression */:
+                case 203 /* ElementAccessExpression */:
                     var propName = getAccessedPropertyName(node);
                     if (propName !== undefined) {
                         var key = getFlowCacheKey(node.expression, declaredType, initialType, flowContainer);
@@ -63325,36 +64996,40 @@ var ts;
         }
         function isMatchingReference(source, target) {
             switch (target.kind) {
-                case 207 /* ParenthesizedExpression */:
-                case 225 /* NonNullExpression */:
+                case 208 /* ParenthesizedExpression */:
+                case 226 /* NonNullExpression */:
                     return isMatchingReference(source, target.expression);
-                case 216 /* BinaryExpression */:
+                case 217 /* 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 227 /* MetaProperty */:
+                    return target.kind === 227 /* MetaProperty */
+                        && source.keywordToken === target.keywordToken
+                        && source.name.escapedText === target.name.escapedText;
                 case 78 /* Identifier */:
                 case 79 /* PrivateIdentifier */:
                     return target.kind === 78 /* Identifier */ && getResolvedSymbol(source) === getResolvedSymbol(target) ||
-                        (target.kind === 249 /* VariableDeclaration */ || target.kind === 198 /* BindingElement */) &&
+                        (target.kind === 250 /* VariableDeclaration */ || target.kind === 199 /* BindingElement */) &&
                             getExportSymbolOfValueSymbolIfExported(getResolvedSymbol(source)) === getSymbolOfNode(target);
                 case 107 /* ThisKeyword */:
                     return target.kind === 107 /* ThisKeyword */;
                 case 105 /* SuperKeyword */:
                     return target.kind === 105 /* SuperKeyword */;
-                case 225 /* NonNullExpression */:
-                case 207 /* ParenthesizedExpression */:
+                case 226 /* NonNullExpression */:
+                case 208 /* ParenthesizedExpression */:
                     return isMatchingReference(source.expression, target);
-                case 201 /* PropertyAccessExpression */:
-                case 202 /* ElementAccessExpression */:
+                case 202 /* PropertyAccessExpression */:
+                case 203 /* ElementAccessExpression */:
                     return ts.isAccessExpression(target) &&
                         getAccessedPropertyName(source) === getAccessedPropertyName(target) &&
                         isMatchingReference(source.expression, target.expression);
-                case 157 /* QualifiedName */:
+                case 158 /* QualifiedName */:
                     return ts.isAccessExpression(target) &&
                         source.right.escapedText === getAccessedPropertyName(target) &&
                         isMatchingReference(source.left, target.expression);
-                case 216 /* BinaryExpression */:
+                case 217 /* BinaryExpression */:
                     return (ts.isBinaryExpression(source) && source.operatorToken.kind === 27 /* CommaToken */ && isMatchingReference(source.right, target));
             }
             return false;
@@ -63362,11 +65037,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 === 216 /* BinaryExpression */ && target.operatorToken.kind === 55 /* AmpersandAmpersandToken */ &&
+                (target.kind === 217 /* BinaryExpression */ && target.operatorToken.kind === 55 /* AmpersandAmpersandToken */ &&
                     (containsTruthyCheck(source, target.left) || containsTruthyCheck(source, target.right)));
         }
         function getAccessedPropertyName(access) {
-            return access.kind === 201 /* PropertyAccessExpression */ ? access.name.escapedText :
+            return access.kind === 202 /* PropertyAccessExpression */ ? access.name.escapedText :
                 ts.isStringOrNumericLiteralLike(access.argumentExpression) ? ts.escapeLeadingUnderscores(access.argumentExpression.text) :
                     undefined;
         }
@@ -63416,6 +65091,86 @@ var ts;
             }
             return result;
         }
+        // Given a set of constituent types and a property name, create and return a map keyed by the literal
+        // types of the property by that name in each constituent type. No map is returned if some key property
+        // has a non-literal type or if less than 10 or less than 50% of the constituents have a unique key.
+        // Entries with duplicate keys have unknownType as the value.
+        function mapTypesByKeyProperty(types, name) {
+            var map = new ts.Map();
+            var count = 0;
+            var _loop_20 = function (type) {
+                if (type.flags & (524288 /* Object */ | 2097152 /* Intersection */ | 58982400 /* InstantiableNonPrimitive */)) {
+                    var discriminant = getTypeOfPropertyOfType(type, name);
+                    if (discriminant) {
+                        if (!isLiteralType(discriminant)) {
+                            return { value: undefined };
+                        }
+                        var duplicate_1 = false;
+                        forEachType(discriminant, function (t) {
+                            var id = getTypeId(getRegularTypeOfLiteralType(t));
+                            var existing = map.get(id);
+                            if (!existing) {
+                                map.set(id, type);
+                            }
+                            else if (existing !== unknownType) {
+                                map.set(id, unknownType);
+                                duplicate_1 = true;
+                            }
+                        });
+                        if (!duplicate_1)
+                            count++;
+                    }
+                }
+            };
+            for (var _i = 0, types_17 = types; _i < types_17.length; _i++) {
+                var type = types_17[_i];
+                var state_8 = _loop_20(type);
+                if (typeof state_8 === "object")
+                    return state_8.value;
+            }
+            return count >= 10 && count * 2 >= types.length ? map : undefined;
+        }
+        // Return the name of a discriminant property for which it was possible and feasible to construct a map of
+        // constituent types keyed by the literal types of the property by that name in each constituent type.
+        function getKeyPropertyName(unionType) {
+            var types = unionType.types;
+            // We only construct maps for large unions with non-primitive constituents.
+            if (types.length < 10 || ts.getObjectFlags(unionType) & 65536 /* PrimitiveUnion */) {
+                return undefined;
+            }
+            if (unionType.keyPropertyName === undefined) {
+                // The candidate key property name is the name of the first property with a unit type in one of the
+                // constituent types.
+                var keyPropertyName = ts.forEach(types, function (t) {
+                    return t.flags & (524288 /* Object */ | 58982400 /* InstantiableNonPrimitive */) ?
+                        ts.forEach(getPropertiesOfType(t), function (p) { return isUnitType(getTypeOfSymbol(p)) ? p.escapedName : undefined; }) :
+                        undefined;
+                });
+                var mapByKeyProperty = keyPropertyName && mapTypesByKeyProperty(types, keyPropertyName);
+                unionType.keyPropertyName = mapByKeyProperty ? keyPropertyName : "";
+                unionType.constituentMap = mapByKeyProperty;
+            }
+            return unionType.keyPropertyName.length ? unionType.keyPropertyName : undefined;
+        }
+        // Given a union type for which getKeyPropertyName returned a non-undefined result, return the constituent
+        // that corresponds to the given key type for that property name.
+        function getConstituentTypeForKeyType(unionType, keyType) {
+            var _a;
+            var result = (_a = unionType.constituentMap) === null || _a === void 0 ? void 0 : _a.get(getTypeId(getRegularTypeOfLiteralType(keyType)));
+            return result !== unknownType ? result : undefined;
+        }
+        function getMatchingUnionConstituentForType(unionType, type) {
+            var keyPropertyName = getKeyPropertyName(unionType);
+            var propType = keyPropertyName && getTypeOfPropertyOfType(type, keyPropertyName);
+            return propType && getConstituentTypeForKeyType(unionType, propType);
+        }
+        function getMatchingUnionConstituentForObjectLiteral(unionType, node) {
+            var keyPropertyName = getKeyPropertyName(unionType);
+            var propNode = keyPropertyName && ts.find(node.properties, function (p) { return p.symbol && p.kind === 289 /* PropertyAssignment */ &&
+                p.symbol.escapedName === keyPropertyName && isPossiblyDiscriminantValue(p.initializer); });
+            var propType = propNode && getTypeOfExpression(propNode.initializer);
+            return propType && getConstituentTypeForKeyType(unionType, propType);
+        }
         function isOrContainsMatchingReference(source, target) {
             return isMatchingReference(source, target) || containsMatchingReference(source, target);
         }
@@ -63428,7 +65183,7 @@ var ts;
                     }
                 }
             }
-            if (expression.expression.kind === 201 /* PropertyAccessExpression */ &&
+            if (expression.expression.kind === 202 /* PropertyAccessExpression */ &&
                 isOrContainsMatchingReference(reference, expression.expression.expression)) {
                 return true;
             }
@@ -63475,14 +65230,6 @@ var ts;
             }
             return declaredType;
         }
-        function getTypeFactsOfTypes(types) {
-            var result = 0 /* None */;
-            for (var _i = 0, types_17 = types; _i < types_17.length; _i++) {
-                var t = types_17[_i];
-                result |= getTypeFacts(t);
-            }
-            return result;
-        }
         function isFunctionObjectType(type) {
             // We do a quick check for a "bind" property before performing the more expensive subtype
             // check. This gives us a quicker out in the common case where an object type is not a function.
@@ -63490,7 +65237,8 @@ var ts;
             return !!(resolved.callSignatures.length || resolved.constructSignatures.length ||
                 resolved.members.get("bind") && isTypeSubtypeOf(type, globalFunctionType));
         }
-        function getTypeFacts(type) {
+        function getTypeFacts(type, ignoreObjects) {
+            if (ignoreObjects === void 0) { ignoreObjects = false; }
             var flags = type.flags;
             if (flags & 4 /* String */) {
                 return strictNullChecks ? 16317953 /* StringStrictFacts */ : 16776705 /* StringFacts */;
@@ -63527,7 +65275,7 @@ var ts;
                     (type === falseType || type === regularFalseType) ? 12121864 /* FalseStrictFacts */ : 7927560 /* TrueStrictFacts */ :
                     (type === falseType || type === regularFalseType) ? 12580616 /* FalseFacts */ : 16774920 /* TrueFacts */;
             }
-            if (flags & 524288 /* Object */) {
+            if (flags & 524288 /* Object */ && !ignoreObjects) {
                 return ts.getObjectFlags(type) & 16 /* Anonymous */ && isEmptyObjectType(type) ?
                     strictNullChecks ? 16318463 /* EmptyObjectStrictFacts */ : 16777215 /* EmptyObjectFacts */ :
                     isFunctionObjectType(type) ?
@@ -63550,11 +65298,17 @@ var ts;
                 return 0 /* None */;
             }
             if (flags & 465829888 /* Instantiable */) {
-                return !isPatternLiteralType(type) ? getTypeFacts(getBaseConstraintOfType(type) || unknownType) :
+                return !isPatternLiteralType(type) ? getTypeFacts(getBaseConstraintOfType(type) || unknownType, ignoreObjects) :
                     strictNullChecks ? 7929345 /* NonEmptyStringStrictFacts */ : 16776705 /* NonEmptyStringFacts */;
             }
-            if (flags & 3145728 /* UnionOrIntersection */) {
-                return getTypeFactsOfTypes(type.types);
+            if (flags & 1048576 /* Union */) {
+                return ts.reduceLeft(type.types, function (facts, t) { return facts | getTypeFacts(t, ignoreObjects); }, 0 /* None */);
+            }
+            if (flags & 2097152 /* Intersection */) {
+                // When an intersection contains a primitive type we ignore object type constituents as they are
+                // presumably type tags. For example, in string & { __kind__: "name" } we ignore the object type.
+                ignoreObjects || (ignoreObjects = maybeTypeOfKind(type, 131068 /* Primitive */));
+                return ts.reduceLeft(type.types, function (facts, t) { return facts & getTypeFacts(t, ignoreObjects); }, 16777215 /* All */);
             }
             return 16777215 /* All */;
         }
@@ -63562,18 +65316,16 @@ var ts;
             return filterType(type, function (t) { return (getTypeFacts(t) & include) !== 0; });
         }
         function getTypeWithDefault(type, defaultExpression) {
-            if (defaultExpression) {
-                var defaultType = getTypeOfExpression(defaultExpression);
-                return getUnionType([getTypeWithFacts(type, 524288 /* NEUndefined */), defaultType]);
-            }
-            return type;
+            return defaultExpression ?
+                getUnionType([getNonUndefinedType(type), getTypeOfExpression(defaultExpression)]) :
+                type;
         }
         function getTypeOfDestructuredProperty(type, name) {
             var nameType = getLiteralTypeFromPropertyName(name);
             if (!isTypeUsableAsPropertyName(nameType))
                 return errorType;
             var text = getPropertyNameFromType(nameType);
-            return getConstraintForLocation(getTypeOfPropertyOfType(type, text), name) ||
+            return getTypeOfPropertyOfType(type, text) ||
                 isNumericLiteralName(text) && includeUndefinedInIndexSignature(getIndexTypeOfType(type, 1 /* Number */)) ||
                 includeUndefinedInIndexSignature(getIndexTypeOfType(type, 0 /* String */)) ||
                 errorType;
@@ -63594,15 +65346,15 @@ var ts;
             return createArrayType(checkIteratedTypeOrElementType(65 /* Destructuring */, type, undefinedType, /*errorNode*/ undefined) || errorType);
         }
         function getAssignedTypeOfBinaryExpression(node) {
-            var isDestructuringDefaultAssignment = node.parent.kind === 199 /* ArrayLiteralExpression */ && isDestructuringAssignmentTarget(node.parent) ||
-                node.parent.kind === 288 /* PropertyAssignment */ && isDestructuringAssignmentTarget(node.parent.parent);
+            var isDestructuringDefaultAssignment = node.parent.kind === 200 /* ArrayLiteralExpression */ && isDestructuringAssignmentTarget(node.parent) ||
+                node.parent.kind === 289 /* PropertyAssignment */ && isDestructuringAssignmentTarget(node.parent.parent);
             return isDestructuringDefaultAssignment ?
                 getTypeWithDefault(getAssignedType(node), node.right) :
                 getTypeOfExpression(node.right);
         }
         function isDestructuringAssignmentTarget(parent) {
-            return parent.parent.kind === 216 /* BinaryExpression */ && parent.parent.left === parent ||
-                parent.parent.kind === 239 /* ForOfStatement */ && parent.parent.initializer === parent;
+            return parent.parent.kind === 217 /* BinaryExpression */ && parent.parent.left === parent ||
+                parent.parent.kind === 240 /* ForOfStatement */ && parent.parent.initializer === parent;
         }
         function getAssignedTypeOfArrayLiteralElement(node, element) {
             return getTypeOfDestructuredArrayElement(getAssignedType(node), node.elements.indexOf(element));
@@ -63619,21 +65371,21 @@ var ts;
         function getAssignedType(node) {
             var parent = node.parent;
             switch (parent.kind) {
-                case 238 /* ForInStatement */:
+                case 239 /* ForInStatement */:
                     return stringType;
-                case 239 /* ForOfStatement */:
+                case 240 /* ForOfStatement */:
                     return checkRightHandSideOfForOf(parent) || errorType;
-                case 216 /* BinaryExpression */:
+                case 217 /* BinaryExpression */:
                     return getAssignedTypeOfBinaryExpression(parent);
-                case 210 /* DeleteExpression */:
+                case 211 /* DeleteExpression */:
                     return undefinedType;
-                case 199 /* ArrayLiteralExpression */:
+                case 200 /* ArrayLiteralExpression */:
                     return getAssignedTypeOfArrayLiteralElement(parent, node);
-                case 220 /* SpreadElement */:
+                case 221 /* SpreadElement */:
                     return getAssignedTypeOfSpreadExpression(parent);
-                case 288 /* PropertyAssignment */:
+                case 289 /* PropertyAssignment */:
                     return getAssignedTypeOfPropertyAssignment(parent);
-                case 289 /* ShorthandPropertyAssignment */:
+                case 290 /* ShorthandPropertyAssignment */:
                     return getAssignedTypeOfShorthandPropertyAssignment(parent);
             }
             return errorType;
@@ -63641,7 +65393,7 @@ var ts;
         function getInitialTypeOfBindingElement(node) {
             var pattern = node.parent;
             var parentType = getInitialType(pattern.parent);
-            var type = pattern.kind === 196 /* ObjectBindingPattern */ ?
+            var type = pattern.kind === 197 /* ObjectBindingPattern */ ?
                 getTypeOfDestructuredProperty(parentType, node.propertyName || node.name) :
                 !node.dotDotDotToken ?
                     getTypeOfDestructuredArrayElement(parentType, pattern.elements.indexOf(node)) :
@@ -63659,30 +65411,30 @@ var ts;
             if (node.initializer) {
                 return getTypeOfInitializer(node.initializer);
             }
-            if (node.parent.parent.kind === 238 /* ForInStatement */) {
+            if (node.parent.parent.kind === 239 /* ForInStatement */) {
                 return stringType;
             }
-            if (node.parent.parent.kind === 239 /* ForOfStatement */) {
+            if (node.parent.parent.kind === 240 /* ForOfStatement */) {
                 return checkRightHandSideOfForOf(node.parent.parent) || errorType;
             }
             return errorType;
         }
         function getInitialType(node) {
-            return node.kind === 249 /* VariableDeclaration */ ?
+            return node.kind === 250 /* VariableDeclaration */ ?
                 getInitialTypeOfVariableDeclaration(node) :
                 getInitialTypeOfBindingElement(node);
         }
         function isEmptyArrayAssignment(node) {
-            return node.kind === 249 /* VariableDeclaration */ && node.initializer &&
+            return node.kind === 250 /* VariableDeclaration */ && node.initializer &&
                 isEmptyArrayLiteral(node.initializer) ||
-                node.kind !== 198 /* BindingElement */ && node.parent.kind === 216 /* BinaryExpression */ &&
+                node.kind !== 199 /* BindingElement */ && node.parent.kind === 217 /* BinaryExpression */ &&
                     isEmptyArrayLiteral(node.parent.right);
         }
         function getReferenceCandidate(node) {
             switch (node.kind) {
-                case 207 /* ParenthesizedExpression */:
+                case 208 /* ParenthesizedExpression */:
                     return getReferenceCandidate(node.expression);
-                case 216 /* BinaryExpression */:
+                case 217 /* BinaryExpression */:
                     switch (node.operatorToken.kind) {
                         case 62 /* EqualsToken */:
                         case 74 /* BarBarEqualsToken */:
@@ -63697,13 +65449,13 @@ var ts;
         }
         function getReferenceRoot(node) {
             var parent = node.parent;
-            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 ?
+            return parent.kind === 208 /* ParenthesizedExpression */ ||
+                parent.kind === 217 /* BinaryExpression */ && parent.operatorToken.kind === 62 /* EqualsToken */ && parent.left === node ||
+                parent.kind === 217 /* BinaryExpression */ && parent.operatorToken.kind === 27 /* CommaToken */ && parent.right === node ?
                 getReferenceRoot(parent) : node;
         }
         function getTypeOfSwitchClause(clause) {
-            if (clause.kind === 284 /* CaseClause */) {
+            if (clause.kind === 285 /* CaseClause */) {
                 return getRegularTypeOfLiteralType(getTypeOfExpression(clause.expression));
             }
             return neverType;
@@ -63723,7 +65475,7 @@ var ts;
             var witnesses = [];
             for (var _i = 0, _a = switchStatement.caseBlock.clauses; _i < _a.length; _i++) {
                 var clause = _a[_i];
-                if (clause.kind === 284 /* CaseClause */) {
+                if (clause.kind === 285 /* CaseClause */) {
                     if (ts.isStringLiteralLike(clause.expression)) {
                         witnesses.push(clause.expression.text);
                         continue;
@@ -63759,9 +65511,15 @@ var ts;
         function forEachType(type, f) {
             return type.flags & 1048576 /* Union */ ? ts.forEach(type.types, f) : f(type);
         }
+        function someType(type, f) {
+            return type.flags & 1048576 /* Union */ ? ts.some(type.types, f) : f(type);
+        }
         function everyType(type, f) {
             return type.flags & 1048576 /* Union */ ? ts.every(type.types, f) : f(type);
         }
+        function everyContainedType(type, f) {
+            return type.flags & 3145728 /* UnionOrIntersection */ ? ts.every(type.types, f) : f(type);
+        }
         function filterType(type, f) {
             if (type.flags & 1048576 /* Union */) {
                 var types = type.types;
@@ -63909,12 +65667,12 @@ var ts;
             var root = getReferenceRoot(node);
             var parent = root.parent;
             var isLengthPushOrUnshift = ts.isPropertyAccessExpression(parent) && (parent.name.escapedText === "length" ||
-                parent.parent.kind === 203 /* CallExpression */
+                parent.parent.kind === 204 /* CallExpression */
                     && ts.isIdentifier(parent.name)
                     && ts.isPushOrUnshiftIdentifier(parent.name));
-            var isElementAssignment = parent.kind === 202 /* ElementAccessExpression */ &&
+            var isElementAssignment = parent.kind === 203 /* ElementAccessExpression */ &&
                 parent.expression === root &&
-                parent.parent.kind === 216 /* BinaryExpression */ &&
+                parent.parent.kind === 217 /* BinaryExpression */ &&
                 parent.parent.operatorToken.kind === 62 /* EqualsToken */ &&
                 parent.parent.left === parent &&
                 !ts.isAssignmentTarget(parent.parent) &&
@@ -63922,8 +65680,8 @@ var ts;
             return isLengthPushOrUnshift || isElementAssignment;
         }
         function isDeclarationWithExplicitTypeAnnotation(declaration) {
-            return (declaration.kind === 249 /* VariableDeclaration */ || declaration.kind === 160 /* Parameter */ ||
-                declaration.kind === 163 /* PropertyDeclaration */ || declaration.kind === 162 /* PropertySignature */) &&
+            return (declaration.kind === 250 /* VariableDeclaration */ || declaration.kind === 161 /* Parameter */ ||
+                declaration.kind === 164 /* PropertyDeclaration */ || declaration.kind === 163 /* PropertySignature */) &&
                 !!ts.getEffectiveTypeAnnotationNode(declaration);
         }
         function getExplicitTypeOfSymbol(symbol, diagnostic) {
@@ -63942,7 +65700,7 @@ var ts;
                     if (isDeclarationWithExplicitTypeAnnotation(declaration)) {
                         return getTypeOfSymbol(symbol);
                     }
-                    if (ts.isVariableDeclaration(declaration) && declaration.parent.parent.kind === 239 /* ForOfStatement */) {
+                    if (ts.isVariableDeclaration(declaration) && declaration.parent.parent.kind === 240 /* ForOfStatement */) {
                         var statement = declaration.parent.parent;
                         var expressionType = getTypeOfDottedName(statement.expression, /*diagnostic*/ undefined);
                         if (expressionType) {
@@ -63970,7 +65728,7 @@ var ts;
                         return getExplicitThisType(node);
                     case 105 /* SuperKeyword */:
                         return checkSuperExpression(node);
-                    case 201 /* PropertyAccessExpression */: {
+                    case 202 /* PropertyAccessExpression */: {
                         var type = getTypeOfDottedName(node.expression, diagnostic);
                         if (type) {
                             var name = node.name;
@@ -63988,7 +65746,7 @@ var ts;
                         }
                         return undefined;
                     }
-                    case 207 /* ParenthesizedExpression */:
+                    case 208 /* ParenthesizedExpression */:
                         return getTypeOfDottedName(node.expression, diagnostic);
                 }
             }
@@ -64002,7 +65760,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 === 233 /* ExpressionStatement */) {
+                if (node.parent.kind === 234 /* ExpressionStatement */) {
                     funcType = getTypeOfDottedName(node.expression, /*diagnostic*/ undefined);
                 }
                 else if (node.expression.kind !== 105 /* SuperKeyword */) {
@@ -64046,7 +65804,7 @@ var ts;
         }
         function isFalseExpression(expr) {
             var node = ts.skipParentheses(expr);
-            return node.kind === 94 /* FalseKeyword */ || node.kind === 216 /* BinaryExpression */ && (node.operatorToken.kind === 55 /* AmpersandAmpersandToken */ && (isFalseExpression(node.left) || isFalseExpression(node.right)) ||
+            return node.kind === 94 /* FalseKeyword */ || node.kind === 217 /* 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) {
@@ -64181,7 +65939,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 === 225 /* NonNullExpression */ && getTypeWithFacts(resultType, 2097152 /* NEUndefinedOrNull */).flags & 131072 /* Never */) {
+            if (resultType === unreachableNeverType || reference.parent && reference.parent.kind === 226 /* NonNullExpression */ && !(resultType.flags & 131072 /* Never */) && getTypeWithFacts(resultType, 2097152 /* NEUndefinedOrNull */).flags & 131072 /* Never */) {
                 return declaredType;
             }
             return resultType;
@@ -64265,8 +66023,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 !== 201 /* PropertyAccessExpression */ &&
-                            reference.kind !== 202 /* ElementAccessExpression */ &&
+                            reference.kind !== 202 /* PropertyAccessExpression */ &&
+                            reference.kind !== 203 /* ElementAccessExpression */ &&
                             reference.kind !== 107 /* ThisKeyword */) {
                             flow = container.flowNode;
                             continue;
@@ -64291,7 +66049,7 @@ var ts;
             }
             function getInitialOrAssignedType(flow) {
                 var node = flow.node;
-                return getConstraintForLocation(node.kind === 249 /* VariableDeclaration */ || node.kind === 198 /* BindingElement */ ?
+                return getNarrowableTypeForReference(node.kind === 250 /* VariableDeclaration */ || node.kind === 199 /* BindingElement */ ?
                     getInitialType(node) :
                     getAssignedType(node), reference);
             }
@@ -64331,14 +66089,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 === 208 /* FunctionExpression */ || init.kind === 209 /* ArrowFunction */)) {
+                        if (init && (init.kind === 209 /* FunctionExpression */ || init.kind === 210 /* 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 === 238 /* ForInStatement */ && isMatchingReference(reference, node.parent.parent.expression)) {
+                if (ts.isVariableDeclaration(node) && node.parent.parent.kind === 239 /* ForInStatement */ && isMatchingReference(reference, node.parent.parent.expression)) {
                     return getNonNullableTypeIfNeeded(getTypeFromFlowType(getTypeAtFlowNode(flow.antecedent)));
                 }
                 // Assignment doesn't affect reference
@@ -64349,7 +66107,7 @@ var ts;
                 if (node.kind === 94 /* FalseKeyword */) {
                     return unreachableNeverType;
                 }
-                if (node.kind === 216 /* BinaryExpression */) {
+                if (node.kind === 217 /* BinaryExpression */) {
                     if (node.operatorToken.kind === 55 /* AmpersandAmpersandToken */) {
                         return narrowTypeByAssertion(narrowTypeByAssertion(type, node.left), node.right);
                     }
@@ -64380,7 +66138,7 @@ var ts;
             function getTypeAtFlowArrayMutation(flow) {
                 if (declaredType === autoType || declaredType === autoArrayType) {
                     var node = flow.node;
-                    var expr = node.kind === 203 /* CallExpression */ ?
+                    var expr = node.kind === 204 /* CallExpression */ ?
                         node.expression.expression :
                         node.left.expression;
                     if (isMatchingReference(reference, getReferenceCandidate(expr))) {
@@ -64388,7 +66146,7 @@ var ts;
                         var type = getTypeFromFlowType(flowType);
                         if (ts.getObjectFlags(type) & 256 /* EvolvingArray */) {
                             var evolvedType_1 = type;
-                            if (node.kind === 203 /* CallExpression */) {
+                            if (node.kind === 204 /* CallExpression */) {
                                 for (var _i = 0, _a = node.arguments; _i < _a.length; _i++) {
                                     var arg = _a[_i];
                                     evolvedType_1 = addEvolvingArrayElementType(evolvedType_1, arg);
@@ -64436,7 +66194,7 @@ var ts;
                 if (isMatchingReference(reference, expr)) {
                     type = narrowTypeBySwitchOnDiscriminant(type, flow.switchStatement, flow.clauseStart, flow.clauseEnd);
                 }
-                else if (expr.kind === 211 /* TypeOfExpression */ && isMatchingReference(reference, expr.expression)) {
+                else if (expr.kind === 212 /* TypeOfExpression */ && isMatchingReference(reference, expr.expression)) {
                     type = narrowBySwitchOnTypeOf(type, flow.switchStatement, flow.clauseStart, flow.clauseEnd);
                 }
                 else {
@@ -64444,12 +66202,12 @@ 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 === 211 /* TypeOfExpression */ && optionalChainContainsReference(expr.expression, reference)) {
+                        else if (expr.kind === 212 /* 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"); });
                         }
                     }
                     if (isMatchingReferenceDiscriminant(expr, type)) {
-                        type = narrowTypeByDiscriminant(type, expr, function (t) { return narrowTypeBySwitchOnDiscriminant(t, flow.switchStatement, flow.clauseStart, flow.clauseEnd); });
+                        type = narrowTypeBySwitchOnDiscriminantProperty(type, expr, flow.switchStatement, flow.clauseStart, flow.clauseEnd);
                     }
                 }
                 return createFlowType(type, isIncomplete(flowType));
@@ -64620,8 +66378,7 @@ var ts;
                 if (propName === undefined) {
                     return type;
                 }
-                var includesNullable = strictNullChecks && maybeTypeOfKind(type, 98304 /* Nullable */);
-                var removeNullable = includesNullable && ts.isOptionalChain(access);
+                var removeNullable = strictNullChecks && ts.isOptionalChain(access) && maybeTypeOfKind(type, 98304 /* Nullable */);
                 var propType = getTypeOfPropertyOfType(removeNullable ? getTypeWithFacts(type, 2097152 /* NEUndefinedOrNull */) : type, propName);
                 if (!propType) {
                     return type;
@@ -64633,6 +66390,30 @@ var ts;
                     return !(discriminantType.flags & 131072 /* Never */) && isTypeComparableTo(discriminantType, narrowedPropType);
                 });
             }
+            function narrowTypeByDiscriminantProperty(type, access, operator, value, assumeTrue) {
+                if ((operator === 36 /* EqualsEqualsEqualsToken */ || operator === 37 /* ExclamationEqualsEqualsToken */) && type.flags & 1048576 /* Union */) {
+                    var keyPropertyName = getKeyPropertyName(type);
+                    if (keyPropertyName && keyPropertyName === getAccessedPropertyName(access)) {
+                        var candidate_2 = getConstituentTypeForKeyType(type, getTypeOfExpression(value));
+                        if (candidate_2) {
+                            return operator === (assumeTrue ? 36 /* EqualsEqualsEqualsToken */ : 37 /* ExclamationEqualsEqualsToken */) ? candidate_2 :
+                                isUnitType(getTypeOfPropertyOfType(candidate_2, keyPropertyName) || unknownType) ? filterType(type, function (t) { return t !== candidate_2; }) :
+                                    type;
+                        }
+                    }
+                }
+                return narrowTypeByDiscriminant(type, access, function (t) { return narrowTypeByEquality(t, operator, value, assumeTrue); });
+            }
+            function narrowTypeBySwitchOnDiscriminantProperty(type, access, switchStatement, clauseStart, clauseEnd) {
+                if (clauseStart < clauseEnd && type.flags & 1048576 /* Union */ && getKeyPropertyName(type) === getAccessedPropertyName(access)) {
+                    var clauseTypes = getSwitchClauseTypes(switchStatement).slice(clauseStart, clauseEnd);
+                    var candidate = getUnionType(ts.map(clauseTypes, function (t) { return getConstituentTypeForKeyType(type, t) || unknownType; }));
+                    if (candidate !== unknownType) {
+                        return candidate;
+                    }
+                }
+                return narrowTypeByDiscriminant(type, access, function (t) { return narrowTypeBySwitchOnDiscriminant(t, switchStatement, clauseStart, clauseEnd); });
+            }
             function narrowTypeByTruthiness(type, expr, assumeTrue) {
                 if (isMatchingReference(reference, expr)) {
                     return getTypeWithFacts(type, assumeTrue ? 4194304 /* Truthy */ : 8388608 /* Falsy */);
@@ -64656,7 +66437,8 @@ var ts;
                 return !assumeTrue;
             }
             function narrowByInKeyword(type, literal, assumeTrue) {
-                if (type.flags & (1048576 /* Union */ | 524288 /* Object */)
+                if (type.flags & 1048576 /* Union */
+                    || type.flags & 524288 /* Object */ && declaredType !== type
                     || isThisTypeParameter(type)
                     || type.flags & 2097152 /* Intersection */ && ts.every(type.types, function (t) { return t.symbol !== globalThisSymbol; })) {
                     var propName_1 = ts.escapeLeadingUnderscores(literal.text);
@@ -64675,40 +66457,40 @@ var ts;
                     case 35 /* ExclamationEqualsToken */:
                     case 36 /* EqualsEqualsEqualsToken */:
                     case 37 /* ExclamationEqualsEqualsToken */:
-                        var operator_1 = expr.operatorToken.kind;
-                        var left_1 = getReferenceCandidate(expr.left);
-                        var right_1 = getReferenceCandidate(expr.right);
-                        if (left_1.kind === 211 /* TypeOfExpression */ && ts.isStringLiteralLike(right_1)) {
-                            return narrowTypeByTypeof(type, left_1, operator_1, right_1, assumeTrue);
+                        var operator = expr.operatorToken.kind;
+                        var left = getReferenceCandidate(expr.left);
+                        var right = getReferenceCandidate(expr.right);
+                        if (left.kind === 212 /* TypeOfExpression */ && ts.isStringLiteralLike(right)) {
+                            return narrowTypeByTypeof(type, left, operator, right, assumeTrue);
                         }
-                        if (right_1.kind === 211 /* TypeOfExpression */ && ts.isStringLiteralLike(left_1)) {
-                            return narrowTypeByTypeof(type, right_1, operator_1, left_1, assumeTrue);
+                        if (right.kind === 212 /* TypeOfExpression */ && ts.isStringLiteralLike(left)) {
+                            return narrowTypeByTypeof(type, right, operator, left, assumeTrue);
                         }
-                        if (isMatchingReference(reference, left_1)) {
-                            return narrowTypeByEquality(type, operator_1, right_1, assumeTrue);
+                        if (isMatchingReference(reference, left)) {
+                            return narrowTypeByEquality(type, operator, right, assumeTrue);
                         }
-                        if (isMatchingReference(reference, right_1)) {
-                            return narrowTypeByEquality(type, operator_1, left_1, assumeTrue);
+                        if (isMatchingReference(reference, right)) {
+                            return narrowTypeByEquality(type, operator, left, assumeTrue);
                         }
                         if (strictNullChecks) {
-                            if (optionalChainContainsReference(left_1, reference)) {
-                                type = narrowTypeByOptionalChainContainment(type, operator_1, right_1, assumeTrue);
+                            if (optionalChainContainsReference(left, reference)) {
+                                type = narrowTypeByOptionalChainContainment(type, operator, right, assumeTrue);
                             }
-                            else if (optionalChainContainsReference(right_1, reference)) {
-                                type = narrowTypeByOptionalChainContainment(type, operator_1, left_1, assumeTrue);
+                            else if (optionalChainContainsReference(right, reference)) {
+                                type = narrowTypeByOptionalChainContainment(type, operator, left, assumeTrue);
                             }
                         }
-                        if (isMatchingReferenceDiscriminant(left_1, type)) {
-                            return narrowTypeByDiscriminant(type, left_1, function (t) { return narrowTypeByEquality(t, operator_1, right_1, assumeTrue); });
+                        if (isMatchingReferenceDiscriminant(left, type)) {
+                            return narrowTypeByDiscriminantProperty(type, left, operator, right, assumeTrue);
                         }
-                        if (isMatchingReferenceDiscriminant(right_1, type)) {
-                            return narrowTypeByDiscriminant(type, right_1, function (t) { return narrowTypeByEquality(t, operator_1, left_1, assumeTrue); });
+                        if (isMatchingReferenceDiscriminant(right, type)) {
+                            return narrowTypeByDiscriminantProperty(type, right, operator, left, assumeTrue);
                         }
-                        if (isMatchingConstructorReference(left_1)) {
-                            return narrowTypeByConstructor(type, operator_1, right_1, assumeTrue);
+                        if (isMatchingConstructorReference(left)) {
+                            return narrowTypeByConstructor(type, operator, right, assumeTrue);
                         }
-                        if (isMatchingConstructorReference(right_1)) {
-                            return narrowTypeByConstructor(type, operator_1, left_1, assumeTrue);
+                        if (isMatchingConstructorReference(right)) {
+                            return narrowTypeByConstructor(type, operator, left, assumeTrue);
                         }
                         break;
                     case 101 /* InstanceOfKeyword */:
@@ -64773,13 +66555,12 @@ var ts;
                 }
                 if (assumeTrue) {
                     var filterFn = operator === 34 /* EqualsEqualsToken */ ?
-                        (function (t) { return areTypesComparable(t, valueType) || isCoercibleUnderDoubleEquals(t, valueType); }) :
+                        function (t) { return areTypesComparable(t, valueType) || isCoercibleUnderDoubleEquals(t, valueType); } :
                         function (t) { return areTypesComparable(t, valueType); };
                     return replacePrimitivesWithLiterals(filterType(type, filterFn), valueType);
                 }
                 if (isUnitType(valueType)) {
-                    var regularType_1 = getRegularTypeOfLiteralType(valueType);
-                    return filterType(type, function (t) { return isUnitType(t) ? !areTypesComparable(t, valueType) : getRegularTypeOfLiteralType(t) !== regularType_1; });
+                    return filterType(type, function (t) { return !(isUnitLikeType(t) && areTypesComparable(t, valueType)); });
                 }
                 return type;
             }
@@ -64801,7 +66582,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 === 216 /* BinaryExpression */) {
+                    if (typeOfExpr.parent.parent.kind === 217 /* BinaryExpression */) {
                         var expr = typeOfExpr.parent.parent;
                         if (expr.operatorToken.kind === 55 /* AmpersandAmpersandToken */ && expr.right === typeOfExpr.parent && containsTruthyCheck(reference, expr.left)) {
                             return nonPrimitiveType;
@@ -64857,7 +66638,7 @@ var ts;
                 if (!hasDefaultClause) {
                     return caseType;
                 }
-                var defaultType = filterType(type, function (t) { return !(isUnitType(t) && ts.contains(switchTypes, getRegularTypeOfLiteralType(t))); });
+                var defaultType = filterType(type, function (t) { return !(isUnitLikeType(t) && ts.contains(switchTypes, getRegularTypeOfLiteralType(extractUnitType(t)))); });
                 return caseType.flags & 131072 /* Never */ ? defaultType : getUnionType([caseType, defaultType]);
             }
             function getImpliedTypeFromTypeofGuard(type, text) {
@@ -65039,7 +66820,16 @@ var ts;
             }
             function getNarrowedType(type, candidate, assumeTrue, isRelated) {
                 if (!assumeTrue) {
-                    return filterType(type, function (t) { return !isRelated(t, candidate); });
+                    return filterType(type, function (t) {
+                        if (!isRelated(t, candidate)) {
+                            return true;
+                        }
+                        var constraint = getBaseConstraintOfType(t);
+                        if (constraint && constraint !== t) {
+                            return !isRelated(constraint, candidate);
+                        }
+                        return false;
+                    });
                 }
                 // If the current type is a union type, remove all constituents that couldn't be instances of
                 // the candidate type. If one or more constituents remain, return a union of those.
@@ -65100,17 +66890,17 @@ var ts;
                     case 78 /* Identifier */:
                     case 107 /* ThisKeyword */:
                     case 105 /* SuperKeyword */:
-                    case 201 /* PropertyAccessExpression */:
-                    case 202 /* ElementAccessExpression */:
+                    case 202 /* PropertyAccessExpression */:
+                    case 203 /* ElementAccessExpression */:
                         return narrowTypeByTruthiness(type, expr, assumeTrue);
-                    case 203 /* CallExpression */:
+                    case 204 /* CallExpression */:
                         return narrowTypeByCallExpression(type, expr, assumeTrue);
-                    case 207 /* ParenthesizedExpression */:
-                    case 225 /* NonNullExpression */:
+                    case 208 /* ParenthesizedExpression */:
+                    case 226 /* NonNullExpression */:
                         return narrowType(type, expr.expression, assumeTrue);
-                    case 216 /* BinaryExpression */:
+                    case 217 /* BinaryExpression */:
                         return narrowTypeByBinaryExpression(type, expr, assumeTrue);
-                    case 214 /* PrefixUnaryExpression */:
+                    case 215 /* PrefixUnaryExpression */:
                         if (expr.operator === 53 /* ExclamationToken */) {
                             return narrowType(type, expr.operand, !assumeTrue);
                         }
@@ -65134,17 +66924,20 @@ var ts;
             // an dotted name expression, and if the location is not an assignment target, obtain the type
             // of the expression (which will reflect control flow analysis). If the expression indeed
             // resolved to the given symbol, return the narrowed type.
-            if (location.kind === 78 /* Identifier */) {
+            if (location.kind === 78 /* Identifier */ || location.kind === 79 /* PrivateIdentifier */) {
                 if (ts.isRightSideOfQualifiedNameOrPropertyAccess(location)) {
                     location = location.parent;
                 }
-                if (ts.isExpressionNode(location) && !ts.isAssignmentTarget(location)) {
+                if (ts.isExpressionNode(location) && (!ts.isAssignmentTarget(location) || ts.isWriteAccess(location))) {
                     var type = getTypeOfExpression(location);
                     if (getExportSymbolOfValueSymbolIfExported(getNodeLinks(location).resolvedSymbol) === symbol) {
                         return type;
                     }
                 }
             }
+            if (ts.isDeclarationName(location) && ts.isSetAccessor(location.parent) && getAnnotatedAccessorTypeNode(location.parent)) {
+                return resolveTypeOfAccessors(location.parent.symbol, /*writing*/ true);
+            }
             // The location isn't a reference to the given symbol, meaning we're being asked
             // a hypothetical question of what type the symbol would have if there was a reference
             // to it at the given location. Since we have no control flow information for the
@@ -65155,13 +66948,16 @@ var ts;
         function getControlFlowContainer(node) {
             return ts.findAncestor(node.parent, function (node) {
                 return ts.isFunctionLike(node) && !ts.getImmediatelyInvokedFunctionExpression(node) ||
-                    node.kind === 257 /* ModuleBlock */ ||
-                    node.kind === 297 /* SourceFile */ ||
-                    node.kind === 163 /* PropertyDeclaration */;
+                    node.kind === 258 /* ModuleBlock */ ||
+                    node.kind === 298 /* SourceFile */ ||
+                    node.kind === 164 /* PropertyDeclaration */;
             });
         }
         // Check if a parameter is assigned anywhere within its declaring function.
         function isParameterAssigned(symbol) {
+            if (!symbol.valueDeclaration) {
+                return false;
+            }
             var func = ts.getRootDeclaration(symbol.valueDeclaration).parent;
             var links = getNodeLinks(func);
             if (!(links.flags & 8388608 /* AssignmentsMarked */)) {
@@ -65179,7 +66975,7 @@ var ts;
             if (node.kind === 78 /* Identifier */) {
                 if (ts.isAssignmentTarget(node)) {
                     var symbol = getResolvedSymbol(node);
-                    if (symbol.valueDeclaration && ts.getRootDeclaration(symbol.valueDeclaration).kind === 160 /* Parameter */) {
+                    if (symbol.valueDeclaration && ts.getRootDeclaration(symbol.valueDeclaration).kind === 161 /* Parameter */) {
                         symbol.isAssigned = true;
                     }
                 }
@@ -65195,7 +66991,7 @@ var ts;
         function removeOptionalityFromDeclaredType(declaredType, declaration) {
             if (pushTypeResolution(declaration.symbol, 2 /* DeclaredType */)) {
                 var annotationIncludesUndefined = strictNullChecks &&
-                    declaration.kind === 160 /* Parameter */ &&
+                    declaration.kind === 161 /* Parameter */ &&
                     declaration.initializer &&
                     getFalsyFlags(declaredType) & 32768 /* Undefined */ &&
                     !(getFalsyFlags(checkExpression(declaration.initializer)) & 32768 /* Undefined */);
@@ -65209,23 +67005,40 @@ var ts;
         }
         function isConstraintPosition(node) {
             var parent = node.parent;
-            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 */);
-        }
-        function getConstraintForLocation(type, node) {
-            // When a node is the left hand expression of a property access, element access, or call expression,
-            // and the type of the node includes type variables with constraints that are nullable, we fetch the
-            // apparent type of the node *before* performing control flow analysis such that narrowings apply to
-            // the constraint type.
-            if (type && isConstraintPosition(node) && forEachType(type, typeHasNullableConstraint)) {
-                return mapType(getWidenedType(type), getBaseConstraintOrType);
-            }
-            return type;
+            // In an element access obj[x], we consider obj to be in a constraint position only when x is not
+            // of a generic type. This is because when both obj and x are of generic types T and K, we want
+            // the resulting type to be T[K].
+            return parent.kind === 202 /* PropertyAccessExpression */ ||
+                parent.kind === 204 /* CallExpression */ && parent.expression === node ||
+                parent.kind === 203 /* ElementAccessExpression */ && parent.expression === node &&
+                    !isGenericIndexType(getTypeOfExpression(parent.argumentExpression));
+        }
+        function isGenericTypeWithUnionConstraint(type) {
+            return !!(type.flags & 465829888 /* Instantiable */ && getBaseConstraintOrType(type).flags & (98304 /* Nullable */ | 1048576 /* Union */));
+        }
+        function containsGenericType(type) {
+            return !!(type.flags & 465829888 /* Instantiable */ || type.flags & 3145728 /* UnionOrIntersection */ && ts.some(type.types, containsGenericType));
+        }
+        function hasContextualTypeWithNoGenericTypes(node) {
+            // Computing the contextual type for a child of a JSX element involves resolving the type of the
+            // element's tag name, so we exclude that here to avoid circularities.
+            var contextualType = (ts.isIdentifier(node) || ts.isPropertyAccessExpression(node) || ts.isElementAccessExpression(node)) &&
+                !((ts.isJsxOpeningElement(node.parent) || ts.isJsxSelfClosingElement(node.parent)) && node.parent.tagName === node) &&
+                getContextualType(node);
+            return contextualType && !someType(contextualType, containsGenericType);
+        }
+        function getNarrowableTypeForReference(type, reference, checkMode) {
+            // When the type of a reference is or contains an instantiable type with a union type constraint, and
+            // when the reference is in a constraint position (where it is known we'll obtain the apparent type) or
+            // has a contextual type containing no top-level instantiables (meaning constraints will determine
+            // assignability), we substitute constraints for all instantiables in the type of the reference to give
+            // control flow analysis an opportunity to narrow it further. For example, for a reference of a type
+            // parameter type 'T extends string | undefined' with a contextual type 'string', we substitute
+            // 'string | undefined' to give control flow analysis the opportunity to narrow to type 'string'.
+            var substituteConstraints = !(checkMode && checkMode & 2 /* Inferential */) &&
+                someType(type, isGenericTypeWithUnionConstraint) &&
+                (isConstraintPosition(reference) || hasContextualTypeWithNoGenericTypes(reference));
+            return substituteConstraints ? mapType(type, function (t) { return t.flags & 465829888 /* Instantiable */ ? getBaseConstraintOrType(t) : t; }) : type;
         }
         function isExportOrExportExpression(location) {
             return !!ts.findAncestor(location, function (e) { return e.parent && ts.isExportAssignment(e.parent) && e.parent.expression === e && ts.isEntityNameExpression(e); });
@@ -65248,7 +67061,7 @@ var ts;
                 }
             }
         }
-        function checkIdentifier(node) {
+        function checkIdentifier(node, checkMode) {
             var symbol = getResolvedSymbol(node);
             if (symbol === unknownSymbol) {
                 return errorType;
@@ -65262,7 +67075,7 @@ var ts;
             if (symbol === argumentsSymbol) {
                 var container = ts.getContainingFunction(node);
                 if (languageVersion < 2 /* ES2015 */) {
-                    if (container.kind === 209 /* ArrowFunction */) {
+                    if (container.kind === 210 /* 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 */)) {
@@ -65279,15 +67092,15 @@ var ts;
             }
             var localOrExportSymbol = getExportSymbolOfValueSymbolIfExported(symbol);
             var sourceSymbol = localOrExportSymbol.flags & 2097152 /* Alias */ ? resolveAlias(localOrExportSymbol) : localOrExportSymbol;
-            if (getDeclarationNodeFlagsFromSymbol(sourceSymbol) & 134217728 /* Deprecated */ && isUncalledFunctionReference(node, sourceSymbol)) {
+            if (sourceSymbol.declarations && getDeclarationNodeFlagsFromSymbol(sourceSymbol) & 134217728 /* Deprecated */ && isUncalledFunctionReference(node, sourceSymbol)) {
                 addDeprecatedSuggestion(node, sourceSymbol.declarations, node.escapedText);
             }
             var declaration = localOrExportSymbol.valueDeclaration;
-            if (localOrExportSymbol.flags & 32 /* Class */) {
+            if (declaration && 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 === 252 /* ClassDeclaration */
+                if (declaration.kind === 253 /* ClassDeclaration */
                     && ts.nodeIsDecorated(declaration)) {
                     var container = ts.getContainingClass(node);
                     while (container !== undefined) {
@@ -65299,14 +67112,14 @@ var ts;
                         container = ts.getContainingClass(container);
                     }
                 }
-                else if (declaration.kind === 221 /* ClassExpression */) {
+                else if (declaration.kind === 222 /* 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 !== 297 /* SourceFile */) {
+                    while (container.kind !== 298 /* SourceFile */) {
                         if (container.parent === declaration) {
-                            if (container.kind === 163 /* PropertyDeclaration */ && ts.hasSyntacticModifier(container, 32 /* Static */)) {
+                            if (container.kind === 164 /* PropertyDeclaration */ && ts.hasSyntacticModifier(container, 32 /* Static */)) {
                                 getNodeLinks(declaration).flags |= 16777216 /* ClassWithConstructorReference */;
                                 getNodeLinks(node).flags |= 33554432 /* ConstructorReferenceInClass */;
                             }
@@ -65317,12 +67130,18 @@ var ts;
                 }
             }
             checkNestedBlockScopedBinding(node, symbol);
-            var type = getConstraintForLocation(getTypeOfSymbol(localOrExportSymbol), node);
+            var type = getTypeOfSymbol(localOrExportSymbol);
             var assignmentKind = ts.getAssignmentTargetKind(node);
             if (assignmentKind) {
                 if (!(localOrExportSymbol.flags & 3 /* Variable */) &&
                     !(ts.isInJSFile(node) && localOrExportSymbol.flags & 512 /* ValueModule */)) {
-                    error(node, ts.Diagnostics.Cannot_assign_to_0_because_it_is_not_a_variable, symbolToString(symbol));
+                    var assignmentError = localOrExportSymbol.flags & 384 /* Enum */ ? ts.Diagnostics.Cannot_assign_to_0_because_it_is_an_enum
+                        : localOrExportSymbol.flags & 32 /* Class */ ? ts.Diagnostics.Cannot_assign_to_0_because_it_is_a_class
+                            : localOrExportSymbol.flags & 1536 /* Module */ ? ts.Diagnostics.Cannot_assign_to_0_because_it_is_a_namespace
+                                : localOrExportSymbol.flags & 16 /* Function */ ? ts.Diagnostics.Cannot_assign_to_0_because_it_is_a_function
+                                    : localOrExportSymbol.flags & 2097152 /* Alias */ ? ts.Diagnostics.Cannot_assign_to_0_because_it_is_an_import
+                                        : ts.Diagnostics.Cannot_assign_to_0_because_it_is_not_a_variable;
+                    error(node, assignmentError, symbolToString(symbol));
                     return errorType;
                 }
                 if (isReadonlySymbol(localOrExportSymbol)) {
@@ -65344,7 +67163,7 @@ var ts;
                 }
             }
             else if (isAlias) {
-                declaration = ts.find(symbol.declarations, isSomeImportDeclaration);
+                declaration = getDeclarationOfAliasSymbol(symbol);
             }
             else {
                 return type;
@@ -65352,10 +67171,11 @@ var ts;
             if (!declaration) {
                 return type;
             }
+            type = getNarrowableTypeForReference(type, node, checkMode);
             // 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 === 160 /* Parameter */;
+            var isParameter = ts.getRootDeclaration(declaration).kind === 161 /* Parameter */;
             var declarationContainer = getControlFlowContainer(declaration);
             var flowContainer = getControlFlowContainer(node);
             var isOuterVariable = flowContainer !== declarationContainer;
@@ -65364,8 +67184,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 === 208 /* FunctionExpression */ ||
-                flowContainer.kind === 209 /* ArrowFunction */ || ts.isObjectLiteralOrClassExpressionMethod(flowContainer)) &&
+            while (flowContainer !== declarationContainer && (flowContainer.kind === 209 /* FunctionExpression */ ||
+                flowContainer.kind === 210 /* ArrowFunction */ || ts.isObjectLiteralOrClassExpressionMethod(flowContainer)) &&
                 (isConstVariable(localOrExportSymbol) || isParameter && !isParameterAssigned(localOrExportSymbol))) {
                 flowContainer = getControlFlowContainer(flowContainer);
             }
@@ -65374,9 +67194,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 === 270 /* ExportSpecifier */) ||
-                node.parent.kind === 225 /* NonNullExpression */ ||
-                declaration.kind === 249 /* VariableDeclaration */ && declaration.exclamationToken ||
+                    isInTypeQuery(node) || node.parent.kind === 271 /* ExportSpecifier */) ||
+                node.parent.kind === 226 /* NonNullExpression */ ||
+                declaration.kind === 250 /* VariableDeclaration */ && declaration.exclamationToken ||
                 declaration.flags & 8388608 /* Ambient */;
             var initialType = assumeInitialized ? (isParameter ? removeOptionalityFromDeclaredType(type, declaration) : type) :
                 type === autoType || type === autoArrayType ? undefinedType :
@@ -65401,17 +67221,21 @@ var ts;
             }
             return assignmentKind ? getBaseTypeOfLiteralType(flowType) : flowType;
         }
-        function isInsideFunction(node, threshold) {
-            return !!ts.findAncestor(node, function (n) { return n === threshold ? "quit" : ts.isFunctionLike(n); });
+        function isInsideFunctionOrInstancePropertyInitializer(node, threshold) {
+            return !!ts.findAncestor(node, function (n) { return n === threshold ? "quit" : ts.isFunctionLike(n) || (n.parent && ts.isPropertyDeclaration(n.parent) && !ts.hasStaticModifier(n.parent) && n.parent.initializer === n); });
         }
         function getPartOfForStatementContainingNode(node, container) {
             return ts.findAncestor(node, function (n) { return n === container ? "quit" : n === container.initializer || n === container.condition || n === container.incrementor || n === container.statement; });
         }
+        function getEnclosingIterationStatement(node) {
+            return ts.findAncestor(node, function (n) { return (!n || ts.nodeStartsNewLexicalEnvironment(n)) ? "quit" : ts.isIterationStatement(n, /*lookInLabeledStatements*/ false); });
+        }
         function checkNestedBlockScopedBinding(node, symbol) {
             if (languageVersion >= 2 /* ES2015 */ ||
                 (symbol.flags & (2 /* BlockScopedVariable */ | 32 /* Class */)) === 0 ||
+                !symbol.valueDeclaration ||
                 ts.isSourceFile(symbol.valueDeclaration) ||
-                symbol.valueDeclaration.parent.kind === 287 /* CatchClause */) {
+                symbol.valueDeclaration.parent.kind === 288 /* CatchClause */) {
                 return;
             }
             // 1. walk from the use site up to the declaration and check
@@ -65419,22 +67243,14 @@ var ts;
             // 2. walk from the declaration up to the boundary of lexical environment and check
             // if there is an iteration statement in between declaration and boundary (is binding/class declared inside iteration statement)
             var container = ts.getEnclosingBlockScopeContainer(symbol.valueDeclaration);
-            var usedInFunction = isInsideFunction(node.parent, container);
-            var current = container;
-            var containedInIterationStatement = false;
-            while (current && !ts.nodeStartsNewLexicalEnvironment(current)) {
-                if (ts.isIterationStatement(current, /*lookInLabeledStatements*/ false)) {
-                    containedInIterationStatement = true;
-                    break;
-                }
-                current = current.parent;
-            }
-            if (containedInIterationStatement) {
-                if (usedInFunction) {
+            var isCaptured = isInsideFunctionOrInstancePropertyInitializer(node, container);
+            var enclosingIterationStatement = getEnclosingIterationStatement(container);
+            if (enclosingIterationStatement) {
+                if (isCaptured) {
                     // 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, 250 /* VariableDeclarationList */);
+                        var varDeclList = ts.getAncestor(symbol.valueDeclaration, 251 /* VariableDeclarationList */);
                         if (varDeclList && varDeclList.parent === container) {
                             var part = getPartOfForStatementContainingNode(node.parent, container);
                             if (part) {
@@ -65449,13 +67265,13 @@ var ts;
                         }
                     }
                     if (capturesBlockScopeBindingInLoopBody) {
-                        getNodeLinks(current).flags |= 65536 /* LoopWithCapturedBlockScopedBinding */;
+                        getNodeLinks(enclosingIterationStatement).flags |= 65536 /* LoopWithCapturedBlockScopedBinding */;
                     }
                 }
                 // mark variables that are declared in loop initializer and reassigned inside the body of ForStatement.
                 // if body of ForStatement will be converted to function then we'll need a extra machinery to propagate reassigned values back.
                 if (ts.isForStatement(container)) {
-                    var varDeclList = ts.getAncestor(symbol.valueDeclaration, 250 /* VariableDeclarationList */);
+                    var varDeclList = ts.getAncestor(symbol.valueDeclaration, 251 /* VariableDeclarationList */);
                     if (varDeclList && varDeclList.parent === container && isAssignedInBodyOfForStatement(node, container)) {
                         getNodeLinks(symbol.valueDeclaration).flags |= 4194304 /* NeedsLoopOutParameter */;
                     }
@@ -65463,7 +67279,7 @@ var ts;
                 // set 'declared inside loop' bit on the block-scoped binding
                 getNodeLinks(symbol.valueDeclaration).flags |= 524288 /* BlockScopedBindingInLoop */;
             }
-            if (usedInFunction) {
+            if (isCaptured) {
                 getNodeLinks(symbol.valueDeclaration).flags |= 262144 /* CapturedBlockScopedBinding */;
             }
         }
@@ -65474,7 +67290,7 @@ var ts;
         function isAssignedInBodyOfForStatement(node, container) {
             // skip parenthesized nodes
             var current = node;
-            while (current.parent.kind === 207 /* ParenthesizedExpression */) {
+            while (current.parent.kind === 208 /* ParenthesizedExpression */) {
                 current = current.parent;
             }
             // check if node is used as LHS in some assignment expression
@@ -65482,7 +67298,7 @@ var ts;
             if (ts.isAssignmentTarget(current)) {
                 isAssigned = true;
             }
-            else if ((current.parent.kind === 214 /* PrefixUnaryExpression */ || current.parent.kind === 215 /* PostfixUnaryExpression */)) {
+            else if ((current.parent.kind === 215 /* PrefixUnaryExpression */ || current.parent.kind === 216 /* PostfixUnaryExpression */)) {
                 var expr = current.parent;
                 isAssigned = expr.operator === 45 /* PlusPlusToken */ || expr.operator === 46 /* MinusMinusToken */;
             }
@@ -65495,7 +67311,7 @@ var ts;
         }
         function captureLexicalThis(node, container) {
             getNodeLinks(node).flags |= 2 /* LexicalThis */;
-            if (container.kind === 163 /* PropertyDeclaration */ || container.kind === 166 /* Constructor */) {
+            if (container.kind === 164 /* PropertyDeclaration */ || container.kind === 167 /* Constructor */) {
                 var classNode = container.parent;
                 getNodeLinks(classNode).flags |= 4 /* CaptureThis */;
             }
@@ -65535,37 +67351,37 @@ var ts;
             // tell whether 'this' needs to be captured.
             var container = ts.getThisContainer(node, /* includeArrowFunctions */ true);
             var capturedByArrowFunction = false;
-            if (container.kind === 166 /* Constructor */) {
+            if (container.kind === 167 /* 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 === 209 /* ArrowFunction */) {
+            if (container.kind === 210 /* ArrowFunction */) {
                 container = ts.getThisContainer(container, /* includeArrowFunctions */ false);
                 capturedByArrowFunction = true;
             }
             switch (container.kind) {
-                case 256 /* ModuleDeclaration */:
+                case 257 /* 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 255 /* EnumDeclaration */:
+                case 256 /* 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 166 /* Constructor */:
+                case 167 /* 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 163 /* PropertyDeclaration */:
-                case 162 /* PropertySignature */:
-                    if (ts.hasSyntacticModifier(container, 32 /* Static */) && !(compilerOptions.target === 99 /* ESNext */ && compilerOptions.useDefineForClassFields)) {
+                case 164 /* PropertyDeclaration */:
+                case 163 /* PropertySignature */:
+                    if (ts.hasSyntacticModifier(container, 32 /* Static */) && !(compilerOptions.target === 99 /* ESNext */ && 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 158 /* ComputedPropertyName */:
+                case 159 /* ComputedPropertyName */:
                     error(node, ts.Diagnostics.this_cannot_be_referenced_in_a_computed_property_name);
                     break;
             }
@@ -65653,7 +67469,7 @@ var ts;
         }
         function getClassNameFromPrototypeMethod(container) {
             // Check if it's the RHS of a x.prototype.y = function [name]() { .... }
-            if (container.kind === 208 /* FunctionExpression */ &&
+            if (container.kind === 209 /* FunctionExpression */ &&
                 ts.isBinaryExpression(container.parent) &&
                 ts.getAssignmentDeclarationKind(container.parent) === 3 /* PrototypeProperty */) {
                 // Get the 'x' of 'x.prototype.y = container'
@@ -65663,16 +67479,16 @@ var ts;
                     .expression; // x
             }
             // x.prototype = { method() { } }
-            else if (container.kind === 165 /* MethodDeclaration */ &&
-                container.parent.kind === 200 /* ObjectLiteralExpression */ &&
+            else if (container.kind === 166 /* MethodDeclaration */ &&
+                container.parent.kind === 201 /* 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 === 208 /* FunctionExpression */ &&
-                container.parent.kind === 288 /* PropertyAssignment */ &&
-                container.parent.parent.kind === 200 /* ObjectLiteralExpression */ &&
+            else if (container.kind === 209 /* FunctionExpression */ &&
+                container.parent.kind === 289 /* PropertyAssignment */ &&
+                container.parent.parent.kind === 201 /* ObjectLiteralExpression */ &&
                 ts.isBinaryExpression(container.parent.parent.parent) &&
                 ts.getAssignmentDeclarationKind(container.parent.parent.parent) === 6 /* Prototype */) {
                 return container.parent.parent.parent.left.expression;
@@ -65680,7 +67496,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 === 208 /* FunctionExpression */ &&
+            else if (container.kind === 209 /* 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") &&
@@ -65705,7 +67521,7 @@ var ts;
         }
         function getTypeForThisExpressionFromJSDoc(node) {
             var jsdocType = ts.getJSDocType(node);
-            if (jsdocType && jsdocType.kind === 308 /* JSDocFunctionType */) {
+            if (jsdocType && jsdocType.kind === 309 /* JSDocFunctionType */) {
                 var jsDocFunctionType = jsdocType;
                 if (jsDocFunctionType.parameters.length > 0 &&
                     jsDocFunctionType.parameters[0].name &&
@@ -65719,16 +67535,16 @@ var ts;
             }
         }
         function isInConstructorArgumentInitializer(node, constructorDecl) {
-            return !!ts.findAncestor(node, function (n) { return ts.isFunctionLikeDeclaration(n) ? "quit" : n.kind === 160 /* Parameter */ && n.parent === constructorDecl; });
+            return !!ts.findAncestor(node, function (n) { return ts.isFunctionLikeDeclaration(n) ? "quit" : n.kind === 161 /* Parameter */ && n.parent === constructorDecl; });
         }
         function checkSuperExpression(node) {
-            var isCallExpression = node.parent.kind === 203 /* CallExpression */ && node.parent.expression === node;
+            var isCallExpression = node.parent.kind === 204 /* 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 === 209 /* ArrowFunction */) {
+                while (container && container.kind === 210 /* ArrowFunction */) {
                     container = ts.getSuperContainer(container, /*stopOnFunctions*/ true);
                     needToCaptureLexicalThis = languageVersion < 2 /* ES2015 */;
                 }
@@ -65741,14 +67557,14 @@ var ts;
                 // class B {
                 //     [super.foo()]() {}
                 // }
-                var current = ts.findAncestor(node, function (n) { return n === container ? "quit" : n.kind === 158 /* ComputedPropertyName */; });
-                if (current && current.kind === 158 /* ComputedPropertyName */) {
+                var current = ts.findAncestor(node, function (n) { return n === container ? "quit" : n.kind === 159 /* ComputedPropertyName */; });
+                if (current && current.kind === 159 /* 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 === 200 /* ObjectLiteralExpression */)) {
+                else if (!container || !container.parent || !(ts.isClassLike(container.parent) || container.parent.kind === 201 /* ObjectLiteralExpression */)) {
                     error(node, ts.Diagnostics.super_can_only_be_referenced_in_members_of_derived_classes_or_object_literal_expressions);
                 }
                 else {
@@ -65756,7 +67572,7 @@ var ts;
                 }
                 return errorType;
             }
-            if (!isCallExpression && immediateContainer.kind === 166 /* Constructor */) {
+            if (!isCallExpression && immediateContainer.kind === 167 /* 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) {
@@ -65825,7 +67641,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 === 165 /* MethodDeclaration */ && ts.hasSyntacticModifier(container, 256 /* Async */)) {
+            if (container.kind === 166 /* MethodDeclaration */ && ts.hasSyntacticModifier(container, 256 /* Async */)) {
                 if (ts.isSuperProperty(node.parent) && ts.isAssignmentTarget(node.parent)) {
                     getNodeLinks(container).flags |= 4096 /* AsyncMethodWithSuperBinding */;
                 }
@@ -65839,7 +67655,7 @@ var ts;
                 // in this case they should also use correct lexical this
                 captureLexicalThis(node.parent, container);
             }
-            if (container.parent.kind === 200 /* ObjectLiteralExpression */) {
+            if (container.parent.kind === 201 /* 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;
@@ -65860,7 +67676,7 @@ var ts;
             if (!baseClassType) {
                 return errorType;
             }
-            if (container.kind === 166 /* Constructor */ && isInConstructorArgumentInitializer(node, container)) {
+            if (container.kind === 167 /* 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;
@@ -65875,7 +67691,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 === 166 /* Constructor */;
+                    return container.kind === 167 /* Constructor */;
                 }
                 else {
                     // TS 1.0 SPEC (April 2014)
@@ -65883,21 +67699,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 === 200 /* ObjectLiteralExpression */) {
+                    if (ts.isClassLike(container.parent) || container.parent.kind === 201 /* ObjectLiteralExpression */) {
                         if (ts.hasSyntacticModifier(container, 32 /* Static */)) {
-                            return container.kind === 165 /* MethodDeclaration */ ||
-                                container.kind === 164 /* MethodSignature */ ||
-                                container.kind === 167 /* GetAccessor */ ||
-                                container.kind === 168 /* SetAccessor */;
+                            return container.kind === 166 /* MethodDeclaration */ ||
+                                container.kind === 165 /* MethodSignature */ ||
+                                container.kind === 168 /* GetAccessor */ ||
+                                container.kind === 169 /* SetAccessor */;
                         }
                         else {
-                            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 */;
+                            return container.kind === 166 /* MethodDeclaration */ ||
+                                container.kind === 165 /* MethodSignature */ ||
+                                container.kind === 168 /* GetAccessor */ ||
+                                container.kind === 169 /* SetAccessor */ ||
+                                container.kind === 164 /* PropertyDeclaration */ ||
+                                container.kind === 163 /* PropertySignature */ ||
+                                container.kind === 167 /* Constructor */;
                         }
                     }
                 }
@@ -65905,10 +67721,10 @@ var ts;
             }
         }
         function getContainingObjectLiteral(func) {
-            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 :
+            return (func.kind === 166 /* MethodDeclaration */ ||
+                func.kind === 168 /* GetAccessor */ ||
+                func.kind === 169 /* SetAccessor */) && func.parent.kind === 201 /* ObjectLiteralExpression */ ? func.parent :
+                func.kind === 209 /* FunctionExpression */ && func.parent.kind === 289 /* PropertyAssignment */ ? func.parent.parent :
                     undefined;
         }
         function getThisTypeArgument(type) {
@@ -65920,7 +67736,7 @@ var ts;
             });
         }
         function getContextualThisParameterType(func) {
-            if (func.kind === 209 /* ArrowFunction */) {
+            if (func.kind === 210 /* ArrowFunction */) {
                 return undefined;
             }
             if (isContextSensitiveFunctionOrObjectLiteralMethod(func)) {
@@ -65947,7 +67763,7 @@ var ts;
                         if (thisType) {
                             return instantiateType(thisType, getMapperFromContext(getInferenceContext(containingLiteral)));
                         }
-                        if (literal.parent.kind !== 288 /* PropertyAssignment */) {
+                        if (literal.parent.kind !== 289 /* PropertyAssignment */) {
                             break;
                         }
                         literal = literal.parent.parent;
@@ -65961,7 +67777,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 === 216 /* BinaryExpression */ && parent.operatorToken.kind === 62 /* EqualsToken */) {
+                if (parent.kind === 217 /* BinaryExpression */ && parent.operatorToken.kind === 62 /* EqualsToken */) {
                     var target = parent.left;
                     if (ts.isAccessExpression(target)) {
                         var expression = target.expression;
@@ -66014,11 +67830,11 @@ var ts;
                 return getTypeFromTypeNode(typeNode);
             }
             switch (declaration.kind) {
-                case 160 /* Parameter */:
+                case 161 /* Parameter */:
                     return getContextuallyTypedParameterType(declaration);
-                case 198 /* BindingElement */:
+                case 199 /* BindingElement */:
                     return getContextualTypeForBindingElement(declaration);
-                case 163 /* PropertyDeclaration */:
+                case 164 /* PropertyDeclaration */:
                     if (ts.hasSyntacticModifier(declaration, 32 /* Static */)) {
                         return getContextualTypeForStaticPropertyDeclaration(declaration);
                     }
@@ -66029,10 +67845,10 @@ var ts;
             var parent = declaration.parent.parent;
             var name = declaration.propertyName || declaration.name;
             var parentType = getContextualTypeForVariableLikeDeclaration(parent) ||
-                parent.kind !== 198 /* BindingElement */ && parent.initializer && checkDeclarationInitializer(parent);
+                parent.kind !== 199 /* BindingElement */ && parent.initializer && checkDeclarationInitializer(parent);
             if (!parentType || ts.isBindingPattern(name) || ts.isComputedNonLiteralName(name))
                 return undefined;
-            if (parent.name.kind === 197 /* ArrayBindingPattern */) {
+            if (parent.name.kind === 198 /* ArrayBindingPattern */) {
                 var index = ts.indexOfNode(declaration.parent.elements, declaration);
                 if (index < 0)
                     return undefined;
@@ -66169,7 +67985,7 @@ var ts;
             return getTypeAtPosition(signature, argIndex);
         }
         function getContextualTypeForSubstitutionExpression(template, substitutionExpression) {
-            if (template.parent.kind === 205 /* TaggedTemplateExpression */) {
+            if (template.parent.kind === 206 /* TaggedTemplateExpression */) {
                 return getContextualTypeForArgument(template.parent, substitutionExpression);
             }
             return undefined;
@@ -66203,16 +68019,16 @@ 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 getContextualTypeForAssignmentDeclaration(binaryExpression) {
+            var _a, _b;
             var kind = ts.getAssignmentDeclarationKind(binaryExpression);
             switch (kind) {
                 case 0 /* None */:
                     return getTypeOfExpression(binaryExpression.left);
+                case 4 /* ThisProperty */:
+                    return getContextualTypeForThisPropertyAssignment(binaryExpression);
                 case 5 /* Property */:
-                case 1 /* ExportsProperty */:
-                case 6 /* Prototype */:
-                case 3 /* PrototypeProperty */:
                     if (isPossiblyAliasedThisProperty(binaryExpression, kind)) {
-                        return getContextualTypeForThisPropertyAssignment(binaryExpression, kind);
+                        return getContextualTypeForThisPropertyAssignment(binaryExpression);
                     }
                     // 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`.
@@ -66233,11 +68049,11 @@ var ts;
                             var id = lhs.expression;
                             var parentSymbol = resolveName(id, id.escapedText, 111551 /* Value */, undefined, id.escapedText, /*isUse*/ true);
                             if (parentSymbol) {
-                                var annotated = parentSymbol.valueDeclaration && ts.getEffectiveTypeAnnotationNode(parentSymbol.valueDeclaration);
-                                if (annotated) {
+                                var annotated_1 = parentSymbol.valueDeclaration && ts.getEffectiveTypeAnnotationNode(parentSymbol.valueDeclaration);
+                                if (annotated_1) {
                                     var nameStr = ts.getElementOrPropertyAccessName(lhs);
                                     if (nameStr !== undefined) {
-                                        return getTypeOfPropertyOfContextualType(getTypeFromTypeNode(annotated), nameStr);
+                                        return getTypeOfPropertyOfContextualType(getTypeFromTypeNode(annotated_1), nameStr);
                                     }
                                 }
                                 return undefined;
@@ -66245,9 +68061,15 @@ var ts;
                         }
                         return ts.isInJSFile(decl) ? undefined : getTypeOfExpression(binaryExpression.left);
                     }
+                case 1 /* ExportsProperty */:
+                case 6 /* Prototype */:
+                case 3 /* PrototypeProperty */:
+                    var valueDeclaration = (_a = binaryExpression.left.symbol) === null || _a === void 0 ? void 0 : _a.valueDeclaration;
+                // falls through
                 case 2 /* ModuleExports */:
-                case 4 /* ThisProperty */:
-                    return getContextualTypeForThisPropertyAssignment(binaryExpression, kind);
+                    valueDeclaration || (valueDeclaration = (_b = binaryExpression.symbol) === null || _b === void 0 ? void 0 : _b.valueDeclaration);
+                    var annotated = valueDeclaration && ts.getEffectiveTypeAnnotationNode(valueDeclaration);
+                    return annotated ? getTypeFromTypeNode(annotated) : undefined;
                 case 7 /* ObjectDefinePropertyValue */:
                 case 8 /* ObjectDefinePropertyExports */:
                 case 9 /* ObjectDefinePrototypeProperty */:
@@ -66268,7 +68090,7 @@ var ts;
             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) {
+        function getContextualTypeForThisPropertyAssignment(binaryExpression) {
             if (!binaryExpression.symbol)
                 return getTypeOfExpression(binaryExpression.left);
             if (binaryExpression.symbol.valueDeclaration) {
@@ -66280,8 +68102,6 @@ var ts;
                     }
                 }
             }
-            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;
@@ -66336,6 +68156,10 @@ var ts;
         }
         function getContextualTypeForObjectLiteralElement(element, contextFlags) {
             var objectLiteral = element.parent;
+            var propertyAssignmentType = ts.isPropertyAssignment(element) && getContextualTypeForVariableLikeDeclaration(element);
+            if (propertyAssignmentType) {
+                return propertyAssignmentType;
+            }
             var type = getApparentTypeOfContextualType(objectLiteral, contextFlags);
             if (type) {
                 if (hasBindableName(element)) {
@@ -66424,19 +68248,19 @@ var ts;
                 case 78 /* Identifier */:
                 case 150 /* UndefinedKeyword */:
                     return true;
-                case 201 /* PropertyAccessExpression */:
-                case 207 /* ParenthesizedExpression */:
+                case 202 /* PropertyAccessExpression */:
+                case 208 /* ParenthesizedExpression */:
                     return isPossiblyDiscriminantValue(node.expression);
-                case 283 /* JsxExpression */:
+                case 284 /* 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 === 288 /* PropertyAssignment */ && isPossiblyDiscriminantValue(p.initializer) && isDiscriminantProperty(contextualType, p.symbol.escapedName); }), function (prop) { return [function () { return checkExpression(prop.initializer); }, prop.symbol.escapedName]; }), isTypeAssignableTo, contextualType);
+            return getMatchingUnionConstituentForObjectLiteral(contextualType, node) || discriminateTypeByDiscriminableItems(contextualType, ts.concatenate(ts.map(ts.filter(node.properties, function (p) { return !!p.symbol && p.kind === 289 /* PropertyAssignment */ && isPossiblyDiscriminantValue(p.initializer) && isDiscriminantProperty(contextualType, p.symbol.escapedName); }), function (prop) { return [function () { return getContextFreeTypeOfExpression(prop.initializer); }, prop.symbol.escapedName]; }), ts.map(ts.filter(getPropertiesOfType(contextualType), function (s) { var _a; return !!(s.flags & 16777216 /* Optional */) && !!((_a = node === null || node === void 0 ? void 0 : node.symbol) === null || _a === void 0 ? void 0 : _a.members) && !node.symbol.members.has(s.escapedName) && isDiscriminantProperty(contextualType, s.escapedName); }), function (s) { return [function () { return undefinedType; }, s.escapedName]; })), isTypeAssignableTo, contextualType);
         }
         function discriminateContextualTypeByJSXAttributes(node, 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 discriminateTypeByDiscriminableItems(contextualType, ts.concatenate(ts.map(ts.filter(node.properties, function (p) { return !!p.symbol && p.kind === 281 /* 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]; }), ts.map(ts.filter(getPropertiesOfType(contextualType), function (s) { var _a; return !!(s.flags & 16777216 /* Optional */) && !!((_a = node === null || node === void 0 ? void 0 : node.symbol) === null || _a === void 0 ? void 0 : _a.members) && !node.symbol.members.has(s.escapedName) && isDiscriminantProperty(contextualType, s.escapedName); }), function (s) { return [function () { return undefinedType; }, s.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.
@@ -66447,15 +68271,9 @@ var ts;
             var instantiatedType = instantiateContextualType(contextualType, node, contextFlags);
             if (instantiatedType && !(contextFlags && contextFlags & 2 /* NoConstraints */ && instantiatedType.flags & 8650752 /* TypeVariable */)) {
                 var apparentType = mapType(instantiatedType, getApparentType, /*noReductions*/ true);
-                if (apparentType.flags & 1048576 /* Union */) {
-                    if (ts.isObjectLiteralExpression(node)) {
-                        return discriminateContextualTypeByObjectMembers(node, apparentType);
-                    }
-                    else if (ts.isJsxAttributes(node)) {
-                        return discriminateContextualTypeByJSXAttributes(node, apparentType);
-                    }
-                }
-                return apparentType;
+                return apparentType.flags & 1048576 /* Union */ && ts.isObjectLiteralExpression(node) ? discriminateContextualTypeByObjectMembers(node, apparentType) :
+                    apparentType.flags & 1048576 /* Union */ && ts.isJsxAttributes(node) ? discriminateContextualTypeByJSXAttributes(node, apparentType) :
+                        apparentType;
             }
         }
         // If the given contextual type contains instantiable types and if a mapper representing
@@ -66522,60 +68340,60 @@ var ts;
             }
             var parent = node.parent;
             switch (parent.kind) {
-                case 249 /* VariableDeclaration */:
-                case 160 /* Parameter */:
-                case 163 /* PropertyDeclaration */:
-                case 162 /* PropertySignature */:
-                case 198 /* BindingElement */:
+                case 250 /* VariableDeclaration */:
+                case 161 /* Parameter */:
+                case 164 /* PropertyDeclaration */:
+                case 163 /* PropertySignature */:
+                case 199 /* BindingElement */:
                     return getContextualTypeForInitializerExpression(node, contextFlags);
-                case 209 /* ArrowFunction */:
-                case 242 /* ReturnStatement */:
+                case 210 /* ArrowFunction */:
+                case 243 /* ReturnStatement */:
                     return getContextualTypeForReturnExpression(node);
-                case 219 /* YieldExpression */:
+                case 220 /* YieldExpression */:
                     return getContextualTypeForYieldOperand(parent);
-                case 213 /* AwaitExpression */:
+                case 214 /* AwaitExpression */:
                     return getContextualTypeForAwaitOperand(parent, contextFlags);
-                case 203 /* CallExpression */:
+                case 204 /* CallExpression */:
                     if (parent.expression.kind === 99 /* ImportKeyword */) {
                         return stringType;
                     }
                 /* falls through */
-                case 204 /* NewExpression */:
+                case 205 /* NewExpression */:
                     return getContextualTypeForArgument(parent, node);
-                case 206 /* TypeAssertionExpression */:
-                case 224 /* AsExpression */:
+                case 207 /* TypeAssertionExpression */:
+                case 225 /* AsExpression */:
                     return ts.isConstTypeReference(parent.type) ? tryFindWhenConstTypeReference(parent) : getTypeFromTypeNode(parent.type);
-                case 216 /* BinaryExpression */:
+                case 217 /* BinaryExpression */:
                     return getContextualTypeForBinaryOperand(node, contextFlags);
-                case 288 /* PropertyAssignment */:
-                case 289 /* ShorthandPropertyAssignment */:
+                case 289 /* PropertyAssignment */:
+                case 290 /* ShorthandPropertyAssignment */:
                     return getContextualTypeForObjectLiteralElement(parent, contextFlags);
-                case 290 /* SpreadAssignment */:
-                    return getApparentTypeOfContextualType(parent.parent, contextFlags);
-                case 199 /* ArrayLiteralExpression */: {
+                case 291 /* SpreadAssignment */:
+                    return getContextualType(parent.parent, contextFlags);
+                case 200 /* ArrayLiteralExpression */: {
                     var arrayLiteral = parent;
                     var type = getApparentTypeOfContextualType(arrayLiteral, contextFlags);
                     return getContextualTypeForElementExpression(type, ts.indexOfNode(arrayLiteral.elements, node));
                 }
-                case 217 /* ConditionalExpression */:
+                case 218 /* ConditionalExpression */:
                     return getContextualTypeForConditionalOperand(node, contextFlags);
-                case 228 /* TemplateSpan */:
-                    ts.Debug.assert(parent.parent.kind === 218 /* TemplateExpression */);
+                case 229 /* TemplateSpan */:
+                    ts.Debug.assert(parent.parent.kind === 219 /* TemplateExpression */);
                     return getContextualTypeForSubstitutionExpression(parent.parent, node);
-                case 207 /* ParenthesizedExpression */: {
+                case 208 /* 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 225 /* NonNullExpression */:
+                case 226 /* NonNullExpression */:
                     return getContextualType(parent, contextFlags);
-                case 283 /* JsxExpression */:
+                case 284 /* JsxExpression */:
                     return getContextualTypeForJsxExpression(parent);
-                case 280 /* JsxAttribute */:
-                case 282 /* JsxSpreadAttribute */:
+                case 281 /* JsxAttribute */:
+                case 283 /* JsxSpreadAttribute */:
                     return getContextualTypeForJsxAttribute(parent);
-                case 275 /* JsxOpeningElement */:
-                case 274 /* JsxSelfClosingElement */:
+                case 276 /* JsxOpeningElement */:
+                case 275 /* JsxSelfClosingElement */:
                     return getContextualJsxElementAttributesType(parent, contextFlags);
             }
             return undefined;
@@ -66611,14 +68429,14 @@ var ts;
             return propsType;
         }
         function getJsxPropsTypeForSignatureFromMember(sig, forcedLookupLocation) {
-            if (sig.unionSignatures) {
+            if (sig.compositeSignatures) {
                 // JSX Elements using the legacy `props`-field based lookup (eg, react class components) need to treat the `props` member as an input
                 // instead of an output position when resolving the signature. We need to go back to the input signatures of the composite signature,
                 // get the type of `props` on each return type individually, and then _intersect them_, rather than union them (as would normally occur
                 // for a union signature). It's an unfortunate quirk of looking in the output of the signature for the type we want to use for the input.
                 // The default behavior of `getTypeOfFirstParameterOfSignatureWithFallback` when no `props` member name is defined is much more sane.
                 var results = [];
-                for (var _i = 0, _a = sig.unionSignatures; _i < _a.length; _i++) {
+                for (var _i = 0, _a = sig.compositeSignatures; _i < _a.length; _i++) {
                     var signature = _a[_i];
                     var instance = getReturnTypeOfSignature(signature);
                     if (isTypeAny(instance)) {
@@ -66630,7 +68448,7 @@ var ts;
                     }
                     results.push(propType);
                 }
-                return getIntersectionType(results);
+                return getIntersectionType(results); // Same result for both union and intersection signatures
             }
             var instanceType = getReturnTypeOfSignature(sig);
             return isTypeAny(instanceType) ? instanceType : getTypeOfPropertyOfType(instanceType, forcedLookupLocation);
@@ -66712,16 +68530,93 @@ var ts;
                 return apparentAttributesType;
             }
         }
+        function getIntersectedSignatures(signatures) {
+            return ts.getStrictOptionValue(compilerOptions, "noImplicitAny")
+                ? ts.reduceLeft(signatures, function (left, right) {
+                    return left === right || !left ? left
+                        : compareTypeParametersIdentical(left.typeParameters, right.typeParameters) ? combineSignaturesOfIntersectionMembers(left, right)
+                            : undefined;
+                })
+                : undefined;
+        }
+        function combineIntersectionThisParam(left, right, mapper) {
+            if (!left || !right) {
+                return left || right;
+            }
+            // A signature `this` type might be a read or a write position... It's very possible that it should be invariant
+            // and we should refuse to merge signatures if there are `this` types and they do not match. However, so as to be
+            // pessimistic when contextual typing, for now, we'll union the `this` types.
+            var thisType = getUnionType([getTypeOfSymbol(left), instantiateType(getTypeOfSymbol(right), mapper)]);
+            return createSymbolWithType(left, thisType);
+        }
+        function combineIntersectionParameters(left, right, mapper) {
+            var leftCount = getParameterCount(left);
+            var rightCount = getParameterCount(right);
+            var longest = leftCount >= rightCount ? left : right;
+            var shorter = longest === left ? right : left;
+            var longestCount = longest === left ? leftCount : rightCount;
+            var eitherHasEffectiveRest = (hasEffectiveRestParameter(left) || hasEffectiveRestParameter(right));
+            var needsExtraRestElement = eitherHasEffectiveRest && !hasEffectiveRestParameter(longest);
+            var params = new Array(longestCount + (needsExtraRestElement ? 1 : 0));
+            for (var i = 0; i < longestCount; i++) {
+                var longestParamType = tryGetTypeAtPosition(longest, i);
+                if (longest === right) {
+                    longestParamType = instantiateType(longestParamType, mapper);
+                }
+                var shorterParamType = tryGetTypeAtPosition(shorter, i) || unknownType;
+                if (shorter === right) {
+                    shorterParamType = instantiateType(shorterParamType, mapper);
+                }
+                var unionParamType = getUnionType([longestParamType, shorterParamType]);
+                var isRestParam = eitherHasEffectiveRest && !needsExtraRestElement && i === (longestCount - 1);
+                var isOptional = i >= getMinArgumentCount(longest) && i >= getMinArgumentCount(shorter);
+                var leftName = i >= leftCount ? undefined : getParameterNameAtPosition(left, i);
+                var rightName = i >= rightCount ? undefined : getParameterNameAtPosition(right, i);
+                var paramName = leftName === rightName ? leftName :
+                    !leftName ? rightName :
+                        !rightName ? leftName :
+                            undefined;
+                var paramSymbol = createSymbol(1 /* FunctionScopedVariable */ | (isOptional && !isRestParam ? 16777216 /* Optional */ : 0), paramName || "arg" + i);
+                paramSymbol.type = isRestParam ? createArrayType(unionParamType) : unionParamType;
+                params[i] = paramSymbol;
+            }
+            if (needsExtraRestElement) {
+                var restParamSymbol = createSymbol(1 /* FunctionScopedVariable */, "args");
+                restParamSymbol.type = createArrayType(getTypeAtPosition(shorter, longestCount));
+                if (shorter === right) {
+                    restParamSymbol.type = instantiateType(restParamSymbol.type, mapper);
+                }
+                params[longestCount] = restParamSymbol;
+            }
+            return params;
+        }
+        function combineSignaturesOfIntersectionMembers(left, right) {
+            var typeParams = left.typeParameters || right.typeParameters;
+            var paramMapper;
+            if (left.typeParameters && right.typeParameters) {
+                paramMapper = createTypeMapper(right.typeParameters, left.typeParameters);
+                // We just use the type parameter defaults from the first signature
+            }
+            var declaration = left.declaration;
+            var params = combineIntersectionParameters(left, right, paramMapper);
+            var thisParam = combineIntersectionThisParam(left.thisParameter, right.thisParameter, paramMapper);
+            var minArgCount = Math.max(left.minArgumentCount, right.minArgumentCount);
+            var result = createSignature(declaration, typeParams, thisParam, params, 
+            /*resolvedReturnType*/ undefined, 
+            /*resolvedTypePredicate*/ undefined, minArgCount, (left.flags | right.flags) & 39 /* PropagatingFlags */);
+            result.compositeKind = 2097152 /* Intersection */;
+            result.compositeSignatures = ts.concatenate(left.compositeKind === 2097152 /* Intersection */ && left.compositeSignatures || [left], [right]);
+            if (paramMapper) {
+                result.mapper = left.compositeKind === 2097152 /* Intersection */ && left.mapper && left.compositeSignatures ? combineTypeMappers(left.mapper, paramMapper) : paramMapper;
+            }
+            return result;
+        }
         // If the given type is an object or union type with a single signature, and if that signature has at
         // least as many parameters as the given function, return the signature. Otherwise return undefined.
         function getContextualCallSignature(type, node) {
             var signatures = getSignaturesOfType(type, 0 /* Call */);
-            if (signatures.length === 1) {
-                var signature = signatures[0];
-                if (!isAritySmaller(signature, node)) {
-                    return signature;
-                }
-            }
+            var applicableByArity = ts.filter(signatures, function (s) { return !isAritySmaller(s, node); });
+            return applicableByArity.length === 1 ? applicableByArity[0] : getIntersectedSignatures(applicableByArity);
         }
         /** If the contextual signature has fewer parameters than the function expression, do not use it */
         function isAritySmaller(signature, target) {
@@ -66738,7 +68633,7 @@ var ts;
             return !hasEffectiveRestParameter(signature) && getParameterCount(signature) < targetParameterCount;
         }
         function isFunctionExpressionOrArrowFunction(node) {
-            return node.kind === 208 /* FunctionExpression */ || node.kind === 209 /* ArrowFunction */;
+            return node.kind === 209 /* FunctionExpression */ || node.kind === 210 /* ArrowFunction */;
         }
         function getContextualSignatureForFunctionLikeDeclaration(node) {
             // Only function expressions, arrow functions, and object literal methods are contextually typed.
@@ -66752,7 +68647,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 !== 165 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
+            ts.Debug.assert(node.kind !== 166 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
             var typeTagSignature = getSignatureOfTypeTag(node);
             if (typeTagSignature) {
                 return typeTagSignature;
@@ -66800,8 +68695,8 @@ var ts;
             return node.isSpread ? getIndexedAccessType(node.type, numberType) : node.type;
         }
         function hasDefaultValue(node) {
-            return (node.kind === 198 /* BindingElement */ && !!node.initializer) ||
-                (node.kind === 216 /* BinaryExpression */ && node.operatorToken.kind === 62 /* EqualsToken */);
+            return (node.kind === 199 /* BindingElement */ && !!node.initializer) ||
+                (node.kind === 217 /* BinaryExpression */ && node.operatorToken.kind === 62 /* EqualsToken */);
         }
         function checkArrayLiteral(node, checkMode, forceTuple) {
             var elements = node.elements;
@@ -66813,7 +68708,7 @@ var ts;
             var inConstContext = isConstContext(node);
             for (var i = 0; i < elementCount; i++) {
                 var e = elements[i];
-                if (e.kind === 220 /* SpreadElement */) {
+                if (e.kind === 221 /* SpreadElement */) {
                     if (languageVersion < 2 /* ES2015 */) {
                         checkExternalEmitHelpers(e, compilerOptions.downlevelIteration ? 1536 /* SpreadIncludes */ : 1024 /* SpreadArray */);
                     }
@@ -66856,7 +68751,7 @@ var ts;
             if (inDestructuringPattern) {
                 return createTupleType(elementTypes, elementFlags);
             }
-            if (forceTuple || inConstContext || contextualType && forEachType(contextualType, isTupleLikeType)) {
+            if (forceTuple || inConstContext || contextualType && someType(contextualType, isTupleLikeType)) {
                 return createArrayLiteralType(createTupleType(elementTypes, elementFlags, /*readonly*/ inConstContext));
             }
             return createArrayLiteralType(createArrayType(elementTypes.length ?
@@ -66870,13 +68765,13 @@ var ts;
             var literalType = type.literalType;
             if (!literalType) {
                 literalType = type.literalType = cloneTypeReference(type);
-                literalType.objectFlags |= 65536 /* ArrayLiteral */ | 1048576 /* ContainsObjectOrArrayLiteral */;
+                literalType.objectFlags |= 32768 /* ArrayLiteral */ | 262144 /* ContainsObjectOrArrayLiteral */;
             }
             return literalType;
         }
         function isNumericName(name) {
             switch (name.kind) {
-                case 158 /* ComputedPropertyName */:
+                case 159 /* ComputedPropertyName */:
                     return isNumericComputedName(name);
                 case 78 /* Identifier */:
                     return isNumericLiteralName(name.escapedText);
@@ -66923,6 +68818,20 @@ var ts;
             var links = getNodeLinks(node.expression);
             if (!links.resolvedType) {
                 links.resolvedType = checkExpression(node.expression);
+                // The computed property name of a non-static class field within a loop must be stored in a block-scoped binding.
+                // (It needs to be bound at class evaluation time.)
+                if (ts.isPropertyDeclaration(node.parent) && !ts.hasStaticModifier(node.parent) && ts.isClassExpression(node.parent.parent)) {
+                    var container = ts.getEnclosingBlockScopeContainer(node.parent.parent);
+                    var enclosingIterationStatement = getEnclosingIterationStatement(container);
+                    if (enclosingIterationStatement) {
+                        // The computed field name will use a block scoped binding which can be unique for each iteration of the loop.
+                        getNodeLinks(enclosingIterationStatement).flags |= 65536 /* LoopWithCapturedBlockScopedBinding */;
+                        // The generated variable which stores the computed field name must be block-scoped.
+                        getNodeLinks(node).flags |= 524288 /* BlockScopedBindingInLoop */;
+                        // The generated variable which stores the class must be block-scoped.
+                        getNodeLinks(node.parent.parent).flags |= 524288 /* BlockScopedBindingInLoop */;
+                    }
+                }
                 // 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 */ ||
@@ -66930,9 +68839,6 @@ var ts;
                         !isTypeAssignableTo(links.resolvedType, stringNumberSymbolType)) {
                     error(node, ts.Diagnostics.A_computed_property_name_must_be_of_type_string_number_symbol_or_any);
                 }
-                else {
-                    checkThatExpressionIsProperSymbolReference(node.expression, links.resolvedType, /*reportError*/ true);
-                }
             }
             return links.resolvedType;
         }
@@ -66972,7 +68878,7 @@ var ts;
             var spread = emptyObjectType;
             var contextualType = getApparentTypeOfContextualType(node);
             var contextualTypeHasPattern = contextualType && contextualType.pattern &&
-                (contextualType.pattern.kind === 196 /* ObjectBindingPattern */ || contextualType.pattern.kind === 200 /* ObjectLiteralExpression */);
+                (contextualType.pattern.kind === 197 /* ObjectBindingPattern */ || contextualType.pattern.kind === 201 /* ObjectLiteralExpression */);
             var inConstContext = isConstContext(node);
             var checkFlags = inConstContext ? 8 /* Readonly */ : 0;
             var isInJavascript = ts.isInJSFile(node) && !ts.isInJsonFile(node);
@@ -66987,7 +68893,7 @@ var ts;
             // which may never occur.
             for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
                 var elem = _a[_i];
-                if (elem.name && ts.isComputedPropertyName(elem.name) && !ts.isWellKnownSymbolSyntactically(elem.name)) {
+                if (elem.name && ts.isComputedPropertyName(elem.name)) {
                     checkComputedPropertyName(elem.name);
                 }
             }
@@ -66995,16 +68901,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 === 158 /* ComputedPropertyName */ && !ts.isWellKnownSymbolSyntactically(memberDecl.name.expression) ?
+                var computedNameType = memberDecl.name && memberDecl.name.kind === 159 /* ComputedPropertyName */ ?
                     checkComputedPropertyName(memberDecl.name) : undefined;
-                if (memberDecl.kind === 288 /* PropertyAssignment */ ||
-                    memberDecl.kind === 289 /* ShorthandPropertyAssignment */ ||
+                if (memberDecl.kind === 289 /* PropertyAssignment */ ||
+                    memberDecl.kind === 290 /* ShorthandPropertyAssignment */ ||
                     ts.isObjectLiteralMethod(memberDecl)) {
-                    var type = memberDecl.kind === 288 /* PropertyAssignment */ ? checkPropertyAssignment(memberDecl, checkMode) :
+                    var type = memberDecl.kind === 289 /* 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 === 289 /* ShorthandPropertyAssignment */ ? checkExpressionForMutableLocation(!inDestructuringPattern && memberDecl.objectAssignmentInitializer ? memberDecl.objectAssignmentInitializer : memberDecl.name, checkMode) :
+                        memberDecl.kind === 290 /* ShorthandPropertyAssignment */ ? checkExpressionForMutableLocation(!inDestructuringPattern && memberDecl.objectAssignmentInitializer ? memberDecl.objectAssignmentInitializer : memberDecl.name, checkMode) :
                             checkObjectLiteralMethod(memberDecl, checkMode);
                     if (isInJavascript) {
                         var jsDocType = getTypeForDeclarationFromJSDocComment(memberDecl);
@@ -67016,7 +68922,7 @@ var ts;
                             checkTypeAssignableTo(type, getTypeFromTypeNode(enumTag.typeExpression), memberDecl);
                         }
                     }
-                    objectFlags |= ts.getObjectFlags(type) & 3670016 /* PropagatingFlags */;
+                    objectFlags |= ts.getObjectFlags(type) & 917504 /* PropagatingFlags */;
                     var nameType = computedNameType && isTypeUsableAsPropertyName(computedNameType) ? computedNameType : undefined;
                     var prop = nameType ?
                         createSymbol(4 /* Property */ | member.flags, getPropertyNameFromType(nameType), checkFlags | 4096 /* Late */) :
@@ -67027,8 +68933,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 === 288 /* PropertyAssignment */ && hasDefaultValue(memberDecl.initializer)) ||
-                            (memberDecl.kind === 289 /* ShorthandPropertyAssignment */ && memberDecl.objectAssignmentInitializer);
+                        var isOptional = (memberDecl.kind === 289 /* PropertyAssignment */ && hasDefaultValue(memberDecl.initializer)) ||
+                            (memberDecl.kind === 290 /* ShorthandPropertyAssignment */ && memberDecl.objectAssignmentInitializer);
                         if (isOptional) {
                             prop.flags |= 16777216 /* Optional */;
                         }
@@ -67054,7 +68960,7 @@ var ts;
                     member = prop;
                     allPropertiesTable === null || allPropertiesTable === void 0 ? void 0 : allPropertiesTable.set(prop.escapedName, prop);
                 }
-                else if (memberDecl.kind === 290 /* SpreadAssignment */) {
+                else if (memberDecl.kind === 291 /* SpreadAssignment */) {
                     if (languageVersion < 2 /* ES2015 */) {
                         checkExternalEmitHelpers(memberDecl, 2 /* Assign */);
                     }
@@ -67066,15 +68972,20 @@ var ts;
                         hasComputedNumberProperty = false;
                     }
                     var type = getReducedType(checkExpression(memberDecl.expression));
-                    if (!isValidSpreadType(type)) {
-                        error(memberDecl, ts.Diagnostics.Spread_types_may_only_be_created_from_object_types);
-                        return errorType;
+                    if (isValidSpreadType(type)) {
+                        if (allPropertiesTable) {
+                            checkSpreadPropOverrides(type, allPropertiesTable, memberDecl);
+                        }
+                        offset = propertiesArray.length;
+                        if (spread === errorType) {
+                            continue;
+                        }
+                        spread = getSpreadType(spread, type, node.symbol, objectFlags, inConstContext);
                     }
-                    if (allPropertiesTable) {
-                        checkSpreadPropOverrides(type, allPropertiesTable, memberDecl);
+                    else {
+                        error(memberDecl, ts.Diagnostics.Spread_types_may_only_be_created_from_object_types);
+                        spread = errorType;
                     }
-                    spread = getSpreadType(spread, type, node.symbol, objectFlags, inConstContext);
-                    offset = propertiesArray.length;
                     continue;
                 }
                 else {
@@ -67083,7 +68994,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 === 167 /* GetAccessor */ || memberDecl.kind === 168 /* SetAccessor */);
+                    ts.Debug.assert(memberDecl.kind === 168 /* GetAccessor */ || memberDecl.kind === 169 /* SetAccessor */);
                     checkNodeDeferred(memberDecl);
                 }
                 if (computedNameType && !(computedNameType.flags & 8576 /* StringOrNumberLiteralOrUnique */)) {
@@ -67108,7 +69019,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 !== 290 /* SpreadAssignment */) {
+            if (contextualTypeHasPattern && node.parent.kind !== 291 /* 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)) {
@@ -67120,6 +69031,9 @@ var ts;
                     }
                 }
             }
+            if (spread === errorType) {
+                return errorType;
+            }
             if (spread !== emptyObjectType) {
                 if (propertiesArray.length > 0) {
                     spread = getSpreadType(spread, createObjectLiteralType(), node.symbol, objectFlags, inConstContext);
@@ -67136,9 +69050,9 @@ var ts;
                 var stringIndexInfo = hasComputedStringProperty ? getObjectLiteralIndexInfo(node, offset, propertiesArray, 0 /* String */) : undefined;
                 var numberIndexInfo = hasComputedNumberProperty ? getObjectLiteralIndexInfo(node, offset, propertiesArray, 1 /* Number */) : undefined;
                 var result = createAnonymousType(node.symbol, propertiesTable, ts.emptyArray, ts.emptyArray, stringIndexInfo, numberIndexInfo);
-                result.objectFlags |= objectFlags | 128 /* ObjectLiteral */ | 1048576 /* ContainsObjectOrArrayLiteral */;
+                result.objectFlags |= objectFlags | 128 /* ObjectLiteral */ | 262144 /* ContainsObjectOrArrayLiteral */;
                 if (isJSObjectLiteral) {
-                    result.objectFlags |= 16384 /* JSLiteral */;
+                    result.objectFlags |= 8192 /* JSLiteral */;
                 }
                 if (patternWithComputedProperties) {
                     result.objectFlags |= 512 /* ObjectLiteralPatternWithComputedProperties */;
@@ -67228,14 +69142,14 @@ var ts;
             var hasSpreadAnyType = false;
             var typeToIntersect;
             var explicitlySpecifyChildrenAttribute = false;
-            var objectFlags = 4096 /* JsxAttributes */;
+            var objectFlags = 2048 /* JsxAttributes */;
             var jsxChildrenPropertyName = getJsxElementChildrenPropertyName(getJsxNamespaceAt(openingLikeElement));
             for (var _i = 0, _a = attributes.properties; _i < _a.length; _i++) {
                 var attributeDecl = _a[_i];
                 var member = attributeDecl.symbol;
                 if (ts.isJsxAttribute(attributeDecl)) {
                     var exprType = checkJsxAttribute(attributeDecl, checkMode);
-                    objectFlags |= ts.getObjectFlags(exprType) & 3670016 /* PropagatingFlags */;
+                    objectFlags |= ts.getObjectFlags(exprType) & 917504 /* PropagatingFlags */;
                     var attributeSymbol = createSymbol(4 /* Property */ | member.flags, member.escapedName);
                     attributeSymbol.declarations = member.declarations;
                     attributeSymbol.parent = member.parent;
@@ -67251,7 +69165,7 @@ var ts;
                     }
                 }
                 else {
-                    ts.Debug.assert(attributeDecl.kind === 282 /* JsxSpreadAttribute */);
+                    ts.Debug.assert(attributeDecl.kind === 283 /* JsxSpreadAttribute */);
                     if (attributesTable.size > 0) {
                         spread = getSpreadType(spread, createJsxAttributesType(), attributes.symbol, objectFlags, /*readonly*/ false);
                         attributesTable = ts.createSymbolTable();
@@ -67277,7 +69191,7 @@ var ts;
                 }
             }
             // Handle children attribute
-            var parent = openingLikeElement.parent.kind === 273 /* JsxElement */ ? openingLikeElement.parent : undefined;
+            var parent = openingLikeElement.parent.kind === 274 /* 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);
@@ -67293,7 +69207,7 @@ var ts;
                     // 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 */, jsxChildrenPropertyName);
                     childrenPropSymbol.type = childrenTypes.length === 1 ? childrenTypes[0] :
-                        childrenContextualType && forEachType(childrenContextualType, isTupleLikeType) ? createTupleType(childrenTypes) :
+                        childrenContextualType && someType(childrenContextualType, isTupleLikeType) ? createTupleType(childrenTypes) :
                             createArrayType(getUnionType(childrenTypes));
                     // Fake up a property declaration for the children
                     childrenPropSymbol.valueDeclaration = ts.factory.createPropertySignature(/*modifiers*/ undefined, ts.unescapeLeadingUnderscores(jsxChildrenPropertyName), /*questionToken*/ undefined, /*type*/ undefined);
@@ -67319,7 +69233,7 @@ var ts;
             function createJsxAttributesType() {
                 objectFlags |= freshObjectLiteralFlag;
                 var result = createAnonymousType(attributes.symbol, attributesTable, ts.emptyArray, ts.emptyArray, /*stringIndexInfo*/ undefined, /*numberIndexInfo*/ undefined);
-                result.objectFlags |= objectFlags | 128 /* ObjectLiteral */ | 1048576 /* ContainsObjectOrArrayLiteral */;
+                result.objectFlags |= objectFlags | 128 /* ObjectLiteral */ | 262144 /* ContainsObjectOrArrayLiteral */;
                 return result;
             }
         }
@@ -67334,7 +69248,7 @@ var ts;
                         childrenTypes.push(stringType);
                     }
                 }
-                else if (child.kind === 283 /* JsxExpression */ && !child.expression) {
+                else if (child.kind === 284 /* JsxExpression */ && !child.expression) {
                     continue; // empty jsx expressions don't *really* count as present children
                 }
                 else {
@@ -67485,7 +69399,7 @@ var ts;
                 else if (propertiesOfJsxElementAttribPropInterface.length === 1) {
                     return propertiesOfJsxElementAttribPropInterface[0].escapedName;
                 }
-                else if (propertiesOfJsxElementAttribPropInterface.length > 1) {
+                else if (propertiesOfJsxElementAttribPropInterface.length > 1 && jsxElementAttribPropInterfaceSym.declarations) {
                     // More than one property on ElementAttributesProperty is an error
                     error(jsxElementAttribPropInterfaceSym.declarations[0], ts.Diagnostics.The_global_type_JSX_0_may_not_have_more_than_one_property, ts.unescapeLeadingUnderscores(nameOfAttribPropContainer));
                 }
@@ -67595,11 +69509,11 @@ var ts;
             if (!links.resolvedJsxElementAttributesType) {
                 var symbol = getIntrinsicTagSymbol(node);
                 if (links.jsxFlags & 1 /* IntrinsicNamedElement */) {
-                    return links.resolvedJsxElementAttributesType = getTypeOfSymbol(symbol);
+                    return links.resolvedJsxElementAttributesType = getTypeOfSymbol(symbol) || errorType;
                 }
                 else if (links.jsxFlags & 2 /* IntrinsicIndexedElement */) {
                     return links.resolvedJsxElementAttributesType =
-                        getIndexTypeOfType(getDeclaredTypeOfSymbol(symbol), 0 /* String */);
+                        getIndexTypeOfType(getJsxType(JsxNames.IntrinsicElements, node), 0 /* String */) || errorType;
                 }
                 else {
                     return links.resolvedJsxElementAttributesType = errorType;
@@ -67752,9 +69666,12 @@ var ts;
          * @param type The type of the object whose property is being accessed. (Not the type of the property.)
          * @param prop The symbol for the property being accessed.
          */
-        function checkPropertyAccessibility(node, isSuper, type, prop) {
-            var flags = ts.getDeclarationModifierFlagsFromSymbol(prop);
-            var errorNode = node.kind === 157 /* QualifiedName */ ? node.right : node.kind === 195 /* ImportType */ ? node : node.name;
+        function checkPropertyAccessibility(node, isSuper, writing, type, prop, reportError) {
+            if (reportError === void 0) { reportError = true; }
+            var flags = ts.getDeclarationModifierFlagsFromSymbol(prop, writing);
+            var errorNode = node.kind === 158 /* QualifiedName */ ? node.right :
+                node.kind === 196 /* ImportType */ ? node :
+                    node.kind === 199 /* BindingElement */ && node.propertyName ? node.propertyName : node.name;
             if (isSuper) {
                 // TS 1.0 spec (April 2014): 4.8.2
                 // - In a constructor, instance member function, instance member accessor, or
@@ -67765,7 +69682,9 @@ var ts;
                 //   a super property access is permitted and must specify a public static member function of the base class.
                 if (languageVersion < 2 /* ES2015 */) {
                     if (symbolHasNonMethodDeclaration(prop)) {
-                        error(errorNode, ts.Diagnostics.Only_public_and_protected_methods_of_the_base_class_are_accessible_via_the_super_keyword);
+                        if (reportError) {
+                            error(errorNode, ts.Diagnostics.Only_public_and_protected_methods_of_the_base_class_are_accessible_via_the_super_keyword);
+                        }
                         return false;
                     }
                 }
@@ -67774,24 +69693,22 @@ var ts;
                     // This error could mask a private property access error. But, a member
                     // cannot simultaneously be private and abstract, so this will trigger an
                     // additional error elsewhere.
-                    error(errorNode, ts.Diagnostics.Abstract_method_0_in_class_1_cannot_be_accessed_via_super_expression, symbolToString(prop), typeToString(getDeclaringClass(prop)));
+                    if (reportError) {
+                        error(errorNode, ts.Diagnostics.Abstract_method_0_in_class_1_cannot_be_accessed_via_super_expression, symbolToString(prop), typeToString(getDeclaringClass(prop)));
+                    }
                     return false;
                 }
             }
             // Referencing abstract properties within their own constructors is not allowed
-            if ((flags & 128 /* Abstract */) && ts.isThisProperty(node) && symbolHasNonMethodDeclaration(prop)) {
+            if ((flags & 128 /* Abstract */) && symbolHasNonMethodDeclaration(prop) &&
+                (ts.isThisProperty(node) || ts.isThisInitializedObjectBindingExpression(node) || ts.isObjectBindingPattern(node.parent) && ts.isThisInitializedDeclaration(node.parent.parent))) {
                 var declaringClassDeclaration = ts.getClassLikeDeclarationOfSymbol(getParentOfSymbol(prop));
                 if (declaringClassDeclaration && isNodeUsedDuringClassInitialization(node)) {
-                    error(errorNode, ts.Diagnostics.Abstract_property_0_in_class_1_cannot_be_accessed_in_the_constructor, symbolToString(prop), ts.getTextOfIdentifierOrLiteral(declaringClassDeclaration.name)); // TODO: GH#18217
-                    return false;
-                }
-            }
-            if (ts.isPropertyAccessExpression(node) && ts.isPrivateIdentifier(node.name)) {
-                if (!ts.getContainingClass(node)) {
-                    error(errorNode, ts.Diagnostics.Private_identifiers_are_not_allowed_outside_class_bodies);
+                    if (reportError) {
+                        error(errorNode, ts.Diagnostics.Abstract_property_0_in_class_1_cannot_be_accessed_in_the_constructor, symbolToString(prop), ts.getTextOfIdentifierOrLiteral(declaringClassDeclaration.name)); // TODO: GH#18217
+                    }
                     return false;
                 }
-                return true;
             }
             // Public properties are otherwise accessible.
             if (!(flags & 24 /* NonPublicAccessibilityModifier */)) {
@@ -67802,7 +69719,9 @@ var ts;
             if (flags & 8 /* Private */) {
                 var declaringClassDeclaration = ts.getClassLikeDeclarationOfSymbol(getParentOfSymbol(prop));
                 if (!isNodeWithinClass(node, declaringClassDeclaration)) {
-                    error(errorNode, ts.Diagnostics.Property_0_is_private_and_only_accessible_within_class_1, symbolToString(prop), typeToString(getDeclaringClass(prop)));
+                    if (reportError) {
+                        error(errorNode, ts.Diagnostics.Property_0_is_private_and_only_accessible_within_class_1, symbolToString(prop), typeToString(getDeclaringClass(prop)));
+                    }
                     return false;
                 }
                 return true;
@@ -67816,7 +69735,7 @@ var ts;
             // of the property as base classes
             var enclosingClass = forEachEnclosingClass(node, function (enclosingDeclaration) {
                 var enclosingClass = getDeclaredTypeOfSymbol(getSymbolOfNode(enclosingDeclaration));
-                return isClassDerivedFromDeclaringClasses(enclosingClass, prop) ? enclosingClass : undefined;
+                return isClassDerivedFromDeclaringClasses(enclosingClass, prop, writing) ? enclosingClass : undefined;
             });
             // A protected property is accessible if the property is within the declaring class or classes derived from it
             if (!enclosingClass) {
@@ -67824,7 +69743,9 @@ var ts;
                 // static member access is disallow
                 var thisParameter = void 0;
                 if (flags & 32 /* Static */ || !(thisParameter = getThisParameterFromNodeContext(node)) || !thisParameter.type) {
-                    error(errorNode, ts.Diagnostics.Property_0_is_protected_and_only_accessible_within_class_1_and_its_subclasses, symbolToString(prop), typeToString(getDeclaringClass(prop) || type));
+                    if (reportError) {
+                        error(errorNode, ts.Diagnostics.Property_0_is_protected_and_only_accessible_within_class_1_and_its_subclasses, symbolToString(prop), typeToString(getDeclaringClass(prop) || type));
+                    }
                     return false;
                 }
                 var thisType = getTypeFromTypeNode(thisParameter.type);
@@ -67839,7 +69760,9 @@ var ts;
                 type = type.isThisType ? getConstraintOfTypeParameter(type) : getBaseConstraintOfType(type); // TODO: GH#18217 Use a different variable that's allowed to be undefined
             }
             if (!type || !hasBaseType(type, enclosingClass)) {
-                error(errorNode, ts.Diagnostics.Property_0_is_protected_and_only_accessible_through_an_instance_of_class_1, symbolToString(prop), typeToString(enclosingClass));
+                if (reportError) {
+                    error(errorNode, ts.Diagnostics.Property_0_is_protected_and_only_accessible_through_an_instance_of_class_1_This_is_an_instance_of_class_2, symbolToString(prop), typeToString(enclosingClass), typeToString(type));
+                }
                 return false;
             }
             return true;
@@ -67895,20 +69818,20 @@ var ts;
             }
             return nonNullType;
         }
-        function checkPropertyAccessExpression(node) {
-            return node.flags & 32 /* OptionalChain */ ? checkPropertyAccessChain(node) :
-                checkPropertyAccessExpressionOrQualifiedName(node, node.expression, checkNonNullExpression(node.expression), node.name);
+        function checkPropertyAccessExpression(node, checkMode) {
+            return node.flags & 32 /* OptionalChain */ ? checkPropertyAccessChain(node, checkMode) :
+                checkPropertyAccessExpressionOrQualifiedName(node, node.expression, checkNonNullExpression(node.expression), node.name, checkMode);
         }
-        function checkPropertyAccessChain(node) {
+        function checkPropertyAccessChain(node, checkMode) {
             var leftType = checkExpression(node.expression);
             var nonOptionalType = getOptionalExpressionType(leftType, node.expression);
-            return propagateOptionalTypeMarker(checkPropertyAccessExpressionOrQualifiedName(node, node.expression, checkNonNullType(nonOptionalType, node.expression), node.name), node, nonOptionalType !== leftType);
+            return propagateOptionalTypeMarker(checkPropertyAccessExpressionOrQualifiedName(node, node.expression, checkNonNullType(nonOptionalType, node.expression), node.name, checkMode), node, nonOptionalType !== leftType);
         }
-        function checkQualifiedName(node) {
-            return checkPropertyAccessExpressionOrQualifiedName(node, node.left, checkNonNullExpression(node.left), node.right);
+        function checkQualifiedName(node, checkMode) {
+            return checkPropertyAccessExpressionOrQualifiedName(node, node.left, checkNonNullExpression(node.left), node.right, checkMode);
         }
         function isMethodAccessForCall(node) {
-            while (node.parent.kind === 207 /* ParenthesizedExpression */) {
+            while (node.parent.kind === 208 /* ParenthesizedExpression */) {
                 node = node.parent;
             }
             return ts.isCallOrNewExpression(node.parent) && node.parent.expression === node;
@@ -67943,14 +69866,13 @@ var ts;
             }
             var diagName = diagnosticName(right);
             if (propertyOnType) {
-                var typeValueDecl = propertyOnType.valueDeclaration;
-                var typeClass_1 = ts.getContainingClass(typeValueDecl);
-                ts.Debug.assert(!!typeClass_1);
+                var typeValueDecl = ts.Debug.checkDefined(propertyOnType.valueDeclaration);
+                var typeClass_1 = ts.Debug.checkDefined(ts.getContainingClass(typeValueDecl));
                 // We found a private identifier property with the same description.
                 // Either:
                 // - There is a lexically scoped private identifier AND it shadows the one we found on the type.
                 // - It is an attempt to access the private identifier outside of the class.
-                if (lexicallyScopedIdentifier) {
+                if (lexicallyScopedIdentifier === null || lexicallyScopedIdentifier === void 0 ? void 0 : lexicallyScopedIdentifier.valueDeclaration) {
                     var lexicalValueDecl = lexicallyScopedIdentifier.valueDeclaration;
                     var lexicalClass = ts.getContainingClass(lexicalValueDecl);
                     ts.Debug.assert(!!lexicalClass);
@@ -67969,17 +69891,42 @@ var ts;
             return (isConstructorDeclaredProperty(prop) || ts.isThisProperty(node) && isAutoTypedProperty(prop))
                 && ts.getThisContainer(node, /*includeArrowFunctions*/ true) === getDeclaringConstructor(prop);
         }
-        function checkPropertyAccessExpressionOrQualifiedName(node, left, leftType, right) {
+        function checkPropertyAccessExpressionOrQualifiedName(node, left, leftType, right, checkMode) {
             var parentSymbol = getNodeLinks(left).resolvedSymbol;
             var assignmentKind = ts.getAssignmentTargetKind(node);
             var apparentType = getApparentType(assignmentKind !== 0 /* None */ || isMethodAccessForCall(node) ? getWidenedType(leftType) : leftType);
-            if (ts.isPrivateIdentifier(right)) {
-                checkExternalEmitHelpers(node, 524288 /* ClassPrivateFieldGet */);
-            }
             var isAnyLike = isTypeAny(apparentType) || apparentType === silentNeverType;
             var prop;
             if (ts.isPrivateIdentifier(right)) {
+                if (languageVersion < 99 /* ESNext */) {
+                    if (assignmentKind !== 0 /* None */) {
+                        checkExternalEmitHelpers(node, 1048576 /* ClassPrivateFieldSet */);
+                    }
+                    if (assignmentKind !== 1 /* Definite */) {
+                        checkExternalEmitHelpers(node, 524288 /* ClassPrivateFieldGet */);
+                    }
+                }
                 var lexicallyScopedSymbol = lookupSymbolForPrivateIdentifierDeclaration(right.escapedText, right);
+                if (assignmentKind && lexicallyScopedSymbol && lexicallyScopedSymbol.valueDeclaration && ts.isMethodDeclaration(lexicallyScopedSymbol.valueDeclaration)) {
+                    grammarErrorOnNode(right, ts.Diagnostics.Cannot_assign_to_private_method_0_Private_methods_are_not_writable, ts.idText(right));
+                }
+                if ((lexicallyScopedSymbol === null || lexicallyScopedSymbol === void 0 ? void 0 : lexicallyScopedSymbol.valueDeclaration) && (compilerOptions.target === 99 /* ESNext */ && !useDefineForClassFields)) {
+                    var lexicalClass_1 = ts.getContainingClass(lexicallyScopedSymbol.valueDeclaration);
+                    var parentStaticFieldInitializer = ts.findAncestor(node, function (n) {
+                        if (n === lexicalClass_1)
+                            return "quit";
+                        if (ts.isPropertyDeclaration(n.parent) && ts.hasStaticModifier(n.parent) && n.parent.initializer === n && n.parent.parent === lexicalClass_1) {
+                            return true;
+                        }
+                        return false;
+                    });
+                    if (parentStaticFieldInitializer) {
+                        var parentStaticFieldInitializerSymbol = getSymbolOfNode(parentStaticFieldInitializer.parent);
+                        ts.Debug.assert(parentStaticFieldInitializerSymbol, "Initializer without declaration symbol");
+                        var diagnostic = error(node, ts.Diagnostics.Property_0_may_not_be_used_in_a_static_property_s_initializer_in_the_same_class_when_target_is_esnext_and_useDefineForClassFields_is_false, ts.symbolName(lexicallyScopedSymbol));
+                        ts.addRelatedInfo(diagnostic, ts.createDiagnosticForNode(parentStaticFieldInitializer.parent, ts.Diagnostics.Initializer_for_property_0, ts.symbolName(parentStaticFieldInitializerSymbol)));
+                    }
+                }
                 if (isAnyLike) {
                     if (lexicallyScopedSymbol) {
                         return apparentType;
@@ -67994,6 +69941,12 @@ var ts;
                 if (!prop && checkPrivateIdentifierPropertyAccess(leftType, right, lexicallyScopedSymbol)) {
                     return errorType;
                 }
+                else {
+                    var isSetonlyAccessor = prop && prop.flags & 65536 /* SetAccessor */ && !(prop.flags & 32768 /* GetAccessor */);
+                    if (isSetonlyAccessor && assignmentKind !== 1 /* Definite */) {
+                        error(node, ts.Diagnostics.Private_accessor_was_defined_without_a_getter);
+                    }
+                }
             }
             else {
                 if (isAnyLike) {
@@ -68041,33 +69994,38 @@ var ts;
                 }
             }
             else {
-                if (getDeclarationNodeFlagsFromSymbol(prop) & 134217728 /* Deprecated */ && isUncalledFunctionReference(node, prop)) {
+                if (prop.declarations && getDeclarationNodeFlagsFromSymbol(prop) & 134217728 /* Deprecated */ && isUncalledFunctionReference(node, prop)) {
                     addDeprecatedSuggestion(right, prop.declarations, right.escapedText);
                 }
                 checkPropertyNotUsedBeforeDeclaration(prop, node, right);
-                markPropertyAsReferenced(prop, node, left.kind === 107 /* ThisKeyword */);
+                markPropertyAsReferenced(prop, node, isSelfTypeAccess(left, parentSymbol));
                 getNodeLinks(node).resolvedSymbol = prop;
-                checkPropertyAccessibility(node, left.kind === 105 /* SuperKeyword */, apparentType, prop);
+                var writing = ts.isWriteAccess(node);
+                checkPropertyAccessibility(node, left.kind === 105 /* SuperKeyword */, writing, apparentType, prop);
                 if (isAssignmentToReadonlyEntity(node, prop, assignmentKind)) {
                     error(right, ts.Diagnostics.Cannot_assign_to_0_because_it_is_a_read_only_property, ts.idText(right));
                     return errorType;
                 }
-                propType = isThisPropertyAccessInConstructor(node, prop) ? autoType : getConstraintForLocation(getTypeOfSymbol(prop), node);
+                propType = isThisPropertyAccessInConstructor(node, prop) ? autoType : writing ? getSetAccessorTypeOfSymbol(prop) : getTypeOfSymbol(prop);
             }
-            return getFlowTypeOfAccessExpression(node, prop, propType, right);
+            return getFlowTypeOfAccessExpression(node, prop, propType, right, checkMode);
         }
-        function getFlowTypeOfAccessExpression(node, prop, propType, errorNode) {
+        function getFlowTypeOfAccessExpression(node, prop, propType, errorNode, checkMode) {
             // Only compute control flow type if this is a property access expression that isn't an
             // assignment target, and the referenced property was declared as a variable, property,
             // accessor, or optional method.
             var assignmentKind = ts.getAssignmentTargetKind(node);
             if (assignmentKind === 1 /* Definite */ ||
-                prop && !(prop.flags & (3 /* Variable */ | 4 /* Property */ | 98304 /* Accessor */)) && !(prop.flags & 8192 /* Method */ && propType.flags & 1048576 /* Union */)) {
+                prop &&
+                    !(prop.flags & (3 /* Variable */ | 4 /* Property */ | 98304 /* Accessor */))
+                    && !(prop.flags & 8192 /* Method */ && propType.flags & 1048576 /* Union */)
+                    && !isDuplicatedCommonJSExport(prop.declarations)) {
                 return propType;
             }
             if (propType === autoType) {
                 return getFlowTypeOfProperty(node, prop);
             }
+            propType = getNarrowableTypeForReference(propType, node, checkMode);
             // If strict null checks and strict property initialization checks are enabled, if we have
             // a this.xxx property access, if the property is an instance property without an initializer,
             // and if we are in a constructor of the same class as the property declaration, assume that
@@ -68077,7 +70035,7 @@ var ts;
                 var declaration = prop && prop.valueDeclaration;
                 if (declaration && isInstancePropertyWithoutInitializer(declaration)) {
                     var flowContainer = getControlFlowContainer(node);
-                    if (flowContainer.kind === 166 /* Constructor */ && flowContainer.parent === declaration.parent && !(declaration.flags & 8388608 /* Ambient */)) {
+                    if (flowContainer.kind === 167 /* Constructor */ && flowContainer.parent === declaration.parent && !(declaration.flags & 8388608 /* Ambient */)) {
                         assumeUninitialized = true;
                     }
                 }
@@ -68104,13 +70062,14 @@ var ts;
             var diagnosticMessage;
             var declarationName = ts.idText(right);
             if (isInPropertyInitializer(node)
+                && !isOptionalPropertyDeclaration(valueDeclaration)
                 && !(ts.isAccessExpression(node) && ts.isAccessExpression(node.expression))
                 && !isBlockScopedNameDeclaredBeforeUse(valueDeclaration, right)
-                && !isPropertyDeclaredInAncestorClass(prop)) {
+                && (compilerOptions.useDefineForClassFields || !isPropertyDeclaredInAncestorClass(prop))) {
                 diagnosticMessage = error(right, ts.Diagnostics.Property_0_is_used_before_its_initialization, declarationName);
             }
-            else if (valueDeclaration.kind === 252 /* ClassDeclaration */ &&
-                node.parent.kind !== 173 /* TypeReference */ &&
+            else if (valueDeclaration.kind === 253 /* ClassDeclaration */ &&
+                node.parent.kind !== 174 /* TypeReference */ &&
                 !(valueDeclaration.flags & 8388608 /* Ambient */) &&
                 !isBlockScopedNameDeclaredBeforeUse(valueDeclaration, right)) {
                 diagnosticMessage = error(right, ts.Diagnostics.Class_0_used_before_its_declaration, declarationName);
@@ -68122,22 +70081,22 @@ var ts;
         function isInPropertyInitializer(node) {
             return !!ts.findAncestor(node, function (node) {
                 switch (node.kind) {
-                    case 163 /* PropertyDeclaration */:
+                    case 164 /* PropertyDeclaration */:
                         return true;
-                    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 */:
+                    case 289 /* PropertyAssignment */:
+                    case 166 /* MethodDeclaration */:
+                    case 168 /* GetAccessor */:
+                    case 169 /* SetAccessor */:
+                    case 291 /* SpreadAssignment */:
+                    case 159 /* ComputedPropertyName */:
+                    case 229 /* TemplateSpan */:
+                    case 284 /* JsxExpression */:
+                    case 281 /* JsxAttribute */:
+                    case 282 /* JsxAttributes */:
+                    case 283 /* JsxSpreadAttribute */:
+                    case 276 /* JsxOpeningElement */:
+                    case 224 /* ExpressionWithTypeArguments */:
+                    case 287 /* HeritageClause */:
                         return false;
                     default:
                         return ts.isExpressionNode(node) ? false : "quit";
@@ -68209,7 +70168,10 @@ var ts;
                             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);
+                            var diagnostic = containerSeemsToBeEmptyDomElement(containingType)
+                                ? ts.Diagnostics.Property_0_does_not_exist_on_type_1_Try_changing_the_lib_compiler_option_to_include_dom
+                                : ts.Diagnostics.Property_0_does_not_exist_on_type_1;
+                            errorInfo = ts.chainDiagnosticMessages(elaborateNeverIntersection(errorInfo, containingType), diagnostic, missingProperty, container);
                         }
                     }
                 }
@@ -68220,9 +70182,14 @@ var ts;
             }
             diagnostics.add(resultDiagnostic);
         }
+        function containerSeemsToBeEmptyDomElement(containingType) {
+            return (compilerOptions.lib && !compilerOptions.lib.includes("dom")) &&
+                everyContainedType(containingType, function (type) { return type.symbol && /^(EventTarget|Node|((HTML[a-zA-Z]*)?Element))$/.test(ts.unescapeLeadingUnderscores(type.symbol.escapedName)); }) &&
+                isEmptyObjectType(containingType);
+        }
         function typeHasStaticProperty(propName, containingType) {
             var prop = containingType.symbol && getPropertyOfType(getTypeOfSymbol(containingType.symbol), propName);
-            return prop !== undefined && prop.valueDeclaration && ts.hasSyntacticModifier(prop.valueDeclaration, 32 /* Static */);
+            return prop !== undefined && !!prop.valueDeclaration && ts.hasSyntacticModifier(prop.valueDeclaration, 32 /* Static */);
         }
         function getSuggestedLibForNonExistentName(name) {
             var missingName = diagnosticName(name);
@@ -68253,7 +70220,15 @@ var ts;
             }
         }
         function getSuggestedSymbolForNonexistentProperty(name, containingType) {
-            return getSpellingSuggestionForName(ts.isString(name) ? name : ts.idText(name), getPropertiesOfType(containingType), 111551 /* Value */);
+            var props = getPropertiesOfType(containingType);
+            if (typeof name !== "string") {
+                var parent_2 = name.parent;
+                if (ts.isPropertyAccessExpression(parent_2)) {
+                    props = ts.filter(props, function (prop) { return isValidPropertyAccessForCompletions(parent_2, containingType, prop); });
+                }
+                name = ts.idText(name);
+            }
+            return getSpellingSuggestionForName(name, props, 111551 /* Value */);
         }
         function getSuggestedSymbolForNonexistentJSXAttribute(name, containingType) {
             var strName = ts.isString(name) ? name : ts.idText(name);
@@ -68348,20 +70323,20 @@ var ts;
                 return undefined;
             }
         }
-        function markPropertyAsReferenced(prop, nodeForCheckWriteOnly, isThisAccess) {
+        function markPropertyAsReferenced(prop, nodeForCheckWriteOnly, isSelfTypeAccess) {
             var valueDeclaration = prop && (prop.flags & 106500 /* ClassMember */) && prop.valueDeclaration;
             if (!valueDeclaration) {
                 return;
             }
             var hasPrivateModifier = ts.hasEffectiveModifier(valueDeclaration, 8 /* Private */);
-            var hasPrivateIdentifier = ts.isNamedDeclaration(prop.valueDeclaration) && ts.isPrivateIdentifier(prop.valueDeclaration.name);
+            var hasPrivateIdentifier = prop.valueDeclaration && ts.isNamedDeclaration(prop.valueDeclaration) && ts.isPrivateIdentifier(prop.valueDeclaration.name);
             if (!hasPrivateModifier && !hasPrivateIdentifier) {
                 return;
             }
             if (nodeForCheckWriteOnly && ts.isWriteOnlyAccess(nodeForCheckWriteOnly) && !(prop.flags & 65536 /* SetAccessor */)) {
                 return;
             }
-            if (isThisAccess) {
+            if (isSelfTypeAccess) {
                 // Find any FunctionLikeDeclaration because those create a new 'this' binding. But this should only matter for methods (or getters/setters).
                 var containingMethod = ts.findAncestor(nodeForCheckWriteOnly, ts.isFunctionLikeDeclaration);
                 if (containingMethod && containingMethod.symbol === prop) {
@@ -68370,18 +70345,22 @@ var ts;
             }
             (ts.getCheckFlags(prop) & 1 /* Instantiated */ ? getSymbolLinks(prop).target : prop).isReferenced = 67108863 /* All */;
         }
+        function isSelfTypeAccess(name, parent) {
+            return name.kind === 107 /* ThisKeyword */
+                || !!parent && ts.isEntityNameExpression(name) && parent === getResolvedSymbol(ts.getFirstIdentifier(name));
+        }
         function isValidPropertyAccess(node, propertyName) {
             switch (node.kind) {
-                case 201 /* PropertyAccessExpression */:
+                case 202 /* PropertyAccessExpression */:
                     return isValidPropertyAccessWithType(node, node.expression.kind === 105 /* SuperKeyword */, propertyName, getWidenedType(checkExpression(node.expression)));
-                case 157 /* QualifiedName */:
+                case 158 /* QualifiedName */:
                     return isValidPropertyAccessWithType(node, /*isSuper*/ false, propertyName, getWidenedType(checkExpression(node.left)));
-                case 195 /* ImportType */:
+                case 196 /* ImportType */:
                     return isValidPropertyAccessWithType(node, /*isSuper*/ false, propertyName, getTypeFromTypeNode(node));
             }
         }
         function isValidPropertyAccessForCompletions(node, type, property) {
-            return isValidPropertyAccessWithType(node, node.kind === 201 /* PropertyAccessExpression */ && node.expression.kind === 105 /* SuperKeyword */, property.escapedName, type);
+            return isValidPropertyAccessWithType(node, node.kind === 202 /* 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) {
@@ -68390,11 +70369,11 @@ var ts;
             }
             var prop = getPropertyOfType(type, propertyName);
             if (prop) {
-                if (ts.isPropertyAccessExpression(node) && prop.valueDeclaration && ts.isPrivateIdentifierPropertyDeclaration(prop.valueDeclaration)) {
+                if (prop.valueDeclaration && ts.isPrivateIdentifierClassElementDeclaration(prop.valueDeclaration)) {
                     var declClass_1 = ts.getContainingClass(prop.valueDeclaration);
                     return !ts.isOptionalChain(node) && !!ts.findAncestor(node, function (parent) { return parent === declClass_1; });
                 }
-                return checkPropertyAccessibility(node, isSuper, type, prop);
+                return checkPropertyAccessibility(node, isSuper, /*writing*/ false, type, prop, /* reportError */ false);
             }
             // In js files properties of unions are allowed in completion
             return ts.isInJSFile(node) && (type.flags & 1048576 /* Union */) !== 0 && type.types.some(function (elementType) { return isValidPropertyAccessWithType(node, isSuper, propertyName, elementType); });
@@ -68404,7 +70383,7 @@ var ts;
          */
         function getForInVariableSymbol(node) {
             var initializer = node.initializer;
-            if (initializer.kind === 250 /* VariableDeclarationList */) {
+            if (initializer.kind === 251 /* VariableDeclarationList */) {
                 var variable = initializer.declarations[0];
                 if (variable && !ts.isBindingPattern(variable.name)) {
                     return getSymbolOfNode(variable);
@@ -68433,7 +70412,7 @@ var ts;
                     var child = expr;
                     var node = expr.parent;
                     while (node) {
-                        if (node.kind === 238 /* ForInStatement */ &&
+                        if (node.kind === 239 /* ForInStatement */ &&
                             child === node.statement &&
                             getForInVariableSymbol(node) === symbol &&
                             hasNumericPropertyNames(getTypeOfExpression(node.expression))) {
@@ -68446,16 +70425,16 @@ var ts;
             }
             return false;
         }
-        function checkIndexedAccess(node) {
-            return node.flags & 32 /* OptionalChain */ ? checkElementAccessChain(node) :
-                checkElementAccessExpression(node, checkNonNullExpression(node.expression));
+        function checkIndexedAccess(node, checkMode) {
+            return node.flags & 32 /* OptionalChain */ ? checkElementAccessChain(node, checkMode) :
+                checkElementAccessExpression(node, checkNonNullExpression(node.expression), checkMode);
         }
-        function checkElementAccessChain(node) {
+        function checkElementAccessChain(node, checkMode) {
             var exprType = checkExpression(node.expression);
             var nonOptionalType = getOptionalExpressionType(exprType, node.expression);
-            return propagateOptionalTypeMarker(checkElementAccessExpression(node, checkNonNullType(nonOptionalType, node.expression)), node, nonOptionalType !== exprType);
+            return propagateOptionalTypeMarker(checkElementAccessExpression(node, checkNonNullType(nonOptionalType, node.expression), checkMode), node, nonOptionalType !== exprType);
         }
-        function checkElementAccessExpression(node, exprType) {
+        function checkElementAccessExpression(node, exprType, checkMode) {
             var objectType = ts.getAssignmentTargetKind(node) !== 0 /* None */ || isMethodAccessForCall(node) ? getWidenedType(exprType) : exprType;
             var indexExpression = node.argumentExpression;
             var indexType = checkExpression(indexExpression);
@@ -68471,42 +70450,7 @@ var ts;
                 2 /* Writing */ | (isGenericObjectType(objectType) && !isThisTypeParameter(objectType) ? 1 /* NoIndexSignatures */ : 0) :
                 0 /* None */;
             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) {
-            if (expressionType === errorType) {
-                // There is already an error, so no need to report one.
-                return false;
-            }
-            if (!ts.isWellKnownSymbolSyntactically(expression)) {
-                return false;
-            }
-            // Make sure the property type is the primitive symbol type
-            if ((expressionType.flags & 12288 /* ESSymbolLike */) === 0) {
-                if (reportError) {
-                    error(expression, ts.Diagnostics.A_computed_property_name_of_the_form_0_must_be_of_type_symbol, ts.getTextOfNode(expression));
-                }
-                return false;
-            }
-            // The name is Symbol.<someName>, so make sure Symbol actually resolves to the
-            // global Symbol object
-            var leftHandSide = expression.expression;
-            var leftHandSideSymbol = getResolvedSymbol(leftHandSide);
-            if (!leftHandSideSymbol) {
-                return false;
-            }
-            var globalESSymbol = getGlobalESSymbolConstructorSymbol(/*reportErrors*/ true);
-            if (!globalESSymbol) {
-                // Already errored when we tried to look up the symbol
-                return false;
-            }
-            if (leftHandSideSymbol !== globalESSymbol) {
-                if (reportError) {
-                    error(leftHandSide, ts.Diagnostics.Symbol_reference_does_not_refer_to_the_global_Symbol_constructor_object);
-                }
-                return false;
-            }
-            return true;
+            return checkIndexedAccessIndexType(getFlowTypeOfAccessExpression(node, getNodeLinks(node).resolvedSymbol, indexedAccessType, indexExpression, checkMode), node);
         }
         function callLikeExpressionMayHaveTypeArguments(node) {
             return ts.isCallOrNewExpression(node) || ts.isTaggedTemplateExpression(node) || ts.isJsxOpeningLikeElement(node);
@@ -68517,13 +70461,13 @@ var ts;
                 // This gets us diagnostics for the type arguments and marks them as referenced.
                 ts.forEach(node.typeArguments, checkSourceElement);
             }
-            if (node.kind === 205 /* TaggedTemplateExpression */) {
+            if (node.kind === 206 /* TaggedTemplateExpression */) {
                 checkExpression(node.template);
             }
             else if (ts.isJsxOpeningLikeElement(node)) {
                 checkExpression(node.attributes);
             }
-            else if (node.kind !== 161 /* Decorator */) {
+            else if (node.kind !== 162 /* Decorator */) {
                 ts.forEach(node.arguments, function (argument) {
                     checkExpression(argument);
                 });
@@ -68587,7 +70531,7 @@ var ts;
             }
         }
         function isSpreadArgument(arg) {
-            return !!arg && (arg.kind === 220 /* SpreadElement */ || arg.kind === 227 /* SyntheticExpression */ && arg.isSpread);
+            return !!arg && (arg.kind === 221 /* SpreadElement */ || arg.kind === 228 /* SyntheticExpression */ && arg.isSpread);
         }
         function getSpreadArgumentIndex(args) {
             return ts.findIndex(args, isSpreadArgument);
@@ -68604,9 +70548,9 @@ var ts;
             var callIsIncomplete = false; // In incomplete call we want to be lenient when we have too few arguments
             var effectiveParameterCount = getParameterCount(signature);
             var effectiveMinimumArguments = getMinArgumentCount(signature);
-            if (node.kind === 205 /* TaggedTemplateExpression */) {
+            if (node.kind === 206 /* TaggedTemplateExpression */) {
                 argCount = args.length;
-                if (node.template.kind === 218 /* TemplateExpression */) {
+                if (node.template.kind === 219 /* 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.
@@ -68621,7 +70565,7 @@ var ts;
                     callIsIncomplete = !!templateLiteral.isUnterminated;
                 }
             }
-            else if (node.kind === 161 /* Decorator */) {
+            else if (node.kind === 162 /* Decorator */) {
                 argCount = getDecoratorArgumentCount(node, signature);
             }
             else if (ts.isJsxOpeningLikeElement(node)) {
@@ -68635,7 +70579,7 @@ var ts;
             }
             else if (!node.arguments) {
                 // This only happens when we have something of the form: 'new C'
-                ts.Debug.assert(node.kind === 204 /* NewExpression */);
+                ts.Debug.assert(node.kind === 205 /* NewExpression */);
                 return getMinArgumentCount(signature) === 0;
             }
             else {
@@ -68710,7 +70654,7 @@ var ts;
             });
             if (!inferenceContext) {
                 applyToReturnTypes(contextualSignature, signature, function (source, target) {
-                    inferTypes(context.inferences, source, target, 64 /* ReturnType */);
+                    inferTypes(context.inferences, source, target, 128 /* ReturnType */);
                 });
             }
             return getSignatureInstantiation(signature, getInferredTypes(context), ts.isInJSFile(contextualSignature.declaration));
@@ -68738,7 +70682,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 !== 161 /* Decorator */) {
+            if (node.kind !== 162 /* 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
@@ -68760,7 +70704,7 @@ var ts;
                         instantiatedType;
                     var inferenceTargetType = getReturnTypeOfSignature(signature);
                     // Inferences made from return types have lower priority than all other inferences.
-                    inferTypes(context.inferences, inferenceSourceType, inferenceTargetType, 64 /* ReturnType */);
+                    inferTypes(context.inferences, inferenceSourceType, inferenceTargetType, 128 /* ReturnType */);
                     // Create a type mapper for instantiating generic contextual types using the inferences made
                     // from the return type. We need a separate inference pass here because (a) instantiation of
                     // the source type uses the outer context's return mapper (which excludes inferences made from
@@ -68786,7 +70730,7 @@ var ts;
             }
             for (var i = 0; i < argCount; i++) {
                 var arg = args[i];
-                if (arg.kind !== 222 /* OmittedExpression */) {
+                if (arg.kind !== 223 /* OmittedExpression */) {
                     var paramType = getTypeAtPosition(signature, i);
                     var argType = checkExpressionWithContextualType(arg, paramType, context, checkMode);
                     inferTypes(context.inferences, argType, paramType);
@@ -68810,7 +70754,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 === 227 /* SyntheticExpression */ ? arg.type :
+                    return getMutableArrayOrTupleType(arg.kind === 228 /* SyntheticExpression */ ? arg.type :
                         checkExpressionWithContextualType(arg.expression, restType, context, checkMode));
                 }
             }
@@ -68820,13 +70764,13 @@ var ts;
             for (var i = index; i < argCount; i++) {
                 var arg = args[i];
                 if (isSpreadArgument(arg)) {
-                    var spreadType = arg.kind === 227 /* SyntheticExpression */ ? arg.type : checkExpression(arg.expression);
+                    var spreadType = arg.kind === 228 /* 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 === 220 /* SpreadElement */ ? arg.expression : arg));
+                        types.push(checkIteratedTypeOrElementType(33 /* Spread */, spreadType, undefinedType, arg.kind === 221 /* SpreadElement */ ? arg.expression : arg));
                         flags.push(4 /* Rest */);
                     }
                 }
@@ -68837,7 +70781,7 @@ var ts;
                     types.push(hasPrimitiveContextualType ? getRegularTypeOfLiteralType(argType) : getWidenedLiteralType(argType));
                     flags.push(1 /* Required */);
                 }
-                if (arg.kind === 227 /* SyntheticExpression */ && arg.tupleNameSource) {
+                if (arg.kind === 228 /* SyntheticExpression */ && arg.tupleNameSource) {
                     names.push(arg.tupleNameSource);
                 }
             }
@@ -68981,7 +70925,7 @@ var ts;
                 return undefined;
             }
             var thisType = getThisTypeOfSignature(signature);
-            if (thisType && thisType !== voidType && node.kind !== 204 /* NewExpression */) {
+            if (thisType && thisType !== voidType && node.kind !== 205 /* 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.
@@ -68999,7 +70943,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 !== 222 /* OmittedExpression */) {
+                if (arg.kind !== 223 /* 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),
@@ -69044,7 +70988,7 @@ var ts;
          * Returns the this argument in calls like x.f(...) and x[f](...). Undefined otherwise.
          */
         function getThisArgumentOfCall(node) {
-            if (node.kind === 203 /* CallExpression */) {
+            if (node.kind === 204 /* CallExpression */) {
                 var callee = ts.skipOuterExpressions(node.expression);
                 if (ts.isAccessExpression(callee)) {
                     return callee.expression;
@@ -69061,17 +71005,17 @@ var ts;
          * Returns the effective arguments for an expression that works like a function invocation.
          */
         function getEffectiveCallArguments(node) {
-            if (node.kind === 205 /* TaggedTemplateExpression */) {
+            if (node.kind === 206 /* TaggedTemplateExpression */) {
                 var template = node.template;
                 var args_3 = [createSyntheticExpression(template, getGlobalTemplateStringsArrayType())];
-                if (template.kind === 218 /* TemplateExpression */) {
+                if (template.kind === 219 /* TemplateExpression */) {
                     ts.forEach(template.templateSpans, function (span) {
                         args_3.push(span.expression);
                     });
                 }
                 return args_3;
             }
-            if (node.kind === 161 /* Decorator */) {
+            if (node.kind === 162 /* Decorator */) {
                 return getEffectiveDecoratorArguments(node);
             }
             if (ts.isJsxOpeningLikeElement(node)) {
@@ -69082,10 +71026,10 @@ var ts;
             if (spreadIndex >= 0) {
                 // Create synthetic arguments from spreads of tuple types.
                 var effectiveArgs_1 = args.slice(0, spreadIndex);
-                var _loop_20 = function (i) {
+                var _loop_21 = function (i) {
                     var arg = args[i];
                     // We can call checkExpressionCached because spread expressions never have a contextual type.
-                    var spreadType = arg.kind === 220 /* SpreadElement */ && (flowLoopCount ? checkExpression(arg.expression) : checkExpressionCached(arg.expression));
+                    var spreadType = arg.kind === 221 /* SpreadElement */ && (flowLoopCount ? checkExpression(arg.expression) : checkExpressionCached(arg.expression));
                     if (spreadType && isTupleType(spreadType)) {
                         ts.forEach(getTypeArguments(spreadType), function (t, i) {
                             var _a;
@@ -69099,7 +71043,7 @@ var ts;
                     }
                 };
                 for (var i = spreadIndex; i < args.length; i++) {
-                    _loop_20(i);
+                    _loop_21(i);
                 }
                 return effectiveArgs_1;
             }
@@ -69112,30 +71056,30 @@ var ts;
             var parent = node.parent;
             var expr = node.expression;
             switch (parent.kind) {
-                case 252 /* ClassDeclaration */:
-                case 221 /* ClassExpression */:
+                case 253 /* ClassDeclaration */:
+                case 222 /* 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 160 /* Parameter */:
+                case 161 /* 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 === 166 /* Constructor */ ? getTypeOfSymbol(getSymbolOfNode(func)) : errorType),
+                        createSyntheticExpression(expr, parent.parent.kind === 167 /* Constructor */ ? getTypeOfSymbol(getSymbolOfNode(func)) : errorType),
                         createSyntheticExpression(expr, anyType),
                         createSyntheticExpression(expr, numberType)
                     ];
-                case 163 /* PropertyDeclaration */:
-                case 165 /* MethodDeclaration */:
-                case 167 /* GetAccessor */:
-                case 168 /* SetAccessor */:
+                case 164 /* PropertyDeclaration */:
+                case 166 /* MethodDeclaration */:
+                case 168 /* GetAccessor */:
+                case 169 /* 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 !== 163 /* PropertyDeclaration */ && languageVersion !== 0 /* ES3 */;
+                    var hasPropDesc = parent.kind !== 164 /* PropertyDeclaration */ && languageVersion !== 0 /* ES3 */;
                     return [
                         createSyntheticExpression(expr, getParentTypeOfClassElement(parent)),
                         createSyntheticExpression(expr, getClassElementPropertyKeyType(parent)),
@@ -69149,17 +71093,17 @@ var ts;
          */
         function getDecoratorArgumentCount(node, signature) {
             switch (node.parent.kind) {
-                case 252 /* ClassDeclaration */:
-                case 221 /* ClassExpression */:
+                case 253 /* ClassDeclaration */:
+                case 222 /* ClassExpression */:
                     return 1;
-                case 163 /* PropertyDeclaration */:
+                case 164 /* PropertyDeclaration */:
                     return 2;
-                case 165 /* MethodDeclaration */:
-                case 167 /* GetAccessor */:
-                case 168 /* SetAccessor */:
+                case 166 /* MethodDeclaration */:
+                case 168 /* GetAccessor */:
+                case 169 /* 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 160 /* Parameter */:
+                case 161 /* Parameter */:
                     return 3;
                 default:
                     return ts.Debug.fail();
@@ -69205,77 +71149,66 @@ var ts;
             return constructorSymbol === globalPromiseSymbol;
         }
         function getArgumentArityError(node, signatures, args) {
-            var min = Number.POSITIVE_INFINITY;
-            var max = Number.NEGATIVE_INFINITY;
-            var belowArgCount = Number.NEGATIVE_INFINITY;
-            var aboveArgCount = Number.POSITIVE_INFINITY;
-            var argCount = args.length;
+            var _a;
+            var spreadIndex = getSpreadArgumentIndex(args);
+            if (spreadIndex > -1) {
+                return ts.createDiagnosticForNode(args[spreadIndex], ts.Diagnostics.A_spread_argument_must_either_have_a_tuple_type_or_be_passed_to_a_rest_parameter);
+            }
+            var min = Number.POSITIVE_INFINITY; // smallest parameter count
+            var max = Number.NEGATIVE_INFINITY; // largest parameter count
+            var maxBelow = Number.NEGATIVE_INFINITY; // largest parameter count that is smaller than the number of arguments
+            var minAbove = Number.POSITIVE_INFINITY; // smallest parameter count that is larger than the number of arguments
             var closestSignature;
             for (var _i = 0, signatures_8 = signatures; _i < signatures_8.length; _i++) {
                 var sig = signatures_8[_i];
-                var minCount = getMinArgumentCount(sig);
-                var maxCount = getParameterCount(sig);
-                if (minCount < argCount && minCount > belowArgCount)
-                    belowArgCount = minCount;
-                if (argCount < maxCount && maxCount < aboveArgCount)
-                    aboveArgCount = maxCount;
-                if (minCount < min) {
-                    min = minCount;
+                var minParameter = getMinArgumentCount(sig);
+                var maxParameter = getParameterCount(sig);
+                // smallest/largest parameter counts
+                if (minParameter < min) {
+                    min = minParameter;
                     closestSignature = sig;
                 }
-                max = Math.max(max, maxCount);
+                max = Math.max(max, maxParameter);
+                // shortest parameter count *longer than the call*/longest parameter count *shorter than the call*
+                if (minParameter < args.length && minParameter > maxBelow)
+                    maxBelow = minParameter;
+                if (args.length < maxParameter && maxParameter < minAbove)
+                    minAbove = maxParameter;
             }
             var hasRestParameter = ts.some(signatures, hasEffectiveRestParameter);
-            var paramRange = hasRestParameter ? min :
-                min < max ? min + "-" + max :
-                    min;
-            var hasSpreadArgument = getSpreadArgumentIndex(args) > -1;
-            if (argCount <= max && hasSpreadArgument) {
-                argCount--;
-            }
-            var 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 :
-                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) {
-                    related = ts.createDiagnosticForNode(paramDecl, ts.isBindingPattern(paramDecl.name) ? ts.Diagnostics.An_argument_matching_this_binding_pattern_was_not_provided :
-                        ts.isRestParameter(paramDecl) ? ts.Diagnostics.Arguments_for_the_rest_parameter_0_were_not_provided : ts.Diagnostics.An_argument_for_0_was_not_provided, !paramDecl.name ? argCount : !ts.isBindingPattern(paramDecl.name) ? ts.idText(ts.getFirstIdentifier(paramDecl.name)) : undefined);
-                }
-            }
-            if (min < argCount && argCount < max) {
-                return getDiagnosticForCallNode(node, ts.Diagnostics.No_overload_expects_0_arguments_but_overloads_do_exist_that_expect_either_1_or_2_arguments, argCount, belowArgCount, aboveArgCount);
-            }
-            if (!hasSpreadArgument && argCount < min) {
-                var diagnostic_1 = getDiagnosticForCallNode(node, error, paramRange, argCount);
-                return related ? ts.addRelatedInfo(diagnostic_1, related) : diagnostic_1;
-            }
-            if (hasRestParameter || hasSpreadArgument) {
-                spanArray = ts.factory.createNodeArray(args);
-                if (hasSpreadArgument && argCount) {
-                    var nextArg = ts.elementAt(args, getSpreadArgumentIndex(args) + 1) || undefined;
-                    spanArray = ts.factory.createNodeArray(args.slice(max > argCount && nextArg ? args.indexOf(nextArg) : Math.min(max, args.length - 1)));
+            var parameterRange = hasRestParameter ? min
+                : min < max ? min + "-" + max
+                    : min;
+            var error = hasRestParameter ? ts.Diagnostics.Expected_at_least_0_arguments_but_got_1
+                : parameterRange === 1 && args.length === 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 (min < args.length && args.length < max) {
+                // between min and max, but with no matching overload
+                return getDiagnosticForCallNode(node, ts.Diagnostics.No_overload_expects_0_arguments_but_overloads_do_exist_that_expect_either_1_or_2_arguments, args.length, maxBelow, minAbove);
+            }
+            else if (args.length < min) {
+                // too short: put the error span on the call expression, not any of the args
+                var diagnostic = getDiagnosticForCallNode(node, error, parameterRange, args.length);
+                var parameter = (_a = closestSignature === null || closestSignature === void 0 ? void 0 : closestSignature.declaration) === null || _a === void 0 ? void 0 : _a.parameters[closestSignature.thisParameter ? args.length + 1 : args.length];
+                if (parameter) {
+                    var parameterError = ts.createDiagnosticForNode(parameter, ts.isBindingPattern(parameter.name) ? ts.Diagnostics.An_argument_matching_this_binding_pattern_was_not_provided
+                        : ts.isRestParameter(parameter) ? ts.Diagnostics.Arguments_for_the_rest_parameter_0_were_not_provided
+                            : ts.Diagnostics.An_argument_for_0_was_not_provided, !parameter.name ? args.length : !ts.isBindingPattern(parameter.name) ? ts.idText(ts.getFirstIdentifier(parameter.name)) : undefined);
+                    return ts.addRelatedInfo(diagnostic, parameterError);
                 }
+                return diagnostic;
             }
             else {
-                spanArray = ts.factory.createNodeArray(args.slice(max));
-            }
-            var pos = ts.first(spanArray).pos;
-            var end = ts.last(spanArray).end;
-            if (end === pos) {
-                end++;
+                // too long; error goes on the excess parameters
+                var errorSpan = ts.factory.createNodeArray(args.slice(max));
+                var pos = ts.first(errorSpan).pos;
+                var end = ts.last(errorSpan).end;
+                if (end === pos) {
+                    end++;
+                }
+                ts.setTextRangePosEnd(errorSpan, pos, end);
+                return ts.createDiagnosticForNodeArray(ts.getSourceFileOfNode(node), errorSpan, error, parameterRange, args.length);
             }
-            ts.setTextRangePosEnd(spanArray, pos, end);
-            var diagnostic = ts.createDiagnosticForNodeArray(ts.getSourceFileOfNode(node), spanArray, error, paramRange, argCount);
-            return related ? ts.addRelatedInfo(diagnostic, related) : diagnostic;
         }
         function getTypeArgumentArityError(node, signatures, typeArguments) {
             var argCount = typeArguments.length;
@@ -69306,8 +71239,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 === 205 /* TaggedTemplateExpression */;
-            var isDecorator = node.kind === 161 /* Decorator */;
+            var isTaggedTemplate = node.kind === 206 /* TaggedTemplateExpression */;
+            var isDecorator = node.kind === 162 /* Decorator */;
             var isJsxOpeningOrSelfClosingElement = ts.isJsxOpeningLikeElement(node);
             var reportErrors = !candidatesOutArray && produceDiagnostics;
             var typeArguments;
@@ -69369,7 +71302,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 === 203 /* CallExpression */ && node.arguments.hasTrailingComma;
+            var signatureHelpTrailingComma = !!(checkMode & 16 /* IsForSignatureHelp */) && node.kind === 204 /* 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
@@ -69423,7 +71356,7 @@ var ts;
                         var min_3 = Number.MAX_VALUE;
                         var minIndex = 0;
                         var i_1 = 0;
-                        var _loop_21 = function (c) {
+                        var _loop_22 = 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) {
@@ -69441,7 +71374,7 @@ var ts;
                         };
                         for (var _a = 0, candidatesForArgumentError_1 = candidatesForArgumentError; _a < candidatesForArgumentError_1.length; _a++) {
                             var c = candidatesForArgumentError_1[_a];
-                            _loop_21(c);
+                            _loop_22(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");
@@ -69599,7 +71532,7 @@ var ts;
             }
             var _a = ts.minAndMax(candidates, getNumNonRestParameters), minArgumentCount = _a.min, maxNonRestParam = _a.max;
             var parameters = [];
-            var _loop_22 = function (i) {
+            var _loop_23 = 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; });
@@ -69607,7 +71540,7 @@ var ts;
                 parameters.push(createCombinedSymbolFromTypes(symbols, ts.mapDefined(candidates, function (candidate) { return tryGetTypeAtPosition(candidate, i); })));
             };
             for (var i = 0; i < maxNonRestParam; i++) {
-                _loop_22(i);
+                _loop_23(i);
             }
             var restParameterSymbols = ts.mapDefined(candidates, function (c) { return signatureHasRestParameter(c) ? ts.last(c.parameters) : undefined; });
             var flags = 0 /* None */;
@@ -69799,7 +71732,7 @@ var ts;
         function isUntypedFunctionCall(funcType, apparentFuncType, numCallSignatures, numConstructSignatures) {
             // We exclude union types because we may have a union of function types that happen to have no common signatures.
             return isTypeAny(funcType) || isTypeAny(apparentFuncType) && !!(funcType.flags & 262144 /* TypeParameter */) ||
-                !numCallSignatures && !numConstructSignatures && !(apparentFuncType.flags & (1048576 /* Union */ | 131072 /* Never */)) && isTypeAssignableTo(funcType, globalFunctionType);
+                !numCallSignatures && !numConstructSignatures && !(apparentFuncType.flags & 1048576 /* Union */) && !(getReducedType(apparentFuncType).flags & 131072 /* Never */) && isTypeAssignableTo(funcType, globalFunctionType);
         }
         function resolveNewExpression(node, candidatesOutArray, checkMode) {
             if (node.arguments && languageVersion < 1 /* ES5 */) {
@@ -69914,7 +71847,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 !== 166 /* Constructor */) {
+            if (!modifiers || declaration.kind !== 167 /* Constructor */) {
                 return true;
             }
             var declaringClassDeclaration = ts.getClassLikeDeclarationOfSymbol(declaration.parent.symbol);
@@ -70058,16 +71991,16 @@ var ts;
          */
         function getDiagnosticHeadMessageForDecoratorResolution(node) {
             switch (node.parent.kind) {
-                case 252 /* ClassDeclaration */:
-                case 221 /* ClassExpression */:
+                case 253 /* ClassDeclaration */:
+                case 222 /* ClassExpression */:
                     return ts.Diagnostics.Unable_to_resolve_signature_of_class_decorator_when_called_as_an_expression;
-                case 160 /* Parameter */:
+                case 161 /* Parameter */:
                     return ts.Diagnostics.Unable_to_resolve_signature_of_parameter_decorator_when_called_as_an_expression;
-                case 163 /* PropertyDeclaration */:
+                case 164 /* PropertyDeclaration */:
                     return ts.Diagnostics.Unable_to_resolve_signature_of_property_decorator_when_called_as_an_expression;
-                case 165 /* MethodDeclaration */:
-                case 167 /* GetAccessor */:
-                case 168 /* SetAccessor */:
+                case 166 /* MethodDeclaration */:
+                case 168 /* GetAccessor */:
+                case 169 /* SetAccessor */:
                     return ts.Diagnostics.Unable_to_resolve_signature_of_method_decorator_when_called_as_an_expression;
                 default:
                     return ts.Debug.fail();
@@ -70162,16 +72095,16 @@ var ts;
         }
         function resolveSignature(node, candidatesOutArray, checkMode) {
             switch (node.kind) {
-                case 203 /* CallExpression */:
+                case 204 /* CallExpression */:
                     return resolveCallExpression(node, candidatesOutArray, checkMode);
-                case 204 /* NewExpression */:
+                case 205 /* NewExpression */:
                     return resolveNewExpression(node, candidatesOutArray, checkMode);
-                case 205 /* TaggedTemplateExpression */:
+                case 206 /* TaggedTemplateExpression */:
                     return resolveTaggedTemplateExpression(node, candidatesOutArray, checkMode);
-                case 161 /* Decorator */:
+                case 162 /* Decorator */:
                     return resolveDecorator(node, candidatesOutArray, checkMode);
-                case 275 /* JsxOpeningElement */:
-                case 274 /* JsxSelfClosingElement */:
+                case 276 /* JsxOpeningElement */:
+                case 275 /* JsxSelfClosingElement */:
                     return resolveJsxOpeningLikeElement(node, candidatesOutArray, checkMode);
             }
             throw ts.Debug.assertNever(node, "Branch in 'resolveSignature' should be unreachable.");
@@ -70303,7 +72236,7 @@ var ts;
                 return false;
             }
             var parent = node.parent;
-            while (parent && parent.kind === 201 /* PropertyAccessExpression */) {
+            while (parent && parent.kind === 202 /* PropertyAccessExpression */) {
                 parent = parent.parent;
             }
             if (parent && ts.isBinaryExpression(parent) && ts.isPrototypeAccess(parent.left) && parent.operatorToken.kind === 62 /* EqualsToken */) {
@@ -70330,12 +72263,12 @@ var ts;
             if (node.expression.kind === 105 /* SuperKeyword */) {
                 return voidType;
             }
-            if (node.kind === 204 /* NewExpression */) {
+            if (node.kind === 205 /* NewExpression */) {
                 var declaration = signature.declaration;
                 if (declaration &&
-                    declaration.kind !== 166 /* Constructor */ &&
-                    declaration.kind !== 170 /* ConstructSignature */ &&
-                    declaration.kind !== 175 /* ConstructorType */ &&
+                    declaration.kind !== 167 /* Constructor */ &&
+                    declaration.kind !== 171 /* ConstructSignature */ &&
+                    declaration.kind !== 176 /* ConstructorType */ &&
                     !ts.isJSDocConstructSignature(declaration) &&
                     !isJSConstructor(declaration)) {
                     // When resolved signature is a call signature (and not a construct signature) the result type is any
@@ -70355,7 +72288,7 @@ var ts;
             if (returnType.flags & 12288 /* ESSymbolLike */ && isSymbolOrSymbolForCall(node)) {
                 return getESSymbolLikeTypeForNode(ts.walkUpParenthesizedExpressions(node.parent));
             }
-            if (node.kind === 203 /* CallExpression */ && !node.questionDotToken && node.parent.kind === 233 /* ExpressionStatement */ &&
+            if (node.kind === 204 /* CallExpression */ && !node.questionDotToken && node.parent.kind === 234 /* 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);
@@ -70369,7 +72302,7 @@ var ts;
                 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 */;
+                    jsAssignmentType.objectFlags |= 8192 /* JSLiteral */;
                     return getIntersectionType([returnType, jsAssignmentType]);
                 }
             }
@@ -70385,20 +72318,20 @@ var ts;
         function getDeprecatedSuggestionNode(node) {
             node = ts.skipParentheses(node);
             switch (node.kind) {
-                case 203 /* CallExpression */:
-                case 161 /* Decorator */:
-                case 204 /* NewExpression */:
+                case 204 /* CallExpression */:
+                case 162 /* Decorator */:
+                case 205 /* NewExpression */:
                     return getDeprecatedSuggestionNode(node.expression);
-                case 205 /* TaggedTemplateExpression */:
+                case 206 /* TaggedTemplateExpression */:
                     return getDeprecatedSuggestionNode(node.tag);
-                case 275 /* JsxOpeningElement */:
-                case 274 /* JsxSelfClosingElement */:
+                case 276 /* JsxOpeningElement */:
+                case 275 /* JsxSelfClosingElement */:
                     return getDeprecatedSuggestionNode(node.tagName);
-                case 202 /* ElementAccessExpression */:
+                case 203 /* ElementAccessExpression */:
                     return node.argumentExpression;
-                case 201 /* PropertyAccessExpression */:
+                case 202 /* PropertyAccessExpression */:
                     return node.name;
-                case 173 /* TypeReference */:
+                case 174 /* TypeReference */:
                     var typeReference = node;
                     return ts.isQualifiedName(typeReference.typeName) ? typeReference.typeName.right : typeReference;
                 default:
@@ -70449,10 +72382,11 @@ var ts;
             return createPromiseReturnType(node, anyType);
         }
         function getTypeWithSyntheticDefaultImportType(type, symbol, originalSymbol) {
+            var _a;
             if (allowSyntheticDefaultImports && type && type !== errorType) {
                 var synthType = type;
                 if (!synthType.syntheticType) {
-                    var file = ts.find(originalSymbol.declarations, ts.isSourceFile);
+                    var file = (_a = originalSymbol.declarations) === null || _a === void 0 ? void 0 : _a.find(ts.isSourceFile);
                     var hasSyntheticDefault = canHaveSyntheticDefault(file, originalSymbol, /*dontResolveAlias*/ false);
                     if (hasSyntheticDefault) {
                         var memberTable = ts.createSymbolTable();
@@ -70490,9 +72424,9 @@ var ts;
                 return false;
             }
             var targetDeclarationKind = resolvedRequire.flags & 16 /* Function */
-                ? 251 /* FunctionDeclaration */
+                ? 252 /* FunctionDeclaration */
                 : resolvedRequire.flags & 3 /* Variable */
-                    ? 249 /* VariableDeclaration */
+                    ? 250 /* VariableDeclaration */
                     : 0 /* Unknown */;
             if (targetDeclarationKind !== 0 /* Unknown */) {
                 var decl = ts.getDeclarationOfKind(resolvedRequire, targetDeclarationKind);
@@ -70522,19 +72456,19 @@ var ts;
                 case 9 /* BigIntLiteral */:
                 case 109 /* TrueKeyword */:
                 case 94 /* FalseKeyword */:
-                case 199 /* ArrayLiteralExpression */:
-                case 200 /* ObjectLiteralExpression */:
-                case 218 /* TemplateExpression */:
+                case 200 /* ArrayLiteralExpression */:
+                case 201 /* ObjectLiteralExpression */:
+                case 219 /* TemplateExpression */:
                     return true;
-                case 207 /* ParenthesizedExpression */:
+                case 208 /* ParenthesizedExpression */:
                     return isValidConstAssertionArgument(node.expression);
-                case 214 /* PrefixUnaryExpression */:
+                case 215 /* 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 201 /* PropertyAccessExpression */:
-                case 202 /* ElementAccessExpression */:
+                case 202 /* PropertyAccessExpression */:
+                case 203 /* ElementAccessExpression */:
                     var expr = node.expression;
                     if (ts.isIdentifier(expr)) {
                         var symbol = getSymbolAtLocation(expr);
@@ -70590,7 +72524,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 === 166 /* Constructor */) {
+            else if (container.kind === 167 /* Constructor */) {
                 var symbol = getSymbolOfNode(container.parent);
                 return getTypeOfSymbol(symbol);
             }
@@ -70637,7 +72571,7 @@ var ts;
             return restParameter.escapedName;
         }
         function isValidDeclarationForTupleLabel(d) {
-            return d.kind === 192 /* NamedTupleMember */ || (ts.isParameter(d) && d.name && ts.isIdentifier(d.name));
+            return d.kind === 193 /* NamedTupleMember */ || (ts.isParameter(d) && d.name && ts.isIdentifier(d.name));
         }
         function getNameableDeclarationAtPosition(signature, pos) {
             var paramCount = signature.parameters.length - (signatureHasRestParameter(signature) ? 1 : 0);
@@ -70802,7 +72736,14 @@ var ts;
             }
         }
         function assignContextualParameterTypes(signature, context) {
-            signature.typeParameters = context.typeParameters;
+            if (context.typeParameters) {
+                if (!signature.typeParameters) {
+                    signature.typeParameters = context.typeParameters;
+                }
+                else {
+                    return; // This signature has already has a contextual inference performed and cached on it!
+                }
+            }
             if (context.thisParameter) {
                 var parameter = signature.thisParameter;
                 if (!parameter || parameter.valueDeclaration && !parameter.valueDeclaration.type) {
@@ -70913,7 +72854,7 @@ var ts;
             var yieldType;
             var nextType;
             var fallbackReturnType = voidType;
-            if (func.body.kind !== 230 /* Block */) { // Async or normal arrow function
+            if (func.body.kind !== 231 /* 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
@@ -71098,7 +73039,7 @@ var ts;
             return links.isExhaustive !== undefined ? links.isExhaustive : (links.isExhaustive = computeExhaustiveSwitchStatement(node));
         }
         function computeExhaustiveSwitchStatement(node) {
-            if (node.expression.kind === 211 /* TypeOfExpression */) {
+            if (node.expression.kind === 212 /* 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.
@@ -71161,11 +73102,11 @@ var ts;
         }
         function mayReturnNever(func) {
             switch (func.kind) {
-                case 208 /* FunctionExpression */:
-                case 209 /* ArrowFunction */:
+                case 209 /* FunctionExpression */:
+                case 210 /* ArrowFunction */:
                     return true;
-                case 165 /* MethodDeclaration */:
-                    return func.parent.kind === 200 /* ObjectLiteralExpression */;
+                case 166 /* MethodDeclaration */:
+                    return func.parent.kind === 201 /* ObjectLiteralExpression */;
                 default:
                     return false;
             }
@@ -71191,21 +73132,21 @@ 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 === 164 /* MethodSignature */ || ts.nodeIsMissing(func.body) || func.body.kind !== 230 /* Block */ || !functionHasImplicitReturn(func)) {
+            if (func.kind === 165 /* MethodSignature */ || ts.nodeIsMissing(func.body) || func.body.kind !== 231 /* Block */ || !functionHasImplicitReturn(func)) {
                 return;
             }
             var hasExplicitReturn = func.flags & 512 /* HasExplicitReturn */;
+            var errorNode = ts.getEffectiveReturnTypeNode(func) || func;
             if (type && type.flags & 131072 /* Never */) {
-                error(ts.getEffectiveReturnTypeNode(func), ts.Diagnostics.A_function_returning_never_cannot_have_a_reachable_end_point);
+                error(errorNode, ts.Diagnostics.A_function_returning_never_cannot_have_a_reachable_end_point);
             }
             else if (type && !hasExplicitReturn) {
                 // minimal check: function has syntactic return type annotation and no explicit return statements in the body
                 // this function does not conform to the specification.
-                // NOTE: having returnType !== undefined is a precondition for entering this branch so func.type will always be present
-                error(ts.getEffectiveReturnTypeNode(func), ts.Diagnostics.A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value);
+                error(errorNode, ts.Diagnostics.A_function_whose_declared_type_is_neither_void_nor_any_must_return_a_value);
             }
             else if (type && strictNullChecks && !isTypeAssignableTo(undefinedType, type)) {
-                error(ts.getEffectiveReturnTypeNode(func) || func, ts.Diagnostics.Function_lacks_ending_return_statement_and_return_type_does_not_include_undefined);
+                error(errorNode, ts.Diagnostics.Function_lacks_ending_return_statement_and_return_type_does_not_include_undefined);
             }
             else if (compilerOptions.noImplicitReturns) {
                 if (!type) {
@@ -71220,11 +73161,11 @@ var ts;
                         return;
                     }
                 }
-                error(ts.getEffectiveReturnTypeNode(func) || func, ts.Diagnostics.Not_all_code_paths_return_a_value);
+                error(errorNode, ts.Diagnostics.Not_all_code_paths_return_a_value);
             }
         }
         function checkFunctionExpressionOrObjectLiteralMethod(node, checkMode) {
-            ts.Debug.assert(node.kind !== 165 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
+            ts.Debug.assert(node.kind !== 166 /* 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)) {
@@ -71240,7 +73181,7 @@ var ts;
                         var returnType = getReturnTypeFromBody(node, checkMode);
                         var returnOnlySignature = createSignature(undefined, undefined, undefined, ts.emptyArray, returnType, /*resolvedTypePredicate*/ undefined, 0, 0 /* None */);
                         var returnOnlyType = createAnonymousType(node.symbol, emptySymbols, [returnOnlySignature], ts.emptyArray, undefined, undefined);
-                        returnOnlyType.objectFlags |= 2097152 /* NonInferrableType */;
+                        returnOnlyType.objectFlags |= 524288 /* NonInferrableType */;
                         return links.contextFreeType = returnOnlyType;
                     }
                 }
@@ -71248,7 +73189,7 @@ var ts;
             }
             // Grammar checking
             var hasGrammarError = checkGrammarFunctionLikeDeclaration(node);
-            if (!hasGrammarError && node.kind === 208 /* FunctionExpression */) {
+            if (!hasGrammarError && node.kind === 209 /* FunctionExpression */) {
                 checkGrammarForGenerator(node);
             }
             contextuallyCheckFunctionExpressionOrObjectLiteralMethod(node, checkMode);
@@ -71294,7 +73235,7 @@ var ts;
             }
         }
         function checkFunctionExpressionOrObjectLiteralMethodDeferred(node) {
-            ts.Debug.assert(node.kind !== 165 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
+            ts.Debug.assert(node.kind !== 166 /* MethodDeclaration */ || ts.isObjectLiteralMethod(node));
             var functionFlags = ts.getFunctionFlags(node);
             var returnType = getReturnTypeFromAnnotation(node);
             checkAllCodePathsInNonVoidFunctionReturnOrThrow(node, returnType);
@@ -71307,7 +73248,7 @@ var ts;
                     // checkFunctionExpressionBodies). So it must be done now.
                     getReturnTypeOfSignature(getSignatureFromDeclaration(node));
                 }
-                if (node.body.kind === 230 /* Block */) {
+                if (node.body.kind === 231 /* Block */) {
                     checkSourceElement(node.body);
                 }
                 else {
@@ -71397,7 +73338,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 === 166 /* Constructor */ || isJSConstructor(ctor)))) {
+                    if (!(ctor && (ctor.kind === 167 /* Constructor */ || isJSConstructor(ctor)))) {
                         return true;
                     }
                     if (symbol.valueDeclaration) {
@@ -71422,7 +73363,7 @@ var ts;
                     var symbol_2 = getNodeLinks(node).resolvedSymbol;
                     if (symbol_2.flags & 2097152 /* Alias */) {
                         var declaration = getDeclarationOfAliasSymbol(symbol_2);
-                        return !!declaration && declaration.kind === 263 /* NamespaceImport */;
+                        return !!declaration && declaration.kind === 264 /* NamespaceImport */;
                     }
                 }
             }
@@ -71503,7 +73444,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 !== 166 /* Constructor */ && (ts.getFunctionFlags(func) & 2 /* Async */) === 0) {
+                            if (func && func.kind !== 167 /* 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);
                             }
@@ -71715,7 +73656,7 @@ var ts;
             if (rightIsThis === void 0) { rightIsThis = false; }
             var properties = node.properties;
             var property = properties[propertyIndex];
-            if (property.kind === 288 /* PropertyAssignment */ || property.kind === 289 /* ShorthandPropertyAssignment */) {
+            if (property.kind === 289 /* PropertyAssignment */ || property.kind === 290 /* ShorthandPropertyAssignment */) {
                 var name = property.name;
                 var exprType = getLiteralTypeFromPropertyName(name);
                 if (isTypeUsableAsPropertyName(exprType)) {
@@ -71723,14 +73664,14 @@ var ts;
                     var prop = getPropertyOfType(objectLiteralType, text);
                     if (prop) {
                         markPropertyAsReferenced(prop, property, rightIsThis);
-                        checkPropertyAccessibility(property, /*isSuper*/ false, objectLiteralType, prop);
+                        checkPropertyAccessibility(property, /*isSuper*/ false, /*writing*/ true, objectLiteralType, prop);
                     }
                 }
                 var elementType = getIndexedAccessType(objectLiteralType, exprType, /*noUncheckedIndexedAccessCandidate*/ undefined, name, /*aliasSymbol*/ undefined, /*aliasTypeArguments*/ undefined, 16 /* ExpressionPosition */);
                 var type = getFlowTypeOfDestructuring(property, elementType);
-                return checkDestructuringAssignment(property.kind === 289 /* ShorthandPropertyAssignment */ ? property : property.initializer, type);
+                return checkDestructuringAssignment(property.kind === 290 /* ShorthandPropertyAssignment */ ? property : property.initializer, type);
             }
-            else if (property.kind === 290 /* SpreadAssignment */) {
+            else if (property.kind === 291 /* SpreadAssignment */) {
                 if (propertyIndex < properties.length - 1) {
                     error(property, ts.Diagnostics.A_rest_element_must_be_last_in_a_destructuring_pattern);
                 }
@@ -71768,7 +73709,7 @@ var ts;
             var inBoundsType = compilerOptions.noUncheckedIndexedAccess ? undefined : possiblyOutOfBoundsType;
             for (var i = 0; i < elements.length; i++) {
                 var type = possiblyOutOfBoundsType;
-                if (node.elements[i].kind === 220 /* SpreadElement */) {
+                if (node.elements[i].kind === 221 /* SpreadElement */) {
                     type = inBoundsType = inBoundsType !== null && inBoundsType !== void 0 ? inBoundsType : (checkIteratedTypeOrElementType(65 /* Destructuring */, sourceType, undefinedType, node) || errorType);
                 }
                 checkArrayLiteralDestructuringElementAssignment(node, sourceType, i, type, checkMode);
@@ -71778,8 +73719,8 @@ var ts;
         function checkArrayLiteralDestructuringElementAssignment(node, sourceType, elementIndex, elementType, checkMode) {
             var elements = node.elements;
             var element = elements[elementIndex];
-            if (element.kind !== 222 /* OmittedExpression */) {
-                if (element.kind !== 220 /* SpreadElement */) {
+            if (element.kind !== 223 /* OmittedExpression */) {
+                if (element.kind !== 221 /* SpreadElement */) {
                     var indexType = getLiteralType(elementIndex);
                     if (isArrayLikeType(sourceType)) {
                         // We create a synthetic expression so that getIndexedAccessType doesn't get confused
@@ -71797,7 +73738,7 @@ var ts;
                 }
                 else {
                     var restExpression = element.expression;
-                    if (restExpression.kind === 216 /* BinaryExpression */ && restExpression.operatorToken.kind === 62 /* EqualsToken */) {
+                    if (restExpression.kind === 217 /* BinaryExpression */ && restExpression.operatorToken.kind === 62 /* EqualsToken */) {
                         error(restExpression.operatorToken, ts.Diagnostics.A_rest_element_cannot_have_an_initializer);
                     }
                     else {
@@ -71813,7 +73754,7 @@ var ts;
         }
         function checkDestructuringAssignment(exprOrAssignment, sourceType, checkMode, rightIsThis) {
             var target;
-            if (exprOrAssignment.kind === 289 /* ShorthandPropertyAssignment */) {
+            if (exprOrAssignment.kind === 290 /* ShorthandPropertyAssignment */) {
                 var prop = exprOrAssignment;
                 if (prop.objectAssignmentInitializer) {
                     // In strict null checking mode, if a default value of a non-undefined type is specified, remove
@@ -71829,24 +73770,24 @@ var ts;
             else {
                 target = exprOrAssignment;
             }
-            if (target.kind === 216 /* BinaryExpression */ && target.operatorToken.kind === 62 /* EqualsToken */) {
+            if (target.kind === 217 /* BinaryExpression */ && target.operatorToken.kind === 62 /* EqualsToken */) {
                 checkBinaryExpression(target, checkMode);
                 target = target.left;
             }
-            if (target.kind === 200 /* ObjectLiteralExpression */) {
+            if (target.kind === 201 /* ObjectLiteralExpression */) {
                 return checkObjectLiteralAssignment(target, sourceType, rightIsThis);
             }
-            if (target.kind === 199 /* ArrayLiteralExpression */) {
+            if (target.kind === 200 /* 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 === 290 /* SpreadAssignment */ ?
+            var error = target.parent.kind === 291 /* 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 === 290 /* SpreadAssignment */ ?
+            var optionalError = target.parent.kind === 291 /* 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)) {
@@ -71871,8 +73812,8 @@ var ts;
                 case 78 /* Identifier */:
                 case 10 /* StringLiteral */:
                 case 13 /* RegularExpressionLiteral */:
-                case 205 /* TaggedTemplateExpression */:
-                case 218 /* TemplateExpression */:
+                case 206 /* TaggedTemplateExpression */:
+                case 219 /* TemplateExpression */:
                 case 14 /* NoSubstitutionTemplateLiteral */:
                 case 8 /* NumericLiteral */:
                 case 9 /* BigIntLiteral */:
@@ -71880,27 +73821,27 @@ var ts;
                 case 94 /* FalseKeyword */:
                 case 103 /* NullKeyword */:
                 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 */:
+                case 209 /* FunctionExpression */:
+                case 222 /* ClassExpression */:
+                case 210 /* ArrowFunction */:
+                case 200 /* ArrayLiteralExpression */:
+                case 201 /* ObjectLiteralExpression */:
+                case 212 /* TypeOfExpression */:
+                case 226 /* NonNullExpression */:
+                case 275 /* JsxSelfClosingElement */:
+                case 274 /* JsxElement */:
                     return true;
-                case 217 /* ConditionalExpression */:
+                case 218 /* ConditionalExpression */:
                     return isSideEffectFree(node.whenTrue) &&
                         isSideEffectFree(node.whenFalse);
-                case 216 /* BinaryExpression */:
+                case 217 /* BinaryExpression */:
                     if (ts.isAssignmentOperator(node.operatorToken.kind)) {
                         return false;
                     }
                     return isSideEffectFree(node.left) &&
                         isSideEffectFree(node.right);
-                case 214 /* PrefixUnaryExpression */:
-                case 215 /* PostfixUnaryExpression */:
+                case 215 /* PrefixUnaryExpression */:
+                case 216 /* PostfixUnaryExpression */:
                     // Unary operators ~, !, +, and - have no side effects.
                     // The rest do.
                     switch (node.operator) {
@@ -71912,9 +73853,9 @@ var ts;
                     }
                     return false;
                 // Some forms listed here for clarity
-                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
+                case 213 /* VoidExpression */: // Explicit opt-out
+                case 207 /* TypeAssertionExpression */: // Not SEF, but can produce useful type warnings
+                case 225 /* AsExpression */: // Not SEF, but can produce useful type warnings
                 default:
                     return false;
             }
@@ -71922,84 +73863,111 @@ var ts;
         function isTypeEqualityComparableTo(source, target) {
             return (target.flags & 98304 /* Nullable */) !== 0 || isTypeComparableTo(source, target);
         }
-        var CheckBinaryExpressionState;
-        (function (CheckBinaryExpressionState) {
-            CheckBinaryExpressionState[CheckBinaryExpressionState["MaybeCheckLeft"] = 0] = "MaybeCheckLeft";
-            CheckBinaryExpressionState[CheckBinaryExpressionState["CheckRight"] = 1] = "CheckRight";
-            CheckBinaryExpressionState[CheckBinaryExpressionState["FinishCheck"] = 2] = "FinishCheck";
-        })(CheckBinaryExpressionState || (CheckBinaryExpressionState = {}));
-        function checkBinaryExpression(node, checkMode) {
-            var workStacks = {
-                expr: [node],
-                state: [0 /* MaybeCheckLeft */],
-                leftType: [undefined]
+        function createCheckBinaryExpression() {
+            var trampoline = ts.createBinaryExpressionTrampoline(onEnter, onLeft, onOperator, onRight, onExit, foldState);
+            return function (node, checkMode) {
+                var result = trampoline(node, checkMode);
+                ts.Debug.assertIsDefined(result);
+                return result;
             };
-            var stackIndex = 0;
-            var lastResult;
-            while (stackIndex >= 0) {
-                node = workStacks.expr[stackIndex];
-                switch (workStacks.state[stackIndex]) {
-                    case 0 /* MaybeCheckLeft */: {
-                        if (ts.isInJSFile(node) && ts.getAssignedExpandoInitializer(node)) {
-                            finishInvocation(checkExpression(node.right, checkMode));
-                            break;
-                        }
-                        checkGrammarNullishCoalesceWithLogicalExpression(node);
-                        var operator = node.operatorToken.kind;
-                        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;
-                        }
-                        advanceState(1 /* CheckRight */);
-                        maybeCheckExpression(node.left);
-                        break;
-                    }
-                    case 1 /* CheckRight */: {
-                        var leftType = lastResult;
-                        workStacks.leftType[stackIndex] = leftType;
-                        var operator = node.operatorToken.kind;
-                        if (operator === 55 /* AmpersandAmpersandToken */ || operator === 56 /* BarBarToken */ || operator === 60 /* QuestionQuestionToken */) {
-                            if (operator === 55 /* AmpersandAmpersandToken */) {
-                                var parent = ts.walkUpParenthesizedExpressions(node.parent);
-                                checkTestingKnownTruthyCallableType(node.left, leftType, ts.isIfStatement(parent) ? parent.thenStatement : undefined);
-                            }
-                            checkTruthinessOfType(leftType, node.left);
+            function onEnter(node, state, checkMode) {
+                if (state) {
+                    state.stackIndex++;
+                    state.skip = false;
+                    setLeftType(state, /*type*/ undefined);
+                    setLastResult(state, /*type*/ undefined);
+                }
+                else {
+                    state = {
+                        checkMode: checkMode,
+                        skip: false,
+                        stackIndex: 0,
+                        typeStack: [undefined, undefined],
+                    };
+                }
+                if (ts.isInJSFile(node) && ts.getAssignedExpandoInitializer(node)) {
+                    state.skip = true;
+                    setLastResult(state, checkExpression(node.right, checkMode));
+                    return state;
+                }
+                checkGrammarNullishCoalesceWithLogicalExpression(node);
+                var operator = node.operatorToken.kind;
+                if (operator === 62 /* EqualsToken */ && (node.left.kind === 201 /* ObjectLiteralExpression */ || node.left.kind === 200 /* ArrayLiteralExpression */)) {
+                    state.skip = true;
+                    setLastResult(state, checkDestructuringAssignment(node.left, checkExpression(node.right, checkMode), checkMode, node.right.kind === 107 /* ThisKeyword */));
+                    return state;
+                }
+                return state;
+            }
+            function onLeft(left, state, _node) {
+                if (!state.skip) {
+                    return maybeCheckExpression(state, left);
+                }
+            }
+            function onOperator(operatorToken, state, node) {
+                if (!state.skip) {
+                    var leftType = getLastResult(state);
+                    ts.Debug.assertIsDefined(leftType);
+                    setLeftType(state, leftType);
+                    setLastResult(state, /*type*/ undefined);
+                    var operator = operatorToken.kind;
+                    if (operator === 55 /* AmpersandAmpersandToken */ || operator === 56 /* BarBarToken */ || operator === 60 /* QuestionQuestionToken */) {
+                        if (operator === 55 /* AmpersandAmpersandToken */) {
+                            var parent = ts.walkUpParenthesizedExpressions(node.parent);
+                            checkTestingKnownTruthyCallableOrAwaitableType(node.left, leftType, ts.isIfStatement(parent) ? parent.thenStatement : undefined);
                         }
-                        advanceState(2 /* FinishCheck */);
-                        maybeCheckExpression(node.right);
-                        break;
-                    }
-                    case 2 /* FinishCheck */: {
-                        var leftType = workStacks.leftType[stackIndex];
-                        var rightType = lastResult;
-                        finishInvocation(checkBinaryLikeExpressionWorker(node.left, node.operatorToken, node.right, leftType, rightType, node));
-                        break;
+                        checkTruthinessOfType(leftType, node.left);
                     }
-                    default: return ts.Debug.fail("Invalid state " + workStacks.state[stackIndex] + " for checkBinaryExpression");
                 }
             }
-            return lastResult;
-            function finishInvocation(result) {
-                lastResult = result;
-                stackIndex--;
-            }
-            /**
-             * Note that `advanceState` sets the _current_ head state, and that `maybeCheckExpression` potentially pushes on a new
-             * head state; so `advanceState` must be called before any `maybeCheckExpression` during a state's execution.
-             */
-            function advanceState(nextState) {
-                workStacks.state[stackIndex] = nextState;
+            function onRight(right, state, _node) {
+                if (!state.skip) {
+                    return maybeCheckExpression(state, right);
+                }
             }
-            function maybeCheckExpression(node) {
-                if (ts.isBinaryExpression(node)) {
-                    stackIndex++;
-                    workStacks.expr[stackIndex] = node;
-                    workStacks.state[stackIndex] = 0 /* MaybeCheckLeft */;
-                    workStacks.leftType[stackIndex] = undefined;
+            function onExit(node, state) {
+                var result;
+                if (state.skip) {
+                    result = getLastResult(state);
                 }
                 else {
-                    lastResult = checkExpression(node, checkMode);
+                    var leftType = getLeftType(state);
+                    ts.Debug.assertIsDefined(leftType);
+                    var rightType = getLastResult(state);
+                    ts.Debug.assertIsDefined(rightType);
+                    result = checkBinaryLikeExpressionWorker(node.left, node.operatorToken, node.right, leftType, rightType, node);
+                }
+                state.skip = false;
+                setLeftType(state, /*type*/ undefined);
+                setLastResult(state, /*type*/ undefined);
+                state.stackIndex--;
+                return result;
+            }
+            function foldState(state, result, _side) {
+                setLastResult(state, result);
+                return state;
+            }
+            function maybeCheckExpression(state, node) {
+                if (ts.isBinaryExpression(node)) {
+                    return node;
                 }
+                setLastResult(state, checkExpression(node, state.checkMode));
+            }
+            function getLeftType(state) {
+                return state.typeStack[state.stackIndex];
+            }
+            function setLeftType(state, type) {
+                state.typeStack[state.stackIndex] = type;
+            }
+            function getLastResult(state) {
+                return state.typeStack[state.stackIndex + 1];
+            }
+            function setLastResult(state, type) {
+                // To reduce overhead, reuse the next stack entry to store the
+                // last result. This avoids the overhead of an additional property
+                // on `WorkArea` and reuses empty stack entries as we walk back up
+                // the stack.
+                state.typeStack[state.stackIndex + 1] = type;
             }
         }
         function checkGrammarNullishCoalesceWithLogicalExpression(node) {
@@ -72017,7 +73985,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 === 200 /* ObjectLiteralExpression */ || left.kind === 199 /* ArrayLiteralExpression */)) {
+            if (operator === 62 /* EqualsToken */ && (left.kind === 201 /* ObjectLiteralExpression */ || left.kind === 200 /* ArrayLiteralExpression */)) {
                 return checkDestructuringAssignment(left, checkExpression(right, checkMode), checkMode, right.kind === 107 /* ThisKeyword */);
             }
             var leftType;
@@ -72252,7 +74220,7 @@ var ts;
                         if (propType.symbol && propType.symbol.flags & 32 /* Class */) {
                             var name = prop.escapedName;
                             var symbol = resolveName(prop.valueDeclaration, name, 788968 /* Type */, undefined, name, /*isUse*/ false);
-                            if (symbol && symbol.declarations.some(ts.isJSDocTypedefTag)) {
+                            if ((symbol === null || symbol === void 0 ? void 0 : symbol.declarations) && symbol.declarations.some(ts.isJSDocTypedefTag)) {
                                 addDuplicateDeclarationErrorsForSymbols(symbol, ts.Diagnostics.Duplicate_identifier_0, ts.unescapeLeadingUnderscores(name), prop);
                                 addDuplicateDeclarationErrorsForSymbols(prop, ts.Diagnostics.Duplicate_identifier_0, ts.unescapeLeadingUnderscores(name), symbol);
                             }
@@ -72447,7 +74415,7 @@ var ts;
         }
         function checkConditionalExpression(node, checkMode) {
             var type = checkTruthinessExpression(node.condition);
-            checkTestingKnownTruthyCallableType(node.condition, type, node.whenTrue);
+            checkTestingKnownTruthyCallableOrAwaitableType(node.condition, type, node.whenTrue);
             var type1 = checkExpression(node.whenTrue, checkMode);
             var type2 = checkExpression(node.whenFalse, checkMode);
             return getUnionType([type1, type2], 2 /* Subtype */);
@@ -72464,10 +74432,14 @@ var ts;
                 texts.push(span.literal.text);
                 types.push(isTypeAssignableTo(type, templateConstraintType) ? type : stringType);
             }
-            return isConstContext(node) ? getTemplateLiteralType(texts, types) : stringType;
+            return isConstContext(node) || someType(getContextualType(node) || unknownType, isTemplateLiteralContextualType) ? getTemplateLiteralType(texts, types) : stringType;
+        }
+        function isTemplateLiteralContextualType(type) {
+            return !!(type.flags & (128 /* StringLiteral */ | 134217728 /* TemplateLiteral */) ||
+                type.flags & 58982400 /* InstantiableNonPrimitive */ && maybeTypeOfKind(getBaseConstraintOfType(type) || unknownType, 402653316 /* StringLike */));
         }
         function getContextNode(node) {
-            if (node.kind === 281 /* JsxAttributes */ && !ts.isJsxSelfClosingElement(node.parent)) {
+            if (node.kind === 282 /* 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;
@@ -72516,13 +74488,13 @@ var ts;
         }
         function isTypeAssertion(node) {
             node = ts.skipParentheses(node);
-            return node.kind === 206 /* TypeAssertionExpression */ || node.kind === 224 /* AsExpression */;
+            return node.kind === 207 /* TypeAssertionExpression */ || node.kind === 225 /* 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 === 197 /* ArrayBindingPattern */ &&
+            return ts.isParameter(declaration) && declaration.name.kind === 198 /* ArrayBindingPattern */ &&
                 isTupleType(type) && !type.target.hasRestElement && getTypeReferenceArity(type) < declaration.name.elements.length ?
                 padTupleType(type, declaration.name) : type;
         }
@@ -72532,7 +74504,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 === 198 /* BindingElement */ && e.dotDotDotToken)) {
+                if (i < patternElements.length - 1 || !(e.kind === 199 /* 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)) {
@@ -72599,7 +74571,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 === 158 /* ComputedPropertyName */) {
+            if (node.name.kind === 159 /* ComputedPropertyName */) {
                 checkComputedPropertyName(node.name);
             }
             return checkExpressionForMutableLocation(node.initializer, checkMode);
@@ -72610,7 +74582,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 === 158 /* ComputedPropertyName */) {
+            if (node.name.kind === 159 /* ComputedPropertyName */) {
                 checkComputedPropertyName(node.name);
             }
             var uninstantiatedType = checkFunctionExpressionOrObjectLiteralMethod(node, checkMode);
@@ -72846,11 +74818,11 @@ var ts;
             // - 'left' in property access
             // - 'object' in indexed access
             // - target in rhs of import statement
-            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
+            var ok = (node.parent.kind === 202 /* PropertyAccessExpression */ && node.parent.expression === node) ||
+                (node.parent.kind === 203 /* ElementAccessExpression */ && node.parent.expression === node) ||
+                ((node.kind === 78 /* Identifier */ || node.kind === 158 /* QualifiedName */) && isInRightSideOfImportOrExportAssignment(node) ||
+                    (node.parent.kind === 177 /* TypeQuery */ && node.parent.exprName === node)) ||
+                (node.parent.kind === 271 /* 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);
             }
@@ -72875,15 +74847,15 @@ 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 221 /* ClassExpression */:
-                    case 208 /* FunctionExpression */:
-                    case 209 /* ArrowFunction */:
+                    case 222 /* ClassExpression */:
+                    case 209 /* FunctionExpression */:
+                    case 210 /* ArrowFunction */:
                         cancellationToken.throwIfCancellationRequested();
                 }
             }
             switch (kind) {
                 case 78 /* Identifier */:
-                    return checkIdentifier(node);
+                    return checkIdentifier(node, checkMode);
                 case 107 /* ThisKeyword */:
                     return checkThisExpression(node);
                 case 105 /* SuperKeyword */:
@@ -72903,78 +74875,78 @@ var ts;
                     return trueType;
                 case 94 /* FalseKeyword */:
                     return falseType;
-                case 218 /* TemplateExpression */:
+                case 219 /* TemplateExpression */:
                     return checkTemplateExpression(node);
                 case 13 /* RegularExpressionLiteral */:
                     return globalRegExpType;
-                case 199 /* ArrayLiteralExpression */:
+                case 200 /* ArrayLiteralExpression */:
                     return checkArrayLiteral(node, checkMode, forceTuple);
-                case 200 /* ObjectLiteralExpression */:
+                case 201 /* ObjectLiteralExpression */:
                     return checkObjectLiteral(node, checkMode);
-                case 201 /* PropertyAccessExpression */:
-                    return checkPropertyAccessExpression(node);
-                case 157 /* QualifiedName */:
-                    return checkQualifiedName(node);
-                case 202 /* ElementAccessExpression */:
-                    return checkIndexedAccess(node);
-                case 203 /* CallExpression */:
+                case 202 /* PropertyAccessExpression */:
+                    return checkPropertyAccessExpression(node, checkMode);
+                case 158 /* QualifiedName */:
+                    return checkQualifiedName(node, checkMode);
+                case 203 /* ElementAccessExpression */:
+                    return checkIndexedAccess(node, checkMode);
+                case 204 /* CallExpression */:
                     if (node.expression.kind === 99 /* ImportKeyword */) {
                         return checkImportCallExpression(node);
                     }
                 // falls through
-                case 204 /* NewExpression */:
+                case 205 /* NewExpression */:
                     return checkCallExpression(node, checkMode);
-                case 205 /* TaggedTemplateExpression */:
+                case 206 /* TaggedTemplateExpression */:
                     return checkTaggedTemplateExpression(node);
-                case 207 /* ParenthesizedExpression */:
+                case 208 /* ParenthesizedExpression */:
                     return checkParenthesizedExpression(node, checkMode);
-                case 221 /* ClassExpression */:
+                case 222 /* ClassExpression */:
                     return checkClassExpression(node);
-                case 208 /* FunctionExpression */:
-                case 209 /* ArrowFunction */:
+                case 209 /* FunctionExpression */:
+                case 210 /* ArrowFunction */:
                     return checkFunctionExpressionOrObjectLiteralMethod(node, checkMode);
-                case 211 /* TypeOfExpression */:
+                case 212 /* TypeOfExpression */:
                     return checkTypeOfExpression(node);
-                case 206 /* TypeAssertionExpression */:
-                case 224 /* AsExpression */:
+                case 207 /* TypeAssertionExpression */:
+                case 225 /* AsExpression */:
                     return checkAssertion(node);
-                case 225 /* NonNullExpression */:
+                case 226 /* NonNullExpression */:
                     return checkNonNullAssertion(node);
-                case 226 /* MetaProperty */:
+                case 227 /* MetaProperty */:
                     return checkMetaProperty(node);
-                case 210 /* DeleteExpression */:
+                case 211 /* DeleteExpression */:
                     return checkDeleteExpression(node);
-                case 212 /* VoidExpression */:
+                case 213 /* VoidExpression */:
                     return checkVoidExpression(node);
-                case 213 /* AwaitExpression */:
+                case 214 /* AwaitExpression */:
                     return checkAwaitExpression(node);
-                case 214 /* PrefixUnaryExpression */:
+                case 215 /* PrefixUnaryExpression */:
                     return checkPrefixUnaryExpression(node);
-                case 215 /* PostfixUnaryExpression */:
+                case 216 /* PostfixUnaryExpression */:
                     return checkPostfixUnaryExpression(node);
-                case 216 /* BinaryExpression */:
+                case 217 /* BinaryExpression */:
                     return checkBinaryExpression(node, checkMode);
-                case 217 /* ConditionalExpression */:
+                case 218 /* ConditionalExpression */:
                     return checkConditionalExpression(node, checkMode);
-                case 220 /* SpreadElement */:
+                case 221 /* SpreadElement */:
                     return checkSpreadExpression(node, checkMode);
-                case 222 /* OmittedExpression */:
+                case 223 /* OmittedExpression */:
                     return undefinedWideningType;
-                case 219 /* YieldExpression */:
+                case 220 /* YieldExpression */:
                     return checkYieldExpression(node);
-                case 227 /* SyntheticExpression */:
+                case 228 /* SyntheticExpression */:
                     return checkSyntheticExpression(node);
-                case 283 /* JsxExpression */:
+                case 284 /* JsxExpression */:
                     return checkJsxExpression(node, checkMode);
-                case 273 /* JsxElement */:
+                case 274 /* JsxElement */:
                     return checkJsxElement(node, checkMode);
-                case 274 /* JsxSelfClosingElement */:
+                case 275 /* JsxSelfClosingElement */:
                     return checkJsxSelfClosingElement(node, checkMode);
-                case 277 /* JsxFragment */:
+                case 278 /* JsxFragment */:
                     return checkJsxFragment(node);
-                case 281 /* JsxAttributes */:
+                case 282 /* JsxAttributes */:
                     return checkJsxAttributes(node, checkMode);
-                case 275 /* JsxOpeningElement */:
+                case 276 /* JsxOpeningElement */:
                     ts.Debug.fail("Shouldn't ever directly check a JsxOpeningElement");
             }
             return errorType;
@@ -73010,11 +74982,11 @@ var ts;
             checkGrammarDecoratorsAndModifiers(node);
             checkVariableLikeDeclaration(node);
             var func = ts.getContainingFunction(node);
-            if (ts.hasSyntacticModifier(node, 92 /* ParameterPropertyModifier */)) {
-                if (!(func.kind === 166 /* Constructor */ && ts.nodeIsPresent(func.body))) {
+            if (ts.hasSyntacticModifier(node, 16476 /* ParameterPropertyModifier */)) {
+                if (!(func.kind === 167 /* Constructor */ && ts.nodeIsPresent(func.body))) {
                     error(node, ts.Diagnostics.A_parameter_property_is_only_allowed_in_a_constructor_implementation);
                 }
-                if (func.kind === 166 /* Constructor */ && ts.isIdentifier(node.name) && node.name.escapedText === "constructor") {
+                if (func.kind === 167 /* Constructor */ && ts.isIdentifier(node.name) && node.name.escapedText === "constructor") {
                     error(node.name, ts.Diagnostics.constructor_cannot_be_used_as_a_parameter_property_name);
                 }
             }
@@ -73025,13 +74997,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 === 166 /* Constructor */ || func.kind === 170 /* ConstructSignature */ || func.kind === 175 /* ConstructorType */) {
+                if (func.kind === 167 /* Constructor */ || func.kind === 171 /* ConstructSignature */ || func.kind === 176 /* ConstructorType */) {
                     error(node, ts.Diagnostics.A_constructor_cannot_have_a_this_parameter);
                 }
-                if (func.kind === 209 /* ArrowFunction */) {
+                if (func.kind === 210 /* ArrowFunction */) {
                     error(node, ts.Diagnostics.An_arrow_function_cannot_have_a_this_parameter);
                 }
-                if (func.kind === 167 /* GetAccessor */ || func.kind === 168 /* SetAccessor */) {
+                if (func.kind === 168 /* GetAccessor */ || func.kind === 169 /* SetAccessor */) {
                     error(node, ts.Diagnostics.get_and_set_accessors_cannot_declare_this_parameters);
                 }
             }
@@ -73089,13 +75061,13 @@ var ts;
         }
         function getTypePredicateParent(node) {
             switch (node.parent.kind) {
-                case 209 /* ArrowFunction */:
-                case 169 /* CallSignature */:
-                case 251 /* FunctionDeclaration */:
-                case 208 /* FunctionExpression */:
-                case 174 /* FunctionType */:
-                case 165 /* MethodDeclaration */:
-                case 164 /* MethodSignature */:
+                case 210 /* ArrowFunction */:
+                case 170 /* CallSignature */:
+                case 252 /* FunctionDeclaration */:
+                case 209 /* FunctionExpression */:
+                case 175 /* FunctionType */:
+                case 166 /* MethodDeclaration */:
+                case 165 /* MethodSignature */:
                     var parent = node.parent;
                     if (node === parent.type) {
                         return parent;
@@ -73113,7 +75085,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 === 197 /* ArrayBindingPattern */ || name.kind === 196 /* ObjectBindingPattern */) {
+                else if (name.kind === 198 /* ArrayBindingPattern */ || name.kind === 197 /* ObjectBindingPattern */) {
                     if (checkIfTypePredicateVariableIsDeclaredInBindingPattern(name, predicateVariableNode, predicateVariableName)) {
                         return true;
                     }
@@ -73122,13 +75094,13 @@ var ts;
         }
         function checkSignatureDeclaration(node) {
             // Grammar checking
-            if (node.kind === 171 /* IndexSignature */) {
+            if (node.kind === 172 /* 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 === 174 /* FunctionType */ || node.kind === 251 /* FunctionDeclaration */ || node.kind === 175 /* ConstructorType */ ||
-                node.kind === 169 /* CallSignature */ || node.kind === 166 /* Constructor */ ||
-                node.kind === 170 /* ConstructSignature */) {
+            else if (node.kind === 175 /* FunctionType */ || node.kind === 252 /* FunctionDeclaration */ || node.kind === 176 /* ConstructorType */ ||
+                node.kind === 170 /* CallSignature */ || node.kind === 167 /* Constructor */ ||
+                node.kind === 171 /* ConstructSignature */) {
                 checkGrammarFunctionLikeDeclaration(node);
             }
             var functionFlags = ts.getFunctionFlags(node);
@@ -73158,10 +75130,10 @@ var ts;
                 var returnTypeNode = ts.getEffectiveReturnTypeNode(node);
                 if (noImplicitAny && !returnTypeNode) {
                     switch (node.kind) {
-                        case 170 /* ConstructSignature */:
+                        case 171 /* ConstructSignature */:
                             error(node, ts.Diagnostics.Construct_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type);
                             break;
-                        case 169 /* CallSignature */:
+                        case 170 /* CallSignature */:
                             error(node, ts.Diagnostics.Call_signature_which_lacks_return_type_annotation_implicitly_has_an_any_return_type);
                             break;
                     }
@@ -73191,7 +75163,7 @@ var ts;
                         checkAsyncFunctionReturnType(node, returnTypeNode);
                     }
                 }
-                if (node.kind !== 171 /* IndexSignature */ && node.kind !== 308 /* JSDocFunctionType */) {
+                if (node.kind !== 172 /* IndexSignature */ && node.kind !== 309 /* JSDocFunctionType */) {
                     registerForUnusedIdentifiersCheck(node);
                 }
             }
@@ -73203,7 +75175,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 === 166 /* Constructor */) {
+                if (member.kind === 167 /* 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)) {
@@ -73215,25 +75187,27 @@ var ts;
                     var isStatic = ts.hasSyntacticModifier(member, 32 /* Static */);
                     var name = member.name;
                     if (!name) {
-                        return;
+                        continue;
                     }
-                    var names = ts.isPrivateIdentifier(name) ? privateIdentifiers :
+                    var isPrivate = ts.isPrivateIdentifier(name);
+                    var privateStaticFlags = isPrivate && isStatic ? 16 /* PrivateStatic */ : 0;
+                    var names = isPrivate ? privateIdentifiers :
                         isStatic ? staticNames :
                             instanceNames;
                     var memberName = name && ts.getPropertyNameForPropertyNameNode(name);
                     if (memberName) {
                         switch (member.kind) {
-                            case 167 /* GetAccessor */:
-                                addName(names, name, memberName, 1 /* GetAccessor */);
+                            case 168 /* GetAccessor */:
+                                addName(names, name, memberName, 1 /* GetAccessor */ | privateStaticFlags);
                                 break;
-                            case 168 /* SetAccessor */:
-                                addName(names, name, memberName, 2 /* SetAccessor */);
+                            case 169 /* SetAccessor */:
+                                addName(names, name, memberName, 2 /* SetAccessor */ | privateStaticFlags);
                                 break;
-                            case 163 /* PropertyDeclaration */:
-                                addName(names, name, memberName, 3 /* GetOrSetAccessor */);
+                            case 164 /* PropertyDeclaration */:
+                                addName(names, name, memberName, 3 /* GetOrSetAccessor */ | privateStaticFlags);
                                 break;
-                            case 165 /* MethodDeclaration */:
-                                addName(names, name, memberName, 8 /* Method */);
+                            case 166 /* MethodDeclaration */:
+                                addName(names, name, memberName, 8 /* Method */ | privateStaticFlags);
                                 break;
                         }
                     }
@@ -73242,16 +75216,25 @@ var ts;
             function addName(names, location, name, meaning) {
                 var prev = names.get(name);
                 if (prev) {
-                    if (prev & 8 /* Method */) {
-                        if (meaning !== 8 /* Method */) {
-                            error(location, ts.Diagnostics.Duplicate_identifier_0, ts.getTextOfNode(location));
-                        }
-                    }
-                    else if (prev & meaning) {
-                        error(location, ts.Diagnostics.Duplicate_identifier_0, ts.getTextOfNode(location));
+                    // For private identifiers, do not allow mixing of static and instance members with the same name
+                    if ((prev & 16 /* PrivateStatic */) !== (meaning & 16 /* PrivateStatic */)) {
+                        error(location, ts.Diagnostics.Duplicate_identifier_0_Static_and_instance_elements_cannot_share_the_same_private_name, ts.getTextOfNode(location));
                     }
                     else {
-                        names.set(name, prev | meaning);
+                        var prevIsMethod = !!(prev & 8 /* Method */);
+                        var isMethod = !!(meaning & 8 /* Method */);
+                        if (prevIsMethod || isMethod) {
+                            if (prevIsMethod !== isMethod) {
+                                error(location, ts.Diagnostics.Duplicate_identifier_0, ts.getTextOfNode(location));
+                            }
+                            // If this is a method/method duplication is might be an overload, so this will be handled when overloads are considered
+                        }
+                        else if (prev & meaning & ~16 /* PrivateStatic */) {
+                            error(location, ts.Diagnostics.Duplicate_identifier_0, ts.getTextOfNode(location));
+                        }
+                        else {
+                            names.set(name, prev | meaning);
+                        }
                     }
                 }
                 else {
@@ -73295,7 +75278,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 === 162 /* PropertySignature */) {
+                if (member.kind === 163 /* PropertySignature */) {
                     var memberName = void 0;
                     var name = member.name;
                     switch (name.kind) {
@@ -73320,11 +75303,11 @@ var ts;
             }
         }
         function checkTypeForDuplicateIndexSignatures(node) {
-            if (node.kind === 253 /* InterfaceDeclaration */) {
+            if (node.kind === 254 /* InterfaceDeclaration */) {
                 var nodeSymbol = getSymbolOfNode(node);
                 // in case of merging interface declaration it is possible that we'll enter this check procedure several times for every declaration
                 // to prevent this run check only for the first declaration of a given kind
-                if (nodeSymbol.declarations.length > 0 && nodeSymbol.declarations[0] !== node) {
+                if (nodeSymbol.declarations && nodeSymbol.declarations.length > 0 && nodeSymbol.declarations[0] !== node) {
                     return;
                 }
             }
@@ -73332,7 +75315,7 @@ var ts;
             // 3.7.4: An object type can contain at most one string index signature and one numeric index signature.
             // 8.5: A class declaration can have at most one string index member declaration and one numeric index member declaration
             var indexSymbol = getIndexSymbol(getSymbolOfNode(node));
-            if (indexSymbol) {
+            if (indexSymbol === null || indexSymbol === void 0 ? void 0 : indexSymbol.declarations) {
                 var seenNumericIndexer = false;
                 var seenStringIndexer = false;
                 for (var _i = 0, _a = indexSymbol.declarations; _i < _a.length; _i++) {
@@ -73366,11 +75349,9 @@ var ts;
             if (!checkGrammarDecoratorsAndModifiers(node) && !checkGrammarProperty(node))
                 checkGrammarComputedPropertyName(node.name);
             checkVariableLikeDeclaration(node);
-            // Private class fields transformation relies on WeakMaps.
-            if (ts.isPrivateIdentifier(node.name) && languageVersion < 99 /* ESNext */) {
-                for (var lexicalScope = ts.getEnclosingBlockScopeContainer(node); !!lexicalScope; lexicalScope = ts.getEnclosingBlockScopeContainer(lexicalScope)) {
-                    getNodeLinks(lexicalScope).flags |= 67108864 /* ContainsClassWithPrivateIdentifiers */;
-                }
+            setNodeLinksForPrivateIdentifierScope(node);
+            if (ts.isPrivateIdentifier(node.name) && ts.hasStaticModifier(node) && node.initializer && languageVersion === 99 /* ESNext */ && !compilerOptions.useDefineForClassFields) {
+                error(node.initializer, ts.Diagnostics.Static_fields_with_private_names_can_t_have_initializers_when_the_useDefineForClassFields_flag_is_not_specified_with_a_target_of_esnext_Consider_adding_the_useDefineForClassFields_flag);
             }
         }
         function checkPropertySignature(node) {
@@ -73383,16 +75364,35 @@ var ts;
             // Grammar checking
             if (!checkGrammarMethod(node))
                 checkGrammarComputedPropertyName(node.name);
-            if (ts.isPrivateIdentifier(node.name)) {
-                error(node, ts.Diagnostics.A_method_cannot_be_named_with_a_private_identifier);
-            }
             // Grammar checking for modifiers is done inside the function checkGrammarFunctionLikeDeclaration
             checkFunctionOrMethodDeclaration(node);
             // Abstract methods cannot have an implementation.
             // Extra checks are to avoid reporting multiple errors relating to the "abstractness" of the node.
-            if (ts.hasSyntacticModifier(node, 128 /* Abstract */) && node.kind === 165 /* MethodDeclaration */ && node.body) {
+            if (ts.hasSyntacticModifier(node, 128 /* Abstract */) && node.kind === 166 /* MethodDeclaration */ && node.body) {
                 error(node, ts.Diagnostics.Method_0_cannot_have_an_implementation_because_it_is_marked_abstract, ts.declarationNameToString(node.name));
             }
+            // Private named methods are only allowed in class declarations
+            if (ts.isPrivateIdentifier(node.name) && !ts.getContainingClass(node)) {
+                error(node, ts.Diagnostics.Private_identifiers_are_not_allowed_outside_class_bodies);
+            }
+            setNodeLinksForPrivateIdentifierScope(node);
+        }
+        function setNodeLinksForPrivateIdentifierScope(node) {
+            if (ts.isPrivateIdentifier(node.name) && languageVersion < 99 /* ESNext */) {
+                for (var lexicalScope = ts.getEnclosingBlockScopeContainer(node); !!lexicalScope; lexicalScope = ts.getEnclosingBlockScopeContainer(lexicalScope)) {
+                    getNodeLinks(lexicalScope).flags |= 67108864 /* ContainsClassWithPrivateIdentifiers */;
+                }
+                // If this is a private element in a class expression inside the body of a loop,
+                // then we must use a block-scoped binding to store the additional variables required
+                // to transform private elements.
+                if (ts.isClassExpression(node.parent)) {
+                    var enclosingIterationStatement = getEnclosingIterationStatement(node.parent);
+                    if (enclosingIterationStatement) {
+                        getNodeLinks(node.name).flags |= 524288 /* BlockScopedBindingInLoop */;
+                        getNodeLinks(enclosingIterationStatement).flags |= 65536 /* LoopWithCapturedBlockScopedBinding */;
+                    }
+                }
+            }
         }
         function checkConstructorDeclaration(node) {
             // Grammar check on signature of constructor and modifier of the constructor is done in checkSignatureDeclaration function.
@@ -73415,10 +75415,10 @@ var ts;
                 return;
             }
             function isInstancePropertyWithInitializerOrPrivateIdentifierProperty(n) {
-                if (ts.isPrivateIdentifierPropertyDeclaration(n)) {
+                if (ts.isPrivateIdentifierClassElementDeclaration(n)) {
                     return true;
                 }
-                return n.kind === 163 /* PropertyDeclaration */ &&
+                return n.kind === 164 /* PropertyDeclaration */ &&
                     !ts.hasSyntacticModifier(n, 32 /* Static */) &&
                     !!n.initializer;
             }
@@ -73439,9 +75439,9 @@ var ts;
                     // - The containing class is a derived class.
                     // - The constructor declares parameter properties
                     //   or the containing class declares instance member variables with initializers.
-                    var superCallShouldBeFirst = (compilerOptions.target !== 99 /* ESNext */ || !compilerOptions.useDefineForClassFields) &&
+                    var superCallShouldBeFirst = (compilerOptions.target !== 99 /* ESNext */ || !useDefineForClassFields) &&
                         (ts.some(node.parent.members, isInstancePropertyWithInitializerOrPrivateIdentifierProperty) ||
-                            ts.some(node.parameters, function (p) { return ts.hasSyntacticModifier(p, 92 /* ParameterPropertyModifier */); }));
+                            ts.some(node.parameters, function (p) { return ts.hasSyntacticModifier(p, 16476 /* ParameterPropertyModifier */); }));
                     // Skip past any prologue directives to find the first statement
                     // to ensure that it was a super call.
                     if (superCallShouldBeFirst) {
@@ -73449,7 +75449,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 === 233 /* ExpressionStatement */ && ts.isSuperCall(statement.expression)) {
+                            if (statement.kind === 234 /* ExpressionStatement */ && ts.isSuperCall(statement.expression)) {
                                 superCallStatement = statement;
                                 break;
                             }
@@ -73474,7 +75474,7 @@ var ts;
                     checkGrammarComputedPropertyName(node.name);
                 checkDecorators(node);
                 checkSignatureDeclaration(node);
-                if (node.kind === 167 /* GetAccessor */) {
+                if (node.kind === 168 /* 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);
@@ -73484,45 +75484,42 @@ 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 === 158 /* ComputedPropertyName */) {
+                if (node.name.kind === 159 /* ComputedPropertyName */) {
                     checkComputedPropertyName(node.name);
                 }
-                if (ts.isPrivateIdentifier(node.name)) {
-                    error(node.name, ts.Diagnostics.An_accessor_cannot_be_named_with_a_private_identifier);
-                }
                 if (hasBindableName(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 === 167 /* GetAccessor */ ? 168 /* SetAccessor */ : 167 /* GetAccessor */;
-                    var otherAccessor = ts.getDeclarationOfKind(getSymbolOfNode(node), otherKind);
-                    if (otherAccessor) {
-                        var nodeFlags = ts.getEffectiveModifierFlags(node);
-                        var otherFlags = ts.getEffectiveModifierFlags(otherAccessor);
-                        if ((nodeFlags & 28 /* AccessibilityModifier */) !== (otherFlags & 28 /* AccessibilityModifier */)) {
-                            error(node.name, ts.Diagnostics.Getter_and_setter_accessors_do_not_agree_in_visibility);
+                    var symbol = getSymbolOfNode(node);
+                    var getter = ts.getDeclarationOfKind(symbol, 168 /* GetAccessor */);
+                    var setter = ts.getDeclarationOfKind(symbol, 169 /* SetAccessor */);
+                    if (getter && setter && !(getNodeCheckFlags(getter) & 1 /* TypeChecked */)) {
+                        getNodeLinks(getter).flags |= 1 /* TypeChecked */;
+                        var getterFlags = ts.getEffectiveModifierFlags(getter);
+                        var setterFlags = ts.getEffectiveModifierFlags(setter);
+                        if ((getterFlags & 128 /* Abstract */) !== (setterFlags & 128 /* Abstract */)) {
+                            error(getter.name, ts.Diagnostics.Accessors_must_both_be_abstract_or_non_abstract);
+                            error(setter.name, ts.Diagnostics.Accessors_must_both_be_abstract_or_non_abstract);
                         }
-                        if ((nodeFlags & 128 /* Abstract */) !== (otherFlags & 128 /* Abstract */)) {
-                            error(node.name, ts.Diagnostics.Accessors_must_both_be_abstract_or_non_abstract);
+                        if (((getterFlags & 16 /* Protected */) && !(setterFlags & (16 /* Protected */ | 8 /* Private */))) ||
+                            ((getterFlags & 8 /* Private */) && !(setterFlags & 8 /* Private */))) {
+                            error(getter.name, ts.Diagnostics.A_get_accessor_must_be_at_least_as_accessible_as_the_setter);
+                            error(setter.name, ts.Diagnostics.A_get_accessor_must_be_at_least_as_accessible_as_the_setter);
+                        }
+                        var getterType = getAnnotatedAccessorType(getter);
+                        var setterType = getAnnotatedAccessorType(setter);
+                        if (getterType && setterType) {
+                            checkTypeAssignableTo(getterType, setterType, getter, ts.Diagnostics.The_return_type_of_a_get_accessor_must_be_assignable_to_its_set_accessor_type);
                         }
-                        // TypeScript 1.0 spec (April 2014): 4.5
-                        // If both accessors include type annotations, the specified types must be identical.
-                        checkAccessorDeclarationTypesIdentical(node, otherAccessor, getAnnotatedAccessorType, ts.Diagnostics.get_and_set_accessor_must_have_the_same_type);
-                        checkAccessorDeclarationTypesIdentical(node, otherAccessor, getThisTypeOfDeclaration, ts.Diagnostics.get_and_set_accessor_must_have_the_same_this_type);
                     }
                 }
                 var returnType = getTypeOfAccessors(getSymbolOfNode(node));
-                if (node.kind === 167 /* GetAccessor */) {
+                if (node.kind === 168 /* GetAccessor */) {
                     checkAllCodePathsInNonVoidFunctionReturnOrThrow(node, returnType);
                 }
             }
             checkSourceElement(node.body);
-        }
-        function checkAccessorDeclarationTypesIdentical(first, second, getAnnotatedType, message) {
-            var firstType = getAnnotatedType(first);
-            var secondType = getAnnotatedType(second);
-            if (firstType && secondType && !isTypeIdenticalTo(firstType, secondType)) {
-                error(first, message);
-            }
+            setNodeLinksForPrivateIdentifierScope(node);
         }
         function checkMissingDeclaration(node) {
             checkDecorators(node);
@@ -73559,7 +75556,7 @@ var ts;
         }
         function checkTypeReferenceNode(node) {
             checkGrammarTypeArguments(node, node.typeArguments);
-            if (node.kind === 173 /* TypeReference */ && node.typeName.jsdocDotPos !== undefined && !ts.isInJSFile(node) && !ts.isInJSDoc(node)) {
+            if (node.kind === 174 /* 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);
@@ -73612,7 +75609,7 @@ var ts;
             var hasNamedElement = ts.some(elementTypes, ts.isNamedTupleMember);
             for (var _i = 0, elementTypes_1 = elementTypes; _i < elementTypes_1.length; _i++) {
                 var e = elementTypes_1[_i];
-                if (e.kind !== 192 /* NamedTupleMember */ && hasNamedElement) {
+                if (e.kind !== 193 /* NamedTupleMember */ && hasNamedElement) {
                     grammarErrorOnNode(e, ts.Diagnostics.Tuple_members_must_all_have_names_or_all_not_have_names);
                     break;
                 }
@@ -73661,7 +75658,7 @@ var ts;
             var objectType = type.objectType;
             var indexType = type.indexType;
             if (isTypeAssignableTo(indexType, getIndexType(objectType, /*stringsOnly*/ false))) {
-                if (accessNode.kind === 202 /* ElementAccessExpression */ && ts.isAssignmentTarget(accessNode) &&
+                if (accessNode.kind === 203 /* 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));
                 }
@@ -73719,7 +75716,7 @@ var ts;
             ts.forEachChild(node, checkSourceElement);
         }
         function checkInferType(node) {
-            if (!ts.findAncestor(node, function (n) { return n.parent && n.parent.kind === 184 /* ConditionalType */ && n.parent.extendsType === n; })) {
+            if (!ts.findAncestor(node, function (n) { return n.parent && n.parent.kind === 185 /* 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);
@@ -73742,25 +75739,25 @@ var ts;
             if (node.dotDotDotToken && node.questionToken) {
                 grammarErrorOnNode(node, ts.Diagnostics.A_tuple_member_cannot_be_both_optional_and_rest);
             }
-            if (node.type.kind === 180 /* OptionalType */) {
+            if (node.type.kind === 181 /* 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 === 181 /* RestType */) {
+            if (node.type.kind === 182 /* 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);
             getTypeFromTypeNode(node);
         }
         function isPrivateWithinAmbient(node) {
-            return (ts.hasEffectiveModifier(node, 8 /* Private */) || ts.isPrivateIdentifierPropertyDeclaration(node)) && !!(node.flags & 8388608 /* Ambient */);
+            return (ts.hasEffectiveModifier(node, 8 /* Private */) || ts.isPrivateIdentifierClassElementDeclaration(node)) && !!(node.flags & 8388608 /* Ambient */);
         }
         function getEffectiveDeclarationFlags(n, flagsToCheck) {
             var flags = ts.getCombinedModifierFlags(n);
             // children of classes (even ambient classes) should not be marked as ambient or export
             // because those flags have no useful semantics there.
-            if (n.parent.kind !== 253 /* InterfaceDeclaration */ &&
-                n.parent.kind !== 252 /* ClassDeclaration */ &&
-                n.parent.kind !== 221 /* ClassExpression */ &&
+            if (n.parent.kind !== 254 /* InterfaceDeclaration */ &&
+                n.parent.kind !== 253 /* ClassDeclaration */ &&
+                n.parent.kind !== 222 /* 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
@@ -73856,7 +75853,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 === 165 /* MethodDeclaration */ || node.kind === 164 /* MethodSignature */) &&
+                            var reportError = (node.kind === 166 /* MethodDeclaration */ || node.kind === 165 /* 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
@@ -73893,55 +75890,57 @@ var ts;
             var multipleConstructorImplementation = false;
             var hasNonAmbientClass = false;
             var functionDeclarations = [];
-            for (var _i = 0, declarations_4 = declarations; _i < declarations_4.length; _i++) {
-                var current = declarations_4[_i];
-                var node = current;
-                var inAmbientContext = node.flags & 8388608 /* Ambient */;
-                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
-                    // i.e. this is legal
-                    //     declare function foo();
-                    //     declare function bar();
-                    //     declare function foo();
-                    // 2. mixing ambient and non-ambient declarations is a separate error that will be reported - do not want to report an extra one
-                    previousDeclaration = undefined;
-                }
-                if ((node.kind === 252 /* ClassDeclaration */ || node.kind === 221 /* ClassExpression */) && !inAmbientContext) {
-                    hasNonAmbientClass = true;
-                }
-                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;
-                    allNodeFlags &= currentNodeFlags;
-                    someHaveQuestionToken = someHaveQuestionToken || ts.hasQuestionToken(node);
-                    allHaveQuestionToken = allHaveQuestionToken && ts.hasQuestionToken(node);
-                    var bodyIsPresent = ts.nodeIsPresent(node.body);
-                    if (bodyIsPresent && bodyDeclaration) {
-                        if (isConstructor) {
-                            multipleConstructorImplementation = true;
+            if (declarations) {
+                for (var _i = 0, declarations_4 = declarations; _i < declarations_4.length; _i++) {
+                    var current = declarations_4[_i];
+                    var node = current;
+                    var inAmbientContext = node.flags & 8388608 /* Ambient */;
+                    var inAmbientContextOrInterface = node.parent && (node.parent.kind === 254 /* InterfaceDeclaration */ || node.parent.kind === 178 /* TypeLiteral */) || inAmbientContext;
+                    if (inAmbientContextOrInterface) {
+                        // check if declarations are consecutive only if they are non-ambient
+                        // 1. ambient declarations can be interleaved
+                        // i.e. this is legal
+                        //     declare function foo();
+                        //     declare function bar();
+                        //     declare function foo();
+                        // 2. mixing ambient and non-ambient declarations is a separate error that will be reported - do not want to report an extra one
+                        previousDeclaration = undefined;
+                    }
+                    if ((node.kind === 253 /* ClassDeclaration */ || node.kind === 222 /* ClassExpression */) && !inAmbientContext) {
+                        hasNonAmbientClass = true;
+                    }
+                    if (node.kind === 252 /* FunctionDeclaration */ || node.kind === 166 /* MethodDeclaration */ || node.kind === 165 /* MethodSignature */ || node.kind === 167 /* Constructor */) {
+                        functionDeclarations.push(node);
+                        var currentNodeFlags = getEffectiveDeclarationFlags(node, flagsToCheck);
+                        someNodeFlags |= currentNodeFlags;
+                        allNodeFlags &= currentNodeFlags;
+                        someHaveQuestionToken = someHaveQuestionToken || ts.hasQuestionToken(node);
+                        allHaveQuestionToken = allHaveQuestionToken && ts.hasQuestionToken(node);
+                        var bodyIsPresent = ts.nodeIsPresent(node.body);
+                        if (bodyIsPresent && bodyDeclaration) {
+                            if (isConstructor) {
+                                multipleConstructorImplementation = true;
+                            }
+                            else {
+                                duplicateFunctionDeclaration = true;
+                            }
+                        }
+                        else if ((previousDeclaration === null || previousDeclaration === void 0 ? void 0 : previousDeclaration.parent) === node.parent && previousDeclaration.end !== node.pos) {
+                            reportImplementationExpectedError(previousDeclaration);
+                        }
+                        if (bodyIsPresent) {
+                            if (!bodyDeclaration) {
+                                bodyDeclaration = node;
+                            }
                         }
                         else {
-                            duplicateFunctionDeclaration = true;
+                            hasOverloads = true;
                         }
-                    }
-                    else if ((previousDeclaration === null || previousDeclaration === void 0 ? void 0 : previousDeclaration.parent) === node.parent && previousDeclaration.end !== node.pos) {
-                        reportImplementationExpectedError(previousDeclaration);
-                    }
-                    if (bodyIsPresent) {
-                        if (!bodyDeclaration) {
-                            bodyDeclaration = node;
+                        previousDeclaration = node;
+                        if (!inAmbientContextOrInterface) {
+                            lastSeenNonAmbientDeclaration = node;
                         }
                     }
-                    else {
-                        hasOverloads = true;
-                    }
-                    previousDeclaration = node;
-                    if (!inAmbientContextOrInterface) {
-                        lastSeenNonAmbientDeclaration = node;
-                    }
                 }
             }
             if (multipleConstructorImplementation) {
@@ -73969,8 +75968,10 @@ var ts;
                 reportImplementationExpectedError(lastSeenNonAmbientDeclaration);
             }
             if (hasOverloads) {
-                checkFlagAgreementBetweenOverloads(declarations, bodyDeclaration, flagsToCheck, someNodeFlags, allNodeFlags);
-                checkQuestionTokenAgreementBetweenOverloads(declarations, bodyDeclaration, someHaveQuestionToken, allHaveQuestionToken);
+                if (declarations) {
+                    checkFlagAgreementBetweenOverloads(declarations, bodyDeclaration, flagsToCheck, someNodeFlags, allNodeFlags);
+                    checkQuestionTokenAgreementBetweenOverloads(declarations, bodyDeclaration, someHaveQuestionToken, allHaveQuestionToken);
+                }
                 if (bodyDeclaration) {
                     var signatures = getSignaturesOfSymbol(symbol);
                     var bodySignature = getSignatureFromDeclaration(bodyDeclaration);
@@ -74044,43 +76045,46 @@ var ts;
             function getDeclarationSpaces(decl) {
                 var d = decl;
                 switch (d.kind) {
-                    case 253 /* InterfaceDeclaration */:
-                    case 254 /* TypeAliasDeclaration */:
+                    case 254 /* InterfaceDeclaration */:
+                    case 255 /* TypeAliasDeclaration */:
                     // A jsdoc typedef and callback are, by definition, type aliases.
                     // falls through
-                    case 331 /* JSDocTypedefTag */:
-                    case 324 /* JSDocCallbackTag */:
-                    case 325 /* JSDocEnumTag */:
+                    case 335 /* JSDocTypedefTag */:
+                    case 328 /* JSDocCallbackTag */:
+                    case 329 /* JSDocEnumTag */:
                         return 2 /* ExportType */;
-                    case 256 /* ModuleDeclaration */:
+                    case 257 /* ModuleDeclaration */:
                         return ts.isAmbientModule(d) || ts.getModuleInstanceState(d) !== 0 /* NonInstantiated */
                             ? 4 /* ExportNamespace */ | 1 /* ExportValue */
                             : 4 /* ExportNamespace */;
-                    case 252 /* ClassDeclaration */:
-                    case 255 /* EnumDeclaration */:
-                    case 291 /* EnumMember */:
+                    case 253 /* ClassDeclaration */:
+                    case 256 /* EnumDeclaration */:
+                    case 292 /* EnumMember */:
                         return 2 /* ExportType */ | 1 /* ExportValue */;
-                    case 297 /* SourceFile */:
+                    case 298 /* SourceFile */:
                         return 2 /* ExportType */ | 1 /* ExportValue */ | 4 /* ExportNamespace */;
-                    case 266 /* ExportAssignment */:
+                    case 267 /* ExportAssignment */:
+                    case 217 /* BinaryExpression */:
+                        var node_2 = d;
+                        var expression = ts.isExportAssignment(node_2) ? node_2.expression : node_2.right;
                         // Export assigned entity name expressions act as aliases and should fall through, otherwise they export values
-                        if (!ts.isEntityNameExpression(d.expression)) {
+                        if (!ts.isEntityNameExpression(expression)) {
                             return 1 /* ExportValue */;
                         }
-                        d = d.expression;
+                        d = expression;
                     // The below options all declare an Alias, which is allowed to merge with other values within the importing module.
                     // falls through
-                    case 260 /* ImportEqualsDeclaration */:
-                    case 263 /* NamespaceImport */:
-                    case 262 /* ImportClause */:
-                        var result_12 = 0 /* None */;
+                    case 261 /* ImportEqualsDeclaration */:
+                    case 264 /* NamespaceImport */:
+                    case 263 /* ImportClause */:
+                        var result_13 = 0 /* None */;
                         var target = resolveAlias(getSymbolOfNode(d));
-                        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
+                        ts.forEach(target.declarations, function (d) { result_13 |= getDeclarationSpaces(d); });
+                        return result_13;
+                    case 250 /* VariableDeclaration */:
+                    case 199 /* BindingElement */:
+                    case 252 /* FunctionDeclaration */:
+                    case 266 /* 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});`
@@ -74373,24 +76377,24 @@ var ts;
             var headMessage = getDiagnosticHeadMessageForDecoratorResolution(node);
             var errorInfo;
             switch (node.parent.kind) {
-                case 252 /* ClassDeclaration */:
+                case 253 /* ClassDeclaration */:
                     var classSymbol = getSymbolOfNode(node.parent);
                     var classConstructorType = getTypeOfSymbol(classSymbol);
                     expectedReturnType = getUnionType([classConstructorType, voidType]);
                     break;
-                case 160 /* Parameter */:
+                case 161 /* 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 163 /* PropertyDeclaration */:
+                case 164 /* 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 165 /* MethodDeclaration */:
-                case 167 /* GetAccessor */:
-                case 168 /* SetAccessor */:
+                case 166 /* MethodDeclaration */:
+                case 168 /* GetAccessor */:
+                case 169 /* SetAccessor */:
                     var methodType = getTypeOfNode(node.parent);
                     var descriptorType = createTypedPropertyDescriptorType(methodType);
                     expectedReturnType = getUnionType([descriptorType, voidType]);
@@ -74437,15 +76441,15 @@ var ts;
         function getEntityNameForDecoratorMetadata(node) {
             if (node) {
                 switch (node.kind) {
-                    case 183 /* IntersectionType */:
-                    case 182 /* UnionType */:
+                    case 184 /* IntersectionType */:
+                    case 183 /* UnionType */:
                         return getEntityNameForDecoratorMetadataFromTypeList(node.types);
-                    case 184 /* ConditionalType */:
+                    case 185 /* ConditionalType */:
                         return getEntityNameForDecoratorMetadataFromTypeList([node.trueType, node.falseType]);
-                    case 186 /* ParenthesizedType */:
-                    case 192 /* NamedTupleMember */:
+                    case 187 /* ParenthesizedType */:
+                    case 193 /* NamedTupleMember */:
                         return getEntityNameForDecoratorMetadata(node.type);
-                    case 173 /* TypeReference */:
+                    case 174 /* TypeReference */:
                         return node.typeName;
                 }
             }
@@ -74454,13 +76458,13 @@ var ts;
             var commonEntityName;
             for (var _i = 0, types_23 = types; _i < types_23.length; _i++) {
                 var typeNode = types_23[_i];
-                while (typeNode.kind === 186 /* ParenthesizedType */ || typeNode.kind === 192 /* NamedTupleMember */) {
+                while (typeNode.kind === 187 /* ParenthesizedType */ || typeNode.kind === 193 /* NamedTupleMember */) {
                     typeNode = typeNode.type; // Skip parens if need be
                 }
                 if (typeNode.kind === 141 /* NeverKeyword */) {
                     continue; // Always elide `never` from the union/intersection if possible
                 }
-                if (!strictNullChecks && (typeNode.kind === 191 /* LiteralType */ && typeNode.literal.kind === 103 /* NullKeyword */ || typeNode.kind === 150 /* UndefinedKeyword */)) {
+                if (!strictNullChecks && (typeNode.kind === 192 /* 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);
@@ -74506,14 +76510,14 @@ var ts;
             }
             var firstDecorator = node.decorators[0];
             checkExternalEmitHelpers(firstDecorator, 8 /* Decorate */);
-            if (node.kind === 160 /* Parameter */) {
+            if (node.kind === 161 /* 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 252 /* ClassDeclaration */:
+                    case 253 /* ClassDeclaration */:
                         var constructor = ts.getFirstConstructorWithBody(node);
                         if (constructor) {
                             for (var _i = 0, _a = constructor.parameters; _i < _a.length; _i++) {
@@ -74522,23 +76526,23 @@ var ts;
                             }
                         }
                         break;
-                    case 167 /* GetAccessor */:
-                    case 168 /* SetAccessor */:
-                        var otherKind = node.kind === 167 /* GetAccessor */ ? 168 /* SetAccessor */ : 167 /* GetAccessor */;
+                    case 168 /* GetAccessor */:
+                    case 169 /* SetAccessor */:
+                        var otherKind = node.kind === 168 /* GetAccessor */ ? 169 /* SetAccessor */ : 168 /* GetAccessor */;
                         var otherAccessor = ts.getDeclarationOfKind(getSymbolOfNode(node), otherKind);
                         markDecoratorMedataDataTypeNodeAsReferenced(getAnnotatedAccessorTypeNode(node) || otherAccessor && getAnnotatedAccessorTypeNode(otherAccessor));
                         break;
-                    case 165 /* MethodDeclaration */:
+                    case 166 /* 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 163 /* PropertyDeclaration */:
+                    case 164 /* PropertyDeclaration */:
                         markDecoratorMedataDataTypeNodeAsReferenced(ts.getEffectiveTypeAnnotationNode(node));
                         break;
-                    case 160 /* Parameter */:
+                    case 161 /* Parameter */:
                         markDecoratorMedataDataTypeNodeAsReferenced(getParameterTypeNodeForDecoratorCheck(node));
                         var containingSignature = node.parent;
                         for (var _d = 0, _e = containingSignature.parameters; _d < _e.length; _d++) {
@@ -74601,7 +76605,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 === 157 /* 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 === 158 /* QualifiedName */ ? node.name.right : node.name));
                     }
                 }
             }
@@ -74645,20 +76649,21 @@ var ts;
             switch (node.kind) {
                 case 78 /* Identifier */:
                     return node;
-                case 201 /* PropertyAccessExpression */:
+                case 202 /* PropertyAccessExpression */:
                     return node.name;
                 default:
                     return undefined;
             }
         }
         function checkFunctionOrMethodDeclaration(node) {
+            var _a;
             checkDecorators(node);
             checkSignatureDeclaration(node);
             var functionFlags = ts.getFunctionFlags(node);
             // Do not use hasDynamicName here, because that returns false for well known symbols.
             // We want to perform checkComputedPropertyName for all computed properties, including
             // well known symbols.
-            if (node.name && node.name.kind === 158 /* ComputedPropertyName */) {
+            if (node.name && node.name.kind === 159 /* ComputedPropertyName */) {
                 // This check will account for methods in class/interface declarations,
                 // as well as accessors in classes/object literals
                 checkComputedPropertyName(node.name);
@@ -74672,7 +76677,7 @@ var ts;
                 // Since the javascript won't do semantic analysis like typescript,
                 // if the javascript file comes before the typescript file and both contain same name functions,
                 // checkFunctionOrConstructorSymbol wouldn't be called if we didnt ignore javascript function.
-                var firstDeclaration = ts.find(localSymbol.declarations, 
+                var firstDeclaration = (_a = localSymbol.declarations) === null || _a === void 0 ? void 0 : _a.find(
                 // Get first non javascript function declaration
                 function (declaration) { return declaration.kind === node.kind && !(declaration.flags & 131072 /* JavaScriptFile */); });
                 // Only type check the symbol once
@@ -74684,7 +76689,7 @@ var ts;
                     checkFunctionOrConstructorSymbol(symbol);
                 }
             }
-            var body = node.kind === 164 /* MethodSignature */ ? undefined : node.body;
+            var body = node.kind === 165 /* MethodSignature */ ? undefined : node.body;
             checkSourceElement(body);
             checkAllCodePathsInNonVoidFunctionReturnOrThrow(node, getReturnTypeFromAnnotation(node));
             if (produceDiagnostics && !ts.getEffectiveReturnTypeNode(node)) {
@@ -74726,42 +76731,42 @@ var ts;
             for (var _i = 0, potentiallyUnusedIdentifiers_1 = potentiallyUnusedIdentifiers; _i < potentiallyUnusedIdentifiers_1.length; _i++) {
                 var node = potentiallyUnusedIdentifiers_1[_i];
                 switch (node.kind) {
-                    case 252 /* ClassDeclaration */:
-                    case 221 /* ClassExpression */:
+                    case 253 /* ClassDeclaration */:
+                    case 222 /* ClassExpression */:
                         checkUnusedClassMembers(node, addDiagnostic);
                         checkUnusedTypeParameters(node, addDiagnostic);
                         break;
-                    case 297 /* SourceFile */:
-                    case 256 /* ModuleDeclaration */:
-                    case 230 /* Block */:
-                    case 258 /* CaseBlock */:
-                    case 237 /* ForStatement */:
-                    case 238 /* ForInStatement */:
-                    case 239 /* ForOfStatement */:
+                    case 298 /* SourceFile */:
+                    case 257 /* ModuleDeclaration */:
+                    case 231 /* Block */:
+                    case 259 /* CaseBlock */:
+                    case 238 /* ForStatement */:
+                    case 239 /* ForInStatement */:
+                    case 240 /* ForOfStatement */:
                         checkUnusedLocalsAndParameters(node, addDiagnostic);
                         break;
-                    case 166 /* Constructor */:
-                    case 208 /* FunctionExpression */:
-                    case 251 /* FunctionDeclaration */:
-                    case 209 /* ArrowFunction */:
-                    case 165 /* MethodDeclaration */:
-                    case 167 /* GetAccessor */:
-                    case 168 /* SetAccessor */:
+                    case 167 /* Constructor */:
+                    case 209 /* FunctionExpression */:
+                    case 252 /* FunctionDeclaration */:
+                    case 210 /* ArrowFunction */:
+                    case 166 /* MethodDeclaration */:
+                    case 168 /* GetAccessor */:
+                    case 169 /* SetAccessor */:
                         if (node.body) { // Don't report unused parameters in overloads
                             checkUnusedLocalsAndParameters(node, addDiagnostic);
                         }
                         checkUnusedTypeParameters(node, addDiagnostic);
                         break;
-                    case 164 /* MethodSignature */:
-                    case 169 /* CallSignature */:
-                    case 170 /* ConstructSignature */:
-                    case 174 /* FunctionType */:
-                    case 175 /* ConstructorType */:
-                    case 254 /* TypeAliasDeclaration */:
-                    case 253 /* InterfaceDeclaration */:
+                    case 165 /* MethodSignature */:
+                    case 170 /* CallSignature */:
+                    case 171 /* ConstructSignature */:
+                    case 175 /* FunctionType */:
+                    case 176 /* ConstructorType */:
+                    case 255 /* TypeAliasDeclaration */:
+                    case 254 /* InterfaceDeclaration */:
                         checkUnusedTypeParameters(node, addDiagnostic);
                         break;
-                    case 185 /* InferType */:
+                    case 186 /* InferType */:
                         checkUnusedInferTypeParameter(node, addDiagnostic);
                         break;
                     default:
@@ -74781,11 +76786,11 @@ var ts;
             for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
                 var member = _a[_i];
                 switch (member.kind) {
-                    case 165 /* MethodDeclaration */:
-                    case 163 /* PropertyDeclaration */:
-                    case 167 /* GetAccessor */:
-                    case 168 /* SetAccessor */:
-                        if (member.kind === 168 /* SetAccessor */ && member.symbol.flags & 32768 /* GetAccessor */) {
+                    case 166 /* MethodDeclaration */:
+                    case 164 /* PropertyDeclaration */:
+                    case 168 /* GetAccessor */:
+                    case 169 /* SetAccessor */:
+                        if (member.kind === 169 /* SetAccessor */ && member.symbol.flags & 32768 /* GetAccessor */) {
                             // Already would have reported an error on the getter.
                             break;
                         }
@@ -74796,7 +76801,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 166 /* Constructor */:
+                    case 167 /* 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 */)) {
@@ -74804,8 +76809,8 @@ var ts;
                             }
                         }
                         break;
-                    case 171 /* IndexSignature */:
-                    case 229 /* SemicolonClassElement */:
+                    case 172 /* IndexSignature */:
+                    case 230 /* SemicolonClassElement */:
                         // Can't be private
                         break;
                     default:
@@ -74822,7 +76827,8 @@ var ts;
         function checkUnusedTypeParameters(node, addDiagnostic) {
             // Only report errors on the last declaration for the type parameter container;
             // this ensures that all uses have been accounted for.
-            if (ts.last(getSymbolOfNode(node).declarations) !== node)
+            var declarations = getSymbolOfNode(node).declarations;
+            if (!declarations || ts.last(declarations) !== node)
                 return;
             var typeParameters = ts.getEffectiveTypeParameterDeclarations(node);
             var seenParentsWithEveryUnused = new ts.Set();
@@ -74832,7 +76838,7 @@ var ts;
                     continue;
                 var name = ts.idText(typeParameter.name);
                 var parent = typeParameter.parent;
-                if (parent.kind !== 185 /* InferType */ && parent.typeParameters.every(isTypeParameterUnused)) {
+                if (parent.kind !== 186 /* InferType */ && parent.typeParameters.every(isTypeParameterUnused)) {
                     if (ts.tryAddToSet(seenParentsWithEveryUnused, parent)) {
                         var sourceFile = ts.getSourceFileOfNode(parent);
                         var range = ts.isJSDocTemplateTag(parent)
@@ -74892,39 +76898,41 @@ var ts;
                 if (local.flags & 262144 /* TypeParameter */ ? !(local.flags & 3 /* Variable */ && !(local.isReferenced & 3 /* Variable */)) : local.isReferenced || local.exportSymbol) {
                     return;
                 }
-                for (var _i = 0, _a = local.declarations; _i < _a.length; _i++) {
-                    var declaration = _a[_i];
-                    if (isValidUnusedLocalDeclaration(declaration)) {
-                        continue;
-                    }
-                    if (isImportedDeclaration(declaration)) {
-                        addToGroup(unusedImports, importClauseFromImported(declaration), declaration, getNodeId);
-                    }
-                    else if (ts.isBindingElement(declaration) && ts.isObjectBindingPattern(declaration.parent)) {
-                        // In `{ a, ...b }, `a` is considered used since it removes a property from `b`. `b` may still be unused though.
-                        var lastElement = ts.last(declaration.parent.elements);
-                        if (declaration === lastElement || !ts.last(declaration.parent.elements).dotDotDotToken) {
-                            addToGroup(unusedDestructures, declaration.parent, declaration, getNodeId);
+                if (local.declarations) {
+                    for (var _i = 0, _a = local.declarations; _i < _a.length; _i++) {
+                        var declaration = _a[_i];
+                        if (isValidUnusedLocalDeclaration(declaration)) {
+                            continue;
                         }
-                    }
-                    else if (ts.isVariableDeclaration(declaration)) {
-                        addToGroup(unusedVariables, declaration.parent, declaration, getNodeId);
-                    }
-                    else {
-                        var parameter = local.valueDeclaration && tryGetRootParameterDeclaration(local.valueDeclaration);
-                        var name = local.valueDeclaration && ts.getNameOfDeclaration(local.valueDeclaration);
-                        if (parameter && name) {
-                            if (!ts.isParameterPropertyDeclaration(parameter, parameter.parent) && !ts.parameterIsThisKeyword(parameter) && !isIdentifierThatStartsWithUnderscore(name)) {
-                                if (ts.isBindingElement(declaration) && ts.isArrayBindingPattern(declaration.parent)) {
-                                    addToGroup(unusedDestructures, declaration.parent, declaration, getNodeId);
-                                }
-                                else {
-                                    addDiagnostic(parameter, 1 /* Parameter */, ts.createDiagnosticForNode(name, ts.Diagnostics._0_is_declared_but_its_value_is_never_read, ts.symbolName(local)));
-                                }
+                        if (isImportedDeclaration(declaration)) {
+                            addToGroup(unusedImports, importClauseFromImported(declaration), declaration, getNodeId);
+                        }
+                        else if (ts.isBindingElement(declaration) && ts.isObjectBindingPattern(declaration.parent)) {
+                            // In `{ a, ...b }, `a` is considered used since it removes a property from `b`. `b` may still be unused though.
+                            var lastElement = ts.last(declaration.parent.elements);
+                            if (declaration === lastElement || !ts.last(declaration.parent.elements).dotDotDotToken) {
+                                addToGroup(unusedDestructures, declaration.parent, declaration, getNodeId);
                             }
                         }
+                        else if (ts.isVariableDeclaration(declaration)) {
+                            addToGroup(unusedVariables, declaration.parent, declaration, getNodeId);
+                        }
                         else {
-                            errorUnusedLocal(declaration, ts.symbolName(local), addDiagnostic);
+                            var parameter = local.valueDeclaration && tryGetRootParameterDeclaration(local.valueDeclaration);
+                            var name = local.valueDeclaration && ts.getNameOfDeclaration(local.valueDeclaration);
+                            if (parameter && name) {
+                                if (!ts.isParameterPropertyDeclaration(parameter, parameter.parent) && !ts.parameterIsThisKeyword(parameter) && !isIdentifierThatStartsWithUnderscore(name)) {
+                                    if (ts.isBindingElement(declaration) && ts.isArrayBindingPattern(declaration.parent)) {
+                                        addToGroup(unusedDestructures, declaration.parent, declaration, getNodeId);
+                                    }
+                                    else {
+                                        addDiagnostic(parameter, 1 /* Parameter */, ts.createDiagnosticForNode(name, ts.Diagnostics._0_is_declared_but_its_value_is_never_read, ts.symbolName(local)));
+                                    }
+                                }
+                            }
+                            else {
+                                errorUnusedLocal(declaration, ts.symbolName(local), addDiagnostic);
+                            }
                         }
                     }
                 }
@@ -74934,7 +76942,7 @@ var ts;
                 var importDecl = importClause.parent;
                 var nDeclarations = (importClause.name ? 1 : 0) +
                     (importClause.namedBindings ?
-                        (importClause.namedBindings.kind === 263 /* NamespaceImport */ ? 1 : importClause.namedBindings.elements.length)
+                        (importClause.namedBindings.kind === 264 /* NamespaceImport */ ? 1 : importClause.namedBindings.elements.length)
                         : 0);
                 if (nDeclarations === unuseds.length) {
                     addDiagnostic(importDecl, 0 /* Local */, unuseds.length === 1
@@ -74952,7 +76960,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 === 249 /* VariableDeclaration */ && bindingPattern.parent.parent.kind === 250 /* VariableDeclarationList */) {
+                    if (bindingElements.length === 1 && bindingPattern.parent.kind === 250 /* VariableDeclaration */ && bindingPattern.parent.parent.kind === 251 /* VariableDeclarationList */) {
                         addToGroup(unusedVariables, bindingPattern.parent.parent, bindingPattern.parent, getNodeId);
                     }
                     else {
@@ -74973,7 +76981,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 === 232 /* VariableStatement */ ? declarationList.parent : declarationList, ts.Diagnostics.All_variables_are_unused));
+                        : ts.createDiagnosticForNode(declarationList.parent.kind === 233 /* VariableStatement */ ? declarationList.parent : declarationList, ts.Diagnostics.All_variables_are_unused));
                 }
                 else {
                     for (var _i = 0, declarations_5 = declarations; _i < declarations_5.length; _i++) {
@@ -74987,22 +76995,22 @@ var ts;
             switch (name.kind) {
                 case 78 /* Identifier */:
                     return ts.idText(name);
-                case 197 /* ArrayBindingPattern */:
-                case 196 /* ObjectBindingPattern */:
+                case 198 /* ArrayBindingPattern */:
+                case 197 /* ObjectBindingPattern */:
                     return bindingNameText(ts.cast(ts.first(name.elements), ts.isBindingElement).name);
                 default:
                     return ts.Debug.assertNever(name);
             }
         }
         function isImportedDeclaration(node) {
-            return node.kind === 262 /* ImportClause */ || node.kind === 265 /* ImportSpecifier */ || node.kind === 263 /* NamespaceImport */;
+            return node.kind === 263 /* ImportClause */ || node.kind === 266 /* ImportSpecifier */ || node.kind === 264 /* NamespaceImport */;
         }
         function importClauseFromImported(decl) {
-            return decl.kind === 262 /* ImportClause */ ? decl : decl.kind === 263 /* NamespaceImport */ ? decl.parent : decl.parent.parent;
+            return decl.kind === 263 /* ImportClause */ ? decl : decl.kind === 264 /* NamespaceImport */ ? decl.parent : decl.parent.parent;
         }
         function checkBlock(node) {
             // Grammar checking for SyntaxKind.Block
-            if (node.kind === 230 /* Block */) {
+            if (node.kind === 231 /* Block */) {
                 checkGrammarStatementInAmbientContext(node);
             }
             if (ts.isFunctionOrModuleBlock(node)) {
@@ -75032,12 +77040,12 @@ var ts;
             if (!(identifier && identifier.escapedText === name)) {
                 return false;
             }
-            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 */) {
+            if (node.kind === 164 /* PropertyDeclaration */ ||
+                node.kind === 163 /* PropertySignature */ ||
+                node.kind === 166 /* MethodDeclaration */ ||
+                node.kind === 165 /* MethodSignature */ ||
+                node.kind === 168 /* GetAccessor */ ||
+                node.kind === 169 /* SetAccessor */) {
                 // it is ok to have member named '_super' or '_this' - member access is always qualified
                 return false;
             }
@@ -75046,7 +77054,7 @@ var ts;
                 return false;
             }
             var root = ts.getRootDeclaration(node);
-            if (root.kind === 160 /* Parameter */ && ts.nodeIsMissing(root.parent.body)) {
+            if (root.kind === 161 /* Parameter */ && ts.nodeIsMissing(root.parent.body)) {
                 // just an overload - no codegen impact
                 return false;
             }
@@ -75083,10 +77091,11 @@ var ts;
                 return false;
             });
         }
-        function checkWeakMapCollision(node) {
+        function checkWeakMapSetCollision(node) {
             var enclosingBlockScope = ts.getEnclosingBlockScopeContainer(node);
             if (getNodeCheckFlags(enclosingBlockScope) & 67108864 /* ContainsClassWithPrivateIdentifiers */) {
-                errorSkippedOn("noEmit", node, ts.Diagnostics.Compiler_reserves_name_0_when_emitting_private_identifier_downlevel, "WeakMap");
+                ts.Debug.assert(ts.isNamedDeclaration(node) && ts.isIdentifier(node.name) && typeof node.name.escapedText === "string", "The target of a WeakMap/WeakSet collision check should be an identifier");
+                errorSkippedOn("noEmit", node, ts.Diagnostics.Compiler_reserves_name_0_when_emitting_private_identifier_downlevel, node.name.escapedText);
             }
         }
         function checkCollisionWithRequireExportsInGeneratedCode(node, name) {
@@ -75103,7 +77112,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 === 297 /* SourceFile */ && ts.isExternalOrCommonJsModule(parent)) {
+            if (parent.kind === 298 /* 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));
             }
@@ -75118,7 +77127,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 === 297 /* SourceFile */ && ts.isExternalOrCommonJsModule(parent) && parent.flags & 2048 /* HasAsyncFunctions */) {
+            if (parent.kind === 298 /* 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));
             }
@@ -75153,7 +77162,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 === 249 /* VariableDeclaration */ && !node.initializer) {
+            if (node.kind === 250 /* VariableDeclaration */ && !node.initializer) {
                 return;
             }
             var symbol = getSymbolOfNode(node);
@@ -75165,17 +77174,17 @@ var ts;
                     localDeclarationSymbol !== symbol &&
                     localDeclarationSymbol.flags & 2 /* BlockScopedVariable */) {
                     if (getDeclarationNodeFlagsFromSymbol(localDeclarationSymbol) & 3 /* BlockScoped */) {
-                        var varDeclList = ts.getAncestor(localDeclarationSymbol.valueDeclaration, 250 /* VariableDeclarationList */);
-                        var container = varDeclList.parent.kind === 232 /* VariableStatement */ && varDeclList.parent.parent
+                        var varDeclList = ts.getAncestor(localDeclarationSymbol.valueDeclaration, 251 /* VariableDeclarationList */);
+                        var container = varDeclList.parent.kind === 233 /* 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 === 230 /* Block */ && ts.isFunctionLike(container.parent) ||
-                                container.kind === 257 /* ModuleBlock */ ||
-                                container.kind === 256 /* ModuleDeclaration */ ||
-                                container.kind === 297 /* SourceFile */);
+                            (container.kind === 231 /* Block */ && ts.isFunctionLike(container.parent) ||
+                                container.kind === 258 /* ModuleBlock */ ||
+                                container.kind === 257 /* ModuleDeclaration */ ||
+                                container.kind === 298 /* 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
@@ -75206,18 +77215,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 === 158 /* ComputedPropertyName */) {
+            if (node.name.kind === 159 /* ComputedPropertyName */) {
                 checkComputedPropertyName(node.name);
                 if (node.initializer) {
                     checkExpressionCached(node.initializer);
                 }
             }
-            if (node.kind === 198 /* BindingElement */) {
-                if (node.parent.kind === 196 /* ObjectBindingPattern */ && languageVersion < 99 /* ESNext */) {
+            if (ts.isBindingElement(node)) {
+                if (ts.isObjectBindingPattern(node.parent) && node.dotDotDotToken && languageVersion < 5 /* ES2018 */) {
                     checkExternalEmitHelpers(node, 4 /* Rest */);
                 }
                 // check computed properties inside property names of binding elements
-                if (node.propertyName && node.propertyName.kind === 158 /* ComputedPropertyName */) {
+                if (node.propertyName && node.propertyName.kind === 159 /* ComputedPropertyName */) {
                     checkComputedPropertyName(node.propertyName);
                 }
                 // check private/protected variable access
@@ -75230,15 +77239,15 @@ var ts;
                         var nameText = getPropertyNameFromType(exprType);
                         var property = getPropertyOfType(parentType, nameText);
                         if (property) {
-                            markPropertyAsReferenced(property, /*nodeForCheckWriteOnly*/ undefined, /*isThisAccess*/ false); // A destructuring is never a write-only reference.
-                            checkPropertyAccessibility(parent, !!parent.initializer && parent.initializer.kind === 105 /* SuperKeyword */, parentType, property);
+                            markPropertyAsReferenced(property, /*nodeForCheckWriteOnly*/ undefined, /*isSelfTypeAccess*/ false); // A destructuring is never a write-only reference.
+                            checkPropertyAccessibility(node, !!parent.initializer && parent.initializer.kind === 105 /* SuperKeyword */, /*writing*/ false, parentType, property);
                         }
                     }
                 }
             }
             // For a binding pattern, check contained binding elements
             if (ts.isBindingPattern(node.name)) {
-                if (node.name.kind === 197 /* ArrayBindingPattern */ && languageVersion < 2 /* ES2015 */ && compilerOptions.downlevelIteration) {
+                if (node.name.kind === 198 /* ArrayBindingPattern */ && languageVersion < 2 /* ES2015 */ && compilerOptions.downlevelIteration) {
                     checkExternalEmitHelpers(node, 512 /* Read */);
                 }
                 ts.forEach(node.name.elements, checkSourceElement);
@@ -75250,7 +77259,7 @@ var ts;
             }
             // For a binding pattern, validate the initializer and exit
             if (ts.isBindingPattern(node.name)) {
-                var needCheckInitializer = node.initializer && node.parent.parent.kind !== 238 /* ForInStatement */;
+                var needCheckInitializer = node.initializer && node.parent.parent.kind !== 239 /* ForInStatement */;
                 var needCheckWidenedType = node.name.elements.length === 0;
                 if (needCheckInitializer || needCheckWidenedType) {
                     // Don't validate for-in initializer as it is already an error
@@ -75278,7 +77287,7 @@ var ts;
             }
             // 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)) {
+            if (symbol.flags & 2097152 /* Alias */ && ts.isRequireVariableDeclaration(node)) {
                 checkAliasSymbol(node);
                 return;
             }
@@ -75292,11 +77301,11 @@ 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 !== 238 /* ForInStatement */) {
+                    if (!isJSObjectLiteralInitializer && node.parent.parent.kind !== 239 /* ForInStatement */) {
                         checkTypeAssignableToAndOptionallyElaborate(checkExpressionCached(initializer), type, node, initializer, /*headMessage*/ undefined);
                     }
                 }
-                if (symbol.declarations.length > 1) {
+                if (symbol.declarations && symbol.declarations.length > 1) {
                     if (ts.some(symbol.declarations, function (d) { return d !== node && ts.isVariableLike(d) && !areDeclarationFlagsIdentical(d, node); })) {
                         error(node.name, ts.Diagnostics.All_declarations_of_0_must_have_identical_modifiers, ts.declarationNameToString(node.name));
                     }
@@ -75314,26 +77323,27 @@ var ts;
                 if (node.initializer) {
                     checkTypeAssignableToAndOptionallyElaborate(checkExpressionCached(node.initializer), declarationType, node, node.initializer, /*headMessage*/ undefined);
                 }
-                if (!areDeclarationFlagsIdentical(node, symbol.valueDeclaration)) {
+                if (symbol.valueDeclaration && !areDeclarationFlagsIdentical(node, symbol.valueDeclaration)) {
                     error(node.name, ts.Diagnostics.All_declarations_of_0_must_have_identical_modifiers, ts.declarationNameToString(node.name));
                 }
             }
-            if (node.kind !== 163 /* PropertyDeclaration */ && node.kind !== 162 /* PropertySignature */) {
+            if (node.kind !== 164 /* PropertyDeclaration */ && node.kind !== 163 /* PropertySignature */) {
                 // We know we don't have a binding pattern or computed name here
                 checkExportsOnMergedDeclarations(node);
-                if (node.kind === 249 /* VariableDeclaration */ || node.kind === 198 /* BindingElement */) {
+                if (node.kind === 250 /* VariableDeclaration */ || node.kind === 199 /* BindingElement */) {
                     checkVarDeclaredNamesNotShadowed(node);
                 }
                 checkCollisionWithRequireExportsInGeneratedCode(node, node.name);
                 checkCollisionWithGlobalPromiseInGeneratedCode(node, node.name);
-                if (languageVersion < 99 /* ESNext */ && needCollisionCheckForIdentifier(node, node.name, "WeakMap")) {
-                    potentialWeakMapCollisions.push(node);
+                if (languageVersion < 99 /* ESNext */
+                    && (needCollisionCheckForIdentifier(node, node.name, "WeakMap") || needCollisionCheckForIdentifier(node, node.name, "WeakSet"))) {
+                    potentialWeakMapSetCollisions.push(node);
                 }
             }
         }
         function errorNextVariableOrPropertyDeclarationMustHaveSameType(firstDeclaration, firstType, nextDeclaration, nextType) {
             var nextDeclarationName = ts.getNameOfDeclaration(nextDeclaration);
-            var message = nextDeclaration.kind === 163 /* PropertyDeclaration */ || nextDeclaration.kind === 162 /* PropertySignature */
+            var message = nextDeclaration.kind === 164 /* PropertyDeclaration */ || nextDeclaration.kind === 163 /* 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);
@@ -75343,8 +77353,8 @@ var ts;
             }
         }
         function areDeclarationFlagsIdentical(left, right) {
-            if ((left.kind === 160 /* Parameter */ && right.kind === 249 /* VariableDeclaration */) ||
-                (left.kind === 249 /* VariableDeclaration */ && right.kind === 160 /* Parameter */)) {
+            if ((left.kind === 161 /* Parameter */ && right.kind === 250 /* VariableDeclaration */) ||
+                (left.kind === 250 /* VariableDeclaration */ && right.kind === 161 /* Parameter */)) {
                 // Differences in optionality between parameters and variables are allowed.
                 return true;
             }
@@ -75384,17 +77394,18 @@ var ts;
             // Grammar checking
             checkGrammarStatementInAmbientContext(node);
             var type = checkTruthinessExpression(node.expression);
-            checkTestingKnownTruthyCallableType(node.expression, type, node.thenStatement);
+            checkTestingKnownTruthyCallableOrAwaitableType(node.expression, type, node.thenStatement);
             checkSourceElement(node.thenStatement);
-            if (node.thenStatement.kind === 231 /* EmptyStatement */) {
+            if (node.thenStatement.kind === 232 /* EmptyStatement */) {
                 error(node.thenStatement, ts.Diagnostics.The_body_of_an_if_statement_cannot_be_the_empty_statement);
             }
             checkSourceElement(node.elseStatement);
         }
-        function checkTestingKnownTruthyCallableType(condExpr, type, body) {
-            if (!strictNullChecks) {
+        function checkTestingKnownTruthyCallableOrAwaitableType(condExpr, type, body) {
+            if (!strictNullChecks)
+                return;
+            if (getFalsyFlags(type))
                 return;
-            }
             var location = ts.isBinaryExpression(condExpr) ? condExpr.right : condExpr;
             var testedNode = ts.isIdentifier(location) ? location
                 : ts.isPropertyAccessExpression(location) ? location.name
@@ -75405,30 +77416,33 @@ var ts;
             if (!testedNode || isPropertyExpressionCast) {
                 return;
             }
-            var possiblyFalsy = getFalsyFlags(type);
-            if (possiblyFalsy) {
-                return;
-            }
             // While it technically should be invalid for any known-truthy value
-            // to be tested, we de-scope to functions unrefenced in the block as a
-            // heuristic to identify the most common bugs. There are too many
-            // false positives for values sourced from type definitions without
-            // strictNullChecks otherwise.
+            // to be tested, we de-scope to functions and Promises unreferenced in
+            // the block as a heuristic to identify the most common bugs. There
+            // are too many false positives for values sourced from type
+            // definitions without strictNullChecks otherwise.
             var callSignatures = getSignaturesOfType(type, 0 /* Call */);
-            if (callSignatures.length === 0) {
+            var isPromise = !!getAwaitedTypeOfPromise(type);
+            if (callSignatures.length === 0 && !isPromise) {
                 return;
             }
             var testedSymbol = getSymbolAtLocation(testedNode);
             if (!testedSymbol) {
                 return;
             }
-            var isUsed = ts.isBinaryExpression(condExpr.parent) && isFunctionUsedInBinaryExpressionChain(condExpr.parent, testedSymbol)
-                || body && isFunctionUsedInConditionBody(condExpr, body, testedNode, testedSymbol);
+            var isUsed = ts.isBinaryExpression(condExpr.parent) && isSymbolUsedInBinaryExpressionChain(condExpr.parent, testedSymbol)
+                || body && isSymbolUsedInConditionBody(condExpr, body, testedNode, testedSymbol);
             if (!isUsed) {
-                error(location, ts.Diagnostics.This_condition_will_always_return_true_since_the_function_is_always_defined_Did_you_mean_to_call_it_instead);
+                if (isPromise) {
+                    errorAndMaybeSuggestAwait(location, 
+                    /*maybeMissingAwait*/ true, ts.Diagnostics.This_condition_will_always_return_true_since_this_0_is_always_defined, getTypeNameForErrorDisplay(type));
+                }
+                else {
+                    error(location, ts.Diagnostics.This_condition_will_always_return_true_since_this_function_is_always_defined_Did_you_mean_to_call_it_instead);
+                }
             }
         }
-        function isFunctionUsedInConditionBody(expr, body, testedNode, testedSymbol) {
+        function isSymbolUsedInConditionBody(expr, body, testedNode, testedSymbol) {
             return !!ts.forEachChild(body, function check(childNode) {
                 if (ts.isIdentifier(childNode)) {
                     var childSymbol = getSymbolAtLocation(childNode);
@@ -75465,7 +77479,7 @@ var ts;
                 return ts.forEachChild(childNode, check);
             });
         }
-        function isFunctionUsedInBinaryExpressionChain(node, testedSymbol) {
+        function isSymbolUsedInBinaryExpressionChain(node, testedSymbol) {
             while (ts.isBinaryExpression(node) && node.operatorToken.kind === 55 /* AmpersandAmpersandToken */) {
                 var isUsed = ts.forEachChild(node.right, function visit(child) {
                     if (ts.isIdentifier(child)) {
@@ -75507,12 +77521,12 @@ var ts;
         function checkForStatement(node) {
             // Grammar checking
             if (!checkGrammarStatementInAmbientContext(node)) {
-                if (node.initializer && node.initializer.kind === 250 /* VariableDeclarationList */) {
+                if (node.initializer && node.initializer.kind === 251 /* VariableDeclarationList */) {
                     checkGrammarVariableDeclarationList(node.initializer);
                 }
             }
             if (node.initializer) {
-                if (node.initializer.kind === 250 /* VariableDeclarationList */) {
+                if (node.initializer.kind === 251 /* VariableDeclarationList */) {
                     ts.forEach(node.initializer.declarations, checkVariableDeclaration);
                 }
                 else {
@@ -75546,14 +77560,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 === 250 /* VariableDeclarationList */) {
+            if (node.initializer.kind === 251 /* 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 === 199 /* ArrayLiteralExpression */ || varExpr.kind === 200 /* ObjectLiteralExpression */) {
+                if (varExpr.kind === 200 /* ArrayLiteralExpression */ || varExpr.kind === 201 /* 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.
@@ -75585,7 +77599,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 === 250 /* VariableDeclarationList */) {
+            if (node.initializer.kind === 251 /* 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);
@@ -75599,7 +77613,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 === 199 /* ArrayLiteralExpression */ || varExpr.kind === 200 /* ObjectLiteralExpression */) {
+                if (varExpr.kind === 200 /* ArrayLiteralExpression */ || varExpr.kind === 201 /* 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)) {
@@ -75715,18 +77729,8 @@ var ts;
                     // want to say that number is not an array type. But if the input was just
                     // number and string input is allowed, we want to say that number is not an
                     // array type or a string type.
-                    var yieldType = getIterationTypeOfIterable(use, 0 /* Yield */, inputType, /*errorNode*/ undefined);
-                    var _a = !(use & 4 /* AllowsStringInputFlag */) || hasStringConstituent
-                        ? downlevelIteration
-                            ? [ts.Diagnostics.Type_0_is_not_an_array_type_or_does_not_have_a_Symbol_iterator_method_that_returns_an_iterator, true]
-                            : yieldType
-                                ? [ts.Diagnostics.Type_0_is_not_an_array_type_or_a_string_type_Use_compiler_option_downlevelIteration_to_allow_iterating_of_iterators, false]
-                                : [ts.Diagnostics.Type_0_is_not_an_array_type, true]
-                        : downlevelIteration
-                            ? [ts.Diagnostics.Type_0_is_not_an_array_type_or_a_string_type_or_does_not_have_a_Symbol_iterator_method_that_returns_an_iterator, true]
-                            : yieldType
-                                ? [ts.Diagnostics.Type_0_is_not_an_array_type_or_a_string_type_Use_compiler_option_downlevelIteration_to_allow_iterating_of_iterators, false]
-                                : [ts.Diagnostics.Type_0_is_not_an_array_type_or_a_string_type, true], defaultDiagnostic = _a[0], maybeMissingAwait = _a[1];
+                    var allowsStrings = !!(use & 4 /* AllowsStringInputFlag */) && !hasStringConstituent;
+                    var _a = getIterationDiagnosticDetails(allowsStrings, downlevelIteration), defaultDiagnostic = _a[0], maybeMissingAwait = _a[1];
                     errorAndMaybeSuggestAwait(errorNode, maybeMissingAwait && !!getAwaitedTypeOfPromise(arrayType), defaultDiagnostic, typeToString(arrayType));
                 }
                 return hasStringConstituent ? possibleOutOfBounds ? includeUndefinedInIndexSignature(stringType) : stringType : undefined;
@@ -75740,6 +77744,40 @@ var ts;
                 return getUnionType(possibleOutOfBounds ? [arrayElementType, stringType, undefinedType] : [arrayElementType, stringType], 2 /* Subtype */);
             }
             return (use & 128 /* PossiblyOutOfBounds */) ? includeUndefinedInIndexSignature(arrayElementType) : arrayElementType;
+            function getIterationDiagnosticDetails(allowsStrings, downlevelIteration) {
+                var _a;
+                if (downlevelIteration) {
+                    return allowsStrings
+                        ? [ts.Diagnostics.Type_0_is_not_an_array_type_or_a_string_type_or_does_not_have_a_Symbol_iterator_method_that_returns_an_iterator, true]
+                        : [ts.Diagnostics.Type_0_is_not_an_array_type_or_does_not_have_a_Symbol_iterator_method_that_returns_an_iterator, true];
+                }
+                var yieldType = getIterationTypeOfIterable(use, 0 /* Yield */, inputType, /*errorNode*/ undefined);
+                if (yieldType) {
+                    return [ts.Diagnostics.Type_0_is_not_an_array_type_or_a_string_type_Use_compiler_option_downlevelIteration_to_allow_iterating_of_iterators, false];
+                }
+                if (isES2015OrLaterIterable((_a = inputType.symbol) === null || _a === void 0 ? void 0 : _a.escapedName)) {
+                    return [ts.Diagnostics.Type_0_can_only_be_iterated_through_when_using_the_downlevelIteration_flag_or_with_a_target_of_es2015_or_higher, true];
+                }
+                return allowsStrings
+                    ? [ts.Diagnostics.Type_0_is_not_an_array_type_or_a_string_type, true]
+                    : [ts.Diagnostics.Type_0_is_not_an_array_type, true];
+            }
+        }
+        function isES2015OrLaterIterable(n) {
+            switch (n) {
+                case "Float32Array":
+                case "Float64Array":
+                case "Int16Array":
+                case "Int32Array":
+                case "Int8Array":
+                case "NodeList":
+                case "Uint16Array":
+                case "Uint32Array":
+                case "Uint8Array":
+                case "Uint8ClampedArray":
+                    return true;
+            }
+            return false;
         }
         /**
          * Gets the requested "iteration type" from an `Iterable`-like or `AsyncIterable`-like type.
@@ -75983,6 +78021,11 @@ var ts;
                 return setCachedIterationTypes(type, resolver.iterableCacheKey, createIterationTypes(yieldType, returnType, nextType));
             }
         }
+        function getPropertyNameForKnownSymbolName(symbolName) {
+            var ctorType = getGlobalESSymbolConstructorSymbol(/*reportErrors*/ false);
+            var uniqueType = ctorType && getTypeOfPropertyOfType(getTypeOfSymbol(ctorType), ts.escapeLeadingUnderscores(symbolName));
+            return uniqueType && isTypeUsableAsPropertyName(uniqueType) ? getPropertyNameFromType(uniqueType) : "__@" + symbolName;
+        }
         /**
          * Gets the *yield*, *return*, and *next* types of an `Iterable`-like or `AsyncIterable`-like
          * type from its members.
@@ -75995,7 +78038,7 @@ var ts;
          */
         function getIterationTypesOfIterableSlow(type, resolver, errorNode) {
             var _a;
-            var method = getPropertyOfType(type, ts.getPropertyNameForKnownSymbolName(resolver.iteratorSymbolName));
+            var method = getPropertyOfType(type, getPropertyNameForKnownSymbolName(resolver.iteratorSymbolName));
             var methodType = method && !(method.flags & 16777216 /* Optional */) ? getTypeOfSymbol(method) : undefined;
             if (isTypeAny(methodType)) {
                 return setCachedIterationTypes(type, resolver.iterableCacheKey, anyIterationTypes);
@@ -76294,12 +78337,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 === 168 /* SetAccessor */) {
+                if (func.kind === 169 /* SetAccessor */) {
                     if (node.expression) {
                         error(node, ts.Diagnostics.Setters_cannot_return_a_value);
                     }
                 }
-                else if (func.kind === 166 /* Constructor */) {
+                else if (func.kind === 167 /* 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);
                     }
@@ -76317,7 +78360,7 @@ var ts;
                     }
                 }
             }
-            else if (func.kind !== 166 /* Constructor */ && compilerOptions.noImplicitReturns && !isUnwrappedReturnTypeVoidOrAny(func, returnType)) {
+            else if (func.kind !== 167 /* 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);
             }
@@ -76346,7 +78389,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 === 285 /* DefaultClause */ && !hasDuplicateDefaultClause) {
+                if (clause.kind === 286 /* DefaultClause */ && !hasDuplicateDefaultClause) {
                     if (firstDefaultClause === undefined) {
                         firstDefaultClause = clause;
                     }
@@ -76355,7 +78398,7 @@ var ts;
                         hasDuplicateDefaultClause = true;
                     }
                 }
-                if (produceDiagnostics && clause.kind === 284 /* CaseClause */) {
+                if (produceDiagnostics && clause.kind === 285 /* 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.
@@ -76387,7 +78430,7 @@ var ts;
                     if (ts.isFunctionLike(current)) {
                         return "quit";
                     }
-                    if (current.kind === 245 /* LabeledStatement */ && current.label.escapedText === node.label.escapedText) {
+                    if (current.kind === 246 /* LabeledStatement */ && current.label.escapedText === node.label.escapedText) {
                         grammarErrorOnNode(node.label, ts.Diagnostics.Duplicate_label_0, ts.getTextOfNode(node.label));
                         return true;
                     }
@@ -76417,10 +78460,11 @@ var ts;
                 // Grammar checking
                 if (catchClause.variableDeclaration) {
                     var declaration = catchClause.variableDeclaration;
-                    if (declaration.type) {
+                    var typeNode = ts.getEffectiveTypeAnnotationNode(ts.getRootDeclaration(declaration));
+                    if (typeNode) {
                         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);
+                            grammarErrorOnFirstToken(typeNode, ts.Diagnostics.Catch_clause_variable_type_annotation_must_be_any_or_unknown_if_specified);
                         }
                     }
                     else if (declaration.initializer) {
@@ -76431,7 +78475,7 @@ var ts;
                         if (blockLocals_1) {
                             ts.forEachKey(catchClause.locals, function (caughtName) {
                                 var blockLocal = blockLocals_1.get(caughtName);
-                                if (blockLocal && (blockLocal.flags & 2 /* BlockScopedVariable */) !== 0) {
+                                if ((blockLocal === null || blockLocal === void 0 ? void 0 : blockLocal.valueDeclaration) && (blockLocal.flags & 2 /* BlockScopedVariable */) !== 0) {
                                     grammarErrorOnNode(blockLocal.valueDeclaration, ts.Diagnostics.Cannot_redeclare_identifier_0_in_catch_clause, caughtName);
                                 }
                             });
@@ -76444,21 +78488,24 @@ var ts;
                 checkBlock(node.finallyBlock);
             }
         }
-        function checkIndexConstraints(type) {
-            var declaredNumberIndexer = getIndexDeclarationOfSymbol(type.symbol, 1 /* Number */);
-            var declaredStringIndexer = getIndexDeclarationOfSymbol(type.symbol, 0 /* String */);
+        function checkIndexConstraints(type, isStatic) {
+            var _a, _b, _c, _d;
+            var declaredNumberIndexer = getIndexDeclarationOfSymbolTable(isStatic ? (_a = type.symbol) === null || _a === void 0 ? void 0 : _a.exports : (_b = type.symbol) === null || _b === void 0 ? void 0 : _b.members, 1 /* Number */);
+            var declaredStringIndexer = getIndexDeclarationOfSymbolTable(isStatic ? (_c = type.symbol) === null || _c === void 0 ? void 0 : _c.exports : (_d = type.symbol) === null || _d === void 0 ? void 0 : _d.members, 0 /* String */);
             var stringIndexType = getIndexTypeOfType(type, 0 /* String */);
             var numberIndexType = getIndexTypeOfType(type, 1 /* Number */);
             if (stringIndexType || numberIndexType) {
                 ts.forEach(getPropertiesOfObjectType(type), function (prop) {
+                    if (isStatic && prop.flags & 4194304 /* Prototype */)
+                        return;
                     var propType = getTypeOfSymbol(prop);
                     checkIndexConstraintForProperty(prop, propType, type, declaredStringIndexer, stringIndexType, 0 /* String */);
                     checkIndexConstraintForProperty(prop, propType, type, declaredNumberIndexer, numberIndexType, 1 /* Number */);
                 });
                 var classDeclaration = type.symbol.valueDeclaration;
-                if (ts.getObjectFlags(type) & 1 /* Class */ && ts.isClassLike(classDeclaration)) {
-                    for (var _i = 0, _a = classDeclaration.members; _i < _a.length; _i++) {
-                        var member = _a[_i];
+                if (ts.getObjectFlags(type) & 1 /* Class */ && classDeclaration && ts.isClassLike(classDeclaration)) {
+                    for (var _i = 0, _e = classDeclaration.members; _i < _e.length; _i++) {
+                        var member = _e[_i];
                         // Only process instance properties with computed names here.
                         // Static properties cannot be in conflict with indexers,
                         // and properties with literal names were already checked.
@@ -76477,7 +78524,7 @@ var ts;
                 // condition 'errorNode === undefined' may appear if types does not declare nor string neither number indexer
                 if (!errorNode && (ts.getObjectFlags(type) & 2 /* Interface */)) {
                     var someBaseTypeHasBothIndexers = ts.forEach(getBaseTypes(type), function (base) { return getIndexTypeOfType(base, 0 /* String */) && getIndexTypeOfType(base, 1 /* Number */); });
-                    errorNode = someBaseTypeHasBothIndexers ? undefined : type.symbol.declarations[0];
+                    errorNode = someBaseTypeHasBothIndexers || !type.symbol.declarations ? undefined : type.symbol.declarations[0];
                 }
             }
             if (errorNode && !isTypeAssignableTo(numberIndexType, stringIndexType)) { // TODO: GH#18217
@@ -76501,8 +78548,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 === 216 /* BinaryExpression */ ||
-                        name.kind === 158 /* ComputedPropertyName */ ||
+                    (propDeclaration.kind === 217 /* BinaryExpression */ ||
+                        name.kind === 159 /* ComputedPropertyName */ ||
                         prop.parent === containingType.symbol)) {
                     errorNode = propDeclaration;
                 }
@@ -76514,7 +78561,7 @@ var ts;
                     // check if any base class already has both property and indexer.
                     // check should be performed only if 'type' is the first type that brings property\indexer together
                     var someBaseClassHasBothPropertyAndIndexer = ts.forEach(getBaseTypes(containingType), function (base) { return getPropertyOfObjectType(base, prop.escapedName) && getIndexTypeOfType(base, indexKind); });
-                    errorNode = someBaseClassHasBothPropertyAndIndexer ? undefined : containingType.symbol.declarations[0];
+                    errorNode = someBaseClassHasBothPropertyAndIndexer || !containingType.symbol.declarations ? undefined : containingType.symbol.declarations[0];
                 }
                 if (errorNode && !isTypeAssignableTo(propertyType, indexType)) {
                     var errorMessage = indexKind === 0 /* String */
@@ -76530,6 +78577,7 @@ var ts;
             switch (name.escapedText) {
                 case "any":
                 case "unknown":
+                case "never":
                 case "number":
                 case "bigint":
                 case "boolean":
@@ -76579,7 +78627,7 @@ var ts;
         function checkTypeParametersNotReferenced(root, typeParameters, index) {
             visit(root);
             function visit(node) {
-                if (node.kind === 173 /* TypeReference */) {
+                if (node.kind === 174 /* TypeReference */) {
                     var type = getTypeFromTypeReference(node);
                     if (type.flags & 262144 /* TypeParameter */) {
                         for (var i = index; i < typeParameters.length; i++) {
@@ -76594,14 +78642,14 @@ var ts;
         }
         /** Check that type parameter lists are identical across multiple declarations */
         function checkTypeParameterListsIdentical(symbol) {
-            if (symbol.declarations.length === 1) {
+            if (symbol.declarations && symbol.declarations.length === 1) {
                 return;
             }
             var links = getSymbolLinks(symbol);
             if (!links.typeParametersChecked) {
                 links.typeParametersChecked = true;
                 var declarations = getClassOrInterfaceDeclarationsOfSymbol(symbol);
-                if (declarations.length <= 1) {
+                if (!declarations || declarations.length <= 1) {
                     return;
                 }
                 var type = getDeclaredTypeOfSymbol(symbol);
@@ -76665,6 +78713,9 @@ var ts;
             registerForUnusedIdentifiersCheck(node);
         }
         function checkClassDeclaration(node) {
+            if (ts.some(node.decorators) && ts.some(node.members, function (p) { return ts.hasStaticModifier(p) && ts.isPrivateIdentifierClassElementDeclaration(p); })) {
+                grammarErrorOnNode(node.decorators[0], ts.Diagnostics.Class_decorators_can_t_be_used_with_static_private_identifier_Consider_removing_the_experimental_decorator);
+            }
             if (!node.name && !ts.hasSyntacticModifier(node, 512 /* Default */)) {
                 grammarErrorOnFirstToken(node, ts.Diagnostics.A_class_declaration_without_the_default_modifier_must_have_a_name);
             }
@@ -76693,7 +78744,8 @@ var ts;
             checkFunctionOrConstructorSymbol(symbol);
             checkClassForDuplicateDeclarations(node);
             // Only check for reserved static identifiers on non-ambient context.
-            if (!(node.flags & 8388608 /* Ambient */)) {
+            var nodeInAmbientContext = !!(node.flags & 8388608 /* Ambient */);
+            if (!nodeInAmbientContext) {
                 checkClassForStaticPropertyNameConflicts(node);
             }
             var baseTypeNode = ts.getEffectiveBaseTypeNode(node);
@@ -76753,6 +78805,7 @@ var ts;
                     checkKindsOfPropertyMemberOverrides(type, baseType_1);
                 }
             }
+            checkMembersForMissingOverrideModifier(node, type, typeWithThis, staticType);
             var implementedTypeNodes = ts.getEffectiveImplementsTypeNodes(node);
             if (implementedTypeNodes) {
                 for (var _b = 0, implementedTypeNodes_1 = implementedTypeNodes; _b < implementedTypeNodes_1.length; _b++) {
@@ -76782,14 +78835,76 @@ var ts;
             }
             if (produceDiagnostics) {
                 checkIndexConstraints(type);
+                checkIndexConstraints(staticType, /*isStatic*/ true);
                 checkTypeForDuplicateIndexSignatures(node);
                 checkPropertyInitialization(node);
             }
         }
+        function checkMembersForMissingOverrideModifier(node, type, typeWithThis, staticType) {
+            var nodeInAmbientContext = !!(node.flags & 8388608 /* Ambient */);
+            var baseTypeNode = ts.getEffectiveBaseTypeNode(node);
+            var baseTypes = baseTypeNode && getBaseTypes(type);
+            var baseWithThis = (baseTypes === null || baseTypes === void 0 ? void 0 : baseTypes.length) ? getTypeWithThisArgument(ts.first(baseTypes), type.thisType) : undefined;
+            var baseStaticType = getBaseConstructorTypeOfClass(type);
+            var _loop_24 = function (member) {
+                if (ts.hasAmbientModifier(member)) {
+                    return "continue";
+                }
+                if (ts.isConstructorDeclaration(member)) {
+                    ts.forEach(member.parameters, function (param) {
+                        if (ts.isParameterPropertyDeclaration(param, member)) {
+                            checkClassMember(param, /*memberIsParameterProperty*/ true);
+                        }
+                    });
+                }
+                checkClassMember(member);
+            };
+            for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
+                var member = _a[_i];
+                _loop_24(member);
+            }
+            function checkClassMember(member, memberIsParameterProperty) {
+                var hasOverride = ts.hasOverrideModifier(member);
+                var hasStatic = ts.hasStaticModifier(member);
+                if (baseWithThis && (hasOverride || compilerOptions.noImplicitOverride)) {
+                    var declaredProp = member.name && getSymbolAtLocation(member.name) || getSymbolAtLocation(member);
+                    if (!declaredProp) {
+                        return;
+                    }
+                    var thisType = hasStatic ? staticType : typeWithThis;
+                    var baseType = hasStatic ? baseStaticType : baseWithThis;
+                    var prop = getPropertyOfType(thisType, declaredProp.escapedName);
+                    var baseProp = getPropertyOfType(baseType, declaredProp.escapedName);
+                    var baseClassName = typeToString(baseWithThis);
+                    if (prop && !baseProp && hasOverride) {
+                        error(member, ts.Diagnostics.This_member_cannot_have_an_override_modifier_because_it_is_not_declared_in_the_base_class_0, baseClassName);
+                    }
+                    else if (prop && (baseProp === null || baseProp === void 0 ? void 0 : baseProp.valueDeclaration) && compilerOptions.noImplicitOverride && !nodeInAmbientContext) {
+                        var baseHasAbstract = ts.hasAbstractModifier(baseProp.valueDeclaration);
+                        if (hasOverride) {
+                            return;
+                        }
+                        if (!baseHasAbstract) {
+                            var diag = memberIsParameterProperty ?
+                                ts.Diagnostics.This_parameter_property_must_have_an_override_modifier_because_it_overrides_a_member_in_base_class_0 :
+                                ts.Diagnostics.This_member_must_have_an_override_modifier_because_it_overrides_a_member_in_the_base_class_0;
+                            error(member, diag, baseClassName);
+                        }
+                        else if (ts.hasAbstractModifier(member) && baseHasAbstract) {
+                            error(member, ts.Diagnostics.This_member_must_have_an_override_modifier_because_it_overrides_an_abstract_method_that_is_declared_in_the_base_class_0, baseClassName);
+                        }
+                    }
+                }
+                else if (hasOverride) {
+                    var className = typeToString(type);
+                    error(member, ts.Diagnostics.This_member_cannot_have_an_override_modifier_because_its_containing_class_0_does_not_extend_another_class, className);
+                }
+            }
+        }
         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_23 = function (member) {
+            var _loop_25 = function (member) {
                 if (ts.hasStaticModifier(member)) {
                     return "continue";
                 }
@@ -76808,7 +78923,7 @@ var ts;
             };
             for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
                 var member = _a[_i];
-                _loop_23(member);
+                _loop_25(member);
             }
             if (!issuedMemberError) {
                 // check again with diagnostics to generate a less-specific error
@@ -76834,7 +78949,7 @@ var ts;
         }
         function getClassOrInterfaceDeclarationsOfSymbol(symbol) {
             return ts.filter(symbol.declarations, function (d) {
-                return d.kind === 252 /* ClassDeclaration */ || d.kind === 253 /* InterfaceDeclaration */;
+                return d.kind === 253 /* ClassDeclaration */ || d.kind === 254 /* InterfaceDeclaration */;
             });
         }
         function checkKindsOfPropertyMemberOverrides(type, baseType) {
@@ -76851,6 +78966,7 @@ var ts;
             // but not by other kinds of members.
             // Base class instance member variables and accessors can be overridden by
             // derived class instance member variables and accessors, but not by other kinds of members.
+            var _a, _b;
             // NOTE: assignability is checked in checkClassDeclaration
             var baseProperties = getPropertiesOfType(baseType);
             basePropertyCheck: for (var _i = 0, baseProperties_1 = baseProperties; _i < baseProperties_1.length; _i++) {
@@ -76879,8 +78995,8 @@ var ts;
                         // Searches other base types for a declaration that would satisfy the inherited abstract member.
                         // (The class may have more than one base type via declaration merging with an interface with the
                         // same name.)
-                        for (var _a = 0, _b = getBaseTypes(type); _a < _b.length; _a++) {
-                            var otherBaseType = _b[_a];
+                        for (var _c = 0, _d = getBaseTypes(type); _c < _d.length; _c++) {
+                            var otherBaseType = _d[_c];
                             if (otherBaseType === baseType)
                                 continue;
                             var baseSymbol_1 = getPropertyOfObjectType(otherBaseType, base.escapedName);
@@ -76889,7 +79005,7 @@ var ts;
                                 continue basePropertyCheck;
                             }
                         }
-                        if (derivedClassDecl.kind === 221 /* ClassExpression */) {
+                        if (derivedClassDecl.kind === 222 /* ClassExpression */) {
                             error(derivedClassDecl, ts.Diagnostics.Non_abstract_class_expression_does_not_implement_inherited_abstract_member_0_from_class_1, symbolToString(baseProperty), typeToString(baseType));
                         }
                         else {
@@ -76910,7 +79026,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 === 253 /* InterfaceDeclaration */
+                            || base.valueDeclaration && base.valueDeclaration.parent.kind === 254 /* 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
@@ -76924,13 +79040,13 @@ var ts;
                                 ts.Diagnostics._0_is_defined_as_a_property_in_class_1_but_is_overridden_here_in_2_as_an_accessor;
                             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 === 163 /* PropertyDeclaration */ && !d.initializer; });
+                        else if (useDefineForClassFields) {
+                            var uninitialized = (_a = derived.declarations) === null || _a === void 0 ? void 0 : _a.find(function (d) { return d.kind === 164 /* PropertyDeclaration */ && !d.initializer; });
                             if (uninitialized
                                 && !(derived.flags & 33554432 /* Transient */)
                                 && !(baseDeclarationFlags & 128 /* Abstract */)
                                 && !(derivedDeclarationFlags & 128 /* Abstract */)
-                                && !derived.declarations.some(function (d) { return !!(d.flags & 8388608 /* Ambient */); })) {
+                                && !((_b = derived.declarations) === null || _b === void 0 ? void 0 : _b.some(function (d) { return !!(d.flags & 8388608 /* Ambient */); }))) {
                                 var constructor = findConstructorDeclaration(ts.getClassLikeDeclarationOfSymbol(type.symbol));
                                 var propName = uninitialized.name;
                                 if (uninitialized.exclamationToken
@@ -77041,7 +79157,7 @@ var ts;
             }
         }
         function isInstancePropertyWithoutInitializer(node) {
-            return node.kind === 163 /* PropertyDeclaration */ &&
+            return node.kind === 164 /* PropertyDeclaration */ &&
                 !ts.hasSyntacticModifier(node, 32 /* Static */ | 128 /* Abstract */) &&
                 !node.exclamationToken &&
                 !node.initializer;
@@ -77065,7 +79181,7 @@ var ts;
                 var symbol = getSymbolOfNode(node);
                 checkTypeParameterListsIdentical(symbol);
                 // Only check this symbol once
-                var firstInterfaceDecl = ts.getDeclarationOfKind(symbol, 253 /* InterfaceDeclaration */);
+                var firstInterfaceDecl = ts.getDeclarationOfKind(symbol, 254 /* InterfaceDeclaration */);
                 if (node === firstInterfaceDecl) {
                     var type = getDeclaredTypeOfSymbol(symbol);
                     var typeWithThis = getTypeWithThisArgument(type);
@@ -77184,7 +79300,7 @@ var ts;
             return value;
             function evaluate(expr) {
                 switch (expr.kind) {
-                    case 214 /* PrefixUnaryExpression */:
+                    case 215 /* PrefixUnaryExpression */:
                         var value_2 = evaluate(expr.operand);
                         if (typeof value_2 === "number") {
                             switch (expr.operator) {
@@ -77194,7 +79310,7 @@ var ts;
                             }
                         }
                         break;
-                    case 216 /* BinaryExpression */:
+                    case 217 /* BinaryExpression */:
                         var left = evaluate(expr.left);
                         var right = evaluate(expr.right);
                         if (typeof left === "number" && typeof right === "number") {
@@ -77223,7 +79339,7 @@ var ts;
                     case 8 /* NumericLiteral */:
                         checkGrammarNumericLiteral(expr);
                         return +expr.text;
-                    case 207 /* ParenthesizedExpression */:
+                    case 208 /* ParenthesizedExpression */:
                         return evaluate(expr.expression);
                     case 78 /* Identifier */:
                         var identifier = expr;
@@ -77231,14 +79347,14 @@ var ts;
                             return +(identifier.escapedText);
                         }
                         return ts.nodeIsMissing(expr) ? 0 : evaluateEnumMember(expr, getSymbolOfNode(member.parent), identifier.escapedText);
-                    case 202 /* ElementAccessExpression */:
-                    case 201 /* PropertyAccessExpression */:
+                    case 203 /* ElementAccessExpression */:
+                    case 202 /* 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 === 201 /* PropertyAccessExpression */) {
+                                if (ex.kind === 202 /* PropertyAccessExpression */) {
                                     name = ex.name.escapedText;
                                 }
                                 else {
@@ -77256,7 +79372,7 @@ var ts;
                 if (memberSymbol) {
                     var declaration = memberSymbol.valueDeclaration;
                     if (declaration !== member) {
-                        if (isBlockScopedNameDeclaredBeforeUse(declaration, member)) {
+                        if (declaration && isBlockScopedNameDeclaredBeforeUse(declaration, member)) {
                             return getEnumMemberValue(declaration);
                         }
                         error(expr, ts.Diagnostics.A_member_initializer_in_a_enum_declaration_cannot_reference_members_declared_after_it_including_members_defined_in_other_enums);
@@ -77271,8 +79387,8 @@ var ts;
         }
         function isConstantMemberAccess(node) {
             return node.kind === 78 /* Identifier */ ||
-                node.kind === 201 /* PropertyAccessExpression */ && isConstantMemberAccess(node.expression) ||
-                node.kind === 202 /* ElementAccessExpression */ && isConstantMemberAccess(node.expression) &&
+                node.kind === 202 /* PropertyAccessExpression */ && isConstantMemberAccess(node.expression) ||
+                node.kind === 203 /* ElementAccessExpression */ && isConstantMemberAccess(node.expression) &&
                     ts.isStringLiteralLike(node.argumentExpression);
         }
         function checkEnumDeclaration(node) {
@@ -77296,7 +79412,7 @@ var ts;
             var enumSymbol = getSymbolOfNode(node);
             var firstDeclaration = ts.getDeclarationOfKind(enumSymbol, node.kind);
             if (node === firstDeclaration) {
-                if (enumSymbol.declarations.length > 1) {
+                if (enumSymbol.declarations && enumSymbol.declarations.length > 1) {
                     var enumIsConst_1 = ts.isEnumConst(node);
                     // check that const is placed\omitted on all enum declarations
                     ts.forEach(enumSymbol.declarations, function (decl) {
@@ -77308,7 +79424,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 !== 255 /* EnumDeclaration */) {
+                    if (declaration.kind !== 256 /* EnumDeclaration */) {
                         return false;
                     }
                     var enumDeclaration = declaration;
@@ -77334,12 +79450,14 @@ var ts;
         }
         function getFirstNonAmbientClassOrFunctionDeclaration(symbol) {
             var declarations = symbol.declarations;
-            for (var _i = 0, declarations_8 = declarations; _i < declarations_8.length; _i++) {
-                var declaration = declarations_8[_i];
-                if ((declaration.kind === 252 /* ClassDeclaration */ ||
-                    (declaration.kind === 251 /* FunctionDeclaration */ && ts.nodeIsPresent(declaration.body))) &&
-                    !(declaration.flags & 8388608 /* Ambient */)) {
-                    return declaration;
+            if (declarations) {
+                for (var _i = 0, declarations_8 = declarations; _i < declarations_8.length; _i++) {
+                    var declaration = declarations_8[_i];
+                    if ((declaration.kind === 253 /* ClassDeclaration */ ||
+                        (declaration.kind === 252 /* FunctionDeclaration */ && ts.nodeIsPresent(declaration.body))) &&
+                        !(declaration.flags & 8388608 /* Ambient */)) {
+                        return declaration;
+                    }
                 }
             }
             return undefined;
@@ -77387,6 +79505,7 @@ var ts;
                 // The following checks only apply on a non-ambient instantiated module declaration.
                 if (symbol.flags & 512 /* ValueModule */
                     && !inAmbientContext
+                    && symbol.declarations
                     && symbol.declarations.length > 1
                     && isInstantiatedModule(node, ts.shouldPreserveConstEnums(compilerOptions))) {
                     var firstNonAmbientClassOrFunc = getFirstNonAmbientClassOrFunctionDeclaration(symbol);
@@ -77400,7 +79519,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, 252 /* ClassDeclaration */);
+                    var mergedClass = ts.getDeclarationOfKind(symbol, 253 /* ClassDeclaration */);
                     if (mergedClass &&
                         inSameLexicalScope(node, mergedClass)) {
                         getNodeLinks(node).flags |= 32768 /* LexicalModuleMergesWithClass */;
@@ -77449,40 +79568,41 @@ var ts;
             }
         }
         function checkModuleAugmentationElement(node, isGlobalAugmentation) {
+            var _a;
             switch (node.kind) {
-                case 232 /* VariableStatement */:
+                case 233 /* 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];
+                    for (var _i = 0, _b = node.declarationList.declarations; _i < _b.length; _i++) {
+                        var decl = _b[_i];
                         checkModuleAugmentationElement(decl, isGlobalAugmentation);
                     }
                     break;
-                case 266 /* ExportAssignment */:
-                case 267 /* ExportDeclaration */:
+                case 267 /* ExportAssignment */:
+                case 268 /* ExportDeclaration */:
                     grammarErrorOnFirstToken(node, ts.Diagnostics.Exports_and_export_assignments_are_not_permitted_in_module_augmentations);
                     break;
-                case 260 /* ImportEqualsDeclaration */:
-                case 261 /* ImportDeclaration */:
+                case 261 /* ImportEqualsDeclaration */:
+                case 262 /* ImportDeclaration */:
                     grammarErrorOnFirstToken(node, ts.Diagnostics.Imports_are_not_permitted_in_module_augmentations_Consider_moving_them_to_the_enclosing_external_module);
                     break;
-                case 198 /* BindingElement */:
-                case 249 /* VariableDeclaration */:
+                case 199 /* BindingElement */:
+                case 250 /* VariableDeclaration */:
                     var name = node.name;
                     if (ts.isBindingPattern(name)) {
-                        for (var _b = 0, _c = name.elements; _b < _c.length; _b++) {
-                            var el = _c[_b];
+                        for (var _c = 0, _d = name.elements; _c < _d.length; _c++) {
+                            var el = _d[_c];
                             // mark individual names in binding pattern
                             checkModuleAugmentationElement(el, isGlobalAugmentation);
                         }
                         break;
                     }
                 // falls through
-                case 252 /* ClassDeclaration */:
-                case 255 /* EnumDeclaration */:
-                case 251 /* FunctionDeclaration */:
-                case 253 /* InterfaceDeclaration */:
-                case 256 /* ModuleDeclaration */:
-                case 254 /* TypeAliasDeclaration */:
+                case 253 /* ClassDeclaration */:
+                case 256 /* EnumDeclaration */:
+                case 252 /* FunctionDeclaration */:
+                case 254 /* InterfaceDeclaration */:
+                case 257 /* ModuleDeclaration */:
+                case 255 /* TypeAliasDeclaration */:
                     if (isGlobalAugmentation) {
                         return;
                     }
@@ -77495,7 +79615,7 @@ var ts;
                         var reportError = !(symbol.flags & 33554432 /* Transient */);
                         if (!reportError) {
                             // symbol should not originate in augmentation
-                            reportError = !!symbol.parent && ts.isExternalModuleAugmentation(symbol.parent.declarations[0]);
+                            reportError = !!((_a = symbol.parent) === null || _a === void 0 ? void 0 : _a.declarations) && ts.isExternalModuleAugmentation(symbol.parent.declarations[0]);
                         }
                     }
                     break;
@@ -77505,12 +79625,12 @@ var ts;
             switch (node.kind) {
                 case 78 /* Identifier */:
                     return node;
-                case 157 /* QualifiedName */:
+                case 158 /* QualifiedName */:
                     do {
                         node = node.left;
                     } while (node.kind !== 78 /* Identifier */);
                     return node;
-                case 201 /* PropertyAccessExpression */:
+                case 202 /* PropertyAccessExpression */:
                     do {
                         if (ts.isModuleExportsAccessExpression(node.expression) && !ts.isPrivateIdentifier(node.name)) {
                             return node.name;
@@ -77530,9 +79650,9 @@ var ts;
                 error(moduleName, ts.Diagnostics.String_literal_expected);
                 return false;
             }
-            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 */ ?
+            var inAmbientExternalModule = node.parent.kind === 258 /* ModuleBlock */ && ts.isAmbientModule(node.parent.parent);
+            if (node.parent.kind !== 298 /* SourceFile */ && !inAmbientExternalModule) {
+                error(moduleName, node.kind === 268 /* ExportDeclaration */ ?
                     ts.Diagnostics.Export_declarations_are_not_permitted_in_a_namespace :
                     ts.Diagnostics.Import_declarations_in_a_namespace_cannot_reference_a_module);
                 return false;
@@ -77567,14 +79687,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 === 270 /* ExportSpecifier */ ?
+                    var message = node.kind === 271 /* 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 === 270 /* ExportSpecifier */
+                    && node.kind === 271 /* ExportSpecifier */
                     && !node.parent.parent.isTypeOnly
                     && !(target.flags & 111551 /* Value */)
                     && !(node.flags & 8388608 /* Ambient */)) {
@@ -77589,7 +79709,7 @@ var ts;
             checkCollisionWithRequireExportsInGeneratedCode(node, node.name);
             checkCollisionWithGlobalPromiseInGeneratedCode(node, node.name);
             checkAliasSymbol(node);
-            if (node.kind === 265 /* ImportSpecifier */ &&
+            if (node.kind === 266 /* ImportSpecifier */ &&
                 ts.idText(node.propertyName || node.name) === "default" &&
                 compilerOptions.esModuleInterop &&
                 moduleKind !== ts.ModuleKind.System && moduleKind < ts.ModuleKind.ES2015) {
@@ -77611,7 +79731,7 @@ var ts;
                         checkImportBinding(importClause);
                     }
                     if (importClause.namedBindings) {
-                        if (importClause.namedBindings.kind === 263 /* NamespaceImport */) {
+                        if (importClause.namedBindings.kind === 264 /* NamespaceImport */) {
                             checkImportBinding(importClause.namedBindings);
                             if (moduleKind !== ts.ModuleKind.System && moduleKind < ts.ModuleKind.ES2015 && compilerOptions.esModuleInterop) {
                                 // import * as ns from "foo";
@@ -77639,7 +79759,7 @@ var ts;
                 if (ts.hasSyntacticModifier(node, 1 /* Export */)) {
                     markExportAsReferenced(node);
                 }
-                if (node.moduleReference.kind !== 272 /* ExternalModuleReference */) {
+                if (node.moduleReference.kind !== 273 /* ExternalModuleReference */) {
                     var target = resolveAlias(getSymbolOfNode(node));
                     if (target !== unknownSymbol) {
                         if (target.flags & 111551 /* Value */) {
@@ -77682,10 +79802,10 @@ var ts;
                     // export { x, y }
                     // export { x, y } from "foo"
                     ts.forEach(node.exportClause.elements, checkExportSpecifier);
-                    var inAmbientExternalModule = node.parent.kind === 257 /* ModuleBlock */ && ts.isAmbientModule(node.parent.parent);
-                    var inAmbientNamespaceDeclaration = !inAmbientExternalModule && node.parent.kind === 257 /* ModuleBlock */ &&
+                    var inAmbientExternalModule = node.parent.kind === 258 /* ModuleBlock */ && ts.isAmbientModule(node.parent.parent);
+                    var inAmbientNamespaceDeclaration = !inAmbientExternalModule && node.parent.kind === 258 /* ModuleBlock */ &&
                         !node.moduleSpecifier && node.flags & 8388608 /* Ambient */;
-                    if (node.parent.kind !== 297 /* SourceFile */ && !inAmbientExternalModule && !inAmbientNamespaceDeclaration) {
+                    if (node.parent.kind !== 298 /* SourceFile */ && !inAmbientExternalModule && !inAmbientNamespaceDeclaration) {
                         error(node, ts.Diagnostics.Export_declarations_are_not_permitted_in_a_namespace);
                     }
                 }
@@ -77718,14 +79838,14 @@ var ts;
         }
         function checkGrammarExportDeclaration(node) {
             var _a;
-            var isTypeOnlyExportStar = node.isTypeOnly && ((_a = node.exportClause) === null || _a === void 0 ? void 0 : _a.kind) !== 268 /* NamedExports */;
+            var isTypeOnlyExportStar = node.isTypeOnly && ((_a = node.exportClause) === null || _a === void 0 ? void 0 : _a.kind) !== 269 /* 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 === 297 /* SourceFile */ || node.parent.kind === 257 /* ModuleBlock */ || node.parent.kind === 256 /* ModuleDeclaration */;
+            var isInAppropriateContext = node.parent.kind === 298 /* SourceFile */ || node.parent.kind === 258 /* ModuleBlock */ || node.parent.kind === 257 /* ModuleDeclaration */;
             if (!isInAppropriateContext) {
                 grammarErrorOnFirstToken(node, errorMessage);
             }
@@ -77775,7 +79895,7 @@ var ts;
                 // find immediate value referenced by exported name (SymbolFlags.Alias is set so we don't chase down aliases)
                 var symbol = resolveName(exportedName, exportedName.escapedText, 111551 /* Value */ | 788968 /* Type */ | 1920 /* Namespace */ | 2097152 /* Alias */, 
                 /*nameNotFoundMessage*/ undefined, /*nameArg*/ undefined, /*isUse*/ true);
-                if (symbol && (symbol === undefinedSymbol || symbol === globalThisSymbol || isGlobalSourceFile(getDeclarationContainer(symbol.declarations[0])))) {
+                if (symbol && (symbol === undefinedSymbol || symbol === globalThisSymbol || symbol.declarations && isGlobalSourceFile(getDeclarationContainer(symbol.declarations[0])))) {
                     error(exportedName, ts.Diagnostics.Cannot_export_0_Only_local_declarations_can_be_exported_from_a_module, ts.idText(exportedName));
                 }
                 else {
@@ -77796,12 +79916,15 @@ var ts;
             }
         }
         function checkExportAssignment(node) {
-            if (checkGrammarModuleElementContext(node, ts.Diagnostics.An_export_assignment_can_only_be_used_in_a_module)) {
+            var illegalContextMessage = node.isExportEquals
+                ? ts.Diagnostics.An_export_assignment_must_be_at_the_top_level_of_a_file_or_module_declaration
+                : ts.Diagnostics.A_default_export_must_be_at_the_top_level_of_a_file_or_module_declaration;
+            if (checkGrammarModuleElementContext(node, illegalContextMessage)) {
                 // If we hit an export assignment in an illegal context, just bail out to avoid cascading errors.
                 return;
             }
-            var container = node.parent.kind === 297 /* SourceFile */ ? node.parent : node.parent.parent;
-            if (container.kind === 256 /* ModuleDeclaration */ && !ts.isAmbientModule(container)) {
+            var container = node.parent.kind === 298 /* SourceFile */ ? node.parent : node.parent.parent;
+            if (container.kind === 257 /* ModuleDeclaration */ && !ts.isAmbientModule(container)) {
                 if (node.isExportEquals) {
                     error(node, ts.Diagnostics.An_export_assignment_cannot_be_used_in_a_namespace);
                 }
@@ -77861,7 +79984,7 @@ var ts;
                 var exportEqualsSymbol = moduleSymbol.exports.get("export=");
                 if (exportEqualsSymbol && hasExportedMembers(moduleSymbol)) {
                     var declaration = getDeclarationOfAliasSymbol(exportEqualsSymbol) || exportEqualsSymbol.valueDeclaration;
-                    if (!isTopLevelInExternalModuleAugmentation(declaration) && !ts.isInJSFile(declaration)) {
+                    if (declaration && !isTopLevelInExternalModuleAugmentation(declaration) && !ts.isInJSFile(declaration)) {
                         error(declaration, ts.Diagnostics.An_export_assignment_cannot_be_used_in_a_module_with_other_exported_elements);
                     }
                 }
@@ -77885,10 +80008,12 @@ var ts;
                             return;
                         }
                         if (exportedDeclarationsCount > 1) {
-                            for (var _i = 0, declarations_9 = declarations; _i < declarations_9.length; _i++) {
-                                var declaration = declarations_9[_i];
-                                if (isNotOverload(declaration)) {
-                                    diagnostics.add(ts.createDiagnosticForNode(declaration, ts.Diagnostics.Cannot_redeclare_exported_variable_0, ts.unescapeLeadingUnderscores(id)));
+                            if (!isDuplicatedCommonJSExport(declarations)) {
+                                for (var _i = 0, _b = declarations; _i < _b.length; _i++) {
+                                    var declaration = _b[_i];
+                                    if (isNotOverload(declaration)) {
+                                        diagnostics.add(ts.createDiagnosticForNode(declaration, ts.Diagnostics.Cannot_redeclare_exported_variable_0, ts.unescapeLeadingUnderscores(id)));
+                                    }
                                 }
                             }
                         }
@@ -77897,6 +80022,11 @@ var ts;
                 links.exportsChecked = true;
             }
         }
+        function isDuplicatedCommonJSExport(declarations) {
+            return declarations
+                && declarations.length > 1
+                && declarations.every(function (d) { return ts.isInJSFile(d) && ts.isAccessExpression(d) && (ts.isExportsIdentifier(d.expression) || ts.isModuleExportsAccessExpression(d.expression)); });
+        }
         function checkSourceElement(node) {
             if (node) {
                 var saveCurrentNode = currentNode;
@@ -77918,171 +80048,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 256 /* ModuleDeclaration */:
-                    case 252 /* ClassDeclaration */:
-                    case 253 /* InterfaceDeclaration */:
-                    case 251 /* FunctionDeclaration */:
+                    case 257 /* ModuleDeclaration */:
+                    case 253 /* ClassDeclaration */:
+                    case 254 /* InterfaceDeclaration */:
+                    case 252 /* FunctionDeclaration */:
                         cancellationToken.throwIfCancellationRequested();
                 }
             }
-            if (kind >= 232 /* FirstStatement */ && kind <= 248 /* LastStatement */ && node.flowNode && !isReachableFlowNode(node.flowNode)) {
+            if (kind >= 233 /* FirstStatement */ && kind <= 249 /* LastStatement */ && node.flowNode && !isReachableFlowNode(node.flowNode)) {
                 errorOrSuggestion(compilerOptions.allowUnreachableCode === false, node, ts.Diagnostics.Unreachable_code_detected);
             }
             switch (kind) {
-                case 159 /* TypeParameter */:
+                case 160 /* TypeParameter */:
                     return checkTypeParameter(node);
-                case 160 /* Parameter */:
+                case 161 /* Parameter */:
                     return checkParameter(node);
-                case 163 /* PropertyDeclaration */:
+                case 164 /* PropertyDeclaration */:
                     return checkPropertyDeclaration(node);
-                case 162 /* PropertySignature */:
+                case 163 /* PropertySignature */:
                     return checkPropertySignature(node);
-                case 175 /* ConstructorType */:
-                case 174 /* FunctionType */:
-                case 169 /* CallSignature */:
-                case 170 /* ConstructSignature */:
-                case 171 /* IndexSignature */:
+                case 176 /* ConstructorType */:
+                case 175 /* FunctionType */:
+                case 170 /* CallSignature */:
+                case 171 /* ConstructSignature */:
+                case 172 /* IndexSignature */:
                     return checkSignatureDeclaration(node);
-                case 165 /* MethodDeclaration */:
-                case 164 /* MethodSignature */:
+                case 166 /* MethodDeclaration */:
+                case 165 /* MethodSignature */:
                     return checkMethodDeclaration(node);
-                case 166 /* Constructor */:
+                case 167 /* Constructor */:
                     return checkConstructorDeclaration(node);
-                case 167 /* GetAccessor */:
-                case 168 /* SetAccessor */:
+                case 168 /* GetAccessor */:
+                case 169 /* SetAccessor */:
                     return checkAccessorDeclaration(node);
-                case 173 /* TypeReference */:
+                case 174 /* TypeReference */:
                     return checkTypeReferenceNode(node);
-                case 172 /* TypePredicate */:
+                case 173 /* TypePredicate */:
                     return checkTypePredicate(node);
-                case 176 /* TypeQuery */:
+                case 177 /* TypeQuery */:
                     return checkTypeQuery(node);
-                case 177 /* TypeLiteral */:
+                case 178 /* TypeLiteral */:
                     return checkTypeLiteral(node);
-                case 178 /* ArrayType */:
+                case 179 /* ArrayType */:
                     return checkArrayType(node);
-                case 179 /* TupleType */:
+                case 180 /* TupleType */:
                     return checkTupleType(node);
-                case 182 /* UnionType */:
-                case 183 /* IntersectionType */:
+                case 183 /* UnionType */:
+                case 184 /* IntersectionType */:
                     return checkUnionOrIntersectionType(node);
-                case 186 /* ParenthesizedType */:
-                case 180 /* OptionalType */:
-                case 181 /* RestType */:
+                case 187 /* ParenthesizedType */:
+                case 181 /* OptionalType */:
+                case 182 /* RestType */:
                     return checkSourceElement(node.type);
-                case 187 /* ThisType */:
+                case 188 /* ThisType */:
                     return checkThisType(node);
-                case 188 /* TypeOperator */:
+                case 189 /* TypeOperator */:
                     return checkTypeOperator(node);
-                case 184 /* ConditionalType */:
+                case 185 /* ConditionalType */:
                     return checkConditionalType(node);
-                case 185 /* InferType */:
+                case 186 /* InferType */:
                     return checkInferType(node);
-                case 193 /* TemplateLiteralType */:
+                case 194 /* TemplateLiteralType */:
                     return checkTemplateLiteralType(node);
-                case 195 /* ImportType */:
+                case 196 /* ImportType */:
                     return checkImportType(node);
-                case 192 /* NamedTupleMember */:
+                case 193 /* NamedTupleMember */:
                     return checkNamedTupleMember(node);
-                case 315 /* JSDocAugmentsTag */:
+                case 318 /* JSDocAugmentsTag */:
                     return checkJSDocAugmentsTag(node);
-                case 316 /* JSDocImplementsTag */:
+                case 319 /* JSDocImplementsTag */:
                     return checkJSDocImplementsTag(node);
-                case 331 /* JSDocTypedefTag */:
-                case 324 /* JSDocCallbackTag */:
-                case 325 /* JSDocEnumTag */:
+                case 335 /* JSDocTypedefTag */:
+                case 328 /* JSDocCallbackTag */:
+                case 329 /* JSDocEnumTag */:
                     return checkJSDocTypeAliasTag(node);
-                case 330 /* JSDocTemplateTag */:
+                case 334 /* JSDocTemplateTag */:
                     return checkJSDocTemplateTag(node);
-                case 329 /* JSDocTypeTag */:
+                case 333 /* JSDocTypeTag */:
                     return checkJSDocTypeTag(node);
-                case 326 /* JSDocParameterTag */:
+                case 330 /* JSDocParameterTag */:
                     return checkJSDocParameterTag(node);
-                case 333 /* JSDocPropertyTag */:
+                case 337 /* JSDocPropertyTag */:
                     return checkJSDocPropertyTag(node);
-                case 308 /* JSDocFunctionType */:
+                case 309 /* JSDocFunctionType */:
                     checkJSDocFunctionType(node);
                 // falls through
-                case 306 /* JSDocNonNullableType */:
-                case 305 /* JSDocNullableType */:
-                case 303 /* JSDocAllType */:
-                case 304 /* JSDocUnknownType */:
-                case 312 /* JSDocTypeLiteral */:
+                case 307 /* JSDocNonNullableType */:
+                case 306 /* JSDocNullableType */:
+                case 304 /* JSDocAllType */:
+                case 305 /* JSDocUnknownType */:
+                case 314 /* JSDocTypeLiteral */:
                     checkJSDocTypeIsInJsFile(node);
                     ts.forEachChild(node, checkSourceElement);
                     return;
-                case 309 /* JSDocVariadicType */:
+                case 310 /* JSDocVariadicType */:
                     checkJSDocVariadicType(node);
                     return;
-                case 301 /* JSDocTypeExpression */:
+                case 302 /* JSDocTypeExpression */:
                     return checkSourceElement(node.type);
-                case 189 /* IndexedAccessType */:
+                case 190 /* IndexedAccessType */:
                     return checkIndexedAccessType(node);
-                case 190 /* MappedType */:
+                case 191 /* MappedType */:
                     return checkMappedType(node);
-                case 251 /* FunctionDeclaration */:
+                case 252 /* FunctionDeclaration */:
                     return checkFunctionDeclaration(node);
-                case 230 /* Block */:
-                case 257 /* ModuleBlock */:
+                case 231 /* Block */:
+                case 258 /* ModuleBlock */:
                     return checkBlock(node);
-                case 232 /* VariableStatement */:
+                case 233 /* VariableStatement */:
                     return checkVariableStatement(node);
-                case 233 /* ExpressionStatement */:
+                case 234 /* ExpressionStatement */:
                     return checkExpressionStatement(node);
-                case 234 /* IfStatement */:
+                case 235 /* IfStatement */:
                     return checkIfStatement(node);
-                case 235 /* DoStatement */:
+                case 236 /* DoStatement */:
                     return checkDoStatement(node);
-                case 236 /* WhileStatement */:
+                case 237 /* WhileStatement */:
                     return checkWhileStatement(node);
-                case 237 /* ForStatement */:
+                case 238 /* ForStatement */:
                     return checkForStatement(node);
-                case 238 /* ForInStatement */:
+                case 239 /* ForInStatement */:
                     return checkForInStatement(node);
-                case 239 /* ForOfStatement */:
+                case 240 /* ForOfStatement */:
                     return checkForOfStatement(node);
-                case 240 /* ContinueStatement */:
-                case 241 /* BreakStatement */:
+                case 241 /* ContinueStatement */:
+                case 242 /* BreakStatement */:
                     return checkBreakOrContinueStatement(node);
-                case 242 /* ReturnStatement */:
+                case 243 /* ReturnStatement */:
                     return checkReturnStatement(node);
-                case 243 /* WithStatement */:
+                case 244 /* WithStatement */:
                     return checkWithStatement(node);
-                case 244 /* SwitchStatement */:
+                case 245 /* SwitchStatement */:
                     return checkSwitchStatement(node);
-                case 245 /* LabeledStatement */:
+                case 246 /* LabeledStatement */:
                     return checkLabeledStatement(node);
-                case 246 /* ThrowStatement */:
+                case 247 /* ThrowStatement */:
                     return checkThrowStatement(node);
-                case 247 /* TryStatement */:
+                case 248 /* TryStatement */:
                     return checkTryStatement(node);
-                case 249 /* VariableDeclaration */:
+                case 250 /* VariableDeclaration */:
                     return checkVariableDeclaration(node);
-                case 198 /* BindingElement */:
+                case 199 /* BindingElement */:
                     return checkBindingElement(node);
-                case 252 /* ClassDeclaration */:
+                case 253 /* ClassDeclaration */:
                     return checkClassDeclaration(node);
-                case 253 /* InterfaceDeclaration */:
+                case 254 /* InterfaceDeclaration */:
                     return checkInterfaceDeclaration(node);
-                case 254 /* TypeAliasDeclaration */:
+                case 255 /* TypeAliasDeclaration */:
                     return checkTypeAliasDeclaration(node);
-                case 255 /* EnumDeclaration */:
+                case 256 /* EnumDeclaration */:
                     return checkEnumDeclaration(node);
-                case 256 /* ModuleDeclaration */:
+                case 257 /* ModuleDeclaration */:
                     return checkModuleDeclaration(node);
-                case 261 /* ImportDeclaration */:
+                case 262 /* ImportDeclaration */:
                     return checkImportDeclaration(node);
-                case 260 /* ImportEqualsDeclaration */:
+                case 261 /* ImportEqualsDeclaration */:
                     return checkImportEqualsDeclaration(node);
-                case 267 /* ExportDeclaration */:
+                case 268 /* ExportDeclaration */:
                     return checkExportDeclaration(node);
-                case 266 /* ExportAssignment */:
+                case 267 /* ExportAssignment */:
                     return checkExportAssignment(node);
-                case 231 /* EmptyStatement */:
-                case 248 /* DebuggerStatement */:
+                case 232 /* EmptyStatement */:
+                case 249 /* DebuggerStatement */:
                     checkGrammarStatementInAmbientContext(node);
                     return;
-                case 271 /* MissingDeclaration */:
+                case 272 /* MissingDeclaration */:
                     return checkMissingDeclaration(node);
             }
         }
@@ -78127,7 +80257,8 @@ var ts;
             if (ts.isJSDocTypeExpression(node.parent) && ts.isJSDocParameterTag(paramTag)) {
                 // Else we will add a diagnostic, see `checkJSDocVariadicType`.
                 var host_1 = ts.getHostSignatureFromJSDoc(paramTag);
-                if (host_1) {
+                var isCallbackTag = ts.isJSDocCallbackTag(paramTag.parent.parent);
+                if (host_1 || isCallbackTag) {
                     /*
                     Only return an array type if the corresponding parameter is marked as a rest parameter, or if there are no parameters.
                     So in the following situation we will not create an array type:
@@ -78135,7 +80266,9 @@ var ts;
                         function f(a) {}
                     Because `a` will just be of type `number | undefined`. A synthetic `...args` will also be added, which *will* get an array type.
                     */
-                    var lastParamDeclaration = ts.lastOrUndefined(host_1.parameters);
+                    var lastParamDeclaration = isCallbackTag
+                        ? ts.lastOrUndefined(paramTag.parent.parent.typeExpression.parameters)
+                        : ts.lastOrUndefined(host_1.parameters);
                     var symbol = ts.getParameterSymbolFromJSDoc(paramTag);
                     if (!lastParamDeclaration ||
                         symbol && lastParamDeclaration.symbol === symbol && ts.isRestParameter(lastParamDeclaration)) {
@@ -78178,33 +80311,33 @@ var ts;
             currentNode = node;
             instantiationCount = 0;
             switch (node.kind) {
-                case 203 /* CallExpression */:
-                case 204 /* NewExpression */:
-                case 205 /* TaggedTemplateExpression */:
-                case 161 /* Decorator */:
-                case 275 /* JsxOpeningElement */:
+                case 204 /* CallExpression */:
+                case 205 /* NewExpression */:
+                case 206 /* TaggedTemplateExpression */:
+                case 162 /* Decorator */:
+                case 276 /* 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 208 /* FunctionExpression */:
-                case 209 /* ArrowFunction */:
-                case 165 /* MethodDeclaration */:
-                case 164 /* MethodSignature */:
+                case 209 /* FunctionExpression */:
+                case 210 /* ArrowFunction */:
+                case 166 /* MethodDeclaration */:
+                case 165 /* MethodSignature */:
                     checkFunctionExpressionOrObjectLiteralMethodDeferred(node);
                     break;
-                case 167 /* GetAccessor */:
-                case 168 /* SetAccessor */:
+                case 168 /* GetAccessor */:
+                case 169 /* SetAccessor */:
                     checkAccessorDeclaration(node);
                     break;
-                case 221 /* ClassExpression */:
+                case 222 /* ClassExpression */:
                     checkClassExpressionDeferred(node);
                     break;
-                case 274 /* JsxSelfClosingElement */:
+                case 275 /* JsxSelfClosingElement */:
                     checkJsxSelfClosingElementDeferred(node);
                     break;
-                case 273 /* JsxElement */:
+                case 274 /* JsxElement */:
                     checkJsxElementDeferred(node);
                     break;
             }
@@ -78246,7 +80379,7 @@ var ts;
                 checkGrammarSourceFile(node);
                 ts.clear(potentialThisCollisions);
                 ts.clear(potentialNewTargetCollisions);
-                ts.clear(potentialWeakMapCollisions);
+                ts.clear(potentialWeakMapSetCollisions);
                 ts.forEach(node.statements, checkSourceElement);
                 checkSourceElement(node.endOfFileToken);
                 checkDeferredNodes(node);
@@ -78276,9 +80409,9 @@ var ts;
                     ts.forEach(potentialNewTargetCollisions, checkIfNewTargetIsCapturedInEnclosingScope);
                     ts.clear(potentialNewTargetCollisions);
                 }
-                if (potentialWeakMapCollisions.length) {
-                    ts.forEach(potentialWeakMapCollisions, checkWeakMapCollision);
-                    ts.clear(potentialWeakMapCollisions);
+                if (potentialWeakMapSetCollisions.length) {
+                    ts.forEach(potentialWeakMapSetCollisions, checkWeakMapSetCollision);
+                    ts.clear(potentialWeakMapSetCollisions);
                 }
                 links.flags |= 1 /* TypeChecked */;
             }
@@ -78350,17 +80483,17 @@ var ts;
                         copySymbols(location.locals, meaning);
                     }
                     switch (location.kind) {
-                        case 297 /* SourceFile */:
-                            if (!ts.isExternalOrCommonJsModule(location))
+                        case 298 /* SourceFile */:
+                            if (!ts.isExternalModule(location))
                                 break;
                         // falls through
-                        case 256 /* ModuleDeclaration */:
-                            copySymbols(getSymbolOfNode(location).exports, meaning & 2623475 /* ModuleMember */);
+                        case 257 /* ModuleDeclaration */:
+                            copyLocallyVisibleExportSymbols(getSymbolOfNode(location).exports, meaning & 2623475 /* ModuleMember */);
                             break;
-                        case 255 /* EnumDeclaration */:
+                        case 256 /* EnumDeclaration */:
                             copySymbols(getSymbolOfNode(location).exports, meaning & 8 /* EnumMember */);
                             break;
-                        case 221 /* ClassExpression */:
+                        case 222 /* ClassExpression */:
                             var className = location.name;
                             if (className) {
                                 copySymbol(location.symbol, meaning);
@@ -78368,8 +80501,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 252 /* ClassDeclaration */:
-                        case 253 /* InterfaceDeclaration */:
+                        case 253 /* ClassDeclaration */:
+                        case 254 /* 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.
@@ -78378,7 +80511,7 @@ var ts;
                                 copySymbols(getMembersOfSymbol(getSymbolOfNode(location)), meaning & 788968 /* Type */);
                             }
                             break;
-                        case 208 /* FunctionExpression */:
+                        case 209 /* FunctionExpression */:
                             var funcName = location.name;
                             if (funcName) {
                                 copySymbol(location.symbol, meaning);
@@ -78418,6 +80551,16 @@ var ts;
                     });
                 }
             }
+            function copyLocallyVisibleExportSymbols(source, meaning) {
+                if (meaning) {
+                    source.forEach(function (symbol) {
+                        // Similar condition as in `resolveNameHelper`
+                        if (!ts.getDeclarationOfKind(symbol, 271 /* ExportSpecifier */) && !ts.getDeclarationOfKind(symbol, 270 /* NamespaceExport */)) {
+                            copySymbol(symbol, meaning);
+                        }
+                    });
+                }
+            }
         }
         function isTypeDeclarationName(name) {
             return name.kind === 78 /* Identifier */ &&
@@ -78426,19 +80569,19 @@ var ts;
         }
         function isTypeDeclaration(node) {
             switch (node.kind) {
-                case 159 /* TypeParameter */:
-                case 252 /* ClassDeclaration */:
-                case 253 /* InterfaceDeclaration */:
-                case 254 /* TypeAliasDeclaration */:
-                case 255 /* EnumDeclaration */:
-                case 331 /* JSDocTypedefTag */:
-                case 324 /* JSDocCallbackTag */:
-                case 325 /* JSDocEnumTag */:
+                case 160 /* TypeParameter */:
+                case 253 /* ClassDeclaration */:
+                case 254 /* InterfaceDeclaration */:
+                case 255 /* TypeAliasDeclaration */:
+                case 256 /* EnumDeclaration */:
+                case 335 /* JSDocTypedefTag */:
+                case 328 /* JSDocCallbackTag */:
+                case 329 /* JSDocEnumTag */:
                     return true;
-                case 262 /* ImportClause */:
+                case 263 /* ImportClause */:
                     return node.isTypeOnly;
-                case 265 /* ImportSpecifier */:
-                case 270 /* ExportSpecifier */:
+                case 266 /* ImportSpecifier */:
+                case 271 /* ExportSpecifier */:
                     return node.parent.parent.isTypeOnly;
                 default:
                     return false;
@@ -78446,25 +80589,25 @@ var ts;
         }
         // True if the given identifier is part of a type reference
         function isTypeReferenceIdentifier(node) {
-            while (node.parent.kind === 157 /* QualifiedName */) {
+            while (node.parent.kind === 158 /* QualifiedName */) {
                 node = node.parent;
             }
-            return node.parent.kind === 173 /* TypeReference */;
+            return node.parent.kind === 174 /* TypeReference */;
         }
         function isHeritageClauseElementIdentifier(node) {
-            while (node.parent.kind === 201 /* PropertyAccessExpression */) {
+            while (node.parent.kind === 202 /* PropertyAccessExpression */) {
                 node = node.parent;
             }
-            return node.parent.kind === 223 /* ExpressionWithTypeArguments */;
+            return node.parent.kind === 224 /* ExpressionWithTypeArguments */;
         }
-        function isJSDocEntryNameReference(node) {
-            while (node.parent.kind === 157 /* QualifiedName */) {
+        function getJSDocEntryNameReference(node) {
+            while (node.parent.kind === 158 /* QualifiedName */) {
                 node = node.parent;
             }
-            while (node.parent.kind === 201 /* PropertyAccessExpression */) {
+            while (node.parent.kind === 202 /* PropertyAccessExpression */) {
                 node = node.parent;
             }
-            return node.parent.kind === 302 /* JSDocNameReference */;
+            return ts.isJSDocNameReference(node.parent) ? node.parent : undefined;
         }
         function forEachEnclosingClass(node, callback) {
             var result;
@@ -78492,13 +80635,13 @@ var ts;
             return !!forEachEnclosingClass(node, function (n) { return n === classDeclaration; });
         }
         function getLeftSideOfImportEqualsOrExportAssignment(nodeOnRightSide) {
-            while (nodeOnRightSide.parent.kind === 157 /* QualifiedName */) {
+            while (nodeOnRightSide.parent.kind === 158 /* QualifiedName */) {
                 nodeOnRightSide = nodeOnRightSide.parent;
             }
-            if (nodeOnRightSide.parent.kind === 260 /* ImportEqualsDeclaration */) {
+            if (nodeOnRightSide.parent.kind === 261 /* ImportEqualsDeclaration */) {
                 return nodeOnRightSide.parent.moduleReference === nodeOnRightSide ? nodeOnRightSide.parent : undefined;
             }
-            if (nodeOnRightSide.parent.kind === 266 /* ExportAssignment */) {
+            if (nodeOnRightSide.parent.kind === 267 /* ExportAssignment */) {
                 return nodeOnRightSide.parent.expression === nodeOnRightSide ? nodeOnRightSide.parent : undefined;
             }
             return undefined;
@@ -78524,7 +80667,7 @@ var ts;
                 node = parent;
                 parent = parent.parent;
             }
-            if (parent && parent.kind === 195 /* ImportType */ && parent.qualifier === node) {
+            if (parent && parent.kind === 196 /* ImportType */ && parent.qualifier === node) {
                 return parent;
             }
             return undefined;
@@ -78534,7 +80677,7 @@ var ts;
                 return getSymbolOfNode(name.parent);
             }
             if (ts.isInJSFile(name) &&
-                name.parent.kind === 201 /* PropertyAccessExpression */ &&
+                name.parent.kind === 202 /* PropertyAccessExpression */ &&
                 name.parent === name.parent.parent.left) {
                 // Check if this is a special property assignment
                 if (!ts.isPrivateIdentifier(name)) {
@@ -78544,7 +80687,7 @@ var ts;
                     }
                 }
             }
-            if (name.parent.kind === 266 /* ExportAssignment */ && ts.isEntityNameExpression(name)) {
+            if (name.parent.kind === 267 /* 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);
@@ -78554,7 +80697,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, 260 /* ImportEqualsDeclaration */);
+                var importEqualsDeclaration = ts.getAncestor(name, 261 /* ImportEqualsDeclaration */);
                 ts.Debug.assert(importEqualsDeclaration !== undefined);
                 return getSymbolOfPartOfRightHandSideOfImportEquals(name, /*dontResolveAlias*/ true);
             }
@@ -78572,7 +80715,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 === 223 /* ExpressionWithTypeArguments */) {
+                if (name.parent.kind === 224 /* ExpressionWithTypeArguments */) {
                     meaning = 788968 /* Type */;
                     // In a class 'extends' clause we are also looking for a value.
                     if (ts.isExpressionWithTypeArgumentsInClassExtendsClause(name.parent)) {
@@ -78588,10 +80731,10 @@ var ts;
                     return entityNameSymbol;
                 }
             }
-            if (name.parent.kind === 326 /* JSDocParameterTag */) {
+            if (name.parent.kind === 330 /* JSDocParameterTag */) {
                 return ts.getParameterSymbolFromJSDoc(name.parent);
             }
-            if (name.parent.kind === 159 /* TypeParameter */ && name.parent.parent.kind === 330 /* JSDocTemplateTag */) {
+            if (name.parent.kind === 160 /* TypeParameter */ && name.parent.parent.kind === 334 /* JSDocTemplateTag */) {
                 ts.Debug.assert(!ts.isInJSFile(name)); // Otherwise `isDeclarationName` would have been true.
                 var typeParameter = ts.getTypeParameterFromJsDoc(name.parent);
                 return typeParameter && typeParameter.symbol;
@@ -78608,36 +80751,56 @@ var ts;
                     }
                     return resolveEntityName(name, 111551 /* Value */, /*ignoreErrors*/ false, /*dontResolveAlias*/ true);
                 }
-                else if (name.kind === 201 /* PropertyAccessExpression */ || name.kind === 157 /* QualifiedName */) {
+                else if (name.kind === 202 /* PropertyAccessExpression */ || name.kind === 158 /* QualifiedName */) {
                     var links = getNodeLinks(name);
                     if (links.resolvedSymbol) {
                         return links.resolvedSymbol;
                     }
-                    if (name.kind === 201 /* PropertyAccessExpression */) {
-                        checkPropertyAccessExpression(name);
+                    if (name.kind === 202 /* PropertyAccessExpression */) {
+                        checkPropertyAccessExpression(name, 0 /* Normal */);
                     }
                     else {
-                        checkQualifiedName(name);
+                        checkQualifiedName(name, 0 /* Normal */);
                     }
                     return links.resolvedSymbol;
                 }
             }
             else if (isTypeReferenceIdentifier(name)) {
-                var meaning = name.parent.kind === 173 /* TypeReference */ ? 788968 /* Type */ : 1920 /* Namespace */;
+                var meaning = name.parent.kind === 174 /* TypeReference */ ? 788968 /* Type */ : 1920 /* Namespace */;
                 return resolveEntityName(name, meaning, /*ignoreErrors*/ false, /*dontResolveAlias*/ true);
             }
-            else if (isJSDocEntryNameReference(name)) {
+            var jsdocReference = getJSDocEntryNameReference(name);
+            if (jsdocReference || ts.isJSDocLink(name.parent)) {
                 var meaning = 788968 /* Type */ | 1920 /* Namespace */ | 111551 /* Value */;
-                return resolveEntityName(name, meaning, /*ignoreErrors*/ false, /*dontResolveAlias*/ true, ts.getHostSignatureFromJSDoc(name));
+                var symbol = resolveEntityName(name, meaning, /*ignoreErrors*/ false, /*dontResolveAlias*/ false, ts.getHostSignatureFromJSDoc(name));
+                if (symbol) {
+                    return symbol;
+                }
+                else if (ts.isQualifiedName(name) && ts.isIdentifier(name.left)) {
+                    // resolve C.m as a static member first
+                    var links = getNodeLinks(name);
+                    if (links.resolvedSymbol) {
+                        return links.resolvedSymbol;
+                    }
+                    checkQualifiedName(name, 0 /* Normal */);
+                    if (links.resolvedSymbol) {
+                        return links.resolvedSymbol;
+                    }
+                    // then resolve it as an instance member
+                    var s = resolveEntityName(name.left, meaning, /*ignoreErrors*/ false);
+                    if (s) {
+                        var t = getDeclaredTypeOfSymbol(s);
+                        return getPropertyOfType(t, name.right.escapedText);
+                    }
+                }
             }
-            if (name.parent.kind === 172 /* TypePredicate */) {
+            if (name.parent.kind === 173 /* TypePredicate */) {
                 return resolveEntityName(name, /*meaning*/ 1 /* FunctionScopedVariable */);
             }
-            // Do we want to return undefined here?
             return undefined;
         }
         function getSymbolAtLocation(node, ignoreErrors) {
-            if (node.kind === 297 /* SourceFile */) {
+            if (node.kind === 298 /* SourceFile */) {
                 return ts.isExternalModule(node) ? getMergedSymbol(node.symbol) : undefined;
             }
             var parent = node.parent;
@@ -78660,8 +80823,8 @@ var ts;
                 if (isInRightSideOfImportOrExportAssignment(node)) {
                     return getSymbolOfNameOrPropertyAccessExpression(node);
                 }
-                else if (parent.kind === 198 /* BindingElement */ &&
-                    grandParent.kind === 196 /* ObjectBindingPattern */ &&
+                else if (parent.kind === 199 /* BindingElement */ &&
+                    grandParent.kind === 197 /* ObjectBindingPattern */ &&
                     node === parent.propertyName) {
                     var typeOfPattern = getTypeOfNode(grandParent);
                     var propertyDeclaration = getPropertyOfType(typeOfPattern, node.escapedText);
@@ -78673,8 +80836,8 @@ var ts;
             switch (node.kind) {
                 case 78 /* Identifier */:
                 case 79 /* PrivateIdentifier */:
-                case 201 /* PropertyAccessExpression */:
-                case 157 /* QualifiedName */:
+                case 202 /* PropertyAccessExpression */:
+                case 158 /* QualifiedName */:
                     return getSymbolOfNameOrPropertyAccessExpression(node);
                 case 107 /* ThisKeyword */:
                     var container = ts.getThisContainer(node, /*includeArrowFunctions*/ false);
@@ -78688,14 +80851,14 @@ var ts;
                         return checkExpression(node).symbol;
                     }
                 // falls through
-                case 187 /* ThisType */:
+                case 188 /* 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 === 166 /* Constructor */) {
+                    if (constructorDeclaration && constructorDeclaration.kind === 167 /* Constructor */) {
                         return constructorDeclaration.parent.symbol;
                     }
                     return undefined;
@@ -78706,7 +80869,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 === 261 /* ImportDeclaration */ || node.parent.kind === 267 /* ExportDeclaration */) && node.parent.moduleSpecifier === node) ||
+                        ((node.parent.kind === 262 /* ImportDeclaration */ || node.parent.kind === 268 /* 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);
@@ -78728,7 +80891,7 @@ var ts;
                 case 38 /* EqualsGreaterThanToken */:
                 case 83 /* ClassKeyword */:
                     return getSymbolOfNode(node.parent);
-                case 195 /* ImportType */:
+                case 196 /* 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;
@@ -78737,7 +80900,7 @@ var ts;
             }
         }
         function getShorthandAssignmentValueSymbol(location) {
-            if (location && location.kind === 289 /* ShorthandPropertyAssignment */) {
+            if (location && location.kind === 290 /* ShorthandPropertyAssignment */) {
                 return resolveEntityName(location.name, 111551 /* Value */ | 2097152 /* Alias */);
             }
             return undefined;
@@ -78816,27 +80979,27 @@ var ts;
         // [ a ] from
         //     [a] = [ some array ...]
         function getTypeOfAssignmentPattern(expr) {
-            ts.Debug.assert(expr.kind === 200 /* ObjectLiteralExpression */ || expr.kind === 199 /* ArrayLiteralExpression */);
+            ts.Debug.assert(expr.kind === 201 /* ObjectLiteralExpression */ || expr.kind === 200 /* ArrayLiteralExpression */);
             // If this is from "for of"
             //     for ( { a } of elems) {
             //     }
-            if (expr.parent.kind === 239 /* ForOfStatement */) {
+            if (expr.parent.kind === 240 /* 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 === 216 /* BinaryExpression */) {
+            if (expr.parent.kind === 217 /* 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 === 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);
-                return checkObjectLiteralDestructuringPropertyAssignment(node_2, typeOfParentObjectLiteral, propertyIndex);
+            if (expr.parent.kind === 289 /* PropertyAssignment */) {
+                var node_3 = ts.cast(expr.parent.parent, ts.isObjectLiteralExpression);
+                var typeOfParentObjectLiteral = getTypeOfAssignmentPattern(node_3) || errorType;
+                var propertyIndex = ts.indexOfNode(node_3.properties, expr.parent);
+                return checkObjectLiteralDestructuringPropertyAssignment(node_3, typeOfParentObjectLiteral, propertyIndex);
             }
             // Array literal assignment - array destructuring pattern
             var node = ts.cast(expr.parent, ts.isArrayLiteralExpression);
@@ -78880,7 +81043,7 @@ var ts;
                 case 8 /* NumericLiteral */:
                 case 10 /* StringLiteral */:
                     return getLiteralType(name.text);
-                case 158 /* ComputedPropertyName */:
+                case 159 /* ComputedPropertyName */:
                     var nameType = checkComputedPropertyName(name);
                     return isTypeAssignableToKind(nameType, 12288 /* ESSymbolLike */) ? nameType : stringType;
                 default:
@@ -78977,6 +81140,7 @@ var ts;
         // When resolved as an expression identifier, if the given node references an exported entity, return the declaration
         // node of the exported entity's container. Otherwise, return undefined.
         function getReferencedExportContainer(nodeIn, prefixLocals) {
+            var _a;
             var node = ts.getParseTreeNode(nodeIn, ts.isIdentifier);
             if (node) {
                 // When resolving the export container for the name of a module or enum
@@ -78997,7 +81161,7 @@ var ts;
                     }
                     var parentSymbol_1 = getParentOfSymbol(symbol);
                     if (parentSymbol_1) {
-                        if (parentSymbol_1.flags & 512 /* ValueModule */ && parentSymbol_1.valueDeclaration.kind === 297 /* SourceFile */) {
+                        if (parentSymbol_1.flags & 512 /* ValueModule */ && ((_a = parentSymbol_1.valueDeclaration) === null || _a === void 0 ? void 0 : _a.kind) === 298 /* 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.
@@ -79027,11 +81191,12 @@ var ts;
             return undefined;
         }
         function isSymbolOfDestructuredElementOfCatchBinding(symbol) {
-            return ts.isBindingElement(symbol.valueDeclaration)
-                && ts.walkUpBindingElementsAndPatterns(symbol.valueDeclaration).parent.kind === 287 /* CatchClause */;
+            return symbol.valueDeclaration
+                && ts.isBindingElement(symbol.valueDeclaration)
+                && ts.walkUpBindingElementsAndPatterns(symbol.valueDeclaration).parent.kind === 288 /* CatchClause */;
         }
         function isSymbolOfDeclarationWithCollidingName(symbol) {
-            if (symbol.flags & 418 /* BlockScoped */ && !ts.isSourceFile(symbol.valueDeclaration)) {
+            if (symbol.flags & 418 /* BlockScoped */ && symbol.valueDeclaration && !ts.isSourceFile(symbol.valueDeclaration)) {
                 var links = getSymbolLinks(symbol);
                 if (links.isDeclarationWithCollidingName === undefined) {
                     var container = ts.getEnclosingBlockScopeContainer(symbol.valueDeclaration);
@@ -79059,7 +81224,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 === 230 /* Block */ && ts.isIterationStatement(container.parent, /*lookInLabeledStatements*/ false);
+                            var inLoopBodyBlock = container.kind === 231 /* Block */ && ts.isIterationStatement(container.parent, /*lookInLabeledStatements*/ false);
                             links.isDeclarationWithCollidingName = !ts.isBlockScopedContainerTopLevel(container) && (!isDeclaredInLoop || (!inLoopInitializer && !inLoopBodyBlock));
                         }
                         else {
@@ -79100,19 +81265,19 @@ var ts;
         }
         function isValueAliasDeclaration(node) {
             switch (node.kind) {
-                case 260 /* ImportEqualsDeclaration */:
+                case 261 /* ImportEqualsDeclaration */:
                     return isAliasResolvedToValue(getSymbolOfNode(node) || unknownSymbol);
-                case 262 /* ImportClause */:
-                case 263 /* NamespaceImport */:
-                case 265 /* ImportSpecifier */:
-                case 270 /* ExportSpecifier */:
+                case 263 /* ImportClause */:
+                case 264 /* NamespaceImport */:
+                case 266 /* ImportSpecifier */:
+                case 271 /* ExportSpecifier */:
                     var symbol = getSymbolOfNode(node) || unknownSymbol;
                     return isAliasResolvedToValue(symbol) && !getTypeOnlyAliasDeclaration(symbol);
-                case 267 /* ExportDeclaration */:
+                case 268 /* ExportDeclaration */:
                     var exportClause = node.exportClause;
                     return !!exportClause && (ts.isNamespaceExport(exportClause) ||
                         ts.some(exportClause.elements, isValueAliasDeclaration));
-                case 266 /* ExportAssignment */:
+                case 267 /* ExportAssignment */:
                     return node.expression && node.expression.kind === 78 /* Identifier */ ?
                         isAliasResolvedToValue(getSymbolOfNode(node) || unknownSymbol) :
                         true;
@@ -79121,7 +81286,7 @@ var ts;
         }
         function isTopLevelValueImportEqualsWithEntityName(nodeIn) {
             var node = ts.getParseTreeNode(nodeIn, ts.isImportEqualsDeclaration);
-            if (node === undefined || node.parent.kind !== 297 /* SourceFile */ || !ts.isInternalModuleImportEqualsDeclaration(node)) {
+            if (node === undefined || node.parent.kind !== 298 /* SourceFile */ || !ts.isInternalModuleImportEqualsDeclaration(node)) {
                 // parent is not source file or it is not reference to internal module
                 return false;
             }
@@ -79188,13 +81353,13 @@ var ts;
                 !isOptionalParameter(parameter) &&
                 !ts.isJSDocParameterTag(parameter) &&
                 !!parameter.initializer &&
-                !ts.hasSyntacticModifier(parameter, 92 /* ParameterPropertyModifier */);
+                !ts.hasSyntacticModifier(parameter, 16476 /* ParameterPropertyModifier */);
         }
         function isOptionalUninitializedParameterProperty(parameter) {
             return strictNullChecks &&
                 isOptionalParameter(parameter) &&
                 !parameter.initializer &&
-                ts.hasSyntacticModifier(parameter, 92 /* ParameterPropertyModifier */);
+                ts.hasSyntacticModifier(parameter, 16476 /* ParameterPropertyModifier */);
         }
         function isOptionalUninitializedParameter(parameter) {
             return !!strictNullChecks &&
@@ -79229,15 +81394,15 @@ var ts;
         }
         function canHaveConstantValue(node) {
             switch (node.kind) {
-                case 291 /* EnumMember */:
-                case 201 /* PropertyAccessExpression */:
-                case 202 /* ElementAccessExpression */:
+                case 292 /* EnumMember */:
+                case 202 /* PropertyAccessExpression */:
+                case 203 /* ElementAccessExpression */:
                     return true;
             }
             return false;
         }
         function getConstantValue(node) {
-            if (node.kind === 291 /* EnumMember */) {
+            if (node.kind === 292 /* EnumMember */) {
                 return getEnumMemberValue(node);
             }
             var symbol = getNodeLinks(node).resolvedSymbol;
@@ -79509,12 +81674,12 @@ var ts;
                 getJsxFragmentFactoryEntity: getJsxFragmentFactoryEntity,
                 getAllAccessorDeclarations: function (accessor) {
                     accessor = ts.getParseTreeNode(accessor, ts.isGetOrSetAccessorDeclaration); // TODO: GH#18217
-                    var otherKind = accessor.kind === 168 /* SetAccessor */ ? 167 /* GetAccessor */ : 168 /* SetAccessor */;
+                    var otherKind = accessor.kind === 169 /* SetAccessor */ ? 168 /* GetAccessor */ : 169 /* 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 === 168 /* SetAccessor */ ? accessor : otherAccessor;
-                    var getAccessor = accessor.kind === 167 /* GetAccessor */ ? accessor : otherAccessor;
+                    var setAccessor = accessor.kind === 169 /* SetAccessor */ ? accessor : otherAccessor;
+                    var getAccessor = accessor.kind === 168 /* GetAccessor */ ? accessor : otherAccessor;
                     return {
                         firstAccessor: firstAccessor,
                         secondAccessor: secondAccessor,
@@ -79530,7 +81695,7 @@ var ts;
                 },
                 getDeclarationStatementsForSourceFile: function (node, flags, tracker, bundled) {
                     var n = ts.getParseTreeNode(node);
-                    ts.Debug.assert(n && n.kind === 297 /* SourceFile */, "Non-sourcefile node passed into getDeclarationsForSourceFile");
+                    ts.Debug.assert(n && n.kind === 298 /* SourceFile */, "Non-sourcefile node passed into getDeclarationsForSourceFile");
                     var sym = getSymbolOfNode(node);
                     if (!sym) {
                         return !node.locals ? [] : nodeBuilder.symbolTableToDeclarationStatements(node.locals, node, flags, tracker, bundled);
@@ -79553,11 +81718,13 @@ var ts;
                     var s = _a[_i];
                     if (s.mergeId) {
                         var merged = getMergedSymbol(s);
-                        for (var _b = 0, _c = merged.declarations; _b < _c.length; _b++) {
-                            var d = _c[_b];
-                            var declFile = ts.getSourceFileOfNode(d);
-                            if (declFile === importTarget) {
-                                return true;
+                        if (merged.declarations) {
+                            for (var _b = 0, _c = merged.declarations; _b < _c.length; _b++) {
+                                var d = _c[_b];
+                                var declFile = ts.getSourceFileOfNode(d);
+                                if (declFile === importTarget) {
+                                    return true;
+                                }
                             }
                         }
                     }
@@ -79565,7 +81732,7 @@ var ts;
                 return false;
             }
             function isInHeritageClause(node) {
-                return node.parent && node.parent.kind === 223 /* ExpressionWithTypeArguments */ && node.parent.parent && node.parent.parent.kind === 286 /* HeritageClause */;
+                return node.parent && node.parent.kind === 224 /* ExpressionWithTypeArguments */ && node.parent.parent && node.parent.parent.kind === 287 /* HeritageClause */;
             }
             // defined here to avoid outer scope pollution
             function getTypeReferenceDirectivesForEntityName(node) {
@@ -79577,7 +81744,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 === 201 /* PropertyAccessExpression */ && !isInHeritageClause(node))) {
+                if ((node.kind === 78 /* Identifier */ && isInTypeQuery(node)) || (node.kind === 202 /* PropertyAccessExpression */ && !isInHeritageClause(node))) {
                     meaning = 111551 /* Value */ | 1048576 /* ExportValue */;
                 }
                 var symbol = resolveEntityName(node, meaning, /*ignoreErrors*/ true);
@@ -79586,10 +81753,7 @@ var ts;
             // defined here to avoid outer scope pollution
             function getTypeReferenceDirectivesForSymbol(symbol, meaning) {
                 // program does not have any files with type reference directives - bail out
-                if (!fileToDirective) {
-                    return undefined;
-                }
-                if (!isSymbolFromTypeDeclarationFile(symbol)) {
+                if (!fileToDirective || !isSymbolFromTypeDeclarationFile(symbol)) {
                     return undefined;
                 }
                 // check what declarations in the symbol can contribute to the target meaning
@@ -79628,7 +81792,7 @@ var ts;
                         break;
                     }
                 }
-                if (current.valueDeclaration && current.valueDeclaration.kind === 297 /* SourceFile */ && current.flags & 512 /* ValueModule */) {
+                if (current.valueDeclaration && current.valueDeclaration.kind === 298 /* SourceFile */ && current.flags & 512 /* ValueModule */) {
                     return false;
                 }
                 // check that at least one declaration of top level symbol originates from type declaration file
@@ -79656,12 +81820,12 @@ var ts;
             }
         }
         function getExternalModuleFileFromDeclaration(declaration) {
-            var specifier = declaration.kind === 256 /* ModuleDeclaration */ ? ts.tryCast(declaration.name, ts.isStringLiteral) : ts.getExternalModuleName(declaration);
+            var specifier = declaration.kind === 257 /* 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, 297 /* SourceFile */);
+            return ts.getDeclarationOfKind(moduleSymbol, 298 /* SourceFile */);
         }
         function initializeTypeChecker() {
             // Bind all source files and propagate errors
@@ -79681,7 +81845,7 @@ var ts;
                     // It is an error for a non-external-module (i.e. script) to declare its own `globalThis`.
                     // We can't use `builtinGlobals` for this due to synthetic expando-namespace generation in JS files.
                     var fileGlobalThisSymbol = file.locals.get("globalThis");
-                    if (fileGlobalThisSymbol) {
+                    if (fileGlobalThisSymbol === null || fileGlobalThisSymbol === void 0 ? void 0 : fileGlobalThisSymbol.declarations) {
                         for (var _d = 0, _e = fileGlobalThisSymbol.declarations; _d < _e.length; _d++) {
                             var declaration = _e[_d];
                             diagnostics.add(ts.createDiagnosticForNode(declaration, ts.Diagnostics.Declaration_name_conflicts_with_built_in_global_identifier_0, "globalThis"));
@@ -79805,6 +81969,16 @@ var ts;
                                 if (!symbol) {
                                     error(location, ts.Diagnostics.This_syntax_requires_an_imported_helper_named_1_which_does_not_exist_in_0_Consider_upgrading_your_version_of_0, ts.externalHelpersModuleNameText, name);
                                 }
+                                else if (helper & 524288 /* ClassPrivateFieldGet */) {
+                                    if (!ts.some(getSignaturesOfSymbol(symbol), function (signature) { return getParameterCount(signature) > 3; })) {
+                                        error(location, ts.Diagnostics.This_syntax_requires_an_imported_helper_named_1_with_2_parameters_which_is_not_compatible_with_the_one_in_0_Consider_upgrading_your_version_of_0, ts.externalHelpersModuleNameText, name, 4);
+                                    }
+                                }
+                                else if (helper & 1048576 /* ClassPrivateFieldSet */) {
+                                    if (!ts.some(getSignaturesOfSymbol(symbol), function (signature) { return getParameterCount(signature) > 4; })) {
+                                        error(location, ts.Diagnostics.This_syntax_requires_an_imported_helper_named_1_with_2_parameters_which_is_not_compatible_with_the_one_in_0_Consider_upgrading_your_version_of_0, ts.externalHelpersModuleNameText, name, 5);
+                                    }
+                                }
                             }
                         }
                     }
@@ -79854,14 +82028,14 @@ var ts;
                 return false;
             }
             if (!ts.nodeCanBeDecorated(node, node.parent, node.parent.parent)) {
-                if (node.kind === 165 /* MethodDeclaration */ && !ts.nodeIsPresent(node.body)) {
+                if (node.kind === 166 /* 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 === 167 /* GetAccessor */ || node.kind === 168 /* SetAccessor */) {
+            else if (node.kind === 168 /* GetAccessor */ || node.kind === 169 /* 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);
@@ -79874,24 +82048,41 @@ var ts;
             if (quickResult !== undefined) {
                 return quickResult;
             }
-            var lastStatic, lastDeclare, lastAsync, lastReadonly;
+            var lastStatic, lastDeclare, lastAsync, lastReadonly, lastOverride;
             var flags = 0 /* None */;
             for (var _i = 0, _a = node.modifiers; _i < _a.length; _i++) {
                 var modifier = _a[_i];
                 if (modifier.kind !== 142 /* ReadonlyKeyword */) {
-                    if (node.kind === 162 /* PropertySignature */ || node.kind === 164 /* MethodSignature */) {
+                    if (node.kind === 163 /* PropertySignature */ || node.kind === 165 /* MethodSignature */) {
                         return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_type_member, ts.tokenToString(modifier.kind));
                     }
-                    if (node.kind === 171 /* IndexSignature */) {
+                    if (node.kind === 172 /* IndexSignature */ && (modifier.kind !== 123 /* StaticKeyword */ || !ts.isClassLike(node.parent))) {
                         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 !== 255 /* EnumDeclaration */) {
+                        if (node.kind !== 256 /* EnumDeclaration */) {
                             return grammarErrorOnNode(node, ts.Diagnostics.A_class_member_cannot_have_the_0_keyword, ts.tokenToString(84 /* ConstKeyword */));
                         }
                         break;
+                    case 156 /* OverrideKeyword */:
+                        // If node.kind === SyntaxKind.Parameter, checkParameter reports an error if it's not a parameter property.
+                        if (flags & 16384 /* Override */) {
+                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "override");
+                        }
+                        else if (flags & 2 /* Ambient */) {
+                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_with_1_modifier, "override", "declare");
+                        }
+                        else if (flags & 64 /* Readonly */) {
+                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, "override", "readonly");
+                        }
+                        else if (flags & 256 /* Async */) {
+                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, "override", "async");
+                        }
+                        flags |= 16384 /* Override */;
+                        lastOverride = modifier;
+                        break;
                     case 122 /* PublicKeyword */:
                     case 121 /* ProtectedKeyword */:
                     case 120 /* PrivateKeyword */:
@@ -79899,6 +82090,9 @@ var ts;
                         if (flags & 28 /* AccessibilityModifier */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics.Accessibility_modifier_already_seen);
                         }
+                        else if (flags & 16384 /* Override */) {
+                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, text, "override");
+                        }
                         else if (flags & 32 /* Static */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, text, "static");
                         }
@@ -79908,7 +82102,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 === 257 /* ModuleBlock */ || node.parent.kind === 297 /* SourceFile */) {
+                        else if (node.parent.kind === 258 /* ModuleBlock */ || node.parent.kind === 298 /* SourceFile */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_module_or_namespace_element, text);
                         }
                         else if (flags & 128 /* Abstract */) {
@@ -79919,7 +82113,7 @@ var ts;
                                 return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, text, "abstract");
                             }
                         }
-                        else if (ts.isPrivateIdentifierPropertyDeclaration(node)) {
+                        else if (ts.isPrivateIdentifierClassElementDeclaration(node)) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics.An_accessibility_modifier_cannot_be_used_with_a_private_identifier);
                         }
                         flags |= ts.modifierToFlag(modifier.kind);
@@ -79934,17 +82128,17 @@ 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 === 257 /* ModuleBlock */ || node.parent.kind === 297 /* SourceFile */) {
+                        else if (node.parent.kind === 258 /* ModuleBlock */ || node.parent.kind === 298 /* SourceFile */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_module_or_namespace_element, "static");
                         }
-                        else if (node.kind === 160 /* Parameter */) {
+                        else if (node.kind === 161 /* Parameter */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "static");
                         }
                         else if (flags & 128 /* Abstract */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_with_1_modifier, "static", "abstract");
                         }
-                        else if (ts.isPrivateIdentifierPropertyDeclaration(node)) {
-                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_with_a_private_identifier, "static");
+                        else if (flags & 16384 /* Override */) {
+                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, "static", "override");
                         }
                         flags |= 32 /* Static */;
                         lastStatic = modifier;
@@ -79953,8 +82147,8 @@ var ts;
                         if (flags & 64 /* Readonly */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "readonly");
                         }
-                        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.
+                        else if (node.kind !== 164 /* PropertyDeclaration */ && node.kind !== 163 /* PropertySignature */ && node.kind !== 172 /* IndexSignature */ && node.kind !== 161 /* Parameter */) {
+                            // If node.kind === SyntaxKind.Parameter, checkParameter reports an error if it's not a parameter property.
                             return grammarErrorOnNode(modifier, ts.Diagnostics.readonly_modifier_can_only_appear_on_a_property_declaration_or_index_signature);
                         }
                         flags |= 64 /* Readonly */;
@@ -79976,14 +82170,14 @@ var ts;
                         else if (ts.isClassLike(node.parent)) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_class_elements_of_this_kind, "export");
                         }
-                        else if (node.kind === 160 /* Parameter */) {
+                        else if (node.kind === 161 /* 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 === 297 /* SourceFile */ ? node.parent : node.parent.parent;
-                        if (container.kind === 256 /* ModuleDeclaration */ && !ts.isAmbientModule(container)) {
+                        var container = node.parent.kind === 298 /* SourceFile */ ? node.parent : node.parent.parent;
+                        if (container.kind === 257 /* ModuleDeclaration */ && !ts.isAmbientModule(container)) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics.A_default_export_can_only_be_used_in_an_ECMAScript_style_module);
                         }
                         flags |= 512 /* Default */;
@@ -79995,16 +82189,19 @@ var ts;
                         else if (flags & 256 /* Async */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_in_an_ambient_context, "async");
                         }
+                        else if (flags & 16384 /* Override */) {
+                            return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_in_an_ambient_context, "override");
+                        }
                         else if (ts.isClassLike(node.parent) && !ts.isPropertyDeclaration(node)) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_class_elements_of_this_kind, "declare");
                         }
-                        else if (node.kind === 160 /* Parameter */) {
+                        else if (node.kind === 161 /* Parameter */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "declare");
                         }
-                        else if ((node.parent.flags & 8388608 /* Ambient */) && node.parent.kind === 257 /* ModuleBlock */) {
+                        else if ((node.parent.flags & 8388608 /* Ambient */) && node.parent.kind === 258 /* ModuleBlock */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics.A_declare_modifier_cannot_be_used_in_an_already_ambient_context);
                         }
-                        else if (ts.isPrivateIdentifierPropertyDeclaration(node)) {
+                        else if (ts.isPrivateIdentifierClassElementDeclaration(node)) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_with_a_private_identifier, "declare");
                         }
                         flags |= 2 /* Ambient */;
@@ -80014,15 +82211,15 @@ var ts;
                         if (flags & 128 /* Abstract */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_already_seen, "abstract");
                         }
-                        if (node.kind !== 252 /* ClassDeclaration */ &&
-                            node.kind !== 175 /* ConstructorType */) {
-                            if (node.kind !== 165 /* MethodDeclaration */ &&
-                                node.kind !== 163 /* PropertyDeclaration */ &&
-                                node.kind !== 167 /* GetAccessor */ &&
-                                node.kind !== 168 /* SetAccessor */) {
+                        if (node.kind !== 253 /* ClassDeclaration */ &&
+                            node.kind !== 176 /* ConstructorType */) {
+                            if (node.kind !== 166 /* MethodDeclaration */ &&
+                                node.kind !== 164 /* PropertyDeclaration */ &&
+                                node.kind !== 168 /* GetAccessor */ &&
+                                node.kind !== 169 /* SetAccessor */) {
                                 return grammarErrorOnNode(modifier, ts.Diagnostics.abstract_modifier_can_only_appear_on_a_class_method_or_property_declaration);
                             }
-                            if (!(node.parent.kind === 252 /* ClassDeclaration */ && ts.hasSyntacticModifier(node.parent, 128 /* Abstract */))) {
+                            if (!(node.parent.kind === 253 /* 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 */) {
@@ -80034,6 +82231,9 @@ var ts;
                             if (flags & 256 /* Async */ && lastAsync) {
                                 return grammarErrorOnNode(lastAsync, ts.Diagnostics._0_modifier_cannot_be_used_with_1_modifier, "async", "abstract");
                             }
+                            if (flags & 16384 /* Override */) {
+                                return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_must_precede_1_modifier, "abstract", "override");
+                            }
                         }
                         if (ts.isNamedDeclaration(node) && node.name.kind === 79 /* PrivateIdentifier */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_be_used_with_a_private_identifier, "abstract");
@@ -80047,7 +82247,7 @@ 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 === 160 /* Parameter */) {
+                        else if (node.kind === 161 /* Parameter */) {
                             return grammarErrorOnNode(modifier, ts.Diagnostics._0_modifier_cannot_appear_on_a_parameter, "async");
                         }
                         if (flags & 128 /* Abstract */) {
@@ -80058,13 +82258,16 @@ var ts;
                         break;
                 }
             }
-            if (node.kind === 166 /* Constructor */) {
+            if (node.kind === 167 /* Constructor */) {
                 if (flags & 32 /* Static */) {
                     return grammarErrorOnNode(lastStatic, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "static");
                 }
                 if (flags & 128 /* Abstract */) {
                     return grammarErrorOnNode(lastStatic, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "abstract"); // TODO: GH#18217
                 }
+                if (flags & 16384 /* Override */) {
+                    return grammarErrorOnNode(lastOverride, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "override"); // TODO: GH#18217
+                }
                 else if (flags & 256 /* Async */) {
                     return grammarErrorOnNode(lastAsync, ts.Diagnostics._0_modifier_cannot_appear_on_a_constructor_declaration, "async");
                 }
@@ -80073,13 +82276,13 @@ var ts;
                 }
                 return false;
             }
-            else if ((node.kind === 261 /* ImportDeclaration */ || node.kind === 260 /* ImportEqualsDeclaration */) && flags & 2 /* Ambient */) {
+            else if ((node.kind === 262 /* ImportDeclaration */ || node.kind === 261 /* ImportEqualsDeclaration */) && flags & 2 /* Ambient */) {
                 return grammarErrorOnNode(lastDeclare, ts.Diagnostics.A_0_modifier_cannot_be_used_with_an_import_declaration, "declare");
             }
-            else if (node.kind === 160 /* Parameter */ && (flags & 92 /* ParameterPropertyModifier */) && ts.isBindingPattern(node.name)) {
+            else if (node.kind === 161 /* Parameter */ && (flags & 16476 /* 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 === 160 /* Parameter */ && (flags & 92 /* ParameterPropertyModifier */) && node.dotDotDotToken) {
+            else if (node.kind === 161 /* Parameter */ && (flags & 16476 /* ParameterPropertyModifier */) && node.dotDotDotToken) {
                 return grammarErrorOnNode(node, ts.Diagnostics.A_parameter_property_cannot_be_declared_using_a_rest_parameter);
             }
             if (flags & 256 /* Async */) {
@@ -80100,38 +82303,38 @@ var ts;
         }
         function shouldReportBadModifier(node) {
             switch (node.kind) {
-                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 */:
+                case 168 /* GetAccessor */:
+                case 169 /* SetAccessor */:
+                case 167 /* Constructor */:
+                case 164 /* PropertyDeclaration */:
+                case 163 /* PropertySignature */:
+                case 166 /* MethodDeclaration */:
+                case 165 /* MethodSignature */:
+                case 172 /* IndexSignature */:
+                case 257 /* ModuleDeclaration */:
+                case 262 /* ImportDeclaration */:
+                case 261 /* ImportEqualsDeclaration */:
+                case 268 /* ExportDeclaration */:
+                case 267 /* ExportAssignment */:
+                case 209 /* FunctionExpression */:
+                case 210 /* ArrowFunction */:
+                case 161 /* Parameter */:
                     return false;
                 default:
-                    if (node.parent.kind === 257 /* ModuleBlock */ || node.parent.kind === 297 /* SourceFile */) {
+                    if (node.parent.kind === 258 /* ModuleBlock */ || node.parent.kind === 298 /* SourceFile */) {
                         return false;
                     }
                     switch (node.kind) {
-                        case 251 /* FunctionDeclaration */:
+                        case 252 /* FunctionDeclaration */:
                             return nodeHasAnyModifiersExcept(node, 129 /* AsyncKeyword */);
-                        case 252 /* ClassDeclaration */:
-                        case 175 /* ConstructorType */:
+                        case 253 /* ClassDeclaration */:
+                        case 176 /* ConstructorType */:
                             return nodeHasAnyModifiersExcept(node, 125 /* AbstractKeyword */);
-                        case 253 /* InterfaceDeclaration */:
-                        case 232 /* VariableStatement */:
-                        case 254 /* TypeAliasDeclaration */:
+                        case 254 /* InterfaceDeclaration */:
+                        case 233 /* VariableStatement */:
+                        case 255 /* TypeAliasDeclaration */:
                             return true;
-                        case 255 /* EnumDeclaration */:
+                        case 256 /* EnumDeclaration */:
                             return nodeHasAnyModifiersExcept(node, 84 /* ConstKeyword */);
                         default:
                             ts.Debug.fail();
@@ -80143,10 +82346,10 @@ var ts;
         }
         function checkGrammarAsyncModifier(node, asyncModifier) {
             switch (node.kind) {
-                case 165 /* MethodDeclaration */:
-                case 251 /* FunctionDeclaration */:
-                case 208 /* FunctionExpression */:
-                case 209 /* ArrowFunction */:
+                case 166 /* MethodDeclaration */:
+                case 252 /* FunctionDeclaration */:
+                case 209 /* FunctionExpression */:
+                case 210 /* ArrowFunction */:
                     return false;
             }
             return grammarErrorOnNode(asyncModifier, ts.Diagnostics._0_modifier_cannot_be_used_here, "async");
@@ -80307,7 +82510,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 === 222 /* OmittedExpression */) {
+                    if (arg.kind === 223 /* OmittedExpression */) {
                         return grammarErrorAtPos(arg, arg.pos, 0, ts.Diagnostics.Argument_expression_expected);
                     }
                 }
@@ -80384,20 +82587,20 @@ var ts;
         }
         function checkGrammarComputedPropertyName(node) {
             // If node is not a computedPropertyName, just skip the grammar checking
-            if (node.kind !== 158 /* ComputedPropertyName */) {
+            if (node.kind !== 159 /* ComputedPropertyName */) {
                 return false;
             }
             var computedPropertyName = node;
-            if (computedPropertyName.expression.kind === 216 /* BinaryExpression */ && computedPropertyName.expression.operatorToken.kind === 27 /* CommaToken */) {
+            if (computedPropertyName.expression.kind === 217 /* 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 === 251 /* FunctionDeclaration */ ||
-                    node.kind === 208 /* FunctionExpression */ ||
-                    node.kind === 165 /* MethodDeclaration */);
+                ts.Debug.assert(node.kind === 252 /* FunctionDeclaration */ ||
+                    node.kind === 209 /* FunctionExpression */ ||
+                    node.kind === 166 /* MethodDeclaration */);
                 if (node.flags & 8388608 /* Ambient */) {
                     return grammarErrorOnNode(node.asteriskToken, ts.Diagnostics.Generators_are_not_allowed_in_an_ambient_context);
                 }
@@ -80416,7 +82619,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 === 290 /* SpreadAssignment */) {
+                if (prop.kind === 291 /* SpreadAssignment */) {
                     if (inDestructuring) {
                         // a rest property cannot be destructured any further
                         var expression = ts.skipParentheses(prop.expression);
@@ -80427,24 +82630,24 @@ var ts;
                     continue;
                 }
                 var name = prop.name;
-                if (name.kind === 158 /* ComputedPropertyName */) {
+                if (name.kind === 159 /* ComputedPropertyName */) {
                     // If the name is not a ComputedPropertyName, the grammar checking will skip it
                     checkGrammarComputedPropertyName(name);
                 }
-                if (prop.kind === 289 /* ShorthandPropertyAssignment */ && !inDestructuring && prop.objectAssignmentInitializer) {
+                if (prop.kind === 290 /* 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);
                 }
                 if (name.kind === 79 /* PrivateIdentifier */) {
-                    return grammarErrorOnNode(name, ts.Diagnostics.Private_identifiers_are_not_allowed_outside_class_bodies);
+                    grammarErrorOnNode(name, ts.Diagnostics.Private_identifiers_are_not_allowed_outside_class_bodies);
                 }
                 // Modifiers are never allowed on properties except for 'async' on a method declaration
                 if (prop.modifiers) {
                     // 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 !== 165 /* MethodDeclaration */) {
+                        if (mod.kind !== 129 /* AsyncKeyword */ || prop.kind !== 166 /* MethodDeclaration */) {
                             grammarErrorOnNode(mod, ts.Diagnostics._0_modifier_cannot_be_used_here, ts.getTextOfNode(mod));
                         }
                     }
@@ -80459,10 +82662,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 289 /* ShorthandPropertyAssignment */:
+                    case 290 /* ShorthandPropertyAssignment */:
                         checkGrammarForInvalidExclamationToken(prop.exclamationToken, ts.Diagnostics.A_definite_assignment_assertion_is_not_permitted_in_this_context);
                     // falls through
-                    case 288 /* PropertyAssignment */:
+                    case 289 /* PropertyAssignment */:
                         // Grammar checking for computedPropertyName and shorthandPropertyAssignment
                         checkGrammarForInvalidQuestionMark(prop.questionToken, ts.Diagnostics.An_object_member_cannot_be_declared_optional);
                         if (name.kind === 8 /* NumericLiteral */) {
@@ -80470,13 +82673,13 @@ var ts;
                         }
                         currentKind = 4 /* PropertyAssignment */;
                         break;
-                    case 165 /* MethodDeclaration */:
+                    case 166 /* MethodDeclaration */:
                         currentKind = 8 /* Method */;
                         break;
-                    case 167 /* GetAccessor */:
+                    case 168 /* GetAccessor */:
                         currentKind = 1 /* GetAccessor */;
                         break;
-                    case 168 /* SetAccessor */:
+                    case 169 /* SetAccessor */:
                         currentKind = 2 /* SetAccessor */;
                         break;
                     default:
@@ -80511,11 +82714,12 @@ var ts;
             }
         }
         function checkGrammarJsxElement(node) {
+            checkGrammarJsxName(node.tagName);
             checkGrammarTypeArguments(node, node.typeArguments);
             var seen = new ts.Map();
             for (var _i = 0, _a = node.attributes.properties; _i < _a.length; _i++) {
                 var attr = _a[_i];
-                if (attr.kind === 282 /* JsxSpreadAttribute */) {
+                if (attr.kind === 283 /* JsxSpreadAttribute */) {
                     continue;
                 }
                 var name = attr.name, initializer = attr.initializer;
@@ -80525,11 +82729,32 @@ var ts;
                 else {
                     return grammarErrorOnNode(name, ts.Diagnostics.JSX_elements_cannot_have_multiple_attributes_with_the_same_name);
                 }
-                if (initializer && initializer.kind === 283 /* JsxExpression */ && !initializer.expression) {
+                if (initializer && initializer.kind === 284 /* JsxExpression */ && !initializer.expression) {
                     return grammarErrorOnNode(initializer, ts.Diagnostics.JSX_attributes_must_only_be_assigned_a_non_empty_expression);
                 }
             }
         }
+        function checkGrammarJsxName(node) {
+            if (ts.isPropertyAccessExpression(node)) {
+                var propName = node;
+                do {
+                    var check_1 = checkGrammarJsxNestedIdentifier(propName.name);
+                    if (check_1) {
+                        return check_1;
+                    }
+                    propName = propName.expression;
+                } while (ts.isPropertyAccessExpression(propName));
+                var check = checkGrammarJsxNestedIdentifier(propName);
+                if (check) {
+                    return check;
+                }
+            }
+            function checkGrammarJsxNestedIdentifier(name) {
+                if (ts.isIdentifier(name) && ts.idText(name).indexOf(":") !== -1) {
+                    return grammarErrorOnNode(name, ts.Diagnostics.JSX_property_access_expressions_cannot_include_JSX_namespace_names);
+                }
+            }
+        }
         function checkGrammarJsxExpression(node) {
             if (node.expression && ts.isCommaSequence(node.expression)) {
                 return grammarErrorOnNode(node.expression, ts.Diagnostics.JSX_expressions_may_not_use_the_comma_operator_Did_you_mean_to_write_an_array);
@@ -80539,7 +82764,7 @@ var ts;
             if (checkGrammarStatementInAmbientContext(forInOrOfStatement)) {
                 return true;
             }
-            if (forInOrOfStatement.kind === 239 /* ForOfStatement */ && forInOrOfStatement.awaitModifier) {
+            if (forInOrOfStatement.kind === 240 /* ForOfStatement */ && forInOrOfStatement.awaitModifier) {
                 if (!(forInOrOfStatement.flags & 32768 /* AwaitContext */)) {
                     var sourceFile = ts.getSourceFileOfNode(forInOrOfStatement);
                     if (ts.isInTopLevelContext(forInOrOfStatement)) {
@@ -80557,7 +82782,7 @@ var ts;
                         if (!hasParseDiagnostics(sourceFile)) {
                             var diagnostic = ts.createDiagnosticForNode(forInOrOfStatement.awaitModifier, ts.Diagnostics.for_await_loops_are_only_allowed_within_async_functions_and_at_the_top_levels_of_modules);
                             var func = ts.getContainingFunction(forInOrOfStatement);
-                            if (func && func.kind !== 166 /* Constructor */) {
+                            if (func && func.kind !== 167 /* 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);
@@ -80569,7 +82794,7 @@ var ts;
                     return false;
                 }
             }
-            if (forInOrOfStatement.initializer.kind === 250 /* VariableDeclarationList */) {
+            if (forInOrOfStatement.initializer.kind === 251 /* VariableDeclarationList */) {
                 var variableList = forInOrOfStatement.initializer;
                 if (!checkGrammarVariableDeclarationList(variableList)) {
                     var declarations = variableList.declarations;
@@ -80584,20 +82809,20 @@ var ts;
                         return false;
                     }
                     if (declarations.length > 1) {
-                        var diagnostic = forInOrOfStatement.kind === 238 /* ForInStatement */
+                        var diagnostic = forInOrOfStatement.kind === 239 /* 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 === 238 /* ForInStatement */
+                        var diagnostic = forInOrOfStatement.kind === 239 /* 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 === 238 /* ForInStatement */
+                        var diagnostic = forInOrOfStatement.kind === 239 /* 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);
@@ -80607,26 +82832,34 @@ var ts;
             return false;
         }
         function checkGrammarAccessor(accessor) {
-            if (!(accessor.flags & 8388608 /* Ambient */)) {
+            if (!(accessor.flags & 8388608 /* Ambient */) && (accessor.parent.kind !== 178 /* TypeLiteral */) && (accessor.parent.kind !== 254 /* InterfaceDeclaration */)) {
                 if (languageVersion < 1 /* ES5 */) {
                     return grammarErrorOnNode(accessor.name, ts.Diagnostics.Accessors_are_only_available_when_targeting_ECMAScript_5_and_higher);
                 }
+                if (languageVersion < 2 /* ES2015 */ && ts.isPrivateIdentifier(accessor.name)) {
+                    return grammarErrorOnNode(accessor.name, ts.Diagnostics.Private_identifiers_are_only_available_when_targeting_ECMAScript_2015_and_higher);
+                }
                 if (accessor.body === undefined && !ts.hasSyntacticModifier(accessor, 128 /* Abstract */)) {
                     return grammarErrorAtPos(accessor, accessor.end - 1, ";".length, ts.Diagnostics._0_expected, "{");
                 }
             }
-            if (accessor.body && ts.hasSyntacticModifier(accessor, 128 /* Abstract */)) {
-                return grammarErrorOnNode(accessor, ts.Diagnostics.An_abstract_accessor_cannot_have_an_implementation);
+            if (accessor.body) {
+                if (ts.hasSyntacticModifier(accessor, 128 /* Abstract */)) {
+                    return grammarErrorOnNode(accessor, ts.Diagnostics.An_abstract_accessor_cannot_have_an_implementation);
+                }
+                if (accessor.parent.kind === 178 /* TypeLiteral */ || accessor.parent.kind === 254 /* InterfaceDeclaration */) {
+                    return grammarErrorOnNode(accessor.body, ts.Diagnostics.An_implementation_cannot_be_declared_in_ambient_contexts);
+                }
             }
             if (accessor.typeParameters) {
                 return grammarErrorOnNode(accessor.name, ts.Diagnostics.An_accessor_cannot_have_type_parameters);
             }
             if (!doesAccessorHaveCorrectParameterCount(accessor)) {
-                return grammarErrorOnNode(accessor.name, accessor.kind === 167 /* GetAccessor */ ?
+                return grammarErrorOnNode(accessor.name, accessor.kind === 168 /* GetAccessor */ ?
                     ts.Diagnostics.A_get_accessor_cannot_have_parameters :
                     ts.Diagnostics.A_set_accessor_must_have_exactly_one_parameter);
             }
-            if (accessor.kind === 168 /* SetAccessor */) {
+            if (accessor.kind === 169 /* SetAccessor */) {
                 if (accessor.type) {
                     return grammarErrorOnNode(accessor.name, ts.Diagnostics.A_set_accessor_cannot_have_a_return_type_annotation);
                 }
@@ -80648,10 +82881,10 @@ 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 === 167 /* GetAccessor */ ? 0 : 1);
+            return getAccessorThisParameter(accessor) || accessor.parameters.length === (accessor.kind === 168 /* GetAccessor */ ? 0 : 1);
         }
         function getAccessorThisParameter(accessor) {
-            if (accessor.parameters.length === (accessor.kind === 167 /* GetAccessor */ ? 1 : 2)) {
+            if (accessor.parameters.length === (accessor.kind === 168 /* GetAccessor */ ? 1 : 2)) {
                 return ts.getThisParameter(accessor);
             }
         }
@@ -80669,7 +82902,7 @@ var ts;
                     }
                 }
                 switch (parent.kind) {
-                    case 249 /* VariableDeclaration */:
+                    case 250 /* 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);
@@ -80681,13 +82914,13 @@ var ts;
                             return grammarErrorOnNode(parent.name, ts.Diagnostics.A_variable_whose_type_is_a_unique_symbol_type_must_be_const);
                         }
                         break;
-                    case 163 /* PropertyDeclaration */:
+                    case 164 /* 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 162 /* PropertySignature */:
+                    case 163 /* 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);
                         }
@@ -80697,7 +82930,7 @@ var ts;
                 }
             }
             else if (node.operator === 142 /* ReadonlyKeyword */) {
-                if (node.type.kind !== 178 /* ArrayType */ && node.type.kind !== 179 /* TupleType */) {
+                if (node.type.kind !== 179 /* ArrayType */ && node.type.kind !== 180 /* TupleType */) {
                     return grammarErrorOnFirstToken(node, ts.Diagnostics.readonly_type_modifier_is_only_permitted_on_array_and_tuple_literal_types, ts.tokenToString(148 /* SymbolKeyword */));
                 }
             }
@@ -80711,8 +82944,8 @@ var ts;
             if (checkGrammarFunctionLikeDeclaration(node)) {
                 return true;
             }
-            if (node.kind === 165 /* MethodDeclaration */) {
-                if (node.parent.kind === 200 /* ObjectLiteralExpression */) {
+            if (node.kind === 166 /* MethodDeclaration */) {
+                if (node.parent.kind === 201 /* 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);
@@ -80732,6 +82965,9 @@ var ts;
                 }
             }
             if (ts.isClassLike(node.parent)) {
+                if (languageVersion < 2 /* ES2015 */ && ts.isPrivateIdentifier(node.name)) {
+                    return grammarErrorOnNode(node.name, ts.Diagnostics.Private_identifiers_are_only_available_when_targeting_ECMAScript_2015_and_higher);
+                }
                 // Technically, computed properties in ambient contexts is disallowed
                 // for property declarations and accessors too, not just methods.
                 // However, property declarations disallow computed names in general,
@@ -80740,14 +82976,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 === 165 /* MethodDeclaration */ && !node.body) {
+                else if (node.kind === 166 /* 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 === 253 /* InterfaceDeclaration */) {
+            else if (node.parent.kind === 254 /* 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 === 177 /* TypeLiteral */) {
+            else if (node.parent.kind === 178 /* 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);
             }
         }
@@ -80758,11 +82994,11 @@ var ts;
                     return grammarErrorOnNode(node, ts.Diagnostics.Jump_target_cannot_cross_function_boundary);
                 }
                 switch (current.kind) {
-                    case 245 /* LabeledStatement */:
+                    case 246 /* 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 === 240 /* ContinueStatement */
+                            var isMisplacedContinueLabel = node.kind === 241 /* 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);
@@ -80770,8 +83006,8 @@ var ts;
                             return false;
                         }
                         break;
-                    case 244 /* SwitchStatement */:
-                        if (node.kind === 241 /* BreakStatement */ && !node.label) {
+                    case 245 /* SwitchStatement */:
+                        if (node.kind === 242 /* BreakStatement */ && !node.label) {
                             // unlabeled break within switch statement - ok
                             return false;
                         }
@@ -80786,13 +83022,13 @@ var ts;
                 current = current.parent;
             }
             if (node.label) {
-                var message = node.kind === 241 /* BreakStatement */
+                var message = node.kind === 242 /* 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 === 241 /* BreakStatement */
+                var message = node.kind === 242 /* 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);
@@ -80816,12 +83052,12 @@ var ts;
         }
         function isStringOrNumberLiteralExpression(expr) {
             return ts.isStringOrNumericLiteralLike(expr) ||
-                expr.kind === 214 /* PrefixUnaryExpression */ && expr.operator === 40 /* MinusToken */ &&
+                expr.kind === 215 /* PrefixUnaryExpression */ && expr.operator === 40 /* MinusToken */ &&
                     expr.operand.kind === 8 /* NumericLiteral */;
         }
         function isBigIntLiteralExpression(expr) {
             return expr.kind === 9 /* BigIntLiteral */ ||
-                expr.kind === 214 /* PrefixUnaryExpression */ && expr.operator === 40 /* MinusToken */ &&
+                expr.kind === 215 /* PrefixUnaryExpression */ && expr.operator === 40 /* MinusToken */ &&
                     expr.operand.kind === 9 /* BigIntLiteral */;
         }
         function isSimpleLiteralEnumReference(expr) {
@@ -80852,7 +83088,7 @@ var ts;
             }
         }
         function checkGrammarVariableDeclaration(node) {
-            if (node.parent.parent.kind !== 238 /* ForInStatement */ && node.parent.parent.kind !== 239 /* ForOfStatement */) {
+            if (node.parent.parent.kind !== 239 /* ForInStatement */ && node.parent.parent.kind !== 240 /* ForOfStatement */) {
                 if (node.flags & 8388608 /* Ambient */) {
                     checkAmbientInitializer(node);
                 }
@@ -80865,7 +83101,7 @@ var ts;
                     }
                 }
             }
-            if (node.exclamationToken && (node.parent.parent.kind !== 232 /* VariableStatement */ || !node.type || node.initializer || node.flags & 8388608 /* Ambient */)) {
+            if (node.exclamationToken && (node.parent.parent.kind !== 233 /* VariableStatement */ || !node.type || node.initializer || node.flags & 8388608 /* Ambient */)) {
                 var message = node.initializer
                     ? ts.Diagnostics.Declarations_with_initializers_cannot_also_have_definite_assignment_assertions
                     : !node.type
@@ -80933,15 +83169,15 @@ var ts;
         }
         function allowLetAndConstDeclarations(parent) {
             switch (parent.kind) {
-                case 234 /* IfStatement */:
-                case 235 /* DoStatement */:
-                case 236 /* WhileStatement */:
-                case 243 /* WithStatement */:
-                case 237 /* ForStatement */:
-                case 238 /* ForInStatement */:
-                case 239 /* ForOfStatement */:
+                case 235 /* IfStatement */:
+                case 236 /* DoStatement */:
+                case 237 /* WhileStatement */:
+                case 244 /* WithStatement */:
+                case 238 /* ForStatement */:
+                case 239 /* ForInStatement */:
+                case 240 /* ForOfStatement */:
                     return false;
-                case 245 /* LabeledStatement */:
+                case 246 /* LabeledStatement */:
                     return allowLetAndConstDeclarations(parent.parent);
             }
             return true;
@@ -81026,14 +83262,14 @@ var ts;
                 if (ts.isStringLiteral(node.name) && node.name.text === "constructor") {
                     return grammarErrorOnNode(node.name, ts.Diagnostics.Classes_may_not_have_a_field_named_constructor);
                 }
-                if (checkGrammarForInvalidDynamicName(node.name, ts.Diagnostics.A_computed_property_name_in_a_class_property_declaration_must_refer_to_an_expression_whose_type_is_a_literal_type_or_a_unique_symbol_type)) {
+                if (checkGrammarForInvalidDynamicName(node.name, ts.Diagnostics.A_computed_property_name_in_a_class_property_declaration_must_have_a_simple_literal_type_or_a_unique_symbol_type)) {
                     return true;
                 }
                 if (languageVersion < 2 /* ES2015 */ && ts.isPrivateIdentifier(node.name)) {
                     return grammarErrorOnNode(node.name, ts.Diagnostics.Private_identifiers_are_only_available_when_targeting_ECMAScript_2015_and_higher);
                 }
             }
-            else if (node.parent.kind === 253 /* InterfaceDeclaration */) {
+            else if (node.parent.kind === 254 /* 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;
                 }
@@ -81041,7 +83277,7 @@ var ts;
                     return grammarErrorOnNode(node.initializer, ts.Diagnostics.An_interface_property_cannot_have_an_initializer);
                 }
             }
-            else if (node.parent.kind === 177 /* TypeLiteral */) {
+            else if (node.parent.kind === 178 /* 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;
                 }
@@ -81075,13 +83311,13 @@ var ts;
             //     export_opt   AmbientDeclaration
             //
             // TODO: The spec needs to be amended to reflect this grammar.
-            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 */ ||
+            if (node.kind === 254 /* InterfaceDeclaration */ ||
+                node.kind === 255 /* TypeAliasDeclaration */ ||
+                node.kind === 262 /* ImportDeclaration */ ||
+                node.kind === 261 /* ImportEqualsDeclaration */ ||
+                node.kind === 268 /* ExportDeclaration */ ||
+                node.kind === 267 /* ExportAssignment */ ||
+                node.kind === 260 /* NamespaceExportDeclaration */ ||
                 ts.hasSyntacticModifier(node, 2 /* Ambient */ | 1 /* Export */ | 512 /* Default */)) {
                 return false;
             }
@@ -81090,7 +83326,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 === 232 /* VariableStatement */) {
+                if (ts.isDeclaration(decl) || decl.kind === 233 /* VariableStatement */) {
                     if (checkGrammarTopLevelElementForRequiredDeclareModifier(decl)) {
                         return true;
                     }
@@ -81113,7 +83349,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 === 230 /* Block */ || node.parent.kind === 257 /* ModuleBlock */ || node.parent.kind === 297 /* SourceFile */) {
+                if (node.parent.kind === 231 /* Block */ || node.parent.kind === 258 /* ModuleBlock */ || node.parent.kind === 298 /* SourceFile */) {
                     var links_2 = getNodeLinks(node.parent);
                     // Check if the containing block ever report this error
                     if (!links_2.hasReportedStatementInAmbientContext) {
@@ -81135,10 +83371,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, 191 /* LiteralType */)) {
+                else if (ts.isChildOfNodeWithKind(node, 192 /* LiteralType */)) {
                     diagnosticMessage = ts.Diagnostics.Octal_literal_types_must_use_ES2015_syntax_Use_the_syntax_0;
                 }
-                else if (ts.isChildOfNodeWithKind(node, 291 /* EnumMember */)) {
+                else if (ts.isChildOfNodeWithKind(node, 292 /* EnumMember */)) {
                     diagnosticMessage = ts.Diagnostics.Octal_literals_are_not_allowed_in_enums_members_initializer_Use_the_syntax_0;
                 }
                 if (diagnosticMessage) {
@@ -81244,7 +83480,7 @@ var ts;
             }
         }
         function findBestTypeForObjectLiteral(source, unionTarget) {
-            if (ts.getObjectFlags(source) & 128 /* ObjectLiteral */ && forEachType(unionTarget, isArrayLikeType)) {
+            if (ts.getObjectFlags(source) & 128 /* ObjectLiteral */ && someType(unionTarget, isArrayLikeType)) {
                 return ts.find(unionTarget.types, function (t) { return !isArrayLikeType(t); });
             }
         }
@@ -81296,6 +83532,10 @@ var ts;
         // Keep this up-to-date with the same logic within `getApparentTypeOfContextualType`, since they should behave similarly
         function findMatchingDiscriminantType(source, target, isRelatedTo, skipPartial) {
             if (target.flags & 1048576 /* Union */ && source.flags & (2097152 /* Intersection */ | 524288 /* Object */)) {
+                var match = getMatchingUnionConstituentForType(target, source);
+                if (match) {
+                    return match;
+                }
                 var sourceProperties = getPropertiesOfType(source);
                 if (sourceProperties) {
                     var sourcePropertiesFiltered = findDiscriminantProperties(sourceProperties, target);
@@ -81313,33 +83553,19 @@ var ts;
         return !ts.isAccessor(declaration);
     }
     function isNotOverload(declaration) {
-        return (declaration.kind !== 251 /* FunctionDeclaration */ && declaration.kind !== 165 /* MethodDeclaration */) ||
+        return (declaration.kind !== 252 /* FunctionDeclaration */ && declaration.kind !== 166 /* 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 265 /* ImportSpecifier */:
-            case 270 /* ExportSpecifier */:
+            case 266 /* ImportSpecifier */:
+            case 271 /* ExportSpecifier */:
                 return ts.isIdentifier(name);
             default:
                 return ts.isDeclarationName(name);
         }
     }
-    function isSomeImportDeclaration(decl) {
-        switch (decl.kind) {
-            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 === 265 /* ImportSpecifier */;
-            default:
-                return false;
-        }
-    }
     var JsxNames;
     (function (JsxNames) {
         JsxNames.JSX = "JSX";
@@ -81370,7 +83596,6 @@ var ts;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
-    var isTypeNodeOrTypeParameterDeclaration = ts.or(ts.isTypeNode, ts.isTypeParameterDeclaration);
     function visitNode(node, visitor, test, lift) {
         if (node === undefined || visitor === undefined) {
             return node;
@@ -81559,6 +83784,24 @@ var ts;
         return updated;
     }
     ts.visitFunctionBody = visitFunctionBody;
+    /**
+     * Visits an iteration body, adding any block-scoped variables required by the transformation.
+     */
+    function visitIterationBody(body, visitor, context) {
+        context.startBlockScope();
+        var updated = visitNode(body, visitor, ts.isStatement, context.factory.liftToBlock);
+        var declarations = context.endBlockScope();
+        if (ts.some(declarations)) {
+            if (ts.isBlock(updated)) {
+                declarations.push.apply(declarations, updated.statements);
+                return context.factory.updateBlock(updated, declarations);
+            }
+            declarations.push(updated);
+            return context.factory.createBlock(declarations);
+        }
+        return updated;
+    }
+    ts.visitIterationBody = visitIterationBody;
     function visitEachChild(node, visitor, context, nodesVisitor, tokenVisitor, nodeVisitor) {
         if (nodesVisitor === void 0) { nodesVisitor = visitNodes; }
         if (nodeVisitor === void 0) { nodeVisitor = visitNode; }
@@ -81567,299 +83810,433 @@ var ts;
         }
         var kind = node.kind;
         // No need to visit nodes with no children.
-        if ((kind > 0 /* FirstToken */ && kind <= 156 /* LastToken */) || kind === 187 /* ThisType */) {
+        if ((kind > 0 /* FirstToken */ && kind <= 157 /* LastToken */) || kind === 188 /* ThisType */) {
             return node;
         }
         var factory = context.factory;
         switch (kind) {
             // Names
             case 78 /* Identifier */:
-                return factory.updateIdentifier(node, nodesVisitor(node.typeArguments, visitor, isTypeNodeOrTypeParameterDeclaration));
-            case 157 /* QualifiedName */:
+                ts.Debug.type(node);
+                return factory.updateIdentifier(node, nodesVisitor(node.typeArguments, visitor, ts.isTypeNodeOrTypeParameterDeclaration));
+            case 158 /* QualifiedName */:
+                ts.Debug.type(node);
                 return factory.updateQualifiedName(node, nodeVisitor(node.left, visitor, ts.isEntityName), nodeVisitor(node.right, visitor, ts.isIdentifier));
-            case 158 /* ComputedPropertyName */:
+            case 159 /* ComputedPropertyName */:
+                ts.Debug.type(node);
                 return factory.updateComputedPropertyName(node, nodeVisitor(node.expression, visitor, ts.isExpression));
             // Signature elements
-            case 159 /* TypeParameter */:
+            case 160 /* TypeParameter */:
+                ts.Debug.type(node);
                 return factory.updateTypeParameterDeclaration(node, nodeVisitor(node.name, visitor, ts.isIdentifier), nodeVisitor(node.constraint, visitor, ts.isTypeNode), nodeVisitor(node.default, visitor, ts.isTypeNode));
-            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 161 /* Decorator */:
+            case 161 /* Parameter */:
+                ts.Debug.type(node);
+                return factory.updateParameterDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), nodeVisitor(node.dotDotDotToken, tokenVisitor, ts.isDotDotDotToken), nodeVisitor(node.name, visitor, ts.isBindingName), nodeVisitor(node.questionToken, tokenVisitor, ts.isQuestionToken), nodeVisitor(node.type, visitor, ts.isTypeNode), nodeVisitor(node.initializer, visitor, ts.isExpression));
+            case 162 /* Decorator */:
+                ts.Debug.type(node);
                 return factory.updateDecorator(node, nodeVisitor(node.expression, visitor, ts.isExpression));
             // Type elements
-            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 163 /* PropertyDeclaration */:
+            case 163 /* PropertySignature */:
+                ts.Debug.type(node);
+                return factory.updatePropertySignature(node, nodesVisitor(node.modifiers, visitor, ts.isModifier), nodeVisitor(node.name, visitor, ts.isPropertyName), nodeVisitor(node.questionToken, tokenVisitor, ts.isToken), nodeVisitor(node.type, visitor, ts.isTypeNode));
+            case 164 /* PropertyDeclaration */:
+                ts.Debug.type(node);
                 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 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 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 166 /* Constructor */:
+                nodeVisitor(node.questionToken || node.exclamationToken, tokenVisitor, ts.isQuestionOrExclamationToken), nodeVisitor(node.type, visitor, ts.isTypeNode), nodeVisitor(node.initializer, visitor, ts.isExpression));
+            case 165 /* MethodSignature */:
+                ts.Debug.type(node);
+                return factory.updateMethodSignature(node, nodesVisitor(node.modifiers, visitor, ts.isModifier), nodeVisitor(node.name, visitor, ts.isPropertyName), nodeVisitor(node.questionToken, tokenVisitor, ts.isQuestionToken), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.parameters, visitor, ts.isParameterDeclaration), nodeVisitor(node.type, visitor, ts.isTypeNode));
+            case 166 /* MethodDeclaration */:
+                ts.Debug.type(node);
+                return factory.updateMethodDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), nodeVisitor(node.asteriskToken, tokenVisitor, ts.isAsteriskToken), nodeVisitor(node.name, visitor, ts.isPropertyName), nodeVisitor(node.questionToken, tokenVisitor, ts.isQuestionToken), 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 167 /* Constructor */:
+                ts.Debug.type(node);
                 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 167 /* GetAccessor */:
+            case 168 /* GetAccessor */:
+                ts.Debug.type(node);
                 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 168 /* SetAccessor */:
+            case 169 /* SetAccessor */:
+                ts.Debug.type(node);
                 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 169 /* CallSignature */:
+            case 170 /* CallSignature */:
+                ts.Debug.type(node);
                 return factory.updateCallSignature(node, nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.parameters, visitor, ts.isParameterDeclaration), nodeVisitor(node.type, visitor, ts.isTypeNode));
-            case 170 /* ConstructSignature */:
+            case 171 /* ConstructSignature */:
+                ts.Debug.type(node);
                 return factory.updateConstructSignature(node, nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.parameters, visitor, ts.isParameterDeclaration), nodeVisitor(node.type, visitor, ts.isTypeNode));
-            case 171 /* IndexSignature */:
+            case 172 /* IndexSignature */:
+                ts.Debug.type(node);
                 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 172 /* TypePredicate */:
-                return factory.updateTypePredicateNode(node, nodeVisitor(node.assertsModifier, visitor), nodeVisitor(node.parameterName, visitor), nodeVisitor(node.type, visitor, ts.isTypeNode));
-            case 173 /* TypeReference */:
+            case 173 /* TypePredicate */:
+                ts.Debug.type(node);
+                return factory.updateTypePredicateNode(node, nodeVisitor(node.assertsModifier, visitor, ts.isAssertsKeyword), nodeVisitor(node.parameterName, visitor, ts.isIdentifierOrThisTypeNode), nodeVisitor(node.type, visitor, ts.isTypeNode));
+            case 174 /* TypeReference */:
+                ts.Debug.type(node);
                 return factory.updateTypeReferenceNode(node, nodeVisitor(node.typeName, visitor, ts.isEntityName), nodesVisitor(node.typeArguments, visitor, ts.isTypeNode));
-            case 174 /* FunctionType */:
+            case 175 /* FunctionType */:
+                ts.Debug.type(node);
                 return factory.updateFunctionTypeNode(node, nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.parameters, visitor, ts.isParameterDeclaration), nodeVisitor(node.type, visitor, ts.isTypeNode));
-            case 175 /* ConstructorType */:
+            case 176 /* ConstructorType */:
+                ts.Debug.type(node);
                 return factory.updateConstructorTypeNode(node, nodesVisitor(node.modifiers, visitor, ts.isModifier), nodesVisitor(node.typeParameters, visitor, ts.isTypeParameterDeclaration), nodesVisitor(node.parameters, visitor, ts.isParameterDeclaration), nodeVisitor(node.type, visitor, ts.isTypeNode));
-            case 176 /* TypeQuery */:
+            case 177 /* TypeQuery */:
+                ts.Debug.type(node);
                 return factory.updateTypeQueryNode(node, nodeVisitor(node.exprName, visitor, ts.isEntityName));
-            case 177 /* TypeLiteral */:
+            case 178 /* TypeLiteral */:
+                ts.Debug.type(node);
                 return factory.updateTypeLiteralNode(node, nodesVisitor(node.members, visitor, ts.isTypeElement));
-            case 178 /* ArrayType */:
+            case 179 /* ArrayType */:
+                ts.Debug.type(node);
                 return factory.updateArrayTypeNode(node, nodeVisitor(node.elementType, visitor, ts.isTypeNode));
-            case 179 /* TupleType */:
+            case 180 /* TupleType */:
+                ts.Debug.type(node);
                 return factory.updateTupleTypeNode(node, nodesVisitor(node.elements, visitor, ts.isTypeNode));
-            case 180 /* OptionalType */:
+            case 181 /* OptionalType */:
+                ts.Debug.type(node);
                 return factory.updateOptionalTypeNode(node, nodeVisitor(node.type, visitor, ts.isTypeNode));
-            case 181 /* RestType */:
+            case 182 /* RestType */:
+                ts.Debug.type(node);
                 return factory.updateRestTypeNode(node, nodeVisitor(node.type, visitor, ts.isTypeNode));
-            case 182 /* UnionType */:
+            case 183 /* UnionType */:
+                ts.Debug.type(node);
                 return factory.updateUnionTypeNode(node, nodesVisitor(node.types, visitor, ts.isTypeNode));
-            case 183 /* IntersectionType */:
+            case 184 /* IntersectionType */:
+                ts.Debug.type(node);
                 return factory.updateIntersectionTypeNode(node, nodesVisitor(node.types, visitor, ts.isTypeNode));
-            case 184 /* ConditionalType */:
+            case 185 /* ConditionalType */:
+                ts.Debug.type(node);
                 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 185 /* InferType */:
+            case 186 /* InferType */:
+                ts.Debug.type(node);
                 return factory.updateInferTypeNode(node, nodeVisitor(node.typeParameter, visitor, ts.isTypeParameterDeclaration));
-            case 195 /* ImportType */:
+            case 196 /* ImportType */:
+                ts.Debug.type(node);
                 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 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 186 /* ParenthesizedType */:
+            case 193 /* NamedTupleMember */:
+                ts.Debug.type(node);
+                return factory.updateNamedTupleMember(node, visitNode(node.dotDotDotToken, visitor, ts.isDotDotDotToken), visitNode(node.name, visitor, ts.isIdentifier), visitNode(node.questionToken, visitor, ts.isQuestionToken), visitNode(node.type, visitor, ts.isTypeNode));
+            case 187 /* ParenthesizedType */:
+                ts.Debug.type(node);
                 return factory.updateParenthesizedType(node, nodeVisitor(node.type, visitor, ts.isTypeNode));
-            case 188 /* TypeOperator */:
+            case 189 /* TypeOperator */:
+                ts.Debug.type(node);
                 return factory.updateTypeOperatorNode(node, nodeVisitor(node.type, visitor, ts.isTypeNode));
-            case 189 /* IndexedAccessType */:
+            case 190 /* IndexedAccessType */:
+                ts.Debug.type(node);
                 return factory.updateIndexedAccessTypeNode(node, nodeVisitor(node.objectType, visitor, ts.isTypeNode), nodeVisitor(node.indexType, visitor, ts.isTypeNode));
-            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 */:
+            case 191 /* MappedType */:
+                ts.Debug.type(node);
+                return factory.updateMappedTypeNode(node, nodeVisitor(node.readonlyToken, tokenVisitor, ts.isReadonlyKeywordOrPlusOrMinusToken), nodeVisitor(node.typeParameter, visitor, ts.isTypeParameterDeclaration), nodeVisitor(node.nameType, visitor, ts.isTypeNode), nodeVisitor(node.questionToken, tokenVisitor, ts.isQuestionOrPlusOrMinusToken), nodeVisitor(node.type, visitor, ts.isTypeNode));
+            case 192 /* LiteralType */:
+                ts.Debug.type(node);
                 return factory.updateLiteralTypeNode(node, nodeVisitor(node.literal, visitor, ts.isExpression));
-            case 193 /* TemplateLiteralType */:
+            case 194 /* TemplateLiteralType */:
+                ts.Debug.type(node);
                 return factory.updateTemplateLiteralType(node, nodeVisitor(node.head, visitor, ts.isTemplateHead), nodesVisitor(node.templateSpans, visitor, ts.isTemplateLiteralTypeSpan));
-            case 194 /* TemplateLiteralTypeSpan */:
+            case 195 /* TemplateLiteralTypeSpan */:
+                ts.Debug.type(node);
                 return factory.updateTemplateLiteralTypeSpan(node, nodeVisitor(node.type, visitor, ts.isTypeNode), nodeVisitor(node.literal, visitor, ts.isTemplateMiddleOrTemplateTail));
             // Binding patterns
-            case 196 /* ObjectBindingPattern */:
+            case 197 /* ObjectBindingPattern */:
+                ts.Debug.type(node);
                 return factory.updateObjectBindingPattern(node, nodesVisitor(node.elements, visitor, ts.isBindingElement));
-            case 197 /* ArrayBindingPattern */:
+            case 198 /* ArrayBindingPattern */:
+                ts.Debug.type(node);
                 return factory.updateArrayBindingPattern(node, nodesVisitor(node.elements, visitor, ts.isArrayBindingElement));
-            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));
+            case 199 /* BindingElement */:
+                ts.Debug.type(node);
+                return factory.updateBindingElement(node, nodeVisitor(node.dotDotDotToken, tokenVisitor, ts.isDotDotDotToken), nodeVisitor(node.propertyName, visitor, ts.isPropertyName), nodeVisitor(node.name, visitor, ts.isBindingName), nodeVisitor(node.initializer, visitor, ts.isExpression));
             // Expression
-            case 199 /* ArrayLiteralExpression */:
+            case 200 /* ArrayLiteralExpression */:
+                ts.Debug.type(node);
                 return factory.updateArrayLiteralExpression(node, nodesVisitor(node.elements, visitor, ts.isExpression));
-            case 200 /* ObjectLiteralExpression */:
+            case 201 /* ObjectLiteralExpression */:
+                ts.Debug.type(node);
                 return factory.updateObjectLiteralExpression(node, nodesVisitor(node.properties, visitor, ts.isObjectLiteralElementLike));
-            case 201 /* PropertyAccessExpression */:
+            case 202 /* 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));
+                    ts.Debug.type(node);
+                    return factory.updatePropertyAccessChain(node, nodeVisitor(node.expression, visitor, ts.isExpression), nodeVisitor(node.questionDotToken, tokenVisitor, ts.isQuestionDotToken), nodeVisitor(node.name, visitor, ts.isMemberName));
                 }
-                return factory.updatePropertyAccessExpression(node, nodeVisitor(node.expression, visitor, ts.isExpression), nodeVisitor(node.name, visitor, ts.isIdentifierOrPrivateIdentifier));
-            case 202 /* ElementAccessExpression */:
+                ts.Debug.type(node);
+                return factory.updatePropertyAccessExpression(node, nodeVisitor(node.expression, visitor, ts.isExpression), nodeVisitor(node.name, visitor, ts.isMemberName));
+            case 203 /* 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));
+                    ts.Debug.type(node);
+                    return factory.updateElementAccessChain(node, nodeVisitor(node.expression, visitor, ts.isExpression), nodeVisitor(node.questionDotToken, tokenVisitor, ts.isQuestionDotToken), nodeVisitor(node.argumentExpression, visitor, ts.isExpression));
                 }
+                ts.Debug.type(node);
                 return factory.updateElementAccessExpression(node, nodeVisitor(node.expression, visitor, ts.isExpression), nodeVisitor(node.argumentExpression, visitor, ts.isExpression));
-            case 203 /* CallExpression */:
+            case 204 /* 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));
+                    ts.Debug.type(node);
+                    return factory.updateCallChain(node, nodeVisitor(node.expression, visitor, ts.isExpression), nodeVisitor(node.questionDotToken, tokenVisitor, ts.isQuestionDotToken), nodesVisitor(node.typeArguments, visitor, ts.isTypeNode), nodesVisitor(node.arguments, visitor, ts.isExpression));
                 }
+                ts.Debug.type(node);
                 return factory.updateCallExpression(node, nodeVisitor(node.expression, visitor, ts.isExpression), nodesVisitor(node.typeArguments, visitor, ts.isTypeNode), nodesVisitor(node.arguments, visitor, ts.isExpression));
-            case 204 /* NewExpression */:
+            case 205 /* NewExpression */:
+                ts.Debug.type(node);
                 return factory.updateNewExpression(node, nodeVisitor(node.expression, visitor, ts.isExpression), nodesVisitor(node.typeArguments, visitor, ts.isTypeNode), nodesVisitor(node.arguments, visitor, ts.isExpression));
-            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 206 /* TypeAssertionExpression */:
+            case 206 /* TaggedTemplateExpression */:
+                ts.Debug.type(node);
+                return factory.updateTaggedTemplateExpression(node, nodeVisitor(node.tag, visitor, ts.isExpression), visitNodes(node.typeArguments, visitor, ts.isTypeNode), nodeVisitor(node.template, visitor, ts.isTemplateLiteral));
+            case 207 /* TypeAssertionExpression */:
+                ts.Debug.type(node);
                 return factory.updateTypeAssertion(node, nodeVisitor(node.type, visitor, ts.isTypeNode), nodeVisitor(node.expression, visitor, ts.isExpression));
-            case 207 /* ParenthesizedExpression */:
+            case 208 /* ParenthesizedExpression */:
+                ts.Debug.type(node);
                 return factory.updateParenthesizedExpression(node, nodeVisitor(node.expression, visitor, ts.isExpression));
-            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 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 210 /* DeleteExpression */:
+            case 209 /* FunctionExpression */:
+                ts.Debug.type(node);
+                return factory.updateFunctionExpression(node, nodesVisitor(node.modifiers, visitor, ts.isModifier), nodeVisitor(node.asteriskToken, tokenVisitor, ts.isAsteriskToken), 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 210 /* ArrowFunction */:
+                ts.Debug.type(node);
+                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.isEqualsGreaterThanToken), visitFunctionBody(node.body, visitor, context, nodeVisitor));
+            case 211 /* DeleteExpression */:
+                ts.Debug.type(node);
                 return factory.updateDeleteExpression(node, nodeVisitor(node.expression, visitor, ts.isExpression));
-            case 211 /* TypeOfExpression */:
+            case 212 /* TypeOfExpression */:
+                ts.Debug.type(node);
                 return factory.updateTypeOfExpression(node, nodeVisitor(node.expression, visitor, ts.isExpression));
-            case 212 /* VoidExpression */:
+            case 213 /* VoidExpression */:
+                ts.Debug.type(node);
                 return factory.updateVoidExpression(node, nodeVisitor(node.expression, visitor, ts.isExpression));
-            case 213 /* AwaitExpression */:
+            case 214 /* AwaitExpression */:
+                ts.Debug.type(node);
                 return factory.updateAwaitExpression(node, nodeVisitor(node.expression, visitor, ts.isExpression));
-            case 214 /* PrefixUnaryExpression */:
+            case 215 /* PrefixUnaryExpression */:
+                ts.Debug.type(node);
                 return factory.updatePrefixUnaryExpression(node, nodeVisitor(node.operand, visitor, ts.isExpression));
-            case 215 /* PostfixUnaryExpression */:
+            case 216 /* PostfixUnaryExpression */:
+                ts.Debug.type(node);
                 return factory.updatePostfixUnaryExpression(node, nodeVisitor(node.operand, visitor, ts.isExpression));
-            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 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 218 /* TemplateExpression */:
+            case 217 /* BinaryExpression */:
+                ts.Debug.type(node);
+                return factory.updateBinaryExpression(node, nodeVisitor(node.left, visitor, ts.isExpression), nodeVisitor(node.operatorToken, tokenVisitor, ts.isBinaryOperatorToken), nodeVisitor(node.right, visitor, ts.isExpression));
+            case 218 /* ConditionalExpression */:
+                ts.Debug.type(node);
+                return factory.updateConditionalExpression(node, nodeVisitor(node.condition, visitor, ts.isExpression), nodeVisitor(node.questionToken, tokenVisitor, ts.isQuestionToken), nodeVisitor(node.whenTrue, visitor, ts.isExpression), nodeVisitor(node.colonToken, tokenVisitor, ts.isColonToken), nodeVisitor(node.whenFalse, visitor, ts.isExpression));
+            case 219 /* TemplateExpression */:
+                ts.Debug.type(node);
                 return factory.updateTemplateExpression(node, nodeVisitor(node.head, visitor, ts.isTemplateHead), nodesVisitor(node.templateSpans, visitor, ts.isTemplateSpan));
-            case 219 /* YieldExpression */:
-                return factory.updateYieldExpression(node, nodeVisitor(node.asteriskToken, tokenVisitor, ts.isToken), nodeVisitor(node.expression, visitor, ts.isExpression));
-            case 220 /* SpreadElement */:
+            case 220 /* YieldExpression */:
+                ts.Debug.type(node);
+                return factory.updateYieldExpression(node, nodeVisitor(node.asteriskToken, tokenVisitor, ts.isAsteriskToken), nodeVisitor(node.expression, visitor, ts.isExpression));
+            case 221 /* SpreadElement */:
+                ts.Debug.type(node);
                 return factory.updateSpreadElement(node, nodeVisitor(node.expression, visitor, ts.isExpression));
-            case 221 /* ClassExpression */:
+            case 222 /* ClassExpression */:
+                ts.Debug.type(node);
                 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 223 /* ExpressionWithTypeArguments */:
+            case 224 /* ExpressionWithTypeArguments */:
+                ts.Debug.type(node);
                 return factory.updateExpressionWithTypeArguments(node, nodeVisitor(node.expression, visitor, ts.isExpression), nodesVisitor(node.typeArguments, visitor, ts.isTypeNode));
-            case 224 /* AsExpression */:
+            case 225 /* AsExpression */:
+                ts.Debug.type(node);
                 return factory.updateAsExpression(node, nodeVisitor(node.expression, visitor, ts.isExpression), nodeVisitor(node.type, visitor, ts.isTypeNode));
-            case 225 /* NonNullExpression */:
+            case 226 /* NonNullExpression */:
                 if (node.flags & 32 /* OptionalChain */) {
+                    ts.Debug.type(node);
                     return factory.updateNonNullChain(node, nodeVisitor(node.expression, visitor, ts.isExpression));
                 }
+                ts.Debug.type(node);
                 return factory.updateNonNullExpression(node, nodeVisitor(node.expression, visitor, ts.isExpression));
-            case 226 /* MetaProperty */:
+            case 227 /* MetaProperty */:
+                ts.Debug.type(node);
                 return factory.updateMetaProperty(node, nodeVisitor(node.name, visitor, ts.isIdentifier));
             // Misc
-            case 228 /* TemplateSpan */:
+            case 229 /* TemplateSpan */:
+                ts.Debug.type(node);
                 return factory.updateTemplateSpan(node, nodeVisitor(node.expression, visitor, ts.isExpression), nodeVisitor(node.literal, visitor, ts.isTemplateMiddleOrTemplateTail));
             // Element
-            case 230 /* Block */:
+            case 231 /* Block */:
+                ts.Debug.type(node);
                 return factory.updateBlock(node, nodesVisitor(node.statements, visitor, ts.isStatement));
-            case 232 /* VariableStatement */:
+            case 233 /* VariableStatement */:
+                ts.Debug.type(node);
                 return factory.updateVariableStatement(node, nodesVisitor(node.modifiers, visitor, ts.isModifier), nodeVisitor(node.declarationList, visitor, ts.isVariableDeclarationList));
-            case 233 /* ExpressionStatement */:
+            case 234 /* ExpressionStatement */:
+                ts.Debug.type(node);
                 return factory.updateExpressionStatement(node, nodeVisitor(node.expression, visitor, ts.isExpression));
-            case 234 /* IfStatement */:
+            case 235 /* IfStatement */:
+                ts.Debug.type(node);
                 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 235 /* DoStatement */:
-                return factory.updateDoStatement(node, nodeVisitor(node.statement, visitor, ts.isStatement, factory.liftToBlock), nodeVisitor(node.expression, visitor, ts.isExpression));
-            case 236 /* WhileStatement */:
-                return factory.updateWhileStatement(node, nodeVisitor(node.expression, visitor, ts.isExpression), nodeVisitor(node.statement, visitor, ts.isStatement, factory.liftToBlock));
-            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 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 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 240 /* ContinueStatement */:
+            case 236 /* DoStatement */:
+                ts.Debug.type(node);
+                return factory.updateDoStatement(node, visitIterationBody(node.statement, visitor, context), nodeVisitor(node.expression, visitor, ts.isExpression));
+            case 237 /* WhileStatement */:
+                ts.Debug.type(node);
+                return factory.updateWhileStatement(node, nodeVisitor(node.expression, visitor, ts.isExpression), visitIterationBody(node.statement, visitor, context));
+            case 238 /* ForStatement */:
+                ts.Debug.type(node);
+                return factory.updateForStatement(node, nodeVisitor(node.initializer, visitor, ts.isForInitializer), nodeVisitor(node.condition, visitor, ts.isExpression), nodeVisitor(node.incrementor, visitor, ts.isExpression), visitIterationBody(node.statement, visitor, context));
+            case 239 /* ForInStatement */:
+                ts.Debug.type(node);
+                return factory.updateForInStatement(node, nodeVisitor(node.initializer, visitor, ts.isForInitializer), nodeVisitor(node.expression, visitor, ts.isExpression), visitIterationBody(node.statement, visitor, context));
+            case 240 /* ForOfStatement */:
+                ts.Debug.type(node);
+                return factory.updateForOfStatement(node, nodeVisitor(node.awaitModifier, tokenVisitor, ts.isAwaitKeyword), nodeVisitor(node.initializer, visitor, ts.isForInitializer), nodeVisitor(node.expression, visitor, ts.isExpression), visitIterationBody(node.statement, visitor, context));
+            case 241 /* ContinueStatement */:
+                ts.Debug.type(node);
                 return factory.updateContinueStatement(node, nodeVisitor(node.label, visitor, ts.isIdentifier));
-            case 241 /* BreakStatement */:
+            case 242 /* BreakStatement */:
+                ts.Debug.type(node);
                 return factory.updateBreakStatement(node, nodeVisitor(node.label, visitor, ts.isIdentifier));
-            case 242 /* ReturnStatement */:
+            case 243 /* ReturnStatement */:
+                ts.Debug.type(node);
                 return factory.updateReturnStatement(node, nodeVisitor(node.expression, visitor, ts.isExpression));
-            case 243 /* WithStatement */:
+            case 244 /* WithStatement */:
+                ts.Debug.type(node);
                 return factory.updateWithStatement(node, nodeVisitor(node.expression, visitor, ts.isExpression), nodeVisitor(node.statement, visitor, ts.isStatement, factory.liftToBlock));
-            case 244 /* SwitchStatement */:
+            case 245 /* SwitchStatement */:
+                ts.Debug.type(node);
                 return factory.updateSwitchStatement(node, nodeVisitor(node.expression, visitor, ts.isExpression), nodeVisitor(node.caseBlock, visitor, ts.isCaseBlock));
-            case 245 /* LabeledStatement */:
+            case 246 /* LabeledStatement */:
+                ts.Debug.type(node);
                 return factory.updateLabeledStatement(node, nodeVisitor(node.label, visitor, ts.isIdentifier), nodeVisitor(node.statement, visitor, ts.isStatement, factory.liftToBlock));
-            case 246 /* ThrowStatement */:
+            case 247 /* ThrowStatement */:
+                ts.Debug.type(node);
                 return factory.updateThrowStatement(node, nodeVisitor(node.expression, visitor, ts.isExpression));
-            case 247 /* TryStatement */:
+            case 248 /* TryStatement */:
+                ts.Debug.type(node);
                 return factory.updateTryStatement(node, nodeVisitor(node.tryBlock, visitor, ts.isBlock), nodeVisitor(node.catchClause, visitor, ts.isCatchClause), nodeVisitor(node.finallyBlock, visitor, ts.isBlock));
-            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 250 /* VariableDeclarationList */:
+            case 250 /* VariableDeclaration */:
+                ts.Debug.type(node);
+                return factory.updateVariableDeclaration(node, nodeVisitor(node.name, visitor, ts.isBindingName), nodeVisitor(node.exclamationToken, tokenVisitor, ts.isExclamationToken), nodeVisitor(node.type, visitor, ts.isTypeNode), nodeVisitor(node.initializer, visitor, ts.isExpression));
+            case 251 /* VariableDeclarationList */:
+                ts.Debug.type(node);
                 return factory.updateVariableDeclarationList(node, nodesVisitor(node.declarations, visitor, ts.isVariableDeclaration));
-            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 252 /* ClassDeclaration */:
+            case 252 /* FunctionDeclaration */:
+                ts.Debug.type(node);
+                return factory.updateFunctionDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), nodeVisitor(node.asteriskToken, tokenVisitor, ts.isAsteriskToken), 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 253 /* ClassDeclaration */:
+                ts.Debug.type(node);
                 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 253 /* InterfaceDeclaration */:
+            case 254 /* InterfaceDeclaration */:
+                ts.Debug.type(node);
                 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 254 /* TypeAliasDeclaration */:
+            case 255 /* TypeAliasDeclaration */:
+                ts.Debug.type(node);
                 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 255 /* EnumDeclaration */:
+            case 256 /* EnumDeclaration */:
+                ts.Debug.type(node);
                 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 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 257 /* ModuleBlock */:
+            case 257 /* ModuleDeclaration */:
+                ts.Debug.type(node);
+                return factory.updateModuleDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), nodeVisitor(node.name, visitor, ts.isModuleName), nodeVisitor(node.body, visitor, ts.isModuleBody));
+            case 258 /* ModuleBlock */:
+                ts.Debug.type(node);
                 return factory.updateModuleBlock(node, nodesVisitor(node.statements, visitor, ts.isStatement));
-            case 258 /* CaseBlock */:
+            case 259 /* CaseBlock */:
+                ts.Debug.type(node);
                 return factory.updateCaseBlock(node, nodesVisitor(node.clauses, visitor, ts.isCaseOrDefaultClause));
-            case 259 /* NamespaceExportDeclaration */:
+            case 260 /* NamespaceExportDeclaration */:
+                ts.Debug.type(node);
                 return factory.updateNamespaceExportDeclaration(node, nodeVisitor(node.name, visitor, ts.isIdentifier));
-            case 260 /* ImportEqualsDeclaration */:
+            case 261 /* ImportEqualsDeclaration */:
+                ts.Debug.type(node);
                 return factory.updateImportEqualsDeclaration(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), node.isTypeOnly, nodeVisitor(node.name, visitor, ts.isIdentifier), nodeVisitor(node.moduleReference, visitor, ts.isModuleReference));
-            case 261 /* ImportDeclaration */:
+            case 262 /* ImportDeclaration */:
+                ts.Debug.type(node);
                 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 262 /* ImportClause */:
+            case 263 /* ImportClause */:
+                ts.Debug.type(node);
                 return factory.updateImportClause(node, node.isTypeOnly, nodeVisitor(node.name, visitor, ts.isIdentifier), nodeVisitor(node.namedBindings, visitor, ts.isNamedImportBindings));
-            case 263 /* NamespaceImport */:
+            case 264 /* NamespaceImport */:
+                ts.Debug.type(node);
                 return factory.updateNamespaceImport(node, nodeVisitor(node.name, visitor, ts.isIdentifier));
-            case 269 /* NamespaceExport */:
+            case 270 /* NamespaceExport */:
+                ts.Debug.type(node);
                 return factory.updateNamespaceExport(node, nodeVisitor(node.name, visitor, ts.isIdentifier));
-            case 264 /* NamedImports */:
+            case 265 /* NamedImports */:
+                ts.Debug.type(node);
                 return factory.updateNamedImports(node, nodesVisitor(node.elements, visitor, ts.isImportSpecifier));
-            case 265 /* ImportSpecifier */:
+            case 266 /* ImportSpecifier */:
+                ts.Debug.type(node);
                 return factory.updateImportSpecifier(node, nodeVisitor(node.propertyName, visitor, ts.isIdentifier), nodeVisitor(node.name, visitor, ts.isIdentifier));
-            case 266 /* ExportAssignment */:
+            case 267 /* ExportAssignment */:
+                ts.Debug.type(node);
                 return factory.updateExportAssignment(node, nodesVisitor(node.decorators, visitor, ts.isDecorator), nodesVisitor(node.modifiers, visitor, ts.isModifier), nodeVisitor(node.expression, visitor, ts.isExpression));
-            case 267 /* ExportDeclaration */:
+            case 268 /* ExportDeclaration */:
+                ts.Debug.type(node);
                 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 268 /* NamedExports */:
+            case 269 /* NamedExports */:
+                ts.Debug.type(node);
                 return factory.updateNamedExports(node, nodesVisitor(node.elements, visitor, ts.isExportSpecifier));
-            case 270 /* ExportSpecifier */:
+            case 271 /* ExportSpecifier */:
+                ts.Debug.type(node);
                 return factory.updateExportSpecifier(node, nodeVisitor(node.propertyName, visitor, ts.isIdentifier), nodeVisitor(node.name, visitor, ts.isIdentifier));
             // Module references
-            case 272 /* ExternalModuleReference */:
+            case 273 /* ExternalModuleReference */:
+                ts.Debug.type(node);
                 return factory.updateExternalModuleReference(node, nodeVisitor(node.expression, visitor, ts.isExpression));
             // JSX
-            case 273 /* JsxElement */:
+            case 274 /* JsxElement */:
+                ts.Debug.type(node);
                 return factory.updateJsxElement(node, nodeVisitor(node.openingElement, visitor, ts.isJsxOpeningElement), nodesVisitor(node.children, visitor, ts.isJsxChild), nodeVisitor(node.closingElement, visitor, ts.isJsxClosingElement));
-            case 274 /* JsxSelfClosingElement */:
+            case 275 /* JsxSelfClosingElement */:
+                ts.Debug.type(node);
                 return factory.updateJsxSelfClosingElement(node, nodeVisitor(node.tagName, visitor, ts.isJsxTagNameExpression), nodesVisitor(node.typeArguments, visitor, ts.isTypeNode), nodeVisitor(node.attributes, visitor, ts.isJsxAttributes));
-            case 275 /* JsxOpeningElement */:
+            case 276 /* JsxOpeningElement */:
+                ts.Debug.type(node);
                 return factory.updateJsxOpeningElement(node, nodeVisitor(node.tagName, visitor, ts.isJsxTagNameExpression), nodesVisitor(node.typeArguments, visitor, ts.isTypeNode), nodeVisitor(node.attributes, visitor, ts.isJsxAttributes));
-            case 276 /* JsxClosingElement */:
+            case 277 /* JsxClosingElement */:
+                ts.Debug.type(node);
                 return factory.updateJsxClosingElement(node, nodeVisitor(node.tagName, visitor, ts.isJsxTagNameExpression));
-            case 277 /* JsxFragment */:
+            case 278 /* JsxFragment */:
+                ts.Debug.type(node);
                 return factory.updateJsxFragment(node, nodeVisitor(node.openingFragment, visitor, ts.isJsxOpeningFragment), nodesVisitor(node.children, visitor, ts.isJsxChild), nodeVisitor(node.closingFragment, visitor, ts.isJsxClosingFragment));
-            case 280 /* JsxAttribute */:
+            case 281 /* JsxAttribute */:
+                ts.Debug.type(node);
                 return factory.updateJsxAttribute(node, nodeVisitor(node.name, visitor, ts.isIdentifier), nodeVisitor(node.initializer, visitor, ts.isStringLiteralOrJsxExpression));
-            case 281 /* JsxAttributes */:
+            case 282 /* JsxAttributes */:
+                ts.Debug.type(node);
                 return factory.updateJsxAttributes(node, nodesVisitor(node.properties, visitor, ts.isJsxAttributeLike));
-            case 282 /* JsxSpreadAttribute */:
+            case 283 /* JsxSpreadAttribute */:
+                ts.Debug.type(node);
                 return factory.updateJsxSpreadAttribute(node, nodeVisitor(node.expression, visitor, ts.isExpression));
-            case 283 /* JsxExpression */:
+            case 284 /* JsxExpression */:
+                ts.Debug.type(node);
                 return factory.updateJsxExpression(node, nodeVisitor(node.expression, visitor, ts.isExpression));
             // Clauses
-            case 284 /* CaseClause */:
+            case 285 /* CaseClause */:
+                ts.Debug.type(node);
                 return factory.updateCaseClause(node, nodeVisitor(node.expression, visitor, ts.isExpression), nodesVisitor(node.statements, visitor, ts.isStatement));
-            case 285 /* DefaultClause */:
+            case 286 /* DefaultClause */:
+                ts.Debug.type(node);
                 return factory.updateDefaultClause(node, nodesVisitor(node.statements, visitor, ts.isStatement));
-            case 286 /* HeritageClause */:
+            case 287 /* HeritageClause */:
+                ts.Debug.type(node);
                 return factory.updateHeritageClause(node, nodesVisitor(node.types, visitor, ts.isExpressionWithTypeArguments));
-            case 287 /* CatchClause */:
+            case 288 /* CatchClause */:
+                ts.Debug.type(node);
                 return factory.updateCatchClause(node, nodeVisitor(node.variableDeclaration, visitor, ts.isVariableDeclaration), nodeVisitor(node.block, visitor, ts.isBlock));
             // Property assignments
-            case 288 /* PropertyAssignment */:
+            case 289 /* PropertyAssignment */:
+                ts.Debug.type(node);
                 return factory.updatePropertyAssignment(node, nodeVisitor(node.name, visitor, ts.isPropertyName), nodeVisitor(node.initializer, visitor, ts.isExpression));
-            case 289 /* ShorthandPropertyAssignment */:
+            case 290 /* ShorthandPropertyAssignment */:
+                ts.Debug.type(node);
                 return factory.updateShorthandPropertyAssignment(node, nodeVisitor(node.name, visitor, ts.isIdentifier), nodeVisitor(node.objectAssignmentInitializer, visitor, ts.isExpression));
-            case 290 /* SpreadAssignment */:
+            case 291 /* SpreadAssignment */:
+                ts.Debug.type(node);
                 return factory.updateSpreadAssignment(node, nodeVisitor(node.expression, visitor, ts.isExpression));
             // Enum
-            case 291 /* EnumMember */:
+            case 292 /* EnumMember */:
+                ts.Debug.type(node);
                 return factory.updateEnumMember(node, nodeVisitor(node.name, visitor, ts.isPropertyName), nodeVisitor(node.initializer, visitor, ts.isExpression));
             // Top-level nodes
-            case 297 /* SourceFile */:
+            case 298 /* SourceFile */:
+                ts.Debug.type(node);
                 return factory.updateSourceFile(node, visitLexicalEnvironment(node.statements, visitor, context));
             // Transformation nodes
-            case 336 /* PartiallyEmittedExpression */:
+            case 340 /* PartiallyEmittedExpression */:
+                ts.Debug.type(node);
                 return factory.updatePartiallyEmittedExpression(node, nodeVisitor(node.expression, visitor, ts.isExpression));
-            case 337 /* CommaListExpression */:
+            case 341 /* CommaListExpression */:
+                ts.Debug.type(node);
                 return factory.updateCommaListExpression(node, nodesVisitor(node.elements, visitor, ts.isExpression));
             default:
                 // No need to visit nodes with no children.
@@ -82534,7 +84911,7 @@ var ts;
     function chainBundle(context, transformSourceFile) {
         return transformSourceFileOrBundle;
         function transformSourceFileOrBundle(node) {
-            return node.kind === 297 /* SourceFile */ ? transformSourceFile(node) : transformBundle(node);
+            return node.kind === 298 /* SourceFile */ ? transformSourceFile(node) : transformBundle(node);
         }
         function transformBundle(node) {
             return context.factory.createBundle(ts.map(node.sourceFiles, transformSourceFile), node.prepends);
@@ -82585,7 +84962,7 @@ var ts;
         for (var _i = 0, _a = sourceFile.statements; _i < _a.length; _i++) {
             var node = _a[_i];
             switch (node.kind) {
-                case 261 /* ImportDeclaration */:
+                case 262 /* ImportDeclaration */:
                     // import "mod"
                     // import x from "mod"
                     // import * as x from "mod"
@@ -82598,13 +84975,13 @@ var ts;
                         hasImportDefault = true;
                     }
                     break;
-                case 260 /* ImportEqualsDeclaration */:
-                    if (node.moduleReference.kind === 272 /* ExternalModuleReference */) {
+                case 261 /* ImportEqualsDeclaration */:
+                    if (node.moduleReference.kind === 273 /* ExternalModuleReference */) {
                         // import x = require("mod")
                         externalImports.push(node);
                     }
                     break;
-                case 267 /* ExportDeclaration */:
+                case 268 /* ExportDeclaration */:
                     if (node.moduleSpecifier) {
                         if (!node.exportClause) {
                             // export * from "mod"
@@ -82635,13 +85012,13 @@ var ts;
                         addExportedNamesForExportDeclaration(node);
                     }
                     break;
-                case 266 /* ExportAssignment */:
+                case 267 /* ExportAssignment */:
                     if (node.isExportEquals && !exportEquals) {
                         // export = x
                         exportEquals = node;
                     }
                     break;
-                case 232 /* VariableStatement */:
+                case 233 /* VariableStatement */:
                     if (ts.hasSyntacticModifier(node, 1 /* Export */)) {
                         for (var _b = 0, _c = node.declarationList.declarations; _b < _c.length; _b++) {
                             var decl = _c[_b];
@@ -82649,7 +85026,7 @@ var ts;
                         }
                     }
                     break;
-                case 251 /* FunctionDeclaration */:
+                case 252 /* FunctionDeclaration */:
                     if (ts.hasSyntacticModifier(node, 1 /* Export */)) {
                         if (ts.hasSyntacticModifier(node, 512 /* Default */)) {
                             // export default function() { }
@@ -82669,7 +85046,7 @@ var ts;
                         }
                     }
                     break;
-                case 252 /* ClassDeclaration */:
+                case 253 /* ClassDeclaration */:
                     if (ts.hasSyntacticModifier(node, 1 /* Export */)) {
                         if (ts.hasSyntacticModifier(node, 512 /* Default */)) {
                             // export default class { }
@@ -82763,8 +85140,7 @@ var ts;
      * any such locations
      */
     function isSimpleInlineableExpression(expression) {
-        return !ts.isIdentifier(expression) && isSimpleCopiableExpression(expression) ||
-            ts.isWellKnownSymbolSyntactically(expression);
+        return !ts.isIdentifier(expression) && isSimpleCopiableExpression(expression);
     }
     ts.isSimpleInlineableExpression = isSimpleInlineableExpression;
     function isCompoundAssignment(kind) {
@@ -82843,10 +85219,19 @@ var ts;
      * @param isStatic A value indicating whether the member should be a static or instance member.
      */
     function isInitializedProperty(member) {
-        return member.kind === 163 /* PropertyDeclaration */
+        return member.kind === 164 /* PropertyDeclaration */
             && member.initializer !== undefined;
     }
     ts.isInitializedProperty = isInitializedProperty;
+    /**
+     * Gets a value indicating whether a class element is a private instance method or accessor.
+     *
+     * @param member The class element node.
+     */
+    function isNonStaticMethodOrAccessorWithPrivateName(member) {
+        return !ts.hasStaticModifier(member) && ts.isMethodOrAccessor(member) && ts.isPrivateIdentifier(member.name);
+    }
+    ts.isNonStaticMethodOrAccessorWithPrivateName = isNonStaticMethodOrAccessorWithPrivateName;
 })(ts || (ts = {}));
 /*@internal*/
 var ts;
@@ -83120,8 +85505,8 @@ var ts;
             if (!ts.getRestIndicatorOfBindingOrAssignmentElement(element)) {
                 var propertyName = ts.getPropertyNameOfBindingOrAssignmentElement(element);
                 if (flattenContext.level >= 1 /* ObjectRest */
-                    && !(element.transformFlags & (8192 /* ContainsRestOrSpread */ | 16384 /* ContainsObjectRestOrSpread */))
-                    && !(ts.getTargetOfBindingOrAssignmentElement(element).transformFlags & (8192 /* ContainsRestOrSpread */ | 16384 /* ContainsObjectRestOrSpread */))
+                    && !(element.transformFlags & (16384 /* ContainsRestOrSpread */ | 32768 /* ContainsObjectRestOrSpread */))
+                    && !(ts.getTargetOfBindingOrAssignmentElement(element).transformFlags & (16384 /* ContainsRestOrSpread */ | 32768 /* ContainsObjectRestOrSpread */))
                     && !ts.isComputedPropertyName(propertyName)) {
                     bindingElements = ts.append(bindingElements, ts.visitNode(element, flattenContext.visitor));
                 }
@@ -83187,7 +85572,7 @@ var ts;
             if (flattenContext.level >= 1 /* ObjectRest */) {
                 // If an array pattern contains an ObjectRest, we must cache the result so that we
                 // can perform the ObjectRest destructuring in a different declaration
-                if (element.transformFlags & 16384 /* ContainsObjectRestOrSpread */ || flattenContext.hasTransformedPriorElement && !isSimpleBindingOrAssignmentElement(element)) {
+                if (element.transformFlags & 32768 /* ContainsObjectRestOrSpread */ || flattenContext.hasTransformedPriorElement && !isSimpleBindingOrAssignmentElement(element)) {
                     flattenContext.hasTransformedPriorElement = true;
                     var temp = flattenContext.context.factory.createTempVariable(/*recordTempVariable*/ undefined);
                     if (flattenContext.hoistTempVariables) {
@@ -83445,8 +85830,8 @@ var ts;
         context.onEmitNode = onEmitNode;
         context.onSubstituteNode = onSubstituteNode;
         // Enable substitution for property/element access to emit const enum values.
-        context.enableSubstitution(201 /* PropertyAccessExpression */);
-        context.enableSubstitution(202 /* ElementAccessExpression */);
+        context.enableSubstitution(202 /* PropertyAccessExpression */);
+        context.enableSubstitution(203 /* ElementAccessExpression */);
         // These variables contain state that changes as we descend into the tree.
         var currentSourceFile;
         var currentNamespace;
@@ -83472,14 +85857,14 @@ var ts;
         var applicableSubstitutions;
         return transformSourceFileOrBundle;
         function transformSourceFileOrBundle(node) {
-            if (node.kind === 298 /* Bundle */) {
+            if (node.kind === 299 /* 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 === 300 /* InputFiles */) {
+                if (prepend.kind === 301 /* InputFiles */) {
                     return ts.createUnparsedSourceFile(prepend, "js");
                 }
                 return prepend;
@@ -83530,16 +85915,16 @@ var ts;
          */
         function onBeforeVisitNode(node) {
             switch (node.kind) {
-                case 297 /* SourceFile */:
-                case 258 /* CaseBlock */:
-                case 257 /* ModuleBlock */:
-                case 230 /* Block */:
+                case 298 /* SourceFile */:
+                case 259 /* CaseBlock */:
+                case 258 /* ModuleBlock */:
+                case 231 /* Block */:
                     currentLexicalScope = node;
                     currentNameScope = undefined;
                     currentScopeFirstDeclarationsOfName = undefined;
                     break;
-                case 252 /* ClassDeclaration */:
-                case 251 /* FunctionDeclaration */:
+                case 253 /* ClassDeclaration */:
+                case 252 /* FunctionDeclaration */:
                     if (ts.hasSyntacticModifier(node, 2 /* Ambient */)) {
                         break;
                     }
@@ -83551,7 +85936,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 === 252 /* ClassDeclaration */ || ts.hasSyntacticModifier(node, 512 /* Default */));
+                        ts.Debug.assert(node.kind === 253 /* ClassDeclaration */ || ts.hasSyntacticModifier(node, 512 /* Default */));
                     }
                     if (ts.isClassDeclaration(node)) {
                         // XXX: should probably also cover interfaces and type aliases that can have type variables?
@@ -83594,10 +85979,10 @@ var ts;
          */
         function sourceElementVisitorWorker(node) {
             switch (node.kind) {
-                case 261 /* ImportDeclaration */:
-                case 260 /* ImportEqualsDeclaration */:
-                case 266 /* ExportAssignment */:
-                case 267 /* ExportDeclaration */:
+                case 262 /* ImportDeclaration */:
+                case 261 /* ImportEqualsDeclaration */:
+                case 267 /* ExportAssignment */:
+                case 268 /* ExportDeclaration */:
                     return visitElidableStatement(node);
                 default:
                     return visitorWorker(node);
@@ -83618,13 +86003,13 @@ var ts;
                 return node;
             }
             switch (node.kind) {
-                case 261 /* ImportDeclaration */:
+                case 262 /* ImportDeclaration */:
                     return visitImportDeclaration(node);
-                case 260 /* ImportEqualsDeclaration */:
+                case 261 /* ImportEqualsDeclaration */:
                     return visitImportEqualsDeclaration(node);
-                case 266 /* ExportAssignment */:
+                case 267 /* ExportAssignment */:
                     return visitExportAssignment(node);
-                case 267 /* ExportDeclaration */:
+                case 268 /* ExportDeclaration */:
                     return visitExportDeclaration(node);
                 default:
                     ts.Debug.fail("Unhandled ellided statement");
@@ -83644,11 +86029,11 @@ var ts;
          * @param node The node to visit.
          */
         function namespaceElementVisitorWorker(node) {
-            if (node.kind === 267 /* ExportDeclaration */ ||
-                node.kind === 261 /* ImportDeclaration */ ||
-                node.kind === 262 /* ImportClause */ ||
-                (node.kind === 260 /* ImportEqualsDeclaration */ &&
-                    node.moduleReference.kind === 272 /* ExternalModuleReference */)) {
+            if (node.kind === 268 /* ExportDeclaration */ ||
+                node.kind === 262 /* ImportDeclaration */ ||
+                node.kind === 263 /* ImportClause */ ||
+                (node.kind === 261 /* ImportEqualsDeclaration */ &&
+                    node.moduleReference.kind === 273 /* ExternalModuleReference */)) {
                 // do not emit ES6 imports and exports since they are illegal inside a namespace
                 return undefined;
             }
@@ -83672,26 +86057,26 @@ var ts;
          */
         function classElementVisitorWorker(node) {
             switch (node.kind) {
-                case 166 /* Constructor */:
+                case 167 /* Constructor */:
                     return visitConstructor(node);
-                case 163 /* PropertyDeclaration */:
+                case 164 /* PropertyDeclaration */:
                     // Property declarations are not TypeScript syntax, but they must be visited
                     // for the decorator transformation.
                     return visitPropertyDeclaration(node);
-                case 171 /* IndexSignature */:
-                case 167 /* GetAccessor */:
-                case 168 /* SetAccessor */:
-                case 165 /* MethodDeclaration */:
+                case 172 /* IndexSignature */:
+                case 168 /* GetAccessor */:
+                case 169 /* SetAccessor */:
+                case 166 /* MethodDeclaration */:
                     // Fallback to the default visit behavior.
                     return visitorWorker(node);
-                case 229 /* SemicolonClassElement */:
+                case 230 /* SemicolonClassElement */:
                     return node;
                 default:
                     return ts.Debug.failBadSyntaxKind(node);
             }
         }
         function modifierVisitor(node) {
-            if (ts.modifierToFlag(node.kind) & 2270 /* TypeScriptModifier */) {
+            if (ts.modifierToFlag(node.kind) & 18654 /* TypeScriptModifier */) {
                 return undefined;
             }
             else if (currentNamespace && node.kind === 92 /* ExportKeyword */) {
@@ -83724,13 +86109,13 @@ var ts;
                 case 142 /* ReadonlyKeyword */:
                 // TypeScript accessibility and readonly modifiers are elided
                 // falls through
-                case 178 /* ArrayType */:
-                case 179 /* TupleType */:
-                case 180 /* OptionalType */:
-                case 181 /* RestType */:
-                case 177 /* TypeLiteral */:
-                case 172 /* TypePredicate */:
-                case 159 /* TypeParameter */:
+                case 179 /* ArrayType */:
+                case 180 /* TupleType */:
+                case 181 /* OptionalType */:
+                case 182 /* RestType */:
+                case 178 /* TypeLiteral */:
+                case 173 /* TypePredicate */:
+                case 160 /* TypeParameter */:
                 case 128 /* AnyKeyword */:
                 case 152 /* UnknownKeyword */:
                 case 131 /* BooleanKeyword */:
@@ -83739,43 +86124,43 @@ var ts;
                 case 141 /* NeverKeyword */:
                 case 113 /* VoidKeyword */:
                 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 */:
+                case 176 /* ConstructorType */:
+                case 175 /* FunctionType */:
+                case 177 /* TypeQuery */:
+                case 174 /* TypeReference */:
+                case 183 /* UnionType */:
+                case 184 /* IntersectionType */:
+                case 185 /* ConditionalType */:
+                case 187 /* ParenthesizedType */:
+                case 188 /* ThisType */:
+                case 189 /* TypeOperator */:
+                case 190 /* IndexedAccessType */:
+                case 191 /* MappedType */:
+                case 192 /* LiteralType */:
                 // TypeScript type nodes are elided.
                 // falls through
-                case 171 /* IndexSignature */:
+                case 172 /* IndexSignature */:
                 // TypeScript index signatures are elided.
                 // falls through
-                case 161 /* Decorator */:
+                case 162 /* Decorator */:
                 // TypeScript decorators are elided. They will be emitted as part of visitClassDeclaration.
                 // falls through
-                case 254 /* TypeAliasDeclaration */:
+                case 255 /* TypeAliasDeclaration */:
                     // TypeScript type-only declarations are elided.
                     return undefined;
-                case 163 /* PropertyDeclaration */:
+                case 164 /* 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 259 /* NamespaceExportDeclaration */:
+                case 260 /* NamespaceExportDeclaration */:
                     // TypeScript namespace export declarations are elided.
                     return undefined;
-                case 166 /* Constructor */:
+                case 167 /* Constructor */:
                     return visitConstructor(node);
-                case 253 /* InterfaceDeclaration */:
+                case 254 /* 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 252 /* ClassDeclaration */:
+                case 253 /* ClassDeclaration */:
                     // This may be a class declaration with TypeScript syntax extensions.
                     //
                     // TypeScript class syntax extensions include:
@@ -83785,7 +86170,7 @@ var ts;
                     // - index signatures
                     // - method overload signatures
                     return visitClassDeclaration(node);
-                case 221 /* ClassExpression */:
+                case 222 /* ClassExpression */:
                     // This may be a class expression with TypeScript syntax extensions.
                     //
                     // TypeScript class syntax extensions include:
@@ -83795,35 +86180,35 @@ var ts;
                     // - index signatures
                     // - method overload signatures
                     return visitClassExpression(node);
-                case 286 /* HeritageClause */:
+                case 287 /* HeritageClause */:
                     // This may be a heritage clause with TypeScript syntax extensions.
                     //
                     // TypeScript heritage clause extensions include:
                     // - `implements` clause
                     return visitHeritageClause(node);
-                case 223 /* ExpressionWithTypeArguments */:
+                case 224 /* ExpressionWithTypeArguments */:
                     // TypeScript supports type arguments on an expression in an `extends` heritage clause.
                     return visitExpressionWithTypeArguments(node);
-                case 165 /* MethodDeclaration */:
+                case 166 /* MethodDeclaration */:
                     // TypeScript method declarations may have decorators, modifiers
                     // or type annotations.
                     return visitMethodDeclaration(node);
-                case 167 /* GetAccessor */:
+                case 168 /* GetAccessor */:
                     // Get Accessors can have TypeScript modifiers, decorators, and type annotations.
                     return visitGetAccessor(node);
-                case 168 /* SetAccessor */:
+                case 169 /* SetAccessor */:
                     // Set Accessors can have TypeScript modifiers and type annotations.
                     return visitSetAccessor(node);
-                case 251 /* FunctionDeclaration */:
+                case 252 /* FunctionDeclaration */:
                     // Typescript function declarations can have modifiers, decorators, and type annotations.
                     return visitFunctionDeclaration(node);
-                case 208 /* FunctionExpression */:
+                case 209 /* FunctionExpression */:
                     // TypeScript function expressions can have modifiers and type annotations.
                     return visitFunctionExpression(node);
-                case 209 /* ArrowFunction */:
+                case 210 /* ArrowFunction */:
                     // TypeScript arrow functions can have modifiers and type annotations.
                     return visitArrowFunction(node);
-                case 160 /* Parameter */:
+                case 161 /* Parameter */:
                     // This may be a parameter declaration with TypeScript syntax extensions.
                     //
                     // TypeScript parameter declaration syntax extensions include:
@@ -83833,40 +86218,40 @@ var ts;
                     // - type annotations
                     // - this parameters
                     return visitParameter(node);
-                case 207 /* ParenthesizedExpression */:
+                case 208 /* ParenthesizedExpression */:
                     // ParenthesizedExpressions are TypeScript if their expression is a
                     // TypeAssertion or AsExpression
                     return visitParenthesizedExpression(node);
-                case 206 /* TypeAssertionExpression */:
-                case 224 /* AsExpression */:
+                case 207 /* TypeAssertionExpression */:
+                case 225 /* AsExpression */:
                     // TypeScript type assertions are removed, but their subtrees are preserved.
                     return visitAssertionExpression(node);
-                case 203 /* CallExpression */:
+                case 204 /* CallExpression */:
                     return visitCallExpression(node);
-                case 204 /* NewExpression */:
+                case 205 /* NewExpression */:
                     return visitNewExpression(node);
-                case 205 /* TaggedTemplateExpression */:
+                case 206 /* TaggedTemplateExpression */:
                     return visitTaggedTemplateExpression(node);
-                case 225 /* NonNullExpression */:
+                case 226 /* NonNullExpression */:
                     // TypeScript non-null expressions are removed, but their subtrees are preserved.
                     return visitNonNullExpression(node);
-                case 255 /* EnumDeclaration */:
+                case 256 /* EnumDeclaration */:
                     // TypeScript enum declarations do not exist in ES6 and must be rewritten.
                     return visitEnumDeclaration(node);
-                case 232 /* VariableStatement */:
+                case 233 /* VariableStatement */:
                     // TypeScript namespace exports for variable statements must be transformed.
                     return visitVariableStatement(node);
-                case 249 /* VariableDeclaration */:
+                case 250 /* VariableDeclaration */:
                     return visitVariableDeclaration(node);
-                case 256 /* ModuleDeclaration */:
+                case 257 /* ModuleDeclaration */:
                     // TypeScript namespace declarations must be transformed.
                     return visitModuleDeclaration(node);
-                case 260 /* ImportEqualsDeclaration */:
+                case 261 /* ImportEqualsDeclaration */:
                     // TypeScript namespace or external module import.
                     return visitImportEqualsDeclaration(node);
-                case 274 /* JsxSelfClosingElement */:
+                case 275 /* JsxSelfClosingElement */:
                     return visitJsxSelfClosingElement(node);
-                case 275 /* JsxOpeningElement */:
+                case 276 /* JsxOpeningElement */:
                     return visitJsxJsxOpeningElement(node);
                 default:
                     // node contains some other TypeScript syntax
@@ -83920,7 +86305,7 @@ var ts;
             return facts;
         }
         function hasTypeScriptClassSyntax(node) {
-            return !!(node.transformFlags & 2048 /* ContainsTypeScriptClassSyntax */);
+            return !!(node.transformFlags & 4096 /* ContainsTypeScriptClassSyntax */);
         }
         function isClassLikeDeclarationWithTypeScriptSyntax(node) {
             return ts.some(node.decorators)
@@ -84275,12 +86660,12 @@ var ts;
          */
         function getAllDecoratorsOfClassElement(node, member) {
             switch (member.kind) {
-                case 167 /* GetAccessor */:
-                case 168 /* SetAccessor */:
+                case 168 /* GetAccessor */:
+                case 169 /* SetAccessor */:
                     return getAllDecoratorsOfAccessors(node, member);
-                case 165 /* MethodDeclaration */:
+                case 166 /* MethodDeclaration */:
                     return getAllDecoratorsOfMethod(member);
-                case 163 /* PropertyDeclaration */:
+                case 164 /* PropertyDeclaration */:
                     return getAllDecoratorsOfProperty(member);
                 default:
                     return undefined;
@@ -84433,7 +86818,7 @@ var ts;
             var prefix = getClassMemberPrefix(node, member);
             var memberName = getExpressionForPropertyName(member, /*generateNameForComputedPropertyName*/ true);
             var descriptor = languageVersion > 0 /* ES3 */
-                ? member.kind === 163 /* PropertyDeclaration */
+                ? member.kind === 164 /* 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()
@@ -84557,10 +86942,10 @@ var ts;
          */
         function shouldAddTypeMetadata(node) {
             var kind = node.kind;
-            return kind === 165 /* MethodDeclaration */
-                || kind === 167 /* GetAccessor */
-                || kind === 168 /* SetAccessor */
-                || kind === 163 /* PropertyDeclaration */;
+            return kind === 166 /* MethodDeclaration */
+                || kind === 168 /* GetAccessor */
+                || kind === 169 /* SetAccessor */
+                || kind === 164 /* PropertyDeclaration */;
         }
         /**
          * Determines whether to emit the "design:returntype" metadata based on the node's kind.
@@ -84570,7 +86955,7 @@ var ts;
          * @param node The node to test.
          */
         function shouldAddReturnTypeMetadata(node) {
-            return node.kind === 165 /* MethodDeclaration */;
+            return node.kind === 166 /* MethodDeclaration */;
         }
         /**
          * Determines whether to emit the "design:paramtypes" metadata based on the node's kind.
@@ -84581,12 +86966,12 @@ var ts;
          */
         function shouldAddParamTypesMetadata(node) {
             switch (node.kind) {
-                case 252 /* ClassDeclaration */:
-                case 221 /* ClassExpression */:
+                case 253 /* ClassDeclaration */:
+                case 222 /* ClassExpression */:
                     return ts.getFirstConstructorWithBody(node) !== undefined;
-                case 165 /* MethodDeclaration */:
-                case 167 /* GetAccessor */:
-                case 168 /* SetAccessor */:
+                case 166 /* MethodDeclaration */:
+                case 168 /* GetAccessor */:
+                case 169 /* SetAccessor */:
                     return true;
             }
             return false;
@@ -84603,15 +86988,15 @@ var ts;
          */
         function serializeTypeOfNode(node) {
             switch (node.kind) {
-                case 163 /* PropertyDeclaration */:
-                case 160 /* Parameter */:
+                case 164 /* PropertyDeclaration */:
+                case 161 /* Parameter */:
                     return serializeTypeNode(node.type);
-                case 168 /* SetAccessor */:
-                case 167 /* GetAccessor */:
+                case 169 /* SetAccessor */:
+                case 168 /* GetAccessor */:
                     return serializeTypeNode(getAccessorTypeNode(node));
-                case 252 /* ClassDeclaration */:
-                case 221 /* ClassExpression */:
-                case 165 /* MethodDeclaration */:
+                case 253 /* ClassDeclaration */:
+                case 222 /* ClassExpression */:
+                case 166 /* MethodDeclaration */:
                     return factory.createIdentifier("Function");
                 default:
                     return factory.createVoidZero();
@@ -84648,7 +87033,7 @@ var ts;
             return factory.createArrayLiteralExpression(expressions);
         }
         function getParametersOfDecoratedDeclaration(node, container) {
-            if (container && node.kind === 167 /* GetAccessor */) {
+            if (container && node.kind === 168 /* GetAccessor */) {
                 var setAccessor = ts.getAllAccessorDeclarations(container.members, node).setAccessor;
                 if (setAccessor) {
                     return setAccessor.parameters;
@@ -84697,27 +87082,27 @@ var ts;
                 case 150 /* UndefinedKeyword */:
                 case 141 /* NeverKeyword */:
                     return factory.createVoidZero();
-                case 186 /* ParenthesizedType */:
+                case 187 /* ParenthesizedType */:
                     return serializeTypeNode(node.type);
-                case 174 /* FunctionType */:
-                case 175 /* ConstructorType */:
+                case 175 /* FunctionType */:
+                case 176 /* ConstructorType */:
                     return factory.createIdentifier("Function");
-                case 178 /* ArrayType */:
-                case 179 /* TupleType */:
+                case 179 /* ArrayType */:
+                case 180 /* TupleType */:
                     return factory.createIdentifier("Array");
-                case 172 /* TypePredicate */:
+                case 173 /* TypePredicate */:
                 case 131 /* BooleanKeyword */:
                     return factory.createIdentifier("Boolean");
                 case 147 /* StringKeyword */:
                     return factory.createIdentifier("String");
                 case 145 /* ObjectKeyword */:
                     return factory.createIdentifier("Object");
-                case 191 /* LiteralType */:
+                case 192 /* LiteralType */:
                     switch (node.literal.kind) {
                         case 10 /* StringLiteral */:
                         case 14 /* NoSubstitutionTemplateLiteral */:
                             return factory.createIdentifier("String");
-                        case 214 /* PrefixUnaryExpression */:
+                        case 215 /* PrefixUnaryExpression */:
                         case 8 /* NumericLiteral */:
                             return factory.createIdentifier("Number");
                         case 9 /* BigIntLiteral */:
@@ -84738,37 +87123,37 @@ var ts;
                     return languageVersion < 2 /* ES2015 */
                         ? getGlobalSymbolNameWithFallback()
                         : factory.createIdentifier("Symbol");
-                case 173 /* TypeReference */:
+                case 174 /* TypeReference */:
                     return serializeTypeReferenceNode(node);
-                case 183 /* IntersectionType */:
-                case 182 /* UnionType */:
+                case 184 /* IntersectionType */:
+                case 183 /* UnionType */:
                     return serializeTypeList(node.types);
-                case 184 /* ConditionalType */:
+                case 185 /* ConditionalType */:
                     return serializeTypeList([node.trueType, node.falseType]);
-                case 188 /* TypeOperator */:
+                case 189 /* TypeOperator */:
                     if (node.operator === 142 /* ReadonlyKeyword */) {
                         return serializeTypeNode(node.type);
                     }
                     break;
-                case 176 /* TypeQuery */:
-                case 189 /* IndexedAccessType */:
-                case 190 /* MappedType */:
-                case 177 /* TypeLiteral */:
+                case 177 /* TypeQuery */:
+                case 190 /* IndexedAccessType */:
+                case 191 /* MappedType */:
+                case 178 /* TypeLiteral */:
                 case 128 /* AnyKeyword */:
                 case 152 /* UnknownKeyword */:
-                case 187 /* ThisType */:
-                case 195 /* ImportType */:
+                case 188 /* ThisType */:
+                case 196 /* ImportType */:
                     break;
                 // handle JSDoc types from an invalid parse
-                case 303 /* JSDocAllType */:
-                case 304 /* JSDocUnknownType */:
-                case 308 /* JSDocFunctionType */:
-                case 309 /* JSDocVariadicType */:
-                case 310 /* JSDocNamepathType */:
+                case 304 /* JSDocAllType */:
+                case 305 /* JSDocUnknownType */:
+                case 309 /* JSDocFunctionType */:
+                case 310 /* JSDocVariadicType */:
+                case 311 /* JSDocNamepathType */:
                     break;
-                case 305 /* JSDocNullableType */:
-                case 306 /* JSDocNonNullableType */:
-                case 307 /* JSDocOptionalType */:
+                case 306 /* JSDocNullableType */:
+                case 307 /* JSDocNonNullableType */:
+                case 308 /* JSDocOptionalType */:
                     return serializeTypeNode(node.type);
                 default:
                     return ts.Debug.failBadSyntaxKind(node);
@@ -84781,13 +87166,13 @@ var ts;
             var serializedUnion;
             for (var _i = 0, types_24 = types; _i < types_24.length; _i++) {
                 var typeNode = types_24[_i];
-                while (typeNode.kind === 186 /* ParenthesizedType */) {
+                while (typeNode.kind === 187 /* ParenthesizedType */) {
                     typeNode = typeNode.type; // Skip parens if need be
                 }
                 if (typeNode.kind === 141 /* NeverKeyword */) {
                     continue; // Always elide `never` from the union/intersection if possible
                 }
-                if (!strictNullChecks && (typeNode.kind === 191 /* LiteralType */ && typeNode.literal.kind === 103 /* NullKeyword */ || typeNode.kind === 150 /* UndefinedKeyword */)) {
+                if (!strictNullChecks && (typeNode.kind === 192 /* 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);
@@ -84897,7 +87282,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 157 /* QualifiedName */:
+                case 158 /* QualifiedName */:
                     return serializeQualifiedNameAsExpression(node);
             }
         }
@@ -85470,12 +87855,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 === 297 /* SourceFile */ ? 0 /* None */ : 1 /* Let */));
+            ], currentLexicalScope.kind === 298 /* 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 === 255 /* EnumDeclaration */) {
+                if (node.kind === 256 /* EnumDeclaration */) {
                     ts.setSourceMapRange(statement.declarationList, node);
                 }
                 else {
@@ -85600,7 +87985,7 @@ var ts;
             var statementsLocation;
             var blockLocation;
             if (node.body) {
-                if (node.body.kind === 257 /* ModuleBlock */) {
+                if (node.body.kind === 258 /* ModuleBlock */) {
                     saveStateAndInvoke(node.body, function (body) { return ts.addRange(statements, ts.visitNodes(body.statements, namespaceElementVisitor, ts.isStatement)); });
                     statementsLocation = node.body.statements;
                     blockLocation = node.body;
@@ -85647,13 +88032,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 !== 257 /* ModuleBlock */) {
+            if (!node.body || node.body.kind !== 258 /* ModuleBlock */) {
                 ts.setEmitFlags(block, ts.getEmitFlags(block) | 1536 /* NoComments */);
             }
             return block;
         }
         function getInnerMostModuleDeclarationFromDottedModule(moduleDeclaration) {
-            if (moduleDeclaration.body.kind === 256 /* ModuleDeclaration */) {
+            if (moduleDeclaration.body.kind === 257 /* ModuleDeclaration */) {
                 var recursiveInnerModule = getInnerMostModuleDeclarationFromDottedModule(moduleDeclaration.body);
                 return recursiveInnerModule || moduleDeclaration.body;
             }
@@ -85703,7 +88088,7 @@ var ts;
          * @param node The named import bindings node.
          */
         function visitNamedImportBindings(node) {
-            if (node.kind === 263 /* NamespaceImport */) {
+            if (node.kind === 264 /* NamespaceImport */) {
                 // Elide a namespace import if it is not referenced.
                 return resolver.isReferencedAliasDeclaration(node) ? node : undefined;
             }
@@ -85956,16 +88341,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(289 /* ShorthandPropertyAssignment */);
+                context.enableSubstitution(290 /* ShorthandPropertyAssignment */);
                 // We need to be notified when entering and exiting namespaces.
-                context.enableEmitNotification(256 /* ModuleDeclaration */);
+                context.enableEmitNotification(257 /* ModuleDeclaration */);
             }
         }
         function isTransformedModuleDeclaration(node) {
-            return ts.getOriginalNode(node).kind === 256 /* ModuleDeclaration */;
+            return ts.getOriginalNode(node).kind === 257 /* ModuleDeclaration */;
         }
         function isTransformedEnumDeclaration(node) {
-            return ts.getOriginalNode(node).kind === 255 /* EnumDeclaration */;
+            return ts.getOriginalNode(node).kind === 256 /* EnumDeclaration */;
         }
         /**
          * Hook for node emit.
@@ -86026,9 +88411,9 @@ var ts;
             switch (node.kind) {
                 case 78 /* Identifier */:
                     return substituteExpressionIdentifier(node);
-                case 201 /* PropertyAccessExpression */:
+                case 202 /* PropertyAccessExpression */:
                     return substitutePropertyAccessExpression(node);
-                case 202 /* ElementAccessExpression */:
+                case 203 /* ElementAccessExpression */:
                     return substituteElementAccessExpression(node);
             }
             return node;
@@ -86050,10 +88435,10 @@ var ts;
                     if (declaration) {
                         var classAlias = classAliases[declaration.id]; // TODO: GH#18217
                         if (classAlias) {
-                            var clone_1 = factory.cloneNode(classAlias);
-                            ts.setSourceMapRange(clone_1, node);
-                            ts.setCommentRange(clone_1, node);
-                            return clone_1;
+                            var clone_2 = factory.cloneNode(classAlias);
+                            ts.setSourceMapRange(clone_2, node);
+                            ts.setCommentRange(clone_2, node);
+                            return clone_2;
                         }
                     }
                 }
@@ -86066,9 +88451,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 !== 297 /* SourceFile */) {
-                    var substitute = (applicableSubstitutions & 2 /* NamespaceExports */ && container.kind === 256 /* ModuleDeclaration */) ||
-                        (applicableSubstitutions & 8 /* NonQualifiedEnumMembers */ && container.kind === 255 /* EnumDeclaration */);
+                if (container && container.kind !== 298 /* SourceFile */) {
+                    var substitute = (applicableSubstitutions & 2 /* NamespaceExports */ && container.kind === 257 /* ModuleDeclaration */) ||
+                        (applicableSubstitutions & 8 /* NonQualifiedEnumMembers */ && container.kind === 256 /* EnumDeclaration */);
                     if (substitute) {
                         return ts.setTextRange(factory.createPropertyAccessExpression(factory.getGeneratedNameForNode(container), node), 
                         /*location*/ node);
@@ -86120,10 +88505,12 @@ var ts;
          */
         ClassPropertySubstitutionFlags[ClassPropertySubstitutionFlags["ClassAliases"] = 1] = "ClassAliases";
     })(ClassPropertySubstitutionFlags || (ClassPropertySubstitutionFlags = {}));
-    var PrivateIdentifierPlacement;
-    (function (PrivateIdentifierPlacement) {
-        PrivateIdentifierPlacement[PrivateIdentifierPlacement["InstanceField"] = 0] = "InstanceField";
-    })(PrivateIdentifierPlacement || (PrivateIdentifierPlacement = {}));
+    var PrivateIdentifierKind;
+    (function (PrivateIdentifierKind) {
+        PrivateIdentifierKind["Field"] = "f";
+        PrivateIdentifierKind["Method"] = "m";
+        PrivateIdentifierKind["Accessor"] = "a";
+    })(PrivateIdentifierKind = ts.PrivateIdentifierKind || (ts.PrivateIdentifierKind = {}));
     /**
      * Transforms ECMAScript Class Syntax.
      * TypeScript parameter property syntax is transformed in the TypeScript transformer.
@@ -86132,11 +88519,12 @@ var ts;
      * When --useDefineForClassFields is on, this transforms to ECMAScript semantics, with Object.defineProperty.
      */
     function transformClassFields(context) {
-        var factory = context.factory, hoistVariableDeclaration = context.hoistVariableDeclaration, endLexicalEnvironment = context.endLexicalEnvironment, resumeLexicalEnvironment = context.resumeLexicalEnvironment;
+        var factory = context.factory, hoistVariableDeclaration = context.hoistVariableDeclaration, endLexicalEnvironment = context.endLexicalEnvironment, resumeLexicalEnvironment = context.resumeLexicalEnvironment, addBlockScopedVariable = context.addBlockScopedVariable;
         var resolver = context.getEmitResolver();
         var compilerOptions = context.getCompilerOptions();
         var languageVersion = ts.getEmitScriptTarget(compilerOptions);
-        var shouldTransformPrivateFields = languageVersion < 99 /* ESNext */;
+        var useDefineForClassFields = ts.getUseDefineForClassFields(compilerOptions);
+        var shouldTransformPrivateElements = languageVersion < 99 /* ESNext */;
         var previousOnSubstituteNode = context.onSubstituteNode;
         context.onSubstituteNode = onSubstituteNode;
         var enabledSubstitutions;
@@ -86157,7 +88545,7 @@ var ts;
         function transformSourceFile(node) {
             var options = context.getCompilerOptions();
             if (node.isDeclarationFile
-                || options.useDefineForClassFields && options.target === 99 /* ESNext */) {
+                || useDefineForClassFields && options.target === 99 /* ESNext */) {
                 return node;
             }
             var visited = ts.visitEachChild(node, visitor, context);
@@ -86165,41 +88553,41 @@ var ts;
             return visited;
         }
         function visitor(node) {
-            if (!(node.transformFlags & 4194304 /* ContainsClassFields */))
+            if (!(node.transformFlags & 8388608 /* ContainsClassFields */))
                 return node;
             switch (node.kind) {
-                case 221 /* ClassExpression */:
-                case 252 /* ClassDeclaration */:
+                case 222 /* ClassExpression */:
+                case 253 /* ClassDeclaration */:
                     return visitClassLike(node);
-                case 163 /* PropertyDeclaration */:
+                case 164 /* PropertyDeclaration */:
                     return visitPropertyDeclaration(node);
-                case 232 /* VariableStatement */:
+                case 233 /* VariableStatement */:
                     return visitVariableStatement(node);
-                case 201 /* PropertyAccessExpression */:
+                case 202 /* PropertyAccessExpression */:
                     return visitPropertyAccessExpression(node);
-                case 214 /* PrefixUnaryExpression */:
+                case 215 /* PrefixUnaryExpression */:
                     return visitPrefixUnaryExpression(node);
-                case 215 /* PostfixUnaryExpression */:
+                case 216 /* PostfixUnaryExpression */:
                     return visitPostfixUnaryExpression(node, /*valueIsDiscarded*/ false);
-                case 203 /* CallExpression */:
+                case 204 /* CallExpression */:
                     return visitCallExpression(node);
-                case 216 /* BinaryExpression */:
+                case 217 /* BinaryExpression */:
                     return visitBinaryExpression(node);
                 case 79 /* PrivateIdentifier */:
                     return visitPrivateIdentifier(node);
-                case 233 /* ExpressionStatement */:
+                case 234 /* ExpressionStatement */:
                     return visitExpressionStatement(node);
-                case 237 /* ForStatement */:
+                case 238 /* ForStatement */:
                     return visitForStatement(node);
-                case 205 /* TaggedTemplateExpression */:
+                case 206 /* TaggedTemplateExpression */:
                     return visitTaggedTemplateExpression(node);
             }
             return ts.visitEachChild(node, visitor, context);
         }
         function visitorDestructuringTarget(node) {
             switch (node.kind) {
-                case 200 /* ObjectLiteralExpression */:
-                case 199 /* ArrayLiteralExpression */:
+                case 201 /* ObjectLiteralExpression */:
+                case 200 /* ArrayLiteralExpression */:
                     return visitAssignmentPattern(node);
                 default:
                     return visitor(node);
@@ -86210,7 +88598,7 @@ var ts;
          * Replace it with an empty identifier to indicate a problem with the code.
          */
         function visitPrivateIdentifier(node) {
-            if (!shouldTransformPrivateFields) {
+            if (!shouldTransformPrivateElements) {
                 return node;
             }
             return ts.setOriginalNode(factory.createIdentifier(""), node);
@@ -86222,20 +88610,19 @@ var ts;
          */
         function classElementVisitor(node) {
             switch (node.kind) {
-                case 166 /* Constructor */:
+                case 167 /* Constructor */:
                     // Constructors for classes using class fields are transformed in
                     // `visitClassDeclaration` or `visitClassExpression`.
                     return undefined;
-                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 163 /* PropertyDeclaration */:
+                case 168 /* GetAccessor */:
+                case 169 /* SetAccessor */:
+                case 166 /* MethodDeclaration */:
+                    return visitMethodOrAccessorDeclaration(node);
+                case 164 /* PropertyDeclaration */:
                     return visitPropertyDeclaration(node);
-                case 158 /* ComputedPropertyName */:
+                case 159 /* ComputedPropertyName */:
                     return visitComputedPropertyName(node);
-                case 229 /* SemicolonClassElement */:
+                case 230 /* SemicolonClassElement */:
                     return node;
                 default:
                     return visitor(node);
@@ -86260,44 +88647,96 @@ var ts;
             }
             return node;
         }
+        function visitMethodOrAccessorDeclaration(node) {
+            ts.Debug.assert(!ts.some(node.decorators));
+            if (!shouldTransformPrivateElements || !ts.isPrivateIdentifier(node.name)) {
+                return ts.visitEachChild(node, classElementVisitor, context);
+            }
+            // leave invalid code untransformed
+            var info = accessPrivateIdentifier(node.name);
+            ts.Debug.assert(info, "Undeclared private name for property declaration.");
+            if (!info.isValid) {
+                return node;
+            }
+            var functionName = getHoistedFunctionName(node);
+            if (functionName) {
+                getPendingExpressions().push(factory.createAssignment(functionName, factory.createFunctionExpression(ts.filter(node.modifiers, function (m) { return !ts.isStaticModifier(m); }), node.asteriskToken, functionName, 
+                /* typeParameters */ undefined, ts.visitParameterList(node.parameters, classElementVisitor, context), 
+                /* type */ undefined, ts.visitFunctionBody(node.body, classElementVisitor, context))));
+            }
+            // remove method declaration from class
+            return undefined;
+        }
+        function getHoistedFunctionName(node) {
+            ts.Debug.assert(ts.isPrivateIdentifier(node.name));
+            var info = accessPrivateIdentifier(node.name);
+            ts.Debug.assert(info, "Undeclared private name for property declaration.");
+            if (info.kind === "m" /* Method */) {
+                return info.methodName;
+            }
+            if (info.kind === "a" /* Accessor */) {
+                if (ts.isGetAccessor(node)) {
+                    return info.getterName;
+                }
+                if (ts.isSetAccessor(node)) {
+                    return info.setterName;
+                }
+            }
+        }
         function visitPropertyDeclaration(node) {
             ts.Debug.assert(!ts.some(node.decorators));
-            if (!shouldTransformPrivateFields && ts.isPrivateIdentifier(node.name)) {
-                // Initializer is elided as the field is initialized in transformConstructor.
-                return factory.updatePropertyDeclaration(node, 
-                /*decorators*/ undefined, ts.visitNodes(node.modifiers, visitor, ts.isModifier), node.name, 
-                /*questionOrExclamationToken*/ undefined, 
-                /*type*/ undefined, 
-                /*initializer*/ undefined);
+            if (ts.isPrivateIdentifier(node.name)) {
+                if (!shouldTransformPrivateElements) {
+                    // Initializer is elided as the field is initialized in transformConstructor.
+                    return factory.updatePropertyDeclaration(node, 
+                    /*decorators*/ undefined, ts.visitNodes(node.modifiers, visitor, ts.isModifier), node.name, 
+                    /*questionOrExclamationToken*/ undefined, 
+                    /*type*/ undefined, 
+                    /*initializer*/ undefined);
+                }
+                // leave invalid code untransformed
+                var info = accessPrivateIdentifier(node.name);
+                ts.Debug.assert(info, "Undeclared private name for property declaration.");
+                if (!info.isValid) {
+                    return node;
+                }
             }
             // Create a temporary variable to store a computed property name (if necessary).
             // If it's not inlineable, then we emit an expression after the class which assigns
             // the property name to the temporary variable.
-            var expr = getPropertyNameExpressionIfNeeded(node.name, !!node.initializer || !!context.getCompilerOptions().useDefineForClassFields);
+            var expr = getPropertyNameExpressionIfNeeded(node.name, !!node.initializer || useDefineForClassFields);
             if (expr && !ts.isSimpleInlineableExpression(expr)) {
                 getPendingExpressions().push(expr);
             }
             return undefined;
         }
         function createPrivateIdentifierAccess(info, receiver) {
-            receiver = ts.visitNode(receiver, visitor, ts.isExpression);
-            switch (info.placement) {
-                case 0 /* InstanceField */:
-                    return context.getEmitHelperFactory().createClassPrivateFieldGetHelper(ts.nodeIsSynthesized(receiver) ? receiver : factory.cloneNode(receiver), info.weakMapName);
-                default: return ts.Debug.fail("Unexpected private identifier placement");
+            return createPrivateIdentifierAccessHelper(info, ts.visitNode(receiver, visitor, ts.isExpression));
+        }
+        function createPrivateIdentifierAccessHelper(info, receiver) {
+            ts.setCommentRange(receiver, ts.moveRangePos(receiver, -1));
+            switch (info.kind) {
+                case "a" /* Accessor */:
+                    return context.getEmitHelperFactory().createClassPrivateFieldGetHelper(receiver, info.brandCheckIdentifier, info.kind, info.getterName);
+                case "m" /* Method */:
+                    return context.getEmitHelperFactory().createClassPrivateFieldGetHelper(receiver, info.brandCheckIdentifier, info.kind, info.methodName);
+                case "f" /* Field */:
+                    return context.getEmitHelperFactory().createClassPrivateFieldGetHelper(receiver, info.brandCheckIdentifier, info.kind, info.variableName);
+                default:
+                    ts.Debug.assertNever(info, "Unknown private element type");
             }
         }
         function visitPropertyAccessExpression(node) {
-            if (shouldTransformPrivateFields && ts.isPrivateIdentifier(node.name)) {
+            if (shouldTransformPrivateElements && ts.isPrivateIdentifier(node.name)) {
                 var privateIdentifierInfo = accessPrivateIdentifier(node.name);
                 if (privateIdentifierInfo) {
-                    return ts.setOriginalNode(createPrivateIdentifierAccess(privateIdentifierInfo, node.expression), node);
+                    return ts.setTextRange(ts.setOriginalNode(createPrivateIdentifierAccess(privateIdentifierInfo, node.expression), node), node);
                 }
             }
             return ts.visitEachChild(node, visitor, context);
         }
         function visitPrefixUnaryExpression(node) {
-            if (shouldTransformPrivateFields && ts.isPrivateIdentifierPropertyAccessExpression(node.operand)) {
+            if (shouldTransformPrivateElements && ts.isPrivateIdentifierPropertyAccessExpression(node.operand)) {
                 var operator = node.operator === 45 /* PlusPlusToken */ ?
                     39 /* PlusToken */ : node.operator === 46 /* MinusMinusToken */ ?
                     40 /* MinusToken */ : undefined;
@@ -86312,7 +88751,7 @@ var ts;
             return ts.visitEachChild(node, visitor, context);
         }
         function visitPostfixUnaryExpression(node, valueIsDiscarded) {
-            if (shouldTransformPrivateFields && ts.isPrivateIdentifierPropertyAccessExpression(node.operand)) {
+            if (shouldTransformPrivateElements && ts.isPrivateIdentifierPropertyAccessExpression(node.operand)) {
                 var operator = node.operator === 45 /* PlusPlusToken */ ?
                     39 /* PlusToken */ : node.operator === 46 /* MinusMinusToken */ ?
                     40 /* MinusToken */ : undefined;
@@ -86333,7 +88772,7 @@ var ts;
         }
         function visitForStatement(node) {
             if (node.incrementor && ts.isPostfixUnaryExpression(node.incrementor)) {
-                return factory.updateForStatement(node, ts.visitNode(node.initializer, visitor, ts.isForInitializer), ts.visitNode(node.condition, visitor, ts.isExpression), visitPostfixUnaryExpression(node.incrementor, /*valueIsDiscarded*/ true), ts.visitNode(node.statement, visitor, ts.isStatement));
+                return factory.updateForStatement(node, ts.visitNode(node.initializer, visitor, ts.isForInitializer), ts.visitNode(node.condition, visitor, ts.isExpression), visitPostfixUnaryExpression(node.incrementor, /*valueIsDiscarded*/ true), ts.visitIterationBody(node.statement, visitor, context));
             }
             return ts.visitEachChild(node, visitor, context);
         }
@@ -86353,7 +88792,7 @@ var ts;
             return { readExpression: readExpression, initializeExpression: initializeExpression };
         }
         function visitCallExpression(node) {
-            if (shouldTransformPrivateFields && ts.isPrivateIdentifierPropertyAccessExpression(node.expression)) {
+            if (shouldTransformPrivateElements && ts.isPrivateIdentifierPropertyAccessExpression(node.expression)) {
                 // Transform call expressions of private names to properly bind the `this` parameter.
                 var _a = factory.createCallBinding(node.expression, hoistVariableDeclaration, languageVersion), thisArg = _a.thisArg, target = _a.target;
                 if (ts.isCallChain(node)) {
@@ -86367,7 +88806,7 @@ var ts;
             return ts.visitEachChild(node, visitor, context);
         }
         function visitTaggedTemplateExpression(node) {
-            if (shouldTransformPrivateFields && ts.isPrivateIdentifierPropertyAccessExpression(node.tag)) {
+            if (shouldTransformPrivateElements && ts.isPrivateIdentifierPropertyAccessExpression(node.tag)) {
                 // Bind the `this` correctly for tagged template literals when the tag is a private identifier property access.
                 var _a = factory.createCallBinding(node.tag, hoistVariableDeclaration, languageVersion), thisArg = _a.thisArg, target = _a.target;
                 return factory.updateTaggedTemplateExpression(node, factory.createCallExpression(factory.createPropertyAccessExpression(ts.visitNode(target, visitor), "bind"), 
@@ -86377,7 +88816,7 @@ var ts;
             return ts.visitEachChild(node, visitor, context);
         }
         function visitBinaryExpression(node) {
-            if (shouldTransformPrivateFields) {
+            if (shouldTransformPrivateElements) {
                 if (ts.isDestructuringAssignment(node)) {
                     var savedPendingExpressions = pendingExpressions;
                     pendingExpressions = undefined;
@@ -86391,29 +88830,31 @@ var ts;
                 if (ts.isAssignmentExpression(node) && ts.isPrivateIdentifierPropertyAccessExpression(node.left)) {
                     var info = accessPrivateIdentifier(node.left.name);
                     if (info) {
-                        return ts.setOriginalNode(createPrivateIdentifierAssignment(info, node.left.expression, node.right, node.operatorToken.kind), node);
+                        return ts.setTextRange(ts.setOriginalNode(createPrivateIdentifierAssignment(info, node.left.expression, node.right, node.operatorToken.kind), node), node);
                     }
                 }
             }
             return ts.visitEachChild(node, visitor, context);
         }
         function createPrivateIdentifierAssignment(info, receiver, right, operator) {
-            switch (info.placement) {
-                case 0 /* InstanceField */: {
-                    return createPrivateIdentifierInstanceFieldAssignment(info, receiver, right, operator);
-                }
-                default: return ts.Debug.fail("Unexpected private identifier placement");
-            }
-        }
-        function createPrivateIdentifierInstanceFieldAssignment(info, receiver, right, operator) {
             receiver = ts.visitNode(receiver, visitor, ts.isExpression);
             right = ts.visitNode(right, visitor, ts.isExpression);
             if (ts.isCompoundAssignment(operator)) {
                 var _a = createCopiableReceiverExpr(receiver), readExpression = _a.readExpression, initializeExpression = _a.initializeExpression;
-                return context.getEmitHelperFactory().createClassPrivateFieldSetHelper(initializeExpression || readExpression, info.weakMapName, factory.createBinaryExpression(context.getEmitHelperFactory().createClassPrivateFieldGetHelper(readExpression, info.weakMapName), ts.getNonAssignmentOperatorForCompoundAssignment(operator), right));
-            }
-            else {
-                return context.getEmitHelperFactory().createClassPrivateFieldSetHelper(receiver, info.weakMapName, right);
+                receiver = initializeExpression || readExpression;
+                right = factory.createBinaryExpression(createPrivateIdentifierAccessHelper(info, readExpression), ts.getNonAssignmentOperatorForCompoundAssignment(operator), right);
+            }
+            ts.setCommentRange(receiver, ts.moveRangePos(receiver, -1));
+            switch (info.kind) {
+                case "a" /* Accessor */:
+                    return context.getEmitHelperFactory().createClassPrivateFieldSetHelper(receiver, info.brandCheckIdentifier, right, info.kind, info.setterName);
+                case "m" /* Method */:
+                    return context.getEmitHelperFactory().createClassPrivateFieldSetHelper(receiver, info.brandCheckIdentifier, right, info.kind, 
+                    /* f */ undefined);
+                case "f" /* Field */:
+                    return context.getEmitHelperFactory().createClassPrivateFieldSetHelper(receiver, info.brandCheckIdentifier, right, info.kind, info.variableName);
+                default:
+                    ts.Debug.assertNever(info, "Unknown private element type");
             }
         }
         /**
@@ -86422,25 +88863,43 @@ var ts;
         function visitClassLike(node) {
             var savedPendingExpressions = pendingExpressions;
             pendingExpressions = undefined;
-            if (shouldTransformPrivateFields) {
+            if (shouldTransformPrivateElements) {
                 startPrivateIdentifierEnvironment();
+                var name = ts.getNameOfDeclaration(node);
+                if (name && ts.isIdentifier(name)) {
+                    getPrivateIdentifierEnvironment().className = ts.idText(name);
+                }
+                var privateInstanceMethodsAndAccessors = getPrivateInstanceMethodsAndAccessors(node);
+                if (ts.some(privateInstanceMethodsAndAccessors)) {
+                    getPrivateIdentifierEnvironment().weakSetName = createHoistedVariableForClass("instances", privateInstanceMethodsAndAccessors[0].name);
+                }
             }
             var result = ts.isClassDeclaration(node) ?
                 visitClassDeclaration(node) :
                 visitClassExpression(node);
-            if (shouldTransformPrivateFields) {
+            if (shouldTransformPrivateElements) {
                 endPrivateIdentifierEnvironment();
             }
             pendingExpressions = savedPendingExpressions;
             return result;
         }
         function doesClassElementNeedTransform(node) {
-            return ts.isPropertyDeclaration(node) || (shouldTransformPrivateFields && node.name && ts.isPrivateIdentifier(node.name));
+            return ts.isPropertyDeclaration(node) || (shouldTransformPrivateElements && node.name && ts.isPrivateIdentifier(node.name));
+        }
+        function getPrivateInstanceMethodsAndAccessors(node) {
+            return ts.filter(node.members, ts.isNonStaticMethodOrAccessorWithPrivateName);
         }
         function visitClassDeclaration(node) {
             if (!ts.forEach(node.members, doesClassElementNeedTransform)) {
                 return ts.visitEachChild(node, visitor, context);
             }
+            var staticProperties = ts.getProperties(node, /*requireInitializer*/ false, /*isStatic*/ true);
+            var pendingPrivateStateAssignment;
+            if (shouldTransformPrivateElements && ts.some(node.members, function (m) { return ts.hasStaticModifier(m) && !!m.name && ts.isPrivateIdentifier(m.name); })) {
+                var temp = factory.createTempVariable(hoistVariableDeclaration, /* reservedInNestedScopes */ true);
+                getPrivateIdentifierEnvironment().classConstructor = factory.cloneNode(temp);
+                pendingPrivateStateAssignment = factory.createAssignment(temp, factory.getInternalName(node));
+            }
             var extendsClauseElement = ts.getEffectiveBaseTypeNode(node);
             var isDerivedClass = !!(extendsClauseElement && ts.skipOuterExpressions(extendsClauseElement.expression).kind !== 103 /* NullKeyword */);
             var statements = [
@@ -86448,6 +88907,9 @@ var ts;
                 /*decorators*/ undefined, node.modifiers, node.name, 
                 /*typeParameters*/ undefined, ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause), transformClassMembers(node, isDerivedClass))
             ];
+            if (pendingPrivateStateAssignment) {
+                getPendingExpressions().unshift(pendingPrivateStateAssignment);
+            }
             // Write any pending expressions from elided or moved computed property names
             if (ts.some(pendingExpressions)) {
                 statements.push(factory.createExpressionStatement(factory.inlineExpressions(pendingExpressions)));
@@ -86457,7 +88919,6 @@ var ts;
             // From ES6 specification:
             //      HasLexicalDeclaration (N) : Determines if the argument identifier has a binding in this environment record that was created using
             //                                  a lexical declaration such as a LexicalDeclaration or a ClassDeclaration.
-            var staticProperties = ts.getProperties(node, /*requireInitializer*/ true, /*isStatic*/ true);
             if (ts.some(staticProperties)) {
                 addPropertyStatements(statements, staticProperties, factory.getInternalName(node));
             }
@@ -86475,12 +88936,25 @@ var ts;
             // class declaration transformation. The VariableStatement visitor will insert
             // these statements after the class expression variable statement.
             var isDecoratedClassDeclaration = ts.isClassDeclaration(ts.getOriginalNode(node));
-            var staticProperties = ts.getProperties(node, /*requireInitializer*/ true, /*isStatic*/ true);
+            var staticProperties = ts.getProperties(node, /*requireInitializer*/ false, /*isStatic*/ true);
             var extendsClauseElement = ts.getEffectiveBaseTypeNode(node);
             var isDerivedClass = !!(extendsClauseElement && ts.skipOuterExpressions(extendsClauseElement.expression).kind !== 103 /* NullKeyword */);
+            var isClassWithConstructorReference = resolver.getNodeCheckFlags(node) & 16777216 /* ClassWithConstructorReference */;
+            var temp;
+            function createClassTempVar() {
+                var classCheckFlags = resolver.getNodeCheckFlags(node);
+                var isClassWithConstructorReference = classCheckFlags & 16777216 /* ClassWithConstructorReference */;
+                var requiresBlockScopedVar = classCheckFlags & 524288 /* BlockScopedBindingInLoop */;
+                return factory.createTempVariable(requiresBlockScopedVar ? addBlockScopedVariable : hoistVariableDeclaration, !!isClassWithConstructorReference);
+            }
+            if (shouldTransformPrivateElements && ts.some(node.members, function (m) { return ts.hasStaticModifier(m) && !!m.name && ts.isPrivateIdentifier(m.name); })) {
+                temp = createClassTempVar();
+                getPrivateIdentifierEnvironment().classConstructor = factory.cloneNode(temp);
+            }
             var classExpression = factory.updateClassExpression(node, ts.visitNodes(node.decorators, visitor, ts.isDecorator), node.modifiers, node.name, 
             /*typeParameters*/ undefined, ts.visitNodes(node.heritageClauses, visitor, ts.isHeritageClause), transformClassMembers(node, isDerivedClass));
-            if (ts.some(staticProperties) || ts.some(pendingExpressions)) {
+            var hasTransformableStatics = ts.some(staticProperties, function (p) { return !!p.initializer || (shouldTransformPrivateElements && ts.isPrivateIdentifier(p.name)); });
+            if (hasTransformableStatics || ts.some(pendingExpressions)) {
                 if (isDecoratedClassDeclaration) {
                     ts.Debug.assertIsDefined(pendingStatements, "Decorated classes transformed by TypeScript are expected to be within a variable declaration.");
                     // Write any pending expressions from elided or moved computed property names
@@ -86490,12 +88964,14 @@ var ts;
                     if (pendingStatements && ts.some(staticProperties)) {
                         addPropertyStatements(pendingStatements, staticProperties, factory.getInternalName(node));
                     }
+                    if (temp) {
+                        return factory.inlineExpressions([factory.createAssignment(temp, classExpression), temp]);
+                    }
                     return classExpression;
                 }
                 else {
                     var expressions = [];
-                    var isClassWithConstructorReference = resolver.getNodeCheckFlags(node) & 16777216 /* ClassWithConstructorReference */;
-                    var temp = factory.createTempVariable(hoistVariableDeclaration, !!isClassWithConstructorReference);
+                    temp || (temp = createClassTempVar());
                     if (isClassWithConstructorReference) {
                         // record an alias as the class name is not in scope for statics.
                         enableSubstitutionForClassAliases();
@@ -86517,14 +88993,17 @@ var ts;
             return classExpression;
         }
         function transformClassMembers(node, isDerivedClass) {
-            if (shouldTransformPrivateFields) {
+            if (shouldTransformPrivateElements) {
                 // Declare private names.
                 for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
                     var member = _a[_i];
-                    if (ts.isPrivateIdentifierPropertyDeclaration(member)) {
-                        addPrivateIdentifierToEnvironment(member.name);
+                    if (ts.isPrivateIdentifierClassElementDeclaration(member)) {
+                        addPrivateIdentifierToEnvironment(member);
                     }
                 }
+                if (ts.some(getPrivateInstanceMethodsAndAccessors(node))) {
+                    createBrandCheckWeakSetForPrivateMethods();
+                }
             }
             var members = [];
             var constructor = transformConstructor(node, isDerivedClass);
@@ -86534,21 +89013,27 @@ var ts;
             ts.addRange(members, ts.visitNodes(node.members, classElementVisitor, ts.isClassElement));
             return ts.setTextRange(factory.createNodeArray(members), /*location*/ node.members);
         }
-        function isPropertyDeclarationThatRequiresConstructorStatement(member) {
-            if (!ts.isPropertyDeclaration(member) || ts.hasStaticModifier(member) || ts.hasSyntacticModifier(ts.getOriginalNode(member), 128 /* Abstract */)) {
+        function createBrandCheckWeakSetForPrivateMethods() {
+            var weakSetName = getPrivateIdentifierEnvironment().weakSetName;
+            ts.Debug.assert(weakSetName, "weakSetName should be set in private identifier environment");
+            getPendingExpressions().push(factory.createAssignment(weakSetName, factory.createNewExpression(factory.createIdentifier("WeakSet"), 
+            /*typeArguments*/ undefined, [])));
+        }
+        function isClassElementThatRequiresConstructorStatement(member) {
+            if (ts.hasStaticModifier(member) || ts.hasSyntacticModifier(ts.getOriginalNode(member), 128 /* Abstract */)) {
                 return false;
             }
-            if (context.getCompilerOptions().useDefineForClassFields) {
+            if (useDefineForClassFields) {
                 // If we are using define semantics and targeting ESNext or higher,
                 // then we don't need to transform any class properties.
                 return languageVersion < 99 /* ESNext */;
             }
-            return ts.isInitializedProperty(member) || shouldTransformPrivateFields && ts.isPrivateIdentifierPropertyDeclaration(member);
+            return ts.isInitializedProperty(member) || shouldTransformPrivateElements && ts.isPrivateIdentifierClassElementDeclaration(member);
         }
         function transformConstructor(node, isDerivedClass) {
             var constructor = ts.visitNode(ts.getFirstConstructorWithBody(node), visitor, ts.isConstructorDeclaration);
-            var properties = node.members.filter(isPropertyDeclarationThatRequiresConstructorStatement);
-            if (!ts.some(properties)) {
+            var elements = node.members.filter(isClassElementThatRequiresConstructorStatement);
+            if (!ts.some(elements)) {
                 return constructor;
             }
             var parameters = ts.visitParameterList(constructor ? constructor.parameters : undefined, visitor, context);
@@ -86561,13 +89046,14 @@ var ts;
             /*modifiers*/ undefined, parameters !== null && parameters !== void 0 ? parameters : [], body), constructor || node), constructor));
         }
         function transformConstructorBody(node, constructor, isDerivedClass) {
-            var useDefineForClassFields = context.getCompilerOptions().useDefineForClassFields;
             var properties = ts.getProperties(node, /*requireInitializer*/ false, /*isStatic*/ false);
             if (!useDefineForClassFields) {
                 properties = ts.filter(properties, function (property) { return !!property.initializer || ts.isPrivateIdentifier(property.name); });
             }
+            var privateMethodsAndAccessors = getPrivateInstanceMethodsAndAccessors(node);
+            var needsConstructorBody = ts.some(properties) || ts.some(privateMethodsAndAccessors);
             // Only generate synthetic constructor when there are property initializers to move.
-            if (!constructor && !ts.some(properties)) {
+            if (!constructor && !needsConstructorBody) {
                 return ts.visitFunctionBody(/*node*/ undefined, visitor, context);
             }
             resumeLexicalEnvironment();
@@ -86606,7 +89092,10 @@ var ts;
                     indexOfFirstStatement = afterParameterProperties;
                 }
             }
-            addPropertyStatements(statements, properties, factory.createThis());
+            var receiver = factory.createThis();
+            // private methods can be called in property initializers, they should execute first.
+            addMethodStatements(statements, privateMethodsAndAccessors, receiver);
+            addPropertyStatements(statements, properties, receiver);
             // Add existing statements, skipping the initial super call.
             if (constructor) {
                 ts.addRange(statements, ts.visitNodes(constructor.body.statements, visitor, ts.isStatement, indexOfFirstStatement));
@@ -86668,27 +89157,30 @@ var ts;
         function transformProperty(property, receiver) {
             var _a;
             // We generate a name here in order to reuse the value cached by the relocated computed name expression (which uses the same generated name)
-            var emitAssignment = !context.getCompilerOptions().useDefineForClassFields;
+            var emitAssignment = !useDefineForClassFields;
             var propertyName = ts.isComputedPropertyName(property.name) && !ts.isSimpleInlineableExpression(property.name.expression)
                 ? factory.updateComputedPropertyName(property.name, factory.getGeneratedNameForNode(property.name))
                 : property.name;
-            if (shouldTransformPrivateFields && ts.isPrivateIdentifier(propertyName)) {
+            if (shouldTransformPrivateElements && ts.isPrivateIdentifier(propertyName)) {
                 var privateIdentifierInfo = accessPrivateIdentifier(propertyName);
                 if (privateIdentifierInfo) {
-                    switch (privateIdentifierInfo.placement) {
-                        case 0 /* InstanceField */: {
-                            return createPrivateInstanceFieldInitializer(receiver, ts.visitNode(property.initializer, visitor, ts.isExpression), privateIdentifierInfo.weakMapName);
+                    if (privateIdentifierInfo.kind === "f" /* Field */) {
+                        if (!privateIdentifierInfo.isStatic) {
+                            return createPrivateInstanceFieldInitializer(receiver, ts.visitNode(property.initializer, visitor, ts.isExpression), privateIdentifierInfo.brandCheckIdentifier);
+                        }
+                        else {
+                            return createPrivateStaticFieldInitializer(privateIdentifierInfo.variableName, ts.visitNode(property.initializer, visitor, ts.isExpression));
                         }
                     }
+                    else {
+                        return undefined;
+                    }
                 }
                 else {
                     ts.Debug.fail("Undeclared private name for property declaration.");
                 }
             }
-            if (ts.isPrivateIdentifier(propertyName) && !property.initializer) {
-                return undefined;
-            }
-            if (ts.isPrivateIdentifier(propertyName) && !property.initializer) {
+            if ((ts.isPrivateIdentifier(propertyName) || ts.hasStaticModifier(property)) && !property.initializer) {
                 return undefined;
             }
             var propertyOriginalNode = ts.getOriginalNode(property);
@@ -86720,6 +89212,21 @@ var ts;
                 classAliases = [];
             }
         }
+        /**
+         * Generates brand-check initializer for private methods.
+         *
+         * @param statements Statement list that should be used to append new statements.
+         * @param methods An array of method declarations.
+         * @param receiver The receiver on which each method should be assigned.
+         */
+        function addMethodStatements(statements, methods, receiver) {
+            if (!shouldTransformPrivateElements || !ts.some(methods)) {
+                return;
+            }
+            var weakSetName = getPrivateIdentifierEnvironment().weakSetName;
+            ts.Debug.assert(weakSetName, "weakSetName should be set in private identifier environment");
+            statements.push(factory.createExpressionStatement(createPrivateInstanceMethodInitializer(receiver, weakSetName)));
+        }
         /**
          * Hooks node substitutions.
          *
@@ -86755,10 +89262,10 @@ var ts;
                     if (declaration) {
                         var classAlias = classAliases[declaration.id]; // TODO: GH#18217
                         if (classAlias) {
-                            var clone_2 = factory.cloneNode(classAlias);
-                            ts.setSourceMapRange(clone_2, node);
-                            ts.setCommentRange(clone_2, node);
-                            return clone_2;
+                            var clone_3 = factory.cloneNode(classAlias);
+                            ts.setSourceMapRange(clone_3, node);
+                            ts.setCommentRange(clone_3, node);
+                            return clone_3;
                         }
                     }
                 }
@@ -86778,7 +89285,12 @@ var ts;
                 var alreadyTransformed = ts.isAssignmentExpression(innerExpression) && ts.isGeneratedIdentifier(innerExpression.left);
                 if (!alreadyTransformed && !inlinable && shouldHoist) {
                     var generatedName = factory.getGeneratedNameForNode(name);
-                    hoistVariableDeclaration(generatedName);
+                    if (resolver.getNodeCheckFlags(name) & 524288 /* BlockScopedBindingInLoop */) {
+                        addBlockScopedVariable(generatedName);
+                    }
+                    else {
+                        hoistVariableDeclaration(generatedName);
+                    }
                     return factory.createAssignment(generatedName, expression);
                 }
                 return (inlinable || ts.isIdentifier(innerExpression)) ? undefined : expression;
@@ -86792,22 +89304,164 @@ var ts;
             currentPrivateIdentifierEnvironment = privateIdentifierEnvironmentStack.pop();
         }
         function getPrivateIdentifierEnvironment() {
-            return currentPrivateIdentifierEnvironment || (currentPrivateIdentifierEnvironment = new ts.Map());
+            if (!currentPrivateIdentifierEnvironment) {
+                currentPrivateIdentifierEnvironment = {
+                    className: "",
+                    identifiers: new ts.Map()
+                };
+            }
+            return currentPrivateIdentifierEnvironment;
         }
         function getPendingExpressions() {
             return pendingExpressions || (pendingExpressions = []);
         }
-        function addPrivateIdentifierToEnvironment(name) {
-            var text = ts.getTextOfPropertyName(name);
-            var weakMapName = factory.createUniqueName("_" + text.substring(1), 16 /* Optimistic */ | 8 /* ReservedInNestedScopes */);
-            hoistVariableDeclaration(weakMapName);
-            getPrivateIdentifierEnvironment().set(name.escapedText, { placement: 0 /* InstanceField */, weakMapName: weakMapName });
-            getPendingExpressions().push(factory.createAssignment(weakMapName, factory.createNewExpression(factory.createIdentifier("WeakMap"), 
-            /*typeArguments*/ undefined, [])));
+        function addPrivateIdentifierToEnvironment(node) {
+            var _a;
+            var text = ts.getTextOfPropertyName(node.name);
+            var env = getPrivateIdentifierEnvironment();
+            var weakSetName = env.weakSetName, classConstructor = env.classConstructor;
+            var assignmentExpressions = [];
+            var privateName = node.name.escapedText;
+            var previousInfo = env.identifiers.get(privateName);
+            var isValid = !isReservedPrivateName(node.name) && previousInfo === undefined;
+            if (ts.hasStaticModifier(node)) {
+                ts.Debug.assert(classConstructor, "weakSetName should be set in private identifier environment");
+                if (ts.isPropertyDeclaration(node)) {
+                    var variableName = createHoistedVariableForPrivateName(text, node);
+                    env.identifiers.set(privateName, {
+                        kind: "f" /* Field */,
+                        variableName: variableName,
+                        brandCheckIdentifier: classConstructor,
+                        isStatic: true,
+                        isValid: isValid,
+                    });
+                }
+                else if (ts.isMethodDeclaration(node)) {
+                    var functionName = createHoistedVariableForPrivateName(text, node);
+                    env.identifiers.set(privateName, {
+                        kind: "m" /* Method */,
+                        methodName: functionName,
+                        brandCheckIdentifier: classConstructor,
+                        isStatic: true,
+                        isValid: isValid,
+                    });
+                }
+                else if (ts.isGetAccessorDeclaration(node)) {
+                    var getterName = createHoistedVariableForPrivateName(text + "_get", node);
+                    if ((previousInfo === null || previousInfo === void 0 ? void 0 : previousInfo.kind) === "a" /* Accessor */ && previousInfo.isStatic && !previousInfo.getterName) {
+                        previousInfo.getterName = getterName;
+                    }
+                    else {
+                        env.identifiers.set(privateName, {
+                            kind: "a" /* Accessor */,
+                            getterName: getterName,
+                            setterName: undefined,
+                            brandCheckIdentifier: classConstructor,
+                            isStatic: true,
+                            isValid: isValid,
+                        });
+                    }
+                }
+                else if (ts.isSetAccessorDeclaration(node)) {
+                    var setterName = createHoistedVariableForPrivateName(text + "_set", node);
+                    if ((previousInfo === null || previousInfo === void 0 ? void 0 : previousInfo.kind) === "a" /* Accessor */ && previousInfo.isStatic && !previousInfo.setterName) {
+                        previousInfo.setterName = setterName;
+                    }
+                    else {
+                        env.identifiers.set(privateName, {
+                            kind: "a" /* Accessor */,
+                            getterName: undefined,
+                            setterName: setterName,
+                            brandCheckIdentifier: classConstructor,
+                            isStatic: true,
+                            isValid: isValid,
+                        });
+                    }
+                }
+                else {
+                    ts.Debug.assertNever(node, "Unknown class element type.");
+                }
+            }
+            else if (ts.isPropertyDeclaration(node)) {
+                var weakMapName = createHoistedVariableForPrivateName(text, node);
+                env.identifiers.set(privateName, {
+                    kind: "f" /* Field */,
+                    brandCheckIdentifier: weakMapName,
+                    isStatic: false,
+                    variableName: undefined,
+                    isValid: isValid,
+                });
+                assignmentExpressions.push(factory.createAssignment(weakMapName, factory.createNewExpression(factory.createIdentifier("WeakMap"), 
+                /*typeArguments*/ undefined, [])));
+            }
+            else if (ts.isMethodDeclaration(node)) {
+                ts.Debug.assert(weakSetName, "weakSetName should be set in private identifier environment");
+                env.identifiers.set(privateName, {
+                    kind: "m" /* Method */,
+                    methodName: createHoistedVariableForPrivateName(text, node),
+                    brandCheckIdentifier: weakSetName,
+                    isStatic: false,
+                    isValid: isValid,
+                });
+            }
+            else if (ts.isAccessor(node)) {
+                ts.Debug.assert(weakSetName, "weakSetName should be set in private identifier environment");
+                if (ts.isGetAccessor(node)) {
+                    var getterName = createHoistedVariableForPrivateName(text + "_get", node);
+                    if ((previousInfo === null || previousInfo === void 0 ? void 0 : previousInfo.kind) === "a" /* Accessor */ && !previousInfo.isStatic && !previousInfo.getterName) {
+                        previousInfo.getterName = getterName;
+                    }
+                    else {
+                        env.identifiers.set(privateName, {
+                            kind: "a" /* Accessor */,
+                            getterName: getterName,
+                            setterName: undefined,
+                            brandCheckIdentifier: weakSetName,
+                            isStatic: false,
+                            isValid: isValid,
+                        });
+                    }
+                }
+                else {
+                    var setterName = createHoistedVariableForPrivateName(text + "_set", node);
+                    if ((previousInfo === null || previousInfo === void 0 ? void 0 : previousInfo.kind) === "a" /* Accessor */ && !previousInfo.isStatic && !previousInfo.setterName) {
+                        previousInfo.setterName = setterName;
+                    }
+                    else {
+                        env.identifiers.set(privateName, {
+                            kind: "a" /* Accessor */,
+                            getterName: undefined,
+                            setterName: setterName,
+                            brandCheckIdentifier: weakSetName,
+                            isStatic: false,
+                            isValid: isValid,
+                        });
+                    }
+                }
+            }
+            else {
+                ts.Debug.assertNever(node, "Unknown class element type.");
+            }
+            (_a = getPendingExpressions()).push.apply(_a, assignmentExpressions);
+        }
+        function createHoistedVariableForClass(name, node) {
+            var className = getPrivateIdentifierEnvironment().className;
+            var prefix = className ? "_" + className : "";
+            var identifier = factory.createUniqueName(prefix + "_" + name, 16 /* Optimistic */);
+            if (resolver.getNodeCheckFlags(node) & 524288 /* BlockScopedBindingInLoop */) {
+                addBlockScopedVariable(identifier);
+            }
+            else {
+                hoistVariableDeclaration(identifier);
+            }
+            return identifier;
+        }
+        function createHoistedVariableForPrivateName(privateName, node) {
+            return createHoistedVariableForClass(privateName.substring(1), node.name);
         }
         function accessPrivateIdentifier(name) {
             if (currentPrivateIdentifierEnvironment) {
-                var info = currentPrivateIdentifierEnvironment.get(name.escapedText);
+                var info = currentPrivateIdentifierEnvironment.identifiers.get(name.escapedText);
                 if (info) {
                     return info;
                 }
@@ -86817,7 +89471,7 @@ var ts;
                 if (!env) {
                     continue;
                 }
-                var info = env.get(name.escapedText);
+                var info = env.identifiers.get(name.escapedText);
                 if (info) {
                     return info;
                 }
@@ -86903,10 +89557,22 @@ var ts;
         }
     }
     ts.transformClassFields = transformClassFields;
+    function createPrivateStaticFieldInitializer(variableName, initializer) {
+        return ts.factory.createAssignment(variableName, ts.factory.createObjectLiteralExpression([
+            ts.factory.createPropertyAssignment("value", initializer || ts.factory.createVoidZero())
+        ]));
+    }
     function createPrivateInstanceFieldInitializer(receiver, initializer, weakMapName) {
         return ts.factory.createCallExpression(ts.factory.createPropertyAccessExpression(weakMapName, "set"), 
         /*typeArguments*/ undefined, [receiver, initializer || ts.factory.createVoidZero()]);
     }
+    function createPrivateInstanceMethodInitializer(receiver, weakSetName) {
+        return ts.factory.createCallExpression(ts.factory.createPropertyAccessExpression(weakSetName, "add"), 
+        /*typeArguments*/ undefined, [receiver]);
+    }
+    function isReservedPrivateName(node) {
+        return node.escapedText === "#constructor";
+    }
 })(ts || (ts = {}));
 /*@internal*/
 var ts;
@@ -86989,38 +89655,38 @@ var ts;
             return ts.visitEachChild(node, visitor, context);
         }
         function visitor(node) {
-            if ((node.transformFlags & 64 /* ContainsES2017 */) === 0) {
+            if ((node.transformFlags & 128 /* ContainsES2017 */) === 0) {
                 return node;
             }
             switch (node.kind) {
                 case 129 /* AsyncKeyword */:
                     // ES2017 async modifier should be elided for targets < ES2017
                     return undefined;
-                case 213 /* AwaitExpression */:
+                case 214 /* AwaitExpression */:
                     return visitAwaitExpression(node);
-                case 165 /* MethodDeclaration */:
+                case 166 /* MethodDeclaration */:
                     return doWithContext(1 /* NonTopLevel */ | 2 /* HasLexicalThis */, visitMethodDeclaration, node);
-                case 251 /* FunctionDeclaration */:
+                case 252 /* FunctionDeclaration */:
                     return doWithContext(1 /* NonTopLevel */ | 2 /* HasLexicalThis */, visitFunctionDeclaration, node);
-                case 208 /* FunctionExpression */:
+                case 209 /* FunctionExpression */:
                     return doWithContext(1 /* NonTopLevel */ | 2 /* HasLexicalThis */, visitFunctionExpression, node);
-                case 209 /* ArrowFunction */:
+                case 210 /* ArrowFunction */:
                     return doWithContext(1 /* NonTopLevel */, visitArrowFunction, node);
-                case 201 /* PropertyAccessExpression */:
+                case 202 /* PropertyAccessExpression */:
                     if (capturedSuperProperties && ts.isPropertyAccessExpression(node) && node.expression.kind === 105 /* SuperKeyword */) {
                         capturedSuperProperties.add(node.name.escapedText);
                     }
                     return ts.visitEachChild(node, visitor, context);
-                case 202 /* ElementAccessExpression */:
+                case 203 /* ElementAccessExpression */:
                     if (capturedSuperProperties && node.expression.kind === 105 /* SuperKeyword */) {
                         hasSuperElementAccess = true;
                     }
                     return ts.visitEachChild(node, visitor, context);
-                case 167 /* GetAccessor */:
-                case 168 /* SetAccessor */:
-                case 166 /* Constructor */:
-                case 252 /* ClassDeclaration */:
-                case 221 /* ClassExpression */:
+                case 168 /* GetAccessor */:
+                case 169 /* SetAccessor */:
+                case 167 /* Constructor */:
+                case 253 /* ClassDeclaration */:
+                case 222 /* ClassExpression */:
                     return doWithContext(1 /* NonTopLevel */ | 2 /* HasLexicalThis */, visitDefault, node);
                 default:
                     return ts.visitEachChild(node, visitor, context);
@@ -87029,27 +89695,27 @@ var ts;
         function asyncBodyVisitor(node) {
             if (ts.isNodeWithPossibleHoistedDeclaration(node)) {
                 switch (node.kind) {
-                    case 232 /* VariableStatement */:
+                    case 233 /* VariableStatement */:
                         return visitVariableStatementInAsyncBody(node);
-                    case 237 /* ForStatement */:
+                    case 238 /* ForStatement */:
                         return visitForStatementInAsyncBody(node);
-                    case 238 /* ForInStatement */:
+                    case 239 /* ForInStatement */:
                         return visitForInStatementInAsyncBody(node);
-                    case 239 /* ForOfStatement */:
+                    case 240 /* ForOfStatement */:
                         return visitForOfStatementInAsyncBody(node);
-                    case 287 /* CatchClause */:
+                    case 288 /* CatchClause */:
                         return visitCatchClauseInAsyncBody(node);
-                    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 */:
+                    case 231 /* Block */:
+                    case 245 /* SwitchStatement */:
+                    case 259 /* CaseBlock */:
+                    case 285 /* CaseClause */:
+                    case 286 /* DefaultClause */:
+                    case 248 /* TryStatement */:
+                    case 236 /* DoStatement */:
+                    case 237 /* WhileStatement */:
+                    case 235 /* IfStatement */:
+                    case 244 /* WithStatement */:
+                    case 246 /* LabeledStatement */:
                         return ts.visitEachChild(node, asyncBodyVisitor, context);
                     default:
                         return ts.Debug.assertNever(node, "Unhandled node.");
@@ -87091,18 +89757,18 @@ var ts;
         function visitForInStatementInAsyncBody(node) {
             return factory.updateForInStatement(node, isVariableDeclarationListWithCollidingName(node.initializer)
                 ? visitVariableDeclarationListWithCollidingNames(node.initializer, /*hasReceiver*/ true)
-                : ts.visitNode(node.initializer, visitor, ts.isForInitializer), ts.visitNode(node.expression, visitor, ts.isExpression), ts.visitNode(node.statement, asyncBodyVisitor, ts.isStatement, factory.liftToBlock));
+                : ts.visitNode(node.initializer, visitor, ts.isForInitializer), ts.visitNode(node.expression, visitor, ts.isExpression), ts.visitIterationBody(node.statement, asyncBodyVisitor, context));
         }
         function visitForOfStatementInAsyncBody(node) {
             return factory.updateForOfStatement(node, ts.visitNode(node.awaitModifier, visitor, ts.isToken), isVariableDeclarationListWithCollidingName(node.initializer)
                 ? visitVariableDeclarationListWithCollidingNames(node.initializer, /*hasReceiver*/ true)
-                : ts.visitNode(node.initializer, visitor, ts.isForInitializer), ts.visitNode(node.expression, visitor, ts.isExpression), ts.visitNode(node.statement, asyncBodyVisitor, ts.isStatement, factory.liftToBlock));
+                : ts.visitNode(node.initializer, visitor, ts.isForInitializer), ts.visitNode(node.expression, visitor, ts.isExpression), ts.visitIterationBody(node.statement, asyncBodyVisitor, context));
         }
         function visitForStatementInAsyncBody(node) {
             var initializer = node.initializer; // TODO: GH#18217
             return factory.updateForStatement(node, isVariableDeclarationListWithCollidingName(initializer)
                 ? visitVariableDeclarationListWithCollidingNames(initializer, /*hasReceiver*/ false)
-                : ts.visitNode(node.initializer, visitor, ts.isForInitializer), ts.visitNode(node.condition, visitor, ts.isExpression), ts.visitNode(node.incrementor, visitor, ts.isExpression), ts.visitNode(node.statement, asyncBodyVisitor, ts.isStatement, factory.liftToBlock));
+                : ts.visitNode(node.initializer, visitor, ts.isForInitializer), ts.visitNode(node.condition, visitor, ts.isExpression), ts.visitNode(node.incrementor, visitor, ts.isExpression), ts.visitIterationBody(node.statement, asyncBodyVisitor, context));
         }
         /**
          * Visits an AwaitExpression node.
@@ -87254,7 +89920,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 === 209 /* ArrowFunction */;
+            var isArrowFunction = node.kind === 210 /* 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
@@ -87345,17 +90011,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(203 /* CallExpression */);
-                context.enableSubstitution(201 /* PropertyAccessExpression */);
-                context.enableSubstitution(202 /* ElementAccessExpression */);
+                context.enableSubstitution(204 /* CallExpression */);
+                context.enableSubstitution(202 /* PropertyAccessExpression */);
+                context.enableSubstitution(203 /* ElementAccessExpression */);
                 // We need to be notified when entering and exiting declarations that bind super.
-                context.enableEmitNotification(252 /* ClassDeclaration */);
-                context.enableEmitNotification(165 /* MethodDeclaration */);
-                context.enableEmitNotification(167 /* GetAccessor */);
-                context.enableEmitNotification(168 /* SetAccessor */);
-                context.enableEmitNotification(166 /* Constructor */);
+                context.enableEmitNotification(253 /* ClassDeclaration */);
+                context.enableEmitNotification(166 /* MethodDeclaration */);
+                context.enableEmitNotification(168 /* GetAccessor */);
+                context.enableEmitNotification(169 /* SetAccessor */);
+                context.enableEmitNotification(167 /* Constructor */);
                 // We need to be notified when entering the generated accessor arrow functions.
-                context.enableEmitNotification(232 /* VariableStatement */);
+                context.enableEmitNotification(233 /* VariableStatement */);
             }
         }
         /**
@@ -87403,11 +90069,11 @@ var ts;
         }
         function substituteExpression(node) {
             switch (node.kind) {
-                case 201 /* PropertyAccessExpression */:
+                case 202 /* PropertyAccessExpression */:
                     return substitutePropertyAccessExpression(node);
-                case 202 /* ElementAccessExpression */:
+                case 203 /* ElementAccessExpression */:
                     return substituteElementAccessExpression(node);
-                case 203 /* CallExpression */:
+                case 204 /* CallExpression */:
                     return substituteCallExpression(node);
             }
             return node;
@@ -87439,11 +90105,11 @@ var ts;
         }
         function isSuperContainer(node) {
             var kind = node.kind;
-            return kind === 252 /* ClassDeclaration */
-                || kind === 166 /* Constructor */
-                || kind === 165 /* MethodDeclaration */
-                || kind === 167 /* GetAccessor */
-                || kind === 168 /* SetAccessor */;
+            return kind === 253 /* ClassDeclaration */
+                || kind === 167 /* Constructor */
+                || kind === 166 /* MethodDeclaration */
+                || kind === 168 /* GetAccessor */
+                || kind === 169 /* SetAccessor */;
         }
         function createSuperElementAccessInAsyncMethod(argumentExpression, location) {
             if (enclosingSuperContainerFlags & 4096 /* AsyncMethodWithSuperBinding */) {
@@ -87622,74 +90288,74 @@ var ts;
          * expression of an `ExpressionStatement`).
          */
         function visitorWorker(node, expressionResultIsUnused) {
-            if ((node.transformFlags & 32 /* ContainsES2018 */) === 0) {
+            if ((node.transformFlags & 64 /* ContainsES2018 */) === 0) {
                 return node;
             }
             switch (node.kind) {
-                case 213 /* AwaitExpression */:
+                case 214 /* AwaitExpression */:
                     return visitAwaitExpression(node);
-                case 219 /* YieldExpression */:
+                case 220 /* YieldExpression */:
                     return visitYieldExpression(node);
-                case 242 /* ReturnStatement */:
+                case 243 /* ReturnStatement */:
                     return visitReturnStatement(node);
-                case 245 /* LabeledStatement */:
+                case 246 /* LabeledStatement */:
                     return visitLabeledStatement(node);
-                case 200 /* ObjectLiteralExpression */:
+                case 201 /* ObjectLiteralExpression */:
                     return visitObjectLiteralExpression(node);
-                case 216 /* BinaryExpression */:
+                case 217 /* BinaryExpression */:
                     return visitBinaryExpression(node, expressionResultIsUnused);
-                case 337 /* CommaListExpression */:
+                case 341 /* CommaListExpression */:
                     return visitCommaListExpression(node, expressionResultIsUnused);
-                case 287 /* CatchClause */:
+                case 288 /* CatchClause */:
                     return visitCatchClause(node);
-                case 232 /* VariableStatement */:
+                case 233 /* VariableStatement */:
                     return visitVariableStatement(node);
-                case 249 /* VariableDeclaration */:
+                case 250 /* VariableDeclaration */:
                     return visitVariableDeclaration(node);
-                case 235 /* DoStatement */:
-                case 236 /* WhileStatement */:
-                case 238 /* ForInStatement */:
+                case 236 /* DoStatement */:
+                case 237 /* WhileStatement */:
+                case 239 /* ForInStatement */:
                     return doWithHierarchyFacts(visitDefault, node, 0 /* IterationStatementExcludes */, 2 /* IterationStatementIncludes */);
-                case 239 /* ForOfStatement */:
+                case 240 /* ForOfStatement */:
                     return visitForOfStatement(node, /*outermostLabeledStatement*/ undefined);
-                case 237 /* ForStatement */:
+                case 238 /* ForStatement */:
                     return doWithHierarchyFacts(visitForStatement, node, 0 /* IterationStatementExcludes */, 2 /* IterationStatementIncludes */);
-                case 212 /* VoidExpression */:
+                case 213 /* VoidExpression */:
                     return visitVoidExpression(node);
-                case 166 /* Constructor */:
+                case 167 /* Constructor */:
                     return doWithHierarchyFacts(visitConstructorDeclaration, node, 2 /* ClassOrFunctionExcludes */, 1 /* ClassOrFunctionIncludes */);
-                case 165 /* MethodDeclaration */:
+                case 166 /* MethodDeclaration */:
                     return doWithHierarchyFacts(visitMethodDeclaration, node, 2 /* ClassOrFunctionExcludes */, 1 /* ClassOrFunctionIncludes */);
-                case 167 /* GetAccessor */:
+                case 168 /* GetAccessor */:
                     return doWithHierarchyFacts(visitGetAccessorDeclaration, node, 2 /* ClassOrFunctionExcludes */, 1 /* ClassOrFunctionIncludes */);
-                case 168 /* SetAccessor */:
+                case 169 /* SetAccessor */:
                     return doWithHierarchyFacts(visitSetAccessorDeclaration, node, 2 /* ClassOrFunctionExcludes */, 1 /* ClassOrFunctionIncludes */);
-                case 251 /* FunctionDeclaration */:
+                case 252 /* FunctionDeclaration */:
                     return doWithHierarchyFacts(visitFunctionDeclaration, node, 2 /* ClassOrFunctionExcludes */, 1 /* ClassOrFunctionIncludes */);
-                case 208 /* FunctionExpression */:
+                case 209 /* FunctionExpression */:
                     return doWithHierarchyFacts(visitFunctionExpression, node, 2 /* ClassOrFunctionExcludes */, 1 /* ClassOrFunctionIncludes */);
-                case 209 /* ArrowFunction */:
+                case 210 /* ArrowFunction */:
                     return doWithHierarchyFacts(visitArrowFunction, node, 2 /* ArrowFunctionExcludes */, 0 /* ArrowFunctionIncludes */);
-                case 160 /* Parameter */:
+                case 161 /* Parameter */:
                     return visitParameter(node);
-                case 233 /* ExpressionStatement */:
+                case 234 /* ExpressionStatement */:
                     return visitExpressionStatement(node);
-                case 207 /* ParenthesizedExpression */:
+                case 208 /* ParenthesizedExpression */:
                     return visitParenthesizedExpression(node, expressionResultIsUnused);
-                case 205 /* TaggedTemplateExpression */:
+                case 206 /* TaggedTemplateExpression */:
                     return visitTaggedTemplateExpression(node);
-                case 201 /* PropertyAccessExpression */:
+                case 202 /* PropertyAccessExpression */:
                     if (capturedSuperProperties && ts.isPropertyAccessExpression(node) && node.expression.kind === 105 /* SuperKeyword */) {
                         capturedSuperProperties.add(node.name.escapedText);
                     }
                     return ts.visitEachChild(node, visitor, context);
-                case 202 /* ElementAccessExpression */:
+                case 203 /* ElementAccessExpression */:
                     if (capturedSuperProperties && node.expression.kind === 105 /* SuperKeyword */) {
                         hasSuperElementAccess = true;
                     }
                     return ts.visitEachChild(node, visitor, context);
-                case 252 /* ClassDeclaration */:
-                case 221 /* ClassExpression */:
+                case 253 /* ClassDeclaration */:
+                case 222 /* ClassExpression */:
                     return doWithHierarchyFacts(visitDefault, node, 2 /* ClassOrFunctionExcludes */, 1 /* ClassOrFunctionIncludes */);
                 default:
                     return ts.visitEachChild(node, visitor, context);
@@ -87725,7 +90391,7 @@ var ts;
         function visitLabeledStatement(node) {
             if (enclosingFunctionFlags & 2 /* Async */) {
                 var statement = ts.unwrapInnermostStatementOfLabel(node);
-                if (statement.kind === 239 /* ForOfStatement */ && statement.awaitModifier) {
+                if (statement.kind === 240 /* ForOfStatement */ && statement.awaitModifier) {
                     return visitForOfStatement(statement, node);
                 }
                 return factory.restoreEnclosingLabel(ts.visitNode(statement, visitor, ts.isStatement, factory.liftToBlock), node);
@@ -87737,7 +90403,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 === 290 /* SpreadAssignment */) {
+                if (e.kind === 291 /* SpreadAssignment */) {
                     if (chunkObject) {
                         objects.push(factory.createObjectLiteralExpression(chunkObject));
                         chunkObject = undefined;
@@ -87746,7 +90412,7 @@ var ts;
                     objects.push(ts.visitNode(target, visitor, ts.isExpression));
                 }
                 else {
-                    chunkObject = ts.append(chunkObject, e.kind === 288 /* PropertyAssignment */
+                    chunkObject = ts.append(chunkObject, e.kind === 289 /* PropertyAssignment */
                         ? factory.createPropertyAssignment(e.name, ts.visitNode(e.initializer, visitor, ts.isExpression))
                         : ts.visitNode(e, visitor, ts.isObjectLiteralElementLike));
                 }
@@ -87757,7 +90423,7 @@ var ts;
             return objects;
         }
         function visitObjectLiteralExpression(node) {
-            if (node.transformFlags & 16384 /* ContainsObjectRestOrSpread */) {
+            if (node.transformFlags & 32768 /* ContainsObjectRestOrSpread */) {
                 // spread elements emit like so:
                 // non-spread elements are chunked together into object literals, and then all are passed to __assign:
                 //     { a, ...o, b } => __assign(__assign({a}, o), {b});
@@ -87780,7 +90446,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 !== 200 /* ObjectLiteralExpression */) {
+                if (objects.length && objects[0].kind !== 201 /* ObjectLiteralExpression */) {
                     objects.unshift(factory.createObjectLiteralExpression());
                 }
                 var expression = objects[0];
@@ -87830,7 +90496,7 @@ var ts;
          * expression of an `ExpressionStatement`).
          */
         function visitBinaryExpression(node, expressionResultIsUnused) {
-            if (ts.isDestructuringAssignment(node) && node.left.transformFlags & 16384 /* ContainsObjectRestOrSpread */) {
+            if (ts.isDestructuringAssignment(node) && node.left.transformFlags & 32768 /* ContainsObjectRestOrSpread */) {
                 return ts.flattenDestructuringAssignment(node, visitor, context, 1 /* ObjectRest */, !expressionResultIsUnused);
             }
             if (node.operatorToken.kind === 27 /* CommaToken */) {
@@ -87861,7 +90527,7 @@ var ts;
         function visitCatchClause(node) {
             if (node.variableDeclaration &&
                 ts.isBindingPattern(node.variableDeclaration.name) &&
-                node.variableDeclaration.name.transformFlags & 16384 /* ContainsObjectRestOrSpread */) {
+                node.variableDeclaration.name.transformFlags & 32768 /* ContainsObjectRestOrSpread */) {
                 var name = factory.getGeneratedNameForNode(node.variableDeclaration.name);
                 var updatedDecl = factory.updateVariableDeclaration(node.variableDeclaration, node.variableDeclaration.name, /*exclamationToken*/ undefined, /*type*/ undefined, name);
                 var visitedBindings = ts.flattenDestructuringBinding(updatedDecl, visitor, context, 1 /* ObjectRest */);
@@ -87902,14 +90568,14 @@ var ts;
         }
         function visitVariableDeclarationWorker(node, exportedVariableStatement) {
             // If we are here it is because the name contains a binding pattern with a rest somewhere in it.
-            if (ts.isBindingPattern(node.name) && node.name.transformFlags & 16384 /* ContainsObjectRestOrSpread */) {
+            if (ts.isBindingPattern(node.name) && node.name.transformFlags & 32768 /* ContainsObjectRestOrSpread */) {
                 return ts.flattenDestructuringBinding(node, visitor, context, 1 /* ObjectRest */, 
                 /*rval*/ undefined, exportedVariableStatement);
             }
             return ts.visitEachChild(node, visitor, context);
         }
         function visitForStatement(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));
+            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.visitIterationBody(node.statement, visitor, context));
         }
         function visitVoidExpression(node) {
             return ts.visitEachChild(node, visitorWithUnusedExpressionResult, context);
@@ -87921,7 +90587,7 @@ var ts;
          */
         function visitForOfStatement(node, outermostLabeledStatement) {
             var ancestorFacts = enterSubtree(0 /* IterationStatementExcludes */, 2 /* IterationStatementIncludes */);
-            if (node.initializer.transformFlags & 16384 /* ContainsObjectRestOrSpread */) {
+            if (node.initializer.transformFlags & 32768 /* ContainsObjectRestOrSpread */) {
                 node = transformForOfStatementWithObjectRest(node);
             }
             var result = node.awaitModifier ?
@@ -87959,7 +90625,7 @@ var ts;
             var bodyLocation;
             var statementsLocation;
             var statements = [ts.visitNode(binding, visitor, ts.isStatement)];
-            var statement = ts.visitNode(node.statement, visitor, ts.isStatement);
+            var statement = ts.visitIterationBody(node.statement, visitor, context);
             if (ts.isBlock(statement)) {
                 ts.addRange(statements, statement.statements);
                 bodyLocation = statement;
@@ -88021,7 +90687,7 @@ var ts;
             ]));
         }
         function visitParameter(node) {
-            if (node.transformFlags & 16384 /* ContainsObjectRestOrSpread */) {
+            if (node.transformFlags & 32768 /* ContainsObjectRestOrSpread */) {
                 // Binding patterns are converted into a generated name and are
                 // evaluated inside the function body.
                 return factory.updateParameterDeclaration(node, 
@@ -88173,7 +90839,7 @@ var ts;
         function appendObjectRestAssignmentsIfNeeded(statements, node) {
             for (var _i = 0, _a = node.parameters; _i < _a.length; _i++) {
                 var parameter = _a[_i];
-                if (parameter.transformFlags & 16384 /* ContainsObjectRestOrSpread */) {
+                if (parameter.transformFlags & 32768 /* ContainsObjectRestOrSpread */) {
                     var temp = factory.getGeneratedNameForNode(parameter);
                     var declarations = ts.flattenDestructuringBinding(parameter, visitor, context, 1 /* ObjectRest */, temp, 
                     /*doNotRecordTempVariablesInLine*/ false, 
@@ -88193,17 +90859,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(203 /* CallExpression */);
-                context.enableSubstitution(201 /* PropertyAccessExpression */);
-                context.enableSubstitution(202 /* ElementAccessExpression */);
+                context.enableSubstitution(204 /* CallExpression */);
+                context.enableSubstitution(202 /* PropertyAccessExpression */);
+                context.enableSubstitution(203 /* ElementAccessExpression */);
                 // We need to be notified when entering and exiting declarations that bind super.
-                context.enableEmitNotification(252 /* ClassDeclaration */);
-                context.enableEmitNotification(165 /* MethodDeclaration */);
-                context.enableEmitNotification(167 /* GetAccessor */);
-                context.enableEmitNotification(168 /* SetAccessor */);
-                context.enableEmitNotification(166 /* Constructor */);
+                context.enableEmitNotification(253 /* ClassDeclaration */);
+                context.enableEmitNotification(166 /* MethodDeclaration */);
+                context.enableEmitNotification(168 /* GetAccessor */);
+                context.enableEmitNotification(169 /* SetAccessor */);
+                context.enableEmitNotification(167 /* Constructor */);
                 // We need to be notified when entering the generated accessor arrow functions.
-                context.enableEmitNotification(232 /* VariableStatement */);
+                context.enableEmitNotification(233 /* VariableStatement */);
             }
         }
         /**
@@ -88251,11 +90917,11 @@ var ts;
         }
         function substituteExpression(node) {
             switch (node.kind) {
-                case 201 /* PropertyAccessExpression */:
+                case 202 /* PropertyAccessExpression */:
                     return substitutePropertyAccessExpression(node);
-                case 202 /* ElementAccessExpression */:
+                case 203 /* ElementAccessExpression */:
                     return substituteElementAccessExpression(node);
-                case 203 /* CallExpression */:
+                case 204 /* CallExpression */:
                     return substituteCallExpression(node);
             }
             return node;
@@ -88287,11 +90953,11 @@ var ts;
         }
         function isSuperContainer(node) {
             var kind = node.kind;
-            return kind === 252 /* ClassDeclaration */
-                || kind === 166 /* Constructor */
-                || kind === 165 /* MethodDeclaration */
-                || kind === 167 /* GetAccessor */
-                || kind === 168 /* SetAccessor */;
+            return kind === 253 /* ClassDeclaration */
+                || kind === 167 /* Constructor */
+                || kind === 166 /* MethodDeclaration */
+                || kind === 168 /* GetAccessor */
+                || kind === 169 /* SetAccessor */;
         }
         function createSuperElementAccessInAsyncMethod(argumentExpression, location) {
             if (enclosingSuperContainerFlags & 4096 /* AsyncMethodWithSuperBinding */) {
@@ -88319,11 +90985,11 @@ var ts;
             return ts.visitEachChild(node, visitor, context);
         }
         function visitor(node) {
-            if ((node.transformFlags & 16 /* ContainsES2019 */) === 0) {
+            if ((node.transformFlags & 32 /* ContainsES2019 */) === 0) {
                 return node;
             }
             switch (node.kind) {
-                case 287 /* CatchClause */:
+                case 288 /* CatchClause */:
                     return visitCatchClause(node);
                 default:
                     return ts.visitEachChild(node, visitor, context);
@@ -88351,25 +91017,29 @@ var ts;
             return ts.visitEachChild(node, visitor, context);
         }
         function visitor(node) {
-            if ((node.transformFlags & 8 /* ContainsES2020 */) === 0) {
+            if ((node.transformFlags & 16 /* ContainsES2020 */) === 0) {
                 return node;
             }
             switch (node.kind) {
-                case 201 /* PropertyAccessExpression */:
-                case 202 /* ElementAccessExpression */:
-                case 203 /* CallExpression */:
-                    if (node.flags & 32 /* OptionalChain */) {
+                case 204 /* CallExpression */: {
+                    var updated = visitNonOptionalCallExpression(node, /*captureThisArg*/ false);
+                    ts.Debug.assertNotNode(updated, ts.isSyntheticReference);
+                    return updated;
+                }
+                case 202 /* PropertyAccessExpression */:
+                case 203 /* ElementAccessExpression */:
+                    if (ts.isOptionalChain(node)) {
                         var updated = visitOptionalExpression(node, /*captureThisArg*/ false, /*isDelete*/ false);
                         ts.Debug.assertNotNode(updated, ts.isSyntheticReference);
                         return updated;
                     }
                     return ts.visitEachChild(node, visitor, context);
-                case 216 /* BinaryExpression */:
+                case 217 /* BinaryExpression */:
                     if (node.operatorToken.kind === 60 /* QuestionQuestionToken */) {
                         return transformNullishCoalescingExpression(node);
                     }
                     return ts.visitEachChild(node, visitor, context);
-                case 210 /* DeleteExpression */:
+                case 211 /* DeleteExpression */:
                     return visitDeleteExpression(node);
                 default:
                     return ts.visitEachChild(node, visitor, context);
@@ -88411,7 +91081,7 @@ var ts;
                     thisArg = expression;
                 }
             }
-            expression = node.kind === 201 /* PropertyAccessExpression */
+            expression = node.kind === 202 /* 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;
@@ -88421,14 +91091,23 @@ var ts;
                 // If `node` is an optional chain, then it is the outermost chain of an optional expression.
                 return visitOptionalExpression(node, captureThisArg, /*isDelete*/ false);
             }
+            if (ts.isParenthesizedExpression(node.expression) && ts.isOptionalChain(ts.skipParentheses(node.expression))) {
+                // capture thisArg for calls of parenthesized optional chains like `(foo?.bar)()`
+                var expression = visitNonOptionalParenthesizedExpression(node.expression, /*captureThisArg*/ true, /*isDelete*/ false);
+                var args = ts.visitNodes(node.arguments, visitor, ts.isExpression);
+                if (ts.isSyntheticReference(expression)) {
+                    return ts.setTextRange(factory.createFunctionCallCall(expression.expression, expression.thisArg, args), node);
+                }
+                return factory.updateCallExpression(node, expression, /*typeArguments*/ undefined, args);
+            }
             return ts.visitEachChild(node, visitor, context);
         }
         function visitNonOptionalExpression(node, captureThisArg, isDelete) {
             switch (node.kind) {
-                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);
+                case 208 /* ParenthesizedExpression */: return visitNonOptionalParenthesizedExpression(node, captureThisArg, isDelete);
+                case 202 /* PropertyAccessExpression */:
+                case 203 /* ElementAccessExpression */: return visitNonOptionalPropertyOrElementAccessExpression(node, captureThisArg, isDelete);
+                case 204 /* CallExpression */: return visitNonOptionalCallExpression(node, captureThisArg);
                 default: return ts.visitNode(node, visitor, ts.isExpression);
             }
         }
@@ -88447,8 +91126,8 @@ var ts;
             for (var i = 0; i < chain.length; i++) {
                 var segment = chain[i];
                 switch (segment.kind) {
-                    case 201 /* PropertyAccessExpression */:
-                    case 202 /* ElementAccessExpression */:
+                    case 202 /* PropertyAccessExpression */:
+                    case 203 /* ElementAccessExpression */:
                         if (i === chain.length - 1 && captureThisArg) {
                             if (!ts.isSimpleCopiableExpression(rightExpression)) {
                                 thisArg = factory.createTempVariable(hoistVariableDeclaration);
@@ -88458,11 +91137,11 @@ var ts;
                                 thisArg = rightExpression;
                             }
                         }
-                        rightExpression = segment.kind === 201 /* PropertyAccessExpression */
+                        rightExpression = segment.kind === 202 /* PropertyAccessExpression */
                             ? factory.createPropertyAccessExpression(rightExpression, ts.visitNode(segment.name, visitor, ts.isIdentifier))
                             : factory.createElementAccessExpression(rightExpression, ts.visitNode(segment.argumentExpression, visitor, ts.isExpression));
                         break;
-                    case 203 /* CallExpression */:
+                    case 204 /* CallExpression */:
                         if (i === 0 && leftThisArg) {
                             rightExpression = factory.createFunctionCallCall(rightExpression, leftThisArg.kind === 105 /* SuperKeyword */ ? factory.createThis() : leftThisArg, ts.visitNodes(segment.arguments, visitor, ts.isExpression));
                         }
@@ -88505,7 +91184,7 @@ var ts;
 /*@internal*/
 var ts;
 (function (ts) {
-    function transformESNext(context) {
+    function transformES2021(context) {
         var hoistVariableDeclaration = context.hoistVariableDeclaration, factory = context.factory;
         return ts.chainBundle(context, transformSourceFile);
         function transformSourceFile(node) {
@@ -88515,11 +91194,11 @@ var ts;
             return ts.visitEachChild(node, visitor, context);
         }
         function visitor(node) {
-            if ((node.transformFlags & 4 /* ContainsESNext */) === 0) {
+            if ((node.transformFlags & 8 /* ContainsES2021 */) === 0) {
                 return node;
             }
             switch (node.kind) {
-                case 216 /* BinaryExpression */:
+                case 217 /* BinaryExpression */:
                     var binaryExpression = node;
                     if (ts.isLogicalOrCoalescingAssignmentExpression(binaryExpression)) {
                         return transformLogicalAssignment(binaryExpression);
@@ -88555,6 +91234,29 @@ var ts;
             return factory.createBinaryExpression(left, nonAssignmentOperator, factory.createParenthesizedExpression(factory.createAssignment(assignmentTarget, right)));
         }
     }
+    ts.transformES2021 = transformES2021;
+})(ts || (ts = {}));
+/*@internal*/
+var ts;
+(function (ts) {
+    function transformESNext(context) {
+        return ts.chainBundle(context, transformSourceFile);
+        function transformSourceFile(node) {
+            if (node.isDeclarationFile) {
+                return node;
+            }
+            return ts.visitEachChild(node, visitor, context);
+        }
+        function visitor(node) {
+            if ((node.transformFlags & 4 /* ContainsESNext */) === 0) {
+                return node;
+            }
+            switch (node.kind) {
+                default:
+                    return ts.visitEachChild(node, visitor, context);
+            }
+        }
+    }
     ts.transformESNext = transformESNext;
 })(ts || (ts = {}));
 /*@internal*/
@@ -88665,13 +91367,13 @@ var ts;
         }
         function visitorWorker(node) {
             switch (node.kind) {
-                case 273 /* JsxElement */:
+                case 274 /* JsxElement */:
                     return visitJsxElement(node, /*isChild*/ false);
-                case 274 /* JsxSelfClosingElement */:
+                case 275 /* JsxSelfClosingElement */:
                     return visitJsxSelfClosingElement(node, /*isChild*/ false);
-                case 277 /* JsxFragment */:
+                case 278 /* JsxFragment */:
                     return visitJsxFragment(node, /*isChild*/ false);
-                case 283 /* JsxExpression */:
+                case 284 /* JsxExpression */:
                     return visitJsxExpression(node);
                 default:
                     return ts.visitEachChild(node, visitor, context);
@@ -88681,13 +91383,13 @@ var ts;
             switch (node.kind) {
                 case 11 /* JsxText */:
                     return visitJsxText(node);
-                case 283 /* JsxExpression */:
+                case 284 /* JsxExpression */:
                     return visitJsxExpression(node);
-                case 273 /* JsxElement */:
+                case 274 /* JsxElement */:
                     return visitJsxElement(node, /*isChild*/ true);
-                case 274 /* JsxSelfClosingElement */:
+                case 275 /* JsxSelfClosingElement */:
                     return visitJsxSelfClosingElement(node, /*isChild*/ true);
-                case 277 /* JsxFragment */:
+                case 278 /* JsxFragment */:
                     return visitJsxFragment(node, /*isChild*/ true);
                 default:
                     return ts.Debug.failBadSyntaxKind(node);
@@ -88727,9 +91429,9 @@ var ts;
         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_14 = transformJsxChildToExpression(nonWhitespaceChildren[0]);
+                return result_14 && factory.createObjectLiteralExpression([
+                    factory.createPropertyAssignment("children", result_14)
                 ]);
             }
             var result = ts.mapDefined(children, transformJsxChildToExpression);
@@ -88805,21 +91507,29 @@ var ts;
                 // When there are no attributes, React wants "null"
             }
             else {
-                // Map spans of JsxAttribute nodes into object literals and spans
-                // of JsxSpreadAttribute nodes into expressions.
-                var segments = ts.flatten(ts.spanMap(attrs, ts.isJsxSpreadAttribute, function (attrs, isSpread) { return isSpread
-                    ? ts.map(attrs, transformJsxSpreadAttributeToExpression)
-                    : 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());
+                var target = compilerOptions.target;
+                if (target && target >= 5 /* ES2018 */) {
+                    objectProperties = factory.createObjectLiteralExpression(ts.flatten(ts.spanMap(attrs, ts.isJsxSpreadAttribute, function (attrs, isSpread) {
+                        return isSpread ? ts.map(attrs, transformJsxSpreadAttributeToSpreadAssignment) : ts.map(attrs, transformJsxAttributeToObjectLiteralElement);
+                    })));
                 }
-                // Either emit one big object literal (no spread attribs), or
-                // a call to the __assign helper.
-                objectProperties = ts.singleOrUndefined(segments);
-                if (!objectProperties) {
-                    objectProperties = emitHelpers().createAssignHelper(segments);
+                else {
+                    // Map spans of JsxAttribute nodes into object literals and spans
+                    // of JsxSpreadAttribute nodes into expressions.
+                    var segments = ts.flatten(ts.spanMap(attrs, ts.isJsxSpreadAttribute, function (attrs, isSpread) { return isSpread
+                        ? ts.map(attrs, transformJsxSpreadAttributeToExpression)
+                        : 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());
+                    }
+                    // Either emit one big object literal (no spread attribs), or
+                    // a call to the __assign helper.
+                    objectProperties = ts.singleOrUndefined(segments);
+                    if (!objectProperties) {
+                        objectProperties = emitHelpers().createAssignHelper(segments);
+                    }
                 }
             }
             var callee = currentFileState.importSpecifier === undefined
@@ -88851,6 +91561,9 @@ var ts;
             }
             return element;
         }
+        function transformJsxSpreadAttributeToSpreadAssignment(node) {
+            return factory.createSpreadAssignment(ts.visitNode(node.expression, visitor, ts.isExpression));
+        }
         function transformJsxSpreadAttributeToExpression(node) {
             return ts.visitNode(node.expression, visitor, ts.isExpression);
         }
@@ -88870,7 +91583,7 @@ var ts;
                 var literal = factory.createStringLiteral(tryDecodeEntities(node.text) || node.text, singleQuote);
                 return ts.setTextRange(literal, node);
             }
-            else if (node.kind === 283 /* JsxExpression */) {
+            else if (node.kind === 284 /* JsxExpression */) {
                 if (node.expression === undefined) {
                     return factory.createTrue();
                 }
@@ -88964,7 +91677,7 @@ var ts;
             return decoded === text ? undefined : decoded;
         }
         function getTagName(node) {
-            if (node.kind === 273 /* JsxElement */) {
+            if (node.kind === 274 /* JsxElement */) {
                 return getTagName(node.openingElement);
             }
             else {
@@ -89266,11 +91979,11 @@ var ts;
             return ts.visitEachChild(node, visitor, context);
         }
         function visitor(node) {
-            if ((node.transformFlags & 128 /* ContainsES2016 */) === 0) {
+            if ((node.transformFlags & 256 /* ContainsES2016 */) === 0) {
                 return node;
             }
             switch (node.kind) {
-                case 216 /* BinaryExpression */:
+                case 217 /* BinaryExpression */:
                     return visitBinaryExpression(node);
                 default:
                     return ts.visitEachChild(node, visitor, context);
@@ -89483,11 +92196,11 @@ var ts;
         }
         function isReturnVoidStatementInConstructorWithCapturedSuper(node) {
             return (hierarchyFacts & 8192 /* ConstructorWithCapturedSuper */) !== 0
-                && node.kind === 242 /* ReturnStatement */
+                && node.kind === 243 /* ReturnStatement */
                 && !node.expression;
         }
         function isOrMayContainReturnCompletion(node) {
-            return node.transformFlags & 1048576 /* ContainsHoistedDeclarationOrCompletion */
+            return node.transformFlags & 2097152 /* ContainsHoistedDeclarationOrCompletion */
                 && (ts.isReturnStatement(node)
                     || ts.isIfStatement(node)
                     || ts.isWithStatement(node)
@@ -89502,7 +92215,7 @@ var ts;
                     || ts.isBlock(node));
         }
         function shouldVisitNode(node) {
-            return (node.transformFlags & 256 /* ContainsES2015 */) !== 0
+            return (node.transformFlags & 512 /* ContainsES2015 */) !== 0
                 || convertedLoopState !== undefined
                 || (hierarchyFacts & 8192 /* ConstructorWithCapturedSuper */ && isOrMayContainReturnCompletion(node))
                 || (ts.isIterationStatement(node, /*lookInLabeledStatements*/ false) && shouldConvertIterationStatement(node))
@@ -89524,65 +92237,65 @@ var ts;
             switch (node.kind) {
                 case 123 /* StaticKeyword */:
                     return undefined; // elide static keyword
-                case 252 /* ClassDeclaration */:
+                case 253 /* ClassDeclaration */:
                     return visitClassDeclaration(node);
-                case 221 /* ClassExpression */:
+                case 222 /* ClassExpression */:
                     return visitClassExpression(node);
-                case 160 /* Parameter */:
+                case 161 /* Parameter */:
                     return visitParameter(node);
-                case 251 /* FunctionDeclaration */:
+                case 252 /* FunctionDeclaration */:
                     return visitFunctionDeclaration(node);
-                case 209 /* ArrowFunction */:
+                case 210 /* ArrowFunction */:
                     return visitArrowFunction(node);
-                case 208 /* FunctionExpression */:
+                case 209 /* FunctionExpression */:
                     return visitFunctionExpression(node);
-                case 249 /* VariableDeclaration */:
+                case 250 /* VariableDeclaration */:
                     return visitVariableDeclaration(node);
                 case 78 /* Identifier */:
                     return visitIdentifier(node);
-                case 250 /* VariableDeclarationList */:
+                case 251 /* VariableDeclarationList */:
                     return visitVariableDeclarationList(node);
-                case 244 /* SwitchStatement */:
+                case 245 /* SwitchStatement */:
                     return visitSwitchStatement(node);
-                case 258 /* CaseBlock */:
+                case 259 /* CaseBlock */:
                     return visitCaseBlock(node);
-                case 230 /* Block */:
+                case 231 /* Block */:
                     return visitBlock(node, /*isFunctionBody*/ false);
-                case 241 /* BreakStatement */:
-                case 240 /* ContinueStatement */:
+                case 242 /* BreakStatement */:
+                case 241 /* ContinueStatement */:
                     return visitBreakOrContinueStatement(node);
-                case 245 /* LabeledStatement */:
+                case 246 /* LabeledStatement */:
                     return visitLabeledStatement(node);
-                case 235 /* DoStatement */:
-                case 236 /* WhileStatement */:
+                case 236 /* DoStatement */:
+                case 237 /* WhileStatement */:
                     return visitDoOrWhileStatement(node, /*outermostLabeledStatement*/ undefined);
-                case 237 /* ForStatement */:
+                case 238 /* ForStatement */:
                     return visitForStatement(node, /*outermostLabeledStatement*/ undefined);
-                case 238 /* ForInStatement */:
+                case 239 /* ForInStatement */:
                     return visitForInStatement(node, /*outermostLabeledStatement*/ undefined);
-                case 239 /* ForOfStatement */:
+                case 240 /* ForOfStatement */:
                     return visitForOfStatement(node, /*outermostLabeledStatement*/ undefined);
-                case 233 /* ExpressionStatement */:
+                case 234 /* ExpressionStatement */:
                     return visitExpressionStatement(node);
-                case 200 /* ObjectLiteralExpression */:
+                case 201 /* ObjectLiteralExpression */:
                     return visitObjectLiteralExpression(node);
-                case 287 /* CatchClause */:
+                case 288 /* CatchClause */:
                     return visitCatchClause(node);
-                case 289 /* ShorthandPropertyAssignment */:
+                case 290 /* ShorthandPropertyAssignment */:
                     return visitShorthandPropertyAssignment(node);
-                case 158 /* ComputedPropertyName */:
+                case 159 /* ComputedPropertyName */:
                     return visitComputedPropertyName(node);
-                case 199 /* ArrayLiteralExpression */:
+                case 200 /* ArrayLiteralExpression */:
                     return visitArrayLiteralExpression(node);
-                case 203 /* CallExpression */:
+                case 204 /* CallExpression */:
                     return visitCallExpression(node);
-                case 204 /* NewExpression */:
+                case 205 /* NewExpression */:
                     return visitNewExpression(node);
-                case 207 /* ParenthesizedExpression */:
+                case 208 /* ParenthesizedExpression */:
                     return visitParenthesizedExpression(node, expressionResultIsUnused);
-                case 216 /* BinaryExpression */:
+                case 217 /* BinaryExpression */:
                     return visitBinaryExpression(node, expressionResultIsUnused);
-                case 337 /* CommaListExpression */:
+                case 341 /* CommaListExpression */:
                     return visitCommaListExpression(node, expressionResultIsUnused);
                 case 14 /* NoSubstitutionTemplateLiteral */:
                 case 15 /* TemplateHead */:
@@ -89593,30 +92306,30 @@ var ts;
                     return visitStringLiteral(node);
                 case 8 /* NumericLiteral */:
                     return visitNumericLiteral(node);
-                case 205 /* TaggedTemplateExpression */:
+                case 206 /* TaggedTemplateExpression */:
                     return visitTaggedTemplateExpression(node);
-                case 218 /* TemplateExpression */:
+                case 219 /* TemplateExpression */:
                     return visitTemplateExpression(node);
-                case 219 /* YieldExpression */:
+                case 220 /* YieldExpression */:
                     return visitYieldExpression(node);
-                case 220 /* SpreadElement */:
+                case 221 /* SpreadElement */:
                     return visitSpreadElement(node);
                 case 105 /* SuperKeyword */:
                     return visitSuperKeyword(/*isExpressionOfCall*/ false);
                 case 107 /* ThisKeyword */:
                     return visitThisKeyword(node);
-                case 226 /* MetaProperty */:
+                case 227 /* MetaProperty */:
                     return visitMetaProperty(node);
-                case 165 /* MethodDeclaration */:
+                case 166 /* MethodDeclaration */:
                     return visitMethodDeclaration(node);
-                case 167 /* GetAccessor */:
-                case 168 /* SetAccessor */:
+                case 168 /* GetAccessor */:
+                case 169 /* SetAccessor */:
                     return visitAccessorDeclaration(node);
-                case 232 /* VariableStatement */:
+                case 233 /* VariableStatement */:
                     return visitVariableStatement(node);
-                case 242 /* ReturnStatement */:
+                case 243 /* ReturnStatement */:
                     return visitReturnStatement(node);
-                case 212 /* VoidExpression */:
+                case 213 /* VoidExpression */:
                     return visitVoidExpression(node);
                 default:
                     return ts.visitEachChild(node, visitor, context);
@@ -89706,14 +92419,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 === 241 /* BreakStatement */ ? 2 /* Break */ : 4 /* Continue */;
+                var jump = node.kind === 242 /* 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 === 241 /* BreakStatement */) {
+                        if (node.kind === 242 /* BreakStatement */) {
                             convertedLoopState.nonLocalJumps |= 2 /* Break */;
                             labelMarker = "break";
                         }
@@ -89724,7 +92437,7 @@ var ts;
                         }
                     }
                     else {
-                        if (node.kind === 241 /* BreakStatement */) {
+                        if (node.kind === 242 /* BreakStatement */) {
                             labelMarker = "break-" + label.escapedText;
                             setLabeledJump(convertedLoopState, /*isBreak*/ true, ts.idText(label), labelMarker);
                         }
@@ -90036,7 +92749,7 @@ var ts;
             factory.mergeLexicalEnvironment(prologue, endLexicalEnvironment());
             insertCaptureNewTargetIfNeeded(prologue, constructor, /*copyOnWrite*/ false);
             if (isDerivedClass) {
-                if (superCallExpression && statementOffset === constructor.body.statements.length && !(constructor.body.transformFlags & 4096 /* ContainsLexicalThis */)) {
+                if (superCallExpression && statementOffset === constructor.body.statements.length && !(constructor.body.transformFlags & 8192 /* ContainsLexicalThis */)) {
                     // If the subclass constructor does *not* contain `this` and *ends* with a `super()` call, we will use the
                     // following representation:
                     //
@@ -90122,11 +92835,11 @@ var ts;
          */
         function isSufficientlyCoveredByReturnStatements(statement) {
             // A return statement is considered covered.
-            if (statement.kind === 242 /* ReturnStatement */) {
+            if (statement.kind === 243 /* ReturnStatement */) {
                 return true;
             }
             // An if-statement with two covered branches is covered.
-            else if (statement.kind === 234 /* IfStatement */) {
+            else if (statement.kind === 235 /* IfStatement */) {
                 var ifStatement = statement;
                 if (ifStatement.elseStatement) {
                     return isSufficientlyCoveredByReturnStatements(ifStatement.thenStatement) &&
@@ -90134,7 +92847,7 @@ var ts;
                 }
             }
             // A block is covered if it has a last statement which is covered.
-            else if (statement.kind === 230 /* Block */) {
+            else if (statement.kind === 231 /* Block */) {
                 var lastStatement = ts.lastOrUndefined(statement.statements);
                 if (lastStatement && isSufficientlyCoveredByReturnStatements(lastStatement)) {
                     return true;
@@ -90336,7 +93049,7 @@ var ts;
          * @param node A node.
          */
         function insertCaptureThisForNodeIfNeeded(statements, node) {
-            if (hierarchyFacts & 32768 /* CapturedLexicalThis */ && node.kind !== 209 /* ArrowFunction */) {
+            if (hierarchyFacts & 32768 /* CapturedLexicalThis */ && node.kind !== 210 /* ArrowFunction */) {
                 insertCaptureThisForNode(statements, node, factory.createThis());
                 return true;
             }
@@ -90358,22 +93071,22 @@ var ts;
             if (hierarchyFacts & 16384 /* NewTarget */) {
                 var newTarget = void 0;
                 switch (node.kind) {
-                    case 209 /* ArrowFunction */:
+                    case 210 /* ArrowFunction */:
                         return statements;
-                    case 165 /* MethodDeclaration */:
-                    case 167 /* GetAccessor */:
-                    case 168 /* SetAccessor */:
+                    case 166 /* MethodDeclaration */:
+                    case 168 /* GetAccessor */:
+                    case 169 /* SetAccessor */:
                         // Methods and accessors cannot be constructors, so 'new.target' will
                         // always return 'undefined'.
                         newTarget = factory.createVoidZero();
                         break;
-                    case 166 /* Constructor */:
+                    case 167 /* 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 251 /* FunctionDeclaration */:
-                    case 208 /* FunctionExpression */:
+                    case 252 /* FunctionDeclaration */:
+                    case 209 /* 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))), 
@@ -90408,20 +93121,20 @@ var ts;
             for (var _i = 0, _a = node.members; _i < _a.length; _i++) {
                 var member = _a[_i];
                 switch (member.kind) {
-                    case 229 /* SemicolonClassElement */:
+                    case 230 /* SemicolonClassElement */:
                         statements.push(transformSemicolonClassElementToStatement(member));
                         break;
-                    case 165 /* MethodDeclaration */:
+                    case 166 /* MethodDeclaration */:
                         statements.push(transformClassMethodDeclarationToStatement(getClassMemberPrefix(node, member), member, node));
                         break;
-                    case 167 /* GetAccessor */:
-                    case 168 /* SetAccessor */:
+                    case 168 /* GetAccessor */:
+                    case 169 /* SetAccessor */:
                         var accessors = ts.getAllAccessorDeclarations(node.members, member);
                         if (member === accessors.firstAccessor) {
                             statements.push(transformAccessorsToStatement(getClassMemberPrefix(node, member), accessors, node));
                         }
                         break;
-                    case 166 /* Constructor */:
+                    case 167 /* Constructor */:
                         // Constructors are handled in visitClassExpression/visitClassDeclaration
                         break;
                     default:
@@ -90450,7 +93163,7 @@ var ts;
             var memberFunction = transformFunctionLikeToExpression(member, /*location*/ member, /*name*/ undefined, container);
             var propertyName = ts.visitNode(member.name, visitor, ts.isPropertyName);
             var e;
-            if (!ts.isPrivateIdentifier(propertyName) && context.getCompilerOptions().useDefineForClassFields) {
+            if (!ts.isPrivateIdentifier(propertyName) && ts.getUseDefineForClassFields(context.getCompilerOptions())) {
                 var name = ts.isComputedPropertyName(propertyName) ? propertyName.expression
                     : ts.isIdentifier(propertyName) ? factory.createStringLiteral(ts.unescapeLeadingUnderscores(propertyName.escapedText))
                         : propertyName;
@@ -90542,7 +93255,7 @@ var ts;
          * @param node An ArrowFunction node.
          */
         function visitArrowFunction(node) {
-            if (node.transformFlags & 4096 /* ContainsLexicalThis */) {
+            if (node.transformFlags & 8192 /* ContainsLexicalThis */) {
                 hierarchyFacts |= 32768 /* CapturedLexicalThis */;
             }
             var savedConvertedLoopState = convertedLoopState;
@@ -90624,7 +93337,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 === 251 /* FunctionDeclaration */ || node.kind === 208 /* FunctionExpression */)) {
+            if (hierarchyFacts & 16384 /* NewTarget */ && !name && (node.kind === 252 /* FunctionDeclaration */ || node.kind === 209 /* FunctionExpression */)) {
                 name = factory.getGeneratedNameForNode(node);
             }
             exitSubtree(ancestorFacts, 49152 /* FunctionSubtreeExcludes */, 0 /* None */);
@@ -90670,7 +93383,7 @@ var ts;
                 }
             }
             else {
-                ts.Debug.assert(node.kind === 209 /* ArrowFunction */);
+                ts.Debug.assert(node.kind === 210 /* 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
@@ -90831,7 +93544,7 @@ var ts;
          * @param node A VariableDeclarationList node.
          */
         function visitVariableDeclarationList(node) {
-            if (node.flags & 3 /* BlockScoped */ || node.transformFlags & 131072 /* ContainsBindingPattern */) {
+            if (node.flags & 3 /* BlockScoped */ || node.transformFlags & 262144 /* ContainsBindingPattern */) {
                 if (node.flags & 3 /* BlockScoped */) {
                     enableSubstitutionsForBlockScopedBindings();
                 }
@@ -90844,7 +93557,7 @@ var ts;
                 ts.setCommentRange(declarationList, node);
                 // If the first or last declaration is a binding pattern, we need to modify
                 // the source map range for the declaration list.
-                if (node.transformFlags & 131072 /* ContainsBindingPattern */
+                if (node.transformFlags & 262144 /* ContainsBindingPattern */
                     && (ts.isBindingPattern(node.declarations[0].name) || ts.isBindingPattern(ts.last(node.declarations).name))) {
                     ts.setSourceMapRange(declarationList, getRangeUnion(declarations));
                 }
@@ -90856,8 +93569,8 @@ var ts;
             // declarations may not be sorted by position.
             // pos should be the minimum* position over all nodes (that's not -1), end should be the maximum end over all nodes.
             var pos = -1, end = -1;
-            for (var _i = 0, declarations_10 = declarations; _i < declarations_10.length; _i++) {
-                var node = declarations_10[_i];
+            for (var _i = 0, declarations_9 = declarations; _i < declarations_9.length; _i++) {
+                var node = declarations_9[_i];
                 pos = pos === -1 ? node.pos : node.pos === -1 ? pos : Math.min(pos, node.pos);
                 end = Math.max(end, node.end);
             }
@@ -90977,14 +93690,14 @@ var ts;
         }
         function visitIterationStatement(node, outermostLabeledStatement) {
             switch (node.kind) {
-                case 235 /* DoStatement */:
-                case 236 /* WhileStatement */:
+                case 236 /* DoStatement */:
+                case 237 /* WhileStatement */:
                     return visitDoOrWhileStatement(node, outermostLabeledStatement);
-                case 237 /* ForStatement */:
+                case 238 /* ForStatement */:
                     return visitForStatement(node, outermostLabeledStatement);
-                case 238 /* ForInStatement */:
+                case 239 /* ForInStatement */:
                     return visitForInStatement(node, outermostLabeledStatement);
-                case 239 /* ForOfStatement */:
+                case 240 /* ForOfStatement */:
                     return visitForOfStatement(node, outermostLabeledStatement);
             }
         }
@@ -91168,9 +93881,9 @@ var ts;
             var numInitialProperties = -1, hasComputed = false;
             for (var i = 0; i < properties.length; i++) {
                 var property = properties[i];
-                if ((property.transformFlags & 262144 /* ContainsYield */ &&
+                if ((property.transformFlags & 524288 /* ContainsYield */ &&
                     hierarchyFacts & 4 /* AsyncFunctionBody */)
-                    || (hasComputed = ts.Debug.checkDefined(property.name).kind === 158 /* ComputedPropertyName */)) {
+                    || (hasComputed = ts.Debug.checkDefined(property.name).kind === 159 /* ComputedPropertyName */)) {
                     numInitialProperties = i;
                     break;
                 }
@@ -91273,24 +93986,24 @@ var ts;
                     loop = convert(node, outermostLabeledStatement, bodyFunction.part, ancestorFacts);
                 }
                 else {
-                    var clone_3 = convertIterationStatementCore(node, initializerFunction, factory.createBlock(bodyFunction.part, /*multiLine*/ true));
-                    loop = factory.restoreEnclosingLabel(clone_3, outermostLabeledStatement, convertedLoopState && resetLabel);
+                    var clone_4 = convertIterationStatementCore(node, initializerFunction, factory.createBlock(bodyFunction.part, /*multiLine*/ true));
+                    loop = factory.restoreEnclosingLabel(clone_4, outermostLabeledStatement, convertedLoopState && resetLabel);
                 }
             }
             else {
-                var clone_4 = convertIterationStatementCore(node, initializerFunction, ts.visitNode(node.statement, visitor, ts.isStatement, factory.liftToBlock));
-                loop = factory.restoreEnclosingLabel(clone_4, outermostLabeledStatement, convertedLoopState && resetLabel);
+                var clone_5 = convertIterationStatementCore(node, initializerFunction, ts.visitNode(node.statement, visitor, ts.isStatement, factory.liftToBlock));
+                loop = factory.restoreEnclosingLabel(clone_5, outermostLabeledStatement, convertedLoopState && resetLabel);
             }
             statements.push(loop);
             return statements;
         }
         function convertIterationStatementCore(node, initializerFunction, convertedLoopBody) {
             switch (node.kind) {
-                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);
+                case 238 /* ForStatement */: return convertForStatement(node, initializerFunction, convertedLoopBody);
+                case 239 /* ForInStatement */: return convertForInStatement(node, convertedLoopBody);
+                case 240 /* ForOfStatement */: return convertForOfStatement(node, convertedLoopBody);
+                case 236 /* DoStatement */: return convertDoStatement(node, convertedLoopBody);
+                case 237 /* WhileStatement */: return convertWhileStatement(node, convertedLoopBody);
                 default: return ts.Debug.failBadSyntaxKind(node, "IterationStatement expected");
             }
         }
@@ -91315,11 +94028,11 @@ var ts;
         function createConvertedLoopState(node) {
             var loopInitializer;
             switch (node.kind) {
-                case 237 /* ForStatement */:
-                case 238 /* ForInStatement */:
-                case 239 /* ForOfStatement */:
+                case 238 /* ForStatement */:
+                case 239 /* ForInStatement */:
+                case 240 /* ForOfStatement */:
                     var initializer = node.initializer;
-                    if (initializer && initializer.kind === 250 /* VariableDeclarationList */) {
+                    if (initializer && initializer.kind === 251 /* VariableDeclarationList */) {
                         loopInitializer = initializer;
                     }
                     break;
@@ -91439,7 +94152,7 @@ var ts;
          */
         function createFunctionForInitializerOfForStatement(node, currentState) {
             var functionName = factory.createUniqueName("_loop_init");
-            var containsYield = (node.initializer.transformFlags & 262144 /* ContainsYield */) !== 0;
+            var containsYield = (node.initializer.transformFlags & 524288 /* ContainsYield */) !== 0;
             var emitFlags = 0 /* None */;
             if (currentState.containsLexicalThis)
                 emitFlags |= 8 /* CapturesThis */;
@@ -91554,7 +94267,7 @@ var ts;
             var loopBody = factory.createBlock(statements, /*multiLine*/ true);
             if (ts.isBlock(statement))
                 ts.setOriginalNode(loopBody, statement);
-            var containsYield = (node.statement.transformFlags & 262144 /* ContainsYield */) !== 0;
+            var containsYield = (node.statement.transformFlags & 524288 /* ContainsYield */) !== 0;
             var emitFlags = 524288 /* ReuseTempVariableScope */;
             if (currentState.containsLexicalThis)
                 emitFlags |= 8 /* CapturesThis */;
@@ -91727,20 +94440,20 @@ var ts;
             for (var i = start; i < numProperties; i++) {
                 var property = properties[i];
                 switch (property.kind) {
-                    case 167 /* GetAccessor */:
-                    case 168 /* SetAccessor */:
+                    case 168 /* GetAccessor */:
+                    case 169 /* SetAccessor */:
                         var accessors = ts.getAllAccessorDeclarations(node.properties, property);
                         if (property === accessors.firstAccessor) {
                             expressions.push(transformAccessorsToExpression(receiver, accessors, node, !!node.multiLine));
                         }
                         break;
-                    case 165 /* MethodDeclaration */:
+                    case 166 /* MethodDeclaration */:
                         expressions.push(transformObjectLiteralMethodDeclarationToExpression(property, receiver, node, node.multiLine));
                         break;
-                    case 288 /* PropertyAssignment */:
+                    case 289 /* PropertyAssignment */:
                         expressions.push(transformPropertyAssignmentToExpression(property, receiver, node.multiLine));
                         break;
-                    case 289 /* ShorthandPropertyAssignment */:
+                    case 290 /* ShorthandPropertyAssignment */:
                         expressions.push(transformShorthandPropertyAssignmentToExpression(property, receiver, node.multiLine));
                         break;
                     default:
@@ -91847,7 +94560,7 @@ var ts;
             var updated;
             var parameters = ts.visitParameterList(node.parameters, visitor, context);
             var body = transformFunctionBody(node);
-            if (node.kind === 167 /* GetAccessor */) {
+            if (node.kind === 168 /* GetAccessor */) {
                 updated = factory.updateGetAccessorDeclaration(node, node.decorators, node.modifiers, node.name, parameters, node.type, body);
             }
             else {
@@ -92027,7 +94740,7 @@ var ts;
         function visitCallExpressionWithPotentialCapturedThisAssignment(node, assignToCapturedThis) {
             // We are here either because SuperKeyword was used somewhere in the expression, or
             // because we contain a SpreadElementExpression.
-            if (node.transformFlags & 8192 /* ContainsRestOrSpread */ ||
+            if (node.transformFlags & 16384 /* ContainsRestOrSpread */ ||
                 node.expression.kind === 105 /* SuperKeyword */ ||
                 ts.isSuperProperty(ts.skipOuterExpressions(node.expression))) {
                 var _a = factory.createCallBinding(node.expression, hoistVariableDeclaration), target = _a.target, thisArg = _a.thisArg;
@@ -92035,7 +94748,7 @@ var ts;
                     ts.setEmitFlags(thisArg, 4 /* NoSubstitution */);
                 }
                 var resultingCall = void 0;
-                if (node.transformFlags & 8192 /* ContainsRestOrSpread */) {
+                if (node.transformFlags & 16384 /* ContainsRestOrSpread */) {
                     // [source]
                     //      f(...a, b)
                     //      x.m(...a, b)
@@ -92353,13 +95066,13 @@ var ts;
             if ((enabledSubstitutions & 1 /* CapturedThis */) === 0) {
                 enabledSubstitutions |= 1 /* CapturedThis */;
                 context.enableSubstitution(107 /* ThisKeyword */);
-                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 */);
+                context.enableEmitNotification(167 /* Constructor */);
+                context.enableEmitNotification(166 /* MethodDeclaration */);
+                context.enableEmitNotification(168 /* GetAccessor */);
+                context.enableEmitNotification(169 /* SetAccessor */);
+                context.enableEmitNotification(210 /* ArrowFunction */);
+                context.enableEmitNotification(209 /* FunctionExpression */);
+                context.enableEmitNotification(252 /* FunctionDeclaration */);
             }
         }
         /**
@@ -92400,10 +95113,10 @@ var ts;
          */
         function isNameOfDeclarationWithCollidingName(node) {
             switch (node.parent.kind) {
-                case 198 /* BindingElement */:
-                case 252 /* ClassDeclaration */:
-                case 255 /* EnumDeclaration */:
-                case 249 /* VariableDeclaration */:
+                case 199 /* BindingElement */:
+                case 253 /* ClassDeclaration */:
+                case 256 /* EnumDeclaration */:
+                case 250 /* VariableDeclaration */:
                     return node.parent.name === node
                         && resolver.isDeclarationWithCollidingName(node.parent);
             }
@@ -92485,11 +95198,11 @@ var ts;
                 return false;
             }
             var statement = ts.firstOrUndefined(constructor.body.statements);
-            if (!statement || !ts.nodeIsSynthesized(statement) || statement.kind !== 233 /* ExpressionStatement */) {
+            if (!statement || !ts.nodeIsSynthesized(statement) || statement.kind !== 234 /* ExpressionStatement */) {
                 return false;
             }
             var statementExpression = statement.expression;
-            if (!ts.nodeIsSynthesized(statementExpression) || statementExpression.kind !== 203 /* CallExpression */) {
+            if (!ts.nodeIsSynthesized(statementExpression) || statementExpression.kind !== 204 /* CallExpression */) {
                 return false;
             }
             var callTarget = statementExpression.expression;
@@ -92497,7 +95210,7 @@ var ts;
                 return false;
             }
             var callArgument = ts.singleOrUndefined(statementExpression.arguments);
-            if (!callArgument || !ts.nodeIsSynthesized(callArgument) || callArgument.kind !== 220 /* SpreadElement */) {
+            if (!callArgument || !ts.nodeIsSynthesized(callArgument) || callArgument.kind !== 221 /* SpreadElement */) {
                 return false;
             }
             var expression = callArgument.expression;
@@ -92523,15 +95236,15 @@ var ts;
         if (compilerOptions.jsx === 1 /* Preserve */ || compilerOptions.jsx === 3 /* ReactNative */) {
             previousOnEmitNode = context.onEmitNode;
             context.onEmitNode = onEmitNode;
-            context.enableEmitNotification(275 /* JsxOpeningElement */);
-            context.enableEmitNotification(276 /* JsxClosingElement */);
-            context.enableEmitNotification(274 /* JsxSelfClosingElement */);
+            context.enableEmitNotification(276 /* JsxOpeningElement */);
+            context.enableEmitNotification(277 /* JsxClosingElement */);
+            context.enableEmitNotification(275 /* JsxSelfClosingElement */);
             noSubstitution = [];
         }
         var previousOnSubstituteNode = context.onSubstituteNode;
         context.onSubstituteNode = onSubstituteNode;
-        context.enableSubstitution(201 /* PropertyAccessExpression */);
-        context.enableSubstitution(288 /* PropertyAssignment */);
+        context.enableSubstitution(202 /* PropertyAccessExpression */);
+        context.enableSubstitution(289 /* PropertyAssignment */);
         return ts.chainBundle(context, transformSourceFile);
         /**
          * Transforms an ES5 source file to ES3.
@@ -92550,9 +95263,9 @@ var ts;
          */
         function onEmitNode(hint, node, emitCallback) {
             switch (node.kind) {
-                case 275 /* JsxOpeningElement */:
-                case 276 /* JsxClosingElement */:
-                case 274 /* JsxSelfClosingElement */:
+                case 276 /* JsxOpeningElement */:
+                case 277 /* JsxClosingElement */:
+                case 275 /* JsxSelfClosingElement */:
                     var tagName = node.tagName;
                     noSubstitution[ts.getOriginalNodeId(tagName)] = true;
                     break;
@@ -92850,7 +95563,7 @@ var ts;
         var withBlockStack; // A stack containing `with` blocks.
         return ts.chainBundle(context, transformSourceFile);
         function transformSourceFile(node) {
-            if (node.isDeclarationFile || (node.transformFlags & 512 /* ContainsGenerator */) === 0) {
+            if (node.isDeclarationFile || (node.transformFlags & 1024 /* ContainsGenerator */) === 0) {
                 return node;
             }
             var visited = ts.visitEachChild(node, visitor, context);
@@ -92873,7 +95586,7 @@ var ts;
             else if (ts.isFunctionLikeDeclaration(node) && node.asteriskToken) {
                 return visitGenerator(node);
             }
-            else if (transformFlags & 512 /* ContainsGenerator */) {
+            else if (transformFlags & 1024 /* ContainsGenerator */) {
                 return ts.visitEachChild(node, visitor, context);
             }
             else {
@@ -92887,13 +95600,13 @@ var ts;
          */
         function visitJavaScriptInStatementContainingYield(node) {
             switch (node.kind) {
-                case 235 /* DoStatement */:
+                case 236 /* DoStatement */:
                     return visitDoStatement(node);
-                case 236 /* WhileStatement */:
+                case 237 /* WhileStatement */:
                     return visitWhileStatement(node);
-                case 244 /* SwitchStatement */:
+                case 245 /* SwitchStatement */:
                     return visitSwitchStatement(node);
-                case 245 /* LabeledStatement */:
+                case 246 /* LabeledStatement */:
                     return visitLabeledStatement(node);
                 default:
                     return visitJavaScriptInGeneratorFunctionBody(node);
@@ -92906,30 +95619,30 @@ var ts;
          */
         function visitJavaScriptInGeneratorFunctionBody(node) {
             switch (node.kind) {
-                case 251 /* FunctionDeclaration */:
+                case 252 /* FunctionDeclaration */:
                     return visitFunctionDeclaration(node);
-                case 208 /* FunctionExpression */:
+                case 209 /* FunctionExpression */:
                     return visitFunctionExpression(node);
-                case 167 /* GetAccessor */:
-                case 168 /* SetAccessor */:
+                case 168 /* GetAccessor */:
+                case 169 /* SetAccessor */:
                     return visitAccessorDeclaration(node);
-                case 232 /* VariableStatement */:
+                case 233 /* VariableStatement */:
                     return visitVariableStatement(node);
-                case 237 /* ForStatement */:
+                case 238 /* ForStatement */:
                     return visitForStatement(node);
-                case 238 /* ForInStatement */:
+                case 239 /* ForInStatement */:
                     return visitForInStatement(node);
-                case 241 /* BreakStatement */:
+                case 242 /* BreakStatement */:
                     return visitBreakStatement(node);
-                case 240 /* ContinueStatement */:
+                case 241 /* ContinueStatement */:
                     return visitContinueStatement(node);
-                case 242 /* ReturnStatement */:
+                case 243 /* ReturnStatement */:
                     return visitReturnStatement(node);
                 default:
-                    if (node.transformFlags & 262144 /* ContainsYield */) {
+                    if (node.transformFlags & 524288 /* ContainsYield */) {
                         return visitJavaScriptContainingYield(node);
                     }
-                    else if (node.transformFlags & (512 /* ContainsGenerator */ | 1048576 /* ContainsHoistedDeclarationOrCompletion */)) {
+                    else if (node.transformFlags & (1024 /* ContainsGenerator */ | 2097152 /* ContainsHoistedDeclarationOrCompletion */)) {
                         return ts.visitEachChild(node, visitor, context);
                     }
                     else {
@@ -92944,23 +95657,23 @@ var ts;
          */
         function visitJavaScriptContainingYield(node) {
             switch (node.kind) {
-                case 216 /* BinaryExpression */:
+                case 217 /* BinaryExpression */:
                     return visitBinaryExpression(node);
-                case 337 /* CommaListExpression */:
+                case 341 /* CommaListExpression */:
                     return visitCommaListExpression(node);
-                case 217 /* ConditionalExpression */:
+                case 218 /* ConditionalExpression */:
                     return visitConditionalExpression(node);
-                case 219 /* YieldExpression */:
+                case 220 /* YieldExpression */:
                     return visitYieldExpression(node);
-                case 199 /* ArrayLiteralExpression */:
+                case 200 /* ArrayLiteralExpression */:
                     return visitArrayLiteralExpression(node);
-                case 200 /* ObjectLiteralExpression */:
+                case 201 /* ObjectLiteralExpression */:
                     return visitObjectLiteralExpression(node);
-                case 202 /* ElementAccessExpression */:
+                case 203 /* ElementAccessExpression */:
                     return visitElementAccessExpression(node);
-                case 203 /* CallExpression */:
+                case 204 /* CallExpression */:
                     return visitCallExpression(node);
-                case 204 /* NewExpression */:
+                case 205 /* NewExpression */:
                     return visitNewExpression(node);
                 default:
                     return ts.visitEachChild(node, visitor, context);
@@ -92973,9 +95686,9 @@ var ts;
          */
         function visitGenerator(node) {
             switch (node.kind) {
-                case 251 /* FunctionDeclaration */:
+                case 252 /* FunctionDeclaration */:
                     return visitFunctionDeclaration(node);
-                case 208 /* FunctionExpression */:
+                case 209 /* FunctionExpression */:
                     return visitFunctionExpression(node);
                 default:
                     return ts.Debug.failBadSyntaxKind(node);
@@ -93134,7 +95847,7 @@ var ts;
          * @param node The node to visit.
          */
         function visitVariableStatement(node) {
-            if (node.transformFlags & 262144 /* ContainsYield */) {
+            if (node.transformFlags & 524288 /* ContainsYield */) {
                 transformAndEmitVariableDeclarationList(node.declarationList);
                 return undefined;
             }
@@ -93183,7 +95896,7 @@ var ts;
             if (containsYield(right)) {
                 var target = void 0;
                 switch (left.kind) {
-                    case 201 /* PropertyAccessExpression */:
+                    case 202 /* PropertyAccessExpression */:
                         // [source]
                         //      a.b = yield;
                         //
@@ -93195,7 +95908,7 @@ var ts;
                         //      _a.b = %sent%;
                         target = factory.updatePropertyAccessExpression(left, cacheExpression(ts.visitNode(left.expression, visitor, ts.isLeftHandSideExpression)), left.name);
                         break;
-                    case 202 /* ElementAccessExpression */:
+                    case 203 /* ElementAccessExpression */:
                         // [source]
                         //      a[b] = yield;
                         //
@@ -93589,35 +96302,35 @@ var ts;
         }
         function transformAndEmitStatementWorker(node) {
             switch (node.kind) {
-                case 230 /* Block */:
+                case 231 /* Block */:
                     return transformAndEmitBlock(node);
-                case 233 /* ExpressionStatement */:
+                case 234 /* ExpressionStatement */:
                     return transformAndEmitExpressionStatement(node);
-                case 234 /* IfStatement */:
+                case 235 /* IfStatement */:
                     return transformAndEmitIfStatement(node);
-                case 235 /* DoStatement */:
+                case 236 /* DoStatement */:
                     return transformAndEmitDoStatement(node);
-                case 236 /* WhileStatement */:
+                case 237 /* WhileStatement */:
                     return transformAndEmitWhileStatement(node);
-                case 237 /* ForStatement */:
+                case 238 /* ForStatement */:
                     return transformAndEmitForStatement(node);
-                case 238 /* ForInStatement */:
+                case 239 /* ForInStatement */:
                     return transformAndEmitForInStatement(node);
-                case 240 /* ContinueStatement */:
+                case 241 /* ContinueStatement */:
                     return transformAndEmitContinueStatement(node);
-                case 241 /* BreakStatement */:
+                case 242 /* BreakStatement */:
                     return transformAndEmitBreakStatement(node);
-                case 242 /* ReturnStatement */:
+                case 243 /* ReturnStatement */:
                     return transformAndEmitReturnStatement(node);
-                case 243 /* WithStatement */:
+                case 244 /* WithStatement */:
                     return transformAndEmitWithStatement(node);
-                case 244 /* SwitchStatement */:
+                case 245 /* SwitchStatement */:
                     return transformAndEmitSwitchStatement(node);
-                case 245 /* LabeledStatement */:
+                case 246 /* LabeledStatement */:
                     return transformAndEmitLabeledStatement(node);
-                case 246 /* ThrowStatement */:
+                case 247 /* ThrowStatement */:
                     return transformAndEmitThrowStatement(node);
-                case 247 /* TryStatement */:
+                case 248 /* TryStatement */:
                     return transformAndEmitTryStatement(node);
                 default:
                     return emitStatement(ts.visitNode(node, visitor, ts.isStatement));
@@ -93837,7 +96550,7 @@ var ts;
                 var variables = ts.getInitializedVariables(initializer);
                 node = factory.updateForStatement(node, variables.length > 0
                     ? factory.inlineExpressions(ts.map(variables, transformInitializedVariable))
-                    : undefined, ts.visitNode(node.condition, visitor, ts.isExpression), ts.visitNode(node.incrementor, visitor, ts.isExpression), ts.visitNode(node.statement, visitor, ts.isStatement, factory.liftToBlock));
+                    : undefined, ts.visitNode(node.condition, visitor, ts.isExpression), ts.visitNode(node.incrementor, visitor, ts.isExpression), ts.visitIterationBody(node.statement, visitor, context));
             }
             else {
                 node = ts.visitEachChild(node, visitor, context);
@@ -94047,7 +96760,7 @@ var ts;
                 for (var i = 0; i < numClauses; i++) {
                     var clause = caseBlock.clauses[i];
                     clauseLabels.push(defineLabel());
-                    if (clause.kind === 285 /* DefaultClause */ && defaultClauseIndex === -1) {
+                    if (clause.kind === 286 /* DefaultClause */ && defaultClauseIndex === -1) {
                         defaultClauseIndex = i;
                     }
                 }
@@ -94060,7 +96773,7 @@ var ts;
                     var defaultClausesSkipped = 0;
                     for (var i = clausesWritten; i < numClauses; i++) {
                         var clause = caseBlock.clauses[i];
-                        if (clause.kind === 284 /* CaseClause */) {
+                        if (clause.kind === 285 /* CaseClause */) {
                             if (containsYield(clause.expression) && pendingClauses.length > 0) {
                                 break;
                             }
@@ -94192,7 +96905,7 @@ var ts;
             }
         }
         function containsYield(node) {
-            return !!node && (node.transformFlags & 262144 /* ContainsYield */) !== 0;
+            return !!node && (node.transformFlags & 524288 /* ContainsYield */) !== 0;
         }
         function countInitialNodesWithoutYield(nodes) {
             var numNodes = nodes.length;
@@ -94225,10 +96938,10 @@ var ts;
                         var name = renamedCatchVariableDeclarations[ts.getOriginalNodeId(declaration)];
                         if (name) {
                             // TODO(rbuckton): Does this need to be parented?
-                            var clone_5 = ts.setParent(ts.setTextRange(factory.cloneNode(name), name), name.parent);
-                            ts.setSourceMapRange(clone_5, node);
-                            ts.setCommentRange(clone_5, node);
-                            return clone_5;
+                            var clone_6 = ts.setParent(ts.setTextRange(factory.cloneNode(name), name), name.parent);
+                            ts.setSourceMapRange(clone_6, node);
+                            ts.setCommentRange(clone_6, node);
+                            return clone_6;
                         }
                     }
                 }
@@ -95221,11 +97934,11 @@ var ts;
         context.onSubstituteNode = onSubstituteNode;
         context.onEmitNode = onEmitNode;
         context.enableSubstitution(78 /* Identifier */); // Substitutes expression identifiers with imported/exported 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(289 /* ShorthandPropertyAssignment */); // Substitutes shorthand property assignments for imported/exported symbols.
-        context.enableEmitNotification(297 /* SourceFile */); // Restore state when substituting nodes in a file.
+        context.enableSubstitution(217 /* BinaryExpression */); // Substitutes assignments to exported symbols.
+        context.enableSubstitution(215 /* PrefixUnaryExpression */); // Substitutes updates to exported symbols.
+        context.enableSubstitution(216 /* PostfixUnaryExpression */); // Substitutes updates to exported symbols.
+        context.enableSubstitution(290 /* ShorthandPropertyAssignment */); // Substitutes shorthand property assignments for imported/exported symbols.
+        context.enableEmitNotification(298 /* 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.
@@ -95241,7 +97954,7 @@ var ts;
         function transformSourceFile(node) {
             if (node.isDeclarationFile ||
                 !(ts.isEffectiveExternalModule(node, compilerOptions) ||
-                    node.transformFlags & 2097152 /* ContainsDynamicImport */ ||
+                    node.transformFlags & 4194304 /* ContainsDynamicImport */ ||
                     (ts.isJsonSourceFile(node) && ts.hasJsonModuleEmitEnabled(compilerOptions) && ts.outFile(compilerOptions)))) {
                 return node;
             }
@@ -95553,23 +98266,23 @@ var ts;
          */
         function sourceElementVisitor(node) {
             switch (node.kind) {
-                case 261 /* ImportDeclaration */:
+                case 262 /* ImportDeclaration */:
                     return visitImportDeclaration(node);
-                case 260 /* ImportEqualsDeclaration */:
+                case 261 /* ImportEqualsDeclaration */:
                     return visitImportEqualsDeclaration(node);
-                case 267 /* ExportDeclaration */:
+                case 268 /* ExportDeclaration */:
                     return visitExportDeclaration(node);
-                case 266 /* ExportAssignment */:
+                case 267 /* ExportAssignment */:
                     return visitExportAssignment(node);
-                case 232 /* VariableStatement */:
+                case 233 /* VariableStatement */:
                     return visitVariableStatement(node);
-                case 251 /* FunctionDeclaration */:
+                case 252 /* FunctionDeclaration */:
                     return visitFunctionDeclaration(node);
-                case 252 /* ClassDeclaration */:
+                case 253 /* ClassDeclaration */:
                     return visitClassDeclaration(node);
-                case 338 /* MergeDeclarationMarker */:
+                case 342 /* MergeDeclarationMarker */:
                     return visitMergeDeclarationMarker(node);
-                case 339 /* EndOfDeclarationMarker */:
+                case 343 /* EndOfDeclarationMarker */:
                     return visitEndOfDeclarationMarker(node);
                 default:
                     return ts.visitEachChild(node, moduleExpressionElementVisitor, context);
@@ -95578,7 +98291,7 @@ var ts;
         function moduleExpressionElementVisitor(node) {
             // This visitor does not need to descend into the tree if there is no dynamic import or destructuring assignment,
             // as export/import statements are only transformed at the top level of a file.
-            if (!(node.transformFlags & 2097152 /* ContainsDynamicImport */) && !(node.transformFlags & 1024 /* ContainsDestructuringAssignment */)) {
+            if (!(node.transformFlags & 4194304 /* ContainsDynamicImport */) && !(node.transformFlags & 2048 /* ContainsDestructuringAssignment */)) {
                 return node;
             }
             if (ts.isImportCall(node)) {
@@ -95596,24 +98309,24 @@ var ts;
                 for (var _i = 0, _a = node.properties; _i < _a.length; _i++) {
                     var elem = _a[_i];
                     switch (elem.kind) {
-                        case 288 /* PropertyAssignment */:
+                        case 289 /* PropertyAssignment */:
                             if (destructuringNeedsFlattening(elem.initializer)) {
                                 return true;
                             }
                             break;
-                        case 289 /* ShorthandPropertyAssignment */:
+                        case 290 /* ShorthandPropertyAssignment */:
                             if (destructuringNeedsFlattening(elem.name)) {
                                 return true;
                             }
                             break;
-                        case 290 /* SpreadAssignment */:
+                        case 291 /* SpreadAssignment */:
                             if (destructuringNeedsFlattening(elem.expression)) {
                                 return true;
                             }
                             break;
-                        case 165 /* MethodDeclaration */:
-                        case 167 /* GetAccessor */:
-                        case 168 /* SetAccessor */:
+                        case 166 /* MethodDeclaration */:
+                        case 168 /* GetAccessor */:
+                        case 169 /* SetAccessor */:
                             return false;
                         default: ts.Debug.assertNever(elem, "Unhandled object member kind");
                     }
@@ -95648,7 +98361,7 @@ var ts;
             var firstArgument = ts.visitNode(ts.firstOrUndefined(node.arguments), moduleExpressionElementVisitor);
             // Only use the external module name if it differs from the first argument. This allows us to preserve the quote style of the argument on output.
             var argument = externalModuleName && (!firstArgument || !ts.isStringLiteral(firstArgument) || firstArgument.text !== externalModuleName.text) ? externalModuleName : firstArgument;
-            var containsLexicalThis = !!(node.transformFlags & 4096 /* ContainsLexicalThis */);
+            var containsLexicalThis = !!(node.transformFlags & 8192 /* ContainsLexicalThis */);
             switch (compilerOptions.module) {
                 case ts.ModuleKind.AMD:
                     return createImportCallExpressionAMD(argument, containsLexicalThis);
@@ -96141,7 +98854,7 @@ var ts;
             //
             // To balance the declaration, add the exports of the elided variable
             // statement.
-            if (hasAssociatedEndOfDeclarationMarker(node) && node.original.kind === 232 /* VariableStatement */) {
+            if (hasAssociatedEndOfDeclarationMarker(node) && node.original.kind === 233 /* VariableStatement */) {
                 var id = ts.getOriginalNodeId(node);
                 deferredExports[id] = appendExportsOfVariableStatement(deferredExports[id], node.original);
             }
@@ -96196,10 +98909,10 @@ var ts;
             var namedBindings = importClause.namedBindings;
             if (namedBindings) {
                 switch (namedBindings.kind) {
-                    case 263 /* NamespaceImport */:
+                    case 264 /* NamespaceImport */:
                         statements = appendExportsOfDeclaration(statements, namedBindings);
                         break;
-                    case 264 /* NamedImports */:
+                    case 265 /* NamedImports */:
                         for (var _i = 0, _a = namedBindings.elements; _i < _a.length; _i++) {
                             var importBinding = _a[_i];
                             statements = appendExportsOfDeclaration(statements, importBinding, /* liveBinding */ true);
@@ -96412,7 +99125,7 @@ var ts;
          * @param emit A callback used to emit the node in the printer.
          */
         function onEmitNode(hint, node, emitCallback) {
-            if (node.kind === 297 /* SourceFile */) {
+            if (node.kind === 298 /* SourceFile */) {
                 currentSourceFile = node;
                 currentModuleInfo = moduleInfoMap[ts.getOriginalNodeId(currentSourceFile)];
                 noSubstitution = [];
@@ -96476,10 +99189,10 @@ var ts;
             switch (node.kind) {
                 case 78 /* Identifier */:
                     return substituteExpressionIdentifier(node);
-                case 216 /* BinaryExpression */:
+                case 217 /* BinaryExpression */:
                     return substituteBinaryExpression(node);
-                case 215 /* PostfixUnaryExpression */:
-                case 214 /* PrefixUnaryExpression */:
+                case 216 /* PostfixUnaryExpression */:
+                case 215 /* PrefixUnaryExpression */:
                     return substituteUnaryExpression(node);
             }
             return node;
@@ -96499,9 +99212,9 @@ var ts;
                 }
                 return node;
             }
-            if (!(ts.isGeneratedIdentifier(node) && !(node.autoGenerateFlags & 64 /* AllowNameSubstitution */)) && !ts.isLocalName(node)) {
+            else if (!(ts.isGeneratedIdentifier(node) && !(node.autoGenerateFlags & 64 /* AllowNameSubstitution */)) && !ts.isLocalName(node)) {
                 var exportContainer = resolver.getReferencedExportContainer(node, ts.isExportName(node));
-                if (exportContainer && exportContainer.kind === 297 /* SourceFile */) {
+                if (exportContainer && exportContainer.kind === 298 /* SourceFile */) {
                     return ts.setTextRange(factory.createPropertyAccessExpression(factory.createIdentifier("exports"), factory.cloneNode(node)), 
                     /*location*/ node);
                 }
@@ -96576,15 +99289,21 @@ var ts;
                 && !ts.isDeclarationNameOfEnumOrNamespace(node.operand)) {
                 var exportedNames = getExports(node.operand);
                 if (exportedNames) {
-                    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)), 
+                    var expression = node.kind === 216 /* PostfixUnaryExpression */
+                        ? ts.setTextRange(factory.createPrefixUnaryExpression(node.operator, node.operand), 
                         /*location*/ node)
                         : node;
                     for (var _i = 0, exportedNames_3 = exportedNames; _i < exportedNames_3.length; _i++) {
                         var exportName = exportedNames_3[_i];
                         // Mark the node to prevent triggering this rule again.
                         noSubstitution[ts.getNodeId(expression)] = true;
-                        expression = factory.createParenthesizedExpression(createExportExpression(exportName, expression));
+                        expression = createExportExpression(exportName, expression);
+                    }
+                    if (node.kind === 216 /* PostfixUnaryExpression */) {
+                        noSubstitution[ts.getNodeId(expression)] = true;
+                        expression = node.operator === 45 /* PlusPlusToken */
+                            ? factory.createSubtract(expression, factory.createNumericLiteral(1))
+                            : factory.createAdd(expression, factory.createNumericLiteral(1));
                     }
                     return expression;
                 }
@@ -96628,12 +99347,12 @@ var ts;
         context.onSubstituteNode = onSubstituteNode;
         context.onEmitNode = onEmitNode;
         context.enableSubstitution(78 /* Identifier */); // Substitutes expression identifiers for imported symbols.
-        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.
+        context.enableSubstitution(290 /* ShorthandPropertyAssignment */); // Substitutes expression identifiers for imported symbols
+        context.enableSubstitution(217 /* BinaryExpression */); // Substitutes assignments to exported symbols.
+        context.enableSubstitution(215 /* PrefixUnaryExpression */); // Substitutes updates to exported symbols.
+        context.enableSubstitution(216 /* PostfixUnaryExpression */); // Substitutes updates to exported symbols.
+        context.enableSubstitution(227 /* MetaProperty */); // Substitutes 'import.meta'
+        context.enableEmitNotification(298 /* 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.
@@ -96653,7 +99372,7 @@ var ts;
          * @param node The SourceFile node.
          */
         function transformSourceFile(node) {
-            if (node.isDeclarationFile || !(ts.isEffectiveExternalModule(node, compilerOptions) || node.transformFlags & 2097152 /* ContainsDynamicImport */)) {
+            if (node.isDeclarationFile || !(ts.isEffectiveExternalModule(node, compilerOptions) || node.transformFlags & 4194304 /* ContainsDynamicImport */)) {
                 return node;
             }
             var id = ts.getOriginalNodeId(node);
@@ -96822,7 +99541,7 @@ var ts;
             // - Temporary variables will appear at the top rather than at the bottom of the file
             ts.insertStatementsAfterStandardPrologue(statements, endLexicalEnvironment());
             var exportStarFunction = addExportStarIfNeeded(statements); // TODO: GH#18217
-            var modifiers = node.transformFlags & 524288 /* ContainsAwait */ ?
+            var modifiers = node.transformFlags & 1048576 /* ContainsAwait */ ?
                 factory.createModifiersFromModifierFlags(256 /* Async */) :
                 undefined;
             var moduleObject = factory.createObjectLiteralExpression([
@@ -96857,7 +99576,7 @@ var ts;
                 var hasExportDeclarationWithExportClause = false;
                 for (var _i = 0, _a = moduleInfo.externalImports; _i < _a.length; _i++) {
                     var externalImport = _a[_i];
-                    if (externalImport.kind === 267 /* ExportDeclaration */ && externalImport.exportClause) {
+                    if (externalImport.kind === 268 /* ExportDeclaration */ && externalImport.exportClause) {
                         hasExportDeclarationWithExportClause = true;
                         break;
                     }
@@ -96947,19 +99666,19 @@ var ts;
                     var entry = _b[_a];
                     var importVariableName = ts.getLocalNameForExternalImport(factory, entry, currentSourceFile); // TODO: GH#18217
                     switch (entry.kind) {
-                        case 261 /* ImportDeclaration */:
+                        case 262 /* ImportDeclaration */:
                             if (!entry.importClause) {
                                 // 'import "..."' case
                                 // module is imported only for side-effects, no emit required
                                 break;
                             }
                         // falls through
-                        case 260 /* ImportEqualsDeclaration */:
+                        case 261 /* ImportEqualsDeclaration */:
                             ts.Debug.assert(importVariableName !== undefined);
                             // save import into the local
                             statements.push(factory.createExpressionStatement(factory.createAssignment(importVariableName, parameterName)));
                             break;
-                        case 267 /* ExportDeclaration */:
+                        case 268 /* ExportDeclaration */:
                             ts.Debug.assert(importVariableName !== undefined);
                             if (entry.exportClause) {
                                 if (ts.isNamedExports(entry.exportClause)) {
@@ -97018,13 +99737,13 @@ var ts;
          */
         function sourceElementVisitor(node) {
             switch (node.kind) {
-                case 261 /* ImportDeclaration */:
+                case 262 /* ImportDeclaration */:
                     return visitImportDeclaration(node);
-                case 260 /* ImportEqualsDeclaration */:
+                case 261 /* ImportEqualsDeclaration */:
                     return visitImportEqualsDeclaration(node);
-                case 267 /* ExportDeclaration */:
+                case 268 /* ExportDeclaration */:
                     return visitExportDeclaration(node);
-                case 266 /* ExportAssignment */:
+                case 267 /* ExportAssignment */:
                     return visitExportAssignment(node);
                 default:
                     return nestedElementVisitor(node);
@@ -97204,7 +99923,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 === 297 /* SourceFile */
+                && (enclosingBlockScopedContainer.kind === 298 /* SourceFile */
                     || (ts.getOriginalNode(node).flags & 3 /* BlockScoped */) === 0);
         }
         /**
@@ -97268,7 +99987,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 === 232 /* VariableStatement */) {
+            if (hasAssociatedEndOfDeclarationMarker(node) && node.original.kind === 233 /* VariableStatement */) {
                 var id = ts.getOriginalNodeId(node);
                 var isExportedDeclaration = ts.hasSyntacticModifier(node.original, 1 /* Export */);
                 deferredExports[id] = appendExportsOfVariableStatement(deferredExports[id], node.original, isExportedDeclaration);
@@ -97330,10 +100049,10 @@ var ts;
             var namedBindings = importClause.namedBindings;
             if (namedBindings) {
                 switch (namedBindings.kind) {
-                    case 263 /* NamespaceImport */:
+                    case 264 /* NamespaceImport */:
                         statements = appendExportsOfDeclaration(statements, namedBindings);
                         break;
-                    case 264 /* NamedImports */:
+                    case 265 /* NamedImports */:
                         for (var _i = 0, _a = namedBindings.elements; _i < _a.length; _i++) {
                             var importBinding = _a[_i];
                             statements = appendExportsOfDeclaration(statements, importBinding);
@@ -97513,43 +100232,43 @@ var ts;
          */
         function nestedElementVisitor(node) {
             switch (node.kind) {
-                case 232 /* VariableStatement */:
+                case 233 /* VariableStatement */:
                     return visitVariableStatement(node);
-                case 251 /* FunctionDeclaration */:
+                case 252 /* FunctionDeclaration */:
                     return visitFunctionDeclaration(node);
-                case 252 /* ClassDeclaration */:
+                case 253 /* ClassDeclaration */:
                     return visitClassDeclaration(node);
-                case 237 /* ForStatement */:
+                case 238 /* ForStatement */:
                     return visitForStatement(node);
-                case 238 /* ForInStatement */:
+                case 239 /* ForInStatement */:
                     return visitForInStatement(node);
-                case 239 /* ForOfStatement */:
+                case 240 /* ForOfStatement */:
                     return visitForOfStatement(node);
-                case 235 /* DoStatement */:
+                case 236 /* DoStatement */:
                     return visitDoStatement(node);
-                case 236 /* WhileStatement */:
+                case 237 /* WhileStatement */:
                     return visitWhileStatement(node);
-                case 245 /* LabeledStatement */:
+                case 246 /* LabeledStatement */:
                     return visitLabeledStatement(node);
-                case 243 /* WithStatement */:
+                case 244 /* WithStatement */:
                     return visitWithStatement(node);
-                case 244 /* SwitchStatement */:
+                case 245 /* SwitchStatement */:
                     return visitSwitchStatement(node);
-                case 258 /* CaseBlock */:
+                case 259 /* CaseBlock */:
                     return visitCaseBlock(node);
-                case 284 /* CaseClause */:
+                case 285 /* CaseClause */:
                     return visitCaseClause(node);
-                case 285 /* DefaultClause */:
+                case 286 /* DefaultClause */:
                     return visitDefaultClause(node);
-                case 247 /* TryStatement */:
+                case 248 /* TryStatement */:
                     return visitTryStatement(node);
-                case 287 /* CatchClause */:
+                case 288 /* CatchClause */:
                     return visitCatchClause(node);
-                case 230 /* Block */:
+                case 231 /* Block */:
                     return visitBlock(node);
-                case 338 /* MergeDeclarationMarker */:
+                case 342 /* MergeDeclarationMarker */:
                     return visitMergeDeclarationMarker(node);
-                case 339 /* EndOfDeclarationMarker */:
+                case 343 /* EndOfDeclarationMarker */:
                     return visitEndOfDeclarationMarker(node);
                 default:
                     return destructuringAndImportCallVisitor(node);
@@ -97563,7 +100282,7 @@ var ts;
         function visitForStatement(node) {
             var savedEnclosingBlockScopedContainer = enclosingBlockScopedContainer;
             enclosingBlockScopedContainer = node;
-            node = factory.updateForStatement(node, node.initializer && visitForInitializer(node.initializer), ts.visitNode(node.condition, destructuringAndImportCallVisitor, ts.isExpression), ts.visitNode(node.incrementor, destructuringAndImportCallVisitor, ts.isExpression), ts.visitNode(node.statement, nestedElementVisitor, ts.isStatement));
+            node = factory.updateForStatement(node, node.initializer && visitForInitializer(node.initializer), ts.visitNode(node.condition, destructuringAndImportCallVisitor, ts.isExpression), ts.visitNode(node.incrementor, destructuringAndImportCallVisitor, ts.isExpression), ts.visitIterationBody(node.statement, nestedElementVisitor, context));
             enclosingBlockScopedContainer = savedEnclosingBlockScopedContainer;
             return node;
         }
@@ -97575,7 +100294,7 @@ var ts;
         function visitForInStatement(node) {
             var savedEnclosingBlockScopedContainer = enclosingBlockScopedContainer;
             enclosingBlockScopedContainer = node;
-            node = factory.updateForInStatement(node, visitForInitializer(node.initializer), ts.visitNode(node.expression, destructuringAndImportCallVisitor, ts.isExpression), ts.visitNode(node.statement, nestedElementVisitor, ts.isStatement, factory.liftToBlock));
+            node = factory.updateForInStatement(node, visitForInitializer(node.initializer), ts.visitNode(node.expression, destructuringAndImportCallVisitor, ts.isExpression), ts.visitIterationBody(node.statement, nestedElementVisitor, context));
             enclosingBlockScopedContainer = savedEnclosingBlockScopedContainer;
             return node;
         }
@@ -97587,7 +100306,7 @@ var ts;
         function visitForOfStatement(node) {
             var savedEnclosingBlockScopedContainer = enclosingBlockScopedContainer;
             enclosingBlockScopedContainer = node;
-            node = factory.updateForOfStatement(node, node.awaitModifier, visitForInitializer(node.initializer), ts.visitNode(node.expression, destructuringAndImportCallVisitor, ts.isExpression), ts.visitNode(node.statement, nestedElementVisitor, ts.isStatement, factory.liftToBlock));
+            node = factory.updateForOfStatement(node, node.awaitModifier, visitForInitializer(node.initializer), ts.visitNode(node.expression, destructuringAndImportCallVisitor, ts.isExpression), ts.visitIterationBody(node.statement, nestedElementVisitor, context));
             enclosingBlockScopedContainer = savedEnclosingBlockScopedContainer;
             return node;
         }
@@ -97628,7 +100347,7 @@ var ts;
          * @param node The node to visit.
          */
         function visitDoStatement(node) {
-            return factory.updateDoStatement(node, ts.visitNode(node.statement, nestedElementVisitor, ts.isStatement, factory.liftToBlock), ts.visitNode(node.expression, destructuringAndImportCallVisitor, ts.isExpression));
+            return factory.updateDoStatement(node, ts.visitIterationBody(node.statement, nestedElementVisitor, context), ts.visitNode(node.expression, destructuringAndImportCallVisitor, ts.isExpression));
         }
         /**
          * Visits the body of a WhileStatement to hoist declarations.
@@ -97636,7 +100355,7 @@ var ts;
          * @param node The node to visit.
          */
         function visitWhileStatement(node) {
-            return factory.updateWhileStatement(node, ts.visitNode(node.expression, destructuringAndImportCallVisitor, ts.isExpression), ts.visitNode(node.statement, nestedElementVisitor, ts.isStatement, factory.liftToBlock));
+            return factory.updateWhileStatement(node, ts.visitNode(node.expression, destructuringAndImportCallVisitor, ts.isExpression), ts.visitIterationBody(node.statement, nestedElementVisitor, context));
         }
         /**
          * Visits the body of a LabeledStatement to hoist declarations.
@@ -97737,7 +100456,7 @@ var ts;
             else if (ts.isImportCall(node)) {
                 return visitImportCallExpression(node);
             }
-            else if ((node.transformFlags & 1024 /* ContainsDestructuringAssignment */) || (node.transformFlags & 2097152 /* ContainsDynamicImport */)) {
+            else if ((node.transformFlags & 2048 /* ContainsDestructuringAssignment */) || (node.transformFlags & 4194304 /* ContainsDynamicImport */)) {
                 return ts.visitEachChild(node, destructuringAndImportCallVisitor, context);
             }
             else {
@@ -97775,7 +100494,7 @@ var ts;
             return ts.visitEachChild(node, destructuringAndImportCallVisitor, context);
         }
         /**
-         * Determines whether the target of a destructuring assigment refers to an exported symbol.
+         * Determines whether the target of a destructuring assignment refers to an exported symbol.
          *
          * @param node The destructuring target.
          */
@@ -97800,7 +100519,7 @@ var ts;
             }
             else if (ts.isIdentifier(node)) {
                 var container = resolver.getReferencedExportContainer(node);
-                return container !== undefined && container.kind === 297 /* SourceFile */;
+                return container !== undefined && container.kind === 298 /* SourceFile */;
             }
             else {
                 return false;
@@ -97833,7 +100552,7 @@ var ts;
          * @param emitCallback A callback used to emit the node in the printer.
          */
         function onEmitNode(hint, node, emitCallback) {
-            if (node.kind === 297 /* SourceFile */) {
+            if (node.kind === 298 /* SourceFile */) {
                 var id = ts.getOriginalNodeId(node);
                 currentSourceFile = node;
                 moduleInfo = moduleInfoMap[id];
@@ -97883,7 +100602,7 @@ var ts;
          */
         function substituteUnspecified(node) {
             switch (node.kind) {
-                case 289 /* ShorthandPropertyAssignment */:
+                case 290 /* ShorthandPropertyAssignment */:
                     return substituteShorthandPropertyAssignment(node);
             }
             return node;
@@ -97920,12 +100639,12 @@ var ts;
             switch (node.kind) {
                 case 78 /* Identifier */:
                     return substituteExpressionIdentifier(node);
-                case 216 /* BinaryExpression */:
+                case 217 /* BinaryExpression */:
                     return substituteBinaryExpression(node);
-                case 214 /* PrefixUnaryExpression */:
-                case 215 /* PostfixUnaryExpression */:
+                case 215 /* PrefixUnaryExpression */:
+                case 216 /* PostfixUnaryExpression */:
                     return substituteUnaryExpression(node);
-                case 226 /* MetaProperty */:
+                case 227 /* MetaProperty */:
                     return substituteMetaProperty(node);
             }
             return node;
@@ -98019,14 +100738,14 @@ var ts;
                 && !ts.isDeclarationNameOfEnumOrNamespace(node.operand)) {
                 var exportedNames = getExports(node.operand);
                 if (exportedNames) {
-                    var expression = node.kind === 215 /* PostfixUnaryExpression */
+                    var expression = node.kind === 216 /* 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 === 215 /* PostfixUnaryExpression */) {
+                    if (node.kind === 216 /* PostfixUnaryExpression */) {
                         expression = node.operator === 45 /* PlusPlusToken */
                             ? factory.createSubtract(preventSubstitution(expression), factory.createNumericLiteral(1))
                             : factory.createAdd(preventSubstitution(expression), factory.createNumericLiteral(1));
@@ -98054,7 +100773,7 @@ var ts;
                     || resolver.getReferencedValueDeclaration(name);
                 if (valueDeclaration) {
                     var exportContainer = resolver.getReferencedExportContainer(name, /*prefixLocals*/ false);
-                    if (exportContainer && exportContainer.kind === 297 /* SourceFile */) {
+                    if (exportContainer && exportContainer.kind === 298 /* SourceFile */) {
                         exportedNames = ts.append(exportedNames, factory.getDeclarationName(valueDeclaration));
                     }
                     exportedNames = ts.addRange(exportedNames, moduleInfo && moduleInfo.exportedBindings[ts.getOriginalNodeId(valueDeclaration)]);
@@ -98094,7 +100813,7 @@ var ts;
         var previousOnSubstituteNode = context.onSubstituteNode;
         context.onEmitNode = onEmitNode;
         context.onSubstituteNode = onSubstituteNode;
-        context.enableEmitNotification(297 /* SourceFile */);
+        context.enableEmitNotification(298 /* SourceFile */);
         context.enableSubstitution(78 /* Identifier */);
         var helperNameSubstitutions;
         return ts.chainBundle(context, transformSourceFile);
@@ -98126,12 +100845,12 @@ var ts;
         }
         function visitor(node) {
             switch (node.kind) {
-                case 260 /* ImportEqualsDeclaration */:
+                case 261 /* ImportEqualsDeclaration */:
                     // Elide `import=` as it is not legal with --module ES6
                     return undefined;
-                case 266 /* ExportAssignment */:
+                case 267 /* ExportAssignment */:
                     return visitExportAssignment(node);
-                case 267 /* ExportDeclaration */:
+                case 268 /* ExportDeclaration */:
                     var exportDecl = node;
                     return visitExportDeclaration(exportDecl);
             }
@@ -98266,7 +100985,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 === 252 /* ClassDeclaration */) {
+            else if (node.parent.kind === 253 /* 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 :
@@ -98295,7 +101014,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 === 252 /* ClassDeclaration */) {
+            else if (node.parent.kind === 253 /* 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 :
@@ -98342,7 +101061,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 === 249 /* VariableDeclaration */ || node.kind === 198 /* BindingElement */) {
+            if (node.kind === 250 /* VariableDeclaration */ || node.kind === 199 /* 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 :
@@ -98351,8 +101070,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 === 163 /* PropertyDeclaration */ || node.kind === 201 /* PropertyAccessExpression */ || node.kind === 162 /* PropertySignature */ ||
-                (node.kind === 160 /* Parameter */ && ts.hasSyntacticModifier(node.parent, 8 /* Private */))) {
+            else if (node.kind === 164 /* PropertyDeclaration */ || node.kind === 202 /* PropertyAccessExpression */ || node.kind === 163 /* PropertySignature */ ||
+                (node.kind === 161 /* 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 ?
@@ -98361,7 +101080,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 === 252 /* ClassDeclaration */ || node.kind === 160 /* Parameter */) {
+                else if (node.parent.kind === 253 /* ClassDeclaration */ || node.kind === 161 /* 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 :
@@ -98386,7 +101105,7 @@ var ts;
         }
         function getAccessorDeclarationTypeVisibilityError(symbolAccessibilityResult) {
             var diagnosticMessage;
-            if (node.kind === 168 /* SetAccessor */) {
+            if (node.kind === 169 /* 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 */)) {
@@ -98425,26 +101144,26 @@ var ts;
         function getReturnTypeVisibilityError(symbolAccessibilityResult) {
             var diagnosticMessage;
             switch (node.kind) {
-                case 170 /* ConstructSignature */:
+                case 171 /* 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 169 /* CallSignature */:
+                case 170 /* 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 171 /* IndexSignature */:
+                case 172 /* 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 165 /* MethodDeclaration */:
-                case 164 /* MethodSignature */:
+                case 166 /* MethodDeclaration */:
+                case 165 /* MethodSignature */:
                     if (ts.hasSyntacticModifier(node, 32 /* Static */)) {
                         diagnosticMessage = symbolAccessibilityResult.errorModuleName ?
                             symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
@@ -98452,7 +101171,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 === 252 /* ClassDeclaration */) {
+                    else if (node.parent.kind === 253 /* 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 :
@@ -98466,7 +101185,7 @@ var ts;
                             ts.Diagnostics.Return_type_of_method_from_exported_interface_has_or_is_using_private_name_0;
                     }
                     break;
-                case 251 /* FunctionDeclaration */:
+                case 252 /* 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 :
@@ -98491,30 +101210,30 @@ var ts;
         }
         function getParameterDeclarationTypeVisibilityDiagnosticMessage(symbolAccessibilityResult) {
             switch (node.parent.kind) {
-                case 166 /* Constructor */:
+                case 167 /* 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 170 /* ConstructSignature */:
-                case 175 /* ConstructorType */:
+                case 171 /* ConstructSignature */:
+                case 176 /* 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 169 /* CallSignature */:
+                case 170 /* 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 171 /* IndexSignature */:
+                case 172 /* 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 165 /* MethodDeclaration */:
-                case 164 /* MethodSignature */:
+                case 166 /* MethodDeclaration */:
+                case 165 /* MethodSignature */:
                     if (ts.hasSyntacticModifier(node.parent, 32 /* Static */)) {
                         return symbolAccessibilityResult.errorModuleName ?
                             symbolAccessibilityResult.accessibility === 2 /* CannotBeNamed */ ?
@@ -98522,7 +101241,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 === 252 /* ClassDeclaration */) {
+                    else if (node.parent.parent.kind === 253 /* 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 :
@@ -98535,15 +101254,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 251 /* FunctionDeclaration */:
-                case 174 /* FunctionType */:
+                case 252 /* FunctionDeclaration */:
+                case 175 /* 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 168 /* SetAccessor */:
-                case 167 /* GetAccessor */:
+                case 169 /* SetAccessor */:
+                case 168 /* 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 :
@@ -98557,39 +101276,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 252 /* ClassDeclaration */:
+                case 253 /* ClassDeclaration */:
                     diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_class_has_or_is_using_private_name_1;
                     break;
-                case 253 /* InterfaceDeclaration */:
+                case 254 /* InterfaceDeclaration */:
                     diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1;
                     break;
-                case 190 /* MappedType */:
+                case 191 /* MappedType */:
                     diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_mapped_object_type_is_using_private_name_1;
                     break;
-                case 175 /* ConstructorType */:
-                case 170 /* ConstructSignature */:
+                case 176 /* ConstructorType */:
+                case 171 /* ConstructSignature */:
                     diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_constructor_signature_from_exported_interface_has_or_is_using_private_name_1;
                     break;
-                case 169 /* CallSignature */:
+                case 170 /* CallSignature */:
                     diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_call_signature_from_exported_interface_has_or_is_using_private_name_1;
                     break;
-                case 165 /* MethodDeclaration */:
-                case 164 /* MethodSignature */:
+                case 166 /* MethodDeclaration */:
+                case 165 /* 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 === 252 /* ClassDeclaration */) {
+                    else if (node.parent.parent.kind === 253 /* 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 174 /* FunctionType */:
-                case 251 /* FunctionDeclaration */:
+                case 175 /* FunctionType */:
+                case 252 /* FunctionDeclaration */:
                     diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_function_has_or_is_using_private_name_1;
                     break;
-                case 254 /* TypeAliasDeclaration */:
+                case 255 /* TypeAliasDeclaration */:
                     diagnosticMessage = ts.Diagnostics.Type_parameter_0_of_exported_type_alias_has_or_is_using_private_name_1;
                     break;
                 default:
@@ -98655,7 +101374,7 @@ var ts;
     }
     function isInternalDeclaration(node, currentSourceFile) {
         var parseTreeNode = ts.getParseTreeNode(node);
-        if (parseTreeNode && parseTreeNode.kind === 160 /* Parameter */) {
+        if (parseTreeNode && parseTreeNode.kind === 161 /* Parameter */) {
             var paramIdx = parseTreeNode.parent.parameters.indexOf(parseTreeNode);
             var previousSibling = paramIdx > 0 ? parseTreeNode.parent.parameters[paramIdx - 1] : undefined;
             var text = currentSourceFile.text;
@@ -98817,11 +101536,14 @@ var ts;
             }
         }
         function reportNonlocalAugmentation(containingFile, parentSymbol, symbol) {
-            var primaryDeclaration = ts.find(parentSymbol.declarations, function (d) { return ts.getSourceFileOfNode(d) === containingFile; });
+            var _a;
+            var primaryDeclaration = (_a = parentSymbol.declarations) === null || _a === void 0 ? void 0 : _a.find(function (d) { return ts.getSourceFileOfNode(d) === containingFile; });
             var augmentingDeclarations = ts.filter(symbol.declarations, function (d) { return ts.getSourceFileOfNode(d) !== containingFile; });
-            for (var _i = 0, augmentingDeclarations_1 = augmentingDeclarations; _i < augmentingDeclarations_1.length; _i++) {
-                var augmentations = augmentingDeclarations_1[_i];
-                context.addDiagnostic(ts.addRelatedInfo(ts.createDiagnosticForNode(augmentations, ts.Diagnostics.Declaration_augments_declaration_in_another_file_This_cannot_be_serialized), ts.createDiagnosticForNode(primaryDeclaration, ts.Diagnostics.This_is_the_declaration_being_augmented_Consider_moving_the_augmenting_declaration_into_the_same_file)));
+            if (augmentingDeclarations) {
+                for (var _i = 0, augmentingDeclarations_1 = augmentingDeclarations; _i < augmentingDeclarations_1.length; _i++) {
+                    var augmentations = augmentingDeclarations_1[_i];
+                    context.addDiagnostic(ts.addRelatedInfo(ts.createDiagnosticForNode(augmentations, ts.Diagnostics.Declaration_augments_declaration_in_another_file_This_cannot_be_serialized), ts.createDiagnosticForNode(primaryDeclaration, ts.Diagnostics.This_is_the_declaration_being_augmented_Consider_moving_the_augmenting_declaration_into_the_same_file)));
+                }
             }
         }
         function transformDeclarationsForJS(sourceFile, bundled) {
@@ -98837,10 +101559,10 @@ var ts;
             return result;
         }
         function transformRoot(node) {
-            if (node.kind === 297 /* SourceFile */ && node.isDeclarationFile) {
+            if (node.kind === 298 /* SourceFile */ && node.isDeclarationFile) {
                 return node;
             }
-            if (node.kind === 298 /* Bundle */) {
+            if (node.kind === 299 /* Bundle */) {
                 isBundledEmit = true;
                 refs = new ts.Map();
                 libs = new ts.Map();
@@ -98870,7 +101592,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 === 300 /* InputFiles */) {
+                    if (prepend.kind === 301 /* InputFiles */) {
                         var sourceFile = ts.createUnparsedSourceFile(prepend, "dts", stripInternal);
                         hasNoDefaultLib_1 = hasNoDefaultLib_1 || !!sourceFile.hasNoDefaultLib;
                         collectReferences(sourceFile, refs);
@@ -98962,7 +101684,7 @@ var ts;
                         declFileName = paths.declarationFilePath || paths.jsFilePath || file.fileName;
                     }
                     if (declFileName) {
-                        var specifier = ts.moduleSpecifiers.getModuleSpecifier(__assign(__assign({}, options), { baseUrl: options.baseUrl && ts.toPath(options.baseUrl, host.getCurrentDirectory(), host.getCanonicalFileName) }), currentSourceFile, ts.toPath(outputFilePath, host.getCurrentDirectory(), host.getCanonicalFileName), ts.toPath(declFileName, host.getCurrentDirectory(), host.getCanonicalFileName), host, 
+                        var specifier = ts.moduleSpecifiers.getModuleSpecifier(options, currentSourceFile, ts.toPath(outputFilePath, host.getCurrentDirectory(), host.getCanonicalFileName), ts.toPath(declFileName, host.getCurrentDirectory(), host.getCanonicalFileName), host, 
                         /*preferences*/ undefined);
                         if (!ts.pathIsRelative(specifier)) {
                             // If some compiler option/symlink/whatever allows access to the file containing the ambient module declaration
@@ -99011,7 +101733,7 @@ var ts;
                 return name;
             }
             else {
-                if (name.kind === 197 /* ArrayBindingPattern */) {
+                if (name.kind === 198 /* ArrayBindingPattern */) {
                     return factory.updateArrayBindingPattern(name, ts.visitNodes(name.elements, visitBindingElement));
                 }
                 else {
@@ -99019,7 +101741,7 @@ var ts;
                 }
             }
             function visitBindingElement(elem) {
-                if (elem.kind === 222 /* OmittedExpression */) {
+                if (elem.kind === 223 /* OmittedExpression */) {
                     return elem;
                 }
                 return factory.updateBindingElement(elem, elem.dotDotDotToken, elem.propertyName, filterBindingPatternInitializers(elem.name), shouldPrintWithInitializer(elem) ? elem.initializer : undefined);
@@ -99057,7 +101779,7 @@ var ts;
                 // Literal const declarations will have an initializer ensured rather than a type
                 return;
             }
-            var shouldUseResolverType = node.kind === 160 /* Parameter */ &&
+            var shouldUseResolverType = node.kind === 161 /* Parameter */ &&
                 (resolver.isRequiredInitializedParameter(node) ||
                     resolver.isOptionalUninitializedParameterProperty(node));
             if (type && !shouldUseResolverType) {
@@ -99066,7 +101788,7 @@ var ts;
             if (!ts.getParseTreeNode(node)) {
                 return type ? ts.visitNode(type, visitDeclarationSubtree) : factory.createKeywordTypeNode(128 /* AnyKeyword */);
             }
-            if (node.kind === 168 /* SetAccessor */) {
+            if (node.kind === 169 /* 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 */);
@@ -99077,12 +101799,12 @@ var ts;
                 oldDiag = getSymbolAccessibilityDiagnostic;
                 getSymbolAccessibilityDiagnostic = ts.createGetSymbolAccessibilityDiagnosticForNode(node);
             }
-            if (node.kind === 249 /* VariableDeclaration */ || node.kind === 198 /* BindingElement */) {
+            if (node.kind === 250 /* VariableDeclaration */ || node.kind === 199 /* BindingElement */) {
                 return cleanup(resolver.createTypeOfDeclaration(node, enclosingDeclaration, declarationEmitNodeBuilderFlags, symbolTracker));
             }
-            if (node.kind === 160 /* Parameter */
-                || node.kind === 163 /* PropertyDeclaration */
-                || node.kind === 162 /* PropertySignature */) {
+            if (node.kind === 161 /* Parameter */
+                || node.kind === 164 /* PropertyDeclaration */
+                || node.kind === 163 /* 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));
@@ -99099,20 +101821,20 @@ var ts;
         function isDeclarationAndNotVisible(node) {
             node = ts.getParseTreeNode(node);
             switch (node.kind) {
-                case 251 /* FunctionDeclaration */:
-                case 256 /* ModuleDeclaration */:
-                case 253 /* InterfaceDeclaration */:
-                case 252 /* ClassDeclaration */:
-                case 254 /* TypeAliasDeclaration */:
-                case 255 /* EnumDeclaration */:
+                case 252 /* FunctionDeclaration */:
+                case 257 /* ModuleDeclaration */:
+                case 254 /* InterfaceDeclaration */:
+                case 253 /* ClassDeclaration */:
+                case 255 /* TypeAliasDeclaration */:
+                case 256 /* EnumDeclaration */:
                     return !resolver.isDeclarationVisible(node);
                 // The following should be doing their own visibility checks based on filtering their members
-                case 249 /* VariableDeclaration */:
+                case 250 /* VariableDeclaration */:
                     return !getBindingNameVisible(node);
-                case 260 /* ImportEqualsDeclaration */:
-                case 261 /* ImportDeclaration */:
-                case 267 /* ExportDeclaration */:
-                case 266 /* ExportAssignment */:
+                case 261 /* ImportEqualsDeclaration */:
+                case 262 /* ImportDeclaration */:
+                case 268 /* ExportDeclaration */:
+                case 267 /* ExportAssignment */:
                     return false;
             }
             return false;
@@ -99193,7 +101915,7 @@ var ts;
         function rewriteModuleSpecifier(parent, input) {
             if (!input)
                 return undefined; // TODO: GH#18217
-            resultHasExternalModuleIndicator = resultHasExternalModuleIndicator || (parent.kind !== 256 /* ModuleDeclaration */ && parent.kind !== 195 /* ImportType */);
+            resultHasExternalModuleIndicator = resultHasExternalModuleIndicator || (parent.kind !== 257 /* ModuleDeclaration */ && parent.kind !== 196 /* ImportType */);
             if (ts.isStringLiteralLike(input)) {
                 if (isBundledEmit) {
                     var newName = ts.getExternalModuleNameFromDeclaration(context.getEmitHost(), resolver, parent);
@@ -99213,7 +101935,7 @@ var ts;
         function transformImportEqualsDeclaration(decl) {
             if (!resolver.isDeclarationVisible(decl))
                 return;
-            if (decl.moduleReference.kind === 272 /* ExternalModuleReference */) {
+            if (decl.moduleReference.kind === 273 /* ExternalModuleReference */) {
                 // Rewrite external module names if necessary
                 var specifier = ts.getExternalModuleImportEqualsDeclarationExpression(decl);
                 return factory.updateImportEqualsDeclaration(decl, 
@@ -99240,7 +101962,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 === 263 /* NamespaceImport */) {
+            if (decl.importClause.namedBindings.kind === 264 /* 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;
@@ -99335,7 +102057,7 @@ var ts;
             // We'd see a TDZ violation at runtime
             var canProduceDiagnostic = ts.canProduceDiagnostics(input);
             var oldWithinObjectLiteralType = suppressNewDiagnosticContexts;
-            var shouldEnterSuppressNewDiagnosticsContextContext = ((input.kind === 177 /* TypeLiteral */ || input.kind === 190 /* MappedType */) && input.parent.kind !== 254 /* TypeAliasDeclaration */);
+            var shouldEnterSuppressNewDiagnosticsContextContext = ((input.kind === 178 /* TypeLiteral */ || input.kind === 191 /* MappedType */) && input.parent.kind !== 255 /* 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 */)) {
@@ -99356,21 +102078,21 @@ var ts;
             }
             if (isProcessedComponent(input)) {
                 switch (input.kind) {
-                    case 223 /* ExpressionWithTypeArguments */: {
+                    case 224 /* 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 173 /* TypeReference */: {
+                    case 174 /* TypeReference */: {
                         checkEntityNameVisibility(input.typeName, enclosingDeclaration);
                         var node = ts.visitEachChild(input, visitDeclarationSubtree, context);
                         return cleanup(factory.updateTypeReferenceNode(node, node.typeName, node.typeArguments));
                     }
-                    case 170 /* ConstructSignature */:
+                    case 171 /* ConstructSignature */:
                         return cleanup(factory.updateConstructSignature(input, ensureTypeParams(input, input.typeParameters), updateParamsList(input, input.parameters), ensureType(input, input.type)));
-                    case 166 /* Constructor */: {
+                    case 167 /* Constructor */: {
                         // A constructor declaration may not have a type annotation
                         var ctor = factory.createConstructorDeclaration(
                         /*decorators*/ undefined, 
@@ -99378,7 +102100,7 @@ var ts;
                         /*body*/ undefined);
                         return cleanup(ctor);
                     }
-                    case 165 /* MethodDeclaration */: {
+                    case 166 /* MethodDeclaration */: {
                         if (ts.isPrivateIdentifier(input.name)) {
                             return cleanup(/*returnValue*/ undefined);
                         }
@@ -99388,7 +102110,7 @@ var ts;
                         /*body*/ undefined);
                         return cleanup(sig);
                     }
-                    case 167 /* GetAccessor */: {
+                    case 168 /* GetAccessor */: {
                         if (ts.isPrivateIdentifier(input.name)) {
                             return cleanup(/*returnValue*/ undefined);
                         }
@@ -99397,7 +102119,7 @@ var ts;
                         /*decorators*/ undefined, ensureModifiers(input), input.name, updateAccessorParamsList(input, ts.hasEffectiveModifier(input, 8 /* Private */)), ensureType(input, accessorType), 
                         /*body*/ undefined));
                     }
-                    case 168 /* SetAccessor */: {
+                    case 169 /* SetAccessor */: {
                         if (ts.isPrivateIdentifier(input.name)) {
                             return cleanup(/*returnValue*/ undefined);
                         }
@@ -99405,31 +102127,31 @@ var ts;
                         /*decorators*/ undefined, ensureModifiers(input), input.name, updateAccessorParamsList(input, ts.hasEffectiveModifier(input, 8 /* Private */)), 
                         /*body*/ undefined));
                     }
-                    case 163 /* PropertyDeclaration */:
+                    case 164 /* 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 162 /* PropertySignature */:
+                    case 163 /* 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 164 /* MethodSignature */: {
+                    case 165 /* 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 169 /* CallSignature */: {
+                    case 170 /* CallSignature */: {
                         return cleanup(factory.updateCallSignature(input, ensureTypeParams(input, input.typeParameters), updateParamsList(input, input.parameters), ensureType(input, input.type)));
                     }
-                    case 171 /* IndexSignature */: {
+                    case 172 /* IndexSignature */: {
                         return cleanup(factory.updateIndexSignature(input, 
                         /*decorators*/ undefined, ensureModifiers(input), updateParamsList(input, input.parameters), ts.visitNode(input.type, visitDeclarationSubtree) || factory.createKeywordTypeNode(128 /* AnyKeyword */)));
                     }
-                    case 249 /* VariableDeclaration */: {
+                    case 250 /* VariableDeclaration */: {
                         if (ts.isBindingPattern(input.name)) {
                             return recreateBindingPattern(input.name);
                         }
@@ -99437,13 +102159,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 159 /* TypeParameter */: {
+                    case 160 /* 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 184 /* ConditionalType */: {
+                    case 185 /* 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);
@@ -99455,13 +102177,13 @@ var ts;
                         var falseType = ts.visitNode(input.falseType, visitDeclarationSubtree);
                         return cleanup(factory.updateConditionalTypeNode(input, checkType, extendsType, trueType, falseType));
                     }
-                    case 174 /* FunctionType */: {
+                    case 175 /* FunctionType */: {
                         return cleanup(factory.updateFunctionTypeNode(input, ts.visitNodes(input.typeParameters, visitDeclarationSubtree), updateParamsList(input, input.parameters), ts.visitNode(input.type, visitDeclarationSubtree)));
                     }
-                    case 175 /* ConstructorType */: {
+                    case 176 /* ConstructorType */: {
                         return cleanup(factory.updateConstructorTypeNode(input, ensureModifiers(input), ts.visitNodes(input.typeParameters, visitDeclarationSubtree), updateParamsList(input, input.parameters), ts.visitNode(input.type, visitDeclarationSubtree)));
                     }
-                    case 195 /* ImportType */: {
+                    case 196 /* 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));
@@ -99493,7 +102215,7 @@ var ts;
             }
         }
         function isPrivateMethodTypeParameter(node) {
-            return node.parent.kind === 165 /* MethodDeclaration */ && ts.hasEffectiveModifier(node.parent, 8 /* Private */);
+            return node.parent.kind === 166 /* MethodDeclaration */ && ts.hasEffectiveModifier(node.parent, 8 /* Private */);
         }
         function visitDeclarationStatements(input) {
             if (!isPreservedDeclarationStatement(input)) {
@@ -99503,7 +102225,7 @@ var ts;
             if (shouldStripInternal(input))
                 return;
             switch (input.kind) {
-                case 267 /* ExportDeclaration */: {
+                case 268 /* ExportDeclaration */: {
                     if (ts.isSourceFile(input.parent)) {
                         resultHasExternalModuleIndicator = true;
                     }
@@ -99513,7 +102235,7 @@ var ts;
                     return factory.updateExportDeclaration(input, 
                     /*decorators*/ undefined, input.modifiers, input.isTypeOnly, input.exportClause, rewriteModuleSpecifier(input, input.moduleSpecifier));
                 }
-                case 266 /* ExportAssignment */: {
+                case 267 /* ExportAssignment */: {
                     // Always visible if the parent node isn't dropped for being not visible
                     if (ts.isSourceFile(input.parent)) {
                         resultHasExternalModuleIndicator = true;
@@ -99547,17 +102269,17 @@ var ts;
                 // Likewise, `export default` classes and the like and just be `default`, so we preserve their `export` modifiers, too
                 return statement;
             }
-            var modifiers = factory.createModifiersFromModifierFlags(ts.getEffectiveModifierFlags(statement) & (11263 /* All */ ^ 1 /* Export */));
+            var modifiers = factory.createModifiersFromModifierFlags(ts.getEffectiveModifierFlags(statement) & (27647 /* All */ ^ 1 /* Export */));
             return factory.updateModifiers(statement, modifiers);
         }
         function transformTopLevelDeclaration(input) {
             if (shouldStripInternal(input))
                 return;
             switch (input.kind) {
-                case 260 /* ImportEqualsDeclaration */: {
+                case 261 /* ImportEqualsDeclaration */: {
                     return transformImportEqualsDeclaration(input);
                 }
-                case 261 /* ImportDeclaration */: {
+                case 262 /* ImportDeclaration */: {
                     return transformImportDeclaration(input);
                 }
             }
@@ -99578,14 +102300,14 @@ var ts;
             }
             var previousNeedsDeclare = needsDeclare;
             switch (input.kind) {
-                case 254 /* TypeAliasDeclaration */: // Type aliases get `declare`d if need be (for legacy support), but that's all
+                case 255 /* 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 253 /* InterfaceDeclaration */: {
+                case 254 /* 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 251 /* FunctionDeclaration */: {
+                case 252 /* FunctionDeclaration */: {
                     // Generators lose their generator-ness, excepting their return type
                     var clean = cleanup(factory.updateFunctionDeclaration(input, 
                     /*decorators*/ undefined, ensureModifiers(input), 
@@ -99600,7 +102322,7 @@ var ts;
                         fakespace_1.symbol = props[0].parent;
                         var exportMappings_1 = [];
                         var declarations = ts.mapDefined(props, function (p) {
-                            if (!ts.isPropertyAccessExpression(p.valueDeclaration)) {
+                            if (!p.valueDeclaration || !ts.isPropertyAccessExpression(p.valueDeclaration)) {
                                 return undefined; // TODO GH#33569: Handle element access expressions that created late bound names (rather than silently omitting them)
                             }
                             getSymbolAccessibilityDiagnostic = ts.createGetSymbolAccessibilityDiagnosticForNode(p.valueDeclaration);
@@ -99652,10 +102374,10 @@ var ts;
                         return clean;
                     }
                 }
-                case 256 /* ModuleDeclaration */: {
+                case 257 /* ModuleDeclaration */: {
                     needsDeclare = false;
                     var inner = input.body;
-                    if (inner && inner.kind === 257 /* ModuleBlock */) {
+                    if (inner && inner.kind === 258 /* ModuleBlock */) {
                         var oldNeedsScopeFix = needsScopeFixMarker;
                         var oldHasScopeFix = resultHasScopeMarker;
                         resultHasScopeMarker = false;
@@ -99698,7 +102420,7 @@ var ts;
                         /*decorators*/ undefined, mods, input.name, body));
                     }
                 }
-                case 252 /* ClassDeclaration */: {
+                case 253 /* ClassDeclaration */: {
                     errorNameNode = input.name;
                     errorFallbackNode = input;
                     var modifiers = factory.createNodeArray(ensureModifiers(input));
@@ -99708,7 +102430,7 @@ var ts;
                     if (ctor) {
                         var oldDiag_1 = getSymbolAccessibilityDiagnostic;
                         parameterProperties = ts.compact(ts.flatMap(ctor.parameters, function (param) {
-                            if (!ts.hasSyntacticModifier(param, 92 /* ParameterPropertyModifier */) || shouldStripInternal(param))
+                            if (!ts.hasSyntacticModifier(param, 16476 /* ParameterPropertyModifier */) || shouldStripInternal(param))
                                 return;
                             getSymbolAccessibilityDiagnostic = ts.createGetSymbolAccessibilityDiagnosticForNode(param);
                             if (param.name.kind === 78 /* Identifier */) {
@@ -99783,10 +102505,10 @@ var ts;
                         /*decorators*/ undefined, modifiers, input.name, typeParameters, heritageClauses, members));
                     }
                 }
-                case 232 /* VariableStatement */: {
+                case 233 /* VariableStatement */: {
                     return cleanup(transformVariableStatement(input));
                 }
-                case 255 /* EnumDeclaration */: {
+                case 256 /* 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;
@@ -99805,7 +102527,7 @@ var ts;
                 if (canProdiceDiagnostic) {
                     getSymbolAccessibilityDiagnostic = oldDiag;
                 }
-                if (input.kind === 256 /* ModuleDeclaration */) {
+                if (input.kind === 257 /* ModuleDeclaration */) {
                     needsDeclare = previousNeedsDeclare;
                 }
                 if (node === input) {
@@ -99828,7 +102550,7 @@ var ts;
             return ts.flatten(ts.mapDefined(d.elements, function (e) { return recreateBindingElement(e); }));
         }
         function recreateBindingElement(e) {
-            if (e.kind === 222 /* OmittedExpression */) {
+            if (e.kind === 223 /* OmittedExpression */) {
                 return;
             }
             if (e.name) {
@@ -99876,9 +102598,9 @@ var ts;
             return factory.createModifiersFromModifierFlags(newFlags);
         }
         function ensureModifierFlags(node) {
-            var mask = 11263 /* All */ ^ (4 /* Public */ | 256 /* Async */); // No async modifiers in declaration files
+            var mask = 27647 /* All */ ^ (4 /* Public */ | 256 /* Async */ | 16384 /* Override */); // No async and override modifiers in declaration files
             var additions = (needsDeclare && !isAlwaysType(node)) ? 2 /* Ambient */ : 0 /* None */;
-            var parentIsFile = node.parent.kind === 297 /* SourceFile */;
+            var parentIsFile = node.parent.kind === 298 /* SourceFile */;
             if (!parentIsFile || (isBundledEmit && parentIsFile && ts.isExternalModule(node.parent))) {
                 mask ^= 2 /* Ambient */;
                 additions = 0 /* None */;
@@ -99907,7 +102629,7 @@ var ts;
     }
     ts.transformDeclarations = transformDeclarations;
     function isAlwaysType(node) {
-        if (node.kind === 253 /* InterfaceDeclaration */) {
+        if (node.kind === 254 /* InterfaceDeclaration */) {
             return true;
         }
         return false;
@@ -99917,7 +102639,7 @@ var ts;
         return ts.factory.createModifiersFromModifierFlags(maskModifierFlags(node, modifierMask, modifierAdditions));
     }
     function maskModifierFlags(node, modifierMask, modifierAdditions) {
-        if (modifierMask === void 0) { modifierMask = 11263 /* All */ ^ 4 /* Public */; }
+        if (modifierMask === void 0) { modifierMask = 27647 /* All */ ^ 4 /* Public */; }
         if (modifierAdditions === void 0) { modifierAdditions = 0 /* None */; }
         var flags = (ts.getEffectiveModifierFlags(node) & modifierMask) | modifierAdditions;
         if (flags & 512 /* Default */ && !(flags & 1 /* Export */)) {
@@ -99932,7 +102654,7 @@ var ts;
     }
     function getTypeAnnotationFromAccessor(accessor) {
         if (accessor) {
-            return accessor.kind === 167 /* GetAccessor */
+            return accessor.kind === 168 /* GetAccessor */
                 ? accessor.type // Getter - return type
                 : accessor.parameters.length > 0
                     ? accessor.parameters[0].type // Setter parameter type
@@ -99941,52 +102663,52 @@ var ts;
     }
     function canHaveLiteralInitializer(node) {
         switch (node.kind) {
-            case 163 /* PropertyDeclaration */:
-            case 162 /* PropertySignature */:
+            case 164 /* PropertyDeclaration */:
+            case 163 /* PropertySignature */:
                 return !ts.hasEffectiveModifier(node, 8 /* Private */);
-            case 160 /* Parameter */:
-            case 249 /* VariableDeclaration */:
+            case 161 /* Parameter */:
+            case 250 /* VariableDeclaration */:
                 return true;
         }
         return false;
     }
     function isPreservedDeclarationStatement(node) {
         switch (node.kind) {
-            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 */:
+            case 252 /* FunctionDeclaration */:
+            case 257 /* ModuleDeclaration */:
+            case 261 /* ImportEqualsDeclaration */:
+            case 254 /* InterfaceDeclaration */:
+            case 253 /* ClassDeclaration */:
+            case 255 /* TypeAliasDeclaration */:
+            case 256 /* EnumDeclaration */:
+            case 233 /* VariableStatement */:
+            case 262 /* ImportDeclaration */:
+            case 268 /* ExportDeclaration */:
+            case 267 /* ExportAssignment */:
                 return true;
         }
         return false;
     }
     function isProcessedComponent(node) {
         switch (node.kind) {
-            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 */:
+            case 171 /* ConstructSignature */:
+            case 167 /* Constructor */:
+            case 166 /* MethodDeclaration */:
+            case 168 /* GetAccessor */:
+            case 169 /* SetAccessor */:
+            case 164 /* PropertyDeclaration */:
+            case 163 /* PropertySignature */:
+            case 165 /* MethodSignature */:
+            case 170 /* CallSignature */:
+            case 172 /* IndexSignature */:
+            case 250 /* VariableDeclaration */:
+            case 160 /* TypeParameter */:
+            case 224 /* ExpressionWithTypeArguments */:
+            case 174 /* TypeReference */:
+            case 185 /* ConditionalType */:
+            case 175 /* FunctionType */:
+            case 176 /* ConstructorType */:
+            case 196 /* ImportType */:
                 return true;
         }
         return false;
@@ -100042,6 +102764,9 @@ var ts;
         if (languageVersion < 99 /* ESNext */) {
             transformers.push(ts.transformESNext);
         }
+        if (languageVersion < 8 /* ES2021 */) {
+            transformers.push(ts.transformES2021);
+        }
         if (languageVersion < 7 /* ES2020 */) {
             transformers.push(ts.transformES2020);
         }
@@ -100118,7 +102843,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(341 /* Count */);
+        var enabledSyntaxKindFeatures = new Array(345 /* Count */);
         var lexicalEnvironmentVariableDeclarations;
         var lexicalEnvironmentFunctionDeclarations;
         var lexicalEnvironmentStatements;
@@ -100129,6 +102854,9 @@ var ts;
         var lexicalEnvironmentFlagsStack = [];
         var lexicalEnvironmentStackOffset = 0;
         var lexicalEnvironmentSuspended = false;
+        var blockScopedVariableDeclarationsStack = [];
+        var blockScopeStackOffset = 0;
+        var blockScopedVariableDeclarations;
         var emitHelpers;
         var onSubstituteNode = noEmitSubstitution;
         var onEmitNode = noEmitNotification;
@@ -100151,6 +102879,9 @@ var ts;
             hoistVariableDeclaration: hoistVariableDeclaration,
             hoistFunctionDeclaration: hoistFunctionDeclaration,
             addInitializationStatement: addInitializationStatement,
+            startBlockScope: startBlockScope,
+            endBlockScope: endBlockScope,
+            addBlockScopedVariable: addBlockScopedVariable,
             requestEmitHelper: requestEmitHelper,
             readEmitHelpers: readEmitHelpers,
             enableSubstitution: enableSubstitution,
@@ -100194,7 +102925,7 @@ var ts;
         var transformed = [];
         for (var _a = 0, nodes_3 = nodes; _a < nodes_3.length; _a++) {
             var node = nodes_3[_a];
-            ts.tracing === null || ts.tracing === void 0 ? void 0 : ts.tracing.push("emit" /* Emit */, "transformNodes", node.kind === 297 /* SourceFile */ ? { path: node.path } : { kind: node.kind, pos: node.pos, end: node.end });
+            ts.tracing === null || ts.tracing === void 0 ? void 0 : ts.tracing.push("emit" /* Emit */, "transformNodes", node.kind === 298 /* SourceFile */ ? { path: node.path } : { kind: node.kind, pos: node.pos, end: node.end });
             transformed.push((allowDtsFiles ? transformation : transformRoot)(node));
             ts.tracing === null || ts.tracing === void 0 ? void 0 : ts.tracing.pop();
         }
@@ -100411,6 +103142,38 @@ var ts;
         function getLexicalEnvironmentFlags() {
             return lexicalEnvironmentFlags;
         }
+        /**
+         * Starts a block scope. Any existing block hoisted variables are pushed onto the stack and the related storage variables are reset.
+         */
+        function startBlockScope() {
+            ts.Debug.assert(state > 0 /* Uninitialized */, "Cannot start a block scope during initialization.");
+            ts.Debug.assert(state < 2 /* Completed */, "Cannot start a block scope after transformation has completed.");
+            blockScopedVariableDeclarationsStack[blockScopeStackOffset] = blockScopedVariableDeclarations;
+            blockScopeStackOffset++;
+            blockScopedVariableDeclarations = undefined;
+        }
+        /**
+         * Ends a block scope. The previous set of block hoisted variables are restored. Any hoisted declarations are returned.
+         */
+        function endBlockScope() {
+            ts.Debug.assert(state > 0 /* Uninitialized */, "Cannot end a block scope during initialization.");
+            ts.Debug.assert(state < 2 /* Completed */, "Cannot end a block scope after transformation has completed.");
+            var statements = ts.some(blockScopedVariableDeclarations) ?
+                [
+                    factory.createVariableStatement(
+                    /*modifiers*/ undefined, factory.createVariableDeclarationList(blockScopedVariableDeclarations.map(function (identifier) { return factory.createVariableDeclaration(identifier); }), 1 /* Let */))
+                ] : undefined;
+            blockScopeStackOffset--;
+            blockScopedVariableDeclarations = blockScopedVariableDeclarationsStack[blockScopeStackOffset];
+            if (blockScopeStackOffset === 0) {
+                blockScopedVariableDeclarationsStack = [];
+            }
+            return statements;
+        }
+        function addBlockScopedVariable(name) {
+            ts.Debug.assert(blockScopeStackOffset > 0, "Cannot add a block scoped variable outside of an iteration body.");
+            (blockScopedVariableDeclarations || (blockScopedVariableDeclarations = [])).push(name);
+        }
         function requestEmitHelper(helper) {
             ts.Debug.assert(state > 0 /* Uninitialized */, "Cannot modify the transformation context during initialization.");
             ts.Debug.assert(state < 2 /* Completed */, "Cannot modify the transformation context after transformation has completed.");
@@ -100452,35 +103215,37 @@ var ts;
     }
     ts.transformNodes = transformNodes;
     ts.nullTransformationContext = {
-        get factory() { return ts.factory; },
-        enableEmitNotification: ts.noop,
-        enableSubstitution: ts.noop,
-        endLexicalEnvironment: ts.returnUndefined,
+        factory: ts.factory,
         getCompilerOptions: function () { return ({}); },
-        getEmitHost: ts.notImplemented,
         getEmitResolver: ts.notImplemented,
+        getEmitHost: ts.notImplemented,
         getEmitHelperFactory: ts.notImplemented,
+        startLexicalEnvironment: ts.noop,
+        resumeLexicalEnvironment: ts.noop,
+        suspendLexicalEnvironment: ts.noop,
+        endLexicalEnvironment: ts.returnUndefined,
         setLexicalEnvironmentFlags: ts.noop,
         getLexicalEnvironmentFlags: function () { return 0; },
-        hoistFunctionDeclaration: ts.noop,
         hoistVariableDeclaration: ts.noop,
+        hoistFunctionDeclaration: ts.noop,
         addInitializationStatement: ts.noop,
-        isEmitNotificationEnabled: ts.notImplemented,
-        isSubstitutionEnabled: ts.notImplemented,
-        onEmitNode: ts.noop,
-        onSubstituteNode: ts.notImplemented,
-        readEmitHelpers: ts.notImplemented,
+        startBlockScope: ts.noop,
+        endBlockScope: ts.returnUndefined,
+        addBlockScopedVariable: ts.noop,
         requestEmitHelper: ts.noop,
-        resumeLexicalEnvironment: ts.noop,
-        startLexicalEnvironment: ts.noop,
-        suspendLexicalEnvironment: ts.noop,
+        readEmitHelpers: ts.notImplemented,
+        enableSubstitution: ts.noop,
+        enableEmitNotification: ts.noop,
+        isSubstitutionEnabled: ts.notImplemented,
+        isEmitNotificationEnabled: ts.notImplemented,
+        onSubstituteNode: noEmitSubstitution,
+        onEmitNode: noEmitNotification,
         addDiagnostic: ts.noop,
     };
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
     var brackets = createBracketsMap();
-    var syntheticParent = { pos: -1, end: -1 };
     /*@internal*/
     function isBuildInfoFile(file) {
         return ts.fileExtensionIs(file, ".tsbuildinfo" /* TsBuildInfo */);
@@ -100566,7 +103331,7 @@ var ts;
     /*@internal*/
     function getOutputPathsFor(sourceFile, host, forceDtsPaths) {
         var options = host.getCompilerOptions();
-        if (sourceFile.kind === 298 /* Bundle */) {
+        if (sourceFile.kind === 299 /* Bundle */) {
             return getOutputPathsForBundle(options, forceDtsPaths);
         }
         else {
@@ -100927,13 +103692,13 @@ var ts;
             if (!declBlocked || forceDtsEmit) {
                 ts.Debug.assert(declarationTransform.transformed.length === 1, "Should only see one output from the decl transform");
                 printSourceFileOrBundle(declarationFilePath, declarationMapPath, declarationTransform.transformed[0], declarationPrinter, {
-                    sourceMap: compilerOptions.declarationMap,
+                    sourceMap: !forceDtsEmit && compilerOptions.declarationMap,
                     sourceRoot: compilerOptions.sourceRoot,
                     mapRoot: compilerOptions.mapRoot,
                     extendedDiagnostics: compilerOptions.extendedDiagnostics,
                     // Explicitly do not passthru either `inline` option
                 });
-                if (forceDtsEmit && declarationTransform.transformed[0].kind === 297 /* SourceFile */) {
+                if (forceDtsEmit && declarationTransform.transformed[0].kind === 298 /* SourceFile */) {
                     var sourceFile = declarationTransform.transformed[0];
                     exportedModulesFromDeclarationEmit = sourceFile.exportedModulesFromDeclarationEmit;
                 }
@@ -100956,8 +103721,8 @@ var ts;
             ts.forEachChild(node, collectLinkedAliases);
         }
         function printSourceFileOrBundle(jsFilePath, sourceMapFilePath, sourceFileOrBundle, printer, mapOptions) {
-            var bundle = sourceFileOrBundle.kind === 298 /* Bundle */ ? sourceFileOrBundle : undefined;
-            var sourceFile = sourceFileOrBundle.kind === 297 /* SourceFile */ ? sourceFileOrBundle : undefined;
+            var bundle = sourceFileOrBundle.kind === 299 /* Bundle */ ? sourceFileOrBundle : undefined;
+            var sourceFile = sourceFileOrBundle.kind === 298 /* SourceFile */ ? sourceFileOrBundle : undefined;
             var sourceFiles = bundle ? bundle.sourceFiles : [sourceFile];
             var sourceMapGenerator;
             if (shouldEmitSourceMaps(mapOptions, sourceFileOrBundle)) {
@@ -100998,7 +103763,7 @@ var ts;
         }
         function shouldEmitSourceMaps(mapOptions, sourceFileOrBundle) {
             return (mapOptions.sourceMap || mapOptions.inlineSourceMap)
-                && (sourceFileOrBundle.kind !== 297 /* SourceFile */ || !ts.fileExtensionIs(sourceFileOrBundle.fileName, ".json" /* Json */));
+                && (sourceFileOrBundle.kind !== 298 /* 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
@@ -101057,7 +103822,7 @@ var ts;
     ts.emitFiles = emitFiles;
     /*@internal*/
     function getBuildInfoText(buildInfo) {
-        return JSON.stringify(buildInfo, undefined, 2);
+        return JSON.stringify(buildInfo);
     }
     ts.getBuildInfoText = getBuildInfoText;
     /*@internal*/
@@ -101238,7 +104003,7 @@ var ts;
     function createPrinter(printerOptions, handlers) {
         if (printerOptions === void 0) { printerOptions = {}; }
         if (handlers === void 0) { handlers = {}; }
-        var hasGlobalName = handlers.hasGlobalName, _a = handlers.onEmitNode, onEmitNode = _a === void 0 ? ts.noEmitNotification : _a, isEmitNotificationEnabled = handlers.isEmitNotificationEnabled, _b = handlers.substituteNode, substituteNode = _b === void 0 ? ts.noEmitSubstitution : _b, onBeforeEmitNodeArray = handlers.onBeforeEmitNodeArray, onAfterEmitNodeArray = handlers.onAfterEmitNodeArray, onBeforeEmitToken = handlers.onBeforeEmitToken, onAfterEmitToken = handlers.onAfterEmitToken;
+        var hasGlobalName = handlers.hasGlobalName, _a = handlers.onEmitNode, onEmitNode = _a === void 0 ? ts.noEmitNotification : _a, isEmitNotificationEnabled = handlers.isEmitNotificationEnabled, _b = handlers.substituteNode, substituteNode = _b === void 0 ? ts.noEmitSubstitution : _b, onBeforeEmitNode = handlers.onBeforeEmitNode, onAfterEmitNode = handlers.onAfterEmitNode, onBeforeEmitNodeArray = handlers.onBeforeEmitNodeArray, onAfterEmitNodeArray = handlers.onAfterEmitNodeArray, onBeforeEmitToken = handlers.onBeforeEmitToken, onAfterEmitToken = handlers.onAfterEmitToken;
         var extendedDiagnostics = !!printerOptions.extendedDiagnostics;
         var newLine = ts.getNewLineCharacter(printerOptions);
         var moduleKind = ts.getEmitModuleKind(printerOptions);
@@ -101277,9 +104042,11 @@ var ts;
         var detachedCommentsInfo;
         var hasWrittenComment = false;
         var commentsDisabled = !!printerOptions.removeComments;
-        var lastNode;
         var lastSubstitution;
+        var currentParenthesizerRule;
         var _c = ts.performance.createTimerIf(extendedDiagnostics, "commentTime", "beforeComment", "afterComment"), enterComment = _c.enter, exitComment = _c.exit;
+        var parenthesizer = ts.factory.parenthesizer;
+        var emitBinaryExpression = createEmitBinaryExpression();
         reset();
         return {
             // public API
@@ -101307,9 +104074,9 @@ var ts;
                     break;
             }
             switch (node.kind) {
-                case 297 /* SourceFile */: return printFile(node);
-                case 298 /* Bundle */: return printBundle(node);
-                case 299 /* UnparsedSource */: return printUnparsedSource(node);
+                case 298 /* SourceFile */: return printFile(node);
+                case 299 /* Bundle */: return printBundle(node);
+                case 300 /* UnparsedSource */: return printUnparsedSource(node);
             }
             writeNode(hint, node, sourceFile, beginPrint());
             return endPrint();
@@ -101343,7 +104110,7 @@ var ts;
             if (sourceFile) {
                 setSourceFile(sourceFile);
             }
-            emitList(syntheticParent, nodes, format);
+            emitList(/*parentNode*/ undefined, nodes, format);
             reset();
             writer = previousWriter;
         }
@@ -101478,7 +104245,7 @@ var ts;
             if (sourceFile) {
                 setSourceFile(sourceFile);
             }
-            pipelineEmit(hint, node);
+            pipelineEmit(hint, node, /*parenthesizerRule*/ undefined);
         }
         function setSourceFile(sourceFile) {
             currentSourceFile = sourceFile;
@@ -101506,51 +104273,54 @@ var ts;
             currentSourceFile = undefined;
             currentLineMap = undefined;
             detachedCommentsInfo = undefined;
-            lastNode = undefined;
-            lastSubstitution = undefined;
             setWriter(/*output*/ undefined, /*_sourceMapGenerator*/ undefined);
         }
         function getCurrentLineMap() {
             return currentLineMap || (currentLineMap = ts.getLineStarts(currentSourceFile));
         }
-        function emit(node) {
+        function emit(node, parenthesizerRule) {
             if (node === undefined)
                 return;
             var prevSourceFileTextKind = recordBundleFileInternalSectionStart(node);
-            var substitute = pipelineEmit(4 /* Unspecified */, node);
+            pipelineEmit(4 /* Unspecified */, node, parenthesizerRule);
             recordBundleFileInternalSectionEnd(prevSourceFileTextKind);
-            return substitute;
         }
         function emitIdentifierName(node) {
             if (node === undefined)
                 return;
-            return pipelineEmit(2 /* IdentifierName */, node);
+            pipelineEmit(2 /* IdentifierName */, node, /*parenthesizerRule*/ undefined);
         }
-        function emitExpression(node) {
+        function emitExpression(node, parenthesizerRule) {
             if (node === undefined)
                 return;
-            return pipelineEmit(1 /* Expression */, node);
+            pipelineEmit(1 /* Expression */, node, parenthesizerRule);
         }
         function emitJsxAttributeValue(node) {
-            return pipelineEmit(ts.isStringLiteral(node) ? 6 /* JsxAttributeValue */ : 4 /* Unspecified */, node);
+            pipelineEmit(ts.isStringLiteral(node) ? 6 /* JsxAttributeValue */ : 4 /* Unspecified */, node);
         }
-        function pipelineEmit(emitHint, node) {
-            var savedLastNode = lastNode;
-            var savedLastSubstitution = lastSubstitution;
-            var savedPreserveSourceNewlines = preserveSourceNewlines;
-            lastNode = node;
-            lastSubstitution = undefined;
-            if (preserveSourceNewlines && !!(ts.getEmitFlags(node) & 134217728 /* IgnoreSourceNewlines */)) {
+        function beforeEmitNode(node) {
+            if (preserveSourceNewlines && (ts.getEmitFlags(node) & 134217728 /* IgnoreSourceNewlines */)) {
                 preserveSourceNewlines = false;
             }
+        }
+        function afterEmitNode(savedPreserveSourceNewlines) {
+            preserveSourceNewlines = savedPreserveSourceNewlines;
+        }
+        function pipelineEmit(emitHint, node, parenthesizerRule) {
+            currentParenthesizerRule = parenthesizerRule;
             var pipelinePhase = getPipelinePhase(0 /* Notification */, emitHint, node);
             pipelinePhase(emitHint, node);
-            ts.Debug.assert(lastNode === node);
-            var substitute = lastSubstitution;
-            lastNode = savedLastNode;
-            lastSubstitution = savedLastSubstitution;
-            preserveSourceNewlines = savedPreserveSourceNewlines;
-            return substitute || node;
+            currentParenthesizerRule = undefined;
+        }
+        function shouldEmitComments(node) {
+            return !commentsDisabled && !ts.isSourceFile(node);
+        }
+        function shouldEmitSourceMaps(node) {
+            return !sourceMapsDisabled &&
+                !ts.isSourceFile(node) &&
+                !ts.isInJsonFile(node) &&
+                !ts.isUnparsedSource(node) &&
+                !ts.isUnparsedPrepend(node);
         }
         function getPipelinePhase(phase, emitHint, node) {
             switch (phase) {
@@ -101560,18 +104330,21 @@ var ts;
                     }
                 // falls through
                 case 1 /* Substitution */:
-                    if (substituteNode !== ts.noEmitSubstitution && (lastSubstitution = substituteNode(emitHint, node)) !== node) {
+                    if (substituteNode !== ts.noEmitSubstitution && (lastSubstitution = substituteNode(emitHint, node) || node) !== node) {
+                        if (currentParenthesizerRule) {
+                            lastSubstitution = currentParenthesizerRule(lastSubstitution);
+                        }
                         return pipelineEmitWithSubstitution;
                     }
                 // falls through
                 case 2 /* Comments */:
-                    if (!commentsDisabled && node.kind !== 297 /* SourceFile */) {
+                    if (shouldEmitComments(node)) {
                         return pipelineEmitWithComments;
                     }
                 // falls through
                 case 3 /* SourceMaps */:
-                    if (!sourceMapsDisabled && node.kind !== 297 /* SourceFile */ && !ts.isInJsonFile(node)) {
-                        return pipelineEmitWithSourceMap;
+                    if (shouldEmitSourceMaps(node)) {
+                        return pipelineEmitWithSourceMaps;
                     }
                 // falls through
                 case 4 /* Emit */:
@@ -101584,13 +104357,25 @@ var ts;
             return getPipelinePhase(currentPhase + 1, emitHint, node);
         }
         function pipelineEmitWithNotification(hint, node) {
-            ts.Debug.assert(lastNode === node);
             var pipelinePhase = getNextPipelinePhase(0 /* Notification */, hint, node);
             onEmitNode(hint, node, pipelinePhase);
-            ts.Debug.assert(lastNode === node);
         }
         function pipelineEmitWithHint(hint, node) {
-            ts.Debug.assert(lastNode === node || lastSubstitution === node);
+            onBeforeEmitNode === null || onBeforeEmitNode === void 0 ? void 0 : onBeforeEmitNode(node);
+            if (preserveSourceNewlines) {
+                var savedPreserveSourceNewlines = preserveSourceNewlines;
+                beforeEmitNode(node);
+                pipelineEmitWithHintWorker(hint, node);
+                afterEmitNode(savedPreserveSourceNewlines);
+            }
+            else {
+                pipelineEmitWithHintWorker(hint, node);
+            }
+            onAfterEmitNode === null || onAfterEmitNode === void 0 ? void 0 : onAfterEmitNode(node);
+            // clear the parenthesizer rule as we ascend
+            currentParenthesizerRule = undefined;
+        }
+        function pipelineEmitWithHintWorker(hint, node) {
             if (hint === 0 /* SourceFile */)
                 return emitSourceFile(ts.cast(node, ts.isSourceFile));
             if (hint === 2 /* IdentifierName */)
@@ -101604,24 +104389,12 @@ var ts;
                 return emitEmptyStatement(/*isEmbeddedStatement*/ true);
             }
             if (hint === 4 /* Unspecified */) {
-                if (ts.isKeyword(node.kind))
-                    return writeTokenNode(node, writeKeyword);
                 switch (node.kind) {
                     // Pseudo-literals
                     case 15 /* TemplateHead */:
                     case 16 /* TemplateMiddle */:
                     case 17 /* TemplateTail */:
                         return emitLiteral(node, /*jsxAttributeEscape*/ false);
-                    case 299 /* UnparsedSource */:
-                    case 293 /* UnparsedPrepend */:
-                        return emitUnparsedSourceOrPrepend(node);
-                    case 292 /* UnparsedPrologue */:
-                        return writeUnparsedNode(node);
-                    case 294 /* UnparsedText */:
-                    case 295 /* UnparsedInternalText */:
-                        return emitUnparsedTextLike(node);
-                    case 296 /* UnparsedSyntheticReference */:
-                        return emitUnparsedSyntheticReference(node);
                     // Identifiers
                     case 78 /* Identifier */:
                         return emitIdentifier(node);
@@ -101630,282 +104403,323 @@ var ts;
                         return emitPrivateIdentifier(node);
                     // Parse tree nodes
                     // Names
-                    case 157 /* QualifiedName */:
+                    case 158 /* QualifiedName */:
                         return emitQualifiedName(node);
-                    case 158 /* ComputedPropertyName */:
+                    case 159 /* ComputedPropertyName */:
                         return emitComputedPropertyName(node);
                     // Signature elements
-                    case 159 /* TypeParameter */:
+                    case 160 /* TypeParameter */:
                         return emitTypeParameter(node);
-                    case 160 /* Parameter */:
+                    case 161 /* Parameter */:
                         return emitParameter(node);
-                    case 161 /* Decorator */:
+                    case 162 /* Decorator */:
                         return emitDecorator(node);
                     // Type members
-                    case 162 /* PropertySignature */:
+                    case 163 /* PropertySignature */:
                         return emitPropertySignature(node);
-                    case 163 /* PropertyDeclaration */:
+                    case 164 /* PropertyDeclaration */:
                         return emitPropertyDeclaration(node);
-                    case 164 /* MethodSignature */:
+                    case 165 /* MethodSignature */:
                         return emitMethodSignature(node);
-                    case 165 /* MethodDeclaration */:
+                    case 166 /* MethodDeclaration */:
                         return emitMethodDeclaration(node);
-                    case 166 /* Constructor */:
+                    case 167 /* Constructor */:
                         return emitConstructor(node);
-                    case 167 /* GetAccessor */:
-                    case 168 /* SetAccessor */:
+                    case 168 /* GetAccessor */:
+                    case 169 /* SetAccessor */:
                         return emitAccessorDeclaration(node);
-                    case 169 /* CallSignature */:
+                    case 170 /* CallSignature */:
                         return emitCallSignature(node);
-                    case 170 /* ConstructSignature */:
+                    case 171 /* ConstructSignature */:
                         return emitConstructSignature(node);
-                    case 171 /* IndexSignature */:
+                    case 172 /* IndexSignature */:
                         return emitIndexSignature(node);
-                    case 194 /* TemplateLiteralTypeSpan */:
-                        return emitTemplateTypeSpan(node);
                     // Types
-                    case 172 /* TypePredicate */:
+                    case 173 /* TypePredicate */:
                         return emitTypePredicate(node);
-                    case 173 /* TypeReference */:
+                    case 174 /* TypeReference */:
                         return emitTypeReference(node);
-                    case 174 /* FunctionType */:
+                    case 175 /* FunctionType */:
                         return emitFunctionType(node);
-                    case 308 /* JSDocFunctionType */:
-                        return emitJSDocFunctionType(node);
-                    case 175 /* ConstructorType */:
+                    case 176 /* ConstructorType */:
                         return emitConstructorType(node);
-                    case 176 /* TypeQuery */:
+                    case 177 /* TypeQuery */:
                         return emitTypeQuery(node);
-                    case 177 /* TypeLiteral */:
+                    case 178 /* TypeLiteral */:
                         return emitTypeLiteral(node);
-                    case 178 /* ArrayType */:
+                    case 179 /* ArrayType */:
                         return emitArrayType(node);
-                    case 179 /* TupleType */:
+                    case 180 /* TupleType */:
                         return emitTupleType(node);
-                    case 180 /* OptionalType */:
+                    case 181 /* OptionalType */:
                         return emitOptionalType(node);
-                    case 182 /* UnionType */:
+                    // SyntaxKind.RestType is handled below
+                    case 183 /* UnionType */:
                         return emitUnionType(node);
-                    case 183 /* IntersectionType */:
+                    case 184 /* IntersectionType */:
                         return emitIntersectionType(node);
-                    case 184 /* ConditionalType */:
+                    case 185 /* ConditionalType */:
                         return emitConditionalType(node);
-                    case 185 /* InferType */:
+                    case 186 /* InferType */:
                         return emitInferType(node);
-                    case 186 /* ParenthesizedType */:
+                    case 187 /* ParenthesizedType */:
                         return emitParenthesizedType(node);
-                    case 223 /* ExpressionWithTypeArguments */:
+                    case 224 /* ExpressionWithTypeArguments */:
                         return emitExpressionWithTypeArguments(node);
-                    case 187 /* ThisType */:
+                    case 188 /* ThisType */:
                         return emitThisType();
-                    case 188 /* TypeOperator */:
+                    case 189 /* TypeOperator */:
                         return emitTypeOperator(node);
-                    case 189 /* IndexedAccessType */:
+                    case 190 /* IndexedAccessType */:
                         return emitIndexedAccessType(node);
-                    case 190 /* MappedType */:
+                    case 191 /* MappedType */:
                         return emitMappedType(node);
-                    case 191 /* LiteralType */:
+                    case 192 /* LiteralType */:
                         return emitLiteralType(node);
-                    case 193 /* TemplateLiteralType */:
+                    case 193 /* NamedTupleMember */:
+                        return emitNamedTupleMember(node);
+                    case 194 /* TemplateLiteralType */:
                         return emitTemplateType(node);
-                    case 195 /* ImportType */:
+                    case 195 /* TemplateLiteralTypeSpan */:
+                        return emitTemplateTypeSpan(node);
+                    case 196 /* ImportType */:
                         return emitImportTypeNode(node);
-                    case 303 /* JSDocAllType */:
-                        writePunctuation("*");
-                        return;
-                    case 304 /* JSDocUnknownType */:
-                        writePunctuation("?");
-                        return;
-                    case 305 /* JSDocNullableType */:
-                        return emitJSDocNullableType(node);
-                    case 306 /* JSDocNonNullableType */:
-                        return emitJSDocNonNullableType(node);
-                    case 307 /* JSDocOptionalType */:
-                        return emitJSDocOptionalType(node);
-                    case 181 /* RestType */:
-                    case 309 /* JSDocVariadicType */:
-                        return emitRestOrJSDocVariadicType(node);
-                    case 192 /* NamedTupleMember */:
-                        return emitNamedTupleMember(node);
                     // Binding patterns
-                    case 196 /* ObjectBindingPattern */:
+                    case 197 /* ObjectBindingPattern */:
                         return emitObjectBindingPattern(node);
-                    case 197 /* ArrayBindingPattern */:
+                    case 198 /* ArrayBindingPattern */:
                         return emitArrayBindingPattern(node);
-                    case 198 /* BindingElement */:
+                    case 199 /* BindingElement */:
                         return emitBindingElement(node);
                     // Misc
-                    case 228 /* TemplateSpan */:
+                    case 229 /* TemplateSpan */:
                         return emitTemplateSpan(node);
-                    case 229 /* SemicolonClassElement */:
+                    case 230 /* SemicolonClassElement */:
                         return emitSemicolonClassElement();
                     // Statements
-                    case 230 /* Block */:
+                    case 231 /* Block */:
                         return emitBlock(node);
-                    case 232 /* VariableStatement */:
+                    case 233 /* VariableStatement */:
                         return emitVariableStatement(node);
-                    case 231 /* EmptyStatement */:
+                    case 232 /* EmptyStatement */:
                         return emitEmptyStatement(/*isEmbeddedStatement*/ false);
-                    case 233 /* ExpressionStatement */:
+                    case 234 /* ExpressionStatement */:
                         return emitExpressionStatement(node);
-                    case 234 /* IfStatement */:
+                    case 235 /* IfStatement */:
                         return emitIfStatement(node);
-                    case 235 /* DoStatement */:
+                    case 236 /* DoStatement */:
                         return emitDoStatement(node);
-                    case 236 /* WhileStatement */:
+                    case 237 /* WhileStatement */:
                         return emitWhileStatement(node);
-                    case 237 /* ForStatement */:
+                    case 238 /* ForStatement */:
                         return emitForStatement(node);
-                    case 238 /* ForInStatement */:
+                    case 239 /* ForInStatement */:
                         return emitForInStatement(node);
-                    case 239 /* ForOfStatement */:
+                    case 240 /* ForOfStatement */:
                         return emitForOfStatement(node);
-                    case 240 /* ContinueStatement */:
+                    case 241 /* ContinueStatement */:
                         return emitContinueStatement(node);
-                    case 241 /* BreakStatement */:
+                    case 242 /* BreakStatement */:
                         return emitBreakStatement(node);
-                    case 242 /* ReturnStatement */:
+                    case 243 /* ReturnStatement */:
                         return emitReturnStatement(node);
-                    case 243 /* WithStatement */:
+                    case 244 /* WithStatement */:
                         return emitWithStatement(node);
-                    case 244 /* SwitchStatement */:
+                    case 245 /* SwitchStatement */:
                         return emitSwitchStatement(node);
-                    case 245 /* LabeledStatement */:
+                    case 246 /* LabeledStatement */:
                         return emitLabeledStatement(node);
-                    case 246 /* ThrowStatement */:
+                    case 247 /* ThrowStatement */:
                         return emitThrowStatement(node);
-                    case 247 /* TryStatement */:
+                    case 248 /* TryStatement */:
                         return emitTryStatement(node);
-                    case 248 /* DebuggerStatement */:
+                    case 249 /* DebuggerStatement */:
                         return emitDebuggerStatement(node);
                     // Declarations
-                    case 249 /* VariableDeclaration */:
+                    case 250 /* VariableDeclaration */:
                         return emitVariableDeclaration(node);
-                    case 250 /* VariableDeclarationList */:
+                    case 251 /* VariableDeclarationList */:
                         return emitVariableDeclarationList(node);
-                    case 251 /* FunctionDeclaration */:
+                    case 252 /* FunctionDeclaration */:
                         return emitFunctionDeclaration(node);
-                    case 252 /* ClassDeclaration */:
+                    case 253 /* ClassDeclaration */:
                         return emitClassDeclaration(node);
-                    case 253 /* InterfaceDeclaration */:
+                    case 254 /* InterfaceDeclaration */:
                         return emitInterfaceDeclaration(node);
-                    case 254 /* TypeAliasDeclaration */:
+                    case 255 /* TypeAliasDeclaration */:
                         return emitTypeAliasDeclaration(node);
-                    case 255 /* EnumDeclaration */:
+                    case 256 /* EnumDeclaration */:
                         return emitEnumDeclaration(node);
-                    case 256 /* ModuleDeclaration */:
+                    case 257 /* ModuleDeclaration */:
                         return emitModuleDeclaration(node);
-                    case 257 /* ModuleBlock */:
+                    case 258 /* ModuleBlock */:
                         return emitModuleBlock(node);
-                    case 258 /* CaseBlock */:
+                    case 259 /* CaseBlock */:
                         return emitCaseBlock(node);
-                    case 259 /* NamespaceExportDeclaration */:
+                    case 260 /* NamespaceExportDeclaration */:
                         return emitNamespaceExportDeclaration(node);
-                    case 260 /* ImportEqualsDeclaration */:
+                    case 261 /* ImportEqualsDeclaration */:
                         return emitImportEqualsDeclaration(node);
-                    case 261 /* ImportDeclaration */:
+                    case 262 /* ImportDeclaration */:
                         return emitImportDeclaration(node);
-                    case 262 /* ImportClause */:
+                    case 263 /* ImportClause */:
                         return emitImportClause(node);
-                    case 263 /* NamespaceImport */:
+                    case 264 /* NamespaceImport */:
                         return emitNamespaceImport(node);
-                    case 269 /* NamespaceExport */:
+                    case 270 /* NamespaceExport */:
                         return emitNamespaceExport(node);
-                    case 264 /* NamedImports */:
+                    case 265 /* NamedImports */:
                         return emitNamedImports(node);
-                    case 265 /* ImportSpecifier */:
+                    case 266 /* ImportSpecifier */:
                         return emitImportSpecifier(node);
-                    case 266 /* ExportAssignment */:
+                    case 267 /* ExportAssignment */:
                         return emitExportAssignment(node);
-                    case 267 /* ExportDeclaration */:
+                    case 268 /* ExportDeclaration */:
                         return emitExportDeclaration(node);
-                    case 268 /* NamedExports */:
+                    case 269 /* NamedExports */:
                         return emitNamedExports(node);
-                    case 270 /* ExportSpecifier */:
+                    case 271 /* ExportSpecifier */:
                         return emitExportSpecifier(node);
-                    case 271 /* MissingDeclaration */:
+                    case 272 /* MissingDeclaration */:
                         return;
                     // Module references
-                    case 272 /* ExternalModuleReference */:
+                    case 273 /* ExternalModuleReference */:
                         return emitExternalModuleReference(node);
                     // JSX (non-expression)
                     case 11 /* JsxText */:
                         return emitJsxText(node);
-                    case 275 /* JsxOpeningElement */:
-                    case 278 /* JsxOpeningFragment */:
+                    case 276 /* JsxOpeningElement */:
+                    case 279 /* JsxOpeningFragment */:
                         return emitJsxOpeningElementOrFragment(node);
-                    case 276 /* JsxClosingElement */:
-                    case 279 /* JsxClosingFragment */:
+                    case 277 /* JsxClosingElement */:
+                    case 280 /* JsxClosingFragment */:
                         return emitJsxClosingElementOrFragment(node);
-                    case 280 /* JsxAttribute */:
+                    case 281 /* JsxAttribute */:
                         return emitJsxAttribute(node);
-                    case 281 /* JsxAttributes */:
+                    case 282 /* JsxAttributes */:
                         return emitJsxAttributes(node);
-                    case 282 /* JsxSpreadAttribute */:
+                    case 283 /* JsxSpreadAttribute */:
                         return emitJsxSpreadAttribute(node);
-                    case 283 /* JsxExpression */:
+                    case 284 /* JsxExpression */:
                         return emitJsxExpression(node);
                     // Clauses
-                    case 284 /* CaseClause */:
+                    case 285 /* CaseClause */:
                         return emitCaseClause(node);
-                    case 285 /* DefaultClause */:
+                    case 286 /* DefaultClause */:
                         return emitDefaultClause(node);
-                    case 286 /* HeritageClause */:
+                    case 287 /* HeritageClause */:
                         return emitHeritageClause(node);
-                    case 287 /* CatchClause */:
+                    case 288 /* CatchClause */:
                         return emitCatchClause(node);
                     // Property assignments
-                    case 288 /* PropertyAssignment */:
+                    case 289 /* PropertyAssignment */:
                         return emitPropertyAssignment(node);
-                    case 289 /* ShorthandPropertyAssignment */:
+                    case 290 /* ShorthandPropertyAssignment */:
                         return emitShorthandPropertyAssignment(node);
-                    case 290 /* SpreadAssignment */:
+                    case 291 /* SpreadAssignment */:
                         return emitSpreadAssignment(node);
                     // Enum
-                    case 291 /* EnumMember */:
+                    case 292 /* EnumMember */:
                         return emitEnumMember(node);
+                    // Unparsed
+                    case 293 /* UnparsedPrologue */:
+                        return writeUnparsedNode(node);
+                    case 300 /* UnparsedSource */:
+                    case 294 /* UnparsedPrepend */:
+                        return emitUnparsedSourceOrPrepend(node);
+                    case 295 /* UnparsedText */:
+                    case 296 /* UnparsedInternalText */:
+                        return emitUnparsedTextLike(node);
+                    case 297 /* UnparsedSyntheticReference */:
+                        return emitUnparsedSyntheticReference(node);
+                    // Top-level nodes
+                    case 298 /* SourceFile */:
+                        return emitSourceFile(node);
+                    case 299 /* Bundle */:
+                        return ts.Debug.fail("Bundles should be printed using printBundle");
+                    // SyntaxKind.UnparsedSource (handled above)
+                    case 301 /* InputFiles */:
+                        return ts.Debug.fail("InputFiles should not be printed");
                     // JSDoc nodes (only used in codefixes currently)
-                    case 326 /* JSDocParameterTag */:
-                    case 333 /* JSDocPropertyTag */:
+                    case 302 /* JSDocTypeExpression */:
+                        return emitJSDocTypeExpression(node);
+                    case 303 /* JSDocNameReference */:
+                        return emitJSDocNameReference(node);
+                    case 304 /* JSDocAllType */:
+                        return writePunctuation("*");
+                    case 305 /* JSDocUnknownType */:
+                        return writePunctuation("?");
+                    case 306 /* JSDocNullableType */:
+                        return emitJSDocNullableType(node);
+                    case 307 /* JSDocNonNullableType */:
+                        return emitJSDocNonNullableType(node);
+                    case 308 /* JSDocOptionalType */:
+                        return emitJSDocOptionalType(node);
+                    case 309 /* JSDocFunctionType */:
+                        return emitJSDocFunctionType(node);
+                    case 182 /* RestType */:
+                    case 310 /* JSDocVariadicType */:
+                        return emitRestOrJSDocVariadicType(node);
+                    case 311 /* JSDocNamepathType */:
+                        return;
+                    case 312 /* JSDocComment */:
+                        return emitJSDoc(node);
+                    case 314 /* JSDocTypeLiteral */:
+                        return emitJSDocTypeLiteral(node);
+                    case 315 /* JSDocSignature */:
+                        return emitJSDocSignature(node);
+                    case 317 /* JSDocTag */:
+                    case 322 /* JSDocClassTag */:
+                        return emitJSDocSimpleTag(node);
+                    case 318 /* JSDocAugmentsTag */:
+                    case 319 /* JSDocImplementsTag */:
+                        return emitJSDocHeritageTag(node);
+                    case 320 /* JSDocAuthorTag */:
+                    case 321 /* JSDocDeprecatedTag */:
+                        return;
+                    // SyntaxKind.JSDocClassTag (see JSDocTag, above)
+                    case 323 /* JSDocPublicTag */:
+                    case 324 /* JSDocPrivateTag */:
+                    case 325 /* JSDocProtectedTag */:
+                    case 326 /* JSDocReadonlyTag */:
+                    case 327 /* JSDocOverrideTag */:
+                        return;
+                    case 328 /* JSDocCallbackTag */:
+                        return emitJSDocCallbackTag(node);
+                    // SyntaxKind.JSDocEnumTag (see below)
+                    case 330 /* JSDocParameterTag */:
+                    case 337 /* JSDocPropertyTag */:
                         return emitJSDocPropertyLikeTag(node);
-                    case 327 /* JSDocReturnTag */:
-                    case 329 /* JSDocTypeTag */:
-                    case 328 /* JSDocThisTag */:
-                    case 325 /* JSDocEnumTag */:
+                    case 329 /* JSDocEnumTag */:
+                    case 331 /* JSDocReturnTag */:
+                    case 332 /* JSDocThisTag */:
+                    case 333 /* JSDocTypeTag */:
                         return emitJSDocSimpleTypedTag(node);
-                    case 316 /* JSDocImplementsTag */:
-                    case 315 /* JSDocAugmentsTag */:
-                        return emitJSDocHeritageTag(node);
-                    case 330 /* JSDocTemplateTag */:
+                    case 334 /* JSDocTemplateTag */:
                         return emitJSDocTemplateTag(node);
-                    case 331 /* JSDocTypedefTag */:
+                    case 335 /* JSDocTypedefTag */:
                         return emitJSDocTypedefTag(node);
-                    case 324 /* JSDocCallbackTag */:
-                        return emitJSDocCallbackTag(node);
-                    case 313 /* JSDocSignature */:
-                        return emitJSDocSignature(node);
-                    case 312 /* JSDocTypeLiteral */:
-                        return emitJSDocTypeLiteral(node);
-                    case 319 /* JSDocClassTag */:
-                    case 314 /* JSDocTag */:
-                        return emitJSDocSimpleTag(node);
-                    case 332 /* JSDocSeeTag */:
+                    case 336 /* JSDocSeeTag */:
                         return emitJSDocSeeTag(node);
-                    case 302 /* JSDocNameReference */:
-                        return emitJSDocNameReference(node);
-                    case 311 /* JSDocComment */:
-                        return emitJSDoc(node);
-                    // Transformation nodes (ignored)
+                    // SyntaxKind.JSDocPropertyTag (see JSDocParameterTag, above)
+                    // Transformation nodes
+                    case 339 /* NotEmittedStatement */:
+                    case 343 /* EndOfDeclarationMarker */:
+                    case 342 /* MergeDeclarationMarker */:
+                        return;
                 }
                 if (ts.isExpression(node)) {
                     hint = 1 /* Expression */;
                     if (substituteNode !== ts.noEmitSubstitution) {
-                        lastSubstitution = node = substituteNode(hint, node);
+                        var substitute = substituteNode(hint, node) || node;
+                        if (substitute !== node) {
+                            node = substitute;
+                            if (currentParenthesizerRule) {
+                                node = currentParenthesizerRule(node);
+                            }
+                        }
                     }
                 }
-                else if (ts.isToken(node)) {
-                    return writeTokenNode(node, writePunctuation);
-                }
             }
             if (hint === 1 /* Expression */) {
                 switch (node.kind) {
@@ -101920,84 +104734,92 @@ var ts;
                     // Identifiers
                     case 78 /* Identifier */:
                         return emitIdentifier(node);
-                    // Reserved words
-                    case 94 /* FalseKeyword */:
-                    case 103 /* NullKeyword */:
-                    case 105 /* SuperKeyword */:
-                    case 109 /* TrueKeyword */:
-                    case 107 /* ThisKeyword */:
-                    case 99 /* ImportKeyword */:
-                        writeTokenNode(node, writeKeyword);
-                        return;
                     // Expressions
-                    case 199 /* ArrayLiteralExpression */:
+                    case 200 /* ArrayLiteralExpression */:
                         return emitArrayLiteralExpression(node);
-                    case 200 /* ObjectLiteralExpression */:
+                    case 201 /* ObjectLiteralExpression */:
                         return emitObjectLiteralExpression(node);
-                    case 201 /* PropertyAccessExpression */:
+                    case 202 /* PropertyAccessExpression */:
                         return emitPropertyAccessExpression(node);
-                    case 202 /* ElementAccessExpression */:
+                    case 203 /* ElementAccessExpression */:
                         return emitElementAccessExpression(node);
-                    case 203 /* CallExpression */:
+                    case 204 /* CallExpression */:
                         return emitCallExpression(node);
-                    case 204 /* NewExpression */:
+                    case 205 /* NewExpression */:
                         return emitNewExpression(node);
-                    case 205 /* TaggedTemplateExpression */:
+                    case 206 /* TaggedTemplateExpression */:
                         return emitTaggedTemplateExpression(node);
-                    case 206 /* TypeAssertionExpression */:
+                    case 207 /* TypeAssertionExpression */:
                         return emitTypeAssertionExpression(node);
-                    case 207 /* ParenthesizedExpression */:
+                    case 208 /* ParenthesizedExpression */:
                         return emitParenthesizedExpression(node);
-                    case 208 /* FunctionExpression */:
+                    case 209 /* FunctionExpression */:
                         return emitFunctionExpression(node);
-                    case 209 /* ArrowFunction */:
+                    case 210 /* ArrowFunction */:
                         return emitArrowFunction(node);
-                    case 210 /* DeleteExpression */:
+                    case 211 /* DeleteExpression */:
                         return emitDeleteExpression(node);
-                    case 211 /* TypeOfExpression */:
+                    case 212 /* TypeOfExpression */:
                         return emitTypeOfExpression(node);
-                    case 212 /* VoidExpression */:
+                    case 213 /* VoidExpression */:
                         return emitVoidExpression(node);
-                    case 213 /* AwaitExpression */:
+                    case 214 /* AwaitExpression */:
                         return emitAwaitExpression(node);
-                    case 214 /* PrefixUnaryExpression */:
+                    case 215 /* PrefixUnaryExpression */:
                         return emitPrefixUnaryExpression(node);
-                    case 215 /* PostfixUnaryExpression */:
+                    case 216 /* PostfixUnaryExpression */:
                         return emitPostfixUnaryExpression(node);
-                    case 216 /* BinaryExpression */:
+                    case 217 /* BinaryExpression */:
                         return emitBinaryExpression(node);
-                    case 217 /* ConditionalExpression */:
+                    case 218 /* ConditionalExpression */:
                         return emitConditionalExpression(node);
-                    case 218 /* TemplateExpression */:
+                    case 219 /* TemplateExpression */:
                         return emitTemplateExpression(node);
-                    case 219 /* YieldExpression */:
+                    case 220 /* YieldExpression */:
                         return emitYieldExpression(node);
-                    case 220 /* SpreadElement */:
-                        return emitSpreadExpression(node);
-                    case 221 /* ClassExpression */:
+                    case 221 /* SpreadElement */:
+                        return emitSpreadElement(node);
+                    case 222 /* ClassExpression */:
                         return emitClassExpression(node);
-                    case 222 /* OmittedExpression */:
+                    case 223 /* OmittedExpression */:
                         return;
-                    case 224 /* AsExpression */:
+                    case 225 /* AsExpression */:
                         return emitAsExpression(node);
-                    case 225 /* NonNullExpression */:
+                    case 226 /* NonNullExpression */:
                         return emitNonNullExpression(node);
-                    case 226 /* MetaProperty */:
+                    case 227 /* MetaProperty */:
                         return emitMetaProperty(node);
+                    case 228 /* SyntheticExpression */:
+                        return ts.Debug.fail("SyntheticExpression should never be printed.");
                     // JSX
-                    case 273 /* JsxElement */:
+                    case 274 /* JsxElement */:
                         return emitJsxElement(node);
-                    case 274 /* JsxSelfClosingElement */:
+                    case 275 /* JsxSelfClosingElement */:
                         return emitJsxSelfClosingElement(node);
-                    case 277 /* JsxFragment */:
+                    case 278 /* JsxFragment */:
                         return emitJsxFragment(node);
+                    // Synthesized list
+                    case 338 /* SyntaxList */:
+                        return ts.Debug.fail("SyntaxList should not be printed");
                     // Transformation nodes
-                    case 336 /* PartiallyEmittedExpression */:
+                    case 339 /* NotEmittedStatement */:
+                        return;
+                    case 340 /* PartiallyEmittedExpression */:
                         return emitPartiallyEmittedExpression(node);
-                    case 337 /* CommaListExpression */:
+                    case 341 /* CommaListExpression */:
                         return emitCommaList(node);
+                    case 342 /* MergeDeclarationMarker */:
+                    case 343 /* EndOfDeclarationMarker */:
+                        return;
+                    case 344 /* SyntheticReferenceExpression */:
+                        return ts.Debug.fail("SyntheticReferenceExpression should not be printed");
                 }
             }
+            if (ts.isKeyword(node.kind))
+                return writeTokenNode(node, writeKeyword);
+            if (ts.isTokenKind(node.kind))
+                return writeTokenNode(node, writePunctuation);
+            ts.Debug.fail("Unhandled SyntaxKind: " + ts.Debug.formatSyntaxKind(node.kind) + ".");
         }
         function emitMappedTypeParameter(node) {
             emit(node.name);
@@ -102007,10 +104829,11 @@ var ts;
             emit(node.constraint);
         }
         function pipelineEmitWithSubstitution(hint, node) {
-            ts.Debug.assert(lastNode === node || lastSubstitution === node);
             var pipelinePhase = getNextPipelinePhase(1 /* Substitution */, hint, node);
-            pipelinePhase(hint, lastSubstitution);
-            ts.Debug.assert(lastNode === node || lastSubstitution === node);
+            ts.Debug.assertIsDefined(lastSubstitution);
+            node = lastSubstitution;
+            lastSubstitution = undefined;
+            pipelinePhase(hint, node);
         }
         function getHelpersFromBundledSourceFiles(bundle) {
             var result;
@@ -102036,7 +104859,7 @@ var ts;
         }
         function emitHelpers(node) {
             var helpersEmitted = false;
-            var bundle = node.kind === 298 /* Bundle */ ? node : undefined;
+            var bundle = node.kind === 299 /* Bundle */ ? node : undefined;
             if (bundle && moduleKind === ts.ModuleKind.None) {
                 return;
             }
@@ -102136,7 +104959,7 @@ var ts;
             var pos = getTextPosWithWriteLine();
             writeUnparsedNode(unparsed);
             if (bundleFileInfo) {
-                updateOrPushBundleFileTextLike(pos, writer.getTextPos(), unparsed.kind === 294 /* UnparsedText */ ?
+                updateOrPushBundleFileTextLike(pos, writer.getTextPos(), unparsed.kind === 295 /* UnparsedText */ ?
                     "text" /* Text */ :
                     "internal" /* Internal */);
             }
@@ -102182,7 +105005,7 @@ var ts;
         }
         function emitComputedPropertyName(node) {
             writePunctuation("[");
-            emitExpression(node.expression);
+            emitExpression(node.expression, parenthesizer.parenthesizeExpressionOfComputedPropertyName);
             writePunctuation("]");
         }
         //
@@ -102209,18 +105032,18 @@ var ts;
             emit(node.dotDotDotToken);
             emitNodeWithWriter(node.name, writeParameter);
             emit(node.questionToken);
-            if (node.parent && node.parent.kind === 308 /* JSDocFunctionType */ && !node.name) {
+            if (node.parent && node.parent.kind === 309 /* JSDocFunctionType */ && !node.name) {
                 emit(node.type);
             }
             else {
                 emitTypeAnnotation(node.type);
             }
             // The comment position has to fallback to any present node within the parameterdeclaration because as it turns out, the parser can make parameter declarations with _just_ an initializer.
-            emitInitializer(node.initializer, node.type ? node.type.end : node.questionToken ? node.questionToken.end : node.name ? node.name.end : node.modifiers ? node.modifiers.end : node.decorators ? node.decorators.end : node.pos, node);
+            emitInitializer(node.initializer, node.type ? node.type.end : node.questionToken ? node.questionToken.end : node.name ? node.name.end : node.modifiers ? node.modifiers.end : node.decorators ? node.decorators.end : node.pos, node, parenthesizer.parenthesizeExpressionForDisallowedComma);
         }
         function emitDecorator(decorator) {
             writePunctuation("@");
-            emitExpression(decorator.expression);
+            emitExpression(decorator.expression, parenthesizer.parenthesizeLeftSideOfAccess);
         }
         //
         // Type members
@@ -102271,7 +105094,7 @@ var ts;
         function emitAccessorDeclaration(node) {
             emitDecorators(node, node.decorators);
             emitModifiers(node, node.modifiers);
-            writeKeyword(node.kind === 167 /* GetAccessor */ ? "get" : "set");
+            writeKeyword(node.kind === 168 /* GetAccessor */ ? "get" : "set");
             writeSpace();
             emit(node.name);
             emitSignatureAndBody(node, emitSignatureHead);
@@ -102385,7 +105208,7 @@ var ts;
             writePunctuation("}");
         }
         function emitArrayType(node) {
-            emit(node.elementType);
+            emit(node.elementType, parenthesizer.parenthesizeElementTypeOfArrayType);
             writePunctuation("[");
             writePunctuation("]");
         }
@@ -102408,21 +105231,21 @@ var ts;
             emit(node.type);
         }
         function emitOptionalType(node) {
-            emit(node.type);
+            emit(node.type, parenthesizer.parenthesizeElementTypeOfArrayType);
             writePunctuation("?");
         }
         function emitUnionType(node) {
-            emitList(node, node.types, 516 /* UnionTypeConstituents */);
+            emitList(node, node.types, 516 /* UnionTypeConstituents */, parenthesizer.parenthesizeMemberOfElementType);
         }
         function emitIntersectionType(node) {
-            emitList(node, node.types, 520 /* IntersectionTypeConstituents */);
+            emitList(node, node.types, 520 /* IntersectionTypeConstituents */, parenthesizer.parenthesizeMemberOfElementType);
         }
         function emitConditionalType(node) {
-            emit(node.checkType);
+            emit(node.checkType, parenthesizer.parenthesizeMemberOfConditionalType);
             writeSpace();
             writeKeyword("extends");
             writeSpace();
-            emit(node.extendsType);
+            emit(node.extendsType, parenthesizer.parenthesizeMemberOfConditionalType);
             writeSpace();
             writePunctuation("?");
             writeSpace();
@@ -102448,10 +105271,10 @@ var ts;
         function emitTypeOperator(node) {
             writeTokenText(node.operator, writeKeyword);
             writeSpace();
-            emit(node.type);
+            emit(node.type, parenthesizer.parenthesizeMemberOfElementType);
         }
         function emitIndexedAccessType(node) {
-            emit(node.objectType);
+            emit(node.objectType, parenthesizer.parenthesizeMemberOfElementType);
             writePunctuation("[");
             emit(node.indexType);
             writePunctuation("]");
@@ -102544,7 +105367,7 @@ var ts;
                 writeSpace();
             }
             emit(node.name);
-            emitInitializer(node.initializer, node.name.end, node);
+            emitInitializer(node.initializer, node.name.end, node, parenthesizer.parenthesizeExpressionForDisallowedComma);
         }
         //
         // Expressions
@@ -102552,7 +105375,7 @@ var ts;
         function emitArrayLiteralExpression(node) {
             var elements = node.elements;
             var preferNewLine = node.multiLine ? 65536 /* PreferNewLine */ : 0 /* None */;
-            emitExpressionList(node, elements, 8914 /* ArrayLiteralExpressionElements */ | preferNewLine);
+            emitExpressionList(node, elements, 8914 /* ArrayLiteralExpressionElements */ | preferNewLine, parenthesizer.parenthesizeExpressionForDisallowedComma);
         }
         function emitObjectLiteralExpression(node) {
             ts.forEach(node.properties, generateMemberNames);
@@ -102568,13 +105391,13 @@ var ts;
             }
         }
         function emitPropertyAccessExpression(node) {
-            var expression = ts.cast(emitExpression(node.expression), ts.isExpression);
+            emitExpression(node.expression, parenthesizer.parenthesizeLeftSideOfAccess);
             var token = node.questionDotToken || ts.setTextRangePosEnd(ts.factory.createToken(24 /* DotToken */), node.expression.end, node.name.pos);
             var linesBeforeDot = getLinesBetweenNodes(node, node.expression, token);
             var linesAfterDot = getLinesBetweenNodes(node, token, node.name);
             writeLinesAndIndent(linesBeforeDot, /*writeSpaceIfNotIndenting*/ false);
             var shouldEmitDotDot = token.kind !== 28 /* QuestionDotToken */ &&
-                mayNeedDotDotForPropertyAccess(expression) &&
+                mayNeedDotDotForPropertyAccess(node.expression) &&
                 !writer.hasTrailingComment() &&
                 !writer.hasTrailingWhitespace();
             if (shouldEmitDotDot) {
@@ -102610,27 +105433,27 @@ var ts;
             }
         }
         function emitElementAccessExpression(node) {
-            emitExpression(node.expression);
+            emitExpression(node.expression, parenthesizer.parenthesizeLeftSideOfAccess);
             emit(node.questionDotToken);
             emitTokenWithComment(22 /* OpenBracketToken */, node.expression.end, writePunctuation, node);
             emitExpression(node.argumentExpression);
             emitTokenWithComment(23 /* CloseBracketToken */, node.argumentExpression.end, writePunctuation, node);
         }
         function emitCallExpression(node) {
-            emitExpression(node.expression);
+            emitExpression(node.expression, parenthesizer.parenthesizeLeftSideOfAccess);
             emit(node.questionDotToken);
             emitTypeArguments(node, node.typeArguments);
-            emitExpressionList(node, node.arguments, 2576 /* CallExpressionArguments */);
+            emitExpressionList(node, node.arguments, 2576 /* CallExpressionArguments */, parenthesizer.parenthesizeExpressionForDisallowedComma);
         }
         function emitNewExpression(node) {
             emitTokenWithComment(102 /* NewKeyword */, node.pos, writeKeyword, node);
             writeSpace();
-            emitExpression(node.expression);
+            emitExpression(node.expression, parenthesizer.parenthesizeExpressionOfNew);
             emitTypeArguments(node, node.typeArguments);
-            emitExpressionList(node, node.arguments, 18960 /* NewExpressionArguments */);
+            emitExpressionList(node, node.arguments, 18960 /* NewExpressionArguments */, parenthesizer.parenthesizeExpressionForDisallowedComma);
         }
         function emitTaggedTemplateExpression(node) {
-            emitExpression(node.tag);
+            emitExpression(node.tag, parenthesizer.parenthesizeLeftSideOfAccess);
             emitTypeArguments(node, node.typeArguments);
             writeSpace();
             emitExpression(node.template);
@@ -102639,12 +105462,12 @@ var ts;
             writePunctuation("<");
             emit(node.type);
             writePunctuation(">");
-            emitExpression(node.expression);
+            emitExpression(node.expression, parenthesizer.parenthesizeOperandOfPrefixUnary);
         }
         function emitParenthesizedExpression(node) {
             var openParenPos = emitTokenWithComment(20 /* OpenParenToken */, node.pos, writePunctuation, node);
             var indented = writeLineSeparatorsAndIndentBefore(node.expression, node);
-            emitExpression(node.expression);
+            emitExpression(node.expression, /*parenthesizerRules*/ undefined);
             writeLineSeparatorsAfter(node.expression, node);
             decreaseIndentIf(indented);
             emitTokenWithComment(21 /* CloseParenToken */, node.expression ? node.expression.end : openParenPos, writePunctuation, node);
@@ -102668,29 +105491,29 @@ var ts;
         function emitDeleteExpression(node) {
             emitTokenWithComment(88 /* DeleteKeyword */, node.pos, writeKeyword, node);
             writeSpace();
-            emitExpression(node.expression);
+            emitExpression(node.expression, parenthesizer.parenthesizeOperandOfPrefixUnary);
         }
         function emitTypeOfExpression(node) {
             emitTokenWithComment(111 /* TypeOfKeyword */, node.pos, writeKeyword, node);
             writeSpace();
-            emitExpression(node.expression);
+            emitExpression(node.expression, parenthesizer.parenthesizeOperandOfPrefixUnary);
         }
         function emitVoidExpression(node) {
             emitTokenWithComment(113 /* VoidKeyword */, node.pos, writeKeyword, node);
             writeSpace();
-            emitExpression(node.expression);
+            emitExpression(node.expression, parenthesizer.parenthesizeOperandOfPrefixUnary);
         }
         function emitAwaitExpression(node) {
             emitTokenWithComment(130 /* AwaitKeyword */, node.pos, writeKeyword, node);
             writeSpace();
-            emitExpression(node.expression);
+            emitExpression(node.expression, parenthesizer.parenthesizeOperandOfPrefixUnary);
         }
         function emitPrefixUnaryExpression(node) {
             writeTokenText(node.operator, writeOperator);
             if (shouldEmitWhitespaceBeforeOperand(node)) {
                 writeSpace();
             }
-            emitExpression(node.operand);
+            emitExpression(node.operand, parenthesizer.parenthesizeOperandOfPrefixUnary);
         }
         function shouldEmitWhitespaceBeforeOperand(node) {
             // In some cases, we need to emit a space between the operator and the operand. One obvious case
@@ -102706,84 +105529,101 @@ 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 === 214 /* PrefixUnaryExpression */
+            return operand.kind === 215 /* 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 */)));
         }
         function emitPostfixUnaryExpression(node) {
-            emitExpression(node.operand);
+            emitExpression(node.operand, parenthesizer.parenthesizeOperandOfPostfixUnary);
             writeTokenText(node.operator, writeOperator);
         }
-        var EmitBinaryExpressionState;
-        (function (EmitBinaryExpressionState) {
-            EmitBinaryExpressionState[EmitBinaryExpressionState["EmitLeft"] = 0] = "EmitLeft";
-            EmitBinaryExpressionState[EmitBinaryExpressionState["EmitRight"] = 1] = "EmitRight";
-            EmitBinaryExpressionState[EmitBinaryExpressionState["FinishEmit"] = 2] = "FinishEmit";
-        })(EmitBinaryExpressionState || (EmitBinaryExpressionState = {}));
-        /**
-         * emitBinaryExpression includes an embedded work stack to attempt to handle as many nested binary expressions
-         * as possible without creating any additional stack frames. This can only be done when the emit pipeline does
-         * not require notification/substitution/comment/sourcemap decorations.
-         */
-        function emitBinaryExpression(node) {
-            var nodeStack = [node];
-            var stateStack = [0 /* EmitLeft */];
-            var stackIndex = 0;
-            while (stackIndex >= 0) {
-                node = nodeStack[stackIndex];
-                switch (stateStack[stackIndex]) {
-                    case 0 /* EmitLeft */: {
-                        maybePipelineEmitExpression(node.left);
-                        break;
-                    }
-                    case 1 /* EmitRight */: {
-                        var isCommaOperator = node.operatorToken.kind !== 27 /* CommaToken */;
-                        var linesBeforeOperator = getLinesBetweenNodes(node, node.left, node.operatorToken);
-                        var linesAfterOperator = getLinesBetweenNodes(node, node.operatorToken, node.right);
-                        writeLinesAndIndent(linesBeforeOperator, isCommaOperator);
-                        emitLeadingCommentsOfPosition(node.operatorToken.pos);
-                        writeTokenNode(node.operatorToken, node.operatorToken.kind === 100 /* InKeyword */ ? writeKeyword : writeOperator);
-                        emitTrailingCommentsOfPosition(node.operatorToken.end, /*prefixSpace*/ true); // Binary operators should have a space before the comment starts
-                        writeLinesAndIndent(linesAfterOperator, /*writeSpaceIfNotIndenting*/ true);
-                        maybePipelineEmitExpression(node.right);
-                        break;
-                    }
-                    case 2 /* FinishEmit */: {
-                        var linesBeforeOperator = getLinesBetweenNodes(node, node.left, node.operatorToken);
-                        var linesAfterOperator = getLinesBetweenNodes(node, node.operatorToken, node.right);
-                        decreaseIndentIf(linesBeforeOperator, linesAfterOperator);
-                        stackIndex--;
-                        break;
-                    }
-                    default: return ts.Debug.fail("Invalid state " + stateStack[stackIndex] + " for emitBinaryExpressionWorker");
+        function createEmitBinaryExpression() {
+            return ts.createBinaryExpressionTrampoline(onEnter, onLeft, onOperator, onRight, onExit, /*foldState*/ undefined);
+            function onEnter(node, state) {
+                if (state) {
+                    state.stackIndex++;
+                    state.preserveSourceNewlinesStack[state.stackIndex] = preserveSourceNewlines;
+                    state.containerPosStack[state.stackIndex] = containerPos;
+                    state.containerEndStack[state.stackIndex] = containerEnd;
+                    state.declarationListContainerEndStack[state.stackIndex] = declarationListContainerEnd;
+                    var emitComments_1 = state.shouldEmitCommentsStack[state.stackIndex] = shouldEmitComments(node);
+                    var emitSourceMaps = state.shouldEmitSourceMapsStack[state.stackIndex] = shouldEmitSourceMaps(node);
+                    onBeforeEmitNode === null || onBeforeEmitNode === void 0 ? void 0 : onBeforeEmitNode(node);
+                    if (emitComments_1)
+                        emitCommentsBeforeNode(node);
+                    if (emitSourceMaps)
+                        emitSourceMapsBeforeNode(node);
+                    beforeEmitNode(node);
                 }
-            }
-            function maybePipelineEmitExpression(next) {
-                // Advance the state of this unit of work,
-                stateStack[stackIndex]++;
-                // Then actually do the work of emitting the node `next` returned by the prior state
-                // The following section should be identical to `pipelineEmit` save it assumes EmitHint.Expression and offloads
-                // binary expression handling, where possible, to the contained work queue
-                // #region trampolinePipelineEmit
-                var savedLastNode = lastNode;
-                var savedLastSubstitution = lastSubstitution;
-                lastNode = next;
-                lastSubstitution = undefined;
+                else {
+                    state = {
+                        stackIndex: 0,
+                        preserveSourceNewlinesStack: [undefined],
+                        containerPosStack: [-1],
+                        containerEndStack: [-1],
+                        declarationListContainerEndStack: [-1],
+                        shouldEmitCommentsStack: [false],
+                        shouldEmitSourceMapsStack: [false],
+                    };
+                }
+                return state;
+            }
+            function onLeft(next, _workArea, parent) {
+                return maybeEmitExpression(next, parent, "left");
+            }
+            function onOperator(operatorToken, _state, node) {
+                var isCommaOperator = operatorToken.kind !== 27 /* CommaToken */;
+                var linesBeforeOperator = getLinesBetweenNodes(node, node.left, operatorToken);
+                var linesAfterOperator = getLinesBetweenNodes(node, operatorToken, node.right);
+                writeLinesAndIndent(linesBeforeOperator, isCommaOperator);
+                emitLeadingCommentsOfPosition(operatorToken.pos);
+                writeTokenNode(operatorToken, operatorToken.kind === 100 /* InKeyword */ ? writeKeyword : writeOperator);
+                emitTrailingCommentsOfPosition(operatorToken.end, /*prefixSpace*/ true); // Binary operators should have a space before the comment starts
+                writeLinesAndIndent(linesAfterOperator, /*writeSpaceIfNotIndenting*/ true);
+            }
+            function onRight(next, _workArea, parent) {
+                return maybeEmitExpression(next, parent, "right");
+            }
+            function onExit(node, state) {
+                var linesBeforeOperator = getLinesBetweenNodes(node, node.left, node.operatorToken);
+                var linesAfterOperator = getLinesBetweenNodes(node, node.operatorToken, node.right);
+                decreaseIndentIf(linesBeforeOperator, linesAfterOperator);
+                if (state.stackIndex > 0) {
+                    var savedPreserveSourceNewlines = state.preserveSourceNewlinesStack[state.stackIndex];
+                    var savedContainerPos = state.containerPosStack[state.stackIndex];
+                    var savedContainerEnd = state.containerEndStack[state.stackIndex];
+                    var savedDeclarationListContainerEnd = state.declarationListContainerEndStack[state.stackIndex];
+                    var shouldEmitComments_1 = state.shouldEmitCommentsStack[state.stackIndex];
+                    var shouldEmitSourceMaps_1 = state.shouldEmitSourceMapsStack[state.stackIndex];
+                    afterEmitNode(savedPreserveSourceNewlines);
+                    if (shouldEmitSourceMaps_1)
+                        emitSourceMapsAfterNode(node);
+                    if (shouldEmitComments_1)
+                        emitCommentsAfterNode(node, savedContainerPos, savedContainerEnd, savedDeclarationListContainerEnd);
+                    onAfterEmitNode === null || onAfterEmitNode === void 0 ? void 0 : onAfterEmitNode(node);
+                    state.stackIndex--;
+                }
+            }
+            function maybeEmitExpression(next, parent, side) {
+                var parenthesizerRule = side === "left" ?
+                    parenthesizer.getParenthesizeLeftSideOfBinaryForOperator(parent.operatorToken.kind) :
+                    parenthesizer.getParenthesizeRightSideOfBinaryForOperator(parent.operatorToken.kind);
                 var pipelinePhase = getPipelinePhase(0 /* Notification */, 1 /* Expression */, next);
-                if (pipelinePhase === pipelineEmitWithHint && ts.isBinaryExpression(next)) {
-                    // If the target pipeline phase is emit directly, and the next node's also a binary expression,
-                    // skip all the intermediate indirection and push the expression directly onto the work stack
-                    stackIndex++;
-                    stateStack[stackIndex] = 0 /* EmitLeft */;
-                    nodeStack[stackIndex] = next;
+                if (pipelinePhase === pipelineEmitWithSubstitution) {
+                    ts.Debug.assertIsDefined(lastSubstitution);
+                    next = parenthesizerRule(ts.cast(lastSubstitution, ts.isExpression));
+                    pipelinePhase = getNextPipelinePhase(1 /* Substitution */, 1 /* Expression */, next);
+                    lastSubstitution = undefined;
                 }
-                else {
-                    pipelinePhase(1 /* Expression */, next);
+                if (pipelinePhase === pipelineEmitWithComments ||
+                    pipelinePhase === pipelineEmitWithSourceMaps ||
+                    pipelinePhase === pipelineEmitWithHint) {
+                    if (ts.isBinaryExpression(next)) {
+                        return next;
+                    }
                 }
-                ts.Debug.assert(lastNode === next);
-                lastNode = savedLastNode;
-                lastSubstitution = savedLastSubstitution;
-                // #endregion trampolinePipelineEmit
+                currentParenthesizerRule = parenthesizerRule;
+                pipelinePhase(1 /* Expression */, next);
             }
         }
         function emitConditionalExpression(node) {
@@ -102791,16 +105631,16 @@ var ts;
             var linesAfterQuestion = getLinesBetweenNodes(node, node.questionToken, node.whenTrue);
             var linesBeforeColon = getLinesBetweenNodes(node, node.whenTrue, node.colonToken);
             var linesAfterColon = getLinesBetweenNodes(node, node.colonToken, node.whenFalse);
-            emitExpression(node.condition);
+            emitExpression(node.condition, parenthesizer.parenthesizeConditionOfConditionalExpression);
             writeLinesAndIndent(linesBeforeQuestion, /*writeSpaceIfNotIndenting*/ true);
             emit(node.questionToken);
             writeLinesAndIndent(linesAfterQuestion, /*writeSpaceIfNotIndenting*/ true);
-            emitExpression(node.whenTrue);
+            emitExpression(node.whenTrue, parenthesizer.parenthesizeBranchOfConditionalExpression);
             decreaseIndentIf(linesBeforeQuestion, linesAfterQuestion);
             writeLinesAndIndent(linesBeforeColon, /*writeSpaceIfNotIndenting*/ true);
             emit(node.colonToken);
             writeLinesAndIndent(linesAfterColon, /*writeSpaceIfNotIndenting*/ true);
-            emitExpression(node.whenFalse);
+            emitExpression(node.whenFalse, parenthesizer.parenthesizeBranchOfConditionalExpression);
             decreaseIndentIf(linesBeforeColon, linesAfterColon);
         }
         function emitTemplateExpression(node) {
@@ -102810,22 +105650,22 @@ var ts;
         function emitYieldExpression(node) {
             emitTokenWithComment(124 /* YieldKeyword */, node.pos, writeKeyword, node);
             emit(node.asteriskToken);
-            emitExpressionWithLeadingSpace(node.expression);
+            emitExpressionWithLeadingSpace(node.expression, parenthesizer.parenthesizeExpressionForDisallowedComma);
         }
-        function emitSpreadExpression(node) {
+        function emitSpreadElement(node) {
             emitTokenWithComment(25 /* DotDotDotToken */, node.pos, writePunctuation, node);
-            emitExpression(node.expression);
+            emitExpression(node.expression, parenthesizer.parenthesizeExpressionForDisallowedComma);
         }
         function emitClassExpression(node) {
             generateNameIfNeeded(node.name);
             emitClassDeclarationOrExpression(node);
         }
         function emitExpressionWithTypeArguments(node) {
-            emitExpression(node.expression);
+            emitExpression(node.expression, parenthesizer.parenthesizeLeftSideOfAccess);
             emitTypeArguments(node, node.typeArguments);
         }
         function emitAsExpression(node) {
-            emitExpression(node.expression);
+            emitExpression(node.expression, /*parenthesizerRules*/ undefined);
             if (node.type) {
                 writeSpace();
                 writeKeyword("as");
@@ -102834,7 +105674,7 @@ var ts;
             }
         }
         function emitNonNullExpression(node) {
-            emitExpression(node.expression);
+            emitExpression(node.expression, parenthesizer.parenthesizeLeftSideOfAccess);
             writeOperator("!");
         }
         function emitMetaProperty(node) {
@@ -102877,7 +105717,7 @@ var ts;
             }
         }
         function emitExpressionStatement(node) {
-            emitExpression(node.expression);
+            emitExpression(node.expression, parenthesizer.parenthesizeExpressionOfExpressionStatement);
             // Emit semicolon in non json files
             // or if json file that created synthesized expression(eg.define expression statement when --out and amd code generation)
             if (!ts.isJsonSourceFile(currentSourceFile) || ts.nodeIsSynthesized(node.expression)) {
@@ -102894,7 +105734,7 @@ var ts;
             if (node.elseStatement) {
                 writeLineOrSpace(node, node.thenStatement, node.elseStatement);
                 emitTokenWithComment(90 /* ElseKeyword */, node.thenStatement.end, writeKeyword, node);
-                if (node.elseStatement.kind === 234 /* IfStatement */) {
+                if (node.elseStatement.kind === 235 /* IfStatement */) {
                     writeSpace();
                     emit(node.elseStatement);
                 }
@@ -102957,7 +105797,7 @@ var ts;
             emitTokenWithComment(20 /* OpenParenToken */, openParenPos, writePunctuation, node);
             emitForBinding(node.initializer);
             writeSpace();
-            emitTokenWithComment(156 /* OfKeyword */, node.initializer.end, writeKeyword, node);
+            emitTokenWithComment(157 /* OfKeyword */, node.initializer.end, writeKeyword, node);
             writeSpace();
             emitExpression(node.expression);
             emitTokenWithComment(21 /* CloseParenToken */, node.expression.end, writePunctuation, node);
@@ -102965,7 +105805,7 @@ var ts;
         }
         function emitForBinding(node) {
             if (node !== undefined) {
-                if (node.kind === 250 /* VariableDeclarationList */) {
+                if (node.kind === 251 /* VariableDeclarationList */) {
                     emit(node);
                 }
                 else {
@@ -103002,7 +105842,7 @@ var ts;
             }
             pos = writeTokenText(token, writer, pos);
             if (isSimilarNode && contextNode.end !== pos) {
-                var isJsxExprContext = contextNode.kind === 283 /* JsxExpression */;
+                var isJsxExprContext = contextNode.kind === 284 /* JsxExpression */;
                 emitTrailingCommentsOfPosition(pos, /*prefixSpace*/ !isJsxExprContext, /*forceNoNewline*/ isJsxExprContext);
             }
             return pos;
@@ -103066,7 +105906,7 @@ var ts;
             emit(node.name);
             emit(node.exclamationToken);
             emitTypeAnnotation(node.type);
-            emitInitializer(node.initializer, node.type ? node.type.end : node.name.end, node);
+            emitInitializer(node.initializer, node.type ? node.type.end : node.name.end, node, parenthesizer.parenthesizeExpressionForDisallowedComma);
         }
         function emitVariableDeclarationList(node) {
             writeKeyword(ts.isLet(node) ? "let" : ts.isVarConst(node) ? "const" : "var");
@@ -103085,9 +105925,6 @@ var ts;
             emitIdentifierName(node.name);
             emitSignatureAndBody(node, emitSignatureHead);
         }
-        function emitBlockCallback(_hint, body) {
-            emitBlockFunctionBody(body);
-        }
         function emitSignatureAndBody(node, emitSignatureHead) {
             var body = node.body;
             if (body) {
@@ -103100,12 +105937,7 @@ var ts;
                     ts.forEach(node.parameters, generateNames);
                     generateNames(node.body);
                     emitSignatureHead(node);
-                    if (onEmitNode) {
-                        onEmitNode(4 /* Unspecified */, body, emitBlockCallback);
-                    }
-                    else {
-                        emitBlockFunctionBody(body);
-                    }
+                    emitBlockFunctionBody(body);
                     popNameGenerationScope(node);
                     if (indentedFlag) {
                         decreaseIndent();
@@ -103114,7 +105946,7 @@ var ts;
                 else {
                     emitSignatureHead(node);
                     writeSpace();
-                    emitExpression(body);
+                    emitExpression(body, parenthesizer.parenthesizeConciseBodyOfArrowFunction);
                 }
             }
             else {
@@ -103158,6 +105990,7 @@ var ts;
             return true;
         }
         function emitBlockFunctionBody(body) {
+            onBeforeEmitNode === null || onBeforeEmitNode === void 0 ? void 0 : onBeforeEmitNode(body);
             writeSpace();
             writePunctuation("{");
             increaseIndent();
@@ -103172,6 +106005,7 @@ var ts;
             }
             decreaseIndent();
             writeToken(19 /* CloseBraceToken */, body.statements.end, writePunctuation, body);
+            onAfterEmitNode === null || onAfterEmitNode === void 0 ? void 0 : onAfterEmitNode(body);
         }
         function emitBlockFunctionBodyOnSingleLine(body) {
             emitBlockFunctionBodyWorker(body, /*emitBlockFunctionBodyOnSingleLine*/ true);
@@ -103187,7 +106021,7 @@ var ts;
                 increaseIndent();
             }
             else {
-                emitList(body, body.statements, 1 /* MultiLineFunctionBodyStatements */, statementOffset);
+                emitList(body, body.statements, 1 /* MultiLineFunctionBodyStatements */, /*parenthesizerRule*/ undefined, statementOffset);
             }
         }
         function emitClassDeclaration(node) {
@@ -103262,7 +106096,7 @@ var ts;
             var body = node.body;
             if (!body)
                 return writeTrailingSemicolon();
-            while (body.kind === 256 /* ModuleDeclaration */) {
+            while (body && ts.isModuleDeclaration(body)) {
                 writePunctuation(".");
                 emit(body.name);
                 body = body.body;
@@ -103352,7 +106186,9 @@ var ts;
                 emitTokenWithComment(87 /* DefaultKeyword */, nextPos, writeKeyword, node);
             }
             writeSpace();
-            emitExpression(node.expression);
+            emitExpression(node.expression, node.isExportEquals ?
+                parenthesizer.getParenthesizeRightSideOfBinaryForOperator(62 /* EqualsToken */) :
+                parenthesizer.parenthesizeExpressionOfExportDefault);
             writeTrailingSemicolon();
         }
         function emitExportDeclaration(node) {
@@ -103524,7 +106360,7 @@ var ts;
         function emitCaseClause(node) {
             emitTokenWithComment(81 /* CaseKeyword */, node.pos, writeKeyword, node);
             writeSpace();
-            emitExpression(node.expression);
+            emitExpression(node.expression, parenthesizer.parenthesizeExpressionForDisallowedComma);
             emitCaseOrDefaultClauseRest(node, node.statements, node.expression.end);
         }
         function emitDefaultClause(node) {
@@ -103585,7 +106421,7 @@ var ts;
                 var commentRange = ts.getCommentRange(initializer);
                 emitTrailingCommentsOfPosition(commentRange.pos);
             }
-            emitExpression(initializer);
+            emitExpression(initializer, parenthesizer.parenthesizeExpressionForDisallowedComma);
         }
         function emitShorthandPropertyAssignment(node) {
             emit(node.name);
@@ -103593,13 +106429,13 @@ var ts;
                 writeSpace();
                 writePunctuation("=");
                 writeSpace();
-                emitExpression(node.objectAssignmentInitializer);
+                emitExpression(node.objectAssignmentInitializer, parenthesizer.parenthesizeExpressionForDisallowedComma);
             }
         }
         function emitSpreadAssignment(node) {
             if (node.expression) {
                 emitTokenWithComment(25 /* DotDotDotToken */, node.pos, writePunctuation, node);
-                emitExpression(node.expression);
+                emitExpression(node.expression, parenthesizer.parenthesizeExpressionForDisallowedComma);
             }
         }
         //
@@ -103607,7 +106443,7 @@ var ts;
         //
         function emitEnumMember(node) {
             emit(node.name);
-            emitInitializer(node.initializer, node.name.end, node);
+            emitInitializer(node.initializer, node.name.end, node, parenthesizer.parenthesizeExpressionForDisallowedComma);
         }
         //
         // JSDoc
@@ -103615,18 +106451,21 @@ var ts;
         function emitJSDoc(node) {
             write("/**");
             if (node.comment) {
-                var lines = node.comment.split(/\r\n?|\n/g);
-                for (var _a = 0, lines_2 = lines; _a < lines_2.length; _a++) {
-                    var line = lines_2[_a];
-                    writeLine();
-                    writeSpace();
-                    writePunctuation("*");
-                    writeSpace();
-                    write(line);
+                var text = ts.getTextOfJSDocComment(node.comment);
+                if (text) {
+                    var lines = text.split(/\r\n?|\n/g);
+                    for (var _a = 0, lines_2 = lines; _a < lines_2.length; _a++) {
+                        var line = lines_2[_a];
+                        writeLine();
+                        writeSpace();
+                        writePunctuation("*");
+                        writeSpace();
+                        write(line);
+                    }
                 }
             }
             if (node.tags) {
-                if (node.tags.length === 1 && node.tags[0].kind === 329 /* JSDocTypeTag */ && !node.comment) {
+                if (node.tags.length === 1 && node.tags[0].kind === 333 /* JSDocTypeTag */ && !node.comment) {
                     writeSpace();
                     emit(node.tags[0]);
                 }
@@ -103671,7 +106510,7 @@ var ts;
         function emitJSDocTypedefTag(tag) {
             emitJSDocTagName(tag.tagName);
             if (tag.typeExpression) {
-                if (tag.typeExpression.kind === 301 /* JSDocTypeExpression */) {
+                if (tag.typeExpression.kind === 302 /* JSDocTypeExpression */) {
                     emitJSDocTypeExpression(tag.typeExpression);
                 }
                 else {
@@ -103690,7 +106529,7 @@ var ts;
                 emit(tag.fullName);
             }
             emitJSDocComment(tag.comment);
-            if (tag.typeExpression && tag.typeExpression.kind === 312 /* JSDocTypeLiteral */) {
+            if (tag.typeExpression && tag.typeExpression.kind === 314 /* JSDocTypeLiteral */) {
                 emitJSDocTypeLiteral(tag.typeExpression);
             }
         }
@@ -103743,9 +106582,10 @@ var ts;
             emit(tagName);
         }
         function emitJSDocComment(comment) {
-            if (comment) {
+            var text = ts.getTextOfJSDocComment(comment);
+            if (text) {
                 writeSpace();
-                write(comment);
+                write(text);
             }
         }
         function emitJSDocTypeExpression(typeExpression) {
@@ -103848,7 +106688,7 @@ var ts;
             emitHelpers(node);
             var index = ts.findIndex(statements, function (statement) { return !ts.isPrologueDirective(statement); });
             emitTripleSlashDirectivesIfNeeded(node);
-            emitList(node, statements, 1 /* MultiLine */, index === -1 ? statements.length : index);
+            emitList(node, statements, 1 /* MultiLine */, /*parenthesizerRule*/ undefined, index === -1 ? statements.length : index);
             popNameGenerationScope(node);
         }
         // Transformation nodes
@@ -103856,7 +106696,7 @@ var ts;
             emitExpression(node.expression);
         }
         function emitCommaList(node) {
-            emitExpressionList(node, node.elements, 528 /* CommaListElements */);
+            emitExpressionList(node, node.elements, 528 /* CommaListElements */, /*parenthesizerRule*/ undefined);
         }
         /**
          * Emits any prologue directives at the start of a Statement list, returning the
@@ -104002,12 +106842,12 @@ var ts;
                 emit(node);
             }
         }
-        function emitInitializer(node, equalCommentStartPos, container) {
+        function emitInitializer(node, equalCommentStartPos, container, parenthesizerRule) {
             if (node) {
                 writeSpace();
                 emitTokenWithComment(62 /* EqualsToken */, equalCommentStartPos, writeOperator, container);
                 writeSpace();
-                emitExpression(node);
+                emitExpression(node, parenthesizerRule);
             }
         }
         function emitNodeWithPrefix(prefix, prefixWriter, node, emit) {
@@ -104022,10 +106862,10 @@ var ts;
                 emit(node);
             }
         }
-        function emitExpressionWithLeadingSpace(node) {
+        function emitExpressionWithLeadingSpace(node, parenthesizerRule) {
             if (node) {
                 writeSpace();
-                emitExpression(node);
+                emitExpression(node, parenthesizerRule);
             }
         }
         function emitWithTrailingSpace(node) {
@@ -104055,7 +106895,7 @@ var ts;
             emitList(parentNode, decorators, 2146305 /* Decorators */);
         }
         function emitTypeArguments(parentNode, typeArguments) {
-            emitList(parentNode, typeArguments, 53776 /* TypeArguments */);
+            emitList(parentNode, typeArguments, 53776 /* TypeArguments */, parenthesizer.parenthesizeMemberOfElementType);
         }
         function emitTypeParameters(parentNode, typeParameters) {
             if (ts.isFunctionLike(parentNode) && parentNode.typeArguments) { // Quick info uses type arguments in place of type parameters on instantiated signatures
@@ -104094,12 +106934,6 @@ var ts;
         function emitParametersForIndexSignature(parentNode, parameters) {
             emitList(parentNode, parameters, 8848 /* IndexSignatureParameters */);
         }
-        function emitList(parentNode, children, format, start, count) {
-            emitNodeList(emit, parentNode, children, format, start, count);
-        }
-        function emitExpressionList(parentNode, children, format, start, count) {
-            emitNodeList(emitExpression, parentNode, children, format, start, count); // TODO: GH#18217
-        }
         function writeDelimiter(format) {
             switch (format & 60 /* DelimitersMask */) {
                 case 0 /* None */:
@@ -104122,7 +106956,13 @@ var ts;
                     break;
             }
         }
-        function emitNodeList(emit, parentNode, children, format, start, count) {
+        function emitList(parentNode, children, format, parenthesizerRule, start, count) {
+            emitNodeList(emit, parentNode, children, format, parenthesizerRule, start, count);
+        }
+        function emitExpressionList(parentNode, children, format, parenthesizerRule, start, count) {
+            emitNodeList(emitExpression, parentNode, children, format, parenthesizerRule, start, count);
+        }
+        function emitNodeList(emit, parentNode, children, format, parenthesizerRule, start, count) {
             if (start === void 0) { start = 0; }
             if (count === void 0) { count = children ? children.length - start : 0; }
             var isUndefined = children === undefined;
@@ -104141,8 +106981,7 @@ var ts;
             }
             if (format & 15360 /* BracketsMask */) {
                 writePunctuation(getOpeningBracket(format));
-                if (isEmpty && !isUndefined) {
-                    // TODO: GH#18217
+                if (isEmpty && children) {
                     emitTrailingCommentsOfPosition(children.pos, /*prefixSpace*/ true); // Emit comments within empty bracketed lists
                 }
             }
@@ -104151,7 +106990,7 @@ var ts;
             }
             if (isEmpty) {
                 // Write a line terminator if the parent node was multi-line
-                if (format & 1 /* MultiLine */ && !(preserveSourceNewlines && ts.rangeIsOnSingleLine(parentNode, currentSourceFile))) {
+                if (format & 1 /* MultiLine */ && !(preserveSourceNewlines && (!parentNode || ts.rangeIsOnSingleLine(parentNode, currentSourceFile)))) {
                     writeLine();
                 }
                 else if (format & 256 /* SpaceBetweenBraces */ && !(format & 524288 /* NoSpaceIfEmpty */)) {
@@ -104159,6 +106998,7 @@ var ts;
                 }
             }
             else {
+                ts.Debug.type(children);
                 // Write the opening line terminator or leading whitespace.
                 var mayEmitInterveningComments = (format & 262144 /* NoInterveningComments */) === 0;
                 var shouldEmitInterveningComments = mayEmitInterveningComments;
@@ -104193,7 +107033,7 @@ var ts;
                         //          a
                         //          /* End of parameter a */ -> this comment isn't considered to be trailing comment of parameter "a" due to newline
                         //          ,
-                        if (format & 60 /* DelimitersMask */ && previousSibling.end !== parentNode.end) {
+                        if (format & 60 /* DelimitersMask */ && previousSibling.end !== (parentNode ? parentNode.end : -1)) {
                             emitLeadingCommentsOfPosition(previousSibling.end);
                         }
                         writeDelimiter(format);
@@ -104226,7 +107066,12 @@ var ts;
                         shouldEmitInterveningComments = mayEmitInterveningComments;
                     }
                     nextListElementPos = child.pos;
-                    emit(child);
+                    if (emit.length === 1) {
+                        emit(child);
+                    }
+                    else {
+                        emit(child, parenthesizerRule);
+                    }
                     if (shouldDecreaseIndentAfterEmit) {
                         decreaseIndent();
                         shouldDecreaseIndentAfterEmit = false;
@@ -104251,7 +107096,7 @@ var ts;
                 //          2
                 //          /* end of element 2 */
                 //       ];
-                if (previousSibling && parentNode.end !== previousSibling.end && (format & 60 /* DelimitersMask */) && !skipTrailingComments) {
+                if (previousSibling && (parentNode ? parentNode.end : -1) !== previousSibling.end && (format & 60 /* DelimitersMask */) && !skipTrailingComments) {
                     emitLeadingCommentsOfPosition(hasTrailingComma && (children === null || children === void 0 ? void 0 : children.end) ? children.end : previousSibling.end);
                 }
                 // Decrease the indent, if requested.
@@ -104272,8 +107117,7 @@ var ts;
                 onAfterEmitNodeArray(children);
             }
             if (format & 15360 /* BracketsMask */) {
-                if (isEmpty && !isUndefined) {
-                    // TODO: GH#18217
+                if (isEmpty && children) {
                     emitLeadingCommentsOfPosition(children.end); // Emit leading comments within empty lists
                 }
                 writePunctuation(getClosingBracket(format));
@@ -104404,7 +107248,7 @@ var ts;
                 }
                 var firstChild_1 = children[0];
                 if (firstChild_1 === undefined) {
-                    return ts.rangeIsOnSingleLine(parentNode, currentSourceFile) ? 0 : 1;
+                    return !parentNode || ts.rangeIsOnSingleLine(parentNode, currentSourceFile) ? 0 : 1;
                 }
                 if (firstChild_1.pos === nextListElementPos) {
                     // If this child starts at the beginning of a list item in a parent list, its leading
@@ -104428,7 +107272,8 @@ var ts;
                     // JsxText will be written with its leading whitespace, so don't add more manually.
                     return 0;
                 }
-                if (!ts.positionIsSynthesized(parentNode.pos) &&
+                if (parentNode &&
+                    !ts.positionIsSynthesized(parentNode.pos) &&
                     !ts.nodeIsSynthesized(firstChild_1) &&
                     (!firstChild_1.parent || ts.getOriginalNode(firstChild_1.parent) === ts.getOriginalNode(parentNode))) {
                     if (preserveSourceNewlines) {
@@ -104451,10 +107296,10 @@ var ts;
                     // JsxText will be written with its leading whitespace, so don't add more manually.
                     return 0;
                 }
-                else if (!ts.nodeIsSynthesized(previousNode) && !ts.nodeIsSynthesized(nextNode) && previousNode.parent === nextNode.parent) {
-                    if (preserveSourceNewlines) {
-                        return getEffectiveLines(function (includeComments) { return ts.getLinesBetweenRangeEndAndRangeStart(previousNode, nextNode, currentSourceFile, includeComments); });
-                    }
+                else if (preserveSourceNewlines && siblingNodePositionsAreComparable(previousNode, nextNode)) {
+                    return getEffectiveLines(function (includeComments) { return ts.getLinesBetweenRangeEndAndRangeStart(previousNode, nextNode, currentSourceFile, includeComments); });
+                }
+                else if (!preserveSourceNewlines && !ts.nodeIsSynthesized(previousNode) && !ts.nodeIsSynthesized(nextNode)) {
                     return ts.rangeEndIsOnSameLineAsRangeStart(previousNode, nextNode, currentSourceFile) ? 0 : 1;
                 }
                 else if (synthesizedNodeStartsOnNewLine(previousNode, format) || synthesizedNodeStartsOnNewLine(nextNode, format)) {
@@ -104473,9 +107318,9 @@ var ts;
                 }
                 var lastChild = ts.lastOrUndefined(children);
                 if (lastChild === undefined) {
-                    return ts.rangeIsOnSingleLine(parentNode, currentSourceFile) ? 0 : 1;
+                    return !parentNode || ts.rangeIsOnSingleLine(parentNode, currentSourceFile) ? 0 : 1;
                 }
-                if (!ts.positionIsSynthesized(parentNode.pos) && !ts.nodeIsSynthesized(lastChild) && (!lastChild.parent || lastChild.parent === parentNode)) {
+                if (parentNode && !ts.positionIsSynthesized(parentNode.pos) && !ts.nodeIsSynthesized(lastChild) && (!lastChild.parent || lastChild.parent === parentNode)) {
                     if (preserveSourceNewlines) {
                         var end_1 = ts.isNodeArray(children) && !ts.positionIsSynthesized(children.end) ? children.end : lastChild.end;
                         return getEffectiveLines(function (includeComments) { return ts.getLinesBetweenPositionAndNextNonWhitespaceCharacter(end_1, parentNode.end, currentSourceFile, includeComments); });
@@ -104561,7 +107406,7 @@ var ts;
                 && ts.rangeEndIsOnSameLineAsRangeStart(block, block, currentSourceFile);
         }
         function skipSynthesizedParentheses(node) {
-            while (node.kind === 207 /* ParenthesizedExpression */ && ts.nodeIsSynthesized(node)) {
+            while (node.kind === 208 /* ParenthesizedExpression */ && ts.nodeIsSynthesized(node)) {
                 node = node.expression;
             }
             return node;
@@ -104631,84 +107476,84 @@ var ts;
             if (!node)
                 return;
             switch (node.kind) {
-                case 230 /* Block */:
+                case 231 /* Block */:
                     ts.forEach(node.statements, generateNames);
                     break;
-                case 245 /* LabeledStatement */:
-                case 243 /* WithStatement */:
-                case 235 /* DoStatement */:
-                case 236 /* WhileStatement */:
+                case 246 /* LabeledStatement */:
+                case 244 /* WithStatement */:
+                case 236 /* DoStatement */:
+                case 237 /* WhileStatement */:
                     generateNames(node.statement);
                     break;
-                case 234 /* IfStatement */:
+                case 235 /* IfStatement */:
                     generateNames(node.thenStatement);
                     generateNames(node.elseStatement);
                     break;
-                case 237 /* ForStatement */:
-                case 239 /* ForOfStatement */:
-                case 238 /* ForInStatement */:
+                case 238 /* ForStatement */:
+                case 240 /* ForOfStatement */:
+                case 239 /* ForInStatement */:
                     generateNames(node.initializer);
                     generateNames(node.statement);
                     break;
-                case 244 /* SwitchStatement */:
+                case 245 /* SwitchStatement */:
                     generateNames(node.caseBlock);
                     break;
-                case 258 /* CaseBlock */:
+                case 259 /* CaseBlock */:
                     ts.forEach(node.clauses, generateNames);
                     break;
-                case 284 /* CaseClause */:
-                case 285 /* DefaultClause */:
+                case 285 /* CaseClause */:
+                case 286 /* DefaultClause */:
                     ts.forEach(node.statements, generateNames);
                     break;
-                case 247 /* TryStatement */:
+                case 248 /* TryStatement */:
                     generateNames(node.tryBlock);
                     generateNames(node.catchClause);
                     generateNames(node.finallyBlock);
                     break;
-                case 287 /* CatchClause */:
+                case 288 /* CatchClause */:
                     generateNames(node.variableDeclaration);
                     generateNames(node.block);
                     break;
-                case 232 /* VariableStatement */:
+                case 233 /* VariableStatement */:
                     generateNames(node.declarationList);
                     break;
-                case 250 /* VariableDeclarationList */:
+                case 251 /* VariableDeclarationList */:
                     ts.forEach(node.declarations, generateNames);
                     break;
-                case 249 /* VariableDeclaration */:
-                case 160 /* Parameter */:
-                case 198 /* BindingElement */:
-                case 252 /* ClassDeclaration */:
+                case 250 /* VariableDeclaration */:
+                case 161 /* Parameter */:
+                case 199 /* BindingElement */:
+                case 253 /* ClassDeclaration */:
                     generateNameIfNeeded(node.name);
                     break;
-                case 251 /* FunctionDeclaration */:
+                case 252 /* FunctionDeclaration */:
                     generateNameIfNeeded(node.name);
                     if (ts.getEmitFlags(node) & 524288 /* ReuseTempVariableScope */) {
                         ts.forEach(node.parameters, generateNames);
                         generateNames(node.body);
                     }
                     break;
-                case 196 /* ObjectBindingPattern */:
-                case 197 /* ArrayBindingPattern */:
+                case 197 /* ObjectBindingPattern */:
+                case 198 /* ArrayBindingPattern */:
                     ts.forEach(node.elements, generateNames);
                     break;
-                case 261 /* ImportDeclaration */:
+                case 262 /* ImportDeclaration */:
                     generateNames(node.importClause);
                     break;
-                case 262 /* ImportClause */:
+                case 263 /* ImportClause */:
                     generateNameIfNeeded(node.name);
                     generateNames(node.namedBindings);
                     break;
-                case 263 /* NamespaceImport */:
+                case 264 /* NamespaceImport */:
                     generateNameIfNeeded(node.name);
                     break;
-                case 269 /* NamespaceExport */:
+                case 270 /* NamespaceExport */:
                     generateNameIfNeeded(node.name);
                     break;
-                case 264 /* NamedImports */:
+                case 265 /* NamedImports */:
                     ts.forEach(node.elements, generateNames);
                     break;
-                case 265 /* ImportSpecifier */:
+                case 266 /* ImportSpecifier */:
                     generateNameIfNeeded(node.propertyName || node.name);
                     break;
             }
@@ -104717,12 +107562,12 @@ var ts;
             if (!node)
                 return;
             switch (node.kind) {
-                case 288 /* PropertyAssignment */:
-                case 289 /* ShorthandPropertyAssignment */:
-                case 163 /* PropertyDeclaration */:
-                case 165 /* MethodDeclaration */:
-                case 167 /* GetAccessor */:
-                case 168 /* SetAccessor */:
+                case 289 /* PropertyAssignment */:
+                case 290 /* ShorthandPropertyAssignment */:
+                case 164 /* PropertyDeclaration */:
+                case 166 /* MethodDeclaration */:
+                case 168 /* GetAccessor */:
+                case 169 /* SetAccessor */:
                     generateNameIfNeeded(node.name);
                     break;
             }
@@ -104904,23 +107749,23 @@ var ts;
             switch (node.kind) {
                 case 78 /* Identifier */:
                     return makeUniqueName(getTextOfNode(node), isUniqueName, !!(flags & 16 /* Optimistic */), !!(flags & 8 /* ReservedInNestedScopes */));
-                case 256 /* ModuleDeclaration */:
-                case 255 /* EnumDeclaration */:
+                case 257 /* ModuleDeclaration */:
+                case 256 /* EnumDeclaration */:
                     return generateNameForModuleOrEnum(node);
-                case 261 /* ImportDeclaration */:
-                case 267 /* ExportDeclaration */:
+                case 262 /* ImportDeclaration */:
+                case 268 /* ExportDeclaration */:
                     return generateNameForImportOrExportDeclaration(node);
-                case 251 /* FunctionDeclaration */:
-                case 252 /* ClassDeclaration */:
-                case 266 /* ExportAssignment */:
+                case 252 /* FunctionDeclaration */:
+                case 253 /* ClassDeclaration */:
+                case 267 /* ExportAssignment */:
                     return generateNameForExportDefault();
-                case 221 /* ClassExpression */:
+                case 222 /* ClassExpression */:
                     return generateNameForClassExpression();
-                case 165 /* MethodDeclaration */:
-                case 167 /* GetAccessor */:
-                case 168 /* SetAccessor */:
+                case 166 /* MethodDeclaration */:
+                case 168 /* GetAccessor */:
+                case 169 /* SetAccessor */:
                     return generateNameForMethodOrAccessor(node);
-                case 158 /* ComputedPropertyName */:
+                case 159 /* ComputedPropertyName */:
                     return makeTempVariableName(0 /* Auto */, /*reserveInNestedScopes*/ true);
                 default:
                     return makeTempVariableName(0 /* Auto */);
@@ -104963,25 +107808,45 @@ var ts;
         }
         // Comments
         function pipelineEmitWithComments(hint, node) {
-            ts.Debug.assert(lastNode === node || lastSubstitution === node);
+            var pipelinePhase = getNextPipelinePhase(2 /* Comments */, hint, node);
+            var savedContainerPos = containerPos;
+            var savedContainerEnd = containerEnd;
+            var savedDeclarationListContainerEnd = declarationListContainerEnd;
+            emitCommentsBeforeNode(node);
+            pipelinePhase(hint, node);
+            emitCommentsAfterNode(node, savedContainerPos, savedContainerEnd, savedDeclarationListContainerEnd);
+        }
+        function emitCommentsBeforeNode(node) {
+            var emitFlags = ts.getEmitFlags(node);
+            var commentRange = ts.getCommentRange(node);
+            // Emit leading comments
+            emitLeadingCommentsOfNode(node, emitFlags, commentRange.pos, commentRange.end);
+            if (emitFlags & 2048 /* NoNestedComments */) {
+                commentsDisabled = true;
+            }
+        }
+        function emitCommentsAfterNode(node, savedContainerPos, savedContainerEnd, savedDeclarationListContainerEnd) {
+            var emitFlags = ts.getEmitFlags(node);
+            var commentRange = ts.getCommentRange(node);
+            // Emit trailing comments
+            if (emitFlags & 2048 /* NoNestedComments */) {
+                commentsDisabled = false;
+            }
+            emitTrailingCommentsOfNode(node, emitFlags, commentRange.pos, commentRange.end, savedContainerPos, savedContainerEnd, savedDeclarationListContainerEnd);
+        }
+        function emitLeadingCommentsOfNode(node, emitFlags, pos, end) {
             enterComment();
             hasWrittenComment = false;
-            var emitFlags = ts.getEmitFlags(node);
-            var _a = ts.getCommentRange(node), pos = _a.pos, end = _a.end;
-            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 */;
             var skipTrailingComments = end < 0 || (emitFlags & 1024 /* NoTrailingComments */) !== 0 || node.kind === 11 /* JsxText */;
             // Save current container state on the stack.
-            var savedContainerPos = containerPos;
-            var savedContainerEnd = containerEnd;
-            var savedDeclarationListContainerEnd = declarationListContainerEnd;
             if ((pos > 0 || end > 0) && pos !== end) {
                 // Emit leading comments if the position is not synthesized and the node
                 // has not opted out from emitting leading comments.
                 if (!skipLeadingComments) {
-                    emitLeadingComments(pos, isEmittedNode);
+                    emitLeadingComments(pos, /*isEmittedNode*/ node.kind !== 339 /* NotEmittedStatement */);
                 }
                 if (!skipLeadingComments || (pos >= 0 && (emitFlags & 512 /* NoLeadingComments */) !== 0)) {
                     // Advance the container position if comments get emitted or if they've been disabled explicitly using NoLeadingComments.
@@ -104992,23 +107857,17 @@ 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 === 250 /* VariableDeclarationList */) {
+                    if (node.kind === 251 /* VariableDeclarationList */) {
                         declarationListContainerEnd = end;
                     }
                 }
             }
             ts.forEach(ts.getSyntheticLeadingComments(node), emitLeadingSynthesizedComment);
             exitComment();
-            var pipelinePhase = getNextPipelinePhase(2 /* Comments */, hint, node);
-            if (emitFlags & 2048 /* NoNestedComments */) {
-                commentsDisabled = true;
-                pipelinePhase(hint, node);
-                commentsDisabled = false;
-            }
-            else {
-                pipelinePhase(hint, node);
-            }
+        }
+        function emitTrailingCommentsOfNode(node, emitFlags, pos, end, savedContainerPos, savedContainerEnd, savedDeclarationListContainerEnd) {
             enterComment();
+            var skipTrailingComments = end < 0 || (emitFlags & 1024 /* NoTrailingComments */) !== 0 || node.kind === 11 /* JsxText */;
             ts.forEach(ts.getSyntheticTrailingComments(node), emitTrailingSynthesizedComment);
             if ((pos > 0 || end > 0) && pos !== end) {
                 // Restore previous container state.
@@ -105017,12 +107876,11 @@ var ts;
                 declarationListContainerEnd = savedDeclarationListContainerEnd;
                 // Emit trailing comments if the position is not synthesized and the node
                 // has not opted out from emitting leading comments and is an emitted node.
-                if (!skipTrailingComments && isEmittedNode) {
+                if (!skipTrailingComments && node.kind !== 339 /* NotEmittedStatement */) {
                     emitTrailingComments(end);
                 }
             }
             exitComment();
-            ts.Debug.assert(lastNode === node || lastSubstitution === node);
         }
         function emitLeadingSynthesizedComment(comment) {
             if (comment.hasLeadingNewline || comment.kind === 2 /* SingleLineCommentTrivia */) {
@@ -105082,6 +107940,23 @@ var ts;
             }
             exitComment();
         }
+        function siblingNodePositionsAreComparable(previousNode, nextNode) {
+            if (ts.nodeIsSynthesized(previousNode) || ts.nodeIsSynthesized(nextNode)) {
+                return false;
+            }
+            if (nextNode.pos < previousNode.end) {
+                return false;
+            }
+            previousNode = ts.getOriginalNode(previousNode);
+            nextNode = ts.getOriginalNode(nextNode);
+            var parent = previousNode.parent;
+            if (!parent || parent !== nextNode.parent) {
+                return false;
+            }
+            var parentNodeArray = ts.getContainingNodeArray(previousNode);
+            var prevNodeIndex = parentNodeArray === null || parentNodeArray === void 0 ? void 0 : parentNodeArray.indexOf(previousNode);
+            return prevNodeIndex !== undefined && prevNodeIndex > -1 && parentNodeArray.indexOf(nextNode) === prevNodeIndex + 1;
+        }
         function emitLeadingComments(pos, isEmittedNode) {
             hasWrittenComment = false;
             if (isEmittedNode) {
@@ -105254,42 +108129,49 @@ var ts;
             }
             return node.parsedSourceMap || undefined;
         }
-        function pipelineEmitWithSourceMap(hint, node) {
-            ts.Debug.assert(lastNode === node || lastSubstitution === node);
+        function pipelineEmitWithSourceMaps(hint, node) {
             var pipelinePhase = getNextPipelinePhase(3 /* SourceMaps */, hint, node);
-            if (ts.isUnparsedSource(node) || ts.isUnparsedPrepend(node)) {
-                pipelinePhase(hint, node);
-            }
-            else if (ts.isUnparsedNode(node)) {
+            emitSourceMapsBeforeNode(node);
+            pipelinePhase(hint, node);
+            emitSourceMapsAfterNode(node);
+        }
+        function emitSourceMapsBeforeNode(node) {
+            var emitFlags = ts.getEmitFlags(node);
+            var sourceMapRange = ts.getSourceMapRange(node);
+            // Emit leading sourcemap
+            if (ts.isUnparsedNode(node)) {
+                ts.Debug.assertIsDefined(node.parent, "UnparsedNodes must have parent pointers");
                 var parsed = getParsedSourceMap(node.parent);
                 if (parsed && sourceMapGenerator) {
                     sourceMapGenerator.appendSourceMap(writer.getLine(), writer.getColumn(), parsed, node.parent.sourceMapPath, node.parent.getLineAndCharacterOfPosition(node.pos), node.parent.getLineAndCharacterOfPosition(node.end));
                 }
-                pipelinePhase(hint, node);
             }
             else {
-                var _a = ts.getSourceMapRange(node), pos = _a.pos, end = _a.end, _b = _a.source, source = _b === void 0 ? sourceMapSource : _b;
-                var emitFlags = ts.getEmitFlags(node);
-                if (node.kind !== 335 /* NotEmittedStatement */
+                var source = sourceMapRange.source || sourceMapSource;
+                if (node.kind !== 339 /* NotEmittedStatement */
                     && (emitFlags & 16 /* NoLeadingSourceMap */) === 0
-                    && pos >= 0) {
-                    emitSourcePos(source, skipSourceTrivia(source, pos));
+                    && sourceMapRange.pos >= 0) {
+                    emitSourcePos(sourceMapRange.source || sourceMapSource, skipSourceTrivia(source, sourceMapRange.pos));
                 }
                 if (emitFlags & 64 /* NoNestedSourceMaps */) {
                     sourceMapsDisabled = true;
-                    pipelinePhase(hint, node);
-                    sourceMapsDisabled = false;
                 }
-                else {
-                    pipelinePhase(hint, node);
+            }
+        }
+        function emitSourceMapsAfterNode(node) {
+            var emitFlags = ts.getEmitFlags(node);
+            var sourceMapRange = ts.getSourceMapRange(node);
+            // Emit trailing sourcemap
+            if (!ts.isUnparsedNode(node)) {
+                if (emitFlags & 64 /* NoNestedSourceMaps */) {
+                    sourceMapsDisabled = false;
                 }
-                if (node.kind !== 335 /* NotEmittedStatement */
+                if (node.kind !== 339 /* NotEmittedStatement */
                     && (emitFlags & 32 /* NoTrailingSourceMap */) === 0
-                    && end >= 0) {
-                    emitSourcePos(source, end);
+                    && sourceMapRange.end >= 0) {
+                    emitSourcePos(sourceMapRange.source || sourceMapSource, sourceMapRange.end);
                 }
             }
-            ts.Debug.assert(lastNode === node || lastSubstitution === node);
         }
         /**
          * Skips trivia such as comments and white-space that can be optionally overridden by the source-map source
@@ -105441,12 +108323,22 @@ var ts;
             return ts.getBaseFileName(ts.normalizePath(fileName));
         }
         function createCachedFileSystemEntries(rootDir, rootDirPath) {
-            var resultFromHost = {
-                files: ts.map(host.readDirectory(rootDir, /*extensions*/ undefined, /*exclude*/ undefined, /*include*/ ["*.*"]), getBaseNameOfFileName) || [],
-                directories: host.getDirectories(rootDir) || []
-            };
-            cachedReadDirectoryResult.set(ts.ensureTrailingDirectorySeparator(rootDirPath), resultFromHost);
-            return resultFromHost;
+            var _a;
+            if (!host.realpath || ts.ensureTrailingDirectorySeparator(toPath(host.realpath(rootDir))) === rootDirPath) {
+                var resultFromHost = {
+                    files: ts.map(host.readDirectory(rootDir, /*extensions*/ undefined, /*exclude*/ undefined, /*include*/ ["*.*"]), getBaseNameOfFileName) || [],
+                    directories: host.getDirectories(rootDir) || []
+                };
+                cachedReadDirectoryResult.set(ts.ensureTrailingDirectorySeparator(rootDirPath), resultFromHost);
+                return resultFromHost;
+            }
+            // If the directory is symlink do not cache the result
+            if ((_a = host.directoryExists) === null || _a === void 0 ? void 0 : _a.call(host, rootDir)) {
+                cachedReadDirectoryResult.set(rootDirPath, false);
+                return false;
+            }
+            // Non existing directory
+            return undefined;
         }
         /**
          * If the readDirectory result was already cached, it returns that
@@ -105521,17 +108413,32 @@ var ts;
         }
         function readDirectory(rootDir, extensions, excludes, includes, depth) {
             var rootDirPath = toPath(rootDir);
-            var result = tryReadDirectory(rootDir, rootDirPath);
-            if (result) {
+            var rootResult = tryReadDirectory(rootDir, rootDirPath);
+            var rootSymLinkResult;
+            if (rootResult !== undefined) {
                 return ts.matchFiles(rootDir, extensions, excludes, includes, useCaseSensitiveFileNames, currentDirectory, depth, getFileSystemEntries, realpath);
             }
             return host.readDirectory(rootDir, extensions, excludes, includes, depth);
             function getFileSystemEntries(dir) {
                 var path = toPath(dir);
                 if (path === rootDirPath) {
-                    return result;
-                }
-                return tryReadDirectory(dir, path) || ts.emptyFileSystemEntries;
+                    return rootResult || getFileSystemEntriesFromHost(dir, path);
+                }
+                var result = tryReadDirectory(dir, path);
+                return result !== undefined ?
+                    result || getFileSystemEntriesFromHost(dir, path) :
+                    ts.emptyFileSystemEntries;
+            }
+            function getFileSystemEntriesFromHost(dir, path) {
+                if (rootSymLinkResult && path === rootDirPath)
+                    return rootSymLinkResult;
+                var result = {
+                    files: ts.map(host.readDirectory(dir, /*extensions*/ undefined, /*exclude*/ undefined, /*include*/ ["*.*"]), getBaseNameOfFileName) || ts.emptyArray,
+                    directories: host.getDirectories(dir) || ts.emptyArray
+                };
+                if (path === rootDirPath)
+                    rootSymLinkResult = result;
+                return result;
             }
         }
         function realpath(s) {
@@ -105539,7 +108446,7 @@ var ts;
         }
         function addOrDeleteFileOrDirectory(fileOrDirectory, fileOrDirectoryPath) {
             var existingResult = getCachedFileSystemEntries(fileOrDirectoryPath);
-            if (existingResult) {
+            if (existingResult !== undefined) {
                 // Just clear the cache for now
                 // For now just clear the cache, since this could mean that multiple level entries might need to be re-evaluated
                 clearCache();
@@ -105599,9 +108506,9 @@ var ts;
     /**
      * Updates the map of shared extended config file watches with a new set of extended config files from a base config file of the project
      */
-    function updateSharedExtendedConfigFileWatcher(projectPath, parsed, extendedConfigFilesMap, createExtendedConfigFileWatch, toPath) {
+    function updateSharedExtendedConfigFileWatcher(projectPath, options, extendedConfigFilesMap, createExtendedConfigFileWatch, toPath) {
         var _a;
-        var extendedConfigs = ts.arrayToMap(((_a = parsed === null || parsed === void 0 ? void 0 : parsed.options.configFile) === null || _a === void 0 ? void 0 : _a.extendedSourceFiles) || ts.emptyArray, toPath);
+        var extendedConfigs = ts.arrayToMap(((_a = options === null || options === void 0 ? void 0 : options.configFile) === null || _a === void 0 ? void 0 : _a.extendedSourceFiles) || ts.emptyArray, toPath);
         // remove project from all unrelated watchers
         extendedConfigFilesMap.forEach(function (watcher, extendedConfigFilePath) {
             if (!extendedConfigs.has(extendedConfigFilePath)) {
@@ -105619,12 +108526,12 @@ var ts;
                 // start watching previously unseen extended config
                 extendedConfigFilesMap.set(extendedConfigFilePath, {
                     projects: new ts.Set([projectPath]),
-                    fileWatcher: createExtendedConfigFileWatch(extendedConfigFileName, extendedConfigFilePath),
+                    watcher: createExtendedConfigFileWatch(extendedConfigFileName, extendedConfigFilePath),
                     close: function () {
                         var existing = extendedConfigFilesMap.get(extendedConfigFilePath);
                         if (!existing || existing.projects.size !== 0)
                             return;
-                        existing.fileWatcher.close();
+                        existing.watcher.close();
                         extendedConfigFilesMap.delete(extendedConfigFilePath);
                     },
                 });
@@ -105632,6 +108539,31 @@ var ts;
         });
     }
     ts.updateSharedExtendedConfigFileWatcher = updateSharedExtendedConfigFileWatcher;
+    /**
+     * Remove the project from the extended config file watchers and close not needed watches
+     */
+    function clearSharedExtendedConfigFileWatcher(projectPath, extendedConfigFilesMap) {
+        extendedConfigFilesMap.forEach(function (watcher) {
+            if (watcher.projects.delete(projectPath))
+                watcher.close();
+        });
+    }
+    ts.clearSharedExtendedConfigFileWatcher = clearSharedExtendedConfigFileWatcher;
+    /**
+     * Clean the extendsConfigCache when extended config file has changed
+     */
+    function cleanExtendedConfigCache(extendedConfigCache, extendedConfigFilePath, toPath) {
+        if (!extendedConfigCache.delete(extendedConfigFilePath))
+            return;
+        extendedConfigCache.forEach(function (_a, key) {
+            var _b;
+            var extendedResult = _a.extendedResult;
+            if ((_b = extendedResult.extendedSourceFiles) === null || _b === void 0 ? void 0 : _b.some(function (extendedFile) { return toPath(extendedFile) === extendedConfigFilePath; })) {
+                cleanExtendedConfigCache(extendedConfigCache, key, toPath);
+            }
+        });
+    }
+    ts.cleanExtendedConfigCache = cleanExtendedConfigCache;
     /**
      * Updates the existing missing file watches with the new set of missing files after new program is created
      */
@@ -105683,7 +108615,7 @@ var ts;
     ts.updateWatchingWildcardDirectories = updateWatchingWildcardDirectories;
     /* @internal */
     function isIgnoredFileFromWildCardWatching(_a) {
-        var watchedDirPath = _a.watchedDirPath, fileOrDirectory = _a.fileOrDirectory, fileOrDirectoryPath = _a.fileOrDirectoryPath, configFileName = _a.configFileName, options = _a.options, program = _a.program, extraFileExtensions = _a.extraFileExtensions, currentDirectory = _a.currentDirectory, useCaseSensitiveFileNames = _a.useCaseSensitiveFileNames, writeLog = _a.writeLog;
+        var watchedDirPath = _a.watchedDirPath, fileOrDirectory = _a.fileOrDirectory, fileOrDirectoryPath = _a.fileOrDirectoryPath, configFileName = _a.configFileName, options = _a.options, program = _a.program, extraFileExtensions = _a.extraFileExtensions, currentDirectory = _a.currentDirectory, useCaseSensitiveFileNames = _a.useCaseSensitiveFileNames, writeLog = _a.writeLog, toPath = _a.toPath;
         var newPath = ts.removeIgnoredPath(fileOrDirectoryPath);
         if (!newPath) {
             writeLog("Project: " + configFileName + " Detected ignored path: " + fileOrDirectory);
@@ -105719,7 +108651,8 @@ var ts;
         }
         // just check if sourceFile with the name exists
         var filePathWithoutExtension = ts.removeFileExtension(fileOrDirectoryPath);
-        var realProgram = isBuilderProgram(program) ? program.getProgramOrUndefined() : program;
+        var realProgram = ts.isArray(program) ? undefined : isBuilderProgram(program) ? program.getProgramOrUndefined() : program;
+        var builderProgram = !realProgram && !ts.isArray(program) ? program : undefined;
         if (hasSourceFile((filePathWithoutExtension + ".ts" /* Ts */)) ||
             hasSourceFile((filePathWithoutExtension + ".tsx" /* Tsx */))) {
             writeLog("Project: " + configFileName + " Detected output file: " + fileOrDirectory);
@@ -105729,7 +108662,9 @@ var ts;
         function hasSourceFile(file) {
             return realProgram ?
                 !!realProgram.getSourceFileByPath(file) :
-                program.getState().fileInfos.has(file);
+                builderProgram ?
+                    builderProgram.getState().fileInfos.has(file) :
+                    !!ts.find(program, function (rootFile) { return toPath(rootFile) === file; });
         }
     }
     ts.isIgnoredFileFromWildCardWatching = isIgnoredFileFromWildCardWatching;
@@ -106408,38 +109343,31 @@ var ts;
      * Determines if program structure is upto date or needs to be recreated
      */
     /* @internal */
-    function isProgramUptoDate(program, rootFileNames, newOptions, getSourceVersion, fileExists, hasInvalidatedResolution, hasChangedAutomaticTypeDirectiveNames, projectReferences) {
+    function isProgramUptoDate(program, rootFileNames, newOptions, getSourceVersion, fileExists, hasInvalidatedResolution, hasChangedAutomaticTypeDirectiveNames, getParsedCommandLine, projectReferences) {
         // If we haven't created a program yet or have changed automatic type directives, then it is not up-to-date
-        if (!program || (hasChangedAutomaticTypeDirectiveNames === null || hasChangedAutomaticTypeDirectiveNames === void 0 ? void 0 : hasChangedAutomaticTypeDirectiveNames())) {
+        if (!program || (hasChangedAutomaticTypeDirectiveNames === null || hasChangedAutomaticTypeDirectiveNames === void 0 ? void 0 : hasChangedAutomaticTypeDirectiveNames()))
             return false;
-        }
         // If root file names don't match
-        if (!ts.arrayIsEqualTo(program.getRootFileNames(), rootFileNames)) {
+        if (!ts.arrayIsEqualTo(program.getRootFileNames(), rootFileNames))
             return false;
-        }
         var seenResolvedRefs;
         // If project references don't match
-        if (!ts.arrayIsEqualTo(program.getProjectReferences(), projectReferences, projectReferenceUptoDate)) {
+        if (!ts.arrayIsEqualTo(program.getProjectReferences(), projectReferences, projectReferenceUptoDate))
             return false;
-        }
         // If any file is not up-to-date, then the whole program is not up-to-date
-        if (program.getSourceFiles().some(sourceFileNotUptoDate)) {
+        if (program.getSourceFiles().some(sourceFileNotUptoDate))
             return false;
-        }
         // If any of the missing file paths are now created
-        if (program.getMissingFilePaths().some(fileExists)) {
+        if (program.getMissingFilePaths().some(fileExists))
             return false;
-        }
         var currentOptions = program.getCompilerOptions();
         // If the compilation settings do no match, then the program is not up-to-date
-        if (!ts.compareDataObjects(currentOptions, newOptions)) {
+        if (!ts.compareDataObjects(currentOptions, newOptions))
             return false;
-        }
         // If everything matches but the text of config file is changed,
         // error locations can change for program options, so update the program
-        if (currentOptions.configFile && newOptions.configFile) {
+        if (currentOptions.configFile && newOptions.configFile)
             return currentOptions.configFile.text === newOptions.configFile.text;
-        }
         return true;
         function sourceFileNotUptoDate(sourceFile) {
             return !sourceFileVersionUptoDate(sourceFile) ||
@@ -106449,21 +109377,25 @@ var ts;
             return sourceFile.version === getSourceVersion(sourceFile.resolvedPath, sourceFile.fileName);
         }
         function projectReferenceUptoDate(oldRef, newRef, index) {
-            if (!ts.projectReferenceIsEqualTo(oldRef, newRef)) {
-                return false;
-            }
-            return resolvedProjectReferenceUptoDate(program.getResolvedProjectReferences()[index], oldRef);
+            return ts.projectReferenceIsEqualTo(oldRef, newRef) &&
+                resolvedProjectReferenceUptoDate(program.getResolvedProjectReferences()[index], oldRef);
         }
         function resolvedProjectReferenceUptoDate(oldResolvedRef, oldRef) {
             if (oldResolvedRef) {
-                if (ts.contains(seenResolvedRefs, oldResolvedRef)) {
-                    // Assume true
+                // Assume true
+                if (ts.contains(seenResolvedRefs, oldResolvedRef))
                     return true;
-                }
-                // If sourceFile for the oldResolvedRef existed, check the version for uptodate
-                if (!sourceFileVersionUptoDate(oldResolvedRef.sourceFile)) {
+                var refPath_1 = resolveProjectReferencePath(oldRef);
+                var newParsedCommandLine = getParsedCommandLine(refPath_1);
+                // Check if config file exists
+                if (!newParsedCommandLine)
+                    return false;
+                // If change in source file
+                if (oldResolvedRef.commandLine.options.configFile !== newParsedCommandLine.options.configFile)
+                    return false;
+                // check file names
+                if (!ts.arrayIsEqualTo(oldResolvedRef.commandLine.fileNames, newParsedCommandLine.fileNames))
                     return false;
-                }
                 // Add to seen before checking the referenced paths of this config file
                 (seenResolvedRefs || (seenResolvedRefs = [])).push(oldResolvedRef);
                 // If child project references are upto date, this project reference is uptodate
@@ -106473,7 +109405,8 @@ var ts;
             }
             // In old program, not able to resolve project reference path,
             // so if config file doesnt exist, it is uptodate.
-            return !fileExists(resolveProjectReferencePath(oldRef));
+            var refPath = resolveProjectReferencePath(oldRef);
+            return !getParsedCommandLine(refPath);
         }
     }
     ts.isProgramUptoDate = isProgramUptoDate;
@@ -106552,6 +109485,7 @@ var ts;
         var hasEmitBlockingDiagnostics = new ts.Map();
         var _compilerOptionsObjectLiteralSyntax;
         var moduleResolutionCache;
+        var typeReferenceDirectiveResolutionCache;
         var actualResolveModuleNamesWorker;
         var hasInvalidatedResolution = host.hasInvalidatedResolution || ts.returnFalse;
         if (host.resolveModuleNames) {
@@ -106566,7 +109500,7 @@ var ts;
             }); };
         }
         else {
-            moduleResolutionCache = ts.createModuleResolutionCache(currentDirectory, function (x) { return host.getCanonicalFileName(x); }, options);
+            moduleResolutionCache = ts.createModuleResolutionCache(currentDirectory, getCanonicalFileName, options);
             var loader_1 = function (moduleName, containingFile, redirectedReference) { return ts.resolveModuleName(moduleName, containingFile, options, host, moduleResolutionCache, redirectedReference).resolvedModule; }; // TODO: GH#18217
             actualResolveModuleNamesWorker = function (moduleNames, containingFile, _reusedNames, redirectedReference) { return loadWithLocalCache(ts.Debug.checkEachDefined(moduleNames), containingFile, redirectedReference, loader_1); };
         }
@@ -106575,7 +109509,8 @@ var ts;
             actualResolveTypeReferenceDirectiveNamesWorker = function (typeDirectiveNames, containingFile, redirectedReference) { return host.resolveTypeReferenceDirectives(ts.Debug.checkEachDefined(typeDirectiveNames), containingFile, redirectedReference, options); };
         }
         else {
-            var loader_2 = function (typesRef, containingFile, redirectedReference) { return ts.resolveTypeReferenceDirective(typesRef, containingFile, options, host, redirectedReference).resolvedTypeReferenceDirective; }; // TODO: GH#18217
+            typeReferenceDirectiveResolutionCache = ts.createTypeReferenceDirectiveResolutionCache(currentDirectory, getCanonicalFileName, /*options*/ undefined, moduleResolutionCache === null || moduleResolutionCache === void 0 ? void 0 : moduleResolutionCache.getPackageJsonInfoCache());
+            var loader_2 = function (typesRef, containingFile, redirectedReference) { return ts.resolveTypeReferenceDirective(typesRef, containingFile, options, host, redirectedReference, typeReferenceDirectiveResolutionCache).resolvedTypeReferenceDirective; }; // TODO: GH#18217
             actualResolveTypeReferenceDirectiveNamesWorker = function (typeReferenceDirectiveNames, containingFile, redirectedReference) { return loadWithLocalCache(ts.Debug.checkEachDefined(typeReferenceDirectiveNames), containingFile, redirectedReference, loader_2); };
         }
         // Map from a stringified PackageId to the source file with that id.
@@ -106714,12 +109649,25 @@ var ts;
                     host.onReleaseOldSourceFile(oldSourceFile, oldProgram.getCompilerOptions(), !!getSourceFileByPath(oldSourceFile.path));
                 }
             }
-            oldProgram.forEachResolvedProjectReference(function (resolvedProjectReference) {
-                if (!getResolvedProjectReferenceByPath(resolvedProjectReference.sourceFile.path)) {
-                    host.onReleaseOldSourceFile(resolvedProjectReference.sourceFile, oldProgram.getCompilerOptions(), /*hasSourceFileByPath*/ false);
+            if (!host.getParsedCommandLine) {
+                oldProgram.forEachResolvedProjectReference(function (resolvedProjectReference) {
+                    if (!getResolvedProjectReferenceByPath(resolvedProjectReference.sourceFile.path)) {
+                        host.onReleaseOldSourceFile(resolvedProjectReference.sourceFile, oldProgram.getCompilerOptions(), /*hasSourceFileByPath*/ false);
+                    }
+                });
+            }
+        }
+        // Release commandlines that new program does not use
+        if (oldProgram && host.onReleaseParsedCommandLine) {
+            forEachProjectReference(oldProgram.getProjectReferences(), oldProgram.getResolvedProjectReferences(), function (oldResolvedRef, parent, index) {
+                var oldReference = (parent === null || parent === void 0 ? void 0 : parent.commandLine.projectReferences[index]) || oldProgram.getProjectReferences()[index];
+                var oldRefPath = resolveProjectReferencePath(oldReference);
+                if (!(projectReferenceRedirects === null || projectReferenceRedirects === void 0 ? void 0 : projectReferenceRedirects.has(toPath(oldRefPath)))) {
+                    host.onReleaseParsedCommandLine(oldRefPath, oldResolvedRef, oldProgram.getCompilerOptions());
                 }
             });
         }
+        typeReferenceDirectiveResolutionCache = undefined;
         // unconditionally set oldProgram to undefined to prevent it from being captured in closure
         oldProgram = undefined;
         var program = {
@@ -106748,7 +109696,6 @@ 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(); },
@@ -106914,13 +109861,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_14 = [];
+                var result_15 = [];
                 for (var _i = 0, moduleNames_1 = moduleNames; _i < moduleNames_1.length; _i++) {
                     var moduleName = moduleNames_1[_i];
                     var resolvedModule = file.resolvedModules.get(moduleName);
-                    result_14.push(resolvedModule);
+                    result_15.push(resolvedModule);
                 }
-                return result_14;
+                return result_15;
             }
             // At this point, we know at least one of the following hold:
             // - file has local declarations for ambient modules
@@ -107031,7 +109978,9 @@ var ts;
                 var newResolvedRef = parseProjectReferenceConfigFile(newRef);
                 if (oldResolvedRef) {
                     // Resolved project reference has gone missing or changed
-                    return !newResolvedRef || newResolvedRef.sourceFile !== oldResolvedRef.sourceFile;
+                    return !newResolvedRef ||
+                        newResolvedRef.sourceFile !== oldResolvedRef.sourceFile ||
+                        !ts.arrayIsEqualTo(oldResolvedRef.commandLine.fileNames, newResolvedRef.commandLine.fileNames);
                 }
                 else {
                     // A previously-unresolved reference may be resolved now
@@ -107554,22 +110503,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 160 /* Parameter */:
-                        case 163 /* PropertyDeclaration */:
-                        case 165 /* MethodDeclaration */:
+                        case 161 /* Parameter */:
+                        case 164 /* PropertyDeclaration */:
+                        case 166 /* 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 164 /* MethodSignature */:
-                        case 166 /* Constructor */:
-                        case 167 /* GetAccessor */:
-                        case 168 /* SetAccessor */:
-                        case 208 /* FunctionExpression */:
-                        case 251 /* FunctionDeclaration */:
-                        case 209 /* ArrowFunction */:
-                        case 249 /* VariableDeclaration */:
+                        case 165 /* MethodSignature */:
+                        case 167 /* Constructor */:
+                        case 168 /* GetAccessor */:
+                        case 169 /* SetAccessor */:
+                        case 209 /* FunctionExpression */:
+                        case 252 /* FunctionDeclaration */:
+                        case 210 /* ArrowFunction */:
+                        case 250 /* VariableDeclaration */:
                             // type annotation
                             if (parent.type === node) {
                                 diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.Type_annotations_can_only_be_used_in_TypeScript_files));
@@ -107577,58 +110526,58 @@ var ts;
                             }
                     }
                     switch (node.kind) {
-                        case 262 /* ImportClause */:
+                        case 263 /* ImportClause */:
                             if (node.isTypeOnly) {
                                 diagnostics.push(createDiagnosticForNode(parent, ts.Diagnostics._0_declarations_can_only_be_used_in_TypeScript_files, "import type"));
                                 return "skip";
                             }
                             break;
-                        case 267 /* ExportDeclaration */:
+                        case 268 /* 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 260 /* ImportEqualsDeclaration */:
+                        case 261 /* ImportEqualsDeclaration */:
                             diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.import_can_only_be_used_in_TypeScript_files));
                             return "skip";
-                        case 266 /* ExportAssignment */:
+                        case 267 /* ExportAssignment */:
                             if (node.isExportEquals) {
                                 diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.export_can_only_be_used_in_TypeScript_files));
                                 return "skip";
                             }
                             break;
-                        case 286 /* HeritageClause */:
+                        case 287 /* 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 253 /* InterfaceDeclaration */:
+                        case 254 /* 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 256 /* ModuleDeclaration */:
+                        case 257 /* 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 254 /* TypeAliasDeclaration */:
+                        case 255 /* TypeAliasDeclaration */:
                             diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.Type_aliases_can_only_be_used_in_TypeScript_files));
                             return "skip";
-                        case 255 /* EnumDeclaration */:
+                        case 256 /* 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 225 /* NonNullExpression */:
+                        case 226 /* NonNullExpression */:
                             diagnostics.push(createDiagnosticForNode(node, ts.Diagnostics.Non_null_assertions_can_only_be_used_in_TypeScript_files));
                             return "skip";
-                        case 224 /* AsExpression */:
+                        case 225 /* AsExpression */:
                             diagnostics.push(createDiagnosticForNode(node.type, ts.Diagnostics.Type_assertion_expressions_can_only_be_used_in_TypeScript_files));
                             return "skip";
-                        case 206 /* TypeAssertionExpression */:
+                        case 207 /* TypeAssertionExpression */:
                             ts.Debug.fail(); // Won't parse these in a JS file anyway, as they are interpreted as JSX.
                     }
                 }
@@ -107637,29 +110586,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 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 */:
+                        case 253 /* ClassDeclaration */:
+                        case 222 /* ClassExpression */:
+                        case 166 /* MethodDeclaration */:
+                        case 167 /* Constructor */:
+                        case 168 /* GetAccessor */:
+                        case 169 /* SetAccessor */:
+                        case 209 /* FunctionExpression */:
+                        case 252 /* FunctionDeclaration */:
+                        case 210 /* 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 232 /* VariableStatement */:
+                        case 233 /* VariableStatement */:
                             // Check modifiers
                             if (nodes === parent.modifiers) {
-                                checkModifiers(parent.modifiers, parent.kind === 232 /* VariableStatement */);
+                                checkModifiers(parent.modifiers, parent.kind === 233 /* VariableStatement */);
                                 return "skip";
                             }
                             break;
-                        case 163 /* PropertyDeclaration */:
+                        case 164 /* PropertyDeclaration */:
                             // Check modifiers of property declaration
                             if (nodes === parent.modifiers) {
                                 for (var _i = 0, _a = nodes; _i < _a.length; _i++) {
@@ -107671,19 +110620,19 @@ var ts;
                                 return "skip";
                             }
                             break;
-                        case 160 /* Parameter */:
+                        case 161 /* 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 203 /* CallExpression */:
-                        case 204 /* NewExpression */:
-                        case 223 /* ExpressionWithTypeArguments */:
-                        case 274 /* JsxSelfClosingElement */:
-                        case 275 /* JsxOpeningElement */:
-                        case 205 /* TaggedTemplateExpression */:
+                        case 204 /* CallExpression */:
+                        case 205 /* NewExpression */:
+                        case 224 /* ExpressionWithTypeArguments */:
+                        case 275 /* JsxSelfClosingElement */:
+                        case 276 /* JsxOpeningElement */:
+                        case 206 /* TaggedTemplateExpression */:
                             // Check type arguments
                             if (nodes === parent.typeArguments) {
                                 diagnostics.push(createDiagnosticForNodeArray(nodes, ts.Diagnostics.Type_arguments_can_only_be_used_in_TypeScript_files));
@@ -107708,6 +110657,7 @@ var ts;
                             case 142 /* ReadonlyKeyword */:
                             case 133 /* DeclareKeyword */:
                             case 125 /* AbstractKeyword */:
+                            case 156 /* OverrideKeyword */:
                                 diagnostics.push(createDiagnosticForNode(modifier, ts.Diagnostics.The_0_modifier_can_only_be_used_in_TypeScript_files, ts.tokenToString(modifier.kind)));
                                 break;
                             // These are all legal modifiers.
@@ -108349,12 +111299,14 @@ var ts;
             return host.getCanonicalFileName(fileName);
         }
         function processImportedModules(file) {
+            var _a;
             collectExternalModuleReferences(file);
             if (file.imports.length || file.moduleAugmentations.length) {
                 // Because global augmentation doesn't have string literal name, we can check for global augmentation as such.
                 var moduleNames = getModuleNames(file);
                 var resolutions = resolveModuleNamesReusingOldState(moduleNames, file);
                 ts.Debug.assert(resolutions.length === moduleNames.length);
+                var optionsForFile = (useSourceOfProjectReferenceRedirect ? (_a = getRedirectReferenceForResolution(file)) === null || _a === void 0 ? void 0 : _a.commandLine.options : undefined) || options;
                 for (var index = 0; index < moduleNames.length; index++) {
                     var resolution = resolutions[index];
                     ts.setResolvedModule(file, moduleNames[index], resolution);
@@ -108377,11 +111329,11 @@ var ts;
                     // Don't add the file if it has a bad extension (e.g. 'tsx' if we don't have '--allowJs')
                     // This may still end up being an untyped module -- the file won't be included but imports will be allowed.
                     var shouldAddFile = resolvedFileName
-                        && !getResolutionDiagnostic(options, resolution)
-                        && !options.noResolve
+                        && !getResolutionDiagnostic(optionsForFile, resolution)
+                        && !optionsForFile.noResolve
                         && index < file.imports.length
                         && !elideImport
-                        && !(isJsFile && !ts.getAllowJSCompilerOption(options))
+                        && !(isJsFile && !ts.getAllowJSCompilerOption(optionsForFile))
                         && (ts.isInJSFile(file.imports[index]) || !(file.imports[index].flags & 4194304 /* JSDoc */));
                     if (elideImport) {
                         modulesWithElidedImports.set(file.path, true);
@@ -108617,9 +111569,10 @@ var ts;
                     createDiagnosticForOptionName(ts.Diagnostics.Option_resolveJsonModule_can_only_be_specified_when_module_code_generation_is_commonjs_amd_es2015_or_esNext, "resolveJsonModule", "module");
                 }
             }
-            // there has to be common source directory if user specified --outdir || --sourceRoot
+            // there has to be common source directory if user specified --outdir || --rootDir || --sourceRoot
             // if user specified --mapRoot, there needs to be common source directory if there would be multiple files being emitted
             if (options.outDir || // there is --outDir specified
+                options.rootDir || // there is --rootDir specified
                 options.sourceRoot || // there is --sourceRoot specified
                 options.mapRoot) { // there is --mapRoot specified
                 // Precalculate and cache the common source directory
@@ -109409,12 +112362,15 @@ var ts;
             // From ambient modules
             for (var _f = 0, _g = program.getTypeChecker().getAmbientModules(); _f < _g.length; _f++) {
                 var ambientModule = _g[_f];
-                if (ambientModule.declarations.length > 1) {
+                if (ambientModule.declarations && ambientModule.declarations.length > 1) {
                     addReferenceFromAmbientModule(ambientModule);
                 }
             }
             return referencedFiles;
             function addReferenceFromAmbientModule(symbol) {
+                if (!symbol.declarations) {
+                    return;
+                }
                 // Add any file other than our own as reference
                 for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                     var declaration = _a[_i];
@@ -109439,7 +112395,7 @@ var ts;
         /**
          * Creates the state of file references and signature for the new program from oldState if it is safe
          */
-        function create(newProgram, getCanonicalFileName, oldState) {
+        function create(newProgram, getCanonicalFileName, oldState, disableUseFileVersionAsSignature) {
             var fileInfos = new ts.Map();
             var referencedMap = newProgram.getCompilerOptions().module !== ts.ModuleKind.None ? new ts.Map() : undefined;
             var exportedModulesMap = referencedMap ? new ts.Map() : undefined;
@@ -109465,13 +112421,14 @@ var ts;
                         }
                     }
                 }
-                fileInfos.set(sourceFile.resolvedPath, { version: version_2, signature: oldInfo && oldInfo.signature, affectsGlobalScope: isFileAffectingGlobalScope(sourceFile) });
+                fileInfos.set(sourceFile.resolvedPath, { version: version_2, signature: oldInfo && oldInfo.signature, affectsGlobalScope: isFileAffectingGlobalScope(sourceFile) || undefined });
             }
             return {
                 fileInfos: fileInfos,
                 referencedMap: referencedMap,
                 exportedModulesMap: exportedModulesMap,
-                hasCalledUpdateShapeSignature: hasCalledUpdateShapeSignature
+                hasCalledUpdateShapeSignature: hasCalledUpdateShapeSignature,
+                useFileVersionAsSignature: !disableUseFileVersionAsSignature && !useOldState
             };
         }
         BuilderState.create = create;
@@ -109493,6 +112450,7 @@ var ts;
                 referencedMap: state.referencedMap && new ts.Map(state.referencedMap),
                 exportedModulesMap: state.exportedModulesMap && new ts.Map(state.exportedModulesMap),
                 hasCalledUpdateShapeSignature: new ts.Set(state.hasCalledUpdateShapeSignature),
+                useFileVersionAsSignature: state.useFileVersionAsSignature,
             };
         }
         BuilderState.clone = clone;
@@ -109548,23 +112506,12 @@ var ts;
                 return ts.Debug.fail();
             var prevSignature = info.signature;
             var latestSignature;
-            if (sourceFile.isDeclarationFile) {
-                latestSignature = sourceFile.version;
-                if (exportedModulesMapCache && latestSignature !== prevSignature) {
-                    // All the references in this file are exported
-                    var references = state.referencedMap ? state.referencedMap.get(sourceFile.resolvedPath) : undefined;
-                    exportedModulesMapCache.set(sourceFile.resolvedPath, references || false);
-                }
-            }
-            else {
+            if (!sourceFile.isDeclarationFile && !state.useFileVersionAsSignature) {
                 var emitOutput_1 = getFileEmitOutput(programOfThisState, sourceFile, 
                 /*emitOnlyDtsFiles*/ true, cancellationToken, 
                 /*customTransformers*/ undefined, 
                 /*forceDtsEmit*/ true);
-                var firstDts_1 = emitOutput_1.outputFiles &&
-                    programOfThisState.getCompilerOptions().declarationMap ?
-                    emitOutput_1.outputFiles.length > 1 ? emitOutput_1.outputFiles[1] : undefined :
-                    emitOutput_1.outputFiles.length > 0 ? emitOutput_1.outputFiles[0] : undefined;
+                var firstDts_1 = ts.firstOrUndefined(emitOutput_1.outputFiles);
                 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 || ts.generateDjb2Hash)(firstDts_1.text);
@@ -109572,12 +112519,18 @@ var ts;
                         updateExportedModules(sourceFile, emitOutput_1.exportedModulesFromDeclarationEmit, exportedModulesMapCache);
                     }
                 }
-                else {
-                    latestSignature = prevSignature; // TODO: GH#18217
+            }
+            // Default is to use file version as signature
+            if (latestSignature === undefined) {
+                latestSignature = sourceFile.version;
+                if (exportedModulesMapCache && latestSignature !== prevSignature) {
+                    // All the references in this file are exported
+                    var references = state.referencedMap ? state.referencedMap.get(sourceFile.resolvedPath) : undefined;
+                    exportedModulesMapCache.set(sourceFile.resolvedPath, references || false);
                 }
             }
             cacheToUpdateSignature.set(sourceFile.resolvedPath, latestSignature);
-            return !prevSignature || latestSignature !== prevSignature;
+            return latestSignature !== prevSignature;
         }
         BuilderState.updateShapeSignature = updateShapeSignature;
         /**
@@ -109697,7 +112650,7 @@ var ts;
          */
         function isFileAffectingGlobalScope(sourceFile) {
             return containsGlobalScopeAugmentation(sourceFile) ||
-                !ts.isExternalModule(sourceFile) && !containsOnlyAmbientModules(sourceFile);
+                !ts.isExternalOrCommonJsModule(sourceFile) && !containsOnlyAmbientModules(sourceFile);
         }
         /**
          * Gets all files of the program excluding the default library file
@@ -109785,8 +112738,8 @@ var ts;
     /**
      * Create the state so that we can iterate on changedFiles/affected files
      */
-    function createBuilderProgramState(newProgram, getCanonicalFileName, oldState) {
-        var state = ts.BuilderState.create(newProgram, getCanonicalFileName, oldState);
+    function createBuilderProgramState(newProgram, getCanonicalFileName, oldState, disableUseFileVersionAsSignature) {
+        var state = ts.BuilderState.create(newProgram, getCanonicalFileName, oldState, disableUseFileVersionAsSignature);
         state.program = newProgram;
         var compilerOptions = newProgram.getCompilerOptions();
         state.compilerOptions = compilerOptions;
@@ -110024,6 +112977,7 @@ var ts;
      *  This is because even though js emit doesnt change, dts emit / type used can change resulting in need for dts emit and js change
      */
     function handleDtsMayChangeOfAffectedFile(state, affectedFile, cancellationToken, computeHash) {
+        var _a;
         removeSemanticDiagnosticsOf(state, affectedFile.resolvedPath);
         // If affected files is everything except default library, then nothing more to do
         if (state.allFilesExcludingDefaultLibraryFile === state.affectedFiles) {
@@ -110037,8 +112991,15 @@ var ts;
                         removeSemanticDiagnosticsOf(state, f.resolvedPath);
                 });
             }
+            // When a change affects the global scope, all files are considered to be affected without updating their signature
+            // That means when affected file is handled, its signature can be out of date
+            // To avoid this, ensure that we update the signature for any affected file in this scenario.
+            ts.BuilderState.updateShapeSignature(state, ts.Debug.checkDefined(state.program), affectedFile, ts.Debug.checkDefined(state.currentAffectedFilesSignatures), cancellationToken, computeHash, state.currentAffectedFilesExportedModulesMap);
             return;
         }
+        else {
+            ts.Debug.assert(state.hasCalledUpdateShapeSignature.has(affectedFile.resolvedPath) || ((_a = state.currentAffectedFilesSignatures) === null || _a === void 0 ? void 0 : _a.has(affectedFile.resolvedPath)), "Signature not updated for affected file: " + affectedFile.fileName);
+        }
         if (!state.compilerOptions.assumeChangesOnlyAffectDirectDependencies) {
             forEachReferencingModulesOfExportOfAffectedFile(state, affectedFile, function (state, path) { return handleDtsMayChangeOf(state, path, cancellationToken, computeHash); });
         }
@@ -110250,83 +113211,116 @@ var ts;
             return undefined;
         var currentDirectory = ts.Debug.checkDefined(state.program).getCurrentDirectory();
         var buildInfoDirectory = ts.getDirectoryPath(ts.getNormalizedAbsolutePath(ts.getTsBuildInfoEmitOutputFilePath(state.compilerOptions), currentDirectory));
-        var fileInfos = {};
-        state.fileInfos.forEach(function (value, key) {
+        var fileNames = [];
+        var fileNameToFileId = new ts.Map();
+        var fileIdsList;
+        var fileNamesToFileIdListId;
+        var fileInfos = ts.arrayFrom(state.fileInfos.entries(), function (_a) {
+            var key = _a[0], value = _a[1];
+            // Ensure fileId
+            var fileId = toFileId(key);
+            ts.Debug.assert(fileNames[fileId - 1] === relativeToBuildInfo(key));
             var signature = state.currentAffectedFilesSignatures && state.currentAffectedFilesSignatures.get(key);
-            fileInfos[relativeToBuildInfo(key)] = signature === undefined ? value : { version: value.version, signature: signature, affectsGlobalScope: value.affectsGlobalScope };
+            var actualSignature = signature !== null && signature !== void 0 ? signature : value.signature;
+            return value.version === actualSignature ?
+                value.affectsGlobalScope ?
+                    { version: value.version, signature: undefined, affectsGlobalScope: true } :
+                    value.version :
+                actualSignature !== undefined ?
+                    signature === undefined ?
+                        value :
+                        { version: value.version, signature: signature, affectsGlobalScope: value.affectsGlobalScope } :
+                    { version: value.version, signature: false, affectsGlobalScope: value.affectsGlobalScope };
         });
-        var result = {
-            fileInfos: fileInfos,
-            options: convertToReusableCompilerOptions(state.compilerOptions, relativeToBuildInfoEnsuringAbsolutePath)
-        };
+        var referencedMap;
         if (state.referencedMap) {
-            var referencedMap = {};
-            for (var _i = 0, _a = ts.arrayFrom(state.referencedMap.keys()).sort(ts.compareStringsCaseSensitive); _i < _a.length; _i++) {
-                var key = _a[_i];
-                referencedMap[relativeToBuildInfo(key)] = ts.arrayFrom(state.referencedMap.get(key).keys(), relativeToBuildInfo).sort(ts.compareStringsCaseSensitive);
-            }
-            result.referencedMap = referencedMap;
+            referencedMap = ts.arrayFrom(state.referencedMap.keys()).sort(ts.compareStringsCaseSensitive).map(function (key) { return [
+                toFileId(key),
+                toFileIdListId(state.referencedMap.get(key))
+            ]; });
         }
+        var exportedModulesMap;
         if (state.exportedModulesMap) {
-            var exportedModulesMap = {};
-            for (var _b = 0, _c = ts.arrayFrom(state.exportedModulesMap.keys()).sort(ts.compareStringsCaseSensitive); _b < _c.length; _b++) {
-                var key = _c[_b];
+            exportedModulesMap = ts.mapDefined(ts.arrayFrom(state.exportedModulesMap.keys()).sort(ts.compareStringsCaseSensitive), function (key) {
                 var newValue = state.currentAffectedFilesExportedModulesMap && state.currentAffectedFilesExportedModulesMap.get(key);
                 // Not in temporary cache, use existing value
                 if (newValue === undefined)
-                    exportedModulesMap[relativeToBuildInfo(key)] = ts.arrayFrom(state.exportedModulesMap.get(key).keys(), relativeToBuildInfo).sort(ts.compareStringsCaseSensitive);
+                    return [toFileId(key), toFileIdListId(state.exportedModulesMap.get(key))];
                 // Value in cache and has updated value map, use that
                 else if (newValue)
-                    exportedModulesMap[relativeToBuildInfo(key)] = ts.arrayFrom(newValue.keys(), relativeToBuildInfo).sort(ts.compareStringsCaseSensitive);
-            }
-            result.exportedModulesMap = exportedModulesMap;
+                    return [toFileId(key), toFileIdListId(newValue)];
+            });
         }
+        var semanticDiagnosticsPerFile;
         if (state.semanticDiagnosticsPerFile) {
-            var semanticDiagnosticsPerFile = [];
-            for (var _d = 0, _e = ts.arrayFrom(state.semanticDiagnosticsPerFile.keys()).sort(ts.compareStringsCaseSensitive); _d < _e.length; _d++) {
-                var key = _e[_d];
+            for (var _i = 0, _a = ts.arrayFrom(state.semanticDiagnosticsPerFile.keys()).sort(ts.compareStringsCaseSensitive); _i < _a.length; _i++) {
+                var key = _a[_i];
                 var value = state.semanticDiagnosticsPerFile.get(key);
-                semanticDiagnosticsPerFile.push(value.length ?
+                (semanticDiagnosticsPerFile || (semanticDiagnosticsPerFile = [])).push(value.length ?
                     [
-                        relativeToBuildInfo(key),
+                        toFileId(key),
                         state.hasReusableDiagnostic ?
                             value :
                             convertToReusableDiagnostics(value, relativeToBuildInfo)
                     ] :
-                    relativeToBuildInfo(key));
+                    toFileId(key));
             }
-            result.semanticDiagnosticsPerFile = semanticDiagnosticsPerFile;
         }
+        var affectedFilesPendingEmit;
         if (state.affectedFilesPendingEmit) {
-            var affectedFilesPendingEmit = [];
             var seenFiles = new ts.Set();
-            for (var _f = 0, _g = state.affectedFilesPendingEmit.slice(state.affectedFilesPendingEmitIndex).sort(ts.compareStringsCaseSensitive); _f < _g.length; _f++) {
-                var path = _g[_f];
+            for (var _b = 0, _c = state.affectedFilesPendingEmit.slice(state.affectedFilesPendingEmitIndex).sort(ts.compareStringsCaseSensitive); _b < _c.length; _b++) {
+                var path = _c[_b];
                 if (ts.tryAddToSet(seenFiles, path)) {
-                    affectedFilesPendingEmit.push([relativeToBuildInfo(path), state.affectedFilesPendingEmitKind.get(path)]);
+                    (affectedFilesPendingEmit || (affectedFilesPendingEmit = [])).push([toFileId(path), state.affectedFilesPendingEmitKind.get(path)]);
                 }
             }
-            result.affectedFilesPendingEmit = affectedFilesPendingEmit;
         }
-        return result;
+        return {
+            fileNames: fileNames,
+            fileInfos: fileInfos,
+            options: convertToProgramBuildInfoCompilerOptions(state.compilerOptions, relativeToBuildInfoEnsuringAbsolutePath),
+            fileIdsList: fileIdsList,
+            referencedMap: referencedMap,
+            exportedModulesMap: exportedModulesMap,
+            semanticDiagnosticsPerFile: semanticDiagnosticsPerFile,
+            affectedFilesPendingEmit: affectedFilesPendingEmit,
+        };
         function relativeToBuildInfoEnsuringAbsolutePath(path) {
             return relativeToBuildInfo(ts.getNormalizedAbsolutePath(path, currentDirectory));
         }
         function relativeToBuildInfo(path) {
             return ts.ensurePathIsNonModuleName(ts.getRelativePathFromDirectory(buildInfoDirectory, path, getCanonicalFileName));
         }
+        function toFileId(path) {
+            var fileId = fileNameToFileId.get(path);
+            if (fileId === undefined) {
+                fileNames.push(relativeToBuildInfo(path));
+                fileNameToFileId.set(path, fileId = fileNames.length);
+            }
+            return fileId;
+        }
+        function toFileIdListId(set) {
+            var fileIds = ts.arrayFrom(set.keys(), toFileId).sort(ts.compareValues);
+            var key = fileIds.join();
+            var fileIdListId = fileNamesToFileIdListId === null || fileNamesToFileIdListId === void 0 ? void 0 : fileNamesToFileIdListId.get(key);
+            if (fileIdListId === undefined) {
+                (fileIdsList || (fileIdsList = [])).push(fileIds);
+                (fileNamesToFileIdListId || (fileNamesToFileIdListId = new ts.Map())).set(key, fileIdListId = fileIdsList.length);
+            }
+            return fileIdListId;
+        }
     }
-    function convertToReusableCompilerOptions(options, relativeToBuildInfo) {
-        var result = {};
+    function convertToProgramBuildInfoCompilerOptions(options, relativeToBuildInfo) {
+        var result;
         var optionsNameMap = ts.getOptionsNameMap().optionsNameMap;
-        for (var name in options) {
-            if (ts.hasProperty(options, name)) {
-                result[name] = convertToReusableCompilerOptionValue(optionsNameMap.get(name.toLowerCase()), options[name], relativeToBuildInfo);
+        for (var _i = 0, _a = ts.getOwnKeys(options).sort(ts.compareStringsCaseSensitive); _i < _a.length; _i++) {
+            var name = _a[_i];
+            var optionInfo = optionsNameMap.get(name.toLowerCase());
+            if ((optionInfo === null || optionInfo === void 0 ? void 0 : optionInfo.affectsEmit) || (optionInfo === null || optionInfo === void 0 ? void 0 : optionInfo.affectsSemanticDiagnostics) || name === "skipLibCheck" || name === "skipDefaultLibCheck") {
+                (result || (result = {}))[name] = convertToReusableCompilerOptionValue(optionInfo, options[name], relativeToBuildInfo);
             }
         }
-        if (result.configFilePath) {
-            result.configFilePath = relativeToBuildInfo(result.configFilePath);
-        }
         return result;
     }
     function convertToReusableCompilerOptionValue(option, value, relativeToBuildInfo) {
@@ -110418,7 +113412,7 @@ var ts;
          * Computing hash to for signature verification
          */
         var computeHash = ts.maybeBind(host, host.createHash);
-        var state = createBuilderProgramState(newProgram, getCanonicalFileName, oldState);
+        var state = createBuilderProgramState(newProgram, getCanonicalFileName, oldState, host.disableUseFileVersionAsSignature);
         var backupState;
         newProgram.getProgramBuildInfo = function () { return getProgramBuildInfo(state, getCanonicalFileName); };
         // To ensure that we arent storing any references to old program or new program without state
@@ -110642,37 +113636,31 @@ var ts;
             state.affectedFilesPendingEmitIndex = 0;
         }
     }
-    function getMapOfReferencedSet(mapLike, toPath) {
-        if (!mapLike)
-            return undefined;
-        var map = new ts.Map();
-        // Copies keys/values from template. Note that for..in will not throw if
-        // template is undefined, and instead will just exit the loop.
-        for (var key in mapLike) {
-            if (ts.hasProperty(mapLike, key)) {
-                map.set(toPath(key), new ts.Set(mapLike[key].map(toPath)));
-            }
-        }
-        return map;
+    function toBuilderStateFileInfo(fileInfo) {
+        return ts.isString(fileInfo) ?
+            { version: fileInfo, signature: fileInfo, affectsGlobalScope: undefined } :
+            ts.isString(fileInfo.signature) ?
+                fileInfo :
+                { version: fileInfo.version, signature: fileInfo.signature === false ? undefined : fileInfo.version, affectsGlobalScope: fileInfo.affectsGlobalScope };
     }
+    ts.toBuilderStateFileInfo = toBuilderStateFileInfo;
     function createBuildProgramUsingProgramBuildInfo(program, buildInfoPath, host) {
+        var _a;
         var buildInfoDirectory = ts.getDirectoryPath(ts.getNormalizedAbsolutePath(buildInfoPath, host.getCurrentDirectory()));
         var getCanonicalFileName = ts.createGetCanonicalFileName(host.useCaseSensitiveFileNames());
+        var filePaths = program.fileNames.map(toPath);
+        var filePathsSetList = (_a = program.fileIdsList) === null || _a === void 0 ? void 0 : _a.map(function (fileIds) { return new ts.Set(fileIds.map(toFilePath)); });
         var fileInfos = new ts.Map();
-        for (var key in program.fileInfos) {
-            if (ts.hasProperty(program.fileInfos, key)) {
-                fileInfos.set(toPath(key), program.fileInfos[key]);
-            }
-        }
+        program.fileInfos.forEach(function (fileInfo, index) { return fileInfos.set(toFilePath(index + 1), toBuilderStateFileInfo(fileInfo)); });
         var state = {
             fileInfos: fileInfos,
-            compilerOptions: ts.convertToOptionsWithAbsolutePaths(program.options, toAbsolutePath),
-            referencedMap: getMapOfReferencedSet(program.referencedMap, toPath),
-            exportedModulesMap: getMapOfReferencedSet(program.exportedModulesMap, toPath),
-            semanticDiagnosticsPerFile: program.semanticDiagnosticsPerFile && ts.arrayToMap(program.semanticDiagnosticsPerFile, function (value) { return toPath(ts.isString(value) ? value : value[0]); }, function (value) { return ts.isString(value) ? ts.emptyArray : value[1]; }),
+            compilerOptions: program.options ? ts.convertToOptionsWithAbsolutePaths(program.options, toAbsolutePath) : {},
+            referencedMap: toMapOfReferencedSet(program.referencedMap),
+            exportedModulesMap: toMapOfReferencedSet(program.exportedModulesMap),
+            semanticDiagnosticsPerFile: program.semanticDiagnosticsPerFile && ts.arrayToMap(program.semanticDiagnosticsPerFile, function (value) { return toFilePath(ts.isNumber(value) ? value : value[0]); }, function (value) { return ts.isNumber(value) ? ts.emptyArray : value[1]; }),
             hasReusableDiagnostic: true,
-            affectedFilesPendingEmit: ts.map(program.affectedFilesPendingEmit, function (value) { return toPath(value[0]); }),
-            affectedFilesPendingEmitKind: program.affectedFilesPendingEmit && ts.arrayToMap(program.affectedFilesPendingEmit, function (value) { return toPath(value[0]); }, function (value) { return value[1]; }),
+            affectedFilesPendingEmit: ts.map(program.affectedFilesPendingEmit, function (value) { return toFilePath(value[0]); }),
+            affectedFilesPendingEmitKind: program.affectedFilesPendingEmit && ts.arrayToMap(program.affectedFilesPendingEmit, function (value) { return toFilePath(value[0]); }, function (value) { return value[1]; }),
             affectedFilesPendingEmitIndex: program.affectedFilesPendingEmit && 0,
         };
         return {
@@ -110705,6 +113693,15 @@ var ts;
         function toAbsolutePath(path) {
             return ts.getNormalizedAbsolutePath(path, buildInfoDirectory);
         }
+        function toFilePath(fileId) {
+            return filePaths[fileId - 1];
+        }
+        function toFilePathsSet(fileIdsListId) {
+            return filePathsSetList[fileIdsListId - 1];
+        }
+        function toMapOfReferencedSet(referenceMap) {
+            return referenceMap && ts.arrayToMap(referenceMap, function (value) { return toFilePath(value[0]); }, function (value) { return toFilePathsSet(value[1]); });
+        }
     }
     ts.createBuildProgramUsingProgramBuildInfo = createBuildProgramUsingProgramBuildInfo;
     function createRedirectedBuilderProgram(state, configFileParsingDiagnostics) {
@@ -110817,9 +113814,9 @@ var ts;
         var resolutionsWithFailedLookups = [];
         var resolvedFileToResolution = ts.createMultiMap();
         var hasChangedAutomaticTypeDirectiveNames = false;
-        var failedLookupChecks = [];
-        var startsWithPathChecks = [];
-        var isInDirectoryChecks = [];
+        var failedLookupChecks;
+        var startsWithPathChecks;
+        var isInDirectoryChecks;
         var getCurrentDirectory = ts.memoize(function () { return resolutionHost.getCurrentDirectory(); }); // TODO: GH#18217
         var cachedDirectoryStructureHost = resolutionHost.getCachedDirectoryStructureHost();
         // The resolvedModuleNames and resolvedTypeReferenceDirectives are the cache of resolutions per file.
@@ -110828,9 +113825,12 @@ var ts;
         var resolvedModuleNames = new ts.Map();
         var perDirectoryResolvedModuleNames = ts.createCacheWithRedirects();
         var nonRelativeModuleNameCache = ts.createCacheWithRedirects();
-        var moduleResolutionCache = ts.createModuleResolutionCacheWithMaps(perDirectoryResolvedModuleNames, nonRelativeModuleNameCache, getCurrentDirectory(), resolutionHost.getCanonicalFileName);
+        var moduleResolutionCache = ts.createModuleResolutionCache(getCurrentDirectory(), resolutionHost.getCanonicalFileName, 
+        /*options*/ undefined, perDirectoryResolvedModuleNames, nonRelativeModuleNameCache);
         var resolvedTypeReferenceDirectives = new ts.Map();
         var perDirectoryResolvedTypeReferenceDirectives = ts.createCacheWithRedirects();
+        var typeReferenceDirectiveResolutionCache = ts.createTypeReferenceDirectiveResolutionCache(getCurrentDirectory(), resolutionHost.getCanonicalFileName, 
+        /*options*/ undefined, moduleResolutionCache.getPackageJsonInfoCache(), perDirectoryResolvedTypeReferenceDirectives);
         /**
          * These are the extensions that failed lookup files will have by default,
          * any other extension of failed lookup will be store that path in custom failed lookup path
@@ -110888,9 +113888,9 @@ var ts;
             resolvedTypeReferenceDirectives.clear();
             resolvedFileToResolution.clear();
             resolutionsWithFailedLookups.length = 0;
-            failedLookupChecks.length = 0;
-            startsWithPathChecks.length = 0;
-            isInDirectoryChecks.length = 0;
+            failedLookupChecks = undefined;
+            startsWithPathChecks = undefined;
+            isInDirectoryChecks = undefined;
             // perDirectoryResolvedModuleNames and perDirectoryResolvedTypeReferenceDirectives could be non empty if there was exception during program update
             // (between startCachingPerDirectoryResolution and finishCachingPerDirectoryResolution)
             clearPerDirectoryResolutions();
@@ -110926,9 +113926,8 @@ var ts;
                 isFileWithInvalidatedNonRelativeUnresolvedImports(path); };
         }
         function clearPerDirectoryResolutions() {
-            perDirectoryResolvedModuleNames.clear();
-            nonRelativeModuleNameCache.clear();
-            perDirectoryResolvedTypeReferenceDirectives.clear();
+            moduleResolutionCache.clear();
+            typeReferenceDirectiveResolutionCache.clear();
             nonRelativeExternalModuleResolutions.forEach(watchFailedLookupLocationOfNonRelativeModuleResolutions);
             nonRelativeExternalModuleResolutions.clear();
         }
@@ -110955,7 +113954,7 @@ var ts;
             if (globalCache !== undefined && !ts.isExternalModuleNameRelative(moduleName) && !(primaryResult.resolvedModule && ts.extensionIsTS(primaryResult.resolvedModule.extension))) {
                 // create different collection of failed lookup locations for second pass
                 // if it will fail and we've already found something during the first pass - we don't want to pollute its results
-                var _b = ts.loadModuleFromGlobalCache(ts.Debug.checkDefined(resolutionHost.globalCacheResolutionModuleName)(moduleName), resolutionHost.projectName, compilerOptions, host, globalCache), resolvedModule = _b.resolvedModule, failedLookupLocations = _b.failedLookupLocations;
+                var _b = ts.loadModuleFromGlobalCache(ts.Debug.checkDefined(resolutionHost.globalCacheResolutionModuleName)(moduleName), resolutionHost.projectName, compilerOptions, host, globalCache, moduleResolutionCache), resolvedModule = _b.resolvedModule, failedLookupLocations = _b.failedLookupLocations;
                 if (resolvedModule) {
                     // Modify existing resolution so its saved in the directory cache as well
                     primaryResult.resolvedModule = resolvedModule;
@@ -110966,6 +113965,9 @@ var ts;
             // Default return the result from the first pass
             return primaryResult;
         }
+        function resolveTypeReferenceDirective(typeReferenceDirectiveName, containingFile, options, host, redirectedReference) {
+            return ts.resolveTypeReferenceDirective(typeReferenceDirectiveName, containingFile, options, host, redirectedReference, typeReferenceDirectiveResolutionCache);
+        }
         function resolveNamesWithLocalCache(_a) {
             var _b;
             var names = _a.names, containingFile = _a.containingFile, redirectedReference = _a.redirectedReference, cache = _a.cache, perDirectoryCacheWithRedirects = _a.perDirectoryCacheWithRedirects, loader = _a.loader, getResolutionWithResolvedFileName = _a.getResolutionWithResolvedFileName, shouldRetryResolution = _a.shouldRetryResolution, reusedNames = _a.reusedNames, logChanges = _a.logChanges;
@@ -111053,7 +114055,7 @@ var ts;
                 redirectedReference: redirectedReference,
                 cache: resolvedTypeReferenceDirectives,
                 perDirectoryCacheWithRedirects: perDirectoryResolvedTypeReferenceDirectives,
-                loader: ts.resolveTypeReferenceDirective,
+                loader: resolveTypeReferenceDirective,
                 getResolutionWithResolvedFileName: getResolvedTypeReferenceDirective,
                 shouldRetryResolution: function (resolution) { return resolution.resolvedTypeReferenceDirective === undefined; },
             });
@@ -111328,7 +114330,7 @@ var ts;
             if (isCreatingWatchedDirectory) {
                 // Watching directory is created
                 // Invalidate any resolution has failed lookup in this directory
-                isInDirectoryChecks.push(fileOrDirectoryPath);
+                (isInDirectoryChecks || (isInDirectoryChecks = [])).push(fileOrDirectoryPath);
             }
             else {
                 // If something to do with folder/file starting with "." in node_modules folder, skip it
@@ -111346,8 +114348,8 @@ var ts;
                 if (isNodeModulesAtTypesDirectory(fileOrDirectoryPath) || ts.isNodeModulesDirectory(fileOrDirectoryPath) ||
                     isNodeModulesAtTypesDirectory(dirOfFileOrDirectory) || ts.isNodeModulesDirectory(dirOfFileOrDirectory)) {
                     // Invalidate any resolution from this directory
-                    failedLookupChecks.push(fileOrDirectoryPath);
-                    startsWithPathChecks.push(fileOrDirectoryPath);
+                    (failedLookupChecks || (failedLookupChecks = [])).push(fileOrDirectoryPath);
+                    (startsWithPathChecks || (startsWithPathChecks = new ts.Set())).add(fileOrDirectoryPath);
                 }
                 else {
                     if (!isPathWithDefaultFailedLookupExtension(fileOrDirectoryPath) && !customFailedLookupPaths.has(fileOrDirectoryPath)) {
@@ -111358,27 +114360,33 @@ var ts;
                         return false;
                     }
                     // Resolution need to be invalidated if failed lookup location is same as the file or directory getting created
-                    failedLookupChecks.push(fileOrDirectoryPath);
+                    (failedLookupChecks || (failedLookupChecks = [])).push(fileOrDirectoryPath);
+                    // If the invalidated file is from a node_modules package, invalidate everything else
+                    // in the package since we might not get notifications for other files in the package.
+                    // This hardens our logic against unreliable file watchers.
+                    var packagePath = ts.parseNodeModuleFromPath(fileOrDirectoryPath);
+                    if (packagePath)
+                        (startsWithPathChecks || (startsWithPathChecks = new ts.Set())).add(packagePath);
                 }
             }
             resolutionHost.scheduleInvalidateResolutionsOfFailedLookupLocations();
         }
         function invalidateResolutionsOfFailedLookupLocations() {
-            if (!failedLookupChecks.length && !startsWithPathChecks.length && !isInDirectoryChecks.length) {
+            if (!failedLookupChecks && !startsWithPathChecks && !isInDirectoryChecks) {
                 return false;
             }
             var invalidated = invalidateResolutions(resolutionsWithFailedLookups, canInvalidateFailedLookupResolution);
-            failedLookupChecks.length = 0;
-            startsWithPathChecks.length = 0;
-            isInDirectoryChecks.length = 0;
+            failedLookupChecks = undefined;
+            startsWithPathChecks = undefined;
+            isInDirectoryChecks = undefined;
             return invalidated;
         }
         function canInvalidateFailedLookupResolution(resolution) {
             return resolution.failedLookupLocations.some(function (location) {
                 var locationPath = resolutionHost.toPath(location);
                 return ts.contains(failedLookupChecks, locationPath) ||
-                    startsWithPathChecks.some(function (fileOrDirectoryPath) { return ts.startsWith(locationPath, fileOrDirectoryPath); }) ||
-                    isInDirectoryChecks.some(function (fileOrDirectoryPath) { return isInDirectoryPath(fileOrDirectoryPath, locationPath); });
+                    ts.firstDefinedIterator((startsWithPathChecks === null || startsWithPathChecks === void 0 ? void 0 : startsWithPathChecks.keys()) || ts.emptyIterator, function (fileOrDirectoryPath) { return ts.startsWith(locationPath, fileOrDirectoryPath) ? true : undefined; }) ||
+                    (isInDirectoryChecks === null || isInDirectoryChecks === void 0 ? void 0 : isInDirectoryChecks.some(function (fileOrDirectoryPath) { return isInDirectoryPath(fileOrDirectoryPath, locationPath); }));
             });
         }
         function closeTypeRootsWatch() {
@@ -111529,6 +114537,9 @@ var ts;
                 return [ambient];
             var info = getInfo(importingSourceFile.path, host);
             var moduleSourceFile = ts.getSourceFileOfNode(moduleSymbol.valueDeclaration || ts.getNonAugmentationDeclaration(moduleSymbol));
+            if (!moduleSourceFile) {
+                return [];
+            }
             var modulePaths = getAllModulePaths(importingSourceFile.path, moduleSourceFile.originalFileName, host);
             var preferences = getPreferences(userPreferences, compilerOptions, importingSourceFile);
             var existingSpecifier = ts.forEach(modulePaths, function (modulePath) { return ts.forEach(host.getFileIncludeReasons().get(ts.toPath(modulePath.path, host.getCurrentDirectory(), info.getCanonicalFileName)), function (reason) {
@@ -111599,7 +114610,7 @@ var ts;
             if (!baseUrl && !paths || relativePreference === 0 /* Relative */) {
                 return relativePath;
             }
-            var baseDirectory = ts.getPathsBasePath(compilerOptions, host) || baseUrl;
+            var baseDirectory = ts.getNormalizedAbsolutePath(ts.getPathsBasePath(compilerOptions, host) || baseUrl, host.getCurrentDirectory());
             var relativeToBaseUrl = getRelativePathIfInDirectory(moduleFileName, baseDirectory, getCanonicalFileName);
             if (!relativeToBaseUrl) {
                 return relativePath;
@@ -111614,7 +114625,9 @@ var ts;
                 return nonRelative;
             }
             if (relativePreference === 3 /* ExternalNonRelative */) {
-                var projectDirectory = host.getCurrentDirectory();
+                var projectDirectory = compilerOptions.configFilePath ?
+                    ts.toPath(ts.getDirectoryPath(compilerOptions.configFilePath), host.getCurrentDirectory(), info.getCanonicalFileName) :
+                    info.getCanonicalFileName(host.getCurrentDirectory());
                 var modulePath = ts.toPath(moduleFileName, projectDirectory, getCanonicalFileName);
                 var sourceIsInternal = ts.startsWith(sourceDirectory, projectDirectory);
                 var targetIsInternal = ts.startsWith(modulePath, projectDirectory);
@@ -111689,9 +114702,9 @@ var ts;
             if (!preferSymlinks) {
                 // Symlinks inside ignored paths are already filtered out of the symlink cache,
                 // so we only need to remove them from the realpath filenames.
-                var result_15 = ts.forEach(targets, function (p) { return !(shouldFilterIgnoredPaths && ts.containsIgnoredPath(p)) && cb(p, referenceRedirect === p); });
-                if (result_15)
-                    return result_15;
+                var result_16 = ts.forEach(targets, function (p) { return !(shouldFilterIgnoredPaths && ts.containsIgnoredPath(p)) && cb(p, referenceRedirect === p); });
+                if (result_16)
+                    return result_16;
             }
             var links = host.getSymlinkCache
                 ? host.getSymlinkCache()
@@ -111714,10 +114727,10 @@ var ts;
                     for (var _i = 0, symlinkDirectories_1 = symlinkDirectories; _i < symlinkDirectories_1.length; _i++) {
                         var symlinkDirectory = symlinkDirectories_1[_i];
                         var option = ts.resolvePath(symlinkDirectory, relative);
-                        var result_16 = cb(option, target === referenceRedirect);
+                        var result_17 = cb(option, target === referenceRedirect);
                         shouldFilterIgnoredPaths = true; // We found a non-ignored path in symlinks, so we can reject ignored-path realpaths
-                        if (result_16)
-                            return result_16;
+                        if (result_17)
+                            return result_17;
                     }
                 });
             });
@@ -111731,8 +114744,14 @@ var ts;
          * Symlinks will be returned first so they are preferred over the real path.
          */
         function getAllModulePaths(importingFileName, importedFileName, host) {
-            var cwd = host.getCurrentDirectory();
+            var _a;
+            var cache = (_a = host.getModuleSpecifierCache) === null || _a === void 0 ? void 0 : _a.call(host);
             var getCanonicalFileName = ts.hostGetCanonicalFileName(host);
+            if (cache) {
+                var cached = cache.get(importingFileName, ts.toPath(importedFileName, host.getCurrentDirectory(), getCanonicalFileName));
+                if (typeof cached === "object")
+                    return cached;
+            }
             var allFileNames = new ts.Map();
             var importedFileFromNodeModules = false;
             forEachFileNameOfModule(importingFileName, importedFileName, host, 
@@ -111744,7 +114763,7 @@ var ts;
             });
             // Sort by paths closest to importing file Name directory
             var sortedPaths = [];
-            var _loop_24 = function (directory) {
+            var _loop_26 = function (directory) {
                 var directoryStart = ts.ensureTrailingDirectorySeparator(directory);
                 var pathsInDirectory;
                 allFileNames.forEach(function (_a, fileName) {
@@ -111767,10 +114786,10 @@ var ts;
                 out_directory_1 = directory;
             };
             var out_directory_1;
-            for (var directory = ts.getDirectoryPath(ts.toPath(importingFileName, cwd, getCanonicalFileName)); allFileNames.size !== 0;) {
-                var state_8 = _loop_24(directory);
+            for (var directory = ts.getDirectoryPath(importingFileName); allFileNames.size !== 0;) {
+                var state_9 = _loop_26(directory);
                 directory = out_directory_1;
-                if (state_8 === "break")
+                if (state_9 === "break")
                     break;
             }
             if (allFileNames.size) {
@@ -111779,10 +114798,14 @@ var ts;
                     remainingPaths.sort(comparePathsByRedirectAndNumberOfDirectorySeparators);
                 sortedPaths.push.apply(sortedPaths, remainingPaths);
             }
+            if (cache) {
+                cache.set(importingFileName, ts.toPath(importedFileName, host.getCurrentDirectory(), getCanonicalFileName), sortedPaths);
+            }
             return sortedPaths;
         }
         function tryGetModuleNameFromAmbientModule(moduleSymbol, checker) {
-            var decl = ts.find(moduleSymbol.declarations, function (d) { return ts.isNonGlobalAmbientModule(d) && (!ts.isExternalModuleAugmentation(d) || !ts.isExternalModuleNameRelative(ts.getTextOfIdentifierOrLiteral(d.name))); });
+            var _a;
+            var decl = (_a = moduleSymbol.declarations) === null || _a === void 0 ? void 0 : _a.find(function (d) { return ts.isNonGlobalAmbientModule(d) && (!ts.isExternalModuleAugmentation(d) || !ts.isExternalModuleNameRelative(ts.getTextOfIdentifierOrLiteral(d.name))); });
             if (decl) {
                 return decl.name.text;
             }
@@ -111838,7 +114861,7 @@ var ts;
                             ts.startsWith(relativeToBaseUrl, prefix) &&
                             ts.endsWith(relativeToBaseUrl, suffix) ||
                             !suffix && relativeToBaseUrl === ts.removeTrailingDirectorySeparator(prefix)) {
-                            var matchedStar = relativeToBaseUrl.substr(prefix.length, relativeToBaseUrl.length - suffix.length);
+                            var matchedStar = relativeToBaseUrl.substr(prefix.length, relativeToBaseUrl.length - suffix.length - prefix.length);
                             return key.replace("*", matchedStar);
                         }
                     }
@@ -112142,10 +115165,10 @@ var ts;
     }
     ts.createWatchStatusReporter = createWatchStatusReporter;
     /** Parses config file using System interface */
-    function parseConfigFileWithSystem(configFileName, optionsToExtend, watchOptionsToExtend, system, reportDiagnostic) {
+    function parseConfigFileWithSystem(configFileName, optionsToExtend, extendedConfigCache, watchOptionsToExtend, system, reportDiagnostic) {
         var host = system;
         host.onUnRecoverableConfigFileDiagnostic = function (diagnostic) { return reportUnrecoverableDiagnostic(system, reportDiagnostic, diagnostic); };
-        var result = ts.getParsedCommandLineOfConfigFile(configFileName, optionsToExtend, host, /*extendedConfigCache*/ undefined, watchOptionsToExtend);
+        var result = ts.getParsedCommandLineOfConfigFile(configFileName, optionsToExtend, host, extendedConfigCache, watchOptionsToExtend);
         host.onUnRecoverableConfigFileDiagnostic = undefined; // TODO: GH#18217
         return result;
     }
@@ -112413,7 +115436,10 @@ var ts;
         MissingFile: "Missing file",
         WildcardDirectory: "Wild card directory",
         FailedLookupLocations: "Failed Lookup Locations",
-        TypeRoots: "Type roots"
+        TypeRoots: "Type roots",
+        ConfigFileOfReferencedProject: "Config file of referened project",
+        ExtendedConfigOfReferencedProject: "Extended config file of referenced project",
+        WildcardDirectoryOfReferencedProject: "Wild card directory of referenced project",
     };
     function createWatchFactory(host, options) {
         var watchLogLevel = host.trace ? options.extendedDiagnostics ? ts.WatchLogLevel.Verbose : options.diagnostics ? ts.WatchLogLevel.TriggerOnly : ts.WatchLogLevel.None : ts.WatchLogLevel.None;
@@ -112460,6 +115486,7 @@ var ts;
             getEnvironmentVariable: ts.maybeBind(host, host.getEnvironmentVariable) || (function () { return ""; }),
             createHash: ts.maybeBind(host, host.createHash),
             readDirectory: ts.maybeBind(host, host.readDirectory),
+            disableUseFileVersionAsSignature: host.disableUseFileVersionAsSignature,
         };
         function writeFile(fileName, text, writeByteOrderMark, onError) {
             try {
@@ -112517,7 +115544,8 @@ var ts;
             createDirectory: function (path) { return system.createDirectory(path); },
             writeFile: function (path, data, writeByteOrderMark) { return system.writeFile(path, data, writeByteOrderMark); },
             createHash: ts.maybeBind(system, system.createHash),
-            createProgram: createProgram || ts.createEmitAndSemanticDiagnosticsBuilderProgram
+            createProgram: createProgram || ts.createEmitAndSemanticDiagnosticsBuilderProgram,
+            disableUseFileVersionAsSignature: system.disableUseFileVersionAsSignature,
         };
     }
     ts.createProgramHost = createProgramHost;
@@ -112605,6 +115633,7 @@ var ts;
         if (system === void 0) { system = ts.sys; }
         var host = ts.createCompilerHostWorker(options, /*setParentNodes*/ undefined, system);
         host.createHash = ts.maybeBind(system, system.createHash);
+        host.disableUseFileVersionAsSignature = system.disableUseFileVersionAsSignature;
         ts.setGetSourceFileAsHashVersioned(host, system);
         ts.changeCompilerHostLikeToUseCache(host, function (fileName) { return ts.toPath(fileName, host.getCurrentDirectory(), host.getCanonicalFileName); });
         return host;
@@ -112648,11 +115677,13 @@ var ts;
     function createWatchProgram(host) {
         var builderProgram;
         var reloadLevel; // level to indicate if the program needs to be reloaded from config file/just filenames etc
-        var extendedConfigFilesMap; // Map of file watchers for the extended config files
         var missingFilesMap; // Map of file watchers for the missing files
         var watchedWildcardDirectories; // map of watchers for the wild card directories in the config file
         var timerToUpdateProgram; // timer callback to recompile the program
         var timerToInvalidateFailedLookupResolutions; // timer callback to invalidate resolutions for changes in failed lookup locations
+        var parsedConfigs; // Parsed commandline and watching cached for referenced projects
+        var sharedExtendedConfigFileWatchers; // Map of file watchers for extended files, shared between different referenced projects
+        var extendedConfigCache = host.extendedConfigCache; // Cache for extended config evaluation
         var sourceFilesCache = new ts.Map(); // Cache that stores the source file and version info
         var missingFilePathsRequestedForRelease; // These paths are held temporarily so that we can remove the entry from source file cache if the file is not tracked by missing files
         var hasChangedCompilerOptions = false; // True if the compiler options have changed between compilations
@@ -112702,6 +115733,7 @@ var ts;
         compilerHost.getNewLine = function () { return newLine; };
         compilerHost.fileExists = fileExists;
         compilerHost.onReleaseOldSourceFile = onReleaseOldSourceFile;
+        compilerHost.onReleaseParsedCommandLine = onReleaseParsedCommandLine;
         // Members for ResolutionCacheHost
         compilerHost.toPath = toPath;
         compilerHost.getCompilationSettings = function () { return compilerOptions; };
@@ -112715,6 +115747,7 @@ var ts;
         compilerHost.fileIsOpen = ts.returnFalse;
         compilerHost.getCurrentProgram = getCurrentProgram;
         compilerHost.writeLog = writeLog;
+        compilerHost.getParsedCommandLine = getParsedCommandLine;
         // Cache for the module resolution
         var resolutionCache = ts.createResolutionCache(compilerHost, configFileName ?
             ts.getDirectoryPath(ts.getNormalizedAbsolutePath(configFileName, currentDirectory)) :
@@ -112745,7 +115778,8 @@ var ts;
         // Update the wild card directory watch
         watchConfigFileWildCardDirectories();
         // Update extended config file watch
-        watchExtendedConfigFiles();
+        if (configFileName)
+            updateExtendedConfigFilesWatches(toPath(configFileName), compilerOptions, watchOptions, ts.WatchType.ExtendedConfigFile);
         return configFileName ?
             { getCurrentProgram: getCurrentBuilderProgram, getProgram: updateProgram, close: close } :
             { getCurrentProgram: getCurrentBuilderProgram, getProgram: updateProgram, updateRootFileNames: updateRootFileNames, close: close };
@@ -112762,9 +115796,11 @@ var ts;
                 configFileWatcher.close();
                 configFileWatcher = undefined;
             }
-            if (extendedConfigFilesMap) {
-                ts.clearMap(extendedConfigFilesMap, ts.closeFileWatcher);
-                extendedConfigFilesMap = undefined;
+            extendedConfigCache === null || extendedConfigCache === void 0 ? void 0 : extendedConfigCache.clear();
+            extendedConfigCache = undefined;
+            if (sharedExtendedConfigFileWatchers) {
+                ts.clearMap(sharedExtendedConfigFileWatchers, ts.closeFileWatcherOf);
+                sharedExtendedConfigFileWatchers = undefined;
             }
             if (watchedWildcardDirectories) {
                 ts.clearMap(watchedWildcardDirectories, ts.closeFileWatcherOf);
@@ -112774,6 +115810,17 @@ var ts;
                 ts.clearMap(missingFilesMap, ts.closeFileWatcher);
                 missingFilesMap = undefined;
             }
+            if (parsedConfigs) {
+                ts.clearMap(parsedConfigs, function (config) {
+                    var _a;
+                    (_a = config.watcher) === null || _a === void 0 ? void 0 : _a.close();
+                    config.watcher = undefined;
+                    if (config.watchedDirectories)
+                        ts.clearMap(config.watchedDirectories, ts.closeFileWatcherOf);
+                    config.watchedDirectories = undefined;
+                });
+                parsedConfigs = undefined;
+            }
         }
         function getCurrentBuilderProgram() {
             return builderProgram;
@@ -112793,7 +115840,7 @@ var ts;
             }
             // All resolutions are invalid if user provided resolutions
             var hasInvalidatedResolution = resolutionCache.createHasInvalidatedResolution(userProvidedResolution);
-            if (ts.isProgramUptoDate(getCurrentProgram(), rootFileNames, compilerOptions, getSourceVersion, fileExists, hasInvalidatedResolution, hasChangedAutomaticTypeDirectiveNames, projectReferences)) {
+            if (ts.isProgramUptoDate(getCurrentProgram(), rootFileNames, compilerOptions, getSourceVersion, fileExists, hasInvalidatedResolution, hasChangedAutomaticTypeDirectiveNames, getParsedCommandLine, projectReferences)) {
                 if (hasChangedConfigFileParsingErrors) {
                     builderProgram = createProgram(/*rootNames*/ undefined, /*options*/ undefined, compilerHost, builderProgram, configFileParsingDiagnostics, projectReferences);
                     hasChangedConfigFileParsingErrors = false;
@@ -112812,6 +115859,8 @@ var ts;
             writeLog("CreatingProgramWith::");
             writeLog("  roots: " + JSON.stringify(rootFileNames));
             writeLog("  options: " + JSON.stringify(compilerOptions));
+            if (projectReferences)
+                writeLog("  projectReferences: " + JSON.stringify(projectReferences));
             var needsUpdateInTypeRootWatch = hasChangedCompilerOptions || !getCurrentProgram();
             hasChangedCompilerOptions = false;
             hasChangedConfigFileParsingErrors = false;
@@ -113034,10 +116083,10 @@ var ts;
             // Update the wild card directory watch
             watchConfigFileWildCardDirectories();
             // Update extended config file watch
-            watchExtendedConfigFiles();
+            updateExtendedConfigFilesWatches(toPath(configFileName), compilerOptions, watchOptions, ts.WatchType.ExtendedConfigFile);
         }
         function parseConfigFile() {
-            setConfigFileParsingResult(ts.getParsedCommandLineOfConfigFile(configFileName, optionsToExtendForConfigFile, parseConfigFileHost, /*extendedConfigCache*/ undefined, watchOptionsToExtend, extraFileExtensions)); // TODO: GH#18217
+            setConfigFileParsingResult(ts.getParsedCommandLineOfConfigFile(configFileName, optionsToExtendForConfigFile, parseConfigFileHost, extendedConfigCache || (extendedConfigCache = new ts.Map()), watchOptionsToExtend, extraFileExtensions)); // TODO: GH#18217
         }
         function setConfigFileParsingResult(configFileParseResult) {
             rootFileNames = configFileParseResult.fileNames;
@@ -113049,6 +116098,56 @@ var ts;
             canConfigFileJsonReportNoInputFiles = ts.canJsonReportNoInputFiles(configFileParseResult.raw);
             hasChangedConfigFileParsingErrors = true;
         }
+        function getParsedCommandLine(configFileName) {
+            var configPath = toPath(configFileName);
+            var config = parsedConfigs === null || parsedConfigs === void 0 ? void 0 : parsedConfigs.get(configPath);
+            if (config) {
+                if (!config.reloadLevel)
+                    return config.parsedCommandLine;
+                // With host implementing getParsedCommandLine we cant just update file names
+                if (config.parsedCommandLine && config.reloadLevel === ts.ConfigFileProgramReloadLevel.Partial && !host.getParsedCommandLine) {
+                    writeLog("Reloading new file names and options");
+                    var fileNames = ts.getFileNamesFromConfigSpecs(config.parsedCommandLine.options.configFile.configFileSpecs, ts.getNormalizedAbsolutePath(ts.getDirectoryPath(configFileName), currentDirectory), compilerOptions, parseConfigFileHost);
+                    config.parsedCommandLine = __assign(__assign({}, config.parsedCommandLine), { fileNames: fileNames });
+                    config.reloadLevel = undefined;
+                    return config.parsedCommandLine;
+                }
+            }
+            writeLog("Loading config file: " + configFileName);
+            var parsedCommandLine = host.getParsedCommandLine ?
+                host.getParsedCommandLine(configFileName) :
+                getParsedCommandLineFromConfigFileHost(configFileName);
+            if (config) {
+                config.parsedCommandLine = parsedCommandLine;
+                config.reloadLevel = undefined;
+            }
+            else {
+                (parsedConfigs || (parsedConfigs = new ts.Map())).set(configPath, config = { parsedCommandLine: parsedCommandLine });
+            }
+            watchReferencedProject(configFileName, configPath, config);
+            return parsedCommandLine;
+        }
+        function getParsedCommandLineFromConfigFileHost(configFileName) {
+            // Ignore the file absent errors
+            var onUnRecoverableConfigFileDiagnostic = parseConfigFileHost.onUnRecoverableConfigFileDiagnostic;
+            parseConfigFileHost.onUnRecoverableConfigFileDiagnostic = ts.noop;
+            var parsedCommandLine = ts.getParsedCommandLineOfConfigFile(configFileName, 
+            /*optionsToExtend*/ undefined, parseConfigFileHost, extendedConfigCache || (extendedConfigCache = new ts.Map()), watchOptionsToExtend);
+            parseConfigFileHost.onUnRecoverableConfigFileDiagnostic = onUnRecoverableConfigFileDiagnostic;
+            return parsedCommandLine;
+        }
+        function onReleaseParsedCommandLine(fileName) {
+            var _a;
+            var path = toPath(fileName);
+            var config = parsedConfigs === null || parsedConfigs === void 0 ? void 0 : parsedConfigs.get(path);
+            if (!config)
+                return;
+            parsedConfigs.delete(path);
+            if (config.watchedDirectories)
+                ts.clearMap(config.watchedDirectories, ts.closeFileWatcherOf);
+            (_a = config.watcher) === null || _a === void 0 ? void 0 : _a.close();
+            ts.clearSharedExtendedConfigFileWatcher(path, sharedExtendedConfigFileWatchers);
+        }
         function watchFilePath(path, file, callback, pollingInterval, options, watchType) {
             return watchFile(file, function (fileName, eventKind) { return callback(fileName, eventKind, path); }, pollingInterval, options, watchType);
         }
@@ -113058,7 +116157,6 @@ var ts;
             if (eventKind === ts.FileWatcherEventKind.Deleted && sourceFilesCache.has(path)) {
                 resolutionCache.invalidateResolutionOfFile(path);
             }
-            resolutionCache.removeResolutionsFromProjectReferenceRedirects(path);
             nextSourceFileVersion(path);
             // Update the program
             scheduleProgramUpdate();
@@ -113069,7 +116167,10 @@ var ts;
             }
         }
         function watchMissingFilePath(missingFilePath) {
-            return watchFilePath(missingFilePath, missingFilePath, onMissingFileChange, ts.PollingInterval.Medium, watchOptions, ts.WatchType.MissingFile);
+            // If watching missing referenced config file, we are already watching it so no need for separate watcher
+            return (parsedConfigs === null || parsedConfigs === void 0 ? void 0 : parsedConfigs.has(missingFilePath)) ?
+                ts.noopFileWatcher :
+                watchFilePath(missingFilePath, missingFilePath, onMissingFileChange, ts.PollingInterval.Medium, watchOptions, ts.WatchType.MissingFile);
         }
         function onMissingFileChange(fileName, eventKind, missingFilePath) {
             updateCachedSystemWithFile(fileName, missingFilePath, eventKind);
@@ -113106,10 +116207,11 @@ var ts;
                     configFileName: configFileName,
                     extraFileExtensions: extraFileExtensions,
                     options: compilerOptions,
-                    program: getCurrentBuilderProgram(),
+                    program: getCurrentBuilderProgram() || rootFileNames,
                     currentDirectory: currentDirectory,
                     useCaseSensitiveFileNames: useCaseSensitiveFileNames,
-                    writeLog: writeLog
+                    writeLog: writeLog,
+                    toPath: toPath,
                 }))
                     return;
                 // Reload is pending, do the reload
@@ -113120,18 +116222,87 @@ var ts;
                 }
             }, flags, watchOptions, ts.WatchType.WildcardDirectory);
         }
-        function watchExtendedConfigFiles() {
-            var _a;
-            // Update the extended config files watcher
-            ts.mutateMap(extendedConfigFilesMap || (extendedConfigFilesMap = new ts.Map()), ts.arrayToMap(((_a = compilerOptions.configFile) === null || _a === void 0 ? void 0 : _a.extendedSourceFiles) || ts.emptyArray, toPath), {
-                // Watch the extended config files
-                createNewValue: watchExtendedConfigFile,
-                // Config files that are no longer extended should no longer be watched.
-                onDeleteValue: ts.closeFileWatcher
-            });
+        function updateExtendedConfigFilesWatches(forProjectPath, options, watchOptions, watchType) {
+            ts.updateSharedExtendedConfigFileWatcher(forProjectPath, options, sharedExtendedConfigFileWatchers || (sharedExtendedConfigFileWatchers = new ts.Map()), function (extendedConfigFileName, extendedConfigFilePath) { return watchFile(extendedConfigFileName, function (_fileName, eventKind) {
+                var _a;
+                updateCachedSystemWithFile(extendedConfigFileName, extendedConfigFilePath, eventKind);
+                // Update extended config cache
+                if (extendedConfigCache)
+                    ts.cleanExtendedConfigCache(extendedConfigCache, extendedConfigFilePath, toPath);
+                // Update projects
+                var projects = (_a = sharedExtendedConfigFileWatchers.get(extendedConfigFilePath)) === null || _a === void 0 ? void 0 : _a.projects;
+                // If there are no referenced projects this extended config file watcher depend on ignore
+                if (!(projects === null || projects === void 0 ? void 0 : projects.size))
+                    return;
+                projects.forEach(function (projectPath) {
+                    if (toPath(configFileName) === projectPath) {
+                        // If this is the config file of the project, reload completely
+                        reloadLevel = ts.ConfigFileProgramReloadLevel.Full;
+                    }
+                    else {
+                        // Reload config for the referenced projects and remove the resolutions from referenced projects since the config file changed
+                        var config = parsedConfigs === null || parsedConfigs === void 0 ? void 0 : parsedConfigs.get(projectPath);
+                        if (config)
+                            config.reloadLevel = ts.ConfigFileProgramReloadLevel.Full;
+                        resolutionCache.removeResolutionsFromProjectReferenceRedirects(projectPath);
+                    }
+                    scheduleProgramUpdate();
+                });
+            }, ts.PollingInterval.High, watchOptions, watchType); }, toPath);
         }
-        function watchExtendedConfigFile(extendedConfigFile) {
-            return watchFile(extendedConfigFile, scheduleProgramReload, ts.PollingInterval.High, watchOptions, ts.WatchType.ExtendedConfigFile);
+        function watchReferencedProject(configFileName, configPath, commandLine) {
+            var _a, _b, _c, _d, _e;
+            // Watch file
+            commandLine.watcher || (commandLine.watcher = watchFile(configFileName, function (_fileName, eventKind) {
+                updateCachedSystemWithFile(configFileName, configPath, eventKind);
+                var config = parsedConfigs === null || parsedConfigs === void 0 ? void 0 : parsedConfigs.get(configPath);
+                if (config)
+                    config.reloadLevel = ts.ConfigFileProgramReloadLevel.Full;
+                resolutionCache.removeResolutionsFromProjectReferenceRedirects(configPath);
+                scheduleProgramUpdate();
+            }, ts.PollingInterval.High, ((_a = commandLine.parsedCommandLine) === null || _a === void 0 ? void 0 : _a.watchOptions) || watchOptions, ts.WatchType.ConfigFileOfReferencedProject));
+            // Watch Wild card
+            if ((_b = commandLine.parsedCommandLine) === null || _b === void 0 ? void 0 : _b.wildcardDirectories) {
+                ts.updateWatchingWildcardDirectories(commandLine.watchedDirectories || (commandLine.watchedDirectories = new ts.Map()), new ts.Map(ts.getEntries((_c = commandLine.parsedCommandLine) === null || _c === void 0 ? void 0 : _c.wildcardDirectories)), function (directory, flags) {
+                    var _a;
+                    return watchDirectory(directory, function (fileOrDirectory) {
+                        var fileOrDirectoryPath = toPath(fileOrDirectory);
+                        // Since the file existence changed, update the sourceFiles cache
+                        if (cachedDirectoryStructureHost) {
+                            cachedDirectoryStructureHost.addOrDeleteFileOrDirectory(fileOrDirectory, fileOrDirectoryPath);
+                        }
+                        nextSourceFileVersion(fileOrDirectoryPath);
+                        var config = parsedConfigs === null || parsedConfigs === void 0 ? void 0 : parsedConfigs.get(configPath);
+                        if (!(config === null || config === void 0 ? void 0 : config.parsedCommandLine))
+                            return;
+                        if (ts.isIgnoredFileFromWildCardWatching({
+                            watchedDirPath: toPath(directory),
+                            fileOrDirectory: fileOrDirectory,
+                            fileOrDirectoryPath: fileOrDirectoryPath,
+                            configFileName: configFileName,
+                            options: config.parsedCommandLine.options,
+                            program: config.parsedCommandLine.fileNames,
+                            currentDirectory: currentDirectory,
+                            useCaseSensitiveFileNames: useCaseSensitiveFileNames,
+                            writeLog: writeLog,
+                            toPath: toPath,
+                        }))
+                            return;
+                        // Reload is pending, do the reload
+                        if (config.reloadLevel !== ts.ConfigFileProgramReloadLevel.Full) {
+                            config.reloadLevel = ts.ConfigFileProgramReloadLevel.Partial;
+                            // Schedule Update the program
+                            scheduleProgramUpdate();
+                        }
+                    }, flags, ((_a = commandLine.parsedCommandLine) === null || _a === void 0 ? void 0 : _a.watchOptions) || watchOptions, ts.WatchType.WildcardDirectoryOfReferencedProject);
+                });
+            }
+            else if (commandLine.watchedDirectories) {
+                ts.clearMap(commandLine.watchedDirectories, ts.closeFileWatcherOf);
+                commandLine.watchedDirectories = undefined;
+            }
+            // Watch extended config files
+            updateExtendedConfigFilesWatches(configPath, (_d = commandLine.parsedCommandLine) === null || _d === void 0 ? void 0 : _d.options, ((_e = commandLine.parsedCommandLine) === null || _e === void 0 ? void 0 : _e.watchOptions) || watchOptions, ts.WatchType.ExtendedConfigOfReferencedProject);
         }
     }
     ts.createWatchProgram = createWatchProgram;
@@ -113291,12 +116462,19 @@ var ts;
         compilerHost.resolveModuleNames = ts.maybeBind(host, host.resolveModuleNames);
         compilerHost.resolveTypeReferenceDirectives = ts.maybeBind(host, host.resolveTypeReferenceDirectives);
         var moduleResolutionCache = !compilerHost.resolveModuleNames ? ts.createModuleResolutionCache(currentDirectory, getCanonicalFileName) : undefined;
+        var typeReferenceDirectiveResolutionCache = !compilerHost.resolveTypeReferenceDirectives ? ts.createTypeReferenceDirectiveResolutionCache(currentDirectory, getCanonicalFileName, /*options*/ undefined, moduleResolutionCache === null || moduleResolutionCache === void 0 ? void 0 : moduleResolutionCache.getPackageJsonInfoCache()) : undefined;
         if (!compilerHost.resolveModuleNames) {
             var loader_3 = function (moduleName, containingFile, redirectedReference) { return ts.resolveModuleName(moduleName, containingFile, state.projectCompilerOptions, compilerHost, moduleResolutionCache, redirectedReference).resolvedModule; };
             compilerHost.resolveModuleNames = function (moduleNames, containingFile, _reusedNames, redirectedReference) {
                 return ts.loadWithLocalCache(ts.Debug.checkEachDefined(moduleNames), containingFile, redirectedReference, loader_3);
             };
         }
+        if (!compilerHost.resolveTypeReferenceDirectives) {
+            var loader_4 = function (moduleName, containingFile, redirectedReference) { return ts.resolveTypeReferenceDirective(moduleName, containingFile, state.projectCompilerOptions, compilerHost, redirectedReference, state.typeReferenceDirectiveResolutionCache).resolvedTypeReferenceDirective; };
+            compilerHost.resolveTypeReferenceDirectives = function (typeReferenceDirectiveNames, containingFile, redirectedReference) {
+                return ts.loadWithLocalCache(ts.Debug.checkEachDefined(typeReferenceDirectiveNames), containingFile, redirectedReference, loader_4);
+            };
+        }
         var _a = ts.createWatchFactory(hostWithWatch, options), watchFile = _a.watchFile, watchDirectory = _a.watchDirectory, writeLog = _a.writeLog;
         var state = {
             host: host,
@@ -113321,6 +116499,7 @@ var ts;
             projectErrorsReported: new ts.Map(),
             compilerHost: compilerHost,
             moduleResolutionCache: moduleResolutionCache,
+            typeReferenceDirectiveResolutionCache: typeReferenceDirectiveResolutionCache,
             // Mutable state
             buildOrder: undefined,
             readFileWithCache: function (f) { return host.readFile(f); },
@@ -113359,6 +116538,10 @@ var ts;
     function isParsedCommandLine(entry) {
         return !!entry.options;
     }
+    function getCachedParsedConfigFile(state, configFilePath) {
+        var value = state.configFileCache.get(configFilePath);
+        return value && isParsedCommandLine(value) ? value : undefined;
+    }
     function parseConfigFile(state, configFileName, configFilePath) {
         var configFileCache = state.configFileCache;
         var value = configFileCache.get(configFilePath);
@@ -113504,7 +116687,7 @@ var ts;
     function disableCache(state) {
         if (!state.cache)
             return;
-        var cache = state.cache, host = state.host, compilerHost = state.compilerHost, extendedConfigCache = state.extendedConfigCache, moduleResolutionCache = state.moduleResolutionCache;
+        var cache = state.cache, host = state.host, compilerHost = state.compilerHost, extendedConfigCache = state.extendedConfigCache, moduleResolutionCache = state.moduleResolutionCache, typeReferenceDirectiveResolutionCache = state.typeReferenceDirectiveResolutionCache;
         host.readFile = cache.originalReadFile;
         host.fileExists = cache.originalFileExists;
         host.directoryExists = cache.originalDirectoryExists;
@@ -113513,10 +116696,8 @@ var ts;
         compilerHost.getSourceFile = cache.originalGetSourceFile;
         state.readFileWithCache = cache.originalReadFileWithCache;
         extendedConfigCache.clear();
-        if (moduleResolutionCache) {
-            moduleResolutionCache.directoryToModuleNameMap.clear();
-            moduleResolutionCache.moduleNameToDirectoryMap.clear();
-        }
+        moduleResolutionCache === null || moduleResolutionCache === void 0 ? void 0 : moduleResolutionCache.clear();
+        typeReferenceDirectiveResolutionCache === null || typeReferenceDirectiveResolutionCache === void 0 ? void 0 : typeReferenceDirectiveResolutionCache.clear();
         state.cache = undefined;
     }
     function clearProjectStatus(state, resolved) {
@@ -113683,6 +116864,7 @@ var ts;
             return withProgramOrUndefined(action) || ts.emptyArray;
         }
         function createProgram() {
+            var _a, _b;
             ts.Debug.assert(program === undefined);
             if (state.options.dry) {
                 reportStatus(state, ts.Diagnostics.A_non_dry_build_would_build_project_0, project);
@@ -113702,7 +116884,8 @@ var ts;
             var host = state.host, compilerHost = state.compilerHost;
             state.projectCompilerOptions = config.options;
             // Update module resolution cache if needed
-            updateModuleResolutionCache(state, project, config);
+            (_a = state.moduleResolutionCache) === null || _a === void 0 ? void 0 : _a.update(config.options);
+            (_b = state.typeReferenceDirectiveResolutionCache) === null || _b === void 0 ? void 0 : _b.update(config.options);
             // Create program
             program = host.createProgram(config.fileNames, config.options, compilerHost, getOldProgram(state, projectPath, config), ts.getConfigFileParsingDiagnostics(config), config.projectReferences);
             if (state.watch) {
@@ -113877,7 +117060,7 @@ var ts;
                         emitBundle(writeFile, customTransformers);
                         break;
                     case BuildStep.BuildInvalidatedProjectOfBundle:
-                        ts.Debug.checkDefined(invalidatedProjectOfBundle).done(cancellationToken);
+                        ts.Debug.checkDefined(invalidatedProjectOfBundle).done(cancellationToken, writeFile, customTransformers);
                         step = BuildStep.Done;
                         break;
                     case BuildStep.QueueReferencingProjects:
@@ -114019,34 +117202,9 @@ var ts;
         afterProgramDone(state, program, config);
         return { buildResult: buildResult, step: BuildStep.QueueReferencingProjects };
     }
-    function updateModuleResolutionCache(state, proj, config) {
-        if (!state.moduleResolutionCache)
-            return;
-        // Update module resolution cache if needed
-        var moduleResolutionCache = state.moduleResolutionCache;
-        var projPath = toPath(state, proj);
-        if (moduleResolutionCache.directoryToModuleNameMap.redirectsMap.size === 0) {
-            // The own map will be for projectCompilerOptions
-            ts.Debug.assert(moduleResolutionCache.moduleNameToDirectoryMap.redirectsMap.size === 0);
-            moduleResolutionCache.directoryToModuleNameMap.redirectsMap.set(projPath, moduleResolutionCache.directoryToModuleNameMap.ownMap);
-            moduleResolutionCache.moduleNameToDirectoryMap.redirectsMap.set(projPath, moduleResolutionCache.moduleNameToDirectoryMap.ownMap);
-        }
-        else {
-            // Set correct own map
-            ts.Debug.assert(moduleResolutionCache.moduleNameToDirectoryMap.redirectsMap.size > 0);
-            var ref = {
-                sourceFile: config.options.configFile,
-                commandLine: config
-            };
-            moduleResolutionCache.directoryToModuleNameMap.setOwnMap(moduleResolutionCache.directoryToModuleNameMap.getOrCreateMapOfCacheRedirects(ref));
-            moduleResolutionCache.moduleNameToDirectoryMap.setOwnMap(moduleResolutionCache.moduleNameToDirectoryMap.getOrCreateMapOfCacheRedirects(ref));
-        }
-        moduleResolutionCache.directoryToModuleNameMap.setOwnOptions(config.options);
-        moduleResolutionCache.moduleNameToDirectoryMap.setOwnOptions(config.options);
-    }
     function checkConfigFileUpToDateStatus(state, configFile, oldestOutputFileTime, oldestOutputFileName) {
         // Check tsconfig time
-        var tsconfigTime = state.host.getModifiedTime(configFile) || ts.missingFileModifiedTime;
+        var tsconfigTime = ts.getModifiedTime(state.host, configFile);
         if (oldestOutputFileTime < tsconfigTime) {
             return {
                 type: ts.UpToDateStatusType.OutOfDateWithSelf,
@@ -114056,6 +117214,7 @@ var ts;
         }
     }
     function getUpToDateStatusWorker(state, project, resolvedPath) {
+        var force = !!state.options.force;
         var newestInputFileName = undefined;
         var newestInputFileTime = minimumDate;
         var host = state.host;
@@ -114068,10 +117227,13 @@ var ts;
                     reason: inputFile + " does not exist"
                 };
             }
-            var inputTime = host.getModifiedTime(inputFile) || ts.missingFileModifiedTime;
-            if (inputTime > newestInputFileTime) {
-                newestInputFileName = inputFile;
-                newestInputFileTime = inputTime;
+            if (!force) {
+                var inputTime = ts.getModifiedTime(host, inputFile);
+                host.getModifiedTime(inputFile);
+                if (inputTime > newestInputFileTime) {
+                    newestInputFileName = inputFile;
+                    newestInputFileTime = inputTime;
+                }
             }
         }
         // Container if no files are specified in the project
@@ -114090,36 +117252,38 @@ var ts;
         var missingOutputFileName;
         var newestDeclarationFileContentChangedTime = minimumDate;
         var isOutOfDateWithInputs = false;
-        for (var _b = 0, outputs_1 = outputs; _b < outputs_1.length; _b++) {
-            var output = outputs_1[_b];
-            // Output is missing; can stop checking
-            // Don't immediately return because we can still be upstream-blocked, which is a higher-priority status
-            if (!host.fileExists(output)) {
-                missingOutputFileName = output;
-                break;
-            }
-            var outputTime = host.getModifiedTime(output) || ts.missingFileModifiedTime;
-            if (outputTime < oldestOutputFileTime) {
-                oldestOutputFileTime = outputTime;
-                oldestOutputFileName = output;
-            }
-            // If an output is older than the newest input, we can stop checking
-            // Don't immediately return because we can still be upstream-blocked, which is a higher-priority status
-            if (outputTime < newestInputFileTime) {
-                isOutOfDateWithInputs = true;
-                break;
-            }
-            if (outputTime > newestOutputFileTime) {
-                newestOutputFileTime = outputTime;
-                newestOutputFileName = output;
-            }
-            // Keep track of when the most recent time a .d.ts file was changed.
-            // In addition to file timestamps, we also keep track of when a .d.ts file
-            // had its file touched but not had its contents changed - this allows us
-            // to skip a downstream typecheck
-            if (isDeclarationFile(output)) {
-                var outputModifiedTime = host.getModifiedTime(output) || ts.missingFileModifiedTime;
-                newestDeclarationFileContentChangedTime = newer(newestDeclarationFileContentChangedTime, outputModifiedTime);
+        if (!force) {
+            for (var _b = 0, outputs_1 = outputs; _b < outputs_1.length; _b++) {
+                var output = outputs_1[_b];
+                // Output is missing; can stop checking
+                // Don't immediately return because we can still be upstream-blocked, which is a higher-priority status
+                if (!host.fileExists(output)) {
+                    missingOutputFileName = output;
+                    break;
+                }
+                var outputTime = ts.getModifiedTime(host, output);
+                if (outputTime < oldestOutputFileTime) {
+                    oldestOutputFileTime = outputTime;
+                    oldestOutputFileName = output;
+                }
+                // If an output is older than the newest input, we can stop checking
+                // Don't immediately return because we can still be upstream-blocked, which is a higher-priority status
+                if (outputTime < newestInputFileTime) {
+                    isOutOfDateWithInputs = true;
+                    break;
+                }
+                if (outputTime > newestOutputFileTime) {
+                    newestOutputFileTime = outputTime;
+                    newestOutputFileName = output;
+                }
+                // Keep track of when the most recent time a .d.ts file was changed.
+                // In addition to file timestamps, we also keep track of when a .d.ts file
+                // had its file touched but not had its contents changed - this allows us
+                // to skip a downstream typecheck
+                if (isDeclarationFile(output)) {
+                    var outputModifiedTime = ts.getModifiedTime(host, output);
+                    newestDeclarationFileContentChangedTime = newer(newestDeclarationFileContentChangedTime, outputModifiedTime);
+                }
             }
         }
         var pseudoUpToDate = false;
@@ -114155,7 +117319,8 @@ var ts;
                     };
                 }
                 // Check oldest output file name only if there is no missing output file name
-                if (!missingOutputFileName) {
+                // (a check we will have skipped if this is a forced build)
+                if (!force && !missingOutputFileName) {
                     // If the upstream project's newest file is older than our oldest output, we
                     // can't be out of date because of it
                     if (refStatus.newestInputFileTime && refStatus.newestInputFileTime <= oldestOutputFileTime) {
@@ -114201,7 +117366,7 @@ var ts;
             if (extendedConfigStatus)
                 return extendedConfigStatus;
         }
-        if (!state.buildInfoChecked.has(resolvedPath)) {
+        if (!force && !state.buildInfoChecked.has(resolvedPath)) {
             state.buildInfoChecked.set(resolvedPath, true);
             var buildInfoPath = ts.getTsBuildInfoEmitOutputFilePath(project.options);
             if (buildInfoPath) {
@@ -114261,7 +117426,7 @@ var ts;
                     reportStatus(state, verboseMessage, proj.options.configFilePath);
                 }
                 if (isDeclarationFile(file)) {
-                    priorNewestUpdateTime = newer(priorNewestUpdateTime, host.getModifiedTime(file) || ts.missingFileModifiedTime);
+                    priorNewestUpdateTime = newer(priorNewestUpdateTime, ts.getModifiedTime(host, file));
                 }
                 host.setModifiedTime(file, now);
             }
@@ -114343,7 +117508,7 @@ var ts;
             }
         }
     }
-    function build(state, project, cancellationToken, onlyReferences) {
+    function build(state, project, cancellationToken, writeFile, getCustomTransformers, onlyReferences) {
         var buildOrder = getBuildOrderFor(state, project, onlyReferences);
         if (!buildOrder)
             return ts.ExitStatus.InvalidProject_OutputsSkipped;
@@ -114355,7 +117520,7 @@ var ts;
             if (!invalidatedProject)
                 break;
             reportQueue = false;
-            invalidatedProject.done(cancellationToken);
+            invalidatedProject.done(cancellationToken, writeFile, getCustomTransformers === null || getCustomTransformers === void 0 ? void 0 : getCustomTransformers(invalidatedProject.project));
             if (!state.diagnostics.has(invalidatedProject.projectPath))
                 successfulProjects++;
         }
@@ -114390,8 +117555,14 @@ var ts;
                 continue;
             }
             var outputs = ts.getAllProjectOutputs(parsed, !host.useCaseSensitiveFileNames());
+            if (!outputs.length)
+                continue;
+            var inputFileNames = new ts.Set(parsed.fileNames.map(function (f) { return toPath(state, f); }));
             for (var _a = 0, outputs_3 = outputs; _a < outputs_3.length; _a++) {
                 var output = outputs_3[_a];
+                // If output name is same as input file name, do not delete and ignore the error
+                if (inputFileNames.has(toPath(state, output)))
+                    continue;
                 if (host.fileExists(output)) {
                     if (filesToDelete) {
                         filesToDelete.push(output);
@@ -114467,7 +117638,7 @@ var ts;
         }, ts.PollingInterval.High, parsed === null || parsed === void 0 ? void 0 : parsed.watchOptions, ts.WatchType.ConfigFile, resolved));
     }
     function watchExtendedConfigFiles(state, resolvedPath, parsed) {
-        ts.updateSharedExtendedConfigFileWatcher(resolvedPath, parsed, state.allWatchedExtendedConfigFiles, function (extendedConfigFileName, extendedConfigFilePath) { return state.watchFile(extendedConfigFileName, function () {
+        ts.updateSharedExtendedConfigFileWatcher(resolvedPath, parsed === null || parsed === void 0 ? void 0 : parsed.options, state.allWatchedExtendedConfigFiles, function (extendedConfigFileName, extendedConfigFilePath) { return state.watchFile(extendedConfigFileName, function () {
             var _a;
             return (_a = state.allWatchedExtendedConfigFiles.get(extendedConfigFilePath)) === null || _a === void 0 ? void 0 : _a.projects.forEach(function (projectConfigFilePath) {
                 return invalidateProjectAndScheduleBuilds(state, projectConfigFilePath, ts.ConfigFileProgramReloadLevel.Full);
@@ -114478,6 +117649,7 @@ var ts;
         if (!state.watch)
             return;
         ts.updateWatchingWildcardDirectories(getOrCreateValueMapFromConfigFileMap(state.allWatchedWildcardDirectories, resolvedPath), new ts.Map(ts.getEntries(parsed.wildcardDirectories)), function (dir, flags) { return state.watchDirectory(dir, function (fileOrDirectory) {
+            var _a;
             if (ts.isIgnoredFileFromWildCardWatching({
                 watchedDirPath: toPath(state, dir),
                 fileOrDirectory: fileOrDirectory,
@@ -114485,9 +117657,10 @@ var ts;
                 configFileName: resolved,
                 currentDirectory: state.currentDirectory,
                 options: parsed.options,
-                program: state.builderPrograms.get(resolvedPath),
+                program: state.builderPrograms.get(resolvedPath) || ((_a = getCachedParsedConfigFile(state, resolvedPath)) === null || _a === void 0 ? void 0 : _a.fileNames),
                 useCaseSensitiveFileNames: state.parseConfigFileHost.useCaseSensitiveFileNames,
-                writeLog: function (s) { return state.writeLog(s); }
+                writeLog: function (s) { return state.writeLog(s); },
+                toPath: function (fileName) { return toPath(state, fileName); }
             }))
                 return;
             invalidateProjectAndScheduleBuilds(state, resolvedPath, ts.ConfigFileProgramReloadLevel.Partial);
@@ -114522,19 +117695,16 @@ var ts;
     }
     function stopWatching(state) {
         ts.clearMap(state.allWatchedConfigFiles, ts.closeFileWatcher);
-        ts.clearMap(state.allWatchedExtendedConfigFiles, function (watcher) {
-            watcher.projects.clear();
-            watcher.close();
-        });
+        ts.clearMap(state.allWatchedExtendedConfigFiles, ts.closeFileWatcherOf);
         ts.clearMap(state.allWatchedWildcardDirectories, function (watchedWildcardDirectories) { return ts.clearMap(watchedWildcardDirectories, ts.closeFileWatcherOf); });
         ts.clearMap(state.allWatchedInputFiles, function (watchedWildcardDirectories) { return ts.clearMap(watchedWildcardDirectories, ts.closeFileWatcher); });
     }
     function createSolutionBuilderWorker(watch, hostOrHostWithWatch, rootNames, options, baseWatchOptions) {
         var state = createSolutionBuilderState(watch, hostOrHostWithWatch, rootNames, options, baseWatchOptions);
         return {
-            build: function (project, cancellationToken) { return build(state, project, cancellationToken); },
+            build: function (project, cancellationToken, writeFile, getCustomTransformers) { return build(state, project, cancellationToken, writeFile, getCustomTransformers); },
             clean: function (project) { return clean(state, project); },
-            buildReferences: function (project, cancellationToken) { return build(state, project, cancellationToken, /*onlyReferences*/ true); },
+            buildReferences: function (project, cancellationToken, writeFile, getCustomTransformers) { return build(state, project, cancellationToken, writeFile, getCustomTransformers, /*onlyReferences*/ true); },
             cleanReferences: function (project) { return clean(state, project, /*onlyReferences*/ true); },
             getNextInvalidatedProject: function (cancellationToken) {
                 setupInitialBuild(state, cancellationToken);
@@ -114624,6 +117794,9 @@ var ts;
         }
     }
     function reportUpToDateStatus(state, configFileName, status) {
+        if (state.options.force && (status.type === ts.UpToDateStatusType.UpToDate || status.type === ts.UpToDateStatusType.UpToDateWithUpstreamTypes)) {
+            return reportStatus(state, ts.Diagnostics.Project_0_is_being_forcibly_rebuilt, relName(state, configFileName));
+        }
         switch (status.type) {
             case ts.UpToDateStatusType.OutOfDateWithSelf:
                 return reportStatus(state, ts.Diagnostics.Project_0_is_out_of_date_because_oldest_output_1_is_older_than_newest_input_2, relName(state, configFileName), relName(state, status.outOfDateOutputFileName), relName(state, status.newerInputFileName));
@@ -115173,6 +118346,9 @@ var ts;
         SymbolDisplayPartKind[SymbolDisplayPartKind["enumMemberName"] = 19] = "enumMemberName";
         SymbolDisplayPartKind[SymbolDisplayPartKind["functionName"] = 20] = "functionName";
         SymbolDisplayPartKind[SymbolDisplayPartKind["regularExpressionLiteral"] = 21] = "regularExpressionLiteral";
+        SymbolDisplayPartKind[SymbolDisplayPartKind["link"] = 22] = "link";
+        SymbolDisplayPartKind[SymbolDisplayPartKind["linkName"] = 23] = "linkName";
+        SymbolDisplayPartKind[SymbolDisplayPartKind["linkText"] = 24] = "linkText";
     })(SymbolDisplayPartKind = ts.SymbolDisplayPartKind || (ts.SymbolDisplayPartKind = {}));
     var OutliningSpanKind;
     (function (OutliningSpanKind) {
@@ -115283,6 +118459,12 @@ var ts;
         ScriptElementKind["jsxAttribute"] = "JSX attribute";
         /** String literal */
         ScriptElementKind["string"] = "string";
+        /** Jsdoc @link: in `{@link C link text}`, the before and after text "{@link " and "}" */
+        ScriptElementKind["link"] = "link";
+        /** Jsdoc @link: in `{@link C link text}`, the entity name "C" */
+        ScriptElementKind["linkName"] = "link name";
+        /** Jsdoc @link: in `{@link C link text}`, the link text "link text" */
+        ScriptElementKind["linkText"] = "link text";
     })(ScriptElementKind = ts.ScriptElementKind || (ts.ScriptElementKind = {}));
     var ScriptElementKindModifier;
     (function (ScriptElementKindModifier) {
@@ -115375,37 +118557,37 @@ var ts;
     })(SemanticMeaning = ts.SemanticMeaning || (ts.SemanticMeaning = {}));
     function getMeaningFromDeclaration(node) {
         switch (node.kind) {
-            case 249 /* VariableDeclaration */:
+            case 250 /* VariableDeclaration */:
                 return ts.isInJSFile(node) && ts.getJSDocEnumTag(node) ? 7 /* All */ : 1 /* Value */;
-            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 */:
+            case 161 /* Parameter */:
+            case 199 /* BindingElement */:
+            case 164 /* PropertyDeclaration */:
+            case 163 /* PropertySignature */:
+            case 289 /* PropertyAssignment */:
+            case 290 /* ShorthandPropertyAssignment */:
+            case 166 /* MethodDeclaration */:
+            case 165 /* MethodSignature */:
+            case 167 /* Constructor */:
+            case 168 /* GetAccessor */:
+            case 169 /* SetAccessor */:
+            case 252 /* FunctionDeclaration */:
+            case 209 /* FunctionExpression */:
+            case 210 /* ArrowFunction */:
+            case 288 /* CatchClause */:
+            case 281 /* JsxAttribute */:
                 return 1 /* Value */;
-            case 159 /* TypeParameter */:
-            case 253 /* InterfaceDeclaration */:
-            case 254 /* TypeAliasDeclaration */:
-            case 177 /* TypeLiteral */:
+            case 160 /* TypeParameter */:
+            case 254 /* InterfaceDeclaration */:
+            case 255 /* TypeAliasDeclaration */:
+            case 178 /* TypeLiteral */:
                 return 2 /* Type */;
-            case 331 /* JSDocTypedefTag */:
+            case 335 /* 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 291 /* EnumMember */:
-            case 252 /* ClassDeclaration */:
+            case 292 /* EnumMember */:
+            case 253 /* ClassDeclaration */:
                 return 1 /* Value */ | 2 /* Type */;
-            case 256 /* ModuleDeclaration */:
+            case 257 /* ModuleDeclaration */:
                 if (ts.isAmbientModule(node)) {
                     return 4 /* Namespace */ | 1 /* Value */;
                 }
@@ -115415,16 +118597,16 @@ var ts;
                 else {
                     return 4 /* Namespace */;
                 }
-            case 255 /* EnumDeclaration */:
-            case 264 /* NamedImports */:
-            case 265 /* ImportSpecifier */:
-            case 260 /* ImportEqualsDeclaration */:
-            case 261 /* ImportDeclaration */:
-            case 266 /* ExportAssignment */:
-            case 267 /* ExportDeclaration */:
+            case 256 /* EnumDeclaration */:
+            case 265 /* NamedImports */:
+            case 266 /* ImportSpecifier */:
+            case 261 /* ImportEqualsDeclaration */:
+            case 262 /* ImportDeclaration */:
+            case 267 /* ExportAssignment */:
+            case 268 /* ExportDeclaration */:
                 return 7 /* All */;
             // An external module can be a Value
-            case 297 /* SourceFile */:
+            case 298 /* SourceFile */:
                 return 4 /* Namespace */ | 1 /* Value */;
         }
         return 7 /* All */;
@@ -115432,13 +118614,13 @@ var ts;
     ts.getMeaningFromDeclaration = getMeaningFromDeclaration;
     function getMeaningFromLocation(node) {
         node = getAdjustedReferenceLocation(node);
-        if (node.kind === 297 /* SourceFile */) {
+        if (node.kind === 298 /* SourceFile */) {
             return 1 /* Value */;
         }
-        else if (node.parent.kind === 266 /* ExportAssignment */
-            || node.parent.kind === 272 /* ExternalModuleReference */
-            || node.parent.kind === 265 /* ImportSpecifier */
-            || node.parent.kind === 262 /* ImportClause */
+        else if (node.parent.kind === 267 /* ExportAssignment */
+            || node.parent.kind === 273 /* ExternalModuleReference */
+            || node.parent.kind === 266 /* ImportSpecifier */
+            || node.parent.kind === 263 /* ImportClause */
             || ts.isImportEqualsDeclaration(node.parent) && node === node.parent.name) {
             return 7 /* All */;
         }
@@ -115448,7 +118630,7 @@ var ts;
         else if (ts.isDeclarationName(node)) {
             return getMeaningFromDeclaration(node.parent);
         }
-        else if (ts.isEntityName(node) && ts.isJSDocNameReference(node.parent)) {
+        else if (ts.isEntityName(node) && (ts.isJSDocNameReference(node.parent) || ts.isJSDocLink(node.parent))) {
             return 7 /* All */;
         }
         else if (isTypeReference(node)) {
@@ -115474,11 +118656,11 @@ var ts;
         //     import a = |b|; // Namespace
         //     import a = |b.c|; // Value, type, namespace
         //     import a = |b.c|.d; // 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 */;
+        var name = node.kind === 158 /* QualifiedName */ ? node : ts.isQualifiedName(node.parent) && node.parent.right === node ? node.parent : undefined;
+        return name && name.parent.kind === 261 /* ImportEqualsDeclaration */ ? 7 /* All */ : 4 /* Namespace */;
     }
     function isInRightSideOfInternalImportEqualsDeclaration(node) {
-        while (node.parent.kind === 157 /* QualifiedName */) {
+        while (node.parent.kind === 158 /* QualifiedName */) {
             node = node.parent;
         }
         return ts.isInternalModuleImportEqualsDeclaration(node.parent) && node.parent.moduleReference === node;
@@ -115490,27 +118672,27 @@ var ts;
     function isQualifiedNameNamespaceReference(node) {
         var root = node;
         var isLastClause = true;
-        if (root.parent.kind === 157 /* QualifiedName */) {
-            while (root.parent && root.parent.kind === 157 /* QualifiedName */) {
+        if (root.parent.kind === 158 /* QualifiedName */) {
+            while (root.parent && root.parent.kind === 158 /* QualifiedName */) {
                 root = root.parent;
             }
             isLastClause = root.right === node;
         }
-        return root.parent.kind === 173 /* TypeReference */ && !isLastClause;
+        return root.parent.kind === 174 /* TypeReference */ && !isLastClause;
     }
     function isPropertyAccessNamespaceReference(node) {
         var root = node;
         var isLastClause = true;
-        if (root.parent.kind === 201 /* PropertyAccessExpression */) {
-            while (root.parent && root.parent.kind === 201 /* PropertyAccessExpression */) {
+        if (root.parent.kind === 202 /* PropertyAccessExpression */) {
+            while (root.parent && root.parent.kind === 202 /* PropertyAccessExpression */) {
                 root = root.parent;
             }
             isLastClause = root.name === node;
         }
-        if (!isLastClause && root.parent.kind === 223 /* ExpressionWithTypeArguments */ && root.parent.parent.kind === 286 /* HeritageClause */) {
+        if (!isLastClause && root.parent.kind === 224 /* ExpressionWithTypeArguments */ && root.parent.parent.kind === 287 /* HeritageClause */) {
             var decl = root.parent.parent.parent;
-            return (decl.kind === 252 /* ClassDeclaration */ && root.parent.parent.token === 116 /* ImplementsKeyword */) ||
-                (decl.kind === 253 /* InterfaceDeclaration */ && root.parent.parent.token === 93 /* ExtendsKeyword */);
+            return (decl.kind === 253 /* ClassDeclaration */ && root.parent.parent.token === 116 /* ImplementsKeyword */) ||
+                (decl.kind === 254 /* InterfaceDeclaration */ && root.parent.parent.token === 93 /* ExtendsKeyword */);
         }
         return false;
     }
@@ -115521,15 +118703,15 @@ var ts;
         switch (node.kind) {
             case 107 /* ThisKeyword */:
                 return !ts.isExpressionNode(node);
-            case 187 /* ThisType */:
+            case 188 /* ThisType */:
                 return true;
         }
         switch (node.parent.kind) {
-            case 173 /* TypeReference */:
+            case 174 /* TypeReference */:
                 return true;
-            case 195 /* ImportType */:
+            case 196 /* ImportType */:
                 return !node.parent.isTypeOf;
-            case 223 /* ExpressionWithTypeArguments */:
+            case 224 /* ExpressionWithTypeArguments */:
                 return !ts.isExpressionWithTypeArgumentsInClassExtendsClause(node.parent);
         }
         return false;
@@ -115596,7 +118778,7 @@ var ts;
     ts.climbPastPropertyOrElementAccess = climbPastPropertyOrElementAccess;
     function getTargetLabel(referenceNode, labelName) {
         while (referenceNode) {
-            if (referenceNode.kind === 245 /* LabeledStatement */ && referenceNode.label.escapedText === labelName) {
+            if (referenceNode.kind === 246 /* LabeledStatement */ && referenceNode.label.escapedText === labelName) {
                 return referenceNode.label;
             }
             referenceNode = referenceNode.parent;
@@ -115657,22 +118839,22 @@ var ts;
     ts.isNameOfFunctionDeclaration = isNameOfFunctionDeclaration;
     function isLiteralNameOfPropertyDeclarationOrIndexAccess(node) {
         switch (node.parent.kind) {
-            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 */:
+            case 164 /* PropertyDeclaration */:
+            case 163 /* PropertySignature */:
+            case 289 /* PropertyAssignment */:
+            case 292 /* EnumMember */:
+            case 166 /* MethodDeclaration */:
+            case 165 /* MethodSignature */:
+            case 168 /* GetAccessor */:
+            case 169 /* SetAccessor */:
+            case 257 /* ModuleDeclaration */:
                 return ts.getNameOfDeclaration(node.parent) === node;
-            case 202 /* ElementAccessExpression */:
+            case 203 /* ElementAccessExpression */:
                 return node.parent.argumentExpression === node;
-            case 158 /* ComputedPropertyName */:
+            case 159 /* ComputedPropertyName */:
                 return true;
-            case 191 /* LiteralType */:
-                return node.parent.parent.kind === 189 /* IndexedAccessType */;
+            case 192 /* LiteralType */:
+                return node.parent.parent.kind === 190 /* IndexedAccessType */;
             default:
                 return false;
         }
@@ -115696,17 +118878,17 @@ var ts;
                 return undefined;
             }
             switch (node.kind) {
-                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 */:
+                case 298 /* SourceFile */:
+                case 166 /* MethodDeclaration */:
+                case 165 /* MethodSignature */:
+                case 252 /* FunctionDeclaration */:
+                case 209 /* FunctionExpression */:
+                case 168 /* GetAccessor */:
+                case 169 /* SetAccessor */:
+                case 253 /* ClassDeclaration */:
+                case 254 /* InterfaceDeclaration */:
+                case 256 /* EnumDeclaration */:
+                case 257 /* ModuleDeclaration */:
                     return node;
             }
         }
@@ -115714,54 +118896,54 @@ var ts;
     ts.getContainerNode = getContainerNode;
     function getNodeKind(node) {
         switch (node.kind) {
-            case 297 /* SourceFile */:
+            case 298 /* SourceFile */:
                 return ts.isExternalModule(node) ? "module" /* moduleElement */ : "script" /* scriptElement */;
-            case 256 /* ModuleDeclaration */:
+            case 257 /* ModuleDeclaration */:
                 return "module" /* moduleElement */;
-            case 252 /* ClassDeclaration */:
-            case 221 /* ClassExpression */:
+            case 253 /* ClassDeclaration */:
+            case 222 /* ClassExpression */:
                 return "class" /* classElement */;
-            case 253 /* InterfaceDeclaration */: return "interface" /* interfaceElement */;
-            case 254 /* TypeAliasDeclaration */:
-            case 324 /* JSDocCallbackTag */:
-            case 331 /* JSDocTypedefTag */:
+            case 254 /* InterfaceDeclaration */: return "interface" /* interfaceElement */;
+            case 255 /* TypeAliasDeclaration */:
+            case 328 /* JSDocCallbackTag */:
+            case 335 /* JSDocTypedefTag */:
                 return "type" /* typeElement */;
-            case 255 /* EnumDeclaration */: return "enum" /* enumElement */;
-            case 249 /* VariableDeclaration */:
+            case 256 /* EnumDeclaration */: return "enum" /* enumElement */;
+            case 250 /* VariableDeclaration */:
                 return getKindOfVariableDeclaration(node);
-            case 198 /* BindingElement */:
+            case 199 /* BindingElement */:
                 return getKindOfVariableDeclaration(ts.getRootDeclaration(node));
-            case 209 /* ArrowFunction */:
-            case 251 /* FunctionDeclaration */:
-            case 208 /* FunctionExpression */:
+            case 210 /* ArrowFunction */:
+            case 252 /* FunctionDeclaration */:
+            case 209 /* FunctionExpression */:
                 return "function" /* functionElement */;
-            case 167 /* GetAccessor */: return "getter" /* memberGetAccessorElement */;
-            case 168 /* SetAccessor */: return "setter" /* memberSetAccessorElement */;
-            case 165 /* MethodDeclaration */:
-            case 164 /* MethodSignature */:
+            case 168 /* GetAccessor */: return "getter" /* memberGetAccessorElement */;
+            case 169 /* SetAccessor */: return "setter" /* memberSetAccessorElement */;
+            case 166 /* MethodDeclaration */:
+            case 165 /* MethodSignature */:
                 return "method" /* memberFunctionElement */;
-            case 288 /* PropertyAssignment */:
+            case 289 /* PropertyAssignment */:
                 var initializer = node.initializer;
                 return ts.isFunctionLike(initializer) ? "method" /* memberFunctionElement */ : "property" /* memberVariableElement */;
-            case 163 /* PropertyDeclaration */:
-            case 162 /* PropertySignature */:
-            case 289 /* ShorthandPropertyAssignment */:
-            case 290 /* SpreadAssignment */:
+            case 164 /* PropertyDeclaration */:
+            case 163 /* PropertySignature */:
+            case 290 /* ShorthandPropertyAssignment */:
+            case 291 /* SpreadAssignment */:
                 return "property" /* memberVariableElement */;
-            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 */:
+            case 172 /* IndexSignature */: return "index" /* indexSignatureElement */;
+            case 171 /* ConstructSignature */: return "construct" /* constructSignatureElement */;
+            case 170 /* CallSignature */: return "call" /* callSignatureElement */;
+            case 167 /* Constructor */: return "constructor" /* constructorImplementationElement */;
+            case 160 /* TypeParameter */: return "type parameter" /* typeParameterElement */;
+            case 292 /* EnumMember */: return "enum member" /* enumMemberElement */;
+            case 161 /* Parameter */: return ts.hasSyntacticModifier(node, 16476 /* ParameterPropertyModifier */) ? "property" /* memberVariableElement */ : "parameter" /* parameterElement */;
+            case 261 /* ImportEqualsDeclaration */:
+            case 266 /* ImportSpecifier */:
+            case 271 /* ExportSpecifier */:
+            case 264 /* NamespaceImport */:
+            case 270 /* NamespaceExport */:
                 return "alias" /* alias */;
-            case 216 /* BinaryExpression */:
+            case 217 /* BinaryExpression */:
                 var kind = ts.getAssignmentDeclarationKind(node);
                 var right = node.right;
                 switch (kind) {
@@ -115790,7 +118972,7 @@ var ts;
                 }
             case 78 /* Identifier */:
                 return ts.isImportClause(node.parent) ? "alias" /* alias */ : "" /* unknown */;
-            case 266 /* ExportAssignment */:
+            case 267 /* 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;
@@ -115813,7 +118995,7 @@ var ts;
                 return true;
             case 78 /* Identifier */:
                 // 'this' as a parameter
-                return ts.identifierIsThisKeyword(node) && node.parent.kind === 160 /* Parameter */;
+                return ts.identifierIsThisKeyword(node) && node.parent.kind === 161 /* Parameter */;
             default:
                 return false;
         }
@@ -115878,42 +119060,42 @@ var ts;
             return false;
         }
         switch (n.kind) {
-            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 */:
+            case 253 /* ClassDeclaration */:
+            case 254 /* InterfaceDeclaration */:
+            case 256 /* EnumDeclaration */:
+            case 201 /* ObjectLiteralExpression */:
+            case 197 /* ObjectBindingPattern */:
+            case 178 /* TypeLiteral */:
+            case 231 /* Block */:
+            case 258 /* ModuleBlock */:
+            case 259 /* CaseBlock */:
+            case 265 /* NamedImports */:
+            case 269 /* NamedExports */:
                 return nodeEndsWith(n, 19 /* CloseBraceToken */, sourceFile);
-            case 287 /* CatchClause */:
+            case 288 /* CatchClause */:
                 return isCompletedNode(n.block, sourceFile);
-            case 204 /* NewExpression */:
+            case 205 /* NewExpression */:
                 if (!n.arguments) {
                     return true;
                 }
             // falls through
-            case 203 /* CallExpression */:
-            case 207 /* ParenthesizedExpression */:
-            case 186 /* ParenthesizedType */:
+            case 204 /* CallExpression */:
+            case 208 /* ParenthesizedExpression */:
+            case 187 /* ParenthesizedType */:
                 return nodeEndsWith(n, 21 /* CloseParenToken */, sourceFile);
-            case 174 /* FunctionType */:
-            case 175 /* ConstructorType */:
+            case 175 /* FunctionType */:
+            case 176 /* ConstructorType */:
                 return isCompletedNode(n.type, sourceFile);
-            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 */:
+            case 167 /* Constructor */:
+            case 168 /* GetAccessor */:
+            case 169 /* SetAccessor */:
+            case 252 /* FunctionDeclaration */:
+            case 209 /* FunctionExpression */:
+            case 166 /* MethodDeclaration */:
+            case 165 /* MethodSignature */:
+            case 171 /* ConstructSignature */:
+            case 170 /* CallSignature */:
+            case 210 /* ArrowFunction */:
                 if (n.body) {
                     return isCompletedNode(n.body, sourceFile);
                 }
@@ -115923,65 +119105,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 256 /* ModuleDeclaration */:
+            case 257 /* ModuleDeclaration */:
                 return !!n.body && isCompletedNode(n.body, sourceFile);
-            case 234 /* IfStatement */:
+            case 235 /* IfStatement */:
                 if (n.elseStatement) {
                     return isCompletedNode(n.elseStatement, sourceFile);
                 }
                 return isCompletedNode(n.thenStatement, sourceFile);
-            case 233 /* ExpressionStatement */:
+            case 234 /* ExpressionStatement */:
                 return isCompletedNode(n.expression, sourceFile) ||
                     hasChildOfKind(n, 26 /* SemicolonToken */, sourceFile);
-            case 199 /* ArrayLiteralExpression */:
-            case 197 /* ArrayBindingPattern */:
-            case 202 /* ElementAccessExpression */:
-            case 158 /* ComputedPropertyName */:
-            case 179 /* TupleType */:
+            case 200 /* ArrayLiteralExpression */:
+            case 198 /* ArrayBindingPattern */:
+            case 203 /* ElementAccessExpression */:
+            case 159 /* ComputedPropertyName */:
+            case 180 /* TupleType */:
                 return nodeEndsWith(n, 23 /* CloseBracketToken */, sourceFile);
-            case 171 /* IndexSignature */:
+            case 172 /* IndexSignature */:
                 if (n.type) {
                     return isCompletedNode(n.type, sourceFile);
                 }
                 return hasChildOfKind(n, 23 /* CloseBracketToken */, sourceFile);
-            case 284 /* CaseClause */:
-            case 285 /* DefaultClause */:
+            case 285 /* CaseClause */:
+            case 286 /* DefaultClause */:
                 // there is no such thing as terminator token for CaseClause/DefaultClause so for simplicity always consider them non-completed
                 return false;
-            case 237 /* ForStatement */:
-            case 238 /* ForInStatement */:
-            case 239 /* ForOfStatement */:
-            case 236 /* WhileStatement */:
+            case 238 /* ForStatement */:
+            case 239 /* ForInStatement */:
+            case 240 /* ForOfStatement */:
+            case 237 /* WhileStatement */:
                 return isCompletedNode(n.statement, sourceFile);
-            case 235 /* DoStatement */:
+            case 236 /* 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 176 /* TypeQuery */:
+            case 177 /* TypeQuery */:
                 return isCompletedNode(n.exprName, sourceFile);
-            case 211 /* TypeOfExpression */:
-            case 210 /* DeleteExpression */:
-            case 212 /* VoidExpression */:
-            case 219 /* YieldExpression */:
-            case 220 /* SpreadElement */:
+            case 212 /* TypeOfExpression */:
+            case 211 /* DeleteExpression */:
+            case 213 /* VoidExpression */:
+            case 220 /* YieldExpression */:
+            case 221 /* SpreadElement */:
                 var unaryWordExpression = n;
                 return isCompletedNode(unaryWordExpression.expression, sourceFile);
-            case 205 /* TaggedTemplateExpression */:
+            case 206 /* TaggedTemplateExpression */:
                 return isCompletedNode(n.template, sourceFile);
-            case 218 /* TemplateExpression */:
+            case 219 /* TemplateExpression */:
                 var lastSpan = ts.lastOrUndefined(n.templateSpans);
                 return isCompletedNode(lastSpan, sourceFile);
-            case 228 /* TemplateSpan */:
+            case 229 /* TemplateSpan */:
                 return ts.nodeIsPresent(n.literal);
-            case 267 /* ExportDeclaration */:
-            case 261 /* ImportDeclaration */:
+            case 268 /* ExportDeclaration */:
+            case 262 /* ImportDeclaration */:
                 return ts.nodeIsPresent(n.moduleSpecifier);
-            case 214 /* PrefixUnaryExpression */:
+            case 215 /* PrefixUnaryExpression */:
                 return isCompletedNode(n.operand, sourceFile);
-            case 216 /* BinaryExpression */:
+            case 217 /* BinaryExpression */:
                 return isCompletedNode(n.right, sourceFile);
-            case 217 /* ConditionalExpression */:
+            case 218 /* ConditionalExpression */:
                 return isCompletedNode(n.whenFalse, sourceFile);
             default:
                 return true;
@@ -116107,11 +119289,11 @@ var ts;
     function getAdjustedLocationForDeclaration(node, forRename) {
         if (!forRename) {
             switch (node.kind) {
-                case 252 /* ClassDeclaration */:
-                case 221 /* ClassExpression */:
+                case 253 /* ClassDeclaration */:
+                case 222 /* ClassExpression */:
                     return getAdjustedLocationForClass(node);
-                case 251 /* FunctionDeclaration */:
-                case 208 /* FunctionExpression */:
+                case 252 /* FunctionDeclaration */:
+                case 209 /* FunctionExpression */:
                     return getAdjustedLocationForFunction(node);
             }
         }
@@ -116371,7 +119553,7 @@ var ts;
             // for (... /**/in [|name|])
             // for (... /**/of [|name|])
             if (node.kind === 100 /* InKeyword */ && ts.isForInStatement(parent) ||
-                node.kind === 156 /* OfKeyword */ && ts.isForOfStatement(parent)) {
+                node.kind === 157 /* OfKeyword */ && ts.isForOfStatement(parent)) {
                 return ts.skipOuterExpressions(parent.expression);
             }
         }
@@ -116440,6 +119622,21 @@ var ts;
             return current;
         }
     }
+    /**
+     * Returns the first token where position is in [start, end),
+     * excluding `JsxText` tokens containing only whitespace.
+     */
+    function findFirstNonJsxWhitespaceToken(sourceFile, position) {
+        var tokenAtPosition = getTokenAtPosition(sourceFile, position);
+        while (isWhiteSpaceOnlyJsxText(tokenAtPosition)) {
+            var nextToken = findNextToken(tokenAtPosition, tokenAtPosition.parent, sourceFile);
+            if (!nextToken)
+                return;
+            tokenAtPosition = nextToken;
+        }
+        return tokenAtPosition;
+    }
+    ts.findFirstNonJsxWhitespaceToken = findFirstNonJsxWhitespaceToken;
     /**
      * The token on the left of the position is the token that strictly includes the position
      * or sits to the left of the cursor if it is on a boundary. For example
@@ -116526,7 +119723,7 @@ var ts;
                     }
                 }
             }
-            ts.Debug.assert(startNode !== undefined || n.kind === 297 /* SourceFile */ || n.kind === 1 /* EndOfFileToken */ || ts.isJSDocCommentContainingNode(n));
+            ts.Debug.assert(startNode !== undefined || n.kind === 298 /* 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.
@@ -116599,17 +119796,17 @@ var ts;
             return true;
         }
         // <div> { | </div> or <div a={| </div>
-        if (token.kind === 29 /* LessThanToken */ && token.parent.kind === 283 /* JsxExpression */) {
+        if (token.kind === 29 /* LessThanToken */ && token.parent.kind === 284 /* JsxExpression */) {
             return true;
         }
         // <div> {
         // |
         // } < /div>
-        if (token && token.kind === 19 /* CloseBraceToken */ && token.parent.kind === 283 /* JsxExpression */) {
+        if (token && token.kind === 19 /* CloseBraceToken */ && token.parent.kind === 284 /* JsxExpression */) {
             return true;
         }
         // <div>|</div>
-        if (token.kind === 29 /* LessThanToken */ && token.parent.kind === 276 /* JsxClosingElement */) {
+        if (token.kind === 29 /* LessThanToken */ && token.parent.kind === 277 /* JsxClosingElement */) {
             return true;
         }
         return false;
@@ -116640,7 +119837,7 @@ var ts;
     function isInsideJsxElement(sourceFile, position) {
         function isInsideJsxElementTraversal(node) {
             while (node) {
-                if (node.kind >= 274 /* JsxSelfClosingElement */ && node.kind <= 283 /* JsxExpression */
+                if (node.kind >= 275 /* JsxSelfClosingElement */ && node.kind <= 284 /* JsxExpression */
                     || node.kind === 11 /* JsxText */
                     || node.kind === 29 /* LessThanToken */
                     || node.kind === 31 /* GreaterThanToken */
@@ -116650,7 +119847,7 @@ var ts;
                     || node.kind === 43 /* SlashToken */) {
                     node = node.parent;
                 }
-                else if (node.kind === 273 /* JsxElement */) {
+                else if (node.kind === 274 /* JsxElement */) {
                     if (position > node.getStart(sourceFile))
                         return true;
                     node = node.parent;
@@ -116858,16 +120055,16 @@ var ts;
             result.push("deprecated" /* deprecatedModifier */);
         if (node.flags & 8388608 /* Ambient */)
             result.push("declare" /* ambientModifier */);
-        if (node.kind === 266 /* ExportAssignment */)
+        if (node.kind === 267 /* ExportAssignment */)
             result.push("export" /* exportedModifier */);
         return result.length > 0 ? result.join(",") : "" /* none */;
     }
     ts.getNodeModifiers = getNodeModifiers;
     function getTypeArgumentOrTypeParameterList(node) {
-        if (node.kind === 173 /* TypeReference */ || node.kind === 203 /* CallExpression */) {
+        if (node.kind === 174 /* TypeReference */ || node.kind === 204 /* CallExpression */) {
             return node.typeArguments;
         }
-        if (ts.isFunctionLike(node) || node.kind === 252 /* ClassDeclaration */ || node.kind === 253 /* InterfaceDeclaration */) {
+        if (ts.isFunctionLike(node) || node.kind === 253 /* ClassDeclaration */ || node.kind === 254 /* InterfaceDeclaration */) {
             return node.typeParameters;
         }
         return undefined;
@@ -116912,18 +120109,18 @@ var ts;
     }
     ts.cloneCompilerOptions = cloneCompilerOptions;
     function isArrayLiteralOrObjectLiteralDestructuringPattern(node) {
-        if (node.kind === 199 /* ArrayLiteralExpression */ ||
-            node.kind === 200 /* ObjectLiteralExpression */) {
+        if (node.kind === 200 /* ArrayLiteralExpression */ ||
+            node.kind === 201 /* ObjectLiteralExpression */) {
             // [a,b,c] from:
             // [a, b, c] = someExpression;
-            if (node.parent.kind === 216 /* BinaryExpression */ &&
+            if (node.parent.kind === 217 /* 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 === 239 /* ForOfStatement */ &&
+            if (node.parent.kind === 240 /* ForOfStatement */ &&
                 node.parent.initializer === node) {
                 return true;
             }
@@ -116931,7 +120128,7 @@ var ts;
             // [x, [a, b, c] ] = someExpression
             // or
             // {x, a: {a, b, c} } = someExpression
-            if (isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent.kind === 288 /* PropertyAssignment */ ? node.parent.parent : node.parent)) {
+            if (isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent.kind === 289 /* PropertyAssignment */ ? node.parent.parent : node.parent)) {
                 return true;
             }
         }
@@ -117051,7 +120248,7 @@ var ts;
     }
     ts.skipConstraint = skipConstraint;
     function getNameFromPropertyName(name) {
-        return name.kind === 158 /* ComputedPropertyName */
+        return name.kind === 159 /* 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);
@@ -117070,7 +120267,7 @@ var ts;
     }
     ts.compilerOptionsIndicateEs6Modules = compilerOptionsIndicateEs6Modules;
     function createModuleSpecifierResolutionHost(program, host) {
-        // Mix in `getProbableSymlinks` from Program when host doesn't have it
+        // Mix in `getSymlinkCache` from Program when host doesn't have it
         // in order for non-Project hosts to have a symlinks cache.
         return {
             fileExists: function (fileName) { return program.fileExists(fileName); },
@@ -117078,6 +120275,7 @@ var ts;
             readFile: ts.maybeBind(host, host.readFile),
             useCaseSensitiveFileNames: ts.maybeBind(host, host.useCaseSensitiveFileNames),
             getSymlinkCache: ts.maybeBind(host, host.getSymlinkCache) || program.getSymlinkCache,
+            getModuleSpecifierCache: ts.maybeBind(host, host.getModuleSpecifierCache),
             getGlobalTypingsCacheLocation: ts.maybeBind(host, host.getGlobalTypingsCacheLocation),
             getSourceFiles: function () { return program.getSourceFiles(); },
             redirectTargetsMap: program.redirectTargetsMap,
@@ -117152,6 +120350,13 @@ var ts;
         });
     }
     ts.symbolEscapedNameNoDefault = symbolEscapedNameNoDefault;
+    function isModuleSpecifierLike(node) {
+        return ts.isStringLiteralLike(node) && (ts.isExternalModuleReference(node.parent) ||
+            ts.isImportDeclaration(node.parent) ||
+            ts.isRequireCall(node.parent, /*requireStringLiteralLikeArgument*/ false) && node.parent.arguments[0] === node ||
+            ts.isImportCall(node.parent) && node.parent.arguments[0] === node);
+    }
+    ts.isModuleSpecifierLike = isModuleSpecifierLike;
     function isObjectBindingElementWithoutPropertyName(bindingElement) {
         return ts.isBindingElement(bindingElement) &&
             ts.isObjectBindingPattern(bindingElement.parent) &&
@@ -117185,7 +120390,7 @@ var ts;
     ts.findModifier = findModifier;
     function insertImports(changes, sourceFile, imports, blankLineBetween) {
         var decl = ts.isArray(imports) ? imports[0] : imports;
-        var importKindPredicate = decl.kind === 232 /* VariableStatement */ ? ts.isRequireVariableStatement : ts.isAnyImportSyntax;
+        var importKindPredicate = decl.kind === 233 /* 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) {
@@ -117263,7 +120468,7 @@ var ts;
     // Display-part writer helpers
     // #region
     function isFirstDeclarationOfSymbolParameter(symbol) {
-        return symbol.declarations && symbol.declarations.length > 0 && symbol.declarations[0].kind === 160 /* Parameter */;
+        return symbol.declarations && symbol.declarations.length > 0 && symbol.declarations[0].kind === 161 /* Parameter */;
     }
     ts.isFirstDeclarationOfSymbolParameter = isFirstDeclarationOfSymbolParameter;
     var displayPartWriter = getDisplayPartWriter();
@@ -117426,6 +120631,14 @@ var ts;
         return displayPart(ts.tokenToString(kind), ts.SymbolDisplayPartKind.operator);
     }
     ts.operatorPart = operatorPart;
+    function parameterNamePart(text) {
+        return displayPart(text, ts.SymbolDisplayPartKind.parameterName);
+    }
+    ts.parameterNamePart = parameterNamePart;
+    function propertyNamePart(text) {
+        return displayPart(text, ts.SymbolDisplayPartKind.propertyName);
+    }
+    ts.propertyNamePart = propertyNamePart;
     function textOrKeywordPart(text) {
         var kind = ts.stringToToken(text);
         return kind === undefined
@@ -117437,6 +120650,58 @@ var ts;
         return displayPart(text, ts.SymbolDisplayPartKind.text);
     }
     ts.textPart = textPart;
+    function typeAliasNamePart(text) {
+        return displayPart(text, ts.SymbolDisplayPartKind.aliasName);
+    }
+    ts.typeAliasNamePart = typeAliasNamePart;
+    function typeParameterNamePart(text) {
+        return displayPart(text, ts.SymbolDisplayPartKind.typeParameterName);
+    }
+    ts.typeParameterNamePart = typeParameterNamePart;
+    function linkTextPart(text) {
+        return displayPart(text, ts.SymbolDisplayPartKind.linkText);
+    }
+    ts.linkTextPart = linkTextPart;
+    function linkNamePart(name, target) {
+        return {
+            text: ts.getTextOfNode(name),
+            kind: ts.SymbolDisplayPartKind[ts.SymbolDisplayPartKind.linkName],
+            target: {
+                fileName: ts.getSourceFileOfNode(target).fileName,
+                textSpan: createTextSpanFromNode(target),
+            },
+        };
+    }
+    ts.linkNamePart = linkNamePart;
+    function linkPart(text) {
+        return displayPart(text, ts.SymbolDisplayPartKind.link);
+    }
+    ts.linkPart = linkPart;
+    function buildLinkParts(link, checker) {
+        var _a;
+        var parts = [linkPart("{@link ")];
+        if (!link.name) {
+            if (link.text) {
+                parts.push(linkTextPart(link.text));
+            }
+        }
+        else {
+            var symbol = checker === null || checker === void 0 ? void 0 : checker.getSymbolAtLocation(link.name);
+            var decl = (symbol === null || symbol === void 0 ? void 0 : symbol.valueDeclaration) || ((_a = symbol === null || symbol === void 0 ? void 0 : symbol.declarations) === null || _a === void 0 ? void 0 : _a[0]);
+            if (decl) {
+                parts.push(linkNamePart(link.name, decl));
+                if (link.text) {
+                    parts.push(linkTextPart(link.text));
+                }
+            }
+            else {
+                parts.push(linkTextPart(ts.getTextOfNode(link.name) + link.text));
+            }
+        }
+        parts.push(linkPart("}"));
+        return parts;
+    }
+    ts.buildLinkParts = buildLinkParts;
     var carriageReturnLineFeed = "\r\n";
     /**
      * The default is CRLF.
@@ -117722,21 +120987,23 @@ var ts;
     }
     /* @internal */
     function needsParentheses(expression) {
-        return ts.isBinaryExpression(expression) && expression.operatorToken.kind === 27 /* CommaToken */ || ts.isObjectLiteralExpression(expression);
+        return ts.isBinaryExpression(expression) && expression.operatorToken.kind === 27 /* CommaToken */
+            || ts.isObjectLiteralExpression(expression)
+            || ts.isAsExpression(expression) && ts.isObjectLiteralExpression(expression.expression);
     }
     ts.needsParentheses = needsParentheses;
     function getContextualTypeFromParent(node, checker) {
         var parent = node.parent;
         switch (parent.kind) {
-            case 204 /* NewExpression */:
+            case 205 /* NewExpression */:
                 return checker.getContextualType(parent);
-            case 216 /* BinaryExpression */: {
+            case 217 /* 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 284 /* CaseClause */:
+            case 285 /* CaseClause */:
                 return parent.expression === node ? getSwitchedType(parent, checker) : undefined;
             default:
                 return checker.getContextualType(node);
@@ -117766,8 +121033,8 @@ var ts;
         switch (node.kind) {
             case 10 /* StringLiteral */:
             case 14 /* NoSubstitutionTemplateLiteral */:
-            case 218 /* TemplateExpression */:
-            case 205 /* TaggedTemplateExpression */:
+            case 219 /* TemplateExpression */:
+            case 206 /* TaggedTemplateExpression */:
                 return true;
             default:
                 return false;
@@ -117800,41 +121067,41 @@ var ts;
     }
     ts.getTypeNodeIfAccessible = getTypeNodeIfAccessible;
     function syntaxRequiresTrailingCommaOrSemicolonOrASI(kind) {
-        return kind === 169 /* CallSignature */
-            || kind === 170 /* ConstructSignature */
-            || kind === 171 /* IndexSignature */
-            || kind === 162 /* PropertySignature */
-            || kind === 164 /* MethodSignature */;
+        return kind === 170 /* CallSignature */
+            || kind === 171 /* ConstructSignature */
+            || kind === 172 /* IndexSignature */
+            || kind === 163 /* PropertySignature */
+            || kind === 165 /* MethodSignature */;
     }
     ts.syntaxRequiresTrailingCommaOrSemicolonOrASI = syntaxRequiresTrailingCommaOrSemicolonOrASI;
     function syntaxRequiresTrailingFunctionBlockOrSemicolonOrASI(kind) {
-        return kind === 251 /* FunctionDeclaration */
-            || kind === 166 /* Constructor */
-            || kind === 165 /* MethodDeclaration */
-            || kind === 167 /* GetAccessor */
-            || kind === 168 /* SetAccessor */;
+        return kind === 252 /* FunctionDeclaration */
+            || kind === 167 /* Constructor */
+            || kind === 166 /* MethodDeclaration */
+            || kind === 168 /* GetAccessor */
+            || kind === 169 /* SetAccessor */;
     }
     ts.syntaxRequiresTrailingFunctionBlockOrSemicolonOrASI = syntaxRequiresTrailingFunctionBlockOrSemicolonOrASI;
     function syntaxRequiresTrailingModuleBlockOrSemicolonOrASI(kind) {
-        return kind === 256 /* ModuleDeclaration */;
+        return kind === 257 /* ModuleDeclaration */;
     }
     ts.syntaxRequiresTrailingModuleBlockOrSemicolonOrASI = syntaxRequiresTrailingModuleBlockOrSemicolonOrASI;
     function syntaxRequiresTrailingSemicolonOrASI(kind) {
-        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 */;
+        return kind === 233 /* VariableStatement */
+            || kind === 234 /* ExpressionStatement */
+            || kind === 236 /* DoStatement */
+            || kind === 241 /* ContinueStatement */
+            || kind === 242 /* BreakStatement */
+            || kind === 243 /* ReturnStatement */
+            || kind === 247 /* ThrowStatement */
+            || kind === 249 /* DebuggerStatement */
+            || kind === 164 /* PropertyDeclaration */
+            || kind === 255 /* TypeAliasDeclaration */
+            || kind === 262 /* ImportDeclaration */
+            || kind === 261 /* ImportEqualsDeclaration */
+            || kind === 268 /* ExportDeclaration */
+            || kind === 260 /* NamespaceExportDeclaration */
+            || kind === 267 /* ExportAssignment */;
     }
     ts.syntaxRequiresTrailingSemicolonOrASI = syntaxRequiresTrailingSemicolonOrASI;
     ts.syntaxMayBeASICandidate = ts.or(syntaxRequiresTrailingCommaOrSemicolonOrASI, syntaxRequiresTrailingFunctionBlockOrSemicolonOrASI, syntaxRequiresTrailingModuleBlockOrSemicolonOrASI, syntaxRequiresTrailingSemicolonOrASI);
@@ -117864,7 +121131,7 @@ var ts;
             return false;
         }
         // See comment in parser’s `parseDoStatement`
-        if (node.kind === 235 /* DoStatement */) {
+        if (node.kind === 236 /* DoStatement */) {
             return true;
         }
         var topNode = ts.findAncestor(node, function (ancestor) { return !ancestor.parent; });
@@ -118038,6 +121305,94 @@ var ts;
         }
     }
     ts.createPackageJsonInfo = createPackageJsonInfo;
+    function createPackageJsonImportFilter(fromFile, host) {
+        var packageJsons = ((host.getPackageJsonsVisibleToFile && host.getPackageJsonsVisibleToFile(fromFile.fileName)) || getPackageJsonsVisibleToFile(fromFile.fileName, host)).filter(function (p) { return p.parseable; });
+        var usesNodeCoreModules;
+        return { allowsImportingAmbientModule: allowsImportingAmbientModule, allowsImportingSourceFile: allowsImportingSourceFile, allowsImportingSpecifier: allowsImportingSpecifier };
+        function moduleSpecifierIsCoveredByPackageJson(specifier) {
+            var packageName = getNodeModuleRootSpecifier(specifier);
+            for (var _i = 0, packageJsons_1 = packageJsons; _i < packageJsons_1.length; _i++) {
+                var packageJson = packageJsons_1[_i];
+                if (packageJson.has(packageName) || packageJson.has(ts.getTypesPackageName(packageName))) {
+                    return true;
+                }
+            }
+            return false;
+        }
+        function allowsImportingAmbientModule(moduleSymbol, moduleSpecifierResolutionHost) {
+            if (!packageJsons.length || !moduleSymbol.valueDeclaration) {
+                return true;
+            }
+            var declaringSourceFile = moduleSymbol.valueDeclaration.getSourceFile();
+            var declaringNodeModuleName = getNodeModulesPackageNameFromFileName(declaringSourceFile.fileName, moduleSpecifierResolutionHost);
+            if (typeof declaringNodeModuleName === "undefined") {
+                return true;
+            }
+            var declaredModuleSpecifier = ts.stripQuotes(moduleSymbol.getName());
+            if (isAllowedCoreNodeModulesImport(declaredModuleSpecifier)) {
+                return true;
+            }
+            return moduleSpecifierIsCoveredByPackageJson(declaringNodeModuleName)
+                || moduleSpecifierIsCoveredByPackageJson(declaredModuleSpecifier);
+        }
+        function allowsImportingSourceFile(sourceFile, moduleSpecifierResolutionHost) {
+            if (!packageJsons.length) {
+                return true;
+            }
+            var moduleSpecifier = getNodeModulesPackageNameFromFileName(sourceFile.fileName, moduleSpecifierResolutionHost);
+            if (!moduleSpecifier) {
+                return true;
+            }
+            return moduleSpecifierIsCoveredByPackageJson(moduleSpecifier);
+        }
+        function allowsImportingSpecifier(moduleSpecifier) {
+            if (!packageJsons.length || isAllowedCoreNodeModulesImport(moduleSpecifier)) {
+                return true;
+            }
+            if (ts.pathIsRelative(moduleSpecifier) || ts.isRootedDiskPath(moduleSpecifier)) {
+                return true;
+            }
+            return moduleSpecifierIsCoveredByPackageJson(moduleSpecifier);
+        }
+        function isAllowedCoreNodeModulesImport(moduleSpecifier) {
+            // If we’re in JavaScript, it can be difficult to tell whether the user wants to import
+            // from Node core modules or not. We can start by seeing if the user is actually using
+            // any node core modules, as opposed to simply having @types/node accidentally as a
+            // dependency of a dependency.
+            if (ts.isSourceFileJS(fromFile) && ts.JsTyping.nodeCoreModules.has(moduleSpecifier)) {
+                if (usesNodeCoreModules === undefined) {
+                    usesNodeCoreModules = consumesNodeCoreModules(fromFile);
+                }
+                if (usesNodeCoreModules) {
+                    return true;
+                }
+            }
+            return false;
+        }
+        function getNodeModulesPackageNameFromFileName(importedFileName, moduleSpecifierResolutionHost) {
+            if (!ts.stringContains(importedFileName, "node_modules")) {
+                return undefined;
+            }
+            var specifier = ts.moduleSpecifiers.getNodeModulesPackageName(host.getCompilationSettings(), fromFile.path, importedFileName, moduleSpecifierResolutionHost);
+            if (!specifier) {
+                return undefined;
+            }
+            // Paths here are not node_modules, so we don’t care about them;
+            // returning anything will trigger a lookup in package.json.
+            if (!ts.pathIsRelative(specifier) && !ts.isRootedDiskPath(specifier)) {
+                return getNodeModuleRootSpecifier(specifier);
+            }
+        }
+        function getNodeModuleRootSpecifier(fullSpecifier) {
+            var components = ts.getPathComponents(ts.getPackageNameFromTypesPackageName(fullSpecifier)).slice(1);
+            // Scoped packages
+            if (ts.startsWith(components[0], "@")) {
+                return components[0] + "/" + components[1];
+            }
+            return components[0];
+        }
+    }
+    ts.createPackageJsonImportFilter = createPackageJsonImportFilter;
     function tryParseJson(text) {
         try {
             return JSON.parse(text);
@@ -118180,6 +121535,184 @@ var ts;
         return ts.isInJSFile(declaration) || !ts.findAncestor(declaration, ts.isGlobalScopeAugmentation);
     }
     ts.isNonGlobalDeclaration = isNonGlobalDeclaration;
+    var ImportKind;
+    (function (ImportKind) {
+        ImportKind[ImportKind["Named"] = 0] = "Named";
+        ImportKind[ImportKind["Default"] = 1] = "Default";
+        ImportKind[ImportKind["Namespace"] = 2] = "Namespace";
+        ImportKind[ImportKind["CommonJS"] = 3] = "CommonJS";
+    })(ImportKind = ts.ImportKind || (ts.ImportKind = {}));
+    var ExportKind;
+    (function (ExportKind) {
+        ExportKind[ExportKind["Named"] = 0] = "Named";
+        ExportKind[ExportKind["Default"] = 1] = "Default";
+        ExportKind[ExportKind["ExportEquals"] = 2] = "ExportEquals";
+        ExportKind[ExportKind["UMD"] = 3] = "UMD";
+    })(ExportKind = ts.ExportKind || (ts.ExportKind = {}));
+    function createExportMapCache() {
+        var cache;
+        var projectVersion;
+        var usableByFileName;
+        var wrapped = {
+            isEmpty: function () {
+                return !cache;
+            },
+            clear: function () {
+                cache = undefined;
+                projectVersion = undefined;
+            },
+            set: function (suggestions, version) {
+                cache = suggestions;
+                if (version) {
+                    projectVersion = version;
+                }
+            },
+            get: function (file, checker, version) {
+                if (usableByFileName && file !== usableByFileName) {
+                    return undefined;
+                }
+                if (version && projectVersion === version) {
+                    return cache;
+                }
+                cache === null || cache === void 0 ? void 0 : cache.forEach(function (infos) {
+                    var _a, _b, _c;
+                    for (var _i = 0, infos_1 = infos; _i < infos_1.length; _i++) {
+                        var info = infos_1[_i];
+                        // If the symbol/moduleSymbol was a merged symbol, it will have a new identity
+                        // in the checker, even though the symbols to merge are the same (guaranteed by
+                        // cache invalidation in synchronizeHostData).
+                        if ((_a = info.symbol.declarations) === null || _a === void 0 ? void 0 : _a.length) {
+                            info.symbol = checker.getMergedSymbol(info.exportKind === 1 /* Default */
+                                ? (_b = info.symbol.declarations[0].localSymbol) !== null && _b !== void 0 ? _b : info.symbol.declarations[0].symbol
+                                : info.symbol.declarations[0].symbol);
+                        }
+                        if ((_c = info.moduleSymbol.declarations) === null || _c === void 0 ? void 0 : _c.length) {
+                            info.moduleSymbol = checker.getMergedSymbol(info.moduleSymbol.declarations[0].symbol);
+                        }
+                    }
+                });
+                return cache;
+            },
+            onFileChanged: function (oldSourceFile, newSourceFile, typeAcquisitionEnabled) {
+                if (fileIsGlobalOnly(oldSourceFile) && fileIsGlobalOnly(newSourceFile)) {
+                    // File is purely global; doesn't affect export map
+                    return false;
+                }
+                if (usableByFileName && usableByFileName !== newSourceFile.path ||
+                    // If ATA is enabled, auto-imports uses existing imports to guess whether you want auto-imports from node.
+                    // Adding or removing imports from node could change the outcome of that guess, so could change the suggestions list.
+                    typeAcquisitionEnabled && consumesNodeCoreModules(oldSourceFile) !== consumesNodeCoreModules(newSourceFile) ||
+                    // Module agumentation and ambient module changes can add or remove exports available to be auto-imported.
+                    // Changes elsewhere in the file can change the *type* of an export in a module augmentation,
+                    // but type info is gathered in getCompletionEntryDetails, which doesn’t use the cache.
+                    !ts.arrayIsEqualTo(oldSourceFile.moduleAugmentations, newSourceFile.moduleAugmentations) ||
+                    !ambientModuleDeclarationsAreEqual(oldSourceFile, newSourceFile)) {
+                    this.clear();
+                    return true;
+                }
+                usableByFileName = newSourceFile.path;
+                return false;
+            },
+        };
+        if (ts.Debug.isDebugging) {
+            Object.defineProperty(wrapped, "__cache", { get: function () { return cache; } });
+        }
+        return wrapped;
+        function fileIsGlobalOnly(file) {
+            return !file.commonJsModuleIndicator && !file.externalModuleIndicator && !file.moduleAugmentations && !file.ambientModuleNames;
+        }
+        function ambientModuleDeclarationsAreEqual(oldSourceFile, newSourceFile) {
+            if (!ts.arrayIsEqualTo(oldSourceFile.ambientModuleNames, newSourceFile.ambientModuleNames)) {
+                return false;
+            }
+            var oldFileStatementIndex = -1;
+            var newFileStatementIndex = -1;
+            var _loop_1 = function (ambientModuleName) {
+                var isMatchingModuleDeclaration = function (node) { return ts.isNonGlobalAmbientModule(node) && node.name.text === ambientModuleName; };
+                oldFileStatementIndex = ts.findIndex(oldSourceFile.statements, isMatchingModuleDeclaration, oldFileStatementIndex + 1);
+                newFileStatementIndex = ts.findIndex(newSourceFile.statements, isMatchingModuleDeclaration, newFileStatementIndex + 1);
+                if (oldSourceFile.statements[oldFileStatementIndex] !== newSourceFile.statements[newFileStatementIndex]) {
+                    return { value: false };
+                }
+            };
+            for (var _i = 0, _a = newSourceFile.ambientModuleNames; _i < _a.length; _i++) {
+                var ambientModuleName = _a[_i];
+                var state_1 = _loop_1(ambientModuleName);
+                if (typeof state_1 === "object")
+                    return state_1.value;
+            }
+            return true;
+        }
+    }
+    ts.createExportMapCache = createExportMapCache;
+    function createModuleSpecifierCache() {
+        var cache;
+        var importingFileName;
+        var wrapped = {
+            get: function (fromFileName, toFileName) {
+                if (!cache || fromFileName !== importingFileName)
+                    return undefined;
+                return cache.get(toFileName);
+            },
+            set: function (fromFileName, toFileName, moduleSpecifiers) {
+                if (cache && fromFileName !== importingFileName) {
+                    cache.clear();
+                }
+                importingFileName = fromFileName;
+                (cache || (cache = new ts.Map())).set(toFileName, moduleSpecifiers);
+            },
+            clear: function () {
+                cache = undefined;
+                importingFileName = undefined;
+            },
+            count: function () {
+                return cache ? cache.size : 0;
+            }
+        };
+        if (ts.Debug.isDebugging) {
+            Object.defineProperty(wrapped, "__cache", { get: function () { return cache; } });
+        }
+        return wrapped;
+    }
+    ts.createModuleSpecifierCache = createModuleSpecifierCache;
+    function isImportableFile(program, from, to, packageJsonFilter, moduleSpecifierResolutionHost, moduleSpecifierCache) {
+        var _a;
+        if (from === to)
+            return false;
+        var cachedResult = moduleSpecifierCache === null || moduleSpecifierCache === void 0 ? void 0 : moduleSpecifierCache.get(from.path, to.path);
+        if (cachedResult !== undefined) {
+            return !!cachedResult;
+        }
+        var getCanonicalFileName = ts.hostGetCanonicalFileName(moduleSpecifierResolutionHost);
+        var globalTypingsCache = (_a = moduleSpecifierResolutionHost.getGlobalTypingsCacheLocation) === null || _a === void 0 ? void 0 : _a.call(moduleSpecifierResolutionHost);
+        var hasImportablePath = !!ts.moduleSpecifiers.forEachFileNameOfModule(from.fileName, to.fileName, moduleSpecifierResolutionHost, 
+        /*preferSymlinks*/ false, function (toPath) {
+            var toFile = program.getSourceFile(toPath);
+            // Determine to import using toPath only if toPath is what we were looking at
+            // or there doesnt exist the file in the program by the symlink
+            return (toFile === to || !toFile) &&
+                isImportablePath(from.fileName, toPath, getCanonicalFileName, globalTypingsCache);
+        });
+        if (packageJsonFilter) {
+            var isImportable = hasImportablePath && packageJsonFilter.allowsImportingSourceFile(to, moduleSpecifierResolutionHost);
+            moduleSpecifierCache === null || moduleSpecifierCache === void 0 ? void 0 : moduleSpecifierCache.set(from.path, to.path, isImportable);
+            return isImportable;
+        }
+        return hasImportablePath;
+    }
+    ts.isImportableFile = isImportableFile;
+    /**
+     * Don't include something from a `node_modules` that isn't actually reachable by a global import.
+     * A relative import to node_modules is usually a bad idea.
+     */
+    function isImportablePath(fromPath, toPath, getCanonicalFileName, globalCachePath) {
+        // If it's in a `node_modules` but is not reachable from here via a global import, don't bother.
+        var toNodeModules = ts.forEachAncestorDirectory(toPath, function (ancestor) { return ts.getBaseFileName(ancestor) === "node_modules" ? ancestor : undefined; });
+        var toNodeModulesParent = toNodeModules && ts.getDirectoryPath(getCanonicalFileName(toNodeModules));
+        return toNodeModulesParent === undefined
+            || ts.startsWith(getCanonicalFileName(fromPath), toNodeModulesParent)
+            || (!!globalCachePath && ts.startsWith(getCanonicalFileName(globalCachePath), toNodeModulesParent));
+    }
     // #endregion
 })(ts || (ts = {}));
 var ts;
@@ -118621,13 +122154,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 256 /* ModuleDeclaration */:
-            case 252 /* ClassDeclaration */:
-            case 253 /* InterfaceDeclaration */:
-            case 251 /* FunctionDeclaration */:
-            case 221 /* ClassExpression */:
-            case 208 /* FunctionExpression */:
-            case 209 /* ArrowFunction */:
+            case 257 /* ModuleDeclaration */:
+            case 253 /* ClassDeclaration */:
+            case 254 /* InterfaceDeclaration */:
+            case 252 /* FunctionDeclaration */:
+            case 222 /* ClassExpression */:
+            case 209 /* FunctionExpression */:
+            case 210 /* ArrowFunction */:
                 cancellationToken.throwIfCancellationRequested();
         }
     }
@@ -118834,10 +122367,11 @@ var ts;
             pushClassification(start, width, 1 /* comment */);
         }
         function classifyJSDocComment(docComment) {
+            var _a, _b, _c, _d, _e, _f, _g;
             var pos = docComment.pos;
             if (docComment.tags) {
-                for (var _i = 0, _a = docComment.tags; _i < _a.length; _i++) {
-                    var tag = _a[_i];
+                for (var _i = 0, _h = docComment.tags; _i < _h.length; _i++) {
+                    var tag = _h[_i];
                     // As we walk through each tag, classify the portion of text from the end of
                     // the last tag (or the start of the entire doc comment) as 'comment'.
                     if (tag.pos !== pos) {
@@ -118846,22 +122380,56 @@ var ts;
                     pushClassification(tag.pos, 1, 10 /* punctuation */); // "@"
                     pushClassification(tag.tagName.pos, tag.tagName.end - tag.tagName.pos, 18 /* docCommentTagName */); // e.g. "param"
                     pos = tag.tagName.end;
+                    var commentStart = tag.tagName.end;
                     switch (tag.kind) {
-                        case 326 /* JSDocParameterTag */:
-                            processJSDocParameterTag(tag);
+                        case 330 /* JSDocParameterTag */:
+                            var param = tag;
+                            processJSDocParameterTag(param);
+                            commentStart = param.isNameFirst && ((_a = param.typeExpression) === null || _a === void 0 ? void 0 : _a.end) || param.name.end;
+                            break;
+                        case 337 /* JSDocPropertyTag */:
+                            var prop = tag;
+                            commentStart = prop.isNameFirst && ((_b = prop.typeExpression) === null || _b === void 0 ? void 0 : _b.end) || prop.name.end;
                             break;
-                        case 330 /* JSDocTemplateTag */:
+                        case 334 /* JSDocTemplateTag */:
                             processJSDocTemplateTag(tag);
                             pos = tag.end;
+                            commentStart = tag.typeParameters.end;
+                            break;
+                        case 335 /* JSDocTypedefTag */:
+                            var type = tag;
+                            commentStart = ((_c = type.typeExpression) === null || _c === void 0 ? void 0 : _c.kind) === 302 /* JSDocTypeExpression */ && ((_d = type.fullName) === null || _d === void 0 ? void 0 : _d.end) || ((_e = type.typeExpression) === null || _e === void 0 ? void 0 : _e.end) || commentStart;
+                            break;
+                        case 328 /* JSDocCallbackTag */:
+                            commentStart = tag.typeExpression.end;
                             break;
-                        case 329 /* JSDocTypeTag */:
+                        case 333 /* JSDocTypeTag */:
                             processElement(tag.typeExpression);
                             pos = tag.end;
+                            commentStart = tag.typeExpression.end;
                             break;
-                        case 327 /* JSDocReturnTag */:
+                        case 332 /* JSDocThisTag */:
+                        case 329 /* JSDocEnumTag */:
+                            commentStart = tag.typeExpression.end;
+                            break;
+                        case 331 /* JSDocReturnTag */:
                             processElement(tag.typeExpression);
                             pos = tag.end;
+                            commentStart = ((_f = tag.typeExpression) === null || _f === void 0 ? void 0 : _f.end) || commentStart;
+                            break;
+                        case 336 /* JSDocSeeTag */:
+                            commentStart = ((_g = tag.name) === null || _g === void 0 ? void 0 : _g.end) || commentStart;
                             break;
+                        case 318 /* JSDocAugmentsTag */:
+                        case 319 /* JSDocImplementsTag */:
+                            commentStart = tag.class.end;
+                            break;
+                    }
+                    if (typeof tag.comment === "object") {
+                        pushCommentRange(tag.comment.pos, tag.comment.end - tag.comment.pos);
+                    }
+                    else if (typeof tag.comment === "string") {
+                        pushCommentRange(commentStart, tag.end - commentStart);
                     }
                 }
             }
@@ -119009,22 +122577,22 @@ var ts;
         }
         function tryClassifyJsxElementName(token) {
             switch (token.parent && token.parent.kind) {
-                case 275 /* JsxOpeningElement */:
+                case 276 /* JsxOpeningElement */:
                     if (token.parent.tagName === token) {
                         return 19 /* jsxOpenTagName */;
                     }
                     break;
-                case 276 /* JsxClosingElement */:
+                case 277 /* JsxClosingElement */:
                     if (token.parent.tagName === token) {
                         return 20 /* jsxCloseTagName */;
                     }
                     break;
-                case 274 /* JsxSelfClosingElement */:
+                case 275 /* JsxSelfClosingElement */:
                     if (token.parent.tagName === token) {
                         return 21 /* jsxSelfClosingTagName */;
                     }
                     break;
-                case 280 /* JsxAttribute */:
+                case 281 /* JsxAttribute */:
                     if (token.parent.name === token) {
                         return 22 /* jsxAttribute */;
                     }
@@ -119053,17 +122621,17 @@ var ts;
                     var parent = token.parent;
                     if (tokenKind === 62 /* EqualsToken */) {
                         // the '=' in a variable declaration is special cased here.
-                        if (parent.kind === 249 /* VariableDeclaration */ ||
-                            parent.kind === 163 /* PropertyDeclaration */ ||
-                            parent.kind === 160 /* Parameter */ ||
-                            parent.kind === 280 /* JsxAttribute */) {
+                        if (parent.kind === 250 /* VariableDeclaration */ ||
+                            parent.kind === 164 /* PropertyDeclaration */ ||
+                            parent.kind === 161 /* Parameter */ ||
+                            parent.kind === 281 /* JsxAttribute */) {
                             return 5 /* operator */;
                         }
                     }
-                    if (parent.kind === 216 /* BinaryExpression */ ||
-                        parent.kind === 214 /* PrefixUnaryExpression */ ||
-                        parent.kind === 215 /* PostfixUnaryExpression */ ||
-                        parent.kind === 217 /* ConditionalExpression */) {
+                    if (parent.kind === 217 /* BinaryExpression */ ||
+                        parent.kind === 215 /* PrefixUnaryExpression */ ||
+                        parent.kind === 216 /* PostfixUnaryExpression */ ||
+                        parent.kind === 218 /* ConditionalExpression */) {
                         return 5 /* operator */;
                     }
                 }
@@ -119076,7 +122644,7 @@ var ts;
                 return 25 /* bigintLiteral */;
             }
             else if (tokenKind === 10 /* StringLiteral */) {
-                return token && token.parent.kind === 280 /* JsxAttribute */ ? 24 /* jsxAttributeStringLiteralValue */ : 6 /* stringLiteral */;
+                return token && token.parent.kind === 281 /* JsxAttribute */ ? 24 /* jsxAttributeStringLiteralValue */ : 6 /* stringLiteral */;
             }
             else if (tokenKind === 13 /* RegularExpressionLiteral */) {
                 // TODO: we should get another classification type for these literals.
@@ -119092,32 +122660,32 @@ var ts;
             else if (tokenKind === 78 /* Identifier */) {
                 if (token) {
                     switch (token.parent.kind) {
-                        case 252 /* ClassDeclaration */:
+                        case 253 /* ClassDeclaration */:
                             if (token.parent.name === token) {
                                 return 11 /* className */;
                             }
                             return;
-                        case 159 /* TypeParameter */:
+                        case 160 /* TypeParameter */:
                             if (token.parent.name === token) {
                                 return 15 /* typeParameterName */;
                             }
                             return;
-                        case 253 /* InterfaceDeclaration */:
+                        case 254 /* InterfaceDeclaration */:
                             if (token.parent.name === token) {
                                 return 13 /* interfaceName */;
                             }
                             return;
-                        case 255 /* EnumDeclaration */:
+                        case 256 /* EnumDeclaration */:
                             if (token.parent.name === token) {
                                 return 12 /* enumName */;
                             }
                             return;
-                        case 256 /* ModuleDeclaration */:
+                        case 257 /* ModuleDeclaration */:
                             if (token.parent.name === token) {
                                 return 14 /* moduleName */;
                             }
                             return;
-                        case 160 /* Parameter */:
+                        case 161 /* Parameter */:
                             if (token.parent.name === token) {
                                 return ts.isThisIdentifier(token) ? 3 /* keyword */ : 17 /* parameterName */;
                             }
@@ -119219,13 +122787,13 @@ var ts;
                 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 */:
+                        case 257 /* ModuleDeclaration */:
+                        case 253 /* ClassDeclaration */:
+                        case 254 /* InterfaceDeclaration */:
+                        case 252 /* FunctionDeclaration */:
+                        case 222 /* ClassExpression */:
+                        case 209 /* FunctionExpression */:
+                        case 210 /* ArrowFunction */:
                             cancellationToken.throwIfCancellationRequested();
                     }
                     if (!node || !ts.textSpanIntersectsWith(span, node.pos, node.getFullWidth()) || node.getFullWidth() === 0) {
@@ -119371,25 +122939,25 @@ var ts;
                 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 */]
+                [250 /* VariableDeclaration */, 7 /* variable */],
+                [161 /* Parameter */, 6 /* parameter */],
+                [164 /* PropertyDeclaration */, 9 /* property */],
+                [257 /* ModuleDeclaration */, 3 /* namespace */],
+                [256 /* EnumDeclaration */, 1 /* enum */],
+                [292 /* EnumMember */, 8 /* enumMember */],
+                [253 /* ClassDeclaration */, 0 /* class */],
+                [166 /* MethodDeclaration */, 11 /* member */],
+                [252 /* FunctionDeclaration */, 10 /* function */],
+                [209 /* FunctionExpression */, 10 /* function */],
+                [165 /* MethodSignature */, 11 /* member */],
+                [168 /* GetAccessor */, 9 /* property */],
+                [169 /* SetAccessor */, 9 /* property */],
+                [163 /* PropertySignature */, 9 /* property */],
+                [254 /* InterfaceDeclaration */, 2 /* interface */],
+                [255 /* TypeAliasDeclaration */, 5 /* type */],
+                [160 /* TypeParameter */, 4 /* typeParameter */],
+                [289 /* PropertyAssignment */, 9 /* property */],
+                [290 /* ShorthandPropertyAssignment */, 9 /* property */]
             ]);
         })(v2020 = classifier.v2020 || (classifier.v2020 = {}));
     })(classifier = ts.classifier || (ts.classifier = {}));
@@ -119409,12 +122977,12 @@ var ts;
                 if (ts.isInString(sourceFile, position, contextToken)) {
                     if (!contextToken || !ts.isStringLiteralLike(contextToken))
                         return undefined;
-                    var entries = getStringLiteralCompletionEntries(sourceFile, contextToken, position, checker, options, host);
-                    return convertStringLiteralCompletions(entries, contextToken, sourceFile, checker, log, preferences);
+                    var entries = getStringLiteralCompletionEntries(sourceFile, contextToken, position, checker, options, host, preferences);
+                    return convertStringLiteralCompletions(entries, contextToken, sourceFile, checker, log, options, preferences);
                 }
             }
             StringCompletions.getStringLiteralCompletions = getStringLiteralCompletions;
-            function convertStringLiteralCompletions(completion, contextToken, sourceFile, checker, log, preferences) {
+            function convertStringLiteralCompletions(completion, contextToken, sourceFile, checker, log, options, preferences) {
                 if (completion === undefined) {
                     return undefined;
                 }
@@ -119424,7 +122992,7 @@ var ts;
                         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
+                        Completions.getCompletionEntriesFromSymbols(completion.symbols, entries, contextToken, sourceFile, sourceFile, checker, 99 /* ESNext */, log, 4 /* String */, preferences, options); // Target will not be used, so arbitrary
                         return { isGlobalCompletion: false, isMemberCompletion: true, isNewIdentifierLocation: completion.hasIndexSignature, optionalReplacementSpan: optionalReplacementSpan, entries: entries };
                     }
                     case 2 /* Types */: {
@@ -119441,10 +123009,10 @@ var ts;
                         return ts.Debug.assertNever(completion);
                 }
             }
-            function getStringLiteralCompletionDetails(name, sourceFile, position, contextToken, checker, options, host, cancellationToken) {
+            function getStringLiteralCompletionDetails(name, sourceFile, position, contextToken, checker, options, host, cancellationToken, preferences) {
                 if (!contextToken || !ts.isStringLiteralLike(contextToken))
                     return undefined;
-                var completions = getStringLiteralCompletionEntries(sourceFile, contextToken, position, checker, options, host);
+                var completions = getStringLiteralCompletionEntries(sourceFile, contextToken, position, checker, options, host, preferences);
                 return completions && stringLiteralCompletionDetails(name, contextToken, completions, sourceFile, checker, cancellationToken);
             }
             StringCompletions.getStringLiteralCompletionDetails = getStringLiteralCompletionDetails;
@@ -119493,13 +123061,13 @@ var ts;
                 StringLiteralCompletionKind[StringLiteralCompletionKind["Properties"] = 1] = "Properties";
                 StringLiteralCompletionKind[StringLiteralCompletionKind["Types"] = 2] = "Types";
             })(StringLiteralCompletionKind || (StringLiteralCompletionKind = {}));
-            function getStringLiteralCompletionEntries(sourceFile, node, position, typeChecker, compilerOptions, host) {
+            function getStringLiteralCompletionEntries(sourceFile, node, position, typeChecker, compilerOptions, host, preferences) {
                 var parent = walkUpParentheses(node.parent);
                 switch (parent.kind) {
-                    case 191 /* LiteralType */: {
+                    case 192 /* LiteralType */: {
                         var grandParent = walkUpParentheses(parent.parent);
                         switch (grandParent.kind) {
-                            case 173 /* TypeReference */: {
+                            case 174 /* TypeReference */: {
                                 var typeReference_1 = grandParent;
                                 var typeArgument = ts.findAncestor(parent, function (n) { return n.parent === typeReference_1; });
                                 if (typeArgument) {
@@ -119507,7 +123075,7 @@ var ts;
                                 }
                                 return undefined;
                             }
-                            case 189 /* IndexedAccessType */:
+                            case 190 /* IndexedAccessType */:
                                 // Get all apparent property names
                                 // i.e. interface Foo {
                                 //          foo: string;
@@ -119519,9 +123087,9 @@ var ts;
                                     return undefined;
                                 }
                                 return stringLiteralCompletionsFromProperties(typeChecker.getTypeFromTypeNode(objectType));
-                            case 195 /* ImportType */:
-                                return { kind: 0 /* Paths */, paths: getStringLiteralCompletionsFromModuleNames(sourceFile, node, compilerOptions, host, typeChecker) };
-                            case 182 /* UnionType */: {
+                            case 196 /* ImportType */:
+                                return { kind: 0 /* Paths */, paths: getStringLiteralCompletionsFromModuleNames(sourceFile, node, compilerOptions, host, typeChecker, preferences) };
+                            case 183 /* UnionType */: {
                                 if (!ts.isTypeReferenceNode(grandParent.parent)) {
                                     return undefined;
                                 }
@@ -119533,7 +123101,7 @@ var ts;
                                 return undefined;
                         }
                     }
-                    case 288 /* PropertyAssignment */:
+                    case 289 /* PropertyAssignment */:
                         if (ts.isObjectLiteralExpression(parent.parent) && parent.name === node) {
                             // Get quoted name of properties of the object literal expression
                             // i.e. interface ConfigFiles {
@@ -119550,7 +123118,7 @@ var ts;
                             return stringLiteralCompletionsForObjectLiteral(typeChecker, parent.parent);
                         }
                         return fromContextualType();
-                    case 202 /* ElementAccessExpression */: {
+                    case 203 /* ElementAccessExpression */: {
                         var _b = parent, expression = _b.expression, argumentExpression = _b.argumentExpression;
                         if (node === ts.skipParentheses(argumentExpression)) {
                             // Get all names of properties on the expression
@@ -119563,8 +123131,8 @@ var ts;
                         }
                         return undefined;
                     }
-                    case 203 /* CallExpression */:
-                    case 204 /* NewExpression */:
+                    case 204 /* CallExpression */:
+                    case 205 /* 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
@@ -119573,16 +123141,16 @@ var ts;
                             return argumentInfo ? getStringLiteralCompletionsFromSignature(argumentInfo, typeChecker) : fromContextualType();
                         }
                     // falls through (is `require("")` or `import("")`)
-                    case 261 /* ImportDeclaration */:
-                    case 267 /* ExportDeclaration */:
-                    case 272 /* ExternalModuleReference */:
+                    case 262 /* ImportDeclaration */:
+                    case 268 /* ExportDeclaration */:
+                    case 273 /* ExternalModuleReference */:
                         // Get all known external module names or complete a path to a module
                         // i.e. import * as ns from "/*completion position*/";
                         //      var y = import("/*completion position*/");
                         //      import x = require("/*completion position*/");
                         //      var y = require("/*completion position*/");
                         //      export * from "/*completion position*/";
-                        return { kind: 0 /* Paths */, paths: getStringLiteralCompletionsFromModuleNames(sourceFile, node, compilerOptions, host, typeChecker) };
+                        return { kind: 0 /* Paths */, paths: getStringLiteralCompletionsFromModuleNames(sourceFile, node, compilerOptions, host, typeChecker, preferences) };
                     default:
                         return fromContextualType();
                 }
@@ -119594,9 +123162,9 @@ var ts;
             }
             function walkUpParentheses(node) {
                 switch (node.kind) {
-                    case 186 /* ParenthesizedType */:
+                    case 187 /* ParenthesizedType */:
                         return ts.walkUpParenthesizedTypes(node);
-                    case 207 /* ParenthesizedExpression */:
+                    case 208 /* ParenthesizedExpression */:
                         return ts.walkUpParenthesizedExpressions(node);
                     default:
                         return node;
@@ -119624,7 +123192,7 @@ var ts;
             function stringLiteralCompletionsFromProperties(type) {
                 return type && {
                     kind: 1 /* Properties */,
-                    symbols: ts.filter(type.getApparentProperties(), function (prop) { return !(prop.valueDeclaration && ts.isPrivateIdentifierPropertyDeclaration(prop.valueDeclaration)); }),
+                    symbols: ts.filter(type.getApparentProperties(), function (prop) { return !(prop.valueDeclaration && ts.isPrivateIdentifierClassElementDeclaration(prop.valueDeclaration)); }),
                     hasIndexSignature: ts.hasIndexSignature(type)
                 };
             }
@@ -119662,23 +123230,23 @@ var ts;
                     return Math.max(name.indexOf(ts.directorySeparator), name.indexOf(ts.altDirectorySeparator)) !== -1 ? { name: name, kind: kind, extension: extension, span: wholeSpan } : { name: name, kind: kind, extension: extension, span: span };
                 });
             }
-            function getStringLiteralCompletionsFromModuleNames(sourceFile, node, compilerOptions, host, typeChecker) {
-                return addReplacementSpans(node.text, node.getStart(sourceFile) + 1, getStringLiteralCompletionsFromModuleNamesWorker(sourceFile, node, compilerOptions, host, typeChecker));
+            function getStringLiteralCompletionsFromModuleNames(sourceFile, node, compilerOptions, host, typeChecker, preferences) {
+                return addReplacementSpans(node.text, node.getStart(sourceFile) + 1, getStringLiteralCompletionsFromModuleNamesWorker(sourceFile, node, compilerOptions, host, typeChecker, preferences));
             }
-            function getStringLiteralCompletionsFromModuleNamesWorker(sourceFile, node, compilerOptions, host, typeChecker) {
+            function getStringLiteralCompletionsFromModuleNamesWorker(sourceFile, node, compilerOptions, host, typeChecker, preferences) {
                 var literalValue = ts.normalizeSlashes(node.text);
                 var scriptPath = sourceFile.path;
                 var scriptDirectory = ts.getDirectoryPath(scriptPath);
                 return isPathRelativeToScript(literalValue) || !compilerOptions.baseUrl && (ts.isRootedDiskPath(literalValue) || ts.isUrl(literalValue))
-                    ? getCompletionEntriesForRelativeModules(literalValue, scriptDirectory, compilerOptions, host, scriptPath)
+                    ? getCompletionEntriesForRelativeModules(literalValue, scriptDirectory, compilerOptions, host, scriptPath, preferences)
                     : getCompletionEntriesForNonRelativeModules(literalValue, scriptDirectory, compilerOptions, host, typeChecker);
             }
             function getExtensionOptions(compilerOptions, includeExtensions) {
                 if (includeExtensions === void 0) { includeExtensions = false; }
                 return { extensions: getSupportedExtensionsForModuleResolution(compilerOptions), includeExtensions: includeExtensions };
             }
-            function getCompletionEntriesForRelativeModules(literalValue, scriptDirectory, compilerOptions, host, scriptPath) {
-                var extensionOptions = getExtensionOptions(compilerOptions);
+            function getCompletionEntriesForRelativeModules(literalValue, scriptDirectory, compilerOptions, host, scriptPath, preferences) {
+                var extensionOptions = getExtensionOptions(compilerOptions, preferences.importModuleSpecifierEnding === "js");
                 if (compilerOptions.rootDirs) {
                     return getCompletionEntriesForDirectoryFragmentWithRootDirs(compilerOptions.rootDirs, literalValue, scriptDirectory, extensionOptions, compilerOptions, host, scriptPath);
                 }
@@ -119795,7 +123363,7 @@ var ts;
                         continue;
                     var patterns = paths[path];
                     if (patterns) {
-                        var _loop_1 = function (name, kind, extension) {
+                        var _loop_2 = function (name, kind, extension) {
                             // Path mappings may provide a duplicate way to get to something we've already added, so don't add again.
                             if (!result.some(function (entry) { return entry.name === name; })) {
                                 result.push(nameAndKind(name, kind, extension));
@@ -119803,7 +123371,7 @@ var ts;
                         };
                         for (var _i = 0, _a = getCompletionsForPathMapping(path, patterns, fragment, baseDirectory, fileExtensions, host); _i < _a.length; _i++) {
                             var _b = _a[_i], name = _b.name, kind = _b.kind, extension = _b.extension;
-                            _loop_1(name, kind, extension);
+                            _loop_2(name, kind, extension);
                         }
                     }
                 }
@@ -119838,7 +123406,7 @@ var ts;
                     // (But do if we didn't find anything, e.g. 'package.json' missing.)
                     var foundGlobal = false;
                     if (fragmentDirectory === undefined) {
-                        var _loop_2 = function (moduleName) {
+                        var _loop_3 = function (moduleName) {
                             if (!result.some(function (entry) { return entry.name === moduleName; })) {
                                 foundGlobal = true;
                                 result.push(nameAndKind(moduleName, "external module name" /* externalModuleName */, /*extension*/ undefined));
@@ -119846,7 +123414,7 @@ var ts;
                         };
                         for (var _b = 0, _c = enumerateNodeModulesVisibleToScript(host, scriptPath); _b < _c.length; _b++) {
                             var moduleName = _c[_b];
-                            _loop_2(moduleName);
+                            _loop_3(moduleName);
                         }
                     }
                     if (!foundGlobal) {
@@ -120093,6 +123661,7 @@ var ts;
             SymbolOriginInfoKind[SymbolOriginInfoKind["Export"] = 4] = "Export";
             SymbolOriginInfoKind[SymbolOriginInfoKind["Promise"] = 8] = "Promise";
             SymbolOriginInfoKind[SymbolOriginInfoKind["Nullable"] = 16] = "Nullable";
+            SymbolOriginInfoKind[SymbolOriginInfoKind["ResolvedExport"] = 32] = "ResolvedExport";
             SymbolOriginInfoKind[SymbolOriginInfoKind["SymbolMemberNoExport"] = 2] = "SymbolMemberNoExport";
             SymbolOriginInfoKind[SymbolOriginInfoKind["SymbolMemberExport"] = 6] = "SymbolMemberExport";
         })(SymbolOriginInfoKind || (SymbolOriginInfoKind = {}));
@@ -120105,8 +123674,14 @@ var ts;
         function originIsExport(origin) {
             return !!(origin && origin.kind & 4 /* Export */);
         }
+        function originIsResolvedExport(origin) {
+            return !!(origin && origin.kind === 32 /* ResolvedExport */);
+        }
+        function originIncludesSymbolName(origin) {
+            return originIsExport(origin) || originIsResolvedExport(origin);
+        }
         function originIsPackageJsonImport(origin) {
-            return originIsExport(origin) && !!origin.isFromPackageJson;
+            return (originIsExport(origin) || originIsResolvedExport(origin)) && !!origin.isFromPackageJson;
         }
         function originIsPromise(origin) {
             return !!(origin.kind & 8 /* Promise */);
@@ -120132,52 +123707,6 @@ var ts;
             GlobalsSearch[GlobalsSearch["Success"] = 1] = "Success";
             GlobalsSearch[GlobalsSearch["Fail"] = 2] = "Fail";
         })(GlobalsSearch || (GlobalsSearch = {}));
-        function createImportSuggestionsForFileCache() {
-            var cache;
-            var projectVersion;
-            var fileName;
-            return {
-                isEmpty: function () {
-                    return !cache;
-                },
-                clear: function () {
-                    cache = undefined;
-                    fileName = undefined;
-                    projectVersion = undefined;
-                },
-                set: function (file, suggestions, version) {
-                    cache = suggestions;
-                    fileName = file;
-                    if (version) {
-                        projectVersion = version;
-                    }
-                },
-                get: function (file, checker, version) {
-                    if (file !== fileName) {
-                        return undefined;
-                    }
-                    if (version) {
-                        return projectVersion === version ? cache : undefined;
-                    }
-                    ts.forEach(cache, function (suggestion) {
-                        var _a, _b, _c;
-                        // If the symbol/moduleSymbol was a merged symbol, it will have a new identity
-                        // in the checker, even though the symbols to merge are the same (guaranteed by
-                        // cache invalidation in synchronizeHostData).
-                        if ((_a = suggestion.symbol.declarations) === null || _a === void 0 ? void 0 : _a.length) {
-                            suggestion.symbol = checker.getMergedSymbol(suggestion.origin.isDefaultExport
-                                ? (_b = suggestion.symbol.declarations[0].localSymbol) !== null && _b !== void 0 ? _b : suggestion.symbol.declarations[0].symbol
-                                : suggestion.symbol.declarations[0].symbol);
-                        }
-                        if ((_c = suggestion.origin.moduleSymbol.declarations) === null || _c === void 0 ? void 0 : _c.length) {
-                            suggestion.origin.moduleSymbol = checker.getMergedSymbol(suggestion.origin.moduleSymbol.declarations[0].symbol);
-                        }
-                    });
-                    return cache;
-                },
-            };
-        }
-        Completions.createImportSuggestionsForFileCache = createImportSuggestionsForFileCache;
         function getCompletionsAtPosition(host, program, log, sourceFile, position, preferences, triggerCharacter) {
             var typeChecker = program.getTypeChecker();
             var compilerOptions = program.getCompilerOptions();
@@ -120185,6 +123714,13 @@ var ts;
             if (triggerCharacter && !ts.isInString(sourceFile, position, contextToken) && !isValidTrigger(sourceFile, triggerCharacter, contextToken, position)) {
                 return undefined;
             }
+            if (triggerCharacter === " ") {
+                // `isValidTrigger` ensures we are at `import |`
+                if (preferences.includeCompletionsForImportStatements && preferences.includeCompletionsWithInsertText) {
+                    return { isGlobalCompletion: true, isMemberCompletion: false, isNewIdentifierLocation: true, isIncomplete: true, entries: [] };
+                }
+                return undefined;
+            }
             var stringCompletions = Completions.StringCompletions.getStringLiteralCompletions(sourceFile, position, contextToken, typeChecker, compilerOptions, host, log, preferences);
             if (stringCompletions) {
                 return stringCompletions;
@@ -120208,6 +123744,8 @@ var ts;
                     return jsdocCompletionInfo(ts.JsDoc.getJSDocTagCompletions());
                 case 3 /* JsDocParameterName */:
                     return jsdocCompletionInfo(ts.JsDoc.getJSDocParameterNameCompletions(completionData.tag));
+                case 4 /* Keywords */:
+                    return specificKeywordCompletionInfo(completionData.keywords);
                 default:
                     return ts.Debug.assertNever(completionData);
             }
@@ -120216,33 +123754,36 @@ var ts;
         function jsdocCompletionInfo(entries) {
             return { isGlobalCompletion: false, isMemberCompletion: false, isNewIdentifierLocation: false, entries: entries };
         }
+        function specificKeywordCompletionInfo(keywords) {
+            return {
+                isGlobalCompletion: false,
+                isMemberCompletion: false,
+                isNewIdentifierLocation: false,
+                entries: keywords.map(function (k) { return ({
+                    name: ts.tokenToString(k),
+                    kind: "keyword" /* keyword */,
+                    kindModifiers: "" /* none */,
+                    sortText: SortText.GlobalsOrKeywords,
+                }); }),
+            };
+        }
         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)) {
-                // In the TypeScript JSX element, if such element is not defined. When users query for completion at closing tag,
-                // instead of simply giving unknown value, the completion will return the tag-name of an associated opening-element.
-                // For example:
-                //     var x = <div> </ /*1*/
-                // The completion list at "1" will contain "div>" with type any
-                // And at `<div> </ /*1*/ >` (with a closing `>`), the completion list will contain "div".
-                var tagName = location.parent.parent.openingElement.tagName;
-                var hasClosingAngleBracket = !!ts.findChildOfKind(location.parent, 31 /* GreaterThanToken */, sourceFile);
-                var entry = {
-                    name: tagName.getFullText(sourceFile) + (hasClosingAngleBracket ? "" : ">"),
-                    kind: "class" /* classElement */,
-                    kindModifiers: undefined,
-                    sortText: SortText.LocationPriority,
-                };
-                return { isGlobalCompletion: false, isMemberCompletion: true, isNewIdentifierLocation: false, optionalReplacementSpan: getOptionalReplacementSpan(location), entries: [entry] };
+            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, isTypeOnlyLocation = completionData.isTypeOnlyLocation, isJsxIdentifierExpected = completionData.isJsxIdentifierExpected, importCompletionNode = completionData.importCompletionNode, insideJsDocTagTypeExpression = completionData.insideJsDocTagTypeExpression, symbolToSortTextMap = completionData.symbolToSortTextMap;
+            // Verify if the file is JSX language variant
+            if (ts.getLanguageVariant(sourceFile.scriptKind) === 1 /* JSX */) {
+                var completionInfo = getJsxClosingTagCompletion(location, sourceFile);
+                if (completionInfo) {
+                    return completionInfo;
+                }
             }
             var entries = [];
             if (isUncheckedFile(sourceFile, compilerOptions)) {
                 var uniqueNames = getCompletionEntriesFromSymbols(symbols, entries, 
-                /* contextToken */ undefined, location, sourceFile, typeChecker, compilerOptions.target, log, completionKind, preferences, propertyAccessToConvert, completionData.isJsxIdentifierExpected, isJsxInitializer, recommendedCompletion, symbolToOriginInfoMap, symbolToSortTextMap);
+                /* contextToken */ undefined, location, sourceFile, typeChecker, compilerOptions.target, log, completionKind, preferences, compilerOptions, isTypeOnlyLocation, propertyAccessToConvert, isJsxIdentifierExpected, isJsxInitializer, importCompletionNode, recommendedCompletion, symbolToOriginInfoMap, symbolToSortTextMap);
                 getJSCompletionEntries(sourceFile, location.pos, uniqueNames, compilerOptions.target, entries); // TODO: GH#18217
             }
             else {
@@ -120250,7 +123791,7 @@ var ts;
                     return undefined;
                 }
                 getCompletionEntriesFromSymbols(symbols, entries, 
-                /* contextToken */ undefined, location, sourceFile, typeChecker, compilerOptions.target, log, completionKind, preferences, propertyAccessToConvert, completionData.isJsxIdentifierExpected, isJsxInitializer, recommendedCompletion, symbolToOriginInfoMap, symbolToSortTextMap);
+                /* contextToken */ undefined, location, sourceFile, typeChecker, compilerOptions.target, log, completionKind, preferences, compilerOptions, isTypeOnlyLocation, propertyAccessToConvert, isJsxIdentifierExpected, isJsxInitializer, importCompletionNode, recommendedCompletion, symbolToOriginInfoMap, symbolToSortTextMap);
             }
             if (keywordFilters !== 0 /* None */) {
                 var entryNames = new ts.Set(entries.map(function (e) { return e.name; }));
@@ -120286,6 +123827,49 @@ var ts;
                     return false;
             }
         }
+        function getJsxClosingTagCompletion(location, sourceFile) {
+            // We wanna walk up the tree till we find a JSX closing element
+            var jsxClosingElement = ts.findAncestor(location, function (node) {
+                switch (node.kind) {
+                    case 277 /* JsxClosingElement */:
+                        return true;
+                    case 43 /* SlashToken */:
+                    case 31 /* GreaterThanToken */:
+                    case 78 /* Identifier */:
+                    case 202 /* PropertyAccessExpression */:
+                        return false;
+                    default:
+                        return "quit";
+                }
+            });
+            if (jsxClosingElement) {
+                // In the TypeScript JSX element, if such element is not defined. When users query for completion at closing tag,
+                // instead of simply giving unknown value, the completion will return the tag-name of an associated opening-element.
+                // For example:
+                //     var x = <div> </ /*1*/
+                // The completion list at "1" will contain "div>" with type any
+                // And at `<div> </ /*1*/ >` (with a closing `>`), the completion list will contain "div".
+                // And at property access expressions `<MainComponent.Child> </MainComponent. /*1*/ >` the completion will
+                // return full closing tag with an optional replacement span
+                // For example:
+                //     var x = <MainComponent.Child> </     MainComponent /*1*/  >
+                //     var y = <MainComponent.Child> </   /*2*/   MainComponent >
+                // the completion list at "1" and "2" will contain "MainComponent.Child" with a replacement span of closing tag name
+                var hasClosingAngleBracket = !!ts.findChildOfKind(jsxClosingElement, 31 /* GreaterThanToken */, sourceFile);
+                var tagName = jsxClosingElement.parent.openingElement.tagName;
+                var closingTag = tagName.getText(sourceFile);
+                var fullClosingTag = closingTag + (hasClosingAngleBracket ? "" : ">");
+                var replacementSpan = ts.createTextSpanFromNode(jsxClosingElement.tagName);
+                var entry = {
+                    name: fullClosingTag,
+                    kind: "class" /* classElement */,
+                    kindModifiers: undefined,
+                    sortText: SortText.LocationPriority,
+                };
+                return { isGlobalCompletion: false, isMemberCompletion: true, isNewIdentifierLocation: false, optionalReplacementSpan: replacementSpan, entries: [entry] };
+            }
+            return;
+        }
         function getJSCompletionEntries(sourceFile, position, uniqueNames, target, entries) {
             ts.getNameTable(sourceFile).forEach(function (pos, name) {
                 // Skip identifiers produced only from the current location
@@ -120312,9 +123896,13 @@ var ts;
         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) {
+        function createCompletionEntry(symbol, sortText, contextToken, location, sourceFile, typeChecker, name, needsConvertPropertyAccess, origin, recommendedCompletion, propertyAccessToConvert, isJsxInitializer, importCompletionNode, useSemicolons, options, preferences) {
+            var _a;
             var insertText;
             var replacementSpan = ts.getReplacementSpanForContextToken(contextToken);
+            var data;
+            var isSnippet;
+            var sourceDisplay;
             var insertQuestionDot = origin && originIsNullableMember(origin);
             var useBraces = origin && originIsSymbolMember(origin) || needsConvertPropertyAccess;
             if (origin && originIsThisType(origin)) {
@@ -120358,9 +123946,24 @@ var ts;
                 insertText = needsConvertPropertyAccess ? "" + awaitText + insertText : "" + awaitText + (insertQuestionDot ? "?." : ".") + insertText;
                 replacementSpan = ts.createTextSpanFromBounds(propertyAccessToConvert.getStart(sourceFile), propertyAccessToConvert.end);
             }
+            if (originIsResolvedExport(origin)) {
+                ts.Debug.assertIsDefined(importCompletionNode);
+                (_a = getInsertTextAndReplacementSpanForImportCompletion(name, importCompletionNode, origin, useSemicolons, options, preferences), insertText = _a.insertText, replacementSpan = _a.replacementSpan);
+                sourceDisplay = [ts.textPart(origin.moduleSpecifier)];
+                isSnippet = preferences.includeCompletionsWithSnippetText ? true : undefined;
+            }
             if (insertText !== undefined && !preferences.includeCompletionsWithInsertText) {
                 return undefined;
             }
+            if (originIsExport(origin) || originIsResolvedExport(origin)) {
+                data = {
+                    exportName: origin.exportName,
+                    fileName: origin.fileName,
+                    ambientModuleName: origin.fileName ? undefined : ts.stripQuotes(origin.moduleSymbol.name),
+                    isPackageJsonImport: origin.isFromPackageJson ? true : undefined,
+                    moduleSpecifier: originIsResolvedExport(origin) ? origin.moduleSpecifier : undefined,
+                };
+            }
             // TODO(drosen): Right now we just permit *all* semantic meanings when calling
             // 'getSymbolKind' which is permissible given that it is backwards compatible; but
             // really we should consider passing the meaning for the node so that we don't report
@@ -120378,9 +123981,30 @@ var ts;
                 isRecommended: isRecommendedCompletionMatch(symbol, recommendedCompletion, typeChecker) || undefined,
                 insertText: insertText,
                 replacementSpan: replacementSpan,
+                sourceDisplay: sourceDisplay,
+                isSnippet: isSnippet,
                 isPackageJsonImport: originIsPackageJsonImport(origin) || undefined,
+                isImportStatementCompletion: originIsResolvedExport(origin) || undefined,
+                data: data,
             };
         }
+        function getInsertTextAndReplacementSpanForImportCompletion(name, importCompletionNode, origin, useSemicolons, options, preferences) {
+            var sourceFile = importCompletionNode.getSourceFile();
+            var replacementSpan = ts.createTextSpanFromNode(importCompletionNode, sourceFile);
+            var quotedModuleSpecifier = ts.quote(sourceFile, preferences, origin.moduleSpecifier);
+            var exportKind = origin.isDefaultExport ? 1 /* Default */ :
+                origin.exportName === "export=" /* ExportEquals */ ? 2 /* ExportEquals */ :
+                    0 /* Named */;
+            var tabStop = preferences.includeCompletionsWithSnippetText ? "$1" : "";
+            var importKind = ts.codefix.getImportKind(sourceFile, exportKind, options);
+            var suffix = useSemicolons ? ";" : "";
+            switch (importKind) {
+                case 3 /* CommonJS */: return { replacementSpan: replacementSpan, insertText: "import " + name + tabStop + " = require(" + quotedModuleSpecifier + ")" + suffix };
+                case 1 /* Default */: return { replacementSpan: replacementSpan, insertText: "import " + name + tabStop + " from " + quotedModuleSpecifier + suffix };
+                case 2 /* Namespace */: return { replacementSpan: replacementSpan, insertText: "import * as " + name + tabStop + " from " + quotedModuleSpecifier + suffix };
+                case 0 /* Named */: return { replacementSpan: replacementSpan, insertText: "import { " + name + tabStop + " } from " + quotedModuleSpecifier + suffix };
+            }
+        }
         function quotePropertyName(sourceFile, preferences, name) {
             if (/^\d+$/.test(name)) {
                 return name;
@@ -120395,29 +124019,31 @@ var ts;
             if (originIsExport(origin)) {
                 return ts.stripQuotes(origin.moduleSymbol.name);
             }
+            if (originIsResolvedExport(origin)) {
+                return origin.moduleSpecifier;
+            }
             if ((origin === null || origin === void 0 ? void 0 : origin.kind) === 1 /* ThisType */) {
                 return CompletionSource.ThisProperty;
             }
         }
-        function getCompletionEntriesFromSymbols(symbols, entries, contextToken, location, sourceFile, typeChecker, target, log, kind, preferences, propertyAccessToConvert, jsxIdentifierExpected, isJsxInitializer, recommendedCompletion, symbolToOriginInfoMap, symbolToSortTextMap) {
+        function getCompletionEntriesFromSymbols(symbols, entries, contextToken, location, sourceFile, typeChecker, target, log, kind, preferences, compilerOptions, isTypeOnlyLocation, propertyAccessToConvert, jsxIdentifierExpected, isJsxInitializer, importCompletionNode, recommendedCompletion, symbolToOriginInfoMap, symbolToSortTextMap) {
             var start = ts.timestamp();
+            var variableDeclaration = getVariableDeclaration(location);
+            var useSemicolons = ts.probablyUsesSemicolons(sourceFile);
             // Tracks unique names.
             // Value is set to false for global variables or completions from external module exports, because we can have multiple of those;
             // true otherwise. Based on the order we add things we will always see locals first, then globals, then module exports.
             // So adding a completion for a local will prevent us from adding completions for external module exports sharing the same name.
             var uniques = new ts.Map();
-            for (var _i = 0, symbols_1 = symbols; _i < symbols_1.length; _i++) {
-                var symbol = symbols_1[_i];
-                var origin = symbolToOriginInfoMap ? symbolToOriginInfoMap[ts.getSymbolId(symbol)] : undefined;
+            for (var i = 0; i < symbols.length; i++) {
+                var symbol = symbols[i];
+                var origin = symbolToOriginInfoMap === null || symbolToOriginInfoMap === void 0 ? void 0 : symbolToOriginInfoMap[i];
                 var info = getCompletionEntryDisplayNameForSymbol(symbol, target, origin, kind, !!jsxIdentifierExpected);
-                if (!info) {
+                if (!info || uniques.get(info.name) || kind === 1 /* Global */ && symbolToSortTextMap && !shouldIncludeSymbol(symbol, symbolToSortTextMap)) {
                     continue;
                 }
                 var name = info.name, needsConvertPropertyAccess = info.needsConvertPropertyAccess;
-                if (uniques.get(name)) {
-                    continue;
-                }
-                var entry = createCompletionEntry(symbol, symbolToSortTextMap && symbolToSortTextMap[ts.getSymbolId(symbol)] || SortText.LocationPriority, contextToken, location, sourceFile, typeChecker, name, needsConvertPropertyAccess, origin, recommendedCompletion, propertyAccessToConvert, isJsxInitializer, preferences);
+                var entry = createCompletionEntry(symbol, symbolToSortTextMap && symbolToSortTextMap[ts.getSymbolId(symbol)] || SortText.LocationPriority, contextToken, location, sourceFile, typeChecker, name, needsConvertPropertyAccess, origin, recommendedCompletion, propertyAccessToConvert, isJsxInitializer, importCompletionNode, useSemicolons, compilerOptions, preferences);
                 if (!entry) {
                     continue;
                 }
@@ -120434,6 +124060,46 @@ var ts;
                 has: function (name) { return uniques.has(name); },
                 add: function (name) { return uniques.set(name, true); },
             };
+            function shouldIncludeSymbol(symbol, symbolToSortTextMap) {
+                if (!ts.isSourceFile(location)) {
+                    // export = /**/ here we want to get all meanings, so any symbol is ok
+                    if (ts.isExportAssignment(location.parent)) {
+                        return true;
+                    }
+                    // Filter out variables from their own initializers
+                    // `const a = /* no 'a' here */`
+                    if (variableDeclaration && symbol.valueDeclaration === variableDeclaration) {
+                        return false;
+                    }
+                    // External modules can have global export declarations that will be
+                    // available as global keywords in all scopes. But if the external module
+                    // already has an explicit export and user only wants to user explicit
+                    // module imports then the global keywords will be filtered out so auto
+                    // import suggestions will win in the completion
+                    var symbolOrigin = ts.skipAlias(symbol, typeChecker);
+                    // We only want to filter out the global keywords
+                    // Auto Imports are not available for scripts so this conditional is always false
+                    if (!!sourceFile.externalModuleIndicator
+                        && !compilerOptions.allowUmdGlobalAccess
+                        && symbolToSortTextMap[ts.getSymbolId(symbol)] === SortText.GlobalsOrKeywords
+                        && (symbolToSortTextMap[ts.getSymbolId(symbolOrigin)] === SortText.AutoImportSuggestions
+                            || symbolToSortTextMap[ts.getSymbolId(symbolOrigin)] === SortText.LocationPriority)) {
+                        return false;
+                    }
+                    // Continue with origin symbol
+                    symbol = symbolOrigin;
+                    // import m = /**/ <-- It can only access namespace (if typing import = x. this would get member symbols and not namespace)
+                    if (ts.isInRightSideOfInternalImportEqualsDeclaration(location)) {
+                        return !!(symbol.flags & 1920 /* Namespace */);
+                    }
+                    if (isTypeOnlyLocation) {
+                        // It's a type, but you can reach it by namespace.type as well
+                        return symbolCanBeReferencedAtTypeLocation(symbol, typeChecker);
+                    }
+                }
+                // expressions are value space (which includes the value namespaces)
+                return !!(ts.getCombinedLocalAndExportSymbolFlags(symbol) & 111551 /* Value */);
+            }
         }
         Completions.getCompletionEntriesFromSymbols = getCompletionEntriesFromSymbols;
         function getLabelCompletionAtPosition(node) {
@@ -120467,6 +124133,20 @@ var ts;
             return entries;
         }
         function getSymbolCompletionFromEntryId(program, log, sourceFile, position, entryId, host, preferences) {
+            if (entryId.data) {
+                var autoImport = getAutoImportSymbolFromCompletionEntryData(entryId.name, entryId.data, program, host);
+                if (autoImport) {
+                    return {
+                        type: "symbol",
+                        symbol: autoImport.symbol,
+                        location: ts.getTouchingPropertyName(sourceFile, position),
+                        previousToken: ts.findPrecedingToken(position, sourceFile, /*startNode*/ undefined),
+                        isJsxInitializer: false,
+                        isTypeOnlyLocation: false,
+                        origin: autoImport.origin,
+                    };
+                }
+            }
             var compilerOptions = program.getCompilerOptions();
             var completionData = getCompletionData(program, log, sourceFile, isUncheckedFile(sourceFile, compilerOptions), position, { includeCompletionsForModuleExports: true, includeCompletionsWithInsertText: true }, entryId, host);
             if (!completionData) {
@@ -120483,11 +124163,11 @@ var ts;
             // We don't need to perform character checks here because we're only comparing the
             // name against 'entryName' (which is known to be good), not building a new
             // completion entry.
-            return ts.firstDefined(symbols, function (symbol) {
-                var origin = symbolToOriginInfoMap[ts.getSymbolId(symbol)];
+            return ts.firstDefined(symbols, function (symbol, index) {
+                var origin = symbolToOriginInfoMap[index];
                 var info = getCompletionEntryDisplayNameForSymbol(symbol, compilerOptions.target, origin, completionKind, completionData.isJsxIdentifierExpected);
                 return info && info.name === entryId.name && getSourceFromOrigin(origin) === entryId.source
-                    ? { type: "symbol", symbol: symbol, location: location, symbolToOriginInfoMap: symbolToOriginInfoMap, previousToken: previousToken, isJsxInitializer: isJsxInitializer, isTypeOnlyLocation: isTypeOnlyLocation }
+                    ? { type: "symbol", symbol: symbol, location: location, origin: origin, previousToken: previousToken, isJsxInitializer: isJsxInitializer, isTypeOnlyLocation: isTypeOnlyLocation }
                     : undefined;
             }) || { type: "none" };
         }
@@ -120497,7 +124177,7 @@ var ts;
             var name = entryId.name;
             var contextToken = ts.findPrecedingToken(position, sourceFile);
             if (ts.isInString(sourceFile, position, contextToken)) {
-                return Completions.StringCompletions.getStringLiteralCompletionDetails(name, sourceFile, position, contextToken, typeChecker, compilerOptions, host, cancellationToken);
+                return Completions.StringCompletions.getStringLiteralCompletionDetails(name, sourceFile, position, contextToken, typeChecker, compilerOptions, host, cancellationToken, preferences);
             }
             // Compute all the completion symbols again.
             var symbolCompletion = getSymbolCompletionFromEntryId(program, log, sourceFile, position, entryId, host, preferences);
@@ -120511,13 +124191,15 @@ var ts;
                             return ts.JsDoc.getJSDocTagCompletionDetails(name);
                         case 3 /* JsDocParameterName */:
                             return ts.JsDoc.getJSDocParameterNameCompletionDetails(name);
+                        case 4 /* Keywords */:
+                            return request.keywords.indexOf(ts.stringToToken(name)) > -1 ? createSimpleDetails(name, "keyword" /* keyword */, ts.SymbolDisplayPartKind.keyword) : undefined;
                         default:
                             return ts.Debug.assertNever(request);
                     }
                 }
                 case "symbol": {
-                    var symbol = symbolCompletion.symbol, location = symbolCompletion.location, symbolToOriginInfoMap = symbolCompletion.symbolToOriginInfoMap, previousToken = symbolCompletion.previousToken;
-                    var _a = getCompletionEntryCodeActionsAndSourceDisplay(symbolToOriginInfoMap, symbol, program, typeChecker, host, compilerOptions, sourceFile, position, previousToken, formatContext, preferences), codeActions = _a.codeActions, sourceDisplay = _a.sourceDisplay;
+                    var symbol = symbolCompletion.symbol, location = symbolCompletion.location, origin = symbolCompletion.origin, previousToken = symbolCompletion.previousToken;
+                    var _a = getCompletionEntryCodeActionsAndSourceDisplay(origin, symbol, program, typeChecker, host, compilerOptions, sourceFile, position, previousToken, formatContext, preferences, entryId.data), codeActions = _a.codeActions, sourceDisplay = _a.sourceDisplay;
                     return createCompletionDetailsForSymbol(symbol, typeChecker, sourceFile, location, cancellationToken, codeActions, sourceDisplay); // TODO: GH#18217
                 }
                 case "literal": {
@@ -120543,15 +124225,17 @@ var ts;
         }
         Completions.createCompletionDetailsForSymbol = createCompletionDetailsForSymbol;
         function createCompletionDetails(name, kindModifiers, kind, displayParts, documentation, tags, codeActions, source) {
-            return { name: name, kindModifiers: kindModifiers, kind: kind, displayParts: displayParts, documentation: documentation, tags: tags, codeActions: codeActions, source: source };
+            return { name: name, kindModifiers: kindModifiers, kind: kind, displayParts: displayParts, documentation: documentation, tags: tags, codeActions: codeActions, source: source, sourceDisplay: source };
         }
         Completions.createCompletionDetails = createCompletionDetails;
-        function getCompletionEntryCodeActionsAndSourceDisplay(symbolToOriginInfoMap, symbol, program, checker, host, compilerOptions, sourceFile, position, previousToken, formatContext, preferences) {
-            var symbolOriginInfo = symbolToOriginInfoMap[ts.getSymbolId(symbol)];
-            if (!symbolOriginInfo || !originIsExport(symbolOriginInfo)) {
+        function getCompletionEntryCodeActionsAndSourceDisplay(origin, symbol, program, checker, host, compilerOptions, sourceFile, position, previousToken, formatContext, preferences, data) {
+            if (data === null || data === void 0 ? void 0 : data.moduleSpecifier) {
+                return { codeActions: undefined, sourceDisplay: [ts.textPart(data.moduleSpecifier)] };
+            }
+            if (!origin || !originIsExport(origin)) {
                 return { codeActions: undefined, sourceDisplay: undefined };
             }
-            var moduleSymbol = symbolOriginInfo.moduleSymbol;
+            var moduleSymbol = origin.moduleSymbol;
             var exportedSymbol = checker.getMergedSymbol(ts.skipAlias(symbol.exportSymbol || symbol, checker));
             var _a = ts.codefix.getImportCompletionAction(exportedSymbol, moduleSymbol, sourceFile, ts.getNameForExportedSymbol(symbol, compilerOptions.target), host, program, formatContext, previousToken && ts.isIdentifier(previousToken) ? previousToken.getStart(sourceFile) : position, preferences), moduleSpecifier = _a.moduleSpecifier, codeAction = _a.codeAction;
             return { sourceDisplay: [ts.textPart(moduleSpecifier)], codeActions: [codeAction] };
@@ -120567,6 +124251,7 @@ var ts;
             CompletionDataKind[CompletionDataKind["JsDocTagName"] = 1] = "JsDocTagName";
             CompletionDataKind[CompletionDataKind["JsDocTag"] = 2] = "JsDocTag";
             CompletionDataKind[CompletionDataKind["JsDocParameterName"] = 3] = "JsDocParameterName";
+            CompletionDataKind[CompletionDataKind["Keywords"] = 4] = "Keywords";
         })(CompletionDataKind || (CompletionDataKind = {}));
         var CompletionKind;
         (function (CompletionKind) {
@@ -120594,11 +124279,11 @@ var ts;
                     return ts.getContextualTypeFromParent(previousToken, checker);
                 case 62 /* EqualsToken */:
                     switch (parent.kind) {
-                        case 249 /* VariableDeclaration */:
+                        case 250 /* VariableDeclaration */:
                             return checker.getContextualType(parent.initializer); // TODO: GH#18217
-                        case 216 /* BinaryExpression */:
+                        case 217 /* BinaryExpression */:
                             return checker.getTypeAtLocation(parent.left);
-                        case 280 /* JsxAttribute */:
+                        case 281 /* JsxAttribute */:
                             return checker.getContextualTypeForJsxAttribute(parent);
                         default:
                             return undefined;
@@ -120608,7 +124293,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 !== 273 /* JsxElement */ ? checker.getContextualTypeForJsxAttribute(parent.parent) : undefined;
+                    return ts.isJsxExpression(parent) && parent.parent.kind !== 274 /* JsxElement */ ? checker.getContextualTypeForJsxAttribute(parent.parent) : undefined;
                 default:
                     var argInfo = ts.SignatureHelp.getArgumentInfoForCompletions(previousToken, position, sourceFile);
                     return argInfo ?
@@ -120627,11 +124312,11 @@ 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 === 297 /* SourceFile */; });
+            var _a;
+            return !!((_a = symbol.declarations) === null || _a === void 0 ? void 0 : _a.some(function (d) { return d.kind === 298 /* SourceFile */; }));
         }
         function getCompletionData(program, log, sourceFile, isUncheckedFile, position, preferences, detailsEntryId, host) {
             var typeChecker = program.getTypeChecker();
-            var compilerOptions = program.getCompilerOptions();
             var start = ts.timestamp();
             var currentToken = ts.getTokenAtPosition(sourceFile, position); // TODO: GH#15853
             // We will check for jsdoc comments with insideComment and getJsDocTagAtPosition. (TODO: that seems rather inefficient to check the same thing so many times.)
@@ -120679,11 +124364,11 @@ var ts;
                     if (tag.tagName.pos <= position && position <= tag.tagName.end) {
                         return { kind: 1 /* JsDocTagName */ };
                     }
-                    if (isTagWithTypeExpression(tag) && tag.typeExpression && tag.typeExpression.kind === 301 /* JSDocTypeExpression */) {
+                    if (isTagWithTypeExpression(tag) && tag.typeExpression && tag.typeExpression.kind === 302 /* JSDocTypeExpression */) {
                         currentToken = ts.getTokenAtPosition(sourceFile, position);
                         if (!currentToken ||
                             (!ts.isDeclarationName(currentToken) &&
-                                (currentToken.parent.kind !== 333 /* JSDocPropertyTag */ ||
+                                (currentToken.parent.kind !== 337 /* JSDocPropertyTag */ ||
                                     currentToken.parent.name !== currentToken))) {
                             // Use as type location if inside tag's type expression
                             insideJsDocTagTypeExpression = isCurrentlyEditingNode(tag.typeExpression);
@@ -120708,7 +124393,7 @@ var ts;
             var contextToken = previousToken;
             // Check if the caret is at the end of an identifier; this is a partial identifier that we want to complete: e.g. a.toS|
             // Skip this partial identifier and adjust the contextToken to the token that precedes it.
-            if (contextToken && position <= contextToken.end && (ts.isIdentifierOrPrivateIdentifier(contextToken) || ts.isKeyword(contextToken.kind))) {
+            if (contextToken && position <= contextToken.end && (ts.isMemberName(contextToken) || ts.isKeyword(contextToken.kind))) {
                 var start_1 = ts.timestamp();
                 contextToken = ts.findPrecedingToken(contextToken.getFullStart(), sourceFile, /*startNode*/ undefined); // TODO: GH#18217
                 log("getCompletionData: Get previous token 2: " + (ts.timestamp() - start_1));
@@ -120724,10 +124409,22 @@ var ts;
             var isStartingCloseTag = false;
             var isJsxInitializer = false;
             var isJsxIdentifierExpected = false;
+            var importCompletionNode;
             var location = ts.getTouchingPropertyName(sourceFile, position);
             if (contextToken) {
+                var importCompletionCandidate = getImportCompletionNode(contextToken);
+                if (importCompletionCandidate === 153 /* FromKeyword */) {
+                    return { kind: 4 /* Keywords */, keywords: [153 /* FromKeyword */] };
+                }
+                // Import statement completions use `insertText`, and also require the `data` property of `CompletionEntryIdentifier`
+                // added in TypeScript 4.3 to be sent back from the client during `getCompletionEntryDetails`. Since this feature
+                // is not backward compatible with older clients, the language service defaults to disabling it, allowing newer clients
+                // to opt in with the `includeCompletionsForImportStatements` user preference.
+                if (importCompletionCandidate && preferences.includeCompletionsForImportStatements && preferences.includeCompletionsWithInsertText) {
+                    importCompletionNode = importCompletionCandidate;
+                }
                 // Bail out if this is a known invalid completion location
-                if (isCompletionListBlocker(contextToken)) {
+                if (!importCompletionNode && isCompletionListBlocker(contextToken)) {
                     log("Returning an empty list because completion was requested in an invalid position.");
                     return undefined;
                 }
@@ -120736,7 +124433,7 @@ var ts;
                     isRightOfDot = contextToken.kind === 24 /* DotToken */;
                     isRightOfQuestionDot = contextToken.kind === 28 /* QuestionDotToken */;
                     switch (parent.kind) {
-                        case 201 /* PropertyAccessExpression */:
+                        case 202 /* PropertyAccessExpression */:
                             propertyAccessToConvert = parent;
                             node = propertyAccessToConvert.expression;
                             if ((ts.isCallExpression(node) || ts.isFunctionLike(node)) &&
@@ -120749,14 +124446,14 @@ var ts;
                                 return undefined;
                             }
                             break;
-                        case 157 /* QualifiedName */:
+                        case 158 /* QualifiedName */:
                             node = parent.left;
                             break;
-                        case 256 /* ModuleDeclaration */:
+                        case 257 /* ModuleDeclaration */:
                             node = parent.name;
                             break;
-                        case 195 /* ImportType */:
-                        case 226 /* MetaProperty */:
+                        case 196 /* ImportType */:
+                        case 227 /* MetaProperty */:
                             node = parent;
                             break;
                         default:
@@ -120765,11 +124462,11 @@ var ts;
                             return undefined;
                     }
                 }
-                else if (sourceFile.languageVariant === 1 /* JSX */) {
+                else if (!importCompletionNode && sourceFile.languageVariant === 1 /* JSX */) {
                     // <UI.Test /* completion position */ />
                     // If the tagname is a property access expression, we will then walk up to the top most of property access expression.
                     // Then, try to get a JSX container and its associated attributes type.
-                    if (parent && parent.kind === 201 /* PropertyAccessExpression */) {
+                    if (parent && parent.kind === 202 /* PropertyAccessExpression */) {
                         contextToken = parent;
                         parent = parent.parent;
                     }
@@ -120777,45 +124474,45 @@ var ts;
                     if (currentToken.parent === location) {
                         switch (currentToken.kind) {
                             case 31 /* GreaterThanToken */:
-                                if (currentToken.parent.kind === 273 /* JsxElement */ || currentToken.parent.kind === 275 /* JsxOpeningElement */) {
+                                if (currentToken.parent.kind === 274 /* JsxElement */ || currentToken.parent.kind === 276 /* JsxOpeningElement */) {
                                     location = currentToken;
                                 }
                                 break;
                             case 43 /* SlashToken */:
-                                if (currentToken.parent.kind === 274 /* JsxSelfClosingElement */) {
+                                if (currentToken.parent.kind === 275 /* JsxSelfClosingElement */) {
                                     location = currentToken;
                                 }
                                 break;
                         }
                     }
                     switch (parent.kind) {
-                        case 276 /* JsxClosingElement */:
+                        case 277 /* JsxClosingElement */:
                             if (contextToken.kind === 43 /* SlashToken */) {
                                 isStartingCloseTag = true;
                                 location = contextToken;
                             }
                             break;
-                        case 216 /* BinaryExpression */:
+                        case 217 /* BinaryExpression */:
                             if (!binaryExpressionMayBeOpenTag(parent)) {
                                 break;
                             }
                         // falls through
-                        case 274 /* JsxSelfClosingElement */:
-                        case 273 /* JsxElement */:
-                        case 275 /* JsxOpeningElement */:
+                        case 275 /* JsxSelfClosingElement */:
+                        case 274 /* JsxElement */:
+                        case 276 /* JsxOpeningElement */:
                             isJsxIdentifierExpected = true;
                             if (contextToken.kind === 29 /* LessThanToken */) {
                                 isRightOfOpenTag = true;
                                 location = contextToken;
                             }
                             break;
-                        case 283 /* JsxExpression */:
+                        case 284 /* 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 */:
+                        case 281 /* JsxAttribute */:
                             // For `<div className="x" [||] ></div>`, `parent` will be JsxAttribute and `previousToken` will be its initializer
                             if (parent.initializer === previousToken &&
                                 previousToken.end < position) {
@@ -120849,8 +124546,11 @@ var ts;
             var symbols = [];
             var symbolToOriginInfoMap = [];
             var symbolToSortTextMap = [];
-            var importSuggestionsCache = host.getImportSuggestionsCache && host.getImportSuggestionsCache();
+            var seenPropertySymbols = new ts.Map();
             var isTypeOnly = isTypeOnlyCompletion();
+            var getModuleSpecifierResolutionHost = ts.memoizeOne(function (isFromPackageJson) {
+                return ts.createModuleSpecifierResolutionHost(isFromPackageJson ? host.getPackageJsonAutoImportProvider() : program, host);
+            });
             if (isRightOfDot || isRightOfQuestionDot) {
                 getTypeScriptMemberSymbols();
             }
@@ -120859,7 +124559,7 @@ var ts;
                 ts.Debug.assertEachIsDefined(tagSymbols, "getJsxIntrinsicTagNames() should all be defined");
                 tryGetGlobalSymbols();
                 symbols = tagSymbols.concat(symbols);
-                completionKind = 3 /* MemberLike */;
+                completionKind = 1 /* Global */;
                 keywordFilters = 0 /* None */;
             }
             else if (isStartingCloseTag) {
@@ -120868,7 +124568,7 @@ var ts;
                 if (tagSymbol) {
                     symbols = [tagSymbol];
                 }
-                completionKind = 3 /* MemberLike */;
+                completionKind = 1 /* Global */;
                 keywordFilters = 0 /* None */;
             }
             else {
@@ -120901,14 +124601,15 @@ var ts;
                 symbolToSortTextMap: symbolToSortTextMap,
                 isTypeOnlyLocation: isTypeOnly,
                 isJsxIdentifierExpected: isJsxIdentifierExpected,
+                importCompletionNode: importCompletionNode,
             };
             function isTagWithTypeExpression(tag) {
                 switch (tag.kind) {
-                    case 326 /* JSDocParameterTag */:
-                    case 333 /* JSDocPropertyTag */:
-                    case 327 /* JSDocReturnTag */:
-                    case 329 /* JSDocTypeTag */:
-                    case 331 /* JSDocTypedefTag */:
+                    case 330 /* JSDocParameterTag */:
+                    case 337 /* JSDocPropertyTag */:
+                    case 331 /* JSDocReturnTag */:
+                    case 333 /* JSDocTypeTag */:
+                    case 335 /* JSDocTypedefTag */:
                         return true;
                     default:
                         return false;
@@ -120936,10 +124637,10 @@ var ts;
                             var exportedSymbols = typeChecker.getExportsOfModule(symbol);
                             ts.Debug.assertEachIsDefined(exportedSymbols, "getExportsOfModule() should all be defined");
                             var isValidValueAccess_1 = function (symbol) { return typeChecker.isValidPropertyAccess(isImportType ? node : (node.parent), symbol.name); };
-                            var isValidTypeAccess_1 = function (symbol) { return symbolCanBeReferencedAtTypeLocation(symbol); };
+                            var isValidTypeAccess_1 = function (symbol) { return symbolCanBeReferencedAtTypeLocation(symbol, typeChecker); };
                             var isValidAccess = isNamespaceName
                                 // At `namespace N.M/**/`, if this is the only declaration of `M`, don't include `M` as a completion.
-                                ? function (symbol) { return !!(symbol.flags & 1920 /* Namespace */) && !symbol.declarations.every(function (d) { return d.parent === node.parent; }); }
+                                ? function (symbol) { var _a; return !!(symbol.flags & 1920 /* Namespace */) && !((_a = symbol.declarations) === null || _a === void 0 ? void 0 : _a.every(function (d) { return d.parent === node.parent; })); }
                                 : isRhsOfImportDeclaration ?
                                     // Any kind is allowed when dotting off namespace in internal import equals declaration
                                     function (symbol) { return isValidTypeAccess_1(symbol) || isValidValueAccess_1(symbol); } :
@@ -120953,7 +124654,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 !== 297 /* SourceFile */ && d.kind !== 256 /* ModuleDeclaration */ && d.kind !== 255 /* EnumDeclaration */; })) {
+                                symbol.declarations.some(function (d) { return d.kind !== 298 /* SourceFile */ && d.kind !== 257 /* ModuleDeclaration */ && d.kind !== 256 /* EnumDeclaration */; })) {
                                 var type = typeChecker.getTypeOfSymbolAtLocation(symbol, node).getNonOptionalType();
                                 var insertQuestionDot = false;
                                 if (type.isNullableType()) {
@@ -121000,7 +124701,7 @@ var ts;
                 if (isRightOfQuestionDot && ts.some(type.getCallSignatures())) {
                     isNewIdentifierLocation = true;
                 }
-                var propertyAccess = node.kind === 195 /* ImportType */ ? node : node.parent;
+                var propertyAccess = node.kind === 196 /* 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
@@ -121039,13 +124740,24 @@ var ts;
                     var nameSymbol = leftMostName && typeChecker.getSymbolAtLocation(leftMostName);
                     // If this is nested like for `namespace N { export const sym = Symbol(); }`, we'll add the completion for `N`.
                     var firstAccessibleSymbol = nameSymbol && getFirstSymbolInChain(nameSymbol, contextToken, typeChecker);
-                    if (firstAccessibleSymbol && !symbolToOriginInfoMap[ts.getSymbolId(firstAccessibleSymbol)]) {
+                    if (firstAccessibleSymbol && ts.addToSeen(seenPropertySymbols, ts.getSymbolId(firstAccessibleSymbol))) {
+                        var index = symbols.length;
                         symbols.push(firstAccessibleSymbol);
                         var moduleSymbol = firstAccessibleSymbol.parent;
-                        symbolToOriginInfoMap[ts.getSymbolId(firstAccessibleSymbol)] =
-                            !moduleSymbol || !ts.isExternalModuleSymbol(moduleSymbol)
-                                ? { kind: getNullableSymbolOriginInfoKind(2 /* SymbolMemberNoExport */) }
-                                : { kind: getNullableSymbolOriginInfoKind(6 /* SymbolMemberExport */), moduleSymbol: moduleSymbol, isDefaultExport: false };
+                        if (!moduleSymbol || !ts.isExternalModuleSymbol(moduleSymbol)) {
+                            symbolToOriginInfoMap[index] = { kind: getNullableSymbolOriginInfoKind(2 /* SymbolMemberNoExport */) };
+                        }
+                        else {
+                            var origin = {
+                                kind: getNullableSymbolOriginInfoKind(6 /* SymbolMemberExport */),
+                                moduleSymbol: moduleSymbol,
+                                isDefaultExport: false,
+                                symbolName: firstAccessibleSymbol.name,
+                                exportName: firstAccessibleSymbol.name,
+                                fileName: ts.isExternalModuleNameRelative(ts.stripQuotes(moduleSymbol.name)) ? ts.cast(moduleSymbol.valueDeclaration, ts.isSourceFile).fileName : undefined,
+                            };
+                            symbolToOriginInfoMap[index] = origin;
+                        }
                     }
                     else if (preferences.includeCompletionsWithInsertText) {
                         addSymbolOriginInfo(symbol);
@@ -121065,11 +124777,11 @@ var ts;
                 }
                 function addSymbolOriginInfo(symbol) {
                     if (preferences.includeCompletionsWithInsertText) {
-                        if (insertAwait && !symbolToOriginInfoMap[ts.getSymbolId(symbol)]) {
-                            symbolToOriginInfoMap[ts.getSymbolId(symbol)] = { kind: getNullableSymbolOriginInfoKind(8 /* Promise */) };
+                        if (insertAwait && ts.addToSeen(seenPropertySymbols, ts.getSymbolId(symbol))) {
+                            symbolToOriginInfoMap[symbols.length] = { kind: getNullableSymbolOriginInfoKind(8 /* Promise */) };
                         }
                         else if (insertQuestionDot) {
-                            symbolToOriginInfoMap[ts.getSymbolId(symbol)] = { kind: 16 /* Nullable */ };
+                            symbolToOriginInfoMap[symbols.length] = { kind: 16 /* Nullable */ };
                         }
                     }
                 }
@@ -121082,7 +124794,9 @@ var ts;
                 return ts.isIdentifier(e) ? e : ts.isPropertyAccessExpression(e) ? getLeftMostName(e.expression) : undefined;
             }
             function tryGetGlobalSymbols() {
-                var result = tryGetObjectLikeCompletionSymbols()
+                var result = tryGetObjectTypeLiteralInTypeArgumentCompletionSymbols()
+                    || tryGetObjectLikeCompletionSymbols()
+                    || tryGetImportCompletionSymbols()
                     || tryGetImportOrExportClauseCompletionSymbols()
                     || tryGetLocalNamedExportCompletionSymbols()
                     || tryGetConstructorCompletion()
@@ -121115,6 +124829,12 @@ var ts;
                 isNewIdentifierLocation = false;
                 return 1 /* Success */;
             }
+            function tryGetImportCompletionSymbols() {
+                if (!importCompletionNode)
+                    return 0 /* Continue */;
+                collectAutoImports(/*resolveModuleSpecifiers*/ true);
+                return 1 /* Success */;
+            }
             function getGlobalCompletions() {
                 keywordFilters = tryGetFunctionLikeBodyCompletionContainer(contextToken) ? 5 /* FunctionLikeBodyKeywords */ : 1 /* All */;
                 // Get all entities in the current scope.
@@ -121156,50 +124876,36 @@ var ts;
                 var symbolMeanings = (isTypeOnly ? 0 /* None */ : 111551 /* Value */) | 788968 /* Type */ | 1920 /* Namespace */ | 2097152 /* Alias */;
                 symbols = typeChecker.getSymbolsInScope(scopeNode, symbolMeanings);
                 ts.Debug.assertEachIsDefined(symbols, "getSymbolsInScope() should all be defined");
-                for (var _i = 0, symbols_2 = symbols; _i < symbols_2.length; _i++) {
-                    var symbol = symbols_2[_i];
+                for (var _i = 0, symbols_1 = symbols; _i < symbols_1.length; _i++) {
+                    var symbol = symbols_1[_i];
                     if (!typeChecker.isArgumentsSymbol(symbol) &&
                         !ts.some(symbol.declarations, function (d) { return d.getSourceFile() === sourceFile; })) {
                         symbolToSortTextMap[ts.getSymbolId(symbol)] = SortText.GlobalsOrKeywords;
                     }
                 }
                 // Need to insert 'this.' before properties of `this` type, so only do that if `includeInsertTextCompletions`
-                if (preferences.includeCompletionsWithInsertText && scopeNode.kind !== 297 /* SourceFile */) {
+                if (preferences.includeCompletionsWithInsertText && scopeNode.kind !== 298 /* 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++) {
                             var symbol = _b[_a];
-                            symbolToOriginInfoMap[ts.getSymbolId(symbol)] = { kind: 1 /* ThisType */ };
+                            symbolToOriginInfoMap[symbols.length] = { kind: 1 /* ThisType */ };
                             symbols.push(symbol);
                             symbolToSortTextMap[ts.getSymbolId(symbol)] = SortText.SuggestedClassMembers;
                         }
                     }
                 }
-                if (shouldOfferImportCompletions()) {
-                    var lowerCaseTokenText_1 = previousToken && ts.isIdentifier(previousToken) ? previousToken.text.toLowerCase() : "";
-                    var autoImportSuggestions = getSymbolsFromOtherSourceFileExports(program.getCompilerOptions().target, host);
-                    if (!detailsEntryId && importSuggestionsCache) {
-                        importSuggestionsCache.set(sourceFile.fileName, autoImportSuggestions, host.getProjectVersion && host.getProjectVersion());
-                    }
-                    autoImportSuggestions.forEach(function (_a) {
-                        var symbol = _a.symbol, symbolName = _a.symbolName, skipFilter = _a.skipFilter, origin = _a.origin;
-                        if (detailsEntryId) {
-                            if (detailsEntryId.source && ts.stripQuotes(origin.moduleSymbol.name) !== detailsEntryId.source) {
-                                return;
-                            }
-                        }
-                        else if (!skipFilter && !stringContainsCharactersInOrder(symbolName.toLowerCase(), lowerCaseTokenText_1)) {
-                            return;
-                        }
-                        var symbolId = ts.getSymbolId(symbol);
-                        symbols.push(symbol);
-                        symbolToOriginInfoMap[symbolId] = origin;
-                        symbolToSortTextMap[symbolId] = SortText.AutoImportSuggestions;
-                    });
+                collectAutoImports(/*resolveModuleSpecifier*/ false);
+                if (isTypeOnly) {
+                    keywordFilters = contextToken && ts.isAssertionExpression(contextToken.parent)
+                        ? 6 /* TypeAssertionKeywords */
+                        : 7 /* TypeKeywords */;
                 }
-                filterGlobalCompletion(symbols);
             }
             function shouldOfferImportCompletions() {
+                // If already typing an import statement, provide completions for it.
+                if (importCompletionNode)
+                    return true;
                 // If current completion is for non-contextual Object literal shortahands, ignore auto-import symbols
                 if (isNonContextualObjectLiteral)
                     return false;
@@ -121217,75 +124923,15 @@ var ts;
             }
             function isSnippetScope(scopeNode) {
                 switch (scopeNode.kind) {
-                    case 297 /* SourceFile */:
-                    case 218 /* TemplateExpression */:
-                    case 283 /* JsxExpression */:
-                    case 230 /* Block */:
+                    case 298 /* SourceFile */:
+                    case 219 /* TemplateExpression */:
+                    case 284 /* JsxExpression */:
+                    case 231 /* Block */:
                         return true;
                     default:
                         return ts.isStatement(scopeNode);
                 }
             }
-            function filterGlobalCompletion(symbols) {
-                var isTypeOnly = isTypeOnlyCompletion();
-                if (isTypeOnly) {
-                    keywordFilters = contextToken && ts.isAssertionExpression(contextToken.parent)
-                        ? 6 /* TypeAssertionKeywords */
-                        : 7 /* TypeKeywords */;
-                }
-                var variableDeclaration = getVariableDeclaration(location);
-                ts.filterMutate(symbols, function (symbol) {
-                    if (!ts.isSourceFile(location)) {
-                        // export = /**/ here we want to get all meanings, so any symbol is ok
-                        if (ts.isExportAssignment(location.parent)) {
-                            return true;
-                        }
-                        // Filter out variables from their own initializers
-                        // `const a = /* no 'a' here */`
-                        if (variableDeclaration && symbol.valueDeclaration === variableDeclaration) {
-                            return false;
-                        }
-                        // External modules can have global export declarations that will be
-                        // available as global keywords in all scopes. But if the external module
-                        // already has an explicit export and user only wants to user explicit
-                        // module imports then the global keywords will be filtered out so auto
-                        // import suggestions will win in the completion
-                        var symbolOrigin = ts.skipAlias(symbol, typeChecker);
-                        // We only want to filter out the global keywords
-                        // Auto Imports are not available for scripts so this conditional is always false
-                        if (!!sourceFile.externalModuleIndicator
-                            && !compilerOptions.allowUmdGlobalAccess
-                            && symbolToSortTextMap[ts.getSymbolId(symbol)] === SortText.GlobalsOrKeywords
-                            && symbolToSortTextMap[ts.getSymbolId(symbolOrigin)] === SortText.AutoImportSuggestions) {
-                            return false;
-                        }
-                        // Continue with origin symbol
-                        symbol = symbolOrigin;
-                        // import m = /**/ <-- It can only access namespace (if typing import = x. this would get member symbols and not namespace)
-                        if (ts.isInRightSideOfInternalImportEqualsDeclaration(location)) {
-                            return !!(symbol.flags & 1920 /* Namespace */);
-                        }
-                        if (isTypeOnly) {
-                            // It's a type, but you can reach it by namespace.type as well
-                            return symbolCanBeReferencedAtTypeLocation(symbol);
-                        }
-                    }
-                    // expressions are value space (which includes the value namespaces)
-                    return !!(ts.getCombinedLocalAndExportSymbolFlags(symbol) & 111551 /* Value */);
-                });
-            }
-            function getVariableDeclaration(property) {
-                var variableDeclaration = ts.findAncestor(property, function (node) {
-                    return ts.isFunctionBlock(node) || isArrowFunctionBody(node) || ts.isBindingPattern(node)
-                        ? "quit"
-                        : ts.isVariableDeclaration(node);
-                });
-                return variableDeclaration;
-            }
-            function isArrowFunctionBody(node) {
-                return node.parent && ts.isArrowFunction(node.parent) && node.parent.body === node;
-            }
-            ;
             function isTypeOnlyCompletion() {
                 return insideJsDocTagTypeExpression
                     || !isContextTokenValueLocation(contextToken) &&
@@ -121295,191 +124941,105 @@ var ts;
             }
             function isContextTokenValueLocation(contextToken) {
                 return contextToken &&
-                    contextToken.kind === 111 /* TypeOfKeyword */ &&
-                    (contextToken.parent.kind === 176 /* TypeQuery */ || ts.isTypeOfExpression(contextToken.parent));
+                    ((contextToken.kind === 111 /* TypeOfKeyword */ &&
+                        (contextToken.parent.kind === 177 /* TypeQuery */ || ts.isTypeOfExpression(contextToken.parent))) ||
+                        (contextToken.kind === 127 /* AssertsKeyword */ && contextToken.parent.kind === 173 /* TypePredicate */));
             }
             function isContextTokenTypeLocation(contextToken) {
                 if (contextToken) {
                     var parentKind = contextToken.parent.kind;
                     switch (contextToken.kind) {
                         case 58 /* ColonToken */:
-                            return parentKind === 163 /* PropertyDeclaration */ ||
-                                parentKind === 162 /* PropertySignature */ ||
-                                parentKind === 160 /* Parameter */ ||
-                                parentKind === 249 /* VariableDeclaration */ ||
+                            return parentKind === 164 /* PropertyDeclaration */ ||
+                                parentKind === 163 /* PropertySignature */ ||
+                                parentKind === 161 /* Parameter */ ||
+                                parentKind === 250 /* VariableDeclaration */ ||
                                 ts.isFunctionLikeKind(parentKind);
                         case 62 /* EqualsToken */:
-                            return parentKind === 254 /* TypeAliasDeclaration */;
+                            return parentKind === 255 /* TypeAliasDeclaration */;
                         case 126 /* AsKeyword */:
-                            return parentKind === 224 /* AsExpression */;
+                            return parentKind === 225 /* AsExpression */;
                         case 29 /* LessThanToken */:
-                            return parentKind === 173 /* TypeReference */ ||
-                                parentKind === 206 /* TypeAssertionExpression */;
+                            return parentKind === 174 /* TypeReference */ ||
+                                parentKind === 207 /* TypeAssertionExpression */;
                         case 93 /* ExtendsKeyword */:
-                            return parentKind === 159 /* TypeParameter */;
+                            return parentKind === 160 /* TypeParameter */;
                     }
                 }
                 return false;
             }
-            /** True if symbol is a type or a module containing at least one type. */
-            function symbolCanBeReferencedAtTypeLocation(symbol, seenModules) {
-                if (seenModules === void 0) { seenModules = new ts.Map(); }
-                var sym = ts.skipAlias(symbol.exportSymbol || symbol, typeChecker);
-                return !!(sym.flags & 788968 /* Type */) ||
-                    !!(sym.flags & 1536 /* Module */) &&
-                        ts.addToSeen(seenModules, ts.getSymbolId(sym)) &&
-                        typeChecker.getExportsOfModule(sym).some(function (e) { return symbolCanBeReferencedAtTypeLocation(e, seenModules); });
-            }
-            /**
-             * Gathers symbols that can be imported from other files, de-duplicating along the way. Symbols can be "duplicates"
-             * if re-exported from another module, e.g. `export { foo } from "./a"`. That syntax creates a fresh symbol, but
-             * it’s just an alias to the first, and both have the same name, so we generally want to filter those aliases out,
-             * if and only if the the first can be imported (it may be excluded due to package.json filtering in
-             * `codefix.forEachExternalModuleToImportFrom`).
-             *
-             * Example. Imagine a chain of node_modules re-exporting one original symbol:
-             *
-             * ```js
-             *  node_modules/x/index.js         node_modules/y/index.js           node_modules/z/index.js
-             * +-----------------------+      +--------------------------+      +--------------------------+
-             * |                       |      |                          |      |                          |
-             * | export const foo = 0; | <--- | export { foo } from 'x'; | <--- | export { foo } from 'y'; |
-             * |                       |      |                          |      |                          |
-             * +-----------------------+      +--------------------------+      +--------------------------+
-             * ```
-             *
-             * Also imagine three buckets, which we’ll reference soon:
-             *
-             * ```md
-             * |                  |      |                      |      |                   |
-             * |   **Bucket A**   |      |    **Bucket B**      |      |    **Bucket C**   |
-             * |    Symbols to    |      | Aliases to symbols   |      | Symbols to return |
-             * |    definitely    |      | in Buckets A or C    |      | if nothing better |
-             * |      return      |      | (don’t return these) |      |    comes along    |
-             * |__________________|      |______________________|      |___________________|
-             * ```
-             *
-             * We _probably_ want to show `foo` from 'x', but not from 'y' or 'z'. However, if 'x' is not in a package.json, it
-             * will not appear in a `forEachExternalModuleToImportFrom` iteration. Furthermore, the order of iterations is not
-             * guaranteed, as it is host-dependent. Therefore, when presented with the symbol `foo` from module 'y' alone, we
-             * may not be sure whether or not it should go in the list. So, we’ll take the following steps:
-             *
-             * 1. Resolve alias `foo` from 'y' to the export declaration in 'x', get the symbol there, and see if that symbol is
-             *    already in Bucket A (symbols we already know will be returned). If it is, put `foo` from 'y' in Bucket B
-             *    (symbols that are aliases to symbols in Bucket A). If it’s not, put it in Bucket C.
-             * 2. Next, imagine we see `foo` from module 'z'. Again, we resolve the alias to the nearest export, which is in 'y'.
-             *    At this point, if that nearest export from 'y' is in _any_ of the three buckets, we know the symbol in 'z'
-             *    should never be returned in the final list, so put it in Bucket B.
-             * 3. Next, imagine we see `foo` from module 'x', the original. Syntactically, it doesn’t look like a re-export, so
-             *    we can just check Bucket C to see if we put any aliases to the original in there. If they exist, throw them out.
-             *    Put this symbol in Bucket A.
-             * 4. After we’ve iterated through every symbol of every module, any symbol left in Bucket C means that step 3 didn’t
-             *    occur for that symbol---that is, the original symbol is not in Bucket A, so we should include the alias. Move
-             *    everything from Bucket C to Bucket A.
-             */
-            function getSymbolsFromOtherSourceFileExports(target, host) {
-                var cached = importSuggestionsCache && importSuggestionsCache.get(sourceFile.fileName, typeChecker, detailsEntryId && host.getProjectVersion ? host.getProjectVersion() : undefined);
-                if (cached) {
-                    log("getSymbolsFromOtherSourceFileExports: Using cached list");
-                    return cached;
-                }
-                var startTime = ts.timestamp();
-                log("getSymbolsFromOtherSourceFileExports: Recomputing list" + (detailsEntryId ? " for details entry" : ""));
-                var seenResolvedModules = new ts.Map();
-                var seenExports = new ts.Map();
-                /** Bucket B */
-                var aliasesToAlreadyIncludedSymbols = new ts.Map();
-                /** Bucket C */
-                var aliasesToReturnIfOriginalsAreMissing = new ts.Map();
-                /** Bucket A */
-                var results = [];
-                /** Ids present in `results` for faster lookup */
-                var resultSymbolIds = new ts.Map();
-                ts.codefix.forEachExternalModuleToImportFrom(program, host, sourceFile, !detailsEntryId, /*useAutoImportProvider*/ true, function (moduleSymbol, _, program, isFromPackageJson) {
-                    // Perf -- ignore other modules if this is a request for details
-                    if (detailsEntryId && detailsEntryId.source && ts.stripQuotes(moduleSymbol.name) !== detailsEntryId.source) {
-                        return;
-                    }
-                    var typeChecker = program.getTypeChecker();
-                    var resolvedModuleSymbol = typeChecker.resolveExternalModuleSymbol(moduleSymbol);
-                    // resolvedModuleSymbol may be a namespace. A namespace may be `export =` by multiple module declarations, but only keep the first one.
-                    if (!ts.addToSeen(seenResolvedModules, ts.getSymbolId(resolvedModuleSymbol))) {
+            /** Mutates `symbols`, `symbolToOriginInfoMap`, and `symbolToSortTextMap` */
+            function collectAutoImports(resolveModuleSpecifiers) {
+                var _a, _b, _c, _d, _e;
+                if (!shouldOfferImportCompletions())
+                    return;
+                ts.Debug.assert(!(detailsEntryId === null || detailsEntryId === void 0 ? void 0 : detailsEntryId.data));
+                var start = ts.timestamp();
+                var moduleSpecifierCache = (_a = host.getModuleSpecifierCache) === null || _a === void 0 ? void 0 : _a.call(host);
+                (_b = host.log) === null || _b === void 0 ? void 0 : _b.call(host, "collectAutoImports: starting, " + (resolveModuleSpecifiers ? "" : "not ") + "resolving module specifiers");
+                if (moduleSpecifierCache) {
+                    (_c = host.log) === null || _c === void 0 ? void 0 : _c.call(host, "collectAutoImports: module specifier cache size: " + moduleSpecifierCache.count());
+                }
+                var lowerCaseTokenText = previousToken && ts.isIdentifier(previousToken) ? previousToken.text.toLowerCase() : "";
+                var exportInfo = ts.codefix.getSymbolToExportInfoMap(sourceFile, host, program);
+                var packageJsonAutoImportProvider = (_d = host.getPackageJsonAutoImportProvider) === null || _d === void 0 ? void 0 : _d.call(host);
+                var packageJsonFilter = detailsEntryId ? undefined : ts.createPackageJsonImportFilter(sourceFile, host);
+                exportInfo.forEach(function (info, key) {
+                    var symbolName = key.substring(0, key.indexOf("|"));
+                    if (!detailsEntryId && ts.isStringANonContextualKeyword(symbolName))
                         return;
-                    }
-                    // Don't add another completion for `export =` of a symbol that's already global.
-                    // So in `declare namespace foo {} declare module "foo" { export = foo; }`, there will just be the global completion for `foo`.
-                    if (resolvedModuleSymbol !== moduleSymbol && ts.every(resolvedModuleSymbol.declarations, ts.isNonGlobalDeclaration)) {
-                        pushSymbol(resolvedModuleSymbol, moduleSymbol, isFromPackageJson, /*skipFilter*/ true);
-                    }
-                    for (var _i = 0, _a = typeChecker.getExportsAndPropertiesOfModule(moduleSymbol); _i < _a.length; _i++) {
-                        var symbol = _a[_i];
-                        var symbolId = ts.getSymbolId(symbol).toString();
-                        // `getExportsAndPropertiesOfModule` can include duplicates
-                        if (!ts.addToSeen(seenExports, symbolId)) {
-                            continue;
-                        }
-                        // If this is `export { _break as break };` (a keyword) -- skip this and prefer the keyword completion.
-                        if (ts.some(symbol.declarations, function (d) { return ts.isExportSpecifier(d) && !!d.propertyName && ts.isIdentifierANonContextualKeyword(d.name); })) {
-                            continue;
-                        }
-                        // If `symbol.parent !== moduleSymbol`, this is an `export * from "foo"` re-export. Those don't create new symbols.
-                        var isExportStarFromReExport = typeChecker.getMergedSymbol(symbol.parent) !== resolvedModuleSymbol;
-                        // If `!!d.parent.parent.moduleSpecifier`, this is `export { foo } from "foo"` re-export, which creates a new symbol (thus isn't caught by the first check).
-                        if (isExportStarFromReExport || ts.some(symbol.declarations, function (d) { return ts.isExportSpecifier(d) && !d.propertyName && !!d.parent.parent.moduleSpecifier; })) {
-                            // Walk the export chain back one module (step 1 or 2 in diagrammed example).
-                            // Or, in the case of `export * from "foo"`, `symbol` already points to the original export, so just use that.
-                            var nearestExportSymbol = isExportStarFromReExport ? symbol : getNearestExportSymbol(symbol);
-                            if (!nearestExportSymbol)
-                                continue;
-                            var nearestExportSymbolId = ts.getSymbolId(nearestExportSymbol).toString();
-                            var symbolHasBeenSeen = resultSymbolIds.has(nearestExportSymbolId) || aliasesToAlreadyIncludedSymbols.has(nearestExportSymbolId);
-                            if (!symbolHasBeenSeen) {
-                                aliasesToReturnIfOriginalsAreMissing.set(nearestExportSymbolId, { alias: symbol, moduleSymbol: moduleSymbol, isFromPackageJson: isFromPackageJson });
-                                aliasesToAlreadyIncludedSymbols.set(symbolId, true);
-                            }
-                            else {
-                                // Perf - we know this symbol is an alias to one that’s already covered in `symbols`, so store it here
-                                // in case another symbol re-exports this one; that way we can short-circuit as soon as we see this symbol id.
-                                ts.addToSeen(aliasesToAlreadyIncludedSymbols, symbolId);
-                            }
-                        }
-                        else {
-                            // This is not a re-export, so see if we have any aliases pending and remove them (step 3 in diagrammed example)
-                            aliasesToReturnIfOriginalsAreMissing.delete(symbolId);
-                            pushSymbol(symbol, moduleSymbol, isFromPackageJson, /*skipFilter*/ false);
-                        }
+                    var isCompletionDetailsMatch = detailsEntryId && ts.some(info, function (i) { return detailsEntryId.source === ts.stripQuotes(i.moduleSymbol.name); });
+                    if (isCompletionDetailsMatch || isNameMatch(symbolName)) {
+                        // If we don't need to resolve module specifiers, we can use any re-export that is importable at all
+                        // (We need to ensure that at least one is importable to show a completion.)
+                        var _a = resolveModuleSpecifiers
+                            ? ts.codefix.getModuleSpecifierForBestExportInfo(info, sourceFile, program, host, preferences)
+                            : { moduleSpecifier: undefined, exportInfo: ts.find(info, isImportableExportInfo) }, moduleSpecifier = _a.moduleSpecifier, exportInfo_1 = _a.exportInfo;
+                        if (!exportInfo_1)
+                            return;
+                        var moduleFile = ts.tryCast(exportInfo_1.moduleSymbol.valueDeclaration, ts.isSourceFile);
+                        var isDefaultExport = exportInfo_1.exportKind === 1 /* Default */;
+                        var symbol = isDefaultExport && ts.getLocalSymbolForExportDefault(exportInfo_1.symbol) || exportInfo_1.symbol;
+                        pushAutoImportSymbol(symbol, {
+                            kind: resolveModuleSpecifiers ? 32 /* ResolvedExport */ : 4 /* Export */,
+                            moduleSpecifier: moduleSpecifier,
+                            symbolName: symbolName,
+                            exportName: exportInfo_1.exportKind === 2 /* ExportEquals */ ? "export=" /* ExportEquals */ : exportInfo_1.symbol.name,
+                            fileName: moduleFile === null || moduleFile === void 0 ? void 0 : moduleFile.fileName,
+                            isDefaultExport: isDefaultExport,
+                            moduleSymbol: exportInfo_1.moduleSymbol,
+                            isFromPackageJson: exportInfo_1.isFromPackageJson,
+                        });
                     }
                 });
-                // By this point, any potential duplicates that were actually duplicates have been
-                // removed, so the rest need to be added. (Step 4 in diagrammed example)
-                aliasesToReturnIfOriginalsAreMissing.forEach(function (_a) {
-                    var alias = _a.alias, moduleSymbol = _a.moduleSymbol, isFromPackageJson = _a.isFromPackageJson;
-                    return pushSymbol(alias, moduleSymbol, isFromPackageJson, /*skipFilter*/ false);
-                });
-                log("getSymbolsFromOtherSourceFileExports: " + (ts.timestamp() - startTime));
-                return results;
-                function pushSymbol(symbol, moduleSymbol, isFromPackageJson, skipFilter) {
-                    var isDefaultExport = symbol.escapedName === "default" /* Default */;
-                    if (isDefaultExport) {
-                        symbol = ts.getLocalSymbolForExportDefault(symbol) || symbol;
+                (_e = host.log) === null || _e === void 0 ? void 0 : _e.call(host, "collectAutoImports: done in " + (ts.timestamp() - start) + " ms");
+                function isNameMatch(symbolName) {
+                    var lowerCaseSymbolName = symbolName.toLowerCase();
+                    if (resolveModuleSpecifiers && lowerCaseTokenText) {
+                        // Use a more restrictive filter if resolving module specifiers since resolving module specifiers is expensive.
+                        return lowerCaseTokenText[0] === lowerCaseSymbolName[0] && stringContainsCharactersInOrder(lowerCaseSymbolName, lowerCaseTokenText);
                     }
-                    if (typeChecker.isUndefinedSymbol(symbol)) {
-                        return;
+                    return stringContainsCharactersInOrder(lowerCaseSymbolName, lowerCaseTokenText);
+                }
+                function isImportableExportInfo(info) {
+                    var moduleFile = ts.tryCast(info.moduleSymbol.valueDeclaration, ts.isSourceFile);
+                    if (!moduleFile) {
+                        return packageJsonFilter
+                            ? packageJsonFilter.allowsImportingAmbientModule(info.moduleSymbol, getModuleSpecifierResolutionHost(info.isFromPackageJson))
+                            : true;
                     }
-                    ts.addToSeen(resultSymbolIds, ts.getSymbolId(symbol));
-                    var origin = { kind: 4 /* Export */, moduleSymbol: moduleSymbol, isDefaultExport: isDefaultExport, isFromPackageJson: isFromPackageJson };
-                    results.push({
-                        symbol: symbol,
-                        symbolName: ts.getNameForExportedSymbol(symbol, target),
-                        origin: origin,
-                        skipFilter: skipFilter,
-                    });
+                    return ts.isImportableFile(info.isFromPackageJson ? packageJsonAutoImportProvider : program, sourceFile, moduleFile, packageJsonFilter, getModuleSpecifierResolutionHost(info.isFromPackageJson), moduleSpecifierCache);
                 }
             }
-            function getNearestExportSymbol(fromSymbol) {
-                return findAlias(typeChecker, fromSymbol, function (alias) {
-                    return ts.some(alias.declarations, function (d) { return ts.isExportSpecifier(d) || !!d.localSymbol; });
-                });
+            function pushAutoImportSymbol(symbol, origin) {
+                var symbolId = ts.getSymbolId(symbol);
+                if (symbolToSortTextMap[symbolId] === SortText.GlobalsOrKeywords) {
+                    // If an auto-importable symbol is available as a global, don't add the auto import
+                    return;
+                }
+                symbolToOriginInfoMap[symbols.length] = origin;
+                symbolToSortTextMap[symbolId] = importCompletionNode ? SortText.LocationPriority : SortText.AutoImportSuggestions;
+                symbols.push(symbol);
             }
             /**
              * True if you could remove some characters in `a` to get `b`.
@@ -121491,7 +125051,8 @@ var ts;
                     return true;
                 }
                 var characterIndex = 0;
-                for (var strIndex = 0; strIndex < str.length; strIndex++) {
+                var len = str.length;
+                for (var strIndex = 0; strIndex < len; strIndex++) {
                     if (str.charCodeAt(strIndex) === characters.charCodeAt(characterIndex)) {
                         characterIndex++;
                         if (characterIndex === characters.length) {
@@ -121527,7 +125088,7 @@ var ts;
                     return true;
                 }
                 if (contextToken.kind === 31 /* GreaterThanToken */ && contextToken.parent) {
-                    if (contextToken.parent.kind === 275 /* JsxOpeningElement */) {
+                    if (contextToken.parent.kind === 276 /* JsxOpeningElement */) {
                         // Two possibilities:
                         //   1. <div>/**/
                         //      - contextToken: GreaterThanToken (before cursor)
@@ -121537,10 +125098,10 @@ var ts;
                         //      - contextToken: GreaterThanToken (before cursor)
                         //      - location: GreaterThanToken (after cursor)
                         //      - same parent (JSXOpeningElement)
-                        return location.parent.kind !== 275 /* JsxOpeningElement */;
+                        return location.parent.kind !== 276 /* JsxOpeningElement */;
                     }
-                    if (contextToken.parent.kind === 276 /* JsxClosingElement */ || contextToken.parent.kind === 274 /* JsxSelfClosingElement */) {
-                        return !!contextToken.parent.parent && contextToken.parent.parent.kind === 273 /* JsxElement */;
+                    if (contextToken.parent.kind === 277 /* JsxClosingElement */ || contextToken.parent.kind === 275 /* JsxSelfClosingElement */) {
+                        return !!contextToken.parent.parent && contextToken.parent.parent.kind === 274 /* JsxElement */;
                     }
                 }
                 return false;
@@ -121551,42 +125112,42 @@ var ts;
                     // Previous token may have been a keyword that was converted to an identifier.
                     switch (keywordForNode(contextToken)) {
                         case 27 /* CommaToken */:
-                            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|
-                                || containingNodeKind === 200 /* ObjectLiteralExpression */; // const obj = { x, |
+                            return containingNodeKind === 204 /* CallExpression */ // func( a, |
+                                || containingNodeKind === 167 /* Constructor */ // constructor( a, |   /* public, protected, private keywords are allowed here, so show completion */
+                                || containingNodeKind === 205 /* NewExpression */ // new C(a, |
+                                || containingNodeKind === 200 /* ArrayLiteralExpression */ // [a, |
+                                || containingNodeKind === 217 /* BinaryExpression */ // const x = (a, |
+                                || containingNodeKind === 175 /* FunctionType */ // var x: (s: string, list|
+                                || containingNodeKind === 201 /* ObjectLiteralExpression */; // const obj = { x, |
                         case 20 /* OpenParenToken */:
-                            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 */
+                            return containingNodeKind === 204 /* CallExpression */ // func( |
+                                || containingNodeKind === 167 /* Constructor */ // constructor( |
+                                || containingNodeKind === 205 /* NewExpression */ // new C(a|
+                                || containingNodeKind === 208 /* ParenthesizedExpression */ // const x = (a|
+                                || containingNodeKind === 187 /* ParenthesizedType */; // function F(pred: (a| /* this can become an arrow function, where 'a' is the argument */
                         case 22 /* OpenBracketToken */:
-                            return containingNodeKind === 199 /* ArrayLiteralExpression */ // [ |
-                                || containingNodeKind === 171 /* IndexSignature */ // [ | : string ]
-                                || containingNodeKind === 158 /* ComputedPropertyName */; // [ |    /* this can become an index signature */
+                            return containingNodeKind === 200 /* ArrayLiteralExpression */ // [ |
+                                || containingNodeKind === 172 /* IndexSignature */ // [ | : string ]
+                                || containingNodeKind === 159 /* ComputedPropertyName */; // [ |    /* this can become an index signature */
                         case 139 /* ModuleKeyword */: // module |
                         case 140 /* NamespaceKeyword */: // namespace |
                             return true;
                         case 24 /* DotToken */:
-                            return containingNodeKind === 256 /* ModuleDeclaration */; // module A.|
+                            return containingNodeKind === 257 /* ModuleDeclaration */; // module A.|
                         case 18 /* OpenBraceToken */:
-                            return containingNodeKind === 252 /* ClassDeclaration */ // class A { |
-                                || containingNodeKind === 200 /* ObjectLiteralExpression */; // const obj = { |
+                            return containingNodeKind === 253 /* ClassDeclaration */ // class A { |
+                                || containingNodeKind === 201 /* ObjectLiteralExpression */; // const obj = { |
                         case 62 /* EqualsToken */:
-                            return containingNodeKind === 249 /* VariableDeclaration */ // const x = a|
-                                || containingNodeKind === 216 /* BinaryExpression */; // x = a|
+                            return containingNodeKind === 250 /* VariableDeclaration */ // const x = a|
+                                || containingNodeKind === 217 /* BinaryExpression */; // x = a|
                         case 15 /* TemplateHead */:
-                            return containingNodeKind === 218 /* TemplateExpression */; // `aa ${|
+                            return containingNodeKind === 219 /* TemplateExpression */; // `aa ${|
                         case 16 /* TemplateMiddle */:
-                            return containingNodeKind === 228 /* TemplateSpan */; // `aa ${10} dd ${|
+                            return containingNodeKind === 229 /* TemplateSpan */; // `aa ${10} dd ${|
                         case 122 /* PublicKeyword */:
                         case 120 /* PrivateKeyword */:
                         case 121 /* ProtectedKeyword */:
-                            return containingNodeKind === 163 /* PropertyDeclaration */; // class A{ public |
+                            return containingNodeKind === 164 /* PropertyDeclaration */; // class A{ public |
                     }
                 }
                 return false;
@@ -121599,6 +125160,25 @@ var ts;
                 return (ts.isRegularExpressionLiteral(contextToken) || ts.isStringTextContainingNode(contextToken)) && (ts.rangeContainsPositionExclusive(ts.createTextRangeFromSpan(ts.createTextSpanFromNode(contextToken)), position) ||
                     position === contextToken.end && (!!contextToken.isUnterminated || ts.isRegularExpressionLiteral(contextToken)));
             }
+            function tryGetObjectTypeLiteralInTypeArgumentCompletionSymbols() {
+                var typeLiteralNode = tryGetTypeLiteralNode(contextToken);
+                if (!typeLiteralNode)
+                    return 0 /* Continue */;
+                var intersectionTypeNode = ts.isIntersectionTypeNode(typeLiteralNode.parent) ? typeLiteralNode.parent : undefined;
+                var containerTypeNode = intersectionTypeNode || typeLiteralNode;
+                var containerExpectedType = getConstraintOfTypeArgumentProperty(containerTypeNode, typeChecker);
+                if (!containerExpectedType)
+                    return 0 /* Continue */;
+                var containerActualType = typeChecker.getTypeFromTypeNode(containerTypeNode);
+                var members = getPropertiesForCompletion(containerExpectedType, typeChecker);
+                var existingMembers = getPropertiesForCompletion(containerActualType, typeChecker);
+                var existingMemberEscapedNames = new ts.Set();
+                existingMembers.forEach(function (s) { return existingMemberEscapedNames.add(s.escapedName); });
+                symbols = ts.filter(members, function (s) { return !existingMemberEscapedNames.has(s.escapedName); });
+                completionKind = 0 /* ObjectPropertyDeclaration */;
+                isNewIdentifierLocation = true;
+                return 1 /* Success */;
+            }
             /**
              * Aggregates relevant symbols for completion in object literals and object binding patterns.
              * Relevant symbols are stored in the captured 'symbols' variable.
@@ -121613,7 +125193,7 @@ var ts;
                 completionKind = 0 /* ObjectPropertyDeclaration */;
                 var typeMembers;
                 var existingMembers;
-                if (objectLikeContainer.kind === 200 /* ObjectLiteralExpression */) {
+                if (objectLikeContainer.kind === 201 /* ObjectLiteralExpression */) {
                     var instantiatedType = tryGetObjectLiteralContextualType(objectLikeContainer, typeChecker);
                     // Check completions for Object property value shorthand
                     if (instantiatedType === undefined) {
@@ -121638,7 +125218,7 @@ var ts;
                     }
                 }
                 else {
-                    ts.Debug.assert(objectLikeContainer.kind === 196 /* ObjectBindingPattern */);
+                    ts.Debug.assert(objectLikeContainer.kind === 197 /* ObjectBindingPattern */);
                     // We are *only* completing on properties from the type being destructured.
                     isNewIdentifierLocation = false;
                     var rootDeclaration = ts.getRootDeclaration(objectLikeContainer.parent);
@@ -121649,12 +125229,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 === 239 /* ForOfStatement */;
-                    if (!canGetType && rootDeclaration.kind === 160 /* Parameter */) {
+                    var canGetType = ts.hasInitializer(rootDeclaration) || ts.hasType(rootDeclaration) || rootDeclaration.parent.parent.kind === 240 /* ForOfStatement */;
+                    if (!canGetType && rootDeclaration.kind === 161 /* Parameter */) {
                         if (ts.isExpression(rootDeclaration.parent)) {
                             canGetType = !!typeChecker.getContextualType(rootDeclaration.parent);
                         }
-                        else if (rootDeclaration.parent.kind === 165 /* MethodDeclaration */ || rootDeclaration.parent.kind === 168 /* SetAccessor */) {
+                        else if (rootDeclaration.parent.kind === 166 /* MethodDeclaration */ || rootDeclaration.parent.kind === 169 /* SetAccessor */) {
                             canGetType = ts.isExpression(rootDeclaration.parent.parent) && !!typeChecker.getContextualType(rootDeclaration.parent.parent);
                         }
                     }
@@ -121701,9 +125281,9 @@ var ts;
                 if (!namedImportsOrExports)
                     return 0 /* Continue */;
                 // try to show exported member for imported/re-exported module
-                var moduleSpecifier = (namedImportsOrExports.kind === 264 /* NamedImports */ ? namedImportsOrExports.parent.parent : namedImportsOrExports.parent).moduleSpecifier;
+                var moduleSpecifier = (namedImportsOrExports.kind === 265 /* NamedImports */ ? namedImportsOrExports.parent.parent : namedImportsOrExports.parent).moduleSpecifier;
                 if (!moduleSpecifier)
-                    return namedImportsOrExports.kind === 264 /* NamedImports */ ? 2 /* Fail */ : 0 /* Continue */;
+                    return namedImportsOrExports.kind === 265 /* NamedImports */ ? 2 /* Fail */ : 0 /* Continue */;
                 var moduleSpecifierSymbol = typeChecker.getSymbolAtLocation(moduleSpecifier); // TODO: GH#18217
                 if (!moduleSpecifierSymbol)
                     return 2 /* Fail */;
@@ -121771,12 +125351,16 @@ var ts;
                         case "static":
                             classElementModifierFlags = classElementModifierFlags | 32 /* Static */;
                             break;
+                        case "override":
+                            classElementModifierFlags = classElementModifierFlags | 16384 /* Override */;
+                            break;
                     }
                 }
                 // No member list for private methods
                 if (!(classElementModifierFlags & 8 /* Private */)) {
                     // List of property symbols of base type that are not private and already implemented
-                    var baseSymbols = ts.flatMap(ts.getAllSuperTypeNodes(decl), function (baseTypeNode) {
+                    var baseTypeNodes = ts.isClassLike(decl) && classElementModifierFlags & 16384 /* Override */ ? ts.singleElementArray(ts.getEffectiveBaseTypeNode(decl)) : ts.getAllSuperTypeNodes(decl);
+                    var baseSymbols = ts.flatMap(baseTypeNodes, function (baseTypeNode) {
                         var type = typeChecker.getTypeAtLocation(baseTypeNode);
                         return classElementModifierFlags & 32 /* Static */ ?
                             (type === null || type === void 0 ? void 0 : type.symbol) && typeChecker.getPropertiesOfType(typeChecker.getTypeOfSymbolAtLocation(type.symbol, decl)) :
@@ -121856,11 +125440,11 @@ var ts;
                         case 30 /* LessThanSlashToken */:
                         case 43 /* SlashToken */:
                         case 78 /* Identifier */:
-                        case 201 /* PropertyAccessExpression */:
-                        case 281 /* JsxAttributes */:
-                        case 280 /* JsxAttribute */:
-                        case 282 /* JsxSpreadAttribute */:
-                            if (parent && (parent.kind === 274 /* JsxSelfClosingElement */ || parent.kind === 275 /* JsxOpeningElement */)) {
+                        case 202 /* PropertyAccessExpression */:
+                        case 282 /* JsxAttributes */:
+                        case 281 /* JsxAttribute */:
+                        case 283 /* JsxSpreadAttribute */:
+                            if (parent && (parent.kind === 275 /* JsxSelfClosingElement */ || parent.kind === 276 /* JsxOpeningElement */)) {
                                 if (contextToken.kind === 31 /* GreaterThanToken */) {
                                     var precedingToken = ts.findPrecedingToken(contextToken.pos, sourceFile, /*startNode*/ undefined);
                                     if (!parent.typeArguments || (precedingToken && precedingToken.kind === 43 /* SlashToken */))
@@ -121868,7 +125452,7 @@ var ts;
                                 }
                                 return parent;
                             }
-                            else if (parent.kind === 280 /* JsxAttribute */) {
+                            else if (parent.kind === 281 /* JsxAttribute */) {
                                 // Currently we parse JsxOpeningLikeElement as:
                                 //      JsxOpeningLikeElement
                                 //          attributes: JsxAttributes
@@ -121880,7 +125464,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 === 280 /* JsxAttribute */) || (parent.kind === 282 /* JsxSpreadAttribute */))) {
+                            if (parent && ((parent.kind === 281 /* JsxAttribute */) || (parent.kind === 283 /* JsxSpreadAttribute */))) {
                                 // Currently we parse JsxOpeningLikeElement as:
                                 //      JsxOpeningLikeElement
                                 //          attributes: JsxAttributes
@@ -121890,8 +125474,8 @@ var ts;
                             break;
                         case 19 /* CloseBraceToken */:
                             if (parent &&
-                                parent.kind === 283 /* JsxExpression */ &&
-                                parent.parent && parent.parent.kind === 280 /* JsxAttribute */) {
+                                parent.kind === 284 /* JsxExpression */ &&
+                                parent.parent && parent.parent.kind === 281 /* JsxAttribute */) {
                                 // Currently we parse JsxOpeningLikeElement as:
                                 //      JsxOpeningLikeElement
                                 //          attributes: JsxAttributes
@@ -121899,7 +125483,7 @@ var ts;
                                 //                  each JsxAttribute can have initializer as JsxExpression
                                 return parent.parent.parent.parent;
                             }
-                            if (parent && parent.kind === 282 /* JsxSpreadAttribute */) {
+                            if (parent && parent.kind === 283 /* JsxSpreadAttribute */) {
                                 // Currently we parse JsxOpeningLikeElement as:
                                 //      JsxOpeningLikeElement
                                 //          attributes: JsxAttributes
@@ -121919,49 +125503,49 @@ var ts;
                 var containingNodeKind = parent.kind;
                 switch (contextToken.kind) {
                     case 27 /* CommaToken */:
-                        return containingNodeKind === 249 /* VariableDeclaration */ ||
+                        return containingNodeKind === 250 /* VariableDeclaration */ ||
                             isVariableDeclarationListButNotTypeArgument(contextToken) ||
-                            containingNodeKind === 232 /* VariableStatement */ ||
-                            containingNodeKind === 255 /* EnumDeclaration */ || // enum a { foo, |
+                            containingNodeKind === 233 /* VariableStatement */ ||
+                            containingNodeKind === 256 /* EnumDeclaration */ || // enum a { foo, |
                             isFunctionLikeButNotConstructor(containingNodeKind) ||
-                            containingNodeKind === 253 /* InterfaceDeclaration */ || // interface A<T, |
-                            containingNodeKind === 197 /* ArrayBindingPattern */ || // var [x, y|
-                            containingNodeKind === 254 /* TypeAliasDeclaration */ || // type Map, K, |
+                            containingNodeKind === 254 /* InterfaceDeclaration */ || // interface A<T, |
+                            containingNodeKind === 198 /* ArrayBindingPattern */ || // var [x, y|
+                            containingNodeKind === 255 /* 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 === 197 /* ArrayBindingPattern */; // var [.|
+                        return containingNodeKind === 198 /* ArrayBindingPattern */; // var [.|
                     case 58 /* ColonToken */:
-                        return containingNodeKind === 198 /* BindingElement */; // var {x :html|
+                        return containingNodeKind === 199 /* BindingElement */; // var {x :html|
                     case 22 /* OpenBracketToken */:
-                        return containingNodeKind === 197 /* ArrayBindingPattern */; // var [x|
+                        return containingNodeKind === 198 /* ArrayBindingPattern */; // var [x|
                     case 20 /* OpenParenToken */:
-                        return containingNodeKind === 287 /* CatchClause */ ||
+                        return containingNodeKind === 288 /* CatchClause */ ||
                             isFunctionLikeButNotConstructor(containingNodeKind);
                     case 18 /* OpenBraceToken */:
-                        return containingNodeKind === 255 /* EnumDeclaration */; // enum a { |
+                        return containingNodeKind === 256 /* EnumDeclaration */; // enum a { |
                     case 29 /* LessThanToken */:
-                        return containingNodeKind === 252 /* ClassDeclaration */ || // class A< |
-                            containingNodeKind === 221 /* ClassExpression */ || // var C = class D< |
-                            containingNodeKind === 253 /* InterfaceDeclaration */ || // interface A< |
-                            containingNodeKind === 254 /* TypeAliasDeclaration */ || // type List< |
+                        return containingNodeKind === 253 /* ClassDeclaration */ || // class A< |
+                            containingNodeKind === 222 /* ClassExpression */ || // var C = class D< |
+                            containingNodeKind === 254 /* InterfaceDeclaration */ || // interface A< |
+                            containingNodeKind === 255 /* TypeAliasDeclaration */ || // type List< |
                             ts.isFunctionLikeKind(containingNodeKind);
                     case 123 /* StaticKeyword */:
-                        return containingNodeKind === 163 /* PropertyDeclaration */ && !ts.isClassLike(parent.parent);
+                        return containingNodeKind === 164 /* PropertyDeclaration */ && !ts.isClassLike(parent.parent);
                     case 25 /* DotDotDotToken */:
-                        return containingNodeKind === 160 /* Parameter */ ||
-                            (!!parent.parent && parent.parent.kind === 197 /* ArrayBindingPattern */); // var [...z|
+                        return containingNodeKind === 161 /* Parameter */ ||
+                            (!!parent.parent && parent.parent.kind === 198 /* ArrayBindingPattern */); // var [...z|
                     case 122 /* PublicKeyword */:
                     case 120 /* PrivateKeyword */:
                     case 121 /* ProtectedKeyword */:
-                        return containingNodeKind === 160 /* Parameter */ && !ts.isConstructorDeclaration(parent.parent);
+                        return containingNodeKind === 161 /* Parameter */ && !ts.isConstructorDeclaration(parent.parent);
                     case 126 /* AsKeyword */:
-                        return containingNodeKind === 265 /* ImportSpecifier */ ||
-                            containingNodeKind === 270 /* ExportSpecifier */ ||
-                            containingNodeKind === 263 /* NamespaceImport */;
+                        return containingNodeKind === 266 /* ImportSpecifier */ ||
+                            containingNodeKind === 271 /* ExportSpecifier */ ||
+                            containingNodeKind === 264 /* NamespaceImport */;
                     case 134 /* GetKeyword */:
                     case 146 /* SetKeyword */:
                         return !isFromObjectTypeDeclaration(contextToken);
@@ -121979,7 +125563,7 @@ var ts;
                     case 41 /* AsteriskToken */:
                         return ts.isFunctionLike(contextToken.parent) && !ts.isMethodDeclaration(contextToken.parent);
                 }
-                // If the previous token is keyword correspoding to class member completion keyword
+                // If the previous token is keyword corresponding to class member completion keyword
                 // there will be completion available here
                 if (isClassMemberCompletionKeyword(keywordForNode(contextToken)) && isFromObjectTypeDeclaration(contextToken)) {
                     return false;
@@ -122014,6 +125598,31 @@ var ts;
                     case 129 /* AsyncKeyword */:
                         return ts.isPropertyDeclaration(contextToken.parent);
                 }
+                // If we are inside a class declaration, and `constructor` is totally not present,
+                // but we request a completion manually at a whitespace...
+                var ancestorClassLike = ts.findAncestor(contextToken.parent, ts.isClassLike);
+                if (ancestorClassLike && contextToken === previousToken && isPreviousPropertyDeclarationTerminated(contextToken, position)) {
+                    return false; // Don't block completions.
+                }
+                var ancestorPropertyDeclaraion = ts.getAncestor(contextToken.parent, 164 /* PropertyDeclaration */);
+                // If we are inside a class declaration and typing `constructor` after property declaration...
+                if (ancestorPropertyDeclaraion
+                    && contextToken !== previousToken
+                    && ts.isClassLike(previousToken.parent.parent)
+                    // And the cursor is at the token...
+                    && position <= previousToken.end) {
+                    // If we are sure that the previous property declaration is terminated according to newline or semicolon...
+                    if (isPreviousPropertyDeclarationTerminated(contextToken, previousToken.end)) {
+                        return false; // Don't block completions.
+                    }
+                    else if (contextToken.kind !== 62 /* EqualsToken */
+                        // Should not block: `class C { blah = c/**/ }`
+                        // But should block: `class C { blah = somewhat c/**/ }` and `class C { blah: SomeType c/**/ }`
+                        && (ts.isInitializedProperty(ancestorPropertyDeclaraion)
+                            || ts.hasType(ancestorPropertyDeclaraion))) {
+                        return true;
+                    }
+                }
                 return ts.isDeclarationName(contextToken)
                     && !ts.isShorthandPropertyAssignment(contextToken.parent)
                     && !ts.isJsxAttribute(contextToken.parent)
@@ -122021,8 +125630,13 @@ var ts;
                     // If `contextToken !== previousToken`, this is `class C ex/**/`.
                     && !(ts.isClassLike(contextToken.parent) && (contextToken !== previousToken || position > previousToken.end));
             }
+            function isPreviousPropertyDeclarationTerminated(contextToken, position) {
+                return contextToken.kind !== 62 /* EqualsToken */ &&
+                    (contextToken.kind === 26 /* SemicolonToken */
+                        || !ts.positionsAreOnSameLine(contextToken.end, position, sourceFile));
+            }
             function isFunctionLikeButNotConstructor(kind) {
-                return ts.isFunctionLikeKind(kind) && kind !== 166 /* Constructor */;
+                return ts.isFunctionLikeKind(kind) && kind !== 167 /* Constructor */;
             }
             function isDotOfNumericLiteral(contextToken) {
                 if (contextToken.kind === 8 /* NumericLiteral */) {
@@ -122032,7 +125646,7 @@ var ts;
                 return false;
             }
             function isVariableDeclarationListButNotTypeArgument(node) {
-                return node.parent.kind === 250 /* VariableDeclarationList */
+                return node.parent.kind === 251 /* VariableDeclarationList */
                     && !ts.isPossiblyTypeArgumentPosition(node, sourceFile, typeChecker);
             }
             /**
@@ -122050,13 +125664,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 !== 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 */) {
+                    if (m.kind !== 289 /* PropertyAssignment */ &&
+                        m.kind !== 290 /* ShorthandPropertyAssignment */ &&
+                        m.kind !== 199 /* BindingElement */ &&
+                        m.kind !== 166 /* MethodDeclaration */ &&
+                        m.kind !== 168 /* GetAccessor */ &&
+                        m.kind !== 169 /* SetAccessor */ &&
+                        m.kind !== 291 /* SpreadAssignment */) {
                         continue;
                     }
                     // If this is the current item we are editing right now, do not filter it out
@@ -122129,10 +125743,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 !== 163 /* PropertyDeclaration */ &&
-                        m.kind !== 165 /* MethodDeclaration */ &&
-                        m.kind !== 167 /* GetAccessor */ &&
-                        m.kind !== 168 /* SetAccessor */) {
+                    if (m.kind !== 164 /* PropertyDeclaration */ &&
+                        m.kind !== 166 /* MethodDeclaration */ &&
+                        m.kind !== 168 /* GetAccessor */ &&
+                        m.kind !== 169 /* SetAccessor */) {
                         continue;
                     }
                     // If this is the current item we are editing right now, do not filter it out
@@ -122156,7 +125770,7 @@ var ts;
                     return !existingMemberNames.has(propertySymbol.escapedName) &&
                         !!propertySymbol.declarations &&
                         !(ts.getDeclarationModifierFlagsFromSymbol(propertySymbol) & 8 /* Private */) &&
-                        !(propertySymbol.valueDeclaration && ts.isPrivateIdentifierPropertyDeclaration(propertySymbol.valueDeclaration));
+                        !(propertySymbol.valueDeclaration && ts.isPrivateIdentifierClassElementDeclaration(propertySymbol.valueDeclaration));
                 });
             }
             /**
@@ -122174,7 +125788,7 @@ var ts;
                     if (isCurrentlyEditingNode(attr)) {
                         continue;
                     }
-                    if (attr.kind === 280 /* JsxAttribute */) {
+                    if (attr.kind === 281 /* JsxAttribute */) {
                         seenNames.add(attr.name.escapedText);
                     }
                     else if (ts.isJsxSpreadAttribute(attr)) {
@@ -122189,8 +125803,35 @@ var ts;
                 return node.getStart(sourceFile) <= position && position <= node.getEnd();
             }
         }
+        function getAutoImportSymbolFromCompletionEntryData(name, data, program, host) {
+            var containingProgram = data.isPackageJsonImport ? host.getPackageJsonAutoImportProvider() : program;
+            var checker = containingProgram.getTypeChecker();
+            var moduleSymbol = data.ambientModuleName ? checker.tryFindAmbientModule(data.ambientModuleName) :
+                data.fileName ? checker.getMergedSymbol(ts.Debug.checkDefined(containingProgram.getSourceFile(data.fileName)).symbol) :
+                    undefined;
+            if (!moduleSymbol)
+                return undefined;
+            var symbol = data.exportName === "export=" /* ExportEquals */
+                ? checker.resolveExternalModuleSymbol(moduleSymbol)
+                : checker.tryGetMemberInModuleExportsAndProperties(data.exportName, moduleSymbol);
+            if (!symbol)
+                return undefined;
+            var isDefaultExport = data.exportName === "default" /* Default */;
+            symbol = isDefaultExport && ts.getLocalSymbolForExportDefault(symbol) || symbol;
+            return {
+                symbol: symbol,
+                origin: {
+                    kind: data.moduleSpecifier ? 32 /* ResolvedExport */ : 4 /* Export */,
+                    moduleSymbol: moduleSymbol,
+                    symbolName: name,
+                    isDefaultExport: isDefaultExport,
+                    exportName: data.exportName,
+                    fileName: data.fileName,
+                }
+            };
+        }
         function getCompletionEntryDisplayNameForSymbol(symbol, target, origin, kind, jsxIdentifierExpected) {
-            var name = originIsExport(origin) ? ts.getNameForExportedSymbol(symbol, target) : symbol.name;
+            var name = originIncludesSymbolName(origin) ? origin.symbolName : symbol.name;
             if (name === undefined
                 // If the symbol is external module, don't show it in the completion list
                 // (i.e declare module "http" { const x; } | // <= request completion here, "http" should not be there)
@@ -122200,7 +125841,7 @@ var ts;
                 return undefined;
             }
             var validNameResult = { name: name, needsConvertPropertyAccess: false };
-            if (ts.isIdentifierText(name, target, jsxIdentifierExpected ? 1 /* JSX */ : 0 /* Standard */) || symbol.valueDeclaration && ts.isPrivateIdentifierPropertyDeclaration(symbol.valueDeclaration)) {
+            if (ts.isIdentifierText(name, target, jsxIdentifierExpected ? 1 /* JSX */ : 0 /* Standard */) || symbol.valueDeclaration && ts.isPrivateIdentifierClassElementDeclaration(symbol.valueDeclaration)) {
                 return validNameResult;
             }
             switch (kind) {
@@ -122224,7 +125865,7 @@ var ts;
         var _keywordCompletions = [];
         var allKeywordsCompletions = ts.memoize(function () {
             var res = [];
-            for (var i = 80 /* FirstKeyword */; i <= 156 /* LastKeyword */; i++) {
+            for (var i = 80 /* FirstKeyword */; i <= 157 /* LastKeyword */; i++) {
                 res.push({
                     name: ts.tokenToString(i),
                     kind: "keyword" /* keyword */,
@@ -122291,6 +125932,7 @@ var ts;
                 case 141 /* NeverKeyword */:
                 case 144 /* NumberKeyword */:
                 case 145 /* ObjectKeyword */:
+                case 156 /* OverrideKeyword */:
                 case 120 /* PrivateKeyword */:
                 case 121 /* ProtectedKeyword */:
                 case 122 /* PublicKeyword */:
@@ -122316,6 +125958,7 @@ var ts;
                 case 146 /* SetKeyword */:
                 case 129 /* AsyncKeyword */:
                 case 133 /* DeclareKeyword */:
+                case 156 /* OverrideKeyword */:
                     return true;
                 default:
                     return ts.isClassMemberModifier(kind);
@@ -122376,7 +126019,7 @@ var ts;
         function tryGetObjectTypeDeclarationCompletionContainer(sourceFile, contextToken, location, position) {
             // class c { method() { } | method2() { } }
             switch (location.kind) {
-                case 334 /* SyntaxList */:
+                case 338 /* 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);
@@ -122397,6 +126040,12 @@ var ts;
             }
             if (!contextToken)
                 return undefined;
+            // class C { blah; constructor/**/ } and so on
+            if (location.kind === 132 /* ConstructorKeyword */
+                // class C { blah \n constructor/**/ }
+                || (ts.isIdentifier(contextToken) && ts.isPropertyDeclaration(contextToken.parent) && ts.isClassLike(location))) {
+                return ts.findAncestor(contextToken, ts.isClassLike);
+            }
             switch (contextToken.kind) {
                 case 62 /* EqualsToken */: // class c { public prop = | /* global completions */ }
                     return undefined;
@@ -122422,6 +126071,44 @@ var ts;
                         ? contextToken.parent.parent : undefined;
             }
         }
+        function tryGetTypeLiteralNode(node) {
+            if (!node)
+                return undefined;
+            var parent = node.parent;
+            switch (node.kind) {
+                case 18 /* OpenBraceToken */:
+                    if (ts.isTypeLiteralNode(parent)) {
+                        return parent;
+                    }
+                    break;
+                case 26 /* SemicolonToken */:
+                case 27 /* CommaToken */:
+                case 78 /* Identifier */:
+                    if (parent.kind === 163 /* PropertySignature */ && ts.isTypeLiteralNode(parent.parent)) {
+                        return parent.parent;
+                    }
+                    break;
+            }
+            return undefined;
+        }
+        function getConstraintOfTypeArgumentProperty(node, checker) {
+            if (!node)
+                return undefined;
+            if (ts.isTypeNode(node) && ts.isTypeReferenceType(node.parent)) {
+                return checker.getTypeArgumentConstraint(node);
+            }
+            var t = getConstraintOfTypeArgumentProperty(node.parent, checker);
+            if (!t)
+                return undefined;
+            switch (node.kind) {
+                case 163 /* PropertySignature */:
+                    return checker.getTypeOfPropertyOfContextualType(t, node.symbol.escapedName);
+                case 184 /* IntersectionType */:
+                case 178 /* TypeLiteral */:
+                case 183 /* UnionType */:
+                    return t;
+            }
+        }
         // TODO: GH#19856 Would like to return `node is Node & { parent: (ClassElement | TypeElement) & { parent: ObjectTypeDeclaration } }` but then compilation takes > 10 minutes
         function isFromObjectTypeDeclaration(node) {
             return node.parent && ts.isClassOrTypeElement(node.parent) && ts.isObjectTypeDeclaration(node.parent.parent);
@@ -122445,6 +126132,8 @@ var ts;
                     return !!contextToken && (ts.isStringLiteralLike(contextToken)
                         ? !!ts.tryGetImportFromModuleSpecifier(contextToken)
                         : contextToken.kind === 43 /* SlashToken */ && ts.isJsxClosingElement(contextToken.parent));
+                case " ":
+                    return !!contextToken && ts.isImportKeyword(contextToken) && contextToken.parent.kind === 298 /* SourceFile */;
                 default:
                     return ts.Debug.assertNever(triggerCharacter);
             }
@@ -122453,14 +126142,6 @@ var ts;
             var left = _a.left;
             return ts.nodeIsMissing(left);
         }
-        function findAlias(typeChecker, symbol, predicate) {
-            var currentAlias = symbol;
-            while (currentAlias.flags & 2097152 /* Alias */ && (currentAlias = typeChecker.getImmediateAliasedSymbol(currentAlias))) {
-                if (predicate(currentAlias)) {
-                    return currentAlias;
-                }
-            }
-        }
         /** Determines if a type is exactly the same type resolved by the global 'self', 'global', or 'globalThis'. */
         function isProbablyGlobalType(type, sourceFile, checker) {
             // The type of `self` and `window` is the same in lib.dom.d.ts, but `window` does not exist in
@@ -122487,11 +126168,67 @@ var ts;
             if (type) {
                 return type;
             }
-            if (ts.isBinaryExpression(node.parent) && node.parent.operatorToken.kind === 62 /* EqualsToken */) {
+            if (ts.isBinaryExpression(node.parent) && node.parent.operatorToken.kind === 62 /* EqualsToken */ && node === node.parent.left) {
+                // Object literal is assignment pattern: ({ | } = x)
                 return typeChecker.getTypeAtLocation(node.parent);
             }
             return undefined;
         }
+        function getImportCompletionNode(contextToken) {
+            var candidate = getCandidate();
+            return candidate === 153 /* FromKeyword */ || candidate && ts.rangeIsOnSingleLine(candidate, candidate.getSourceFile()) ? candidate : undefined;
+            function getCandidate() {
+                var parent = contextToken.parent;
+                if (ts.isImportEqualsDeclaration(parent)) {
+                    return isModuleSpecifierMissingOrEmpty(parent.moduleReference) ? parent : undefined;
+                }
+                if (ts.isNamedImports(parent) || ts.isNamespaceImport(parent)) {
+                    if (isModuleSpecifierMissingOrEmpty(parent.parent.parent.moduleSpecifier) && (ts.isNamespaceImport(parent) || parent.elements.length < 2) && !parent.parent.name) {
+                        // At `import { ... } |` or `import * as Foo |`, the only possible completion is `from`
+                        return contextToken.kind === 19 /* CloseBraceToken */ || contextToken.kind === 78 /* Identifier */
+                            ? 153 /* FromKeyword */
+                            : parent.parent.parent;
+                    }
+                    return undefined;
+                }
+                if (ts.isImportKeyword(contextToken) && ts.isSourceFile(parent)) {
+                    // A lone import keyword with nothing following it does not parse as a statement at all
+                    return contextToken;
+                }
+                if (ts.isImportKeyword(contextToken) && ts.isImportDeclaration(parent)) {
+                    // `import s| from`
+                    return isModuleSpecifierMissingOrEmpty(parent.moduleSpecifier) ? parent : undefined;
+                }
+                return undefined;
+            }
+        }
+        function isModuleSpecifierMissingOrEmpty(specifier) {
+            var _a;
+            if (ts.nodeIsMissing(specifier))
+                return true;
+            return !((_a = ts.tryCast(ts.isExternalModuleReference(specifier) ? specifier.expression : specifier, ts.isStringLiteralLike)) === null || _a === void 0 ? void 0 : _a.text);
+        }
+        function getVariableDeclaration(property) {
+            var variableDeclaration = ts.findAncestor(property, function (node) {
+                return ts.isFunctionBlock(node) || isArrowFunctionBody(node) || ts.isBindingPattern(node)
+                    ? "quit"
+                    : ts.isVariableDeclaration(node);
+            });
+            return variableDeclaration;
+        }
+        function isArrowFunctionBody(node) {
+            return node.parent && ts.isArrowFunction(node.parent) && node.parent.body === node;
+        }
+        ;
+        /** True if symbol is a type or a module containing at least one type. */
+        function symbolCanBeReferencedAtTypeLocation(symbol, checker, seenModules) {
+            if (seenModules === void 0) { seenModules = new ts.Map(); }
+            var sym = ts.skipAlias(symbol.exportSymbol || symbol, checker);
+            return !!(sym.flags & 788968 /* Type */) ||
+                !!(sym.flags & 1536 /* Module */) &&
+                    ts.addToSeen(seenModules, ts.getSymbolId(sym)) &&
+                    checker.getExportsOfModule(sym).some(function (e) { return symbolCanBeReferencedAtTypeLocation(e, checker, seenModules); });
+        }
     })(Completions = ts.Completions || (ts.Completions = {}));
 })(ts || (ts = {}));
 var ts;
@@ -122526,10 +126263,12 @@ var ts;
             if (!referenceEntries)
                 return undefined;
             var map = ts.arrayToMultiMap(referenceEntries.map(ts.FindAllReferences.toHighlightSpan), function (e) { return e.fileName; }, function (e) { return e.span; });
-            return ts.arrayFrom(map.entries(), function (_a) {
+            return ts.mapDefined(ts.arrayFrom(map.entries()), function (_a) {
                 var fileName = _a[0], highlightSpans = _a[1];
                 if (!sourceFilesSet.has(fileName)) {
-                    ts.Debug.assert(program.redirectTargetsMap.has(fileName));
+                    if (!program.redirectTargetsMap.has(fileName)) {
+                        return undefined;
+                    }
                     var redirectTarget_1 = program.getSourceFile(fileName);
                     var redirect = ts.find(sourceFilesToSearch, function (f) { return !!f.redirectInfo && f.redirectInfo.redirectTarget === redirectTarget_1; });
                     fileName = redirect.fileName;
@@ -122624,7 +126363,7 @@ var ts;
             var child = throwStatement;
             while (child.parent) {
                 var parent = child.parent;
-                if (ts.isFunctionBlock(parent) || parent.kind === 297 /* SourceFile */) {
+                if (ts.isFunctionBlock(parent) || parent.kind === 298 /* SourceFile */) {
                     return parent;
                 }
                 // A throw-statement is only owned by a try-statement if the try-statement has
@@ -122656,16 +126395,16 @@ var ts;
         function getBreakOrContinueOwner(statement) {
             return ts.findAncestor(statement, function (node) {
                 switch (node.kind) {
-                    case 244 /* SwitchStatement */:
-                        if (statement.kind === 240 /* ContinueStatement */) {
+                    case 245 /* SwitchStatement */:
+                        if (statement.kind === 241 /* ContinueStatement */) {
                             return false;
                         }
                     // falls through
-                    case 237 /* ForStatement */:
-                    case 238 /* ForInStatement */:
-                    case 239 /* ForOfStatement */:
-                    case 236 /* WhileStatement */:
-                    case 235 /* DoStatement */:
+                    case 238 /* ForStatement */:
+                    case 239 /* ForInStatement */:
+                    case 240 /* ForOfStatement */:
+                    case 237 /* WhileStatement */:
+                    case 236 /* DoStatement */:
                         return !statement.label || isLabeledBy(node, statement.label.escapedText);
                     default:
                         // Don't cross function boundaries.
@@ -122681,11 +126420,11 @@ var ts;
             // Types of node whose children might have modifiers.
             var container = declaration.parent;
             switch (container.kind) {
-                case 257 /* ModuleBlock */:
-                case 297 /* SourceFile */:
-                case 230 /* Block */:
-                case 284 /* CaseClause */:
-                case 285 /* DefaultClause */:
+                case 258 /* ModuleBlock */:
+                case 298 /* SourceFile */:
+                case 231 /* Block */:
+                case 285 /* CaseClause */:
+                case 286 /* DefaultClause */:
                     // Container is either a class declaration or the declaration is a classDeclaration
                     if (modifierFlag & 128 /* Abstract */ && ts.isClassDeclaration(declaration)) {
                         return __spreadArray(__spreadArray([], declaration.members), [declaration]);
@@ -122693,14 +126432,14 @@ var ts;
                     else {
                         return container.statements;
                     }
-                case 166 /* Constructor */:
-                case 165 /* MethodDeclaration */:
-                case 251 /* FunctionDeclaration */:
+                case 167 /* Constructor */:
+                case 166 /* MethodDeclaration */:
+                case 252 /* FunctionDeclaration */:
                     return __spreadArray(__spreadArray([], container.parameters), (ts.isClassLike(container.parent) ? container.parent.members : []));
-                case 252 /* ClassDeclaration */:
-                case 221 /* ClassExpression */:
-                case 253 /* InterfaceDeclaration */:
-                case 177 /* TypeLiteral */:
+                case 253 /* ClassDeclaration */:
+                case 222 /* ClassExpression */:
+                case 254 /* InterfaceDeclaration */:
+                case 178 /* 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.
@@ -122715,7 +126454,7 @@ var ts;
                     }
                     return nodes;
                 // Syntactically invalid positions that the parser might produce anyway
-                case 200 /* ObjectLiteralExpression */:
+                case 201 /* ObjectLiteralExpression */:
                     return undefined;
                 default:
                     ts.Debug.assertNever(container, "Invalid container kind.");
@@ -122736,7 +126475,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 === 235 /* DoStatement */) {
+                if (loopNode.kind === 236 /* DoStatement */) {
                     var loopTokens = loopNode.getChildren();
                     for (var i = loopTokens.length - 1; i >= 0; i--) {
                         if (pushKeywordIf(keywords, loopTokens[i], 114 /* WhileKeyword */)) {
@@ -122756,13 +126495,13 @@ var ts;
             var owner = getBreakOrContinueOwner(breakOrContinueStatement);
             if (owner) {
                 switch (owner.kind) {
-                    case 237 /* ForStatement */:
-                    case 238 /* ForInStatement */:
-                    case 239 /* ForOfStatement */:
-                    case 235 /* DoStatement */:
-                    case 236 /* WhileStatement */:
+                    case 238 /* ForStatement */:
+                    case 239 /* ForInStatement */:
+                    case 240 /* ForOfStatement */:
+                    case 236 /* DoStatement */:
+                    case 237 /* WhileStatement */:
                         return getLoopBreakContinueOccurrences(owner);
-                    case 244 /* SwitchStatement */:
+                    case 245 /* SwitchStatement */:
                         return getSwitchCaseDefaultOccurrences(owner);
                 }
             }
@@ -122935,6 +126674,9 @@ var ts;
 })(ts || (ts = {}));
 var ts;
 (function (ts) {
+    function isDocumentRegistryEntry(entry) {
+        return !!entry.sourceFile;
+    }
     function createDocumentRegistry(useCaseSensitiveFileNames, currentDirectory) {
         return createDocumentRegistryInternal(useCaseSensitiveFileNames, currentDirectory);
     }
@@ -122951,10 +126693,16 @@ var ts;
                 var entries = buckets.get(name);
                 var sourceFiles = [];
                 entries.forEach(function (entry, name) {
-                    sourceFiles.push({
-                        name: name,
-                        refCount: entry.languageServiceRefCount
-                    });
+                    if (isDocumentRegistryEntry(entry)) {
+                        sourceFiles.push({
+                            name: name,
+                            scriptKind: entry.sourceFile.scriptKind,
+                            refCount: entry.languageServiceRefCount
+                        });
+                    }
+                    else {
+                        entry.forEach(function (value, scriptKind) { return sourceFiles.push({ name: name, scriptKind: scriptKind, refCount: value.languageServiceRefCount }); });
+                    }
                 });
                 sourceFiles.sort(function (x, y) { return y.refCount - x.refCount; });
                 return {
@@ -122980,10 +126728,17 @@ var ts;
         function updateDocumentWithKey(fileName, path, compilationSettings, key, scriptSnapshot, version, scriptKind) {
             return acquireOrUpdateDocument(fileName, path, compilationSettings, key, scriptSnapshot, version, /*acquiring*/ false, scriptKind);
         }
+        function getDocumentRegistryEntry(bucketEntry, scriptKind) {
+            var entry = isDocumentRegistryEntry(bucketEntry) ? bucketEntry : bucketEntry.get(ts.Debug.checkDefined(scriptKind, "If there are more than one scriptKind's for same document the scriptKind should be provided"));
+            ts.Debug.assert(scriptKind === undefined || !entry || entry.sourceFile.scriptKind === scriptKind, "Script kind should match provided ScriptKind:" + scriptKind + " and sourceFile.scriptKind: " + (entry === null || entry === void 0 ? void 0 : entry.sourceFile.scriptKind) + ", !entry: " + !entry);
+            return entry;
+        }
         function acquireOrUpdateDocument(fileName, path, compilationSettings, key, scriptSnapshot, version, acquiring, scriptKind) {
-            var bucket = ts.getOrUpdate(buckets, key, function () { return new ts.Map(); });
-            var entry = bucket.get(path);
+            scriptKind = ts.ensureScriptKind(fileName, scriptKind);
             var scriptTarget = scriptKind === 6 /* JSON */ ? 100 /* JSON */ : compilationSettings.target || 1 /* ES5 */;
+            var bucket = ts.getOrUpdate(buckets, key, function () { return new ts.Map(); });
+            var bucketEntry = bucket.get(path);
+            var entry = bucketEntry && getDocumentRegistryEntry(bucketEntry, scriptKind);
             if (!entry && externalCache) {
                 var sourceFile = externalCache.getDocument(key, path);
                 if (sourceFile) {
@@ -122992,7 +126747,7 @@ var ts;
                         sourceFile: sourceFile,
                         languageServiceRefCount: 0
                     };
-                    bucket.set(path, entry);
+                    setBucketEntry();
                 }
             }
             if (!entry) {
@@ -123005,7 +126760,7 @@ var ts;
                     sourceFile: sourceFile,
                     languageServiceRefCount: 1,
                 };
-                bucket.set(path, entry);
+                setBucketEntry();
             }
             else {
                 // We have an entry for this file.  However, it may be for a different version of
@@ -123028,25 +126783,49 @@ var ts;
             }
             ts.Debug.assert(entry.languageServiceRefCount !== 0);
             return entry.sourceFile;
+            function setBucketEntry() {
+                if (!bucketEntry) {
+                    bucket.set(path, entry);
+                }
+                else if (isDocumentRegistryEntry(bucketEntry)) {
+                    var scriptKindMap = new ts.Map();
+                    scriptKindMap.set(bucketEntry.sourceFile.scriptKind, bucketEntry);
+                    scriptKindMap.set(scriptKind, entry);
+                    bucket.set(path, scriptKindMap);
+                }
+                else {
+                    bucketEntry.set(scriptKind, entry);
+                }
+            }
         }
-        function releaseDocument(fileName, compilationSettings) {
+        function releaseDocument(fileName, compilationSettings, scriptKind) {
             var path = ts.toPath(fileName, currentDirectory, getCanonicalFileName);
             var key = getKeyForCompilationSettings(compilationSettings);
-            return releaseDocumentWithKey(path, key);
+            return releaseDocumentWithKey(path, key, scriptKind);
         }
-        function releaseDocumentWithKey(path, key) {
+        function releaseDocumentWithKey(path, key, scriptKind) {
             var bucket = ts.Debug.checkDefined(buckets.get(key));
-            var entry = bucket.get(path);
+            var bucketEntry = bucket.get(path);
+            var entry = getDocumentRegistryEntry(bucketEntry, scriptKind);
             entry.languageServiceRefCount--;
             ts.Debug.assert(entry.languageServiceRefCount >= 0);
             if (entry.languageServiceRefCount === 0) {
-                bucket.delete(path);
+                if (isDocumentRegistryEntry(bucketEntry)) {
+                    bucket.delete(path);
+                }
+                else {
+                    bucketEntry.delete(scriptKind);
+                    if (bucketEntry.size === 1) {
+                        bucket.set(path, ts.firstDefinedIterator(bucketEntry.values(), ts.identity));
+                    }
+                }
             }
         }
-        function getLanguageServiceRefCounts(path) {
+        function getLanguageServiceRefCounts(path, scriptKind) {
             return ts.arrayFrom(buckets.entries(), function (_a) {
                 var key = _a[0], bucket = _a[1];
-                var entry = bucket.get(path);
+                var bucketEntry = bucket.get(path);
+                var entry = bucketEntry && getDocumentRegistryEntry(bucketEntry, scriptKind);
                 return [key, entry && entry.languageServiceRefCount];
             });
         }
@@ -123109,10 +126888,12 @@ var ts;
                     return sourceFiles;
                 }
                 // Module augmentations may use this module's exports without importing it.
-                for (var _i = 0, _a = exportingModuleSymbol.declarations; _i < _a.length; _i++) {
-                    var decl = _a[_i];
-                    if (ts.isExternalModuleAugmentation(decl) && sourceFilesSet.has(decl.getSourceFile().fileName)) {
-                        addIndirectUser(decl);
+                if (exportingModuleSymbol.declarations) {
+                    for (var _i = 0, _a = exportingModuleSymbol.declarations; _i < _a.length; _i++) {
+                        var decl = _a[_i];
+                        if (ts.isExternalModuleAugmentation(decl) && sourceFilesSet.has(decl.getSourceFile().fileName)) {
+                            addIndirectUser(decl);
+                        }
                     }
                 }
                 // This may return duplicates (if there are multiple module declarations in a single source file, all importing the same thing as a namespace), but `State.markSearchedSymbol` will handle that.
@@ -123129,14 +126910,14 @@ var ts;
                         if (cancellationToken)
                             cancellationToken.throwIfCancellationRequested();
                         switch (direct.kind) {
-                            case 203 /* CallExpression */:
+                            case 204 /* CallExpression */:
                                 if (ts.isImportCall(direct)) {
                                     handleImportCall(direct);
                                     break;
                                 }
                                 if (!isAvailableThroughGlobal) {
                                     var parent = direct.parent;
-                                    if (exportKind === 2 /* ExportEquals */ && parent.kind === 249 /* VariableDeclaration */) {
+                                    if (exportKind === 2 /* ExportEquals */ && parent.kind === 250 /* VariableDeclaration */) {
                                         var name = parent.name;
                                         if (name.kind === 78 /* Identifier */) {
                                             directImports.push(name);
@@ -123147,25 +126928,25 @@ var ts;
                                 break;
                             case 78 /* Identifier */: // for 'const x = require("y");
                                 break; // TODO: GH#23879
-                            case 260 /* ImportEqualsDeclaration */:
+                            case 261 /* ImportEqualsDeclaration */:
                                 handleNamespaceImport(direct, direct.name, ts.hasSyntacticModifier(direct, 1 /* Export */), /*alreadyAddedDirect*/ false);
                                 break;
-                            case 261 /* ImportDeclaration */:
+                            case 262 /* ImportDeclaration */:
                                 directImports.push(direct);
                                 var namedBindings = direct.importClause && direct.importClause.namedBindings;
-                                if (namedBindings && namedBindings.kind === 263 /* NamespaceImport */) {
+                                if (namedBindings && namedBindings.kind === 264 /* 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 267 /* ExportDeclaration */:
+                            case 268 /* 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 === 269 /* NamespaceExport */) {
+                                else if (direct.exportClause.kind === 270 /* NamespaceExport */) {
                                     // `export * as foo from "foo"` add to indirect uses
                                     addIndirectUser(getSourceFileLikeForImportDeclaration(direct), /** addTransitiveDependencies */ true);
                                 }
@@ -123174,7 +126955,7 @@ var ts;
                                     directImports.push(direct);
                                 }
                                 break;
-                            case 195 /* ImportType */:
+                            case 196 /* ImportType */:
                                 // Only check for typeof import('xyz')
                                 if (direct.isTypeOf && !direct.qualifier && isExported(direct)) {
                                     addIndirectUser(direct.getSourceFile(), /** addTransitiveDependencies */ true);
@@ -123207,7 +126988,7 @@ var ts;
                 }
                 else if (!isAvailableThroughGlobal) {
                     var sourceFileLike = getSourceFileLikeForImportDeclaration(importDeclaration);
-                    ts.Debug.assert(sourceFileLike.kind === 297 /* SourceFile */ || sourceFileLike.kind === 256 /* ModuleDeclaration */);
+                    ts.Debug.assert(sourceFileLike.kind === 298 /* SourceFile */ || sourceFileLike.kind === 257 /* ModuleDeclaration */);
                     if (isReExport || findNamespaceReExports(sourceFileLike, name, checker)) {
                         addIndirectUser(sourceFileLike, /** addTransitiveDependencies */ true);
                     }
@@ -123263,7 +127044,7 @@ var ts;
             }
             return { importSearches: importSearches, singleReferences: singleReferences };
             function handleImport(decl) {
-                if (decl.kind === 260 /* ImportEqualsDeclaration */) {
+                if (decl.kind === 261 /* ImportEqualsDeclaration */) {
                     if (isExternalModuleImportEquals(decl)) {
                         handleNamespaceImportLike(decl.name);
                     }
@@ -123273,7 +127054,7 @@ var ts;
                     handleNamespaceImportLike(decl);
                     return;
                 }
-                if (decl.kind === 195 /* ImportType */) {
+                if (decl.kind === 196 /* ImportType */) {
                     if (decl.qualifier) {
                         var firstIdentifier = ts.getFirstIdentifier(decl.qualifier);
                         if (firstIdentifier.escapedText === ts.symbolName(exportSymbol)) {
@@ -123289,7 +127070,7 @@ var ts;
                 if (decl.moduleSpecifier.kind !== 10 /* StringLiteral */) {
                     return;
                 }
-                if (decl.kind === 267 /* ExportDeclaration */) {
+                if (decl.kind === 268 /* ExportDeclaration */) {
                     if (decl.exportClause && ts.isNamedExports(decl.exportClause)) {
                         searchForNamedImport(decl.exportClause);
                     }
@@ -123298,10 +127079,10 @@ var ts;
                 var _a = decl.importClause || { name: undefined, namedBindings: undefined }, name = _a.name, namedBindings = _a.namedBindings;
                 if (namedBindings) {
                     switch (namedBindings.kind) {
-                        case 263 /* NamespaceImport */:
+                        case 264 /* NamespaceImport */:
                             handleNamespaceImportLike(namedBindings.name);
                             break;
-                        case 264 /* NamedImports */:
+                        case 265 /* NamedImports */:
                             // 'default' might be accessed as a named import `{ default as foo }`.
                             if (exportKind === 0 /* Named */ || exportKind === 1 /* Default */) {
                                 searchForNamedImport(namedBindings);
@@ -123351,7 +127132,7 @@ var ts;
                         }
                     }
                     else {
-                        var localSymbol = element.kind === 270 /* ExportSpecifier */ && element.propertyName
+                        var localSymbol = element.kind === 271 /* 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);
@@ -123380,7 +127161,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 === 297 /* SourceFile */) {
+                if ((searchSourceFile === null || searchSourceFile === void 0 ? void 0 : searchSourceFile.kind) === 298 /* SourceFile */) {
                     for (var _a = 0, _b = referencingFile.referencedFiles; _a < _b.length; _a++) {
                         var ref = _b[_a];
                         if (program.getSourceFileFromReference(referencingFile, ref) === searchSourceFile) {
@@ -123428,7 +127209,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 === 297 /* SourceFile */ ? sourceFileLike.statements : sourceFileLike.body.statements, function (statement) {
+            return ts.forEach(sourceFileLike.kind === 298 /* SourceFile */ ? sourceFileLike.statements : sourceFileLike.body.statements, function (statement) {
                 return action(statement) || (isAmbientModuleDeclaration(statement) && ts.forEach(statement.body && statement.body.statements, action));
             });
         }
@@ -123443,15 +127224,15 @@ var ts;
             else {
                 forEachPossibleImportOrExportStatement(sourceFile, function (statement) {
                     switch (statement.kind) {
-                        case 267 /* ExportDeclaration */:
-                        case 261 /* ImportDeclaration */: {
+                        case 268 /* ExportDeclaration */:
+                        case 262 /* ImportDeclaration */: {
                             var decl = statement;
                             if (decl.moduleSpecifier && ts.isStringLiteral(decl.moduleSpecifier)) {
                                 action(decl, decl.moduleSpecifier);
                             }
                             break;
                         }
-                        case 260 /* ImportEqualsDeclaration */: {
+                        case 261 /* ImportEqualsDeclaration */: {
                             var decl = statement;
                             if (isExternalModuleImportEquals(decl)) {
                                 action(decl, decl.moduleReference.expression);
@@ -123472,14 +127253,15 @@ var ts;
         function getImportOrExportSymbol(node, symbol, checker, comingFromExport) {
             return comingFromExport ? getExport() : getExport() || getImport();
             function getExport() {
+                var _a;
                 var parent = node.parent;
-                var grandParent = parent.parent;
+                var grandparent = parent.parent;
                 if (symbol.exportSymbol) {
-                    if (parent.kind === 201 /* PropertyAccessExpression */) {
+                    if (parent.kind === 202 /* PropertyAccessExpression */) {
                         // When accessing an export of a JS module, there's no alias. The symbol will still be flagged as an export even though we're at the use.
                         // So check that we are at the declaration.
-                        return symbol.declarations.some(function (d) { return d === parent; }) && ts.isBinaryExpression(grandParent)
-                            ? getSpecialPropertyExport(grandParent, /*useLhsSymbol*/ false)
+                        return ((_a = symbol.declarations) === null || _a === void 0 ? void 0 : _a.some(function (d) { return d === parent; })) && ts.isBinaryExpression(grandparent)
+                            ? getSpecialPropertyExport(grandparent, /*useLhsSymbol*/ false)
                             : undefined;
                     }
                     else {
@@ -123509,15 +127291,15 @@ var ts;
                         return getExportAssignmentExport(parent);
                     }
                     // If we are in `export = class A {};` (or `export = class A {};`) at `A`, `parent.parent` is the export assignment.
-                    else if (ts.isExportAssignment(grandParent)) {
-                        return getExportAssignmentExport(grandParent);
+                    else if (ts.isExportAssignment(grandparent)) {
+                        return getExportAssignmentExport(grandparent);
                     }
                     // Similar for `module.exports =` and `exports.A =`.
                     else if (ts.isBinaryExpression(parent)) {
                         return getSpecialPropertyExport(parent, /*useLhsSymbol*/ true);
                     }
-                    else if (ts.isBinaryExpression(grandParent)) {
-                        return getSpecialPropertyExport(grandParent, /*useLhsSymbol*/ true);
+                    else if (ts.isBinaryExpression(grandparent)) {
+                        return getSpecialPropertyExport(grandparent, /*useLhsSymbol*/ true);
                     }
                     else if (ts.isJSDocTypedefTag(parent)) {
                         return exportInfo(symbol, 0 /* Named */);
@@ -123525,9 +127307,10 @@ var ts;
                 }
                 function getExportAssignmentExport(ex) {
                     // Get the symbol for the `export =` node; its parent is the module it's the export of.
-                    var exportingModuleSymbol = ts.Debug.checkDefined(ex.symbol.parent, "Expected export symbol to have a parent");
+                    if (!ex.symbol.parent)
+                        return undefined;
                     var exportKind = ex.isExportEquals ? 2 /* ExportEquals */ : 1 /* Default */;
-                    return { kind: 1 /* Export */, symbol: symbol, exportInfo: { exportingModuleSymbol: exportingModuleSymbol, exportKind: exportKind } };
+                    return { kind: 1 /* Export */, symbol: symbol, exportInfo: { exportingModuleSymbol: ex.symbol.parent, exportKind: exportKind } };
                 }
                 function getSpecialPropertyExport(node, useLhsSymbol) {
                     var kind;
@@ -123581,7 +127364,7 @@ var ts;
             if (importedSymbol.flags & 2097152 /* Alias */) {
                 return ts.Debug.checkDefined(checker.getImmediateAliasedSymbol(importedSymbol));
             }
-            var decl = importedSymbol.valueDeclaration;
+            var decl = ts.Debug.checkDefined(importedSymbol.valueDeclaration);
             if (ts.isExportAssignment(decl)) { // `export = class {}`
                 return ts.Debug.checkDefined(decl.expression.symbol);
             }
@@ -123608,17 +127391,17 @@ var ts;
         function isNodeImport(node) {
             var parent = node.parent;
             switch (parent.kind) {
-                case 260 /* ImportEqualsDeclaration */:
+                case 261 /* ImportEqualsDeclaration */:
                     return parent.name === node && isExternalModuleImportEquals(parent);
-                case 265 /* ImportSpecifier */:
+                case 266 /* 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 262 /* ImportClause */:
-                case 263 /* NamespaceImport */:
+                case 263 /* ImportClause */:
+                case 264 /* NamespaceImport */:
                     ts.Debug.assert(parent.name === node);
                     return true;
-                case 198 /* BindingElement */:
-                    return ts.isInJSFile(node) && ts.isRequireVariableDeclaration(parent, /*requireStringLiteralLikeArgument*/ true);
+                case 199 /* BindingElement */:
+                    return ts.isInJSFile(node) && ts.isRequireVariableDeclaration(parent);
                 default:
                     return false;
             }
@@ -123642,7 +127425,8 @@ var ts;
                         return checker.getExportSpecifierLocalTargetSymbol(declaration);
                     }
                     else if (ts.isPropertyAccessExpression(declaration) && ts.isModuleExportsAccessExpression(declaration.expression) && !ts.isPrivateIdentifier(declaration.name)) {
-                        return checker.getExportSpecifierLocalTargetSymbol(declaration.name);
+                        // Export of form 'module.exports.propName = expr';
+                        return checker.getSymbolAtLocation(declaration);
                     }
                     else if (ts.isShorthandPropertyAssignment(declaration)
                         && ts.isBinaryExpression(declaration.parent.parent)
@@ -123657,21 +127441,21 @@ var ts;
             return checker.getMergedSymbol(getSourceFileLikeForImportDeclaration(importer).symbol);
         }
         function getSourceFileLikeForImportDeclaration(node) {
-            if (node.kind === 203 /* CallExpression */) {
+            if (node.kind === 204 /* CallExpression */) {
                 return node.getSourceFile();
             }
             var parent = node.parent;
-            if (parent.kind === 297 /* SourceFile */) {
+            if (parent.kind === 298 /* SourceFile */) {
                 return parent;
             }
-            ts.Debug.assert(parent.kind === 257 /* ModuleBlock */);
+            ts.Debug.assert(parent.kind === 258 /* ModuleBlock */);
             return ts.cast(parent.parent, isAmbientModuleDeclaration);
         }
         function isAmbientModuleDeclaration(node) {
-            return node.kind === 256 /* ModuleDeclaration */ && node.name.kind === 10 /* StringLiteral */;
+            return node.kind === 257 /* ModuleDeclaration */ && node.name.kind === 10 /* StringLiteral */;
         }
         function isExternalModuleImportEquals(eq) {
-            return eq.moduleReference.kind === 272 /* ExternalModuleReference */ && eq.moduleReference.expression.kind === 10 /* StringLiteral */;
+            return eq.moduleReference.kind === 273 /* ExternalModuleReference */ && eq.moduleReference.expression.kind === 10 /* StringLiteral */;
         }
     })(FindAllReferences = ts.FindAllReferences || (ts.FindAllReferences = {}));
 })(ts || (ts = {}));
@@ -123774,7 +127558,7 @@ var ts;
             if (!node)
                 return undefined;
             switch (node.kind) {
-                case 249 /* VariableDeclaration */:
+                case 250 /* VariableDeclaration */:
                     return !ts.isVariableDeclarationList(node.parent) || node.parent.declarations.length !== 1 ?
                         node :
                         ts.isVariableStatement(node.parent.parent) ?
@@ -123782,28 +127566,28 @@ var ts;
                             ts.isForInOrOfStatement(node.parent.parent) ?
                                 getContextNode(node.parent.parent) :
                                 node.parent;
-                case 198 /* BindingElement */:
+                case 199 /* BindingElement */:
                     return getContextNode(node.parent.parent);
-                case 265 /* ImportSpecifier */:
+                case 266 /* ImportSpecifier */:
                     return node.parent.parent.parent;
-                case 270 /* ExportSpecifier */:
-                case 263 /* NamespaceImport */:
+                case 271 /* ExportSpecifier */:
+                case 264 /* NamespaceImport */:
                     return node.parent.parent;
-                case 262 /* ImportClause */:
-                case 269 /* NamespaceExport */:
+                case 263 /* ImportClause */:
+                case 270 /* NamespaceExport */:
                     return node.parent;
-                case 216 /* BinaryExpression */:
+                case 217 /* BinaryExpression */:
                     return ts.isExpressionStatement(node.parent) ?
                         node.parent :
                         node;
-                case 239 /* ForOfStatement */:
-                case 238 /* ForInStatement */:
+                case 240 /* ForOfStatement */:
+                case 239 /* ForInStatement */:
                     return {
                         start: node.initializer,
                         end: node.expression
                     };
-                case 288 /* PropertyAssignment */:
-                case 289 /* ShorthandPropertyAssignment */:
+                case 289 /* PropertyAssignment */:
+                case 290 /* ShorthandPropertyAssignment */:
                     return ts.isArrayLiteralOrObjectLiteralDestructuringPattern(node.parent) ?
                         getContextNode(ts.findAncestor(node.parent, function (node) {
                             return ts.isBinaryExpression(node) || ts.isForInOrOfStatement(node);
@@ -123860,9 +127644,9 @@ var ts;
             var node = ts.getTouchingPropertyName(sourceFile, position);
             var referenceEntries;
             var entries = getImplementationReferenceEntries(program, cancellationToken, sourceFiles, node, position);
-            if (node.parent.kind === 201 /* PropertyAccessExpression */
-                || node.parent.kind === 198 /* BindingElement */
-                || node.parent.kind === 202 /* ElementAccessExpression */
+            if (node.parent.kind === 202 /* PropertyAccessExpression */
+                || node.parent.kind === 199 /* BindingElement */
+                || node.parent.kind === 203 /* ElementAccessExpression */
                 || node.kind === 105 /* SuperKeyword */) {
                 referenceEntries = entries && __spreadArray([], entries);
             }
@@ -123886,13 +127670,13 @@ var ts;
         }
         FindAllReferences.getImplementationsAtPosition = getImplementationsAtPosition;
         function getImplementationReferenceEntries(program, cancellationToken, sourceFiles, node, position) {
-            if (node.kind === 297 /* SourceFile */) {
+            if (node.kind === 298 /* 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 === 289 /* ShorthandPropertyAssignment */) {
+            if (node.parent.kind === 290 /* ShorthandPropertyAssignment */) {
                 var result_1 = [];
                 Core.getReferenceEntriesForShorthandPropertyAssignment(node, checker, function (node) { return result_1.push(nodeEntry(node)); });
                 return result_1;
@@ -124067,13 +127851,13 @@ var ts;
             if (symbol) {
                 return getDefinitionKindAndDisplayParts(symbol, checker, node);
             }
-            else if (node.kind === 200 /* ObjectLiteralExpression */) {
+            else if (node.kind === 201 /* ObjectLiteralExpression */) {
                 return {
                     kind: "interface" /* interfaceElement */,
                     displayParts: [ts.punctuationPart(20 /* OpenParenToken */), ts.textPart("object literal"), ts.punctuationPart(21 /* CloseParenToken */)]
                 };
             }
-            else if (node.kind === 221 /* ClassExpression */) {
+            else if (node.kind === 222 /* ClassExpression */) {
                 return {
                     kind: "local class" /* localClassElement */,
                     displayParts: [ts.punctuationPart(20 /* OpenParenToken */), ts.textPart("anonymous local class"), ts.punctuationPart(21 /* CloseParenToken */)]
@@ -124134,47 +127918,47 @@ var ts;
             if (!!(decl.flags & 8388608 /* Ambient */))
                 return true;
             switch (decl.kind) {
-                case 216 /* BinaryExpression */:
-                case 198 /* BindingElement */:
-                case 252 /* ClassDeclaration */:
-                case 221 /* ClassExpression */:
+                case 217 /* BinaryExpression */:
+                case 199 /* BindingElement */:
+                case 253 /* ClassDeclaration */:
+                case 222 /* ClassExpression */:
                 case 87 /* DefaultKeyword */:
-                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 */:
+                case 256 /* EnumDeclaration */:
+                case 292 /* EnumMember */:
+                case 271 /* ExportSpecifier */:
+                case 263 /* ImportClause */: // default import
+                case 261 /* ImportEqualsDeclaration */:
+                case 266 /* ImportSpecifier */:
+                case 254 /* InterfaceDeclaration */:
+                case 328 /* JSDocCallbackTag */:
+                case 335 /* JSDocTypedefTag */:
+                case 281 /* JsxAttribute */:
+                case 257 /* ModuleDeclaration */:
+                case 260 /* NamespaceExportDeclaration */:
+                case 264 /* NamespaceImport */:
+                case 270 /* NamespaceExport */:
+                case 161 /* Parameter */:
+                case 290 /* ShorthandPropertyAssignment */:
+                case 255 /* TypeAliasDeclaration */:
+                case 160 /* TypeParameter */:
                     return true;
-                case 288 /* PropertyAssignment */:
+                case 289 /* PropertyAssignment */:
                     // In `({ x: y } = 0);`, `x` is not a write access. (Won't call this function for `y`.)
                     return !ts.isArrayLiteralOrObjectLiteralDestructuringPattern(decl.parent);
-                case 251 /* FunctionDeclaration */:
-                case 208 /* FunctionExpression */:
-                case 166 /* Constructor */:
-                case 165 /* MethodDeclaration */:
-                case 167 /* GetAccessor */:
-                case 168 /* SetAccessor */:
+                case 252 /* FunctionDeclaration */:
+                case 209 /* FunctionExpression */:
+                case 167 /* Constructor */:
+                case 166 /* MethodDeclaration */:
+                case 168 /* GetAccessor */:
+                case 169 /* SetAccessor */:
                     return !!decl.body;
-                case 249 /* VariableDeclaration */:
-                case 163 /* PropertyDeclaration */:
+                case 250 /* VariableDeclaration */:
+                case 164 /* PropertyDeclaration */:
                     return !!decl.initializer || ts.isCatchClause(decl.parent);
-                case 164 /* MethodSignature */:
-                case 162 /* PropertySignature */:
-                case 333 /* JSDocPropertyTag */:
-                case 326 /* JSDocParameterTag */:
+                case 165 /* MethodSignature */:
+                case 163 /* PropertySignature */:
+                case 337 /* JSDocPropertyTag */:
+                case 330 /* JSDocParameterTag */:
                     return false;
                 default:
                     return ts.Debug.failBadSyntaxKind(decl);
@@ -124196,7 +127980,7 @@ var ts;
                 }
                 if (ts.isSourceFile(node)) {
                     var resolvedRef = ts.GoToDefinition.getReferenceAtPosition(node, position, program);
-                    if (!resolvedRef) {
+                    if (!(resolvedRef === null || resolvedRef === void 0 ? void 0 : resolvedRef.file)) {
                         return undefined;
                     }
                     var moduleSymbol = program.getTypeChecker().getMergedSymbol(resolvedRef.file.symbol);
@@ -124225,7 +128009,7 @@ var ts;
                 if (!symbol) {
                     // String literal might be a property (and thus have a symbol), so do this here rather than in getReferencedSymbolsSpecial.
                     if (!options.implementations && ts.isStringLiteralLike(node)) {
-                        if (ts.isRequireCall(node.parent, /*requireStringLiteralLikeArgument*/ true) || ts.isExternalModuleReference(node.parent) || ts.isImportDeclaration(node.parent) || ts.isImportCall(node.parent)) {
+                        if (ts.isModuleSpecifierLike(node)) {
                             var fileIncludeReasons = program.getFileIncludeReasons();
                             var referencedFileName = (_b = (_a = node.getSourceFile().resolvedModules) === null || _a === void 0 ? void 0 : _a.get(node.text)) === null || _b === void 0 ? void 0 : _b.resolvedFileName;
                             var referencedFile = referencedFileName ? program.getSourceFile(referencedFileName) : undefined;
@@ -124326,7 +128110,7 @@ var ts;
                         result = references;
                         continue;
                     }
-                    var _loop_3 = function (entry) {
+                    var _loop_4 = function (entry) {
                         if (!entry.definition || entry.definition.type !== 0 /* Symbol */) {
                             result.push(entry);
                             return "continue";
@@ -124358,7 +128142,7 @@ var ts;
                     };
                     for (var _b = 0, references_2 = references; _b < references_2.length; _b++) {
                         var entry = references_2[_b];
-                        _loop_3(entry);
+                        _loop_4(entry);
                     }
                 }
                 return result;
@@ -124395,10 +128179,10 @@ var ts;
                     for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                         var decl = _a[_i];
                         switch (decl.kind) {
-                            case 297 /* SourceFile */:
+                            case 298 /* 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 256 /* ModuleDeclaration */:
+                            case 257 /* ModuleDeclaration */:
                                 if (sourceFilesSet.has(decl.getSourceFile().fileName)) {
                                     references.push(nodeEntry(decl.name));
                                 }
@@ -124410,7 +128194,7 @@ var ts;
                     }
                 }
                 var exported = symbol.exports.get("export=" /* ExportEquals */);
-                if (exported) {
+                if (exported === null || exported === void 0 ? void 0 : exported.declarations) {
                     for (var _b = 0, _c = exported.declarations; _b < _c.length; _b++) {
                         var decl = _c[_b];
                         var sourceFile = decl.getSourceFile();
@@ -124473,14 +128257,14 @@ var ts;
                 var searchMeaning = node ? getIntersectingMeaningFromDeclarations(node, symbol) : 7 /* All */;
                 var result = [];
                 var state = new State(sourceFiles, sourceFilesSet, node ? getSpecialSearchKind(node) : 0 /* None */, checker, cancellationToken, searchMeaning, options, result);
-                var exportSpecifier = !isForRenameWithPrefixAndSuffixText(options) ? undefined : ts.find(symbol.declarations, ts.isExportSpecifier);
+                var exportSpecifier = !isForRenameWithPrefixAndSuffixText(options) || !symbol.declarations ? undefined : ts.find(symbol.declarations, ts.isExportSpecifier);
                 if (exportSpecifier) {
                     // When renaming at an export specifier, rename the export and not the thing being exported.
                     getReferencesAtExportSpecifier(exportSpecifier.name, symbol, exportSpecifier, state.createSearch(node, originalSymbol, /*comingFrom*/ undefined), state, /*addReferencesHere*/ true, /*alwaysGetReferences*/ true);
                 }
-                else if (node && node.kind === 87 /* DefaultKeyword */) {
+                else if (node && node.kind === 87 /* DefaultKeyword */ && symbol.escapedName === "default" /* Default */ && symbol.parent) {
                     addReference(node, symbol, state);
-                    searchForImportsOfExport(node, symbol, { exportingModuleSymbol: ts.Debug.checkDefined(symbol.parent, "Expected export symbol to have a parent"), exportKind: 1 /* Default */ }, state);
+                    searchForImportsOfExport(node, symbol, { exportingModuleSymbol: symbol.parent, exportKind: 1 /* Default */ }, state);
                 }
                 else {
                     var search = state.createSearch(node, symbol, /*comingFrom*/ undefined, { allSearchSymbols: node ? populateSearchSymbolSet(symbol, node, checker, options.use === 2 /* Rename */, !!options.providePrefixAndSuffixTextForRename, !!options.implementations) : [symbol] });
@@ -124506,7 +128290,7 @@ var ts;
             }
             function getSpecialSearchKind(node) {
                 switch (node.kind) {
-                    case 166 /* Constructor */:
+                    case 167 /* Constructor */:
                     case 132 /* ConstructorKeyword */:
                         return 1 /* Constructor */;
                     case 78 /* Identifier */:
@@ -124637,8 +128421,8 @@ var ts;
                     var sourceId = ts.getNodeId(sourceFile);
                     var seenSymbols = this.sourceFileToSeenSymbols[sourceId] || (this.sourceFileToSeenSymbols[sourceId] = new ts.Set());
                     var anyNewSymbols = false;
-                    for (var _i = 0, symbols_3 = symbols; _i < symbols_3.length; _i++) {
-                        var sym = symbols_3[_i];
+                    for (var _i = 0, symbols_2 = symbols; _i < symbols_2.length; _i++) {
+                        var sym = symbols_2[_i];
                         anyNewSymbols = ts.tryAddToSet(seenSymbols, ts.getSymbolId(sym)) || anyNewSymbols;
                     }
                     return anyNewSymbols;
@@ -124695,7 +128479,9 @@ var ts;
                     for (var _c = 0, _d = getPossibleSymbolReferenceNodes(indirectUser, isDefaultExport ? "default" : exportName); _c < _d.length; _c++) {
                         var node = _d[_c];
                         // Import specifiers should be handled by importSearches
-                        if (ts.isIdentifier(node) && !ts.isImportOrExportSpecifier(node.parent) && checker.getSymbolAtLocation(node) === exportSymbol) {
+                        var symbol = checker.getSymbolAtLocation(node);
+                        var hasExportAssignmentDeclaration = ts.some(symbol === null || symbol === void 0 ? void 0 : symbol.declarations, function (d) { return ts.tryCast(d, ts.isExportAssignment) ? true : false; });
+                        if (ts.isIdentifier(node) && !ts.isImportOrExportSpecifier(node.parent) && (symbol === exportSymbol || hasExportAssignmentDeclaration)) {
                             cb(node);
                         }
                     }
@@ -124747,7 +128533,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 === 208 /* FunctionExpression */ || valueDeclaration.kind === 221 /* ClassExpression */)) {
+                if (valueDeclaration && (valueDeclaration.kind === 209 /* FunctionExpression */ || valueDeclaration.kind === 222 /* ClassExpression */)) {
                     return valueDeclaration;
                 }
                 if (!declarations) {
@@ -124755,9 +128541,9 @@ var ts;
                 }
                 // If this is private property or method, the scope is the containing class
                 if (flags & (4 /* Property */ | 8192 /* Method */)) {
-                    var privateDeclaration = ts.find(declarations, function (d) { return ts.hasEffectiveModifier(d, 8 /* Private */) || ts.isPrivateIdentifierPropertyDeclaration(d); });
+                    var privateDeclaration = ts.find(declarations, function (d) { return ts.hasEffectiveModifier(d, 8 /* Private */) || ts.isPrivateIdentifierClassElementDeclaration(d); });
                     if (privateDeclaration) {
-                        return ts.getAncestor(privateDeclaration, 252 /* ClassDeclaration */);
+                        return ts.getAncestor(privateDeclaration, 253 /* ClassDeclaration */);
                     }
                     // Else this is a public property and could be accessed from anywhere.
                     return undefined;
@@ -124786,7 +128572,7 @@ var ts;
                         // Different declarations have different containers, bail out
                         return undefined;
                     }
-                    if (!container || container.kind === 297 /* SourceFile */ && !ts.isExternalOrCommonJsModule(container)) {
+                    if (!container || container.kind === 298 /* 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;
@@ -125002,6 +128788,10 @@ var ts;
                     default:
                         ts.Debug.assertNever(state.specialSearchKind);
                 }
+                // Use the parent symbol if the location is commonjs require syntax on javascript files only.
+                referenceSymbol = ts.isInJSFile(referenceLocation) && referenceLocation.parent.kind === 199 /* BindingElement */ && ts.isRequireVariableDeclaration(referenceLocation.parent)
+                    ? referenceLocation.parent.symbol
+                    : referenceSymbol;
                 getImportOrExportReferences(referenceLocation, referenceSymbol, search, state);
             }
             function getReferencesAtExportSpecifier(referenceLocation, referenceSymbol, exportSpecifier, search, state, addReferencesHere, alwaysGetReferences) {
@@ -125164,14 +128954,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 === 166 /* Constructor */ && !!ctrKeyword);
+                        ts.Debug.assert(decl.kind === 167 /* Constructor */ && !!ctrKeyword);
                         addNode(ctrKeyword);
                     }
                 }
                 if (classSymbol.exports) {
                     classSymbol.exports.forEach(function (member) {
                         var decl = member.valueDeclaration;
-                        if (decl && decl.kind === 165 /* MethodDeclaration */) {
+                        if (decl && decl.kind === 166 /* MethodDeclaration */) {
                             var body = decl.body;
                             if (body) {
                                 forEachDescendantOfKind(body, 107 /* ThisKeyword */, function (thisKeyword) {
@@ -125195,7 +128985,7 @@ var ts;
                 }
                 for (var _i = 0, _a = constructor.declarations; _i < _a.length; _i++) {
                     var decl = _a[_i];
-                    ts.Debug.assert(decl.kind === 166 /* Constructor */);
+                    ts.Debug.assert(decl.kind === 167 /* Constructor */);
                     var body = decl.body;
                     if (body) {
                         forEachDescendantOfKind(body, 105 /* SuperKeyword */, function (node) {
@@ -125225,7 +129015,7 @@ var ts;
                 if (refNode.kind !== 78 /* Identifier */) {
                     return;
                 }
-                if (refNode.parent.kind === 289 /* ShorthandPropertyAssignment */) {
+                if (refNode.parent.kind === 290 /* ShorthandPropertyAssignment */) {
                     // Go ahead and dereference the shorthand assignment by going to its definition
                     getReferenceEntriesForShorthandPropertyAssignment(refNode, state.checker, addReference);
                 }
@@ -125245,7 +129035,7 @@ var ts;
                     }
                     else if (ts.isFunctionLike(typeHavingNode) && typeHavingNode.body) {
                         var body = typeHavingNode.body;
-                        if (body.kind === 230 /* Block */) {
+                        if (body.kind === 231 /* Block */) {
                             ts.forEachReturnStatement(body, function (returnStatement) {
                                 if (returnStatement.expression)
                                     addIfImplementation(returnStatement.expression);
@@ -125273,13 +129063,13 @@ var ts;
              */
             function isImplementationExpression(node) {
                 switch (node.kind) {
-                    case 207 /* ParenthesizedExpression */:
+                    case 208 /* ParenthesizedExpression */:
                         return isImplementationExpression(node.expression);
-                    case 209 /* ArrowFunction */:
-                    case 208 /* FunctionExpression */:
-                    case 200 /* ObjectLiteralExpression */:
-                    case 221 /* ClassExpression */:
-                    case 199 /* ArrayLiteralExpression */:
+                    case 210 /* ArrowFunction */:
+                    case 209 /* FunctionExpression */:
+                    case 201 /* ObjectLiteralExpression */:
+                    case 222 /* ClassExpression */:
+                    case 200 /* ArrayLiteralExpression */:
                         return true;
                     default:
                         return false;
@@ -125332,13 +129122,13 @@ var ts;
                 // Whether 'super' occurs in a static context within a class.
                 var staticFlag = 32 /* Static */;
                 switch (searchSpaceNode.kind) {
-                    case 163 /* PropertyDeclaration */:
-                    case 162 /* PropertySignature */:
-                    case 165 /* MethodDeclaration */:
-                    case 164 /* MethodSignature */:
-                    case 166 /* Constructor */:
-                    case 167 /* GetAccessor */:
-                    case 168 /* SetAccessor */:
+                    case 164 /* PropertyDeclaration */:
+                    case 163 /* PropertySignature */:
+                    case 166 /* MethodDeclaration */:
+                    case 165 /* MethodSignature */:
+                    case 167 /* Constructor */:
+                    case 168 /* GetAccessor */:
+                    case 169 /* SetAccessor */:
                         staticFlag &= ts.getSyntacticModifierFlags(searchSpaceNode);
                         searchSpaceNode = searchSpaceNode.parent; // re-assign to be the owning class
                         break;
@@ -125359,41 +129149,43 @@ var ts;
                 return [{ definition: { type: 0 /* Symbol */, symbol: searchSpaceNode.symbol }, references: references }];
             }
             function isParameterName(node) {
-                return node.kind === 78 /* Identifier */ && node.parent.kind === 160 /* Parameter */ && node.parent.name === node;
+                return node.kind === 78 /* Identifier */ && node.parent.kind === 161 /* 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 165 /* MethodDeclaration */:
-                    case 164 /* MethodSignature */:
+                    case 166 /* MethodDeclaration */:
+                    case 165 /* MethodSignature */:
                         if (ts.isObjectLiteralMethod(searchSpaceNode)) {
+                            staticFlag &= ts.getSyntacticModifierFlags(searchSpaceNode);
+                            searchSpaceNode = searchSpaceNode.parent; // re-assign to be the owning object literals
                             break;
                         }
                     // falls through
-                    case 163 /* PropertyDeclaration */:
-                    case 162 /* PropertySignature */:
-                    case 166 /* Constructor */:
-                    case 167 /* GetAccessor */:
-                    case 168 /* SetAccessor */:
+                    case 164 /* PropertyDeclaration */:
+                    case 163 /* PropertySignature */:
+                    case 167 /* Constructor */:
+                    case 168 /* GetAccessor */:
+                    case 169 /* SetAccessor */:
                         staticFlag &= ts.getSyntacticModifierFlags(searchSpaceNode);
                         searchSpaceNode = searchSpaceNode.parent; // re-assign to be the owning class
                         break;
-                    case 297 /* SourceFile */:
+                    case 298 /* SourceFile */:
                         if (ts.isExternalModule(searchSpaceNode) || isParameterName(thisOrSuperKeyword)) {
                             return undefined;
                         }
                     // falls through
-                    case 251 /* FunctionDeclaration */:
-                    case 208 /* FunctionExpression */:
+                    case 252 /* FunctionDeclaration */:
+                    case 209 /* 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 === 297 /* SourceFile */ ? sourceFiles : [searchSpaceNode.getSourceFile()], function (sourceFile) {
+                var references = ts.flatMap(searchSpaceNode.kind === 298 /* SourceFile */ ? sourceFiles : [searchSpaceNode.getSourceFile()], function (sourceFile) {
                     cancellationToken.throwIfCancellationRequested();
                     return getPossibleSymbolReferenceNodes(sourceFile, "this", ts.isSourceFile(searchSpaceNode) ? sourceFile : searchSpaceNode).filter(function (node) {
                         if (!ts.isThis(node)) {
@@ -125401,19 +129193,20 @@ var ts;
                         }
                         var container = ts.getThisContainer(node, /* includeArrowFunctions */ false);
                         switch (searchSpaceNode.kind) {
-                            case 208 /* FunctionExpression */:
-                            case 251 /* FunctionDeclaration */:
+                            case 209 /* FunctionExpression */:
+                            case 252 /* FunctionDeclaration */:
                                 return searchSpaceNode.symbol === container.symbol;
-                            case 165 /* MethodDeclaration */:
-                            case 164 /* MethodSignature */:
+                            case 166 /* MethodDeclaration */:
+                            case 165 /* MethodSignature */:
                                 return ts.isObjectLiteralMethod(searchSpaceNode) && searchSpaceNode.symbol === container.symbol;
-                            case 221 /* ClassExpression */:
-                            case 252 /* ClassDeclaration */:
-                                // Make sure the container belongs to the same class
+                            case 222 /* ClassExpression */:
+                            case 253 /* ClassDeclaration */:
+                            case 201 /* ObjectLiteralExpression */:
+                                // Make sure the container belongs to the same class/object literals
                                 // 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 297 /* SourceFile */:
-                                return container.kind === 297 /* SourceFile */ && !ts.isExternalModule(container) && !isParameterName(node);
+                            case 298 /* SourceFile */:
+                                return container.kind === 298 /* SourceFile */ && !ts.isExternalModule(container) && !isParameterName(node);
                         }
                     });
                 }).map(function (n) { return nodeEntry(n); });
@@ -125523,7 +129316,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, 270 /* ExportSpecifier */);
+                var exportSpecifier = ts.getDeclarationOfKind(symbol, 271 /* ExportSpecifier */);
                 if (!isForRenamePopulateSearchSymbolSet || exportSpecifier && !exportSpecifier.propertyName) {
                     var localSymbol = exportSpecifier && checker.getExportSpecifierLocalTargetSymbol(exportSpecifier);
                     if (localSymbol) {
@@ -125568,7 +129361,7 @@ var ts;
                     });
                 }
                 function getPropertySymbolOfObjectBindingPatternWithoutPropertyName(symbol, checker) {
-                    var bindingElement = ts.getDeclarationOfKind(symbol, 198 /* BindingElement */);
+                    var bindingElement = ts.getDeclarationOfKind(symbol, 199 /* BindingElement */);
                     if (bindingElement && ts.isObjectBindingElementWithoutPropertyName(bindingElement)) {
                         return ts.getPropertySymbolFromBindingElement(checker, bindingElement);
                     }
@@ -125821,16 +129614,16 @@ var ts;
                 return;
             }
             switch (node.kind) {
-                case 167 /* GetAccessor */:
-                case 168 /* SetAccessor */:
-                case 165 /* MethodDeclaration */:
-                    if (node.parent.kind === 200 /* ObjectLiteralExpression */) {
+                case 168 /* GetAccessor */:
+                case 169 /* SetAccessor */:
+                case 166 /* MethodDeclaration */:
+                    if (node.parent.kind === 201 /* 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 251 /* FunctionDeclaration */:
-                case 252 /* ClassDeclaration */:
-                case 256 /* ModuleDeclaration */:
+                case 252 /* FunctionDeclaration */:
+                case 253 /* ClassDeclaration */:
+                case 257 /* ModuleDeclaration */:
                     if (ts.isModuleBlock(node.parent) && ts.isIdentifier(node.parent.parent.name)) {
                         return node.parent.parent.name.getText();
                     }
@@ -126036,55 +129829,55 @@ var ts;
                 }
                 switch (node.kind) {
                     case 78 /* Identifier */:
-                    case 260 /* ImportEqualsDeclaration */:
-                    case 261 /* ImportDeclaration */:
-                    case 267 /* ExportDeclaration */:
-                    case 253 /* InterfaceDeclaration */:
-                    case 254 /* TypeAliasDeclaration */:
+                    case 261 /* ImportEqualsDeclaration */:
+                    case 262 /* ImportDeclaration */:
+                    case 268 /* ExportDeclaration */:
+                    case 254 /* InterfaceDeclaration */:
+                    case 255 /* TypeAliasDeclaration */:
                         // do not descend into nodes that cannot contain callable nodes
                         return;
-                    case 206 /* TypeAssertionExpression */:
-                    case 224 /* AsExpression */:
+                    case 207 /* TypeAssertionExpression */:
+                    case 225 /* AsExpression */:
                         // do not descend into the type side of an assertion
                         collect(node.expression);
                         return;
-                    case 249 /* VariableDeclaration */:
-                    case 160 /* Parameter */:
+                    case 250 /* VariableDeclaration */:
+                    case 161 /* Parameter */:
                         // do not descend into the type of a variable or parameter declaration
                         collect(node.name);
                         collect(node.initializer);
                         return;
-                    case 203 /* CallExpression */:
+                    case 204 /* CallExpression */:
                         // do not descend into the type arguments of a call expression
                         recordCallSite(node);
                         collect(node.expression);
                         ts.forEach(node.arguments, collect);
                         return;
-                    case 204 /* NewExpression */:
+                    case 205 /* NewExpression */:
                         // do not descend into the type arguments of a new expression
                         recordCallSite(node);
                         collect(node.expression);
                         ts.forEach(node.arguments, collect);
                         return;
-                    case 205 /* TaggedTemplateExpression */:
+                    case 206 /* TaggedTemplateExpression */:
                         // do not descend into the type arguments of a tagged template expression
                         recordCallSite(node);
                         collect(node.tag);
                         collect(node.template);
                         return;
-                    case 275 /* JsxOpeningElement */:
-                    case 274 /* JsxSelfClosingElement */:
+                    case 276 /* JsxOpeningElement */:
+                    case 275 /* JsxSelfClosingElement */:
                         // do not descend into the type arguments of a JsxOpeningLikeElement
                         recordCallSite(node);
                         collect(node.tagName);
                         collect(node.attributes);
                         return;
-                    case 161 /* Decorator */:
+                    case 162 /* Decorator */:
                         recordCallSite(node);
                         collect(node.expression);
                         return;
-                    case 201 /* PropertyAccessExpression */:
-                    case 202 /* ElementAccessExpression */:
+                    case 202 /* PropertyAccessExpression */:
+                    case 203 /* ElementAccessExpression */:
                         recordCallSite(node);
                         ts.forEachChild(node, collect);
                         break;
@@ -126134,22 +129927,22 @@ var ts;
             var callSites = [];
             var collect = createCallSiteCollector(program, callSites);
             switch (node.kind) {
-                case 297 /* SourceFile */:
+                case 298 /* SourceFile */:
                     collectCallSitesOfSourceFile(node, collect);
                     break;
-                case 256 /* ModuleDeclaration */:
+                case 257 /* ModuleDeclaration */:
                     collectCallSitesOfModuleDeclaration(node, collect);
                     break;
-                case 251 /* FunctionDeclaration */:
-                case 208 /* FunctionExpression */:
-                case 209 /* ArrowFunction */:
-                case 165 /* MethodDeclaration */:
-                case 167 /* GetAccessor */:
-                case 168 /* SetAccessor */:
+                case 252 /* FunctionDeclaration */:
+                case 209 /* FunctionExpression */:
+                case 210 /* ArrowFunction */:
+                case 166 /* MethodDeclaration */:
+                case 168 /* GetAccessor */:
+                case 169 /* SetAccessor */:
                     collectCallSitesOfFunctionLikeDeclaration(program.getTypeChecker(), node, collect);
                     break;
-                case 252 /* ClassDeclaration */:
-                case 221 /* ClassExpression */:
+                case 253 /* ClassDeclaration */:
+                case 222 /* ClassExpression */:
                     collectCallSitesOfClassLikeDeclaration(node, collect);
                     break;
                 default:
@@ -126282,7 +130075,7 @@ var ts;
     }
     function updateImports(program, changeTracker, oldToNew, newToOld, host, getCanonicalFileName) {
         var allFiles = program.getSourceFiles();
-        var _loop_4 = function (sourceFile) {
+        var _loop_5 = function (sourceFile) {
             var newFromOld = oldToNew(sourceFile.fileName);
             var newImportFromPath = newFromOld !== null && newFromOld !== void 0 ? newFromOld : sourceFile.fileName;
             var newImportFromDirectory = ts.getDirectoryPath(newImportFromPath);
@@ -126299,7 +130092,7 @@ var ts;
             }, function (importLiteral) {
                 var importedModuleSymbol = program.getTypeChecker().getSymbolAtLocation(importLiteral);
                 // No need to update if it's an ambient module^M
-                if (importedModuleSymbol && importedModuleSymbol.declarations.some(function (d) { return ts.isAmbientModule(d); }))
+                if ((importedModuleSymbol === null || importedModuleSymbol === void 0 ? void 0 : importedModuleSymbol.declarations) && importedModuleSymbol.declarations.some(function (d) { return ts.isAmbientModule(d); }))
                     return undefined;
                 var toImport = oldFromNew !== undefined
                     // If we're at the new location (file was already renamed), need to redo module resolution starting from the old location.
@@ -126314,7 +130107,7 @@ var ts;
         };
         for (var _i = 0, allFiles_1 = allFiles; _i < allFiles_1.length; _i++) {
             var sourceFile = allFiles_1[_i];
-            _loop_4(sourceFile);
+            _loop_5(sourceFile);
         }
     }
     function combineNormal(pathA, pathB) {
@@ -126405,8 +130198,10 @@ var ts;
     (function (GoToDefinition) {
         function getDefinitionAtPosition(program, sourceFile, position) {
             var resolvedRef = getReferenceAtPosition(sourceFile, position, program);
-            if (resolvedRef) {
-                return [getDefinitionInfoForFileReference(resolvedRef.reference.fileName, resolvedRef.file.fileName)];
+            var fileReferenceDefinition = resolvedRef && [getDefinitionInfoForFileReference(resolvedRef.reference.fileName, resolvedRef.fileName, resolvedRef.unverified)] || ts.emptyArray;
+            if (resolvedRef === null || resolvedRef === void 0 ? void 0 : resolvedRef.file) {
+                // If `file` is missing, do a symbol-based lookup as well
+                return fileReferenceDefinition;
             }
             var node = ts.getTouchingPropertyName(sourceFile, position);
             if (node === sourceFile) {
@@ -126423,7 +130218,7 @@ var ts;
             // Could not find a symbol e.g. node is string or number keyword,
             // or the symbol was an internal symbol and does not have a declaration e.g. undefined symbol
             if (!symbol) {
-                return getDefinitionInfoForIndexSignatures(node, typeChecker);
+                return ts.concatenate(fileReferenceDefinition, getDefinitionInfoForIndexSignatures(node, typeChecker));
             }
             var calledDeclaration = tryGetSignatureDeclaration(typeChecker, node);
             // Don't go to the component constructor definition for a JSX element, just go to the component definition.
@@ -126445,9 +130240,10 @@ 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 === 289 /* ShorthandPropertyAssignment */) {
+            if (node.parent.kind === 290 /* ShorthandPropertyAssignment */) {
                 var shorthandSymbol_1 = typeChecker.getShorthandAssignmentValueSymbol(symbol.valueDeclaration);
-                return shorthandSymbol_1 ? shorthandSymbol_1.declarations.map(function (decl) { return createDefinitionInfo(decl, typeChecker, shorthandSymbol_1, node); }) : [];
+                var definitions = (shorthandSymbol_1 === null || shorthandSymbol_1 === void 0 ? void 0 : shorthandSymbol_1.declarations) ? shorthandSymbol_1.declarations.map(function (decl) { return createDefinitionInfo(decl, typeChecker, shorthandSymbol_1, node); }) : ts.emptyArray;
+                return ts.concatenate(definitions, getDefinitionFromObjectLiteralElement(typeChecker, node) || ts.emptyArray);
             }
             // If the node is the name of a BindingElement within an ObjectBindingPattern instead of just returning the
             // declaration the symbol (which is itself), we should try to get to the original type of the ObjectBindingPattern
@@ -126469,25 +130265,7 @@ var ts;
                     return prop && getDefinitionFromSymbol(typeChecker, prop, node);
                 });
             }
-            // If the current location we want to find its definition is in an object literal, try to get the contextual type for the
-            // object literal, lookup the property symbol in the contextual type, and use this for goto-definition.
-            // For example
-            //      interface Props{
-            //          /*first*/prop1: number
-            //          prop2: boolean
-            //      }
-            //      function Foo(arg: Props) {}
-            //      Foo( { pr/*1*/op1: 10, prop2: true })
-            var element = ts.getContainingObjectLiteralElement(node);
-            if (element) {
-                var contextualType = element && typeChecker.getContextualType(element.parent);
-                if (contextualType) {
-                    return ts.flatMap(ts.getPropertySymbolsFromContextualType(element, typeChecker, contextualType, /*unionSymbolOk*/ false), function (propertySymbol) {
-                        return getDefinitionFromSymbol(typeChecker, propertySymbol, node);
-                    });
-                }
-            }
-            return getDefinitionFromSymbol(typeChecker, symbol, node);
+            return ts.concatenate(fileReferenceDefinition, getDefinitionFromObjectLiteralElement(typeChecker, node) || getDefinitionFromSymbol(typeChecker, symbol, node));
         }
         GoToDefinition.getDefinitionAtPosition = getDefinitionAtPosition;
         /**
@@ -126501,22 +130279,60 @@ var ts;
                 || ts.isAssignmentExpression(calledDeclaration.parent)
                 || (!ts.isCallLikeExpression(calledDeclaration.parent) && s === calledDeclaration.parent.symbol);
         }
+        // If the current location we want to find its definition is in an object literal, try to get the contextual type for the
+        // object literal, lookup the property symbol in the contextual type, and use this for goto-definition.
+        // For example
+        //      interface Props{
+        //          /*first*/prop1: number
+        //          prop2: boolean
+        //      }
+        //      function Foo(arg: Props) {}
+        //      Foo( { pr/*1*/op1: 10, prop2: true })
+        function getDefinitionFromObjectLiteralElement(typeChecker, node) {
+            var element = ts.getContainingObjectLiteralElement(node);
+            if (element) {
+                var contextualType = element && typeChecker.getContextualType(element.parent);
+                if (contextualType) {
+                    return ts.flatMap(ts.getPropertySymbolsFromContextualType(element, typeChecker, contextualType, /*unionSymbolOk*/ false), function (propertySymbol) {
+                        return getDefinitionFromSymbol(typeChecker, propertySymbol, node);
+                    });
+                }
+            }
+        }
         function getReferenceAtPosition(sourceFile, position, program) {
+            var _a, _b;
             var referencePath = findReferenceInPosition(sourceFile.referencedFiles, position);
             if (referencePath) {
                 var file = program.getSourceFileFromReference(sourceFile, referencePath);
-                return file && { reference: referencePath, file: file };
+                return file && { reference: referencePath, fileName: file.fileName, file: file, unverified: false };
             }
             var typeReferenceDirective = findReferenceInPosition(sourceFile.typeReferenceDirectives, position);
             if (typeReferenceDirective) {
                 var reference = program.getResolvedTypeReferenceDirectives().get(typeReferenceDirective.fileName);
                 var file = reference && program.getSourceFile(reference.resolvedFileName); // TODO:GH#18217
-                return file && { reference: typeReferenceDirective, file: file };
+                return file && { reference: typeReferenceDirective, fileName: file.fileName, file: file, unverified: false };
             }
             var libReferenceDirective = findReferenceInPosition(sourceFile.libReferenceDirectives, position);
             if (libReferenceDirective) {
                 var file = program.getLibFileFromReference(libReferenceDirective);
-                return file && { reference: libReferenceDirective, file: file };
+                return file && { reference: libReferenceDirective, fileName: file.fileName, file: file, unverified: false };
+            }
+            if ((_a = sourceFile.resolvedModules) === null || _a === void 0 ? void 0 : _a.size) {
+                var node = ts.getTokenAtPosition(sourceFile, position);
+                if (ts.isModuleSpecifierLike(node) && ts.isExternalModuleNameRelative(node.text) && sourceFile.resolvedModules.has(node.text)) {
+                    var verifiedFileName = (_b = sourceFile.resolvedModules.get(node.text)) === null || _b === void 0 ? void 0 : _b.resolvedFileName;
+                    var fileName = verifiedFileName || ts.resolvePath(ts.getDirectoryPath(sourceFile.fileName), node.text);
+                    return {
+                        file: program.getSourceFile(fileName),
+                        fileName: fileName,
+                        reference: {
+                            pos: node.getStart(),
+                            end: node.getEnd(),
+                            fileName: node.text
+                        },
+                        unverified: !verifiedFileName,
+                    };
+                }
             }
             return undefined;
         }
@@ -126587,7 +130403,7 @@ 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])) {
+            if ((symbol === null || symbol === void 0 ? void 0 : symbol.declarations) && symbol.flags & 2097152 /* Alias */ && shouldSkipAlias(node, symbol.declarations[0])) {
                 var aliased = checker.getAliasedSymbol(symbol);
                 if (aliased.declarations) {
                     return aliased;
@@ -126608,14 +130424,14 @@ var ts;
                 return true;
             }
             switch (declaration.kind) {
-                case 262 /* ImportClause */:
-                case 260 /* ImportEqualsDeclaration */:
+                case 263 /* ImportClause */:
+                case 261 /* ImportEqualsDeclaration */:
                     return true;
-                case 265 /* ImportSpecifier */:
-                    return declaration.parent.kind === 264 /* NamedImports */;
-                case 198 /* BindingElement */:
-                case 249 /* VariableDeclaration */:
-                    return ts.isInJSFile(declaration) && ts.isRequireVariableDeclaration(declaration, /*requireStringLiteralLikeArgument*/ true);
+                case 266 /* ImportSpecifier */:
+                    return declaration.parent.kind === 265 /* NamedImports */;
+                case 199 /* BindingElement */:
+                case 250 /* VariableDeclaration */:
+                    return ts.isInJSFile(declaration) && ts.isRequireVariableDeclaration(declaration);
                 default:
                     return false;
             }
@@ -126667,7 +130483,38 @@ var ts;
             var sourceFile = name.getSourceFile();
             var textSpan = ts.createTextSpanFromNode(name, sourceFile);
             return __assign(__assign({ fileName: sourceFile.fileName, textSpan: textSpan, kind: symbolKind, name: symbolName, containerKind: undefined, // TODO: GH#18217
-                containerName: containerName }, ts.FindAllReferences.toContextSpan(textSpan, sourceFile, ts.FindAllReferences.getContextNode(declaration))), { isLocal: !checker.isDeclarationVisible(declaration) });
+                containerName: containerName }, ts.FindAllReferences.toContextSpan(textSpan, sourceFile, ts.FindAllReferences.getContextNode(declaration))), { isLocal: !isDefinitionVisible(checker, declaration) });
+        }
+        function isDefinitionVisible(checker, declaration) {
+            if (checker.isDeclarationVisible(declaration))
+                return true;
+            if (!declaration.parent)
+                return false;
+            // Variable initializers are visible if variable is visible
+            if (ts.hasInitializer(declaration.parent) && declaration.parent.initializer === declaration)
+                return isDefinitionVisible(checker, declaration.parent);
+            // Handle some exceptions here like arrow function, members of class and object literal expression which are technically not visible but we want the definition to be determined by its parent
+            switch (declaration.kind) {
+                case 164 /* PropertyDeclaration */:
+                case 168 /* GetAccessor */:
+                case 169 /* SetAccessor */:
+                case 166 /* MethodDeclaration */:
+                    // Private/protected properties/methods are not visible
+                    if (ts.hasEffectiveModifier(declaration, 8 /* Private */))
+                        return false;
+                // Public properties/methods are visible if its parents are visible, so:
+                // falls through
+                case 167 /* Constructor */:
+                case 289 /* PropertyAssignment */:
+                case 290 /* ShorthandPropertyAssignment */:
+                case 201 /* ObjectLiteralExpression */:
+                case 222 /* ClassExpression */:
+                case 210 /* ArrowFunction */:
+                case 209 /* FunctionExpression */:
+                    return isDefinitionVisible(checker, declaration.parent);
+                default:
+                    return false;
+            }
         }
         function createDefinitionFromSignatureDeclaration(typeChecker, decl) {
             return createDefinitionInfo(decl, typeChecker, decl.symbol, decl);
@@ -126676,14 +130523,15 @@ var ts;
             return ts.find(refs, function (ref) { return ts.textRangeContainsPositionInclusive(ref, pos); });
         }
         GoToDefinition.findReferenceInPosition = findReferenceInPosition;
-        function getDefinitionInfoForFileReference(name, targetFileName) {
+        function getDefinitionInfoForFileReference(name, targetFileName, unverified) {
             return {
                 fileName: targetFileName,
                 textSpan: ts.createTextSpanFromBounds(0, 0),
                 kind: "script" /* scriptElement */,
                 name: name,
                 containerName: undefined,
-                containerKind: undefined, // TODO: GH#18217
+                containerKind: undefined,
+                unverified: unverified,
             };
         }
         /** Returns a CallLikeExpression where `node` is the target being invoked. */
@@ -126700,9 +130548,9 @@ var ts;
         }
         function isConstructorLike(node) {
             switch (node.kind) {
-                case 166 /* Constructor */:
-                case 175 /* ConstructorType */:
-                case 170 /* ConstructSignature */:
+                case 167 /* Constructor */:
+                case 176 /* ConstructorType */:
+                case 171 /* ConstructSignature */:
                     return true;
                 default:
                     return false;
@@ -126759,6 +130607,7 @@ var ts;
             "kind",
             "lends",
             "license",
+            "link",
             "listens",
             "member",
             "memberof",
@@ -126796,78 +130645,115 @@ var ts;
         ];
         var jsDocTagNameCompletionEntries;
         var jsDocTagCompletionEntries;
-        function getJsDocCommentsFromDeclarations(declarations) {
+        function getJsDocCommentsFromDeclarations(declarations, checker) {
             // Only collect doc comments from duplicate declarations once:
             // In case of a union property there might be same declaration multiple times
             // which only varies in type parameter
             // Eg. const a: Array<string> | Array<number>; a.length
             // The property length will have two declarations of property length coming
             // from Array<T> - Array<string> and Array<number>
-            var documentationComment = [];
+            var parts = [];
             ts.forEachUnique(declarations, function (declaration) {
                 for (var _i = 0, _a = getCommentHavingNodes(declaration); _i < _a.length; _i++) {
                     var comment = _a[_i].comment;
                     if (comment === undefined)
                         continue;
-                    ts.pushIfUnique(documentationComment, comment);
+                    var newparts = getDisplayPartsFromComment(comment, checker);
+                    if (!ts.contains(parts, newparts, isIdenticalListOfDisplayParts)) {
+                        parts.push(newparts);
+                    }
                 }
             });
-            return ts.intersperse(ts.map(documentationComment, ts.textPart), ts.lineBreakPart());
+            return ts.flatten(ts.intersperse(parts, [ts.lineBreakPart()]));
         }
         JsDoc.getJsDocCommentsFromDeclarations = getJsDocCommentsFromDeclarations;
+        function isIdenticalListOfDisplayParts(parts1, parts2) {
+            return ts.arraysEqual(parts1, parts2, function (p1, p2) { return p1.kind === p2.kind && p1.text === p2.text; });
+        }
         function getCommentHavingNodes(declaration) {
             switch (declaration.kind) {
-                case 326 /* JSDocParameterTag */:
-                case 333 /* JSDocPropertyTag */:
+                case 330 /* JSDocParameterTag */:
+                case 337 /* JSDocPropertyTag */:
                     return [declaration];
-                case 324 /* JSDocCallbackTag */:
-                case 331 /* JSDocTypedefTag */:
+                case 328 /* JSDocCallbackTag */:
+                case 335 /* JSDocTypedefTag */:
                     return [declaration, declaration.parent];
                 default:
                     return ts.getJSDocCommentsAndTags(declaration);
             }
         }
-        function getJsDocTagsFromDeclarations(declarations) {
+        function getJsDocTagsFromDeclarations(declarations, checker) {
             // Only collect doc comments from duplicate declarations once.
             var tags = [];
             ts.forEachUnique(declarations, function (declaration) {
                 for (var _i = 0, _a = ts.getJSDocTags(declaration); _i < _a.length; _i++) {
                     var tag = _a[_i];
-                    tags.push({ name: tag.tagName.text, text: getCommentText(tag) });
+                    tags.push({ name: tag.tagName.text, text: getCommentDisplayParts(tag, checker) });
                 }
             });
             return tags;
         }
         JsDoc.getJsDocTagsFromDeclarations = getJsDocTagsFromDeclarations;
-        function getCommentText(tag) {
-            var comment = tag.comment;
-            switch (tag.kind) {
-                case 316 /* JSDocImplementsTag */:
+        function getDisplayPartsFromComment(comment, checker) {
+            if (typeof comment === "string") {
+                return [ts.textPart(comment)];
+            }
+            return ts.flatMap(comment, function (node) { return node.kind === 313 /* JSDocText */ ? [ts.textPart(node.text)] : ts.buildLinkParts(node, checker); });
+        }
+        function getCommentDisplayParts(tag, checker) {
+            var comment = tag.comment, kind = tag.kind;
+            var namePart = getTagNameDisplayPart(kind);
+            switch (kind) {
+                case 319 /* JSDocImplementsTag */:
                     return withNode(tag.class);
-                case 315 /* JSDocAugmentsTag */:
+                case 318 /* JSDocAugmentsTag */:
                     return withNode(tag.class);
-                case 330 /* JSDocTemplateTag */:
-                    return withList(tag.typeParameters);
-                case 329 /* JSDocTypeTag */:
+                case 334 /* JSDocTemplateTag */:
+                    return addComment(tag.typeParameters.map(function (tp) { return tp.getText(); }).join(", "));
+                case 333 /* JSDocTypeTag */:
                     return withNode(tag.typeExpression);
-                case 331 /* JSDocTypedefTag */:
-                case 324 /* JSDocCallbackTag */:
-                case 333 /* JSDocPropertyTag */:
-                case 326 /* JSDocParameterTag */:
-                case 332 /* JSDocSeeTag */:
+                case 335 /* JSDocTypedefTag */:
+                case 328 /* JSDocCallbackTag */:
+                case 337 /* JSDocPropertyTag */:
+                case 330 /* JSDocParameterTag */:
+                case 336 /* JSDocSeeTag */:
                     var name = tag.name;
-                    return name ? withNode(name) : comment;
+                    return name ? withNode(name)
+                        : comment === undefined ? undefined
+                            : getDisplayPartsFromComment(comment, checker);
                 default:
-                    return comment;
+                    return comment === undefined ? undefined : getDisplayPartsFromComment(comment, checker);
             }
             function withNode(node) {
                 return addComment(node.getText());
             }
-            function withList(list) {
-                return addComment(list.map(function (x) { return x.getText(); }).join(", "));
-            }
             function addComment(s) {
-                return comment === undefined ? s : s + " " + comment;
+                if (comment) {
+                    if (s.match(/^https?$/)) {
+                        return __spreadArray([ts.textPart(s)], getDisplayPartsFromComment(comment, checker));
+                    }
+                    else {
+                        return __spreadArray([namePart(s), ts.spacePart()], getDisplayPartsFromComment(comment, checker));
+                    }
+                }
+                else {
+                    return [ts.textPart(s)];
+                }
+            }
+        }
+        function getTagNameDisplayPart(kind) {
+            switch (kind) {
+                case 330 /* JSDocParameterTag */:
+                    return ts.parameterNamePart;
+                case 337 /* JSDocPropertyTag */:
+                    return ts.propertyNamePart;
+                case 334 /* JSDocTemplateTag */:
+                    return ts.typeParameterNamePart;
+                case 335 /* JSDocTypedefTag */:
+                case 328 /* JSDocCallbackTag */:
+                    return ts.typeAliasNamePart;
+                default:
+                    return ts.textPart;
             }
         }
         function getJSDocTagNameCompletions() {
@@ -127028,24 +130914,24 @@ var ts;
         }
         function getCommentOwnerInfoWorker(commentOwner, options) {
             switch (commentOwner.kind) {
-                case 251 /* FunctionDeclaration */:
-                case 208 /* FunctionExpression */:
-                case 165 /* MethodDeclaration */:
-                case 166 /* Constructor */:
-                case 164 /* MethodSignature */:
-                case 209 /* ArrowFunction */:
+                case 252 /* FunctionDeclaration */:
+                case 209 /* FunctionExpression */:
+                case 166 /* MethodDeclaration */:
+                case 167 /* Constructor */:
+                case 165 /* MethodSignature */:
+                case 210 /* ArrowFunction */:
                     var host = commentOwner;
                     return { commentOwner: commentOwner, parameters: host.parameters, hasReturn: hasReturn(host, options) };
-                case 288 /* PropertyAssignment */:
+                case 289 /* PropertyAssignment */:
                     return getCommentOwnerInfoWorker(commentOwner.initializer, options);
-                case 252 /* ClassDeclaration */:
-                case 253 /* InterfaceDeclaration */:
-                case 162 /* PropertySignature */:
-                case 255 /* EnumDeclaration */:
-                case 291 /* EnumMember */:
-                case 254 /* TypeAliasDeclaration */:
+                case 253 /* ClassDeclaration */:
+                case 254 /* InterfaceDeclaration */:
+                case 163 /* PropertySignature */:
+                case 256 /* EnumDeclaration */:
+                case 292 /* EnumMember */:
+                case 255 /* TypeAliasDeclaration */:
                     return { commentOwner: commentOwner };
-                case 232 /* VariableStatement */: {
+                case 233 /* VariableStatement */: {
                     var varStatement = commentOwner;
                     var varDeclarations = varStatement.declarationList.declarations;
                     var host_1 = varDeclarations.length === 1 && varDeclarations[0].initializer
@@ -127055,16 +130941,16 @@ var ts;
                         ? { commentOwner: commentOwner, parameters: host_1.parameters, hasReturn: hasReturn(host_1, options) }
                         : { commentOwner: commentOwner };
                 }
-                case 297 /* SourceFile */:
+                case 298 /* SourceFile */:
                     return "quit";
-                case 256 /* ModuleDeclaration */:
+                case 257 /* 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 === 256 /* ModuleDeclaration */ ? undefined : { commentOwner: commentOwner };
-                case 233 /* ExpressionStatement */:
+                    return commentOwner.parent.kind === 257 /* ModuleDeclaration */ ? undefined : { commentOwner: commentOwner };
+                case 234 /* ExpressionStatement */:
                     return getCommentOwnerInfoWorker(commentOwner.expression, options);
-                case 216 /* BinaryExpression */: {
+                case 217 /* BinaryExpression */: {
                     var be = commentOwner;
                     if (ts.getAssignmentDeclarationKind(be) === 0 /* None */) {
                         return "quit";
@@ -127073,7 +130959,7 @@ var ts;
                         ? { commentOwner: commentOwner, parameters: be.right.parameters, hasReturn: hasReturn(be.right, options) }
                         : { commentOwner: commentOwner };
                 }
-                case 163 /* PropertyDeclaration */:
+                case 164 /* PropertyDeclaration */:
                     var init = commentOwner.initializer;
                     if (init && (ts.isFunctionExpression(init) || ts.isArrowFunction(init))) {
                         return { commentOwner: commentOwner, parameters: init.parameters, hasReturn: hasReturn(init, options) };
@@ -127086,14 +130972,14 @@ var ts;
                     || ts.isFunctionLikeDeclaration(node) && node.body && ts.isBlock(node.body) && !!ts.forEachReturnStatement(node.body, function (n) { return n; }));
         }
         function getRightHandSideOfAssignment(rightHandSide) {
-            while (rightHandSide.kind === 207 /* ParenthesizedExpression */) {
+            while (rightHandSide.kind === 208 /* ParenthesizedExpression */) {
                 rightHandSide = rightHandSide.expression;
             }
             switch (rightHandSide.kind) {
-                case 208 /* FunctionExpression */:
-                case 209 /* ArrowFunction */:
+                case 209 /* FunctionExpression */:
+                case 210 /* ArrowFunction */:
                     return rightHandSide;
-                case 221 /* ClassExpression */:
+                case 222 /* ClassExpression */:
                     return ts.find(rightHandSide.members, ts.isConstructorDeclaration);
             }
         }
@@ -127109,7 +130995,7 @@ var ts;
             if (!patternMatcher)
                 return ts.emptyArray;
             var rawItems = [];
-            var _loop_5 = function (sourceFile) {
+            var _loop_6 = function (sourceFile) {
                 cancellationToken.throwIfCancellationRequested();
                 if (excludeDtsFiles && sourceFile.isDeclarationFile) {
                     return "continue";
@@ -127121,7 +131007,7 @@ var ts;
             // Search the declarations in all files and output matched NavigateToItem into array of NavigateToItem[]
             for (var _i = 0, sourceFiles_4 = sourceFiles; _i < sourceFiles_4.length; _i++) {
                 var sourceFile = sourceFiles_4[_i];
-                _loop_5(sourceFile);
+                _loop_6(sourceFile);
             }
             rawItems.sort(compareNavigateToItems);
             return (maxResultCount === undefined ? rawItems : rawItems.slice(0, maxResultCount)).map(createNavigateToItem);
@@ -127152,9 +131038,9 @@ var ts;
         }
         function shouldKeepItem(declaration, checker) {
             switch (declaration.kind) {
-                case 262 /* ImportClause */:
-                case 265 /* ImportSpecifier */:
-                case 260 /* ImportEqualsDeclaration */:
+                case 263 /* ImportClause */:
+                case 266 /* ImportSpecifier */:
+                case 261 /* ImportEqualsDeclaration */:
                     var importer = checker.getSymbolAtLocation(declaration.name); // TODO: GH#18217
                     var imported = checker.getAliasedSymbol(importer);
                     return importer.escapedName !== imported.escapedName;
@@ -127164,7 +131050,7 @@ var ts;
         }
         function tryAddSingleDeclarationName(declaration, containers) {
             var name = ts.getNameOfDeclaration(declaration);
-            return !!name && (pushLiteral(name, containers) || name.kind === 158 /* ComputedPropertyName */ && tryAddComputedPropertyName(name.expression, containers));
+            return !!name && (pushLiteral(name, containers) || name.kind === 159 /* ComputedPropertyName */ && tryAddComputedPropertyName(name.expression, containers));
         }
         // Only added the names of computed properties if they're simple dotted expressions, like:
         //
@@ -127181,7 +131067,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 === 158 /* ComputedPropertyName */ && !tryAddComputedPropertyName(name.expression, containers)) {
+            if (name && name.kind === 159 /* ComputedPropertyName */ && !tryAddComputedPropertyName(name.expression, containers)) {
                 return ts.emptyArray;
             }
             // Don't include the last portion.
@@ -127391,6 +131277,18 @@ var ts;
                 addNodeWithRecursiveChild(node, node.initializer);
             }
         }
+        /**
+         * Historically, we've elided dynamic names from the nav tree (including late bound names),
+         * but included certain "well known" symbol names. While we no longer distinguish those well-known
+         * symbols from other unique symbols, we do the below to retain those members in the nav tree.
+         */
+        function hasNavigationBarName(node) {
+            return !ts.hasDynamicName(node) ||
+                (node.kind !== 217 /* BinaryExpression */ &&
+                    ts.isPropertyAccessExpression(node.name.expression) &&
+                    ts.isIdentifier(node.name.expression.expression) &&
+                    ts.idText(node.name.expression.expression) === "Symbol");
+        }
         /** Look for navigation bar items in node's subtree, adding them to the current `parent`. */
         function addChildrenRecursively(node) {
             var _a;
@@ -127399,7 +131297,7 @@ var ts;
                 return;
             }
             switch (node.kind) {
-                case 166 /* Constructor */:
+                case 167 /* 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);
@@ -127411,25 +131309,25 @@ var ts;
                         }
                     }
                     break;
-                case 165 /* MethodDeclaration */:
-                case 167 /* GetAccessor */:
-                case 168 /* SetAccessor */:
-                case 164 /* MethodSignature */:
-                    if (!ts.hasDynamicName(node)) {
+                case 166 /* MethodDeclaration */:
+                case 168 /* GetAccessor */:
+                case 169 /* SetAccessor */:
+                case 165 /* MethodSignature */:
+                    if (hasNavigationBarName(node)) {
                         addNodeWithRecursiveChild(node, node.body);
                     }
                     break;
-                case 163 /* PropertyDeclaration */:
-                    if (!ts.hasDynamicName(node)) {
+                case 164 /* PropertyDeclaration */:
+                    if (hasNavigationBarName(node)) {
                         addNodeWithRecursiveInitializer(node);
                     }
                     break;
-                case 162 /* PropertySignature */:
-                    if (!ts.hasDynamicName(node)) {
+                case 163 /* PropertySignature */:
+                    if (hasNavigationBarName(node)) {
                         addLeafNode(node);
                     }
                     break;
-                case 262 /* ImportClause */:
+                case 263 /* ImportClause */:
                     var importClause = node;
                     // Handle default import case e.g.:
                     //    import d from "mod";
@@ -127441,7 +131339,7 @@ var ts;
                     //    import {a, b as B} from "mod";
                     var namedBindings = importClause.namedBindings;
                     if (namedBindings) {
-                        if (namedBindings.kind === 263 /* NamespaceImport */) {
+                        if (namedBindings.kind === 264 /* NamespaceImport */) {
                             addLeafNode(namedBindings);
                         }
                         else {
@@ -127452,17 +131350,17 @@ var ts;
                         }
                     }
                     break;
-                case 289 /* ShorthandPropertyAssignment */:
+                case 290 /* ShorthandPropertyAssignment */:
                     addNodeWithRecursiveChild(node, node.name);
                     break;
-                case 290 /* SpreadAssignment */:
+                case 291 /* 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 198 /* BindingElement */:
-                case 288 /* PropertyAssignment */:
-                case 249 /* VariableDeclaration */: {
+                case 199 /* BindingElement */:
+                case 289 /* PropertyAssignment */:
+                case 250 /* VariableDeclaration */: {
                     var child = node;
                     if (ts.isBindingPattern(child.name)) {
                         addChildrenRecursively(child.name);
@@ -127472,7 +131370,7 @@ var ts;
                     }
                     break;
                 }
-                case 251 /* FunctionDeclaration */:
+                case 252 /* FunctionDeclaration */:
                     var nameNode = node.name;
                     // If we see a function declaration track as a possible ES5 class
                     if (nameNode && ts.isIdentifier(nameNode)) {
@@ -127480,11 +131378,11 @@ var ts;
                     }
                     addNodeWithRecursiveChild(node, node.body);
                     break;
-                case 209 /* ArrowFunction */:
-                case 208 /* FunctionExpression */:
+                case 210 /* ArrowFunction */:
+                case 209 /* FunctionExpression */:
                     addNodeWithRecursiveChild(node, node.body);
                     break;
-                case 255 /* EnumDeclaration */:
+                case 256 /* EnumDeclaration */:
                     startNode(node);
                     for (var _e = 0, _f = node.members; _e < _f.length; _e++) {
                         var member = _f[_e];
@@ -127494,9 +131392,9 @@ var ts;
                     }
                     endNode();
                     break;
-                case 252 /* ClassDeclaration */:
-                case 221 /* ClassExpression */:
-                case 253 /* InterfaceDeclaration */:
+                case 253 /* ClassDeclaration */:
+                case 222 /* ClassExpression */:
+                case 254 /* InterfaceDeclaration */:
                     startNode(node);
                     for (var _g = 0, _h = node.members; _g < _h.length; _g++) {
                         var member = _h[_g];
@@ -127504,10 +131402,10 @@ var ts;
                     }
                     endNode();
                     break;
-                case 256 /* ModuleDeclaration */:
+                case 257 /* ModuleDeclaration */:
                     addNodeWithRecursiveChild(node, getInteriorModule(node).body);
                     break;
-                case 266 /* ExportAssignment */: {
+                case 267 /* ExportAssignment */: {
                     var expression_1 = node.expression;
                     var child = ts.isObjectLiteralExpression(expression_1) || ts.isCallExpression(expression_1) ? expression_1 :
                         ts.isArrowFunction(expression_1) || ts.isFunctionExpression(expression_1) ? expression_1.body : undefined;
@@ -127521,16 +131419,16 @@ var ts;
                     }
                     break;
                 }
-                case 270 /* ExportSpecifier */:
-                case 260 /* ImportEqualsDeclaration */:
-                case 171 /* IndexSignature */:
-                case 169 /* CallSignature */:
-                case 170 /* ConstructSignature */:
-                case 254 /* TypeAliasDeclaration */:
+                case 271 /* ExportSpecifier */:
+                case 261 /* ImportEqualsDeclaration */:
+                case 172 /* IndexSignature */:
+                case 170 /* CallSignature */:
+                case 171 /* ConstructSignature */:
+                case 255 /* TypeAliasDeclaration */:
                     addLeafNode(node);
                     break;
-                case 203 /* CallExpression */:
-                case 216 /* BinaryExpression */: {
+                case 204 /* CallExpression */:
+                case 217 /* BinaryExpression */: {
                     var special = ts.getAssignmentDeclarationKind(node);
                     switch (special) {
                         case 1 /* ExportsProperty */:
@@ -127772,13 +131670,14 @@ var ts;
                 return false;
             }
             switch (a.kind) {
-                case 163 /* PropertyDeclaration */:
-                case 165 /* MethodDeclaration */:
-                case 167 /* GetAccessor */:
-                case 168 /* SetAccessor */:
+                case 164 /* PropertyDeclaration */:
+                case 166 /* MethodDeclaration */:
+                case 168 /* GetAccessor */:
+                case 169 /* SetAccessor */:
                     return ts.hasSyntacticModifier(a, 32 /* Static */) === ts.hasSyntacticModifier(b, 32 /* Static */);
-                case 256 /* ModuleDeclaration */:
-                    return areSameModule(a, b);
+                case 257 /* ModuleDeclaration */:
+                    return areSameModule(a, b)
+                        && getFullyQualifiedModuleName(a) === getFullyQualifiedModuleName(b);
                 default:
                     return true;
             }
@@ -127795,8 +131694,7 @@ var ts;
         // We use 1 NavNode to represent 'A.B.C', but there are multiple source nodes.
         // Only merge module nodes that have the same chain. Don't merge 'A.B.C' with 'A'!
         function areSameModule(a, b) {
-            // TODO: GH#18217
-            return a.body.kind === b.body.kind && (a.body.kind !== 256 /* ModuleDeclaration */ || areSameModule(a.body, b.body));
+            return a.body.kind === b.body.kind && (a.body.kind !== 257 /* ModuleDeclaration */ || areSameModule(a.body, b.body));
         }
         /** Merge source into target. Source should be thrown away after this is called. */
         function merge(target, source) {
@@ -127826,7 +131724,7 @@ var ts;
          * So `new()` can still come before an `aardvark` method.
          */
         function tryGetName(node) {
-            if (node.kind === 256 /* ModuleDeclaration */) {
+            if (node.kind === 257 /* ModuleDeclaration */) {
                 return getModuleName(node);
             }
             var declName = ts.getNameOfDeclaration(node);
@@ -127835,16 +131733,16 @@ var ts;
                 return propertyName && ts.unescapeLeadingUnderscores(propertyName);
             }
             switch (node.kind) {
-                case 208 /* FunctionExpression */:
-                case 209 /* ArrowFunction */:
-                case 221 /* ClassExpression */:
+                case 209 /* FunctionExpression */:
+                case 210 /* ArrowFunction */:
+                case 222 /* ClassExpression */:
                     return getFunctionOrClassName(node);
                 default:
                     return undefined;
             }
         }
         function getItemName(node, name) {
-            if (node.kind === 256 /* ModuleDeclaration */) {
+            if (node.kind === 257 /* ModuleDeclaration */) {
                 return cleanText(getModuleName(node));
             }
             if (name) {
@@ -127856,18 +131754,18 @@ var ts;
                 }
             }
             switch (node.kind) {
-                case 297 /* SourceFile */:
+                case 298 /* SourceFile */:
                     var sourceFile = node;
                     return ts.isExternalModule(sourceFile)
                         ? "\"" + ts.escapeString(ts.getBaseFileName(ts.removeFileExtension(ts.normalizePath(sourceFile.fileName)))) + "\""
                         : "<global>";
-                case 266 /* ExportAssignment */:
+                case 267 /* ExportAssignment */:
                     return ts.isExportAssignment(node) && node.isExportEquals ? "export=" /* ExportEquals */ : "default" /* Default */;
-                case 209 /* ArrowFunction */:
-                case 251 /* FunctionDeclaration */:
-                case 208 /* FunctionExpression */:
-                case 252 /* ClassDeclaration */:
-                case 221 /* ClassExpression */:
+                case 210 /* ArrowFunction */:
+                case 252 /* FunctionDeclaration */:
+                case 209 /* FunctionExpression */:
+                case 253 /* ClassDeclaration */:
+                case 222 /* ClassExpression */:
                     if (ts.getSyntacticModifierFlags(node) & 512 /* Default */) {
                         return "default";
                     }
@@ -127875,13 +131773,13 @@ var ts;
                     // (eg: "app\n.onactivated"), so we should remove the whitespace for readability in the
                     // navigation bar.
                     return getFunctionOrClassName(node);
-                case 166 /* Constructor */:
+                case 167 /* Constructor */:
                     return "constructor";
-                case 170 /* ConstructSignature */:
+                case 171 /* ConstructSignature */:
                     return "new()";
-                case 169 /* CallSignature */:
+                case 170 /* CallSignature */:
                     return "()";
-                case 171 /* IndexSignature */:
+                case 172 /* IndexSignature */:
                     return "[]";
                 default:
                     return "<unknown>";
@@ -127914,19 +131812,19 @@ var ts;
                 }
                 // Some nodes are otherwise important enough to always include in the primary navigation menu.
                 switch (navigationBarNodeKind(item)) {
-                    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 */:
+                    case 253 /* ClassDeclaration */:
+                    case 222 /* ClassExpression */:
+                    case 256 /* EnumDeclaration */:
+                    case 254 /* InterfaceDeclaration */:
+                    case 257 /* ModuleDeclaration */:
+                    case 298 /* SourceFile */:
+                    case 255 /* TypeAliasDeclaration */:
+                    case 335 /* JSDocTypedefTag */:
+                    case 328 /* JSDocCallbackTag */:
                         return true;
-                    case 209 /* ArrowFunction */:
-                    case 251 /* FunctionDeclaration */:
-                    case 208 /* FunctionExpression */:
+                    case 210 /* ArrowFunction */:
+                    case 252 /* FunctionDeclaration */:
+                    case 209 /* FunctionExpression */:
                         return isTopLevelFunctionDeclaration(item);
                     default:
                         return false;
@@ -127936,10 +131834,10 @@ var ts;
                         return false;
                     }
                     switch (navigationBarNodeKind(item.parent)) {
-                        case 257 /* ModuleBlock */:
-                        case 297 /* SourceFile */:
-                        case 165 /* MethodDeclaration */:
-                        case 166 /* Constructor */:
+                        case 258 /* ModuleBlock */:
+                        case 298 /* SourceFile */:
+                        case 166 /* MethodDeclaration */:
+                        case 167 /* Constructor */:
                             return true;
                         default:
                             return false;
@@ -127996,9 +131894,12 @@ var ts;
             if (ts.isAmbientModule(moduleDeclaration)) {
                 return ts.getTextOfNode(moduleDeclaration.name);
             }
+            return getFullyQualifiedModuleName(moduleDeclaration);
+        }
+        function getFullyQualifiedModuleName(moduleDeclaration) {
             // Otherwise, we need to aggregate each identifier to build up the qualified name.
             var result = [ts.getTextOfIdentifierOrLiteral(moduleDeclaration.name)];
-            while (moduleDeclaration.body && moduleDeclaration.body.kind === 256 /* ModuleDeclaration */) {
+            while (moduleDeclaration.body && moduleDeclaration.body.kind === 257 /* ModuleDeclaration */) {
                 moduleDeclaration = moduleDeclaration.body;
                 result.push(ts.getTextOfIdentifierOrLiteral(moduleDeclaration.name));
             }
@@ -128012,13 +131913,13 @@ var ts;
             return decl.body && ts.isModuleDeclaration(decl.body) ? getInteriorModule(decl.body) : decl;
         }
         function isComputedProperty(member) {
-            return !member.name || member.name.kind === 158 /* ComputedPropertyName */;
+            return !member.name || member.name.kind === 159 /* ComputedPropertyName */;
         }
         function getNodeSpan(node) {
-            return node.kind === 297 /* SourceFile */ ? ts.createTextSpanFromRange(node) : ts.createTextSpanFromNode(node, curSourceFile);
+            return node.kind === 298 /* SourceFile */ ? ts.createTextSpanFromRange(node) : ts.createTextSpanFromNode(node, curSourceFile);
         }
         function getModifiers(node) {
-            if (node.parent && node.parent.kind === 249 /* VariableDeclaration */) {
+            if (node.parent && node.parent.kind === 250 /* VariableDeclaration */) {
                 node = node.parent;
             }
             return ts.getNodeModifiers(node);
@@ -128076,9 +131977,9 @@ var ts;
         }
         function isFunctionOrClassExpression(node) {
             switch (node.kind) {
-                case 209 /* ArrowFunction */:
-                case 208 /* FunctionExpression */:
-                case 221 /* ClassExpression */:
+                case 210 /* ArrowFunction */:
+                case 209 /* FunctionExpression */:
+                case 222 /* ClassExpression */:
                     return true;
                 default:
                     return false;
@@ -128107,9 +132008,9 @@ var ts;
          *   2) Coalescing imports from the same module
          *   3) Sorting imports
          */
-        function organizeImports(sourceFile, formatContext, host, program, preferences) {
+        function organizeImports(sourceFile, formatContext, host, program, preferences, skipDestructiveCodeActions) {
             var changeTracker = ts.textChanges.ChangeTracker.fromContext({ host: host, formatContext: formatContext, preferences: preferences });
-            var coalesceAndOrganizeImports = function (importGroup) { return ts.stableSort(coalesceImports(removeUnusedImports(importGroup, sourceFile, program)), function (s1, s2) { return compareImportsOrRequireStatements(s1, s2); }); };
+            var coalesceAndOrganizeImports = function (importGroup) { return ts.stableSort(coalesceImports(removeUnusedImports(importGroup, sourceFile, program, skipDestructiveCodeActions)), function (s1, s2) { return compareImportsOrRequireStatements(s1, s2); }); };
             // All of the old ImportDeclarations in the file, in syntactic order.
             var topLevelImportDecls = sourceFile.statements.filter(ts.isImportDeclaration);
             organizeImportsWorker(topLevelImportDecls, coalesceAndOrganizeImports);
@@ -128144,26 +132045,35 @@ var ts;
                         ? coalesce(importGroup)
                         : importGroup;
                 });
-                // Delete or replace the first import.
+                // Delete all nodes if there are no imports.
                 if (newImportDecls.length === 0) {
-                    changeTracker.delete(sourceFile, oldImportDecls[0]);
+                    // Consider the first node to have trailingTrivia as we want to exclude the
+                    // "header" comment.
+                    changeTracker.deleteNodes(sourceFile, oldImportDecls, {
+                        trailingTriviaOption: ts.textChanges.TrailingTriviaOption.Include,
+                    }, /*hasTrailingComment*/ true);
                 }
                 else {
                     // Note: Delete the surrounding trivia because it will have been retained in newImportDecls.
-                    changeTracker.replaceNodeWithNodes(sourceFile, oldImportDecls[0], newImportDecls, {
+                    var replaceOptions = {
                         leadingTriviaOption: ts.textChanges.LeadingTriviaOption.Exclude,
                         trailingTriviaOption: ts.textChanges.TrailingTriviaOption.Include,
                         suffix: ts.getNewLineOrDefaultFromHost(host, formatContext.options),
-                    });
-                }
-                // Delete any subsequent imports.
-                for (var i = 1; i < oldImportDecls.length; i++) {
-                    changeTracker.deleteNode(sourceFile, oldImportDecls[i]);
+                    };
+                    changeTracker.replaceNodeWithNodes(sourceFile, oldImportDecls[0], newImportDecls, replaceOptions);
+                    var hasTrailingComment = changeTracker.nodeHasTrailingComment(sourceFile, oldImportDecls[0], replaceOptions);
+                    changeTracker.deleteNodes(sourceFile, oldImportDecls.slice(1), {
+                        trailingTriviaOption: ts.textChanges.TrailingTriviaOption.Include,
+                    }, hasTrailingComment);
                 }
             }
         }
         OrganizeImports.organizeImports = organizeImports;
-        function removeUnusedImports(oldImports, sourceFile, program) {
+        function removeUnusedImports(oldImports, sourceFile, program, skipDestructiveCodeActions) {
+            // As a precaution, consider unused import detection to be destructive (GH #43051)
+            if (skipDestructiveCodeActions) {
+                return oldImports;
+            }
             var typeChecker = program.getTypeChecker();
             var jsxNamespace = typeChecker.getJsxNamespace(sourceFile);
             var jsxFragmentFactory = typeChecker.getJsxFragmentFactory(sourceFile);
@@ -128434,11 +132344,11 @@ var ts;
         function getModuleSpecifierExpression(declaration) {
             var _a;
             switch (declaration.kind) {
-                case 260 /* ImportEqualsDeclaration */:
+                case 261 /* ImportEqualsDeclaration */:
                     return (_a = ts.tryCast(declaration.moduleReference, ts.isExternalModuleReference)) === null || _a === void 0 ? void 0 : _a.expression;
-                case 261 /* ImportDeclaration */:
+                case 262 /* ImportDeclaration */:
                     return declaration.moduleSpecifier;
-                case 232 /* VariableStatement */:
+                case 233 /* VariableStatement */:
                     return declaration.declarationList.declarations[0].initializer.arguments[0];
             }
         }
@@ -128477,19 +132387,19 @@ var ts;
         function getImportKindOrder(s1) {
             var _a;
             switch (s1.kind) {
-                case 261 /* ImportDeclaration */:
+                case 262 /* 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) === 263 /* NamespaceImport */)
+                    if (((_a = s1.importClause.namedBindings) === null || _a === void 0 ? void 0 : _a.kind) === 264 /* NamespaceImport */)
                         return 2;
                     if (s1.importClause.name)
                         return 3;
                     return 4;
-                case 260 /* ImportEqualsDeclaration */:
+                case 261 /* ImportEqualsDeclaration */:
                     return 5;
-                case 232 /* VariableStatement */:
+                case 233 /* VariableStatement */:
                     return 6;
             }
         }
@@ -128645,7 +132555,7 @@ var ts;
         }
         function getOutliningSpanForNode(n, sourceFile) {
             switch (n.kind) {
-                case 230 /* Block */:
+                case 231 /* Block */:
                     if (ts.isFunctionLike(n.parent)) {
                         return functionSpan(n.parent, n, sourceFile);
                     }
@@ -128653,16 +132563,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 235 /* DoStatement */:
-                        case 238 /* ForInStatement */:
-                        case 239 /* ForOfStatement */:
-                        case 237 /* ForStatement */:
-                        case 234 /* IfStatement */:
-                        case 236 /* WhileStatement */:
-                        case 243 /* WithStatement */:
-                        case 287 /* CatchClause */:
+                        case 236 /* DoStatement */:
+                        case 239 /* ForInStatement */:
+                        case 240 /* ForOfStatement */:
+                        case 238 /* ForStatement */:
+                        case 235 /* IfStatement */:
+                        case 237 /* WhileStatement */:
+                        case 244 /* WithStatement */:
+                        case 288 /* CatchClause */:
                             return spanForNode(n.parent);
-                        case 247 /* TryStatement */:
+                        case 248 /* TryStatement */:
                             // Could be the try-block, or the finally-block.
                             var tryStatement = n.parent;
                             if (tryStatement.tryBlock === n) {
@@ -128679,40 +132589,40 @@ var ts;
                             // the span of the block, independent of any parent span.
                             return createOutliningSpan(ts.createTextSpanFromNode(n, sourceFile), "code" /* Code */);
                     }
-                case 257 /* ModuleBlock */:
+                case 258 /* ModuleBlock */:
                     return spanForNode(n.parent);
-                case 252 /* ClassDeclaration */:
-                case 221 /* ClassExpression */:
-                case 253 /* InterfaceDeclaration */:
-                case 255 /* EnumDeclaration */:
-                case 258 /* CaseBlock */:
-                case 177 /* TypeLiteral */:
-                case 196 /* ObjectBindingPattern */:
+                case 253 /* ClassDeclaration */:
+                case 222 /* ClassExpression */:
+                case 254 /* InterfaceDeclaration */:
+                case 256 /* EnumDeclaration */:
+                case 259 /* CaseBlock */:
+                case 178 /* TypeLiteral */:
+                case 197 /* ObjectBindingPattern */:
                     return spanForNode(n);
-                case 179 /* TupleType */:
+                case 180 /* TupleType */:
                     return spanForNode(n, /*autoCollapse*/ false, /*useFullStart*/ !ts.isTupleTypeNode(n.parent), 22 /* OpenBracketToken */);
-                case 284 /* CaseClause */:
-                case 285 /* DefaultClause */:
+                case 285 /* CaseClause */:
+                case 286 /* DefaultClause */:
                     return spanForNodeArray(n.statements);
-                case 200 /* ObjectLiteralExpression */:
+                case 201 /* ObjectLiteralExpression */:
                     return spanForObjectOrArrayLiteral(n);
-                case 199 /* ArrayLiteralExpression */:
+                case 200 /* ArrayLiteralExpression */:
                     return spanForObjectOrArrayLiteral(n, 22 /* OpenBracketToken */);
-                case 273 /* JsxElement */:
+                case 274 /* JsxElement */:
                     return spanForJSXElement(n);
-                case 277 /* JsxFragment */:
+                case 278 /* JsxFragment */:
                     return spanForJSXFragment(n);
-                case 274 /* JsxSelfClosingElement */:
-                case 275 /* JsxOpeningElement */:
+                case 275 /* JsxSelfClosingElement */:
+                case 276 /* JsxOpeningElement */:
                     return spanForJSXAttributes(n.attributes);
-                case 218 /* TemplateExpression */:
+                case 219 /* TemplateExpression */:
                 case 14 /* NoSubstitutionTemplateLiteral */:
                     return spanForTemplateLiteral(n);
-                case 197 /* ArrayBindingPattern */:
+                case 198 /* ArrayBindingPattern */:
                     return spanForNode(n, /*autoCollapse*/ false, /*useFullStart*/ !ts.isBindingElement(n.parent), 22 /* OpenBracketToken */);
-                case 209 /* ArrowFunction */:
+                case 210 /* ArrowFunction */:
                     return spanForArrowFunction(n);
-                case 203 /* CallExpression */:
+                case 204 /* CallExpression */:
                     return spanForCallExpression(n);
             }
             function spanForCallExpression(node) {
@@ -128779,7 +132689,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 !== 209 /* ArrowFunction */);
+            return openToken && closeToken && spanBetweenTokens(openToken, closeToken, node, sourceFile, /*autoCollapse*/ node.kind !== 210 /* ArrowFunction */);
         }
         function spanBetweenTokens(openToken, closeToken, hintSpanNode, sourceFile, autoCollapse, useFullStart) {
             if (autoCollapse === void 0) { autoCollapse = false; }
@@ -129082,15 +132992,15 @@ var ts;
     // Assumes 'value' is already lowercase.
     function indexOfIgnoringCase(str, value) {
         var n = str.length - value.length;
-        var _loop_6 = function (start) {
+        var _loop_7 = function (start) {
             if (every(value, function (valueChar, i) { return toLowerCase(str.charCodeAt(i + start)) === valueChar; })) {
                 return { value: start };
             }
         };
         for (var start = 0; start <= n; start++) {
-            var state_1 = _loop_6(start);
-            if (typeof state_1 === "object")
-                return state_1.value;
+            var state_2 = _loop_7(start);
+            if (typeof state_2 === "object")
+                return state_2.value;
         }
         return -1;
     }
@@ -129642,7 +133552,7 @@ var ts;
         function getRenameInfo(program, sourceFile, position, options) {
             var node = ts.getAdjustedRenameLocation(ts.getTouchingPropertyName(sourceFile, position));
             if (nodeIsEligibleForRename(node)) {
-                var renameInfo = getRenameInfoForNode(node, program.getTypeChecker(), sourceFile, function (declaration) { return program.isSourceFileDefaultLibrary(declaration.getSourceFile()); }, options);
+                var renameInfo = getRenameInfoForNode(node, program.getTypeChecker(), sourceFile, program, options);
                 if (renameInfo) {
                     return renameInfo;
                 }
@@ -129650,7 +133560,7 @@ var ts;
             return getRenameInfoError(ts.Diagnostics.You_cannot_rename_this_element);
         }
         Rename.getRenameInfo = getRenameInfo;
-        function getRenameInfoForNode(node, typeChecker, sourceFile, isDefinedInLibraryFile, options) {
+        function getRenameInfoForNode(node, typeChecker, sourceFile, program, options) {
             var symbol = typeChecker.getSymbolAtLocation(node);
             if (!symbol) {
                 if (ts.isStringLiteralLike(node)) {
@@ -129670,7 +133580,7 @@ var ts;
             if (!declarations || declarations.length === 0)
                 return;
             // Disallow rename for elements that are defined in the standard TypeScript library.
-            if (declarations.some(isDefinedInLibraryFile)) {
+            if (declarations.some(function (declaration) { return isDefinedInLibraryFile(program, declaration); })) {
                 return getRenameInfoError(ts.Diagnostics.You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library);
             }
             // Cannot rename `default` as in `import { default as foo } from "./someModule";
@@ -129681,18 +133591,22 @@ 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 === 158 /* ComputedPropertyName */)
+            var specifierName = (ts.isImportOrExportSpecifierName(node) || ts.isStringOrNumericLiteralLike(node) && node.parent.kind === 159 /* ComputedPropertyName */)
                 ? ts.stripQuotes(ts.getTextOfIdentifierOrLiteral(node))
                 : undefined;
             var displayName = specifierName || typeChecker.symbolToString(symbol);
             var fullDisplayName = specifierName || typeChecker.getFullyQualifiedName(symbol);
             return getRenameInfoSuccess(displayName, fullDisplayName, kind, ts.SymbolDisplay.getSymbolModifiers(typeChecker, symbol), node, sourceFile);
         }
+        function isDefinedInLibraryFile(program, declaration) {
+            var sourceFile = declaration.getSourceFile();
+            return program.isSourceFileDefaultLibrary(sourceFile) && ts.fileExtensionIs(sourceFile.fileName, ".d.ts" /* Dts */);
+        }
         function getRenameInfoForModule(node, sourceFile, moduleSymbol) {
             if (!ts.isExternalModuleNameRelative(node.text)) {
                 return getRenameInfoError(ts.Diagnostics.You_cannot_rename_a_module_via_a_global_import);
             }
-            var moduleSourceFile = ts.find(moduleSymbol.declarations, ts.isSourceFile);
+            var moduleSourceFile = moduleSymbol.declarations && ts.find(moduleSymbol.declarations, ts.isSourceFile);
             if (!moduleSourceFile)
                 return undefined;
             var withoutIndex = ts.endsWith(node.text, "/index") || ts.endsWith(node.text, "/index.js") ? undefined : ts.tryRemoveSuffix(ts.removeFileExtension(moduleSourceFile.fileName), "/index");
@@ -129773,6 +133687,10 @@ var ts;
                     if (ts.getTokenPosOfNode(node, sourceFile, /*includeJsDoc*/ true) > pos) {
                         break outer;
                     }
+                    var comment = ts.singleOrUndefined(ts.getTrailingCommentRanges(sourceFile.text, node.end));
+                    if (comment && comment.kind === 2 /* SingleLineCommentTrivia */) {
+                        pushSelectionCommentRange(comment.pos, comment.end);
+                    }
                     if (positionShouldSnapToNode(sourceFile, pos, node)) {
                         // 1. Blocks are effectively redundant with SyntaxLists.
                         // 2. TemplateSpans, along with the SyntaxLists containing them, are a somewhat unintuitive grouping
@@ -129835,6 +133753,14 @@ var ts;
                     }
                 }
             }
+            function pushSelectionCommentRange(start, end) {
+                pushSelectionRange(start, end);
+                var pos = start;
+                while (sourceFile.text.charCodeAt(pos) === 47 /* slash */) {
+                    pos++;
+                }
+                pushSelectionRange(pos, end);
+            }
         }
         SmartSelectionRange.getSmartSelectionRange = getSmartSelectionRange;
         /**
@@ -129898,7 +133824,7 @@ var ts;
                 var groupedWithBrackets = groupChildren(groupedWithPlusMinusTokens, function (_a) {
                     var kind = _a.kind;
                     return kind === 22 /* OpenBracketToken */ ||
-                        kind === 159 /* TypeParameter */ ||
+                        kind === 160 /* TypeParameter */ ||
                         kind === 23 /* CloseBracketToken */;
                 });
                 return [
@@ -130012,22 +133938,22 @@ var ts;
             return kind === 18 /* OpenBraceToken */
                 || kind === 22 /* OpenBracketToken */
                 || kind === 20 /* OpenParenToken */
-                || kind === 275 /* JsxOpeningElement */;
+                || kind === 276 /* JsxOpeningElement */;
         }
         function isListCloser(token) {
             var kind = token && token.kind;
             return kind === 19 /* CloseBraceToken */
                 || kind === 23 /* CloseBracketToken */
                 || kind === 21 /* CloseParenToken */
-                || kind === 276 /* JsxClosingElement */;
+                || kind === 277 /* JsxClosingElement */;
         }
         function getEndPos(sourceFile, node) {
             switch (node.kind) {
-                case 326 /* JSDocParameterTag */:
-                case 324 /* JSDocCallbackTag */:
-                case 333 /* JSDocPropertyTag */:
-                case 331 /* JSDocTypedefTag */:
-                case 328 /* JSDocThisTag */:
+                case 330 /* JSDocParameterTag */:
+                case 328 /* JSDocCallbackTag */:
+                case 337 /* JSDocPropertyTag */:
+                case 335 /* JSDocTypedefTag */:
+                case 332 /* JSDocThisTag */:
                     return sourceFile.getLineEndOfPosition(node.getStart());
                 default:
                     return node.getEnd();
@@ -130237,10 +134163,10 @@ var ts;
                 }
                 return undefined;
             }
-            else if (ts.isTemplateHead(node) && parent.parent.kind === 205 /* TaggedTemplateExpression */) {
+            else if (ts.isTemplateHead(node) && parent.parent.kind === 206 /* TaggedTemplateExpression */) {
                 var templateExpression = parent;
                 var tagExpression = templateExpression.parent;
-                ts.Debug.assert(templateExpression.kind === 218 /* TemplateExpression */);
+                ts.Debug.assert(templateExpression.kind === 219 /* TemplateExpression */);
                 var argumentIndex = ts.isInsideTemplateLiteral(node, position, sourceFile) ? 0 : 1;
                 return getArgumentListInfoForTemplate(tagExpression, argumentIndex, sourceFile);
             }
@@ -130309,17 +134235,17 @@ var ts;
                 return undefined;
             var parent = startingToken.parent;
             switch (parent.kind) {
-                case 207 /* ParenthesizedExpression */:
-                case 165 /* MethodDeclaration */:
-                case 208 /* FunctionExpression */:
-                case 209 /* ArrowFunction */:
+                case 208 /* ParenthesizedExpression */:
+                case 166 /* MethodDeclaration */:
+                case 209 /* FunctionExpression */:
+                case 210 /* 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 216 /* BinaryExpression */: {
+                case 217 /* BinaryExpression */: {
                     var highestBinary = getHighestBinary(parent);
                     var contextualType_1 = checker.getContextualType(highestBinary);
                     var argumentIndex_1 = startingToken.kind === 20 /* OpenParenToken */ ? 0 : countBinaryExpressionParameters(parent) - 1;
@@ -130443,7 +134369,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 === 218 /* TemplateExpression */) {
+            if (template.kind === 219 /* TemplateExpression */) {
                 var lastSpan = ts.last(template.templateSpans);
                 if (lastSpan.literal.getFullWidth() === 0) {
                     applicableSpanEnd = ts.skipTrivia(sourceFile.text, applicableSpanEnd, /*stopAfterLineBreak*/ false);
@@ -130452,7 +134378,7 @@ var ts;
             return ts.createTextSpan(applicableSpanStart, applicableSpanEnd - applicableSpanStart);
         }
         function getContainingArgumentInfo(node, position, sourceFile, checker, isManuallyInvoked) {
-            var _loop_7 = function (n) {
+            var _loop_8 = function (n) {
                 // If the node is not a subspan of its parent, this is a big problem.
                 // There have been crashes that might be caused by this violation.
                 ts.Debug.assert(ts.rangeContainsRange(n.parent, n), "Not a subspan", function () { return "Child: " + ts.Debug.formatSyntaxKind(n.kind) + ", parent: " + ts.Debug.formatSyntaxKind(n.parent.kind); });
@@ -130462,9 +134388,9 @@ var ts;
                 }
             };
             for (var n = node; !ts.isSourceFile(n) && (isManuallyInvoked || !ts.isBlock(n)); n = n.parent) {
-                var state_2 = _loop_7(n);
-                if (typeof state_2 === "object")
-                    return state_2.value;
+                var state_3 = _loop_8(n);
+                if (typeof state_3 === "object")
+                    return state_3.value;
             }
             return undefined;
         }
@@ -130541,7 +134467,7 @@ var ts;
             var printer = ts.createPrinter({ removeComments: true });
             var parameters = typeParameters.map(function (t) { return createSignatureHelpParameterForTypeParameter(t, checker, enclosingDeclaration, sourceFile, printer); });
             var documentation = symbol.getDocumentationComment(checker);
-            var tags = symbol.getJsDocTags();
+            var tags = symbol.getJsDocTags(checker);
             var prefixDisplayParts = __spreadArray(__spreadArray([], typeSymbolDisplay), [ts.punctuationPart(29 /* LessThanToken */)]);
             return { isVariadic: false, prefixDisplayParts: prefixDisplayParts, suffixDisplayParts: [ts.punctuationPart(31 /* GreaterThanToken */)], separatorDisplayParts: separatorDisplayParts, parameters: parameters, documentation: documentation, tags: tags };
         }
@@ -130826,7 +134752,7 @@ var ts;
                     diags.push(ts.createDiagnosticForNode(node.name || node, ts.Diagnostics.JSDoc_types_may_be_moved_to_TypeScript_types));
                 }
             }
-            if (ts.isFunctionLikeDeclaration(node)) {
+            if (canBeConvertedToAsync(node)) {
                 addConvertToAsyncFunctionDiagnostics(node, checker, diags);
             }
             node.forEachChild(check);
@@ -130837,11 +134763,11 @@ var ts;
     function containsTopLevelCommonjs(sourceFile) {
         return sourceFile.statements.some(function (statement) {
             switch (statement.kind) {
-                case 232 /* VariableStatement */:
+                case 233 /* VariableStatement */:
                     return statement.declarationList.declarations.some(function (decl) {
                         return !!decl.initializer && ts.isRequireCall(propertyAccessLeftHandSide(decl.initializer), /*checkArgumentIsStringLiteralLike*/ true);
                     });
-                case 233 /* ExpressionStatement */: {
+                case 234 /* ExpressionStatement */: {
                     var expression = statement.expression;
                     if (!ts.isBinaryExpression(expression))
                         return ts.isRequireCall(expression, /*checkArgumentIsStringLiteralLike*/ true);
@@ -130858,12 +134784,12 @@ var ts;
     }
     function importNameForConvertToDefaultImport(node) {
         switch (node.kind) {
-            case 261 /* ImportDeclaration */:
+            case 262 /* ImportDeclaration */:
                 var importClause = node.importClause, moduleSpecifier = node.moduleSpecifier;
-                return importClause && !importClause.name && importClause.namedBindings && importClause.namedBindings.kind === 263 /* NamespaceImport */ && ts.isStringLiteral(moduleSpecifier)
+                return importClause && !importClause.name && importClause.namedBindings && importClause.namedBindings.kind === 264 /* NamespaceImport */ && ts.isStringLiteral(moduleSpecifier)
                     ? importClause.namedBindings.name
                     : undefined;
-            case 260 /* ImportEqualsDeclaration */:
+            case 261 /* ImportEqualsDeclaration */:
                 return node.name;
             default:
                 return undefined;
@@ -130883,11 +134809,11 @@ var ts;
             returnsPromise(node, checker);
     }
     function returnsPromise(node, checker) {
-        var functionType = checker.getTypeAtLocation(node);
-        var callSignatures = checker.getSignaturesOfType(functionType, 0 /* Call */);
-        var returnType = callSignatures.length ? checker.getReturnTypeOfSignature(callSignatures[0]) : undefined;
+        var signature = checker.getSignatureFromDeclaration(node);
+        var returnType = signature ? checker.getReturnTypeOfSignature(signature) : undefined;
         return !!returnType && !!checker.getPromisedTypeOfPromise(returnType);
     }
+    ts.returnsPromise = returnsPromise;
     function getErrorNodeFromCommonJsIndicator(commonJsModuleIndicator) {
         return ts.isBinaryExpression(commonJsModuleIndicator) ? commonJsModuleIndicator.left : commonJsModuleIndicator;
     }
@@ -130932,15 +134858,15 @@ var ts;
     // should be kept up to date with getTransformationBody in convertToAsyncFunction.ts
     function isFixablePromiseArgument(arg, checker) {
         switch (arg.kind) {
-            case 251 /* FunctionDeclaration */:
-            case 208 /* FunctionExpression */:
-            case 209 /* ArrowFunction */:
+            case 252 /* FunctionDeclaration */:
+            case 209 /* FunctionExpression */:
+            case 210 /* ArrowFunction */:
                 visitedNestedConvertibleFunctions.set(getKeyFromNode(arg), true);
             // falls through
             case 103 /* NullKeyword */:
                 return true;
             case 78 /* Identifier */:
-            case 201 /* PropertyAccessExpression */: {
+            case 202 /* PropertyAccessExpression */: {
                 var symbol = checker.getSymbolAtLocation(arg);
                 if (!symbol) {
                     return false;
@@ -130957,18 +134883,30 @@ var ts;
     }
     function canBeConvertedToClass(node, checker) {
         var _a, _b, _c, _d;
-        if (node.kind === 208 /* FunctionExpression */) {
+        if (node.kind === 209 /* FunctionExpression */) {
             if (ts.isVariableDeclaration(node.parent) && ((_a = node.symbol.members) === null || _a === void 0 ? void 0 : _a.size)) {
                 return true;
             }
             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 === 251 /* FunctionDeclaration */) {
+        if (node.kind === 252 /* FunctionDeclaration */) {
             return !!((_d = node.symbol.members) === null || _d === void 0 ? void 0 : _d.size);
         }
         return false;
     }
+    function canBeConvertedToAsync(node) {
+        switch (node.kind) {
+            case 252 /* FunctionDeclaration */:
+            case 166 /* MethodDeclaration */:
+            case 209 /* FunctionExpression */:
+            case 210 /* ArrowFunction */:
+                return true;
+            default:
+                return false;
+        }
+    }
+    ts.canBeConvertedToAsync = canBeConvertedToAsync;
 })(ts || (ts = {}));
 /* @internal */
 var ts;
@@ -130984,7 +134922,7 @@ var ts;
             }
             var flags = ts.getCombinedLocalAndExportSymbolFlags(symbol);
             if (flags & 32 /* Class */) {
-                return ts.getDeclarationOfKind(symbol, 221 /* ClassExpression */) ?
+                return ts.getDeclarationOfKind(symbol, 222 /* ClassExpression */) ?
                     "local class" /* localClassElement */ : "class" /* classElement */;
             }
             if (flags & 384 /* Enum */)
@@ -131068,11 +135006,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 275 /* JsxOpeningElement */:
-                    case 273 /* JsxElement */:
-                    case 274 /* JsxSelfClosingElement */:
+                    case 276 /* JsxOpeningElement */:
+                    case 274 /* JsxElement */:
+                    case 275 /* JsxSelfClosingElement */:
                         return location.kind === 78 /* Identifier */ ? "property" /* memberVariableElement */ : "JSX attribute" /* jsxAttribute */;
-                    case 280 /* JsxAttribute */:
+                    case 281 /* JsxAttribute */:
                         return "JSX attribute" /* jsxAttribute */;
                     default:
                         return "property" /* memberVariableElement */;
@@ -131118,6 +135056,7 @@ var ts;
         SymbolDisplay.getSymbolModifiers = getSymbolModifiers;
         // TODO(drosen): Currently completion entry details passes the SemanticMeaning.All instead of using semanticMeaning of location
         function getSymbolDisplayPartsDocumentationAndSymbolKind(typeChecker, symbol, sourceFile, enclosingDeclaration, location, semanticMeaning, alias) {
+            var _a;
             if (semanticMeaning === void 0) { semanticMeaning = ts.getMeaningFromLocation(location); }
             var displayParts = [];
             var documentation = [];
@@ -131141,8 +135080,8 @@ var ts;
                     symbolKind = "property" /* memberVariableElement */;
                 }
                 var signature = void 0;
-                type = isThisExpression ? typeChecker.getTypeAtLocation(location) : typeChecker.getTypeOfSymbolAtLocation(symbol.exportSymbol || symbol, location);
-                if (location.parent && location.parent.kind === 201 /* PropertyAccessExpression */) {
+                type = isThisExpression ? typeChecker.getTypeAtLocation(location) : typeChecker.getTypeOfSymbolAtLocation(symbol, location);
+                if (location.parent && location.parent.kind === 202 /* 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)) {
@@ -131162,9 +135101,9 @@ var ts;
                 }
                 if (callExpressionLike) {
                     signature = typeChecker.getResolvedSignature(callExpressionLike); // TODO: GH#18217
-                    var useConstructSignatures = callExpressionLike.kind === 204 /* NewExpression */ || (ts.isCallExpression(callExpressionLike) && callExpressionLike.expression.kind === 105 /* SuperKeyword */);
+                    var useConstructSignatures = callExpressionLike.kind === 205 /* 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)) {
+                    if (signature && !ts.contains(allSignatures, signature.target) && !ts.contains(allSignatures, signature)) {
                         // Get the first signature if there is one -- allSignatures may contain
                         // either the original signature or its target, so check for either
                         signature = allSignatures.length ? allSignatures[0] : undefined;
@@ -131226,7 +135165,7 @@ var ts;
                     }
                 }
                 else if ((ts.isNameOfFunctionDeclaration(location) && !(symbolFlags & 98304 /* Accessor */)) || // name of function declaration
-                    (location.kind === 132 /* ConstructorKeyword */ && location.parent.kind === 166 /* Constructor */)) { // At constructor keyword of constructor declaration
+                    (location.kind === 132 /* ConstructorKeyword */ && location.parent.kind === 167 /* 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
@@ -131234,24 +135173,26 @@ var ts;
                         return declaration === (location.kind === 132 /* ConstructorKeyword */ ? functionDeclaration_1.parent : functionDeclaration_1);
                     });
                     if (locationIsSymbolDeclaration) {
-                        var allSignatures = functionDeclaration_1.kind === 166 /* Constructor */ ? type.getNonNullableType().getConstructSignatures() : type.getNonNullableType().getCallSignatures();
+                        var allSignatures = functionDeclaration_1.kind === 167 /* 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 === 166 /* Constructor */) {
+                        if (functionDeclaration_1.kind === 167 /* Constructor */) {
                             // show (constructor) Type(...) signature
                             symbolKind = "constructor" /* constructorImplementationElement */;
                             addPrefixForAnyFunctionOrVar(type.symbol, symbolKind);
                         }
                         else {
                             // (function/method) symbol(..signature)
-                            addPrefixForAnyFunctionOrVar(functionDeclaration_1.kind === 169 /* CallSignature */ &&
+                            addPrefixForAnyFunctionOrVar(functionDeclaration_1.kind === 170 /* CallSignature */ &&
                                 !(type.symbol.flags & 2048 /* TypeLiteral */ || type.symbol.flags & 4096 /* ObjectLiteral */) ? type.symbol : symbol, symbolKind);
                         }
-                        addSignatureDisplayParts(signature, allSignatures);
+                        if (signature) {
+                            addSignatureDisplayParts(signature, allSignatures);
+                        }
                         hasAddedSymbolInfo = true;
                         hasMultipleSignatures = allSignatures.length > 1;
                     }
@@ -131259,7 +135200,7 @@ var ts;
             }
             if (symbolFlags & 32 /* Class */ && !hasAddedSymbolInfo && !isThisExpression) {
                 addAliasPrefixIfNecessary();
-                if (ts.getDeclarationOfKind(symbol, 221 /* ClassExpression */)) {
+                if (ts.getDeclarationOfKind(symbol, 222 /* 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>
@@ -131303,7 +135244,7 @@ var ts;
             }
             if (symbolFlags & 1536 /* Module */ && !isThisExpression) {
                 prefixNextMeaning();
-                var declaration = ts.getDeclarationOfKind(symbol, 256 /* ModuleDeclaration */);
+                var declaration = ts.getDeclarationOfKind(symbol, 257 /* ModuleDeclaration */);
                 var isNamespace = declaration && declaration.name && declaration.name.kind === 78 /* Identifier */;
                 displayParts.push(ts.keywordPart(isNamespace ? 140 /* NamespaceKeyword */ : 139 /* ModuleKeyword */));
                 displayParts.push(ts.spacePart());
@@ -131324,7 +135265,7 @@ var ts;
                 }
                 else {
                     // Method/function type parameter
-                    var decl = ts.getDeclarationOfKind(symbol, 159 /* TypeParameter */);
+                    var decl = ts.getDeclarationOfKind(symbol, 160 /* TypeParameter */);
                     if (decl === undefined)
                         return ts.Debug.fail();
                     var declaration = decl.parent;
@@ -131332,16 +135273,16 @@ var ts;
                         if (ts.isFunctionLikeKind(declaration.kind)) {
                             addInPrefix();
                             var signature = typeChecker.getSignatureFromDeclaration(declaration); // TODO: GH#18217
-                            if (declaration.kind === 170 /* ConstructSignature */) {
+                            if (declaration.kind === 171 /* ConstructSignature */) {
                                 displayParts.push(ts.keywordPart(102 /* NewKeyword */));
                                 displayParts.push(ts.spacePart());
                             }
-                            else if (declaration.kind !== 169 /* CallSignature */ && declaration.name) {
+                            else if (declaration.kind !== 170 /* CallSignature */ && declaration.name) {
                                 addFullSymbolName(declaration.symbol);
                             }
                             ts.addRange(displayParts, ts.signatureToDisplayParts(typeChecker, signature, sourceFile, 32 /* WriteTypeArgumentsOfSignature */));
                         }
-                        else if (declaration.kind === 254 /* TypeAliasDeclaration */) {
+                        else if (declaration.kind === 255 /* TypeAliasDeclaration */) {
                             // Type alias type parameter
                             // For example
                             //      type list<T> = T[]; // Both T will go through same code path
@@ -131357,8 +135298,8 @@ var ts;
             if (symbolFlags & 8 /* EnumMember */) {
                 symbolKind = "enum member" /* enumMemberElement */;
                 addPrefixForAnyFunctionOrVar(symbol, "enum member");
-                var declaration = symbol.declarations[0];
-                if (declaration.kind === 291 /* EnumMember */) {
+                var declaration = (_a = symbol.declarations) === null || _a === void 0 ? void 0 : _a[0];
+                if ((declaration === null || declaration === void 0 ? void 0 : declaration.kind) === 292 /* EnumMember */) {
                     var constantValue = typeChecker.getConstantValue(declaration);
                     if (constantValue !== undefined) {
                         displayParts.push(ts.spacePart());
@@ -131388,31 +135329,33 @@ var ts;
                         }
                         else {
                             documentationFromAlias = resolvedSymbol.getContextualDocumentationComment(resolvedNode, typeChecker);
-                            tagsFromAlias = resolvedSymbol.getJsDocTags();
+                            tagsFromAlias = resolvedSymbol.getJsDocTags(typeChecker);
                         }
                     }
                 }
-                switch (symbol.declarations[0].kind) {
-                    case 259 /* NamespaceExportDeclaration */:
-                        displayParts.push(ts.keywordPart(92 /* ExportKeyword */));
-                        displayParts.push(ts.spacePart());
-                        displayParts.push(ts.keywordPart(140 /* NamespaceKeyword */));
-                        break;
-                    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 270 /* ExportSpecifier */:
-                        displayParts.push(ts.keywordPart(92 /* ExportKeyword */));
-                        break;
-                    default:
-                        displayParts.push(ts.keywordPart(99 /* ImportKeyword */));
+                if (symbol.declarations) {
+                    switch (symbol.declarations[0].kind) {
+                        case 260 /* NamespaceExportDeclaration */:
+                            displayParts.push(ts.keywordPart(92 /* ExportKeyword */));
+                            displayParts.push(ts.spacePart());
+                            displayParts.push(ts.keywordPart(140 /* NamespaceKeyword */));
+                            break;
+                        case 267 /* 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 271 /* ExportSpecifier */:
+                            displayParts.push(ts.keywordPart(92 /* ExportKeyword */));
+                            break;
+                        default:
+                            displayParts.push(ts.keywordPart(99 /* ImportKeyword */));
+                    }
                 }
                 displayParts.push(ts.spacePart());
                 addFullSymbolName(symbol);
                 ts.forEach(symbol.declarations, function (declaration) {
-                    if (declaration.kind === 260 /* ImportEqualsDeclaration */) {
+                    if (declaration.kind === 261 /* ImportEqualsDeclaration */) {
                         var importEqualsDeclaration = declaration;
                         if (ts.isExternalModuleImportEqualsDeclaration(importEqualsDeclaration)) {
                             displayParts.push(ts.spacePart());
@@ -131499,10 +135442,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 === 297 /* SourceFile */; })) {
-                    for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
-                        var declaration = _a[_i];
-                        if (!declaration.parent || declaration.parent.kind !== 216 /* BinaryExpression */) {
+                if (symbol.parent && symbol.declarations && ts.forEach(symbol.parent.declarations, function (declaration) { return declaration.kind === 298 /* SourceFile */; })) {
+                    for (var _i = 0, _b = symbol.declarations; _i < _b.length; _i++) {
+                        var declaration = _b[_i];
+                        if (!declaration.parent || declaration.parent.kind !== 217 /* BinaryExpression */) {
                             continue;
                         }
                         var rhsSymbol = typeChecker.getSymbolAtLocation(declaration.parent.right);
@@ -131510,7 +135453,7 @@ var ts;
                             continue;
                         }
                         documentation = rhsSymbol.getDocumentationComment(typeChecker);
-                        tags = rhsSymbol.getJsDocTags();
+                        tags = rhsSymbol.getJsDocTags(typeChecker);
                         if (documentation.length > 0) {
                             break;
                         }
@@ -131518,7 +135461,7 @@ var ts;
                 }
             }
             if (tags.length === 0 && !hasMultipleSignatures) {
-                tags = symbol.getJsDocTags();
+                tags = symbol.getJsDocTags(typeChecker);
             }
             if (documentation.length === 0 && documentationFromAlias) {
                 documentation = documentationFromAlias;
@@ -131620,16 +135563,16 @@ var ts;
             }
             return ts.forEach(symbol.declarations, function (declaration) {
                 // Function expressions are local
-                if (declaration.kind === 208 /* FunctionExpression */) {
+                if (declaration.kind === 209 /* FunctionExpression */) {
                     return true;
                 }
-                if (declaration.kind !== 249 /* VariableDeclaration */ && declaration.kind !== 251 /* FunctionDeclaration */) {
+                if (declaration.kind !== 250 /* VariableDeclaration */ && declaration.kind !== 252 /* 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 === 297 /* SourceFile */ || parent.kind === 257 /* ModuleBlock */) {
+                    if (parent.kind === 298 /* SourceFile */ || parent.kind === 258 /* ModuleBlock */) {
                         return false;
                     }
                 }
@@ -131735,7 +135678,7 @@ var ts;
             return typeof o.type === "object" && !ts.forEachEntry(o.type, function (v) { return typeof v !== "number"; });
         });
         options = ts.cloneCompilerOptions(options);
-        var _loop_8 = function (opt) {
+        var _loop_9 = function (opt) {
             if (!ts.hasProperty(options, opt.name)) {
                 return "continue";
             }
@@ -131754,7 +135697,7 @@ var ts;
         };
         for (var _i = 0, commandLineOptionsStringToEnum_1 = commandLineOptionsStringToEnum; _i < commandLineOptionsStringToEnum_1.length; _i++) {
             var opt = commandLineOptionsStringToEnum_1[_i];
-            _loop_8(opt);
+            _loop_9(opt);
         }
         return options;
     }
@@ -131930,10 +135873,10 @@ var ts;
             function shouldRescanJsxIdentifier(node) {
                 if (node.parent) {
                     switch (node.parent.kind) {
-                        case 280 /* JsxAttribute */:
-                        case 275 /* JsxOpeningElement */:
-                        case 276 /* JsxClosingElement */:
-                        case 274 /* JsxSelfClosingElement */:
+                        case 281 /* JsxAttribute */:
+                        case 276 /* JsxOpeningElement */:
+                        case 277 /* JsxClosingElement */:
+                        case 275 /* 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 */;
                     }
@@ -131941,14 +135884,7 @@ var ts;
                 return false;
             }
             function shouldRescanJsxText(node) {
-                var isJSXText = ts.isJsxText(node);
-                if (isJSXText) {
-                    var containingElement = ts.findAncestor(node.parent, function (p) { return ts.isJsxElement(p); });
-                    if (!containingElement)
-                        return false; // should never happen
-                    return !ts.isParenthesizedExpression(containingElement.parent);
-                }
-                return false;
+                return ts.isJsxText(node);
             }
             function shouldRescanSlashToken(container) {
                 return container.kind === 13 /* RegularExpressionLiteral */;
@@ -132045,7 +135981,7 @@ var ts;
                         return scanner.scanJsxIdentifier();
                     case 5 /* RescanJsxText */:
                         lastScanAction = 5 /* RescanJsxText */;
-                        return scanner.reScanJsxToken();
+                        return scanner.reScanJsxToken(/* allowMultilineJsxText */ false);
                     case 6 /* RescanJsxAttributeValue */:
                         lastScanAction = 6 /* RescanJsxAttributeValue */;
                         return scanner.reScanJsxAttributeValue();
@@ -132134,7 +136070,7 @@ var ts;
     (function (formatting) {
         function getAllRules() {
             var allTokens = [];
-            for (var token = 0 /* FirstToken */; token <= 156 /* LastToken */; token++) {
+            for (var token = 0 /* FirstToken */; token <= 157 /* LastToken */; token++) {
                 if (token !== 1 /* EndOfFileToken */) {
                     allTokens.push(token);
                 }
@@ -132149,9 +136085,9 @@ var ts;
             var anyToken = { tokens: allTokens, isSpecific: false };
             var anyTokenIncludingMultilineComments = tokenRangeFrom(__spreadArray(__spreadArray([], allTokens), [3 /* MultiLineCommentTrivia */]));
             var anyTokenIncludingEOF = tokenRangeFrom(__spreadArray(__spreadArray([], allTokens), [1 /* EndOfFileToken */]));
-            var keywords = tokenRangeFromRange(80 /* FirstKeyword */, 156 /* LastKeyword */);
+            var keywords = tokenRangeFromRange(80 /* FirstKeyword */, 157 /* LastKeyword */);
             var binaryOperators = tokenRangeFromRange(29 /* FirstBinaryOperator */, 77 /* LastBinaryOperator */);
-            var binaryKeywordOperators = [100 /* InKeyword */, 101 /* InstanceOfKeyword */, 156 /* OfKeyword */, 126 /* AsKeyword */, 137 /* IsKeyword */];
+            var binaryKeywordOperators = [100 /* InKeyword */, 101 /* InstanceOfKeyword */, 157 /* 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 */,
@@ -132462,51 +136398,51 @@ var ts;
             return function (context) { return !context.options || !context.options.hasOwnProperty(optionName) || !!context.options[optionName]; };
         }
         function isForContext(context) {
-            return context.contextNode.kind === 237 /* ForStatement */;
+            return context.contextNode.kind === 238 /* ForStatement */;
         }
         function isNotForContext(context) {
             return !isForContext(context);
         }
         function isBinaryOpContext(context) {
             switch (context.contextNode.kind) {
-                case 216 /* BinaryExpression */:
+                case 217 /* BinaryExpression */:
                     return context.contextNode.operatorToken.kind !== 27 /* CommaToken */;
-                case 217 /* ConditionalExpression */:
-                case 184 /* ConditionalType */:
-                case 224 /* AsExpression */:
-                case 270 /* ExportSpecifier */:
-                case 265 /* ImportSpecifier */:
-                case 172 /* TypePredicate */:
-                case 182 /* UnionType */:
-                case 183 /* IntersectionType */:
+                case 218 /* ConditionalExpression */:
+                case 185 /* ConditionalType */:
+                case 225 /* AsExpression */:
+                case 271 /* ExportSpecifier */:
+                case 266 /* ImportSpecifier */:
+                case 173 /* TypePredicate */:
+                case 183 /* UnionType */:
+                case 184 /* IntersectionType */:
                     return true;
                 // equals in binding elements: function foo([[x, y] = [1, 2]])
-                case 198 /* BindingElement */:
+                case 199 /* BindingElement */:
                 // equals in type X = ...
                 // falls through
-                case 254 /* TypeAliasDeclaration */:
+                case 255 /* TypeAliasDeclaration */:
                 // equal in import a = module('a');
                 // falls through
-                case 260 /* ImportEqualsDeclaration */:
+                case 261 /* ImportEqualsDeclaration */:
                 // equal in let a = 0
                 // falls through
-                case 249 /* VariableDeclaration */:
+                case 250 /* VariableDeclaration */:
                 // equal in p = 0
                 // falls through
-                case 160 /* Parameter */:
-                case 291 /* EnumMember */:
-                case 163 /* PropertyDeclaration */:
-                case 162 /* PropertySignature */:
+                case 161 /* Parameter */:
+                case 292 /* EnumMember */:
+                case 164 /* PropertyDeclaration */:
+                case 163 /* PropertySignature */:
                     return context.currentTokenSpan.kind === 62 /* EqualsToken */ || context.nextTokenSpan.kind === 62 /* EqualsToken */;
                 // "in" keyword in for (let x in []) { }
-                case 238 /* ForInStatement */:
+                case 239 /* ForInStatement */:
                 // "in" keyword in [P in keyof T]: T[P]
                 // falls through
-                case 159 /* TypeParameter */:
+                case 160 /* 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 239 /* ForOfStatement */:
-                    return context.currentTokenSpan.kind === 156 /* OfKeyword */ || context.nextTokenSpan.kind === 156 /* OfKeyword */;
+                case 240 /* ForOfStatement */:
+                    return context.currentTokenSpan.kind === 157 /* OfKeyword */ || context.nextTokenSpan.kind === 157 /* OfKeyword */;
             }
             return false;
         }
@@ -132518,22 +136454,22 @@ var ts;
         }
         function isTypeAnnotationContext(context) {
             var contextKind = context.contextNode.kind;
-            return contextKind === 163 /* PropertyDeclaration */ ||
-                contextKind === 162 /* PropertySignature */ ||
-                contextKind === 160 /* Parameter */ ||
-                contextKind === 249 /* VariableDeclaration */ ||
+            return contextKind === 164 /* PropertyDeclaration */ ||
+                contextKind === 163 /* PropertySignature */ ||
+                contextKind === 161 /* Parameter */ ||
+                contextKind === 250 /* VariableDeclaration */ ||
                 ts.isFunctionLikeKind(contextKind);
         }
         function isConditionalOperatorContext(context) {
-            return context.contextNode.kind === 217 /* ConditionalExpression */ ||
-                context.contextNode.kind === 184 /* ConditionalType */;
+            return context.contextNode.kind === 218 /* ConditionalExpression */ ||
+                context.contextNode.kind === 185 /* ConditionalType */;
         }
         function isSameLineTokenOrBeforeBlockContext(context) {
             return context.TokensAreOnSameLine() || isBeforeBlockContext(context);
         }
         function isBraceWrappedContext(context) {
-            return context.contextNode.kind === 196 /* ObjectBindingPattern */ ||
-                context.contextNode.kind === 190 /* MappedType */ ||
+            return context.contextNode.kind === 197 /* ObjectBindingPattern */ ||
+                context.contextNode.kind === 191 /* MappedType */ ||
                 isSingleLineBlockContext(context);
         }
         // This check is done before an open brace in a control construct, a function, or a typescript block declaration
@@ -132559,34 +136495,34 @@ var ts;
                 return true;
             }
             switch (node.kind) {
-                case 230 /* Block */:
-                case 258 /* CaseBlock */:
-                case 200 /* ObjectLiteralExpression */:
-                case 257 /* ModuleBlock */:
+                case 231 /* Block */:
+                case 259 /* CaseBlock */:
+                case 201 /* ObjectLiteralExpression */:
+                case 258 /* ModuleBlock */:
                     return true;
             }
             return false;
         }
         function isFunctionDeclContext(context) {
             switch (context.contextNode.kind) {
-                case 251 /* FunctionDeclaration */:
-                case 165 /* MethodDeclaration */:
-                case 164 /* MethodSignature */:
+                case 252 /* FunctionDeclaration */:
+                case 166 /* MethodDeclaration */:
+                case 165 /* MethodSignature */:
                 // case SyntaxKind.MemberFunctionDeclaration:
                 // falls through
-                case 167 /* GetAccessor */:
-                case 168 /* SetAccessor */:
+                case 168 /* GetAccessor */:
+                case 169 /* SetAccessor */:
                 // case SyntaxKind.MethodSignature:
                 // falls through
-                case 169 /* CallSignature */:
-                case 208 /* FunctionExpression */:
-                case 166 /* Constructor */:
-                case 209 /* ArrowFunction */:
+                case 170 /* CallSignature */:
+                case 209 /* FunctionExpression */:
+                case 167 /* Constructor */:
+                case 210 /* ArrowFunction */:
                 // case SyntaxKind.ConstructorDeclaration:
                 // case SyntaxKind.SimpleArrowFunctionExpression:
                 // case SyntaxKind.ParenthesizedArrowFunctionExpression:
                 // falls through
-                case 253 /* InterfaceDeclaration */: // This one is not truly a function, but for formatting purposes, it acts just like one
+                case 254 /* InterfaceDeclaration */: // This one is not truly a function, but for formatting purposes, it acts just like one
                     return true;
             }
             return false;
@@ -132595,40 +136531,40 @@ var ts;
             return !isFunctionDeclContext(context);
         }
         function isFunctionDeclarationOrFunctionExpressionContext(context) {
-            return context.contextNode.kind === 251 /* FunctionDeclaration */ || context.contextNode.kind === 208 /* FunctionExpression */;
+            return context.contextNode.kind === 252 /* FunctionDeclaration */ || context.contextNode.kind === 209 /* FunctionExpression */;
         }
         function isTypeScriptDeclWithBlockContext(context) {
             return nodeIsTypeScriptDeclWithBlockContext(context.contextNode);
         }
         function nodeIsTypeScriptDeclWithBlockContext(node) {
             switch (node.kind) {
-                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 */:
+                case 253 /* ClassDeclaration */:
+                case 222 /* ClassExpression */:
+                case 254 /* InterfaceDeclaration */:
+                case 256 /* EnumDeclaration */:
+                case 178 /* TypeLiteral */:
+                case 257 /* ModuleDeclaration */:
+                case 268 /* ExportDeclaration */:
+                case 269 /* NamedExports */:
+                case 262 /* ImportDeclaration */:
+                case 265 /* NamedImports */:
                     return true;
             }
             return false;
         }
         function isAfterCodeBlockContext(context) {
             switch (context.currentTokenParent.kind) {
-                case 252 /* ClassDeclaration */:
-                case 256 /* ModuleDeclaration */:
-                case 255 /* EnumDeclaration */:
-                case 287 /* CatchClause */:
-                case 257 /* ModuleBlock */:
-                case 244 /* SwitchStatement */:
+                case 253 /* ClassDeclaration */:
+                case 257 /* ModuleDeclaration */:
+                case 256 /* EnumDeclaration */:
+                case 288 /* CatchClause */:
+                case 258 /* ModuleBlock */:
+                case 245 /* SwitchStatement */:
                     return true;
-                case 230 /* Block */: {
+                case 231 /* 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 !== 209 /* ArrowFunction */ && blockParent.kind !== 208 /* FunctionExpression */) {
+                    if (!blockParent || blockParent.kind !== 210 /* ArrowFunction */ && blockParent.kind !== 209 /* FunctionExpression */) {
                         return true;
                     }
                 }
@@ -132637,32 +136573,32 @@ var ts;
         }
         function isControlDeclContext(context) {
             switch (context.contextNode.kind) {
-                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 */:
+                case 235 /* IfStatement */:
+                case 245 /* SwitchStatement */:
+                case 238 /* ForStatement */:
+                case 239 /* ForInStatement */:
+                case 240 /* ForOfStatement */:
+                case 237 /* WhileStatement */:
+                case 248 /* TryStatement */:
+                case 236 /* DoStatement */:
+                case 244 /* WithStatement */:
                 // TODO
                 // case SyntaxKind.ElseClause:
                 // falls through
-                case 287 /* CatchClause */:
+                case 288 /* CatchClause */:
                     return true;
                 default:
                     return false;
             }
         }
         function isObjectContext(context) {
-            return context.contextNode.kind === 200 /* ObjectLiteralExpression */;
+            return context.contextNode.kind === 201 /* ObjectLiteralExpression */;
         }
         function isFunctionCallContext(context) {
-            return context.contextNode.kind === 203 /* CallExpression */;
+            return context.contextNode.kind === 204 /* CallExpression */;
         }
         function isNewContext(context) {
-            return context.contextNode.kind === 204 /* NewExpression */;
+            return context.contextNode.kind === 205 /* NewExpression */;
         }
         function isFunctionCallOrNewContext(context) {
             return isFunctionCallContext(context) || isNewContext(context);
@@ -132677,10 +136613,10 @@ var ts;
             return context.nextTokenSpan.kind !== 21 /* CloseParenToken */;
         }
         function isArrowFunctionContext(context) {
-            return context.contextNode.kind === 209 /* ArrowFunction */;
+            return context.contextNode.kind === 210 /* ArrowFunction */;
         }
         function isImportTypeContext(context) {
-            return context.contextNode.kind === 195 /* ImportType */;
+            return context.contextNode.kind === 196 /* ImportType */;
         }
         function isNonJsxSameLineTokenContext(context) {
             return context.TokensAreOnSameLine() && context.contextNode.kind !== 11 /* JsxText */;
@@ -132689,19 +136625,19 @@ var ts;
             return context.contextNode.kind !== 11 /* JsxText */;
         }
         function isNonJsxElementOrFragmentContext(context) {
-            return context.contextNode.kind !== 273 /* JsxElement */ && context.contextNode.kind !== 277 /* JsxFragment */;
+            return context.contextNode.kind !== 274 /* JsxElement */ && context.contextNode.kind !== 278 /* JsxFragment */;
         }
         function isJsxExpressionContext(context) {
-            return context.contextNode.kind === 283 /* JsxExpression */ || context.contextNode.kind === 282 /* JsxSpreadAttribute */;
+            return context.contextNode.kind === 284 /* JsxExpression */ || context.contextNode.kind === 283 /* JsxSpreadAttribute */;
         }
         function isNextTokenParentJsxAttribute(context) {
-            return context.nextTokenParent.kind === 280 /* JsxAttribute */;
+            return context.nextTokenParent.kind === 281 /* JsxAttribute */;
         }
         function isJsxAttributeContext(context) {
-            return context.contextNode.kind === 280 /* JsxAttribute */;
+            return context.contextNode.kind === 281 /* JsxAttribute */;
         }
         function isJsxSelfClosingElementContext(context) {
-            return context.contextNode.kind === 274 /* JsxSelfClosingElement */;
+            return context.contextNode.kind === 275 /* JsxSelfClosingElement */;
         }
         function isNotBeforeBlockInFunctionDeclarationContext(context) {
             return !isFunctionDeclContext(context) && !isBeforeBlockContext(context);
@@ -132716,45 +136652,45 @@ var ts;
             while (ts.isExpressionNode(node)) {
                 node = node.parent;
             }
-            return node.kind === 161 /* Decorator */;
+            return node.kind === 162 /* Decorator */;
         }
         function isStartOfVariableDeclarationList(context) {
-            return context.currentTokenParent.kind === 250 /* VariableDeclarationList */ &&
+            return context.currentTokenParent.kind === 251 /* VariableDeclarationList */ &&
                 context.currentTokenParent.getStart(context.sourceFile) === context.currentTokenSpan.pos;
         }
         function isNotFormatOnEnter(context) {
             return context.formattingRequestKind !== 2 /* FormatOnEnter */;
         }
         function isModuleDeclContext(context) {
-            return context.contextNode.kind === 256 /* ModuleDeclaration */;
+            return context.contextNode.kind === 257 /* ModuleDeclaration */;
         }
         function isObjectTypeContext(context) {
-            return context.contextNode.kind === 177 /* TypeLiteral */; // && context.contextNode.parent.kind !== SyntaxKind.InterfaceDeclaration;
+            return context.contextNode.kind === 178 /* TypeLiteral */; // && context.contextNode.parent.kind !== SyntaxKind.InterfaceDeclaration;
         }
         function isConstructorSignatureContext(context) {
-            return context.contextNode.kind === 170 /* ConstructSignature */;
+            return context.contextNode.kind === 171 /* ConstructSignature */;
         }
         function isTypeArgumentOrParameterOrAssertion(token, parent) {
             if (token.kind !== 29 /* LessThanToken */ && token.kind !== 31 /* GreaterThanToken */) {
                 return false;
             }
             switch (parent.kind) {
-                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 */:
+                case 174 /* TypeReference */:
+                case 207 /* TypeAssertionExpression */:
+                case 255 /* TypeAliasDeclaration */:
+                case 253 /* ClassDeclaration */:
+                case 222 /* ClassExpression */:
+                case 254 /* InterfaceDeclaration */:
+                case 252 /* FunctionDeclaration */:
+                case 209 /* FunctionExpression */:
+                case 210 /* ArrowFunction */:
+                case 166 /* MethodDeclaration */:
+                case 165 /* MethodSignature */:
+                case 170 /* CallSignature */:
+                case 171 /* ConstructSignature */:
+                case 204 /* CallExpression */:
+                case 205 /* NewExpression */:
+                case 224 /* ExpressionWithTypeArguments */:
                     return true;
                 default:
                     return false;
@@ -132765,28 +136701,28 @@ var ts;
                 isTypeArgumentOrParameterOrAssertion(context.nextTokenSpan, context.nextTokenParent);
         }
         function isTypeAssertionContext(context) {
-            return context.contextNode.kind === 206 /* TypeAssertionExpression */;
+            return context.contextNode.kind === 207 /* TypeAssertionExpression */;
         }
         function isVoidOpContext(context) {
-            return context.currentTokenSpan.kind === 113 /* VoidKeyword */ && context.currentTokenParent.kind === 212 /* VoidExpression */;
+            return context.currentTokenSpan.kind === 113 /* VoidKeyword */ && context.currentTokenParent.kind === 213 /* VoidExpression */;
         }
         function isYieldOrYieldStarWithOperand(context) {
-            return context.contextNode.kind === 219 /* YieldExpression */ && context.contextNode.expression !== undefined;
+            return context.contextNode.kind === 220 /* YieldExpression */ && context.contextNode.expression !== undefined;
         }
         function isNonNullAssertionContext(context) {
-            return context.contextNode.kind === 225 /* NonNullExpression */;
+            return context.contextNode.kind === 226 /* NonNullExpression */;
         }
         function isNotStatementConditionContext(context) {
             return !isStatementConditionContext(context);
         }
         function isStatementConditionContext(context) {
             switch (context.contextNode.kind) {
-                case 234 /* IfStatement */:
-                case 237 /* ForStatement */:
-                case 238 /* ForInStatement */:
-                case 239 /* ForOfStatement */:
-                case 235 /* DoStatement */:
-                case 236 /* WhileStatement */:
+                case 235 /* IfStatement */:
+                case 238 /* ForStatement */:
+                case 239 /* ForInStatement */:
+                case 240 /* ForOfStatement */:
+                case 236 /* DoStatement */:
+                case 237 /* WhileStatement */:
                     return true;
                 default:
                     return false;
@@ -132811,12 +136747,12 @@ var ts;
                 return nextTokenKind === 19 /* CloseBraceToken */
                     || nextTokenKind === 1 /* EndOfFileToken */;
             }
-            if (nextTokenKind === 229 /* SemicolonClassElement */ ||
+            if (nextTokenKind === 230 /* SemicolonClassElement */ ||
                 nextTokenKind === 26 /* SemicolonToken */) {
                 return false;
             }
-            if (context.contextNode.kind === 253 /* InterfaceDeclaration */ ||
-                context.contextNode.kind === 254 /* TypeAliasDeclaration */) {
+            if (context.contextNode.kind === 254 /* InterfaceDeclaration */ ||
+                context.contextNode.kind === 255 /* TypeAliasDeclaration */) {
                 // Can’t remove semicolon after `foo`; it would parse as a method declaration:
                 //
                 // interface I {
@@ -132830,9 +136766,9 @@ var ts;
             if (ts.isPropertyDeclaration(context.currentTokenParent)) {
                 return !context.currentTokenParent.initializer;
             }
-            return context.currentTokenParent.kind !== 237 /* ForStatement */
-                && context.currentTokenParent.kind !== 231 /* EmptyStatement */
-                && context.currentTokenParent.kind !== 229 /* SemicolonClassElement */
+            return context.currentTokenParent.kind !== 238 /* ForStatement */
+                && context.currentTokenParent.kind !== 232 /* EmptyStatement */
+                && context.currentTokenParent.kind !== 230 /* SemicolonClassElement */
                 && nextTokenKind !== 22 /* OpenBracketToken */
                 && nextTokenKind !== 20 /* OpenParenToken */
                 && nextTokenKind !== 39 /* PlusToken */
@@ -132840,7 +136776,7 @@ var ts;
                 && nextTokenKind !== 43 /* SlashToken */
                 && nextTokenKind !== 13 /* RegularExpressionLiteral */
                 && nextTokenKind !== 27 /* CommaToken */
-                && nextTokenKind !== 218 /* TemplateExpression */
+                && nextTokenKind !== 219 /* TemplateExpression */
                 && nextTokenKind !== 15 /* TemplateHead */
                 && nextTokenKind !== 14 /* NoSubstitutionTemplateLiteral */
                 && nextTokenKind !== 24 /* DotToken */;
@@ -132931,12 +136867,12 @@ var ts;
             return map;
         }
         function getRuleBucketIndex(row, column) {
-            ts.Debug.assert(row <= 156 /* LastKeyword */ && column <= 156 /* LastKeyword */, "Must compute formatting context from tokens");
+            ts.Debug.assert(row <= 157 /* LastKeyword */ && column <= 157 /* LastKeyword */, "Must compute formatting context from tokens");
             return (row * mapRowLength) + column;
         }
         var maskBitSize = 5;
         var mask = 31; // MaskBitSize bits
-        var mapRowLength = 156 /* LastToken */ + 1;
+        var mapRowLength = 157 /* LastToken */ + 1;
         var RulesPosition;
         (function (RulesPosition) {
             RulesPosition[RulesPosition["StopRulesSpecific"] = 0] = "StopRulesSpecific";
@@ -133124,17 +137060,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 252 /* ClassDeclaration */:
-                case 253 /* InterfaceDeclaration */:
+                case 253 /* ClassDeclaration */:
+                case 254 /* InterfaceDeclaration */:
                     return ts.rangeContainsRange(parent.members, node);
-                case 256 /* ModuleDeclaration */:
+                case 257 /* ModuleDeclaration */:
                     var body = parent.body;
-                    return !!body && body.kind === 257 /* ModuleBlock */ && ts.rangeContainsRange(body.statements, node);
-                case 297 /* SourceFile */:
-                case 230 /* Block */:
-                case 257 /* ModuleBlock */:
+                    return !!body && body.kind === 258 /* ModuleBlock */ && ts.rangeContainsRange(body.statements, node);
+                case 298 /* SourceFile */:
+                case 231 /* Block */:
+                case 258 /* ModuleBlock */:
                     return ts.rangeContainsRange(parent.statements, node);
-                case 287 /* CatchClause */:
+                case 288 /* CatchClause */:
                     return ts.rangeContainsRange(parent.block.statements, node);
             }
             return false;
@@ -133363,19 +137299,19 @@ var ts;
                     return node.modifiers[0].kind;
                 }
                 switch (node.kind) {
-                    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 */:
+                    case 253 /* ClassDeclaration */: return 83 /* ClassKeyword */;
+                    case 254 /* InterfaceDeclaration */: return 117 /* InterfaceKeyword */;
+                    case 252 /* FunctionDeclaration */: return 97 /* FunctionKeyword */;
+                    case 256 /* EnumDeclaration */: return 256 /* EnumDeclaration */;
+                    case 168 /* GetAccessor */: return 134 /* GetKeyword */;
+                    case 169 /* SetAccessor */: return 146 /* SetKeyword */;
+                    case 166 /* MethodDeclaration */:
                         if (node.asteriskToken) {
                             return 41 /* AsteriskToken */;
                         }
                     // falls through
-                    case 163 /* PropertyDeclaration */:
-                    case 160 /* Parameter */:
+                    case 164 /* PropertyDeclaration */:
+                    case 161 /* Parameter */:
                         var name = ts.getNameOfDeclaration(node);
                         if (name) {
                             return name.kind;
@@ -133432,16 +137368,16 @@ var ts;
                         case 43 /* SlashToken */:
                         case 31 /* GreaterThanToken */:
                             switch (container.kind) {
-                                case 275 /* JsxOpeningElement */:
-                                case 276 /* JsxClosingElement */:
-                                case 274 /* JsxSelfClosingElement */:
-                                case 223 /* ExpressionWithTypeArguments */:
+                                case 276 /* JsxOpeningElement */:
+                                case 277 /* JsxClosingElement */:
+                                case 275 /* JsxSelfClosingElement */:
+                                case 224 /* ExpressionWithTypeArguments */:
                                     return false;
                             }
                             break;
                         case 22 /* OpenBracketToken */:
                         case 23 /* CloseBracketToken */:
-                            if (container.kind !== 190 /* MappedType */) {
+                            if (container.kind !== 191 /* MappedType */) {
                                 return false;
                             }
                             break;
@@ -133486,11 +137422,6 @@ var ts;
                     if (tokenInfo.token.end > node.end) {
                         break;
                     }
-                    if (node.kind === 11 /* JsxText */) {
-                        // Intentation rules for jsx text are handled by `indentMultilineCommentOrJsxText` inside `processChildNode`; just fastforward past it here
-                        formattingScanner.advance();
-                        continue;
-                    }
                     consumeTokenAndAdvanceScanner(tokenInfo, node, nodeDynamicIndentation, node);
                 }
                 if (!node.parent && formattingScanner.isOnEOF()) {
@@ -133549,27 +137480,11 @@ var ts;
                             return inheritedIndentation;
                         }
                     }
-                    var effectiveParentStartLine = child.kind === 161 /* Decorator */ ? childStartLine : undecoratedParentStartLine;
+                    var effectiveParentStartLine = child.kind === 162 /* Decorator */ ? childStartLine : undecoratedParentStartLine;
                     var childIndentation = computeIndentation(child, childStartLine, childIndentationAmount, node, parentDynamicIndentation, effectiveParentStartLine);
                     processNode(child, childContextNode, childStartLine, undecoratedChildStartLine, childIndentation.indentation, childIndentation.delta);
-                    if (child.kind === 11 /* JsxText */) {
-                        var range = { pos: child.getStart(), end: child.getEnd() };
-                        if (range.pos !== range.end) { // don't indent zero-width jsx text
-                            var siblings = parent.getChildren(sourceFile);
-                            var currentIndex = ts.findIndex(siblings, function (arg) { return arg.pos === child.pos; });
-                            var previousNode = siblings[currentIndex - 1];
-                            if (previousNode) {
-                                // The jsx text needs no indentation whatsoever if it ends on the same line the previous sibling ends on
-                                if (sourceFile.getLineAndCharacterOfPosition(range.end).line !== sourceFile.getLineAndCharacterOfPosition(previousNode.end).line) {
-                                    // The first line is (already) "indented" if the text starts on the same line as the previous sibling element ends on
-                                    var firstLineIsIndented = sourceFile.getLineAndCharacterOfPosition(range.pos).line === sourceFile.getLineAndCharacterOfPosition(previousNode.end).line;
-                                    indentMultilineCommentOrJsxText(range, childIndentation.indentation, firstLineIsIndented, /*indentFinalLine*/ false, /*jsxStyle*/ true);
-                                }
-                            }
-                        }
-                    }
                     childContextNode = node;
-                    if (isFirstListItem && parent.kind === 199 /* ArrayLiteralExpression */ && inheritedIndentation === -1 /* Unknown */) {
+                    if (isFirstListItem && parent.kind === 200 /* ArrayLiteralExpression */ && inheritedIndentation === -1 /* Unknown */) {
                         inheritedIndentation = childIndentation.indentation;
                     }
                     return inheritedIndentation;
@@ -133693,7 +137608,7 @@ var ts;
                     switch (triviaItem.kind) {
                         case 3 /* MultiLineCommentTrivia */:
                             if (triviaInRange) {
-                                indentMultilineCommentOrJsxText(triviaItem, commentIndentation, /*firstLineIsIndented*/ !indentNextTokenOrTrivia);
+                                indentMultilineComment(triviaItem, commentIndentation, /*firstLineIsIndented*/ !indentNextTokenOrTrivia);
                             }
                             indentNextTokenOrTrivia = false;
                             break;
@@ -133810,7 +137725,7 @@ var ts;
             function indentationIsDifferent(indentationString, startLinePosition) {
                 return indentationString !== sourceFile.text.substr(startLinePosition, indentationString.length);
             }
-            function indentMultilineCommentOrJsxText(commentRange, indentation, firstLineIsIndented, indentFinalLine, jsxTextStyleIndent) {
+            function indentMultilineComment(commentRange, indentation, firstLineIsIndented, indentFinalLine) {
                 if (indentFinalLine === void 0) { indentFinalLine = true; }
                 // split comment in lines
                 var startLine = sourceFile.getLineAndCharacterOfPosition(commentRange.pos).line;
@@ -133848,13 +137763,6 @@ var ts;
                     var nonWhitespaceCharacterAndColumn = i === 0
                         ? nonWhitespaceColumnInFirstPart
                         : formatting.SmartIndenter.findFirstNonWhitespaceCharacterAndColumn(parts[i].pos, parts[i].end, sourceFile, options);
-                    if (jsxTextStyleIndent) {
-                        // skip adding indentation to blank lines
-                        if (ts.isLineBreak(sourceFile.text.charCodeAt(ts.getStartPositionOfLine(startLine, sourceFile))))
-                            continue;
-                        // reset delta on every line
-                        delta = indentation - nonWhitespaceCharacterAndColumn.column;
-                    }
                     var newIndentation = nonWhitespaceCharacterAndColumn.column + delta;
                     if (newIndentation > 0) {
                         var indentationString = getIndentationString(newIndentation, options);
@@ -134009,12 +137917,12 @@ var ts;
         formatting.getRangeOfEnclosingComment = getRangeOfEnclosingComment;
         function getOpenTokenForList(node, list) {
             switch (node.kind) {
-                case 166 /* Constructor */:
-                case 251 /* FunctionDeclaration */:
-                case 208 /* FunctionExpression */:
-                case 165 /* MethodDeclaration */:
-                case 164 /* MethodSignature */:
-                case 209 /* ArrowFunction */:
+                case 167 /* Constructor */:
+                case 252 /* FunctionDeclaration */:
+                case 209 /* FunctionExpression */:
+                case 166 /* MethodDeclaration */:
+                case 165 /* MethodSignature */:
+                case 210 /* ArrowFunction */:
                     if (node.typeParameters === list) {
                         return 29 /* LessThanToken */;
                     }
@@ -134022,8 +137930,8 @@ var ts;
                         return 20 /* OpenParenToken */;
                     }
                     break;
-                case 203 /* CallExpression */:
-                case 204 /* NewExpression */:
+                case 204 /* CallExpression */:
+                case 205 /* NewExpression */:
                     if (node.typeArguments === list) {
                         return 29 /* LessThanToken */;
                     }
@@ -134031,12 +137939,12 @@ var ts;
                         return 20 /* OpenParenToken */;
                     }
                     break;
-                case 173 /* TypeReference */:
+                case 174 /* TypeReference */:
                     if (node.typeArguments === list) {
                         return 29 /* LessThanToken */;
                     }
                     break;
-                case 177 /* TypeLiteral */:
+                case 178 /* TypeLiteral */:
                     return 18 /* OpenBraceToken */;
             }
             return 0 /* Unknown */;
@@ -134154,7 +138062,7 @@ var ts;
                 if (options.indentStyle === ts.IndentStyle.Block) {
                     return getBlockIndent(sourceFile, position, options);
                 }
-                if (precedingToken.kind === 27 /* CommaToken */ && precedingToken.parent.kind !== 216 /* BinaryExpression */) {
+                if (precedingToken.kind === 27 /* CommaToken */ && precedingToken.parent.kind !== 217 /* 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 */) {
@@ -134327,7 +138235,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 === 297 /* SourceFile */ || !parentAndChildShareLine);
+                    (parent.kind === 298 /* SourceFile */ || !parentAndChildShareLine);
                 if (!useActualIndentation) {
                     return -1 /* Unknown */;
                 }
@@ -134375,7 +138283,7 @@ var ts;
             }
             SmartIndenter.isArgumentAndStartLineOverlapsExpressionBeingCalled = isArgumentAndStartLineOverlapsExpressionBeingCalled;
             function childStartsOnTheSameLineWithElseInIfStatement(parent, child, childStartLine, sourceFile) {
-                if (parent.kind === 234 /* IfStatement */ && parent.elseStatement === child) {
+                if (parent.kind === 235 /* IfStatement */ && parent.elseStatement === child) {
                     var elseKeyword = ts.findChildOfKind(parent, 90 /* ElseKeyword */, sourceFile);
                     ts.Debug.assert(elseKeyword !== undefined);
                     var elseKeywordStartLine = getStartLineAndCharacterForNode(elseKeyword, sourceFile).line;
@@ -134456,40 +138364,40 @@ var ts;
             }
             function getListByRange(start, end, node, sourceFile) {
                 switch (node.kind) {
-                    case 173 /* TypeReference */:
+                    case 174 /* TypeReference */:
                         return getList(node.typeArguments);
-                    case 200 /* ObjectLiteralExpression */:
+                    case 201 /* ObjectLiteralExpression */:
                         return getList(node.properties);
-                    case 199 /* ArrayLiteralExpression */:
+                    case 200 /* ArrayLiteralExpression */:
                         return getList(node.elements);
-                    case 177 /* TypeLiteral */:
+                    case 178 /* TypeLiteral */:
                         return getList(node.members);
-                    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 */:
+                    case 252 /* FunctionDeclaration */:
+                    case 209 /* FunctionExpression */:
+                    case 210 /* ArrowFunction */:
+                    case 166 /* MethodDeclaration */:
+                    case 165 /* MethodSignature */:
+                    case 170 /* CallSignature */:
+                    case 167 /* Constructor */:
+                    case 176 /* ConstructorType */:
+                    case 171 /* ConstructSignature */:
                         return getList(node.typeParameters) || getList(node.parameters);
-                    case 252 /* ClassDeclaration */:
-                    case 221 /* ClassExpression */:
-                    case 253 /* InterfaceDeclaration */:
-                    case 254 /* TypeAliasDeclaration */:
-                    case 330 /* JSDocTemplateTag */:
+                    case 253 /* ClassDeclaration */:
+                    case 222 /* ClassExpression */:
+                    case 254 /* InterfaceDeclaration */:
+                    case 255 /* TypeAliasDeclaration */:
+                    case 334 /* JSDocTemplateTag */:
                         return getList(node.typeParameters);
-                    case 204 /* NewExpression */:
-                    case 203 /* CallExpression */:
+                    case 205 /* NewExpression */:
+                    case 204 /* CallExpression */:
                         return getList(node.typeArguments) || getList(node.arguments);
-                    case 250 /* VariableDeclarationList */:
+                    case 251 /* VariableDeclarationList */:
                         return getList(node.declarations);
-                    case 264 /* NamedImports */:
-                    case 268 /* NamedExports */:
+                    case 265 /* NamedImports */:
+                    case 269 /* NamedExports */:
                         return getList(node.elements);
-                    case 196 /* ObjectBindingPattern */:
-                    case 197 /* ArrayBindingPattern */:
+                    case 197 /* ObjectBindingPattern */:
+                    case 198 /* ArrayBindingPattern */:
                         return getList(node.elements);
                 }
                 function getList(list) {
@@ -134512,7 +138420,7 @@ var ts;
                 return findColumnForFirstNonWhitespaceCharacterInLine(sourceFile.getLineAndCharacterOfPosition(list.pos), sourceFile, options);
             }
             function getActualIndentationForListItem(node, sourceFile, options, listIndentsChild) {
-                if (node.parent && node.parent.kind === 250 /* VariableDeclarationList */) {
+                if (node.parent && node.parent.kind === 251 /* VariableDeclarationList */) {
                     // VariableDeclarationList has no wrapping tokens
                     return -1 /* Unknown */;
                 }
@@ -134585,91 +138493,91 @@ var ts;
             function nodeWillIndentChild(settings, parent, child, sourceFile, indentByDefault) {
                 var childKind = child ? child.kind : 0 /* Unknown */;
                 switch (parent.kind) {
-                    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 */:
+                    case 234 /* ExpressionStatement */:
+                    case 253 /* ClassDeclaration */:
+                    case 222 /* ClassExpression */:
+                    case 254 /* InterfaceDeclaration */:
+                    case 256 /* EnumDeclaration */:
+                    case 255 /* TypeAliasDeclaration */:
+                    case 200 /* ArrayLiteralExpression */:
+                    case 231 /* Block */:
+                    case 258 /* ModuleBlock */:
+                    case 201 /* ObjectLiteralExpression */:
+                    case 178 /* TypeLiteral */:
+                    case 191 /* MappedType */:
+                    case 180 /* TupleType */:
+                    case 259 /* CaseBlock */:
+                    case 286 /* DefaultClause */:
+                    case 285 /* CaseClause */:
+                    case 208 /* ParenthesizedExpression */:
+                    case 202 /* PropertyAccessExpression */:
+                    case 204 /* CallExpression */:
+                    case 205 /* NewExpression */:
+                    case 233 /* VariableStatement */:
+                    case 267 /* ExportAssignment */:
+                    case 243 /* ReturnStatement */:
+                    case 218 /* ConditionalExpression */:
+                    case 198 /* ArrayBindingPattern */:
+                    case 197 /* ObjectBindingPattern */:
+                    case 276 /* JsxOpeningElement */:
+                    case 279 /* JsxOpeningFragment */:
+                    case 275 /* JsxSelfClosingElement */:
+                    case 284 /* JsxExpression */:
+                    case 165 /* MethodSignature */:
+                    case 170 /* CallSignature */:
+                    case 171 /* ConstructSignature */:
+                    case 161 /* Parameter */:
+                    case 175 /* FunctionType */:
+                    case 176 /* ConstructorType */:
+                    case 187 /* ParenthesizedType */:
+                    case 206 /* TaggedTemplateExpression */:
+                    case 214 /* AwaitExpression */:
+                    case 269 /* NamedExports */:
+                    case 265 /* NamedImports */:
+                    case 271 /* ExportSpecifier */:
+                    case 266 /* ImportSpecifier */:
+                    case 164 /* PropertyDeclaration */:
                         return true;
-                    case 249 /* VariableDeclaration */:
-                    case 288 /* PropertyAssignment */:
-                    case 216 /* BinaryExpression */:
-                        if (!settings.indentMultiLineObjectLiteralBeginningOnBlankLine && sourceFile && childKind === 200 /* ObjectLiteralExpression */) { // TODO: GH#18217
+                    case 250 /* VariableDeclaration */:
+                    case 289 /* PropertyAssignment */:
+                    case 217 /* BinaryExpression */:
+                        if (!settings.indentMultiLineObjectLiteralBeginningOnBlankLine && sourceFile && childKind === 201 /* ObjectLiteralExpression */) { // TODO: GH#18217
                             return rangeIsOnOneLine(sourceFile, child);
                         }
-                        if (parent.kind !== 216 /* BinaryExpression */) {
+                        if (parent.kind !== 217 /* BinaryExpression */) {
                             return true;
                         }
                         break;
-                    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 */) {
+                    case 236 /* DoStatement */:
+                    case 237 /* WhileStatement */:
+                    case 239 /* ForInStatement */:
+                    case 240 /* ForOfStatement */:
+                    case 238 /* ForStatement */:
+                    case 235 /* IfStatement */:
+                    case 252 /* FunctionDeclaration */:
+                    case 209 /* FunctionExpression */:
+                    case 166 /* MethodDeclaration */:
+                    case 167 /* Constructor */:
+                    case 168 /* GetAccessor */:
+                    case 169 /* SetAccessor */:
+                        return childKind !== 231 /* Block */;
+                    case 210 /* ArrowFunction */:
+                        if (sourceFile && childKind === 208 /* 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 childKind !== 231 /* Block */;
+                    case 268 /* ExportDeclaration */:
+                        return childKind !== 269 /* NamedExports */;
+                    case 262 /* ImportDeclaration */:
+                        return childKind !== 263 /* ImportClause */ ||
+                            (!!child.namedBindings && child.namedBindings.kind !== 265 /* NamedImports */);
+                    case 274 /* JsxElement */:
+                        return childKind !== 277 /* JsxClosingElement */;
+                    case 278 /* JsxFragment */:
+                        return childKind !== 280 /* JsxClosingFragment */;
+                    case 184 /* IntersectionType */:
+                    case 183 /* UnionType */:
+                        if (childKind === 178 /* TypeLiteral */ || childKind === 180 /* TupleType */) {
                             return false;
                         }
                         break;
@@ -134680,11 +138588,11 @@ var ts;
             SmartIndenter.nodeWillIndentChild = nodeWillIndentChild;
             function isControlFlowEndingStatement(kind, parent) {
                 switch (kind) {
-                    case 242 /* ReturnStatement */:
-                    case 246 /* ThrowStatement */:
-                    case 240 /* ContinueStatement */:
-                    case 241 /* BreakStatement */:
-                        return parent.kind !== 230 /* Block */;
+                    case 243 /* ReturnStatement */:
+                    case 247 /* ThrowStatement */:
+                    case 241 /* ContinueStatement */:
+                    case 242 /* BreakStatement */:
+                        return parent.kind !== 231 /* Block */;
                     default:
                         return false;
                 }
@@ -134792,7 +138700,9 @@ var ts;
         function getAdjustedRange(sourceFile, startNode, endNode, options) {
             return { pos: getAdjustedStartPosition(sourceFile, startNode, options), end: getAdjustedEndPosition(sourceFile, endNode, options) };
         }
-        function getAdjustedStartPosition(sourceFile, node, options) {
+        function getAdjustedStartPosition(sourceFile, node, options, hasTrailingComment) {
+            var _a, _b;
+            if (hasTrailingComment === void 0) { hasTrailingComment = false; }
             var leadingTriviaOption = options.leadingTriviaOption;
             if (leadingTriviaOption === LeadingTriviaOption.Exclude) {
                 return node.getStart(sourceFile);
@@ -134823,6 +138733,15 @@ var ts;
                 // when b is deleted - we delete it
                 return leadingTriviaOption === LeadingTriviaOption.IncludeAll ? fullStart : start;
             }
+            // if node has a trailing comments, use comment end position as the text has already been included.
+            if (hasTrailingComment) {
+                // Check first for leading comments as if the node is the first import, we want to exclude the trivia;
+                // otherwise we get the trailing comments.
+                var comment = ((_a = ts.getLeadingCommentRanges(sourceFile.text, fullStart)) === null || _a === void 0 ? void 0 : _a[0]) || ((_b = ts.getTrailingCommentRanges(sourceFile.text, fullStart)) === null || _b === void 0 ? void 0 : _b[0]);
+                if (comment) {
+                    return ts.skipTrivia(sourceFile.text, comment.end, /*stopAfterLineBreak*/ true, /*stopAtComments*/ true);
+                }
+            }
             // get start position of the line following the line that contains fullstart position
             // (but only if the fullstart isn't the very beginning of the file)
             var nextLineStart = fullStart > 0 ? 1 : 0;
@@ -134831,6 +138750,35 @@ var ts;
             adjustedStartPosition = skipWhitespacesAndLineBreaks(sourceFile.text, adjustedStartPosition);
             return ts.getStartPositionOfLine(ts.getLineOfLocalPosition(sourceFile, adjustedStartPosition), sourceFile);
         }
+        /** Return the end position of a multiline comment of it is on another line; otherwise returns `undefined`; */
+        function getEndPositionOfMultilineTrailingComment(sourceFile, node, options) {
+            var end = node.end;
+            var trailingTriviaOption = options.trailingTriviaOption;
+            if (trailingTriviaOption === TrailingTriviaOption.Include) {
+                // If the trailing comment is a multiline comment that extends to the next lines,
+                // return the end of the comment and track it for the next nodes to adjust.
+                var comments = ts.getTrailingCommentRanges(sourceFile.text, end);
+                if (comments) {
+                    var nodeEndLine = ts.getLineOfLocalPosition(sourceFile, node.end);
+                    for (var _i = 0, comments_2 = comments; _i < comments_2.length; _i++) {
+                        var comment = comments_2[_i];
+                        // Single line can break the loop as trivia will only be this line.
+                        // Comments on subsequest lines are also ignored.
+                        if (comment.kind === 2 /* SingleLineCommentTrivia */ || ts.getLineOfLocalPosition(sourceFile, comment.pos) > nodeEndLine) {
+                            break;
+                        }
+                        // Get the end line of the comment and compare against the end line of the node.
+                        // If the comment end line position and the multiline comment extends to multiple lines,
+                        // then is safe to return the end position.
+                        var commentEndLine = ts.getLineOfLocalPosition(sourceFile, comment.end);
+                        if (commentEndLine > nodeEndLine) {
+                            return ts.skipTrivia(sourceFile.text, comment.end, /*stopAfterLineBreak*/ true, /*stopAtComments*/ true);
+                        }
+                    }
+                }
+            }
+            return undefined;
+        }
         function getAdjustedEndPosition(sourceFile, node, options) {
             var _a;
             var end = node.end;
@@ -134846,6 +138794,10 @@ var ts;
                 }
                 return end;
             }
+            var multilineEndPosition = getEndPositionOfMultilineTrailingComment(sourceFile, node, options);
+            if (multilineEndPosition) {
+                return multilineEndPosition;
+            }
             var newEnd = ts.skipTrivia(sourceFile.text, end, /*stopAfterLineBreak*/ true);
             return newEnd !== end && (trailingTriviaOption === TrailingTriviaOption.Include || ts.isLineBreak(sourceFile.text.charCodeAt(newEnd - 1)))
                 ? newEnd
@@ -134855,14 +138807,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 === 200 /* ObjectLiteralExpression */));
-        }
-        function spaces(count) {
-            var s = "";
-            for (var i = 0; i < count; i++) {
-                s += " ";
-            }
-            return s;
+            return !!candidate && !!node.parent && (candidate.kind === 27 /* CommaToken */ || (candidate.kind === 26 /* SemicolonToken */ && node.parent.kind === 201 /* ObjectLiteralExpression */));
         }
         function isThisTypeAnnotatable(containingFunction) {
             return ts.isFunctionExpression(containingFunction) || ts.isFunctionDeclaration(containingFunction);
@@ -134908,6 +138853,17 @@ var ts;
                 if (options === void 0) { options = { leadingTriviaOption: LeadingTriviaOption.IncludeAll }; }
                 this.deleteRange(sourceFile, getAdjustedRange(sourceFile, node, node, options));
             };
+            ChangeTracker.prototype.deleteNodes = function (sourceFile, nodes, options, hasTrailingComment) {
+                if (options === void 0) { options = { leadingTriviaOption: LeadingTriviaOption.IncludeAll }; }
+                // When deleting multiple nodes we need to track if the end position is including multiline trailing comments.
+                for (var _i = 0, nodes_1 = nodes; _i < nodes_1.length; _i++) {
+                    var node = nodes_1[_i];
+                    var pos = getAdjustedStartPosition(sourceFile, node, options, hasTrailingComment);
+                    var end = getAdjustedEndPosition(sourceFile, node, options);
+                    this.deleteRange(sourceFile, { pos: pos, end: end });
+                    hasTrailingComment = !!getEndPositionOfMultilineTrailingComment(sourceFile, node, options);
+                }
+            };
             ChangeTracker.prototype.deleteModifier = function (sourceFile, modifier) {
                 this.deleteRange(sourceFile, { pos: modifier.getStart(sourceFile), end: ts.skipTrivia(sourceFile.text, modifier.end, /*stopAfterLineBreak*/ true) });
             };
@@ -134950,6 +138906,10 @@ var ts;
                 if (options === void 0) { options = useNonAdjustedPositions; }
                 this.replaceRangeWithNodes(sourceFile, getAdjustedRange(sourceFile, startNode, endNode, options), newNodes, options);
             };
+            ChangeTracker.prototype.nodeHasTrailingComment = function (sourceFile, oldNode, configurableEnd) {
+                if (configurableEnd === void 0) { configurableEnd = useNonAdjustedPositions; }
+                return !!getEndPositionOfMultilineTrailingComment(sourceFile, oldNode, configurableEnd);
+            };
             ChangeTracker.prototype.nextCommaToken = function (sourceFile, node) {
                 var next = ts.findNextToken(node, node.parent, sourceFile);
                 return next && next.kind === 27 /* CommaToken */ ? next : undefined;
@@ -135054,7 +139014,7 @@ var ts;
                     }
                 }
                 else {
-                    endNode = (_a = (node.kind === 249 /* VariableDeclaration */ ? node.exclamationToken : node.questionToken)) !== null && _a !== void 0 ? _a : node.name;
+                    endNode = (_a = (node.kind === 250 /* VariableDeclaration */ ? node.exclamationToken : node.questionToken)) !== null && _a !== void 0 ? _a : node.name;
                 }
                 this.insertNodeAt(sourceFile, endNode.end, type, { prefix: ": " });
                 return true;
@@ -135096,6 +139056,15 @@ var ts;
                     this.insertNodeBefore(sourceFile, firstStatement, newStatement);
                 }
             };
+            ChangeTracker.prototype.insertNodeAtConstructorStartAfterSuperCall = function (sourceFile, ctr, newStatement) {
+                var superCallStatement = ts.find(ctr.body.statements, function (stmt) { return ts.isExpressionStatement(stmt) && ts.isSuperCall(stmt.expression); });
+                if (!superCallStatement || !ctr.body.multiLine) {
+                    this.replaceConstructorBody(sourceFile, ctr, __spreadArray(__spreadArray([], ctr.body.statements), [newStatement]));
+                }
+                else {
+                    this.insertNodeAfter(sourceFile, superCallStatement, newStatement);
+                }
+            };
             ChangeTracker.prototype.insertNodeAtConstructorEnd = function (sourceFile, ctr, newStatement) {
                 var lastStatement = ts.lastOrUndefined(ctr.body.statements);
                 if (!lastStatement || !ctr.body.multiLine) {
@@ -135211,18 +139180,18 @@ var ts;
             };
             ChangeTracker.prototype.getInsertNodeAfterOptionsWorker = function (node) {
                 switch (node.kind) {
-                    case 252 /* ClassDeclaration */:
-                    case 256 /* ModuleDeclaration */:
+                    case 253 /* ClassDeclaration */:
+                    case 257 /* ModuleDeclaration */:
                         return { prefix: this.newLineCharacter, suffix: this.newLineCharacter };
-                    case 249 /* VariableDeclaration */:
+                    case 250 /* VariableDeclaration */:
                     case 10 /* StringLiteral */:
                     case 78 /* Identifier */:
                         return { prefix: ", " };
-                    case 288 /* PropertyAssignment */:
+                    case 289 /* PropertyAssignment */:
                         return { suffix: "," + this.newLineCharacter };
                     case 92 /* ExportKeyword */:
                         return { prefix: " " };
-                    case 160 /* Parameter */:
+                    case 161 /* Parameter */:
                         return {};
                     default:
                         ts.Debug.assert(ts.isStatement(node) || ts.isClassOrTypeElement(node)); // Else we haven't handled this kind of node yet -- add it
@@ -135231,7 +139200,7 @@ var ts;
             };
             ChangeTracker.prototype.insertName = function (sourceFile, node, name) {
                 ts.Debug.assert(!node.name);
-                if (node.kind === 209 /* ArrowFunction */) {
+                if (node.kind === 210 /* ArrowFunction */) {
                     var arrow = ts.findChildOfKind(node, 38 /* EqualsGreaterThanToken */, sourceFile);
                     var lparen = ts.findChildOfKind(node, 20 /* OpenParenToken */, sourceFile);
                     if (lparen) {
@@ -135245,14 +139214,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 !== 230 /* Block */) {
+                    if (node.body.kind !== 231 /* 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 === 208 /* FunctionExpression */ ? 97 /* FunctionKeyword */ : 83 /* ClassKeyword */, sourceFile).end;
+                    var pos = ts.findChildOfKind(node, node.kind === 209 /* FunctionExpression */ ? 97 /* FunctionKeyword */ : 83 /* ClassKeyword */, sourceFile).end;
                     this.insertNodeAt(sourceFile, pos, ts.factory.createIdentifier(name), { prefix: " " });
                 }
             };
@@ -135284,47 +139253,22 @@ var ts;
                         // a, b, c
                         // create change for adding 'e' after 'a' as
                         // - find start of next element after a (it is b)
-                        // - use this start as start and end position in final change
-                        // - build text of change by formatting the text of node + separator + whitespace trivia of b
+                        // - use next element start as start and end position in final change
+                        // - build text of change by formatting the text of node + whitespace trivia of b
                         // in multiline case it will work as
                         //   a,
                         //   b,
                         //   c,
                         // result - '*' denotes leading trivia that will be inserted after new text (displayed as '#')
-                        //   a,*
-                        // ***insertedtext<separator>#
+                        //   a,
+                        //   insertedtext<separator>#
                         // ###b,
                         //   c,
-                        // find line and character of the next element
-                        var lineAndCharOfNextElement = ts.getLineAndCharacterOfPosition(sourceFile, skipWhitespacesAndLineBreaks(sourceFile.text, containingList[index + 1].getFullStart()));
-                        // find line and character of the token that precedes next element (usually it is separator)
-                        var lineAndCharOfNextToken = ts.getLineAndCharacterOfPosition(sourceFile, nextToken.end);
-                        var prefix = void 0;
-                        var startPos = void 0;
-                        if (lineAndCharOfNextToken.line === lineAndCharOfNextElement.line) {
-                            // next element is located on the same line with separator:
-                            // a,$$$$b
-                            //  ^    ^
-                            //  |    |-next element
-                            //  |-separator
-                            // where $$$ is some leading trivia
-                            // for a newly inserted node we'll maintain the same relative position comparing to separator and replace leading trivia with spaces
-                            // a,    x,$$$$b
-                            //  ^    ^     ^
-                            //  |    |     |-next element
-                            //  |    |-new inserted node padded with spaces
-                            //  |-separator
-                            startPos = nextToken.end;
-                            prefix = spaces(lineAndCharOfNextElement.character - lineAndCharOfNextToken.character);
-                        }
-                        else {
-                            // next element is located on different line that separator
-                            // let insert position be the beginning of the line that contains next element
-                            startPos = ts.getStartPositionOfLine(lineAndCharOfNextElement.line, sourceFile);
-                        }
+                        var nextNode = containingList[index + 1];
+                        var startPos = skipWhitespacesAndLineBreaks(sourceFile.text, nextNode.getFullStart());
                         // write separator and leading trivia of the next element as suffix
-                        var suffix = "" + ts.tokenToString(nextToken.kind) + sourceFile.text.substring(nextToken.end, containingList[index + 1].getStart(sourceFile));
-                        this.replaceRange(sourceFile, ts.createRange(startPos, containingList[index + 1].getStart(sourceFile)), newNode, { prefix: prefix, suffix: suffix });
+                        var suffix = "" + ts.tokenToString(nextToken.kind) + sourceFile.text.substring(nextToken.end, startPos);
+                        this.insertNodesAt(sourceFile, startPos, [newNode], { suffix: suffix });
                     }
                 }
                 else {
@@ -135396,7 +139340,7 @@ var ts;
             ChangeTracker.prototype.finishDeleteDeclarations = function () {
                 var _this = this;
                 var deletedNodesInLists = new ts.Set(); // Stores nodes in lists that we already deleted. Used to avoid deleting `, ` twice in `a, b`.
-                var _loop_9 = function (sourceFile, node) {
+                var _loop_10 = function (sourceFile, node) {
                     if (!this_1.deletedNodes.some(function (d) { return d.sourceFile === sourceFile && ts.rangeContainsRangeExclusive(d.node, node); })) {
                         if (ts.isArray(node)) {
                             this_1.deleteRange(sourceFile, ts.rangeOfTypeParameters(sourceFile, node));
@@ -135409,7 +139353,7 @@ var ts;
                 var this_1 = this;
                 for (var _i = 0, _a = this.deletedNodes; _i < _a.length; _i++) {
                     var _b = _a[_i], sourceFile = _b.sourceFile, node = _b.node;
-                    _loop_9(sourceFile, node);
+                    _loop_10(sourceFile, node);
                 }
                 deletedNodesInLists.forEach(function (node) {
                     var sourceFile = node.getSourceFile();
@@ -135468,14 +139412,14 @@ var ts;
                     // order changes by start position
                     // If the start position is the same, put the shorter range first, since an empty range (x, x) may precede (x, y) but not vice-versa.
                     var normalized = ts.stableSort(changesInFile, function (a, b) { return (a.range.pos - b.range.pos) || (a.range.end - b.range.end); });
-                    var _loop_10 = function (i) {
+                    var _loop_11 = function (i) {
                         ts.Debug.assert(normalized[i].range.end <= normalized[i + 1].range.pos, "Changes overlap", function () {
                             return JSON.stringify(normalized[i].range) + " and " + JSON.stringify(normalized[i + 1].range);
                         });
                     };
                     // verify that change intervals do not overlap, except possibly at end points.
                     for (var i = 0; i < normalized.length - 1; i++) {
-                        _loop_10(i);
+                        _loop_11(i);
                     }
                     var textChanges = ts.mapDefined(normalized, function (c) {
                         var span = ts.createTextSpanFromRange(c.range);
@@ -135589,11 +139533,12 @@ var ts;
         function createWriter(newLine) {
             var lastNonTriviaPosition = 0;
             var writer = ts.createTextWriter(newLine);
-            var onEmitNode = function (hint, node, printCallback) {
+            var onBeforeEmitNode = function (node) {
                 if (node) {
                     setPos(node, lastNonTriviaPosition);
                 }
-                printCallback(hint, node);
+            };
+            var onAfterEmitNode = function (node) {
                 if (node) {
                     setEnd(node, lastNonTriviaPosition);
                 }
@@ -135712,7 +139657,8 @@ var ts;
                 lastNonTriviaPosition = 0;
             }
             return {
-                onEmitNode: onEmitNode,
+                onBeforeEmitNode: onBeforeEmitNode,
+                onAfterEmitNode: onAfterEmitNode,
                 onBeforeEmitNodeArray: onBeforeEmitNodeArray,
                 onAfterEmitNodeArray: onAfterEmitNodeArray,
                 onBeforeEmitToken: onBeforeEmitToken,
@@ -135827,14 +139773,14 @@ var ts;
         }
         textChanges_3.isValidLocationToAddComment = isValidLocationToAddComment;
         function needSemicolonBetween(a, b) {
-            return (ts.isPropertySignature(a) || ts.isPropertyDeclaration(a)) && ts.isClassOrTypeElement(b) && b.name.kind === 158 /* ComputedPropertyName */
+            return (ts.isPropertySignature(a) || ts.isPropertyDeclaration(a)) && ts.isClassOrTypeElement(b) && b.name.kind === 159 /* 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 160 /* Parameter */: {
+                    case 161 /* Parameter */: {
                         var oldFunction = node.parent;
                         if (ts.isArrowFunction(oldFunction) &&
                             oldFunction.parameters.length === 1 &&
@@ -135849,15 +139795,17 @@ var ts;
                         }
                         break;
                     }
-                    case 261 /* ImportDeclaration */:
-                    case 260 /* ImportEqualsDeclaration */:
+                    case 262 /* ImportDeclaration */:
+                    case 261 /* 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 });
+                        deleteNode(changes, sourceFile, node, {
+                            leadingTriviaOption: isFirstImport ? LeadingTriviaOption.Exclude : ts.hasJSDocNodes(node) ? LeadingTriviaOption.JSDoc : LeadingTriviaOption.StartLine,
+                        });
                         break;
-                    case 198 /* BindingElement */:
+                    case 199 /* BindingElement */:
                         var pattern = node.parent;
-                        var preserveComma = pattern.kind === 197 /* ArrayBindingPattern */ && node !== ts.last(pattern.elements);
+                        var preserveComma = pattern.kind === 198 /* ArrayBindingPattern */ && node !== ts.last(pattern.elements);
                         if (preserveComma) {
                             deleteNode(changes, sourceFile, node);
                         }
@@ -135865,13 +139813,13 @@ var ts;
                             deleteNodeInList(changes, deletedNodesInLists, sourceFile, node);
                         }
                         break;
-                    case 249 /* VariableDeclaration */:
+                    case 250 /* VariableDeclaration */:
                         deleteVariableDeclaration(changes, deletedNodesInLists, sourceFile, node);
                         break;
-                    case 159 /* TypeParameter */:
+                    case 160 /* TypeParameter */:
                         deleteNodeInList(changes, deletedNodesInLists, sourceFile, node);
                         break;
-                    case 265 /* ImportSpecifier */:
+                    case 266 /* ImportSpecifier */:
                         var namedImports = node.parent;
                         if (namedImports.elements.length === 1) {
                             deleteImportBinding(changes, sourceFile, namedImports);
@@ -135880,7 +139828,7 @@ var ts;
                             deleteNodeInList(changes, deletedNodesInLists, sourceFile, node);
                         }
                         break;
-                    case 263 /* NamespaceImport */:
+                    case 264 /* NamespaceImport */:
                         deleteImportBinding(changes, sourceFile, node);
                         break;
                     case 26 /* SemicolonToken */:
@@ -135889,12 +139837,16 @@ var ts;
                     case 97 /* FunctionKeyword */:
                         deleteNode(changes, sourceFile, node, { leadingTriviaOption: LeadingTriviaOption.Exclude });
                         break;
-                    case 252 /* ClassDeclaration */:
-                    case 251 /* FunctionDeclaration */:
+                    case 253 /* ClassDeclaration */:
+                    case 252 /* FunctionDeclaration */:
                         deleteNode(changes, sourceFile, node, { leadingTriviaOption: ts.hasJSDocNodes(node) ? LeadingTriviaOption.JSDoc : LeadingTriviaOption.StartLine });
                         break;
                     default:
-                        if (ts.isImportClause(node.parent) && node.parent.name === node) {
+                        if (!node.parent) {
+                            // a misbehaving client can reach here with the SourceFile node
+                            deleteNode(changes, sourceFile, node);
+                        }
+                        else if (ts.isImportClause(node.parent) && node.parent.name === node) {
                             deleteDefaultImport(changes, sourceFile, node.parent);
                         }
                         else if (ts.isCallExpression(node.parent) && ts.contains(node.parent.arguments, node)) {
@@ -135937,13 +139889,13 @@ var ts;
                     // Delete the entire import declaration
                     // |import * as ns from './file'|
                     // |import { a } from './file'|
-                    var importDecl = ts.getAncestor(node, 261 /* ImportDeclaration */);
+                    var importDecl = ts.getAncestor(node, 262 /* ImportDeclaration */);
                     deleteNode(changes, sourceFile, importDecl);
                 }
             }
             function deleteVariableDeclaration(changes, deletedNodesInLists, sourceFile, node) {
                 var parent = node.parent;
-                if (parent.kind === 287 /* CatchClause */) {
+                if (parent.kind === 288 /* 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;
@@ -135954,14 +139906,14 @@ var ts;
                 }
                 var gp = parent.parent;
                 switch (gp.kind) {
-                    case 239 /* ForOfStatement */:
-                    case 238 /* ForInStatement */:
+                    case 240 /* ForOfStatement */:
+                    case 239 /* ForInStatement */:
                         changes.replaceNode(sourceFile, node, ts.factory.createObjectLiteralExpression());
                         break;
-                    case 237 /* ForStatement */:
+                    case 238 /* ForStatement */:
                         deleteNode(changes, sourceFile, parent);
                         break;
-                    case 232 /* VariableStatement */:
+                    case 233 /* VariableStatement */:
                         deleteNode(changes, sourceFile, gp, { leadingTriviaOption: ts.hasJSDocNodes(gp) ? LeadingTriviaOption.JSDoc : LeadingTriviaOption.StartLine });
                         break;
                     default:
@@ -136017,6 +139969,10 @@ var ts;
             return createCodeFixActionWorker(fixName, diagnosticToString(description), changes, fixId, diagnosticToString(fixAllDescription), command);
         }
         codefix.createCodeFixAction = createCodeFixAction;
+        function createCodeFixActionMaybeFixAll(fixName, changes, description, fixId, fixAllDescription, command) {
+            return createCodeFixActionWorker(fixName, diagnosticToString(description), changes, fixId, fixAllDescription && diagnosticToString(fixAllDescription), command);
+        }
+        codefix.createCodeFixActionMaybeFixAll = createCodeFixActionMaybeFixAll;
         function createCodeFixActionWorker(fixName, description, changes, fixId, fixAllDescription, command) {
             return { fixName: fixName, description: description, changes: changes, fixId: fixId, fixAllDescription: fixAllDescription, commands: command ? [command] : undefined };
         }
@@ -136271,6 +140227,7 @@ var ts;
             ts.Diagnostics.Operator_0_cannot_be_applied_to_type_1.code,
             ts.Diagnostics.Operator_0_cannot_be_applied_to_types_1_and_2.code,
             ts.Diagnostics.This_condition_will_always_return_0_since_the_types_1_and_2_have_no_overlap.code,
+            ts.Diagnostics.This_condition_will_always_return_true_since_this_0_is_always_defined.code,
             ts.Diagnostics.Type_0_is_not_an_array_type.code,
             ts.Diagnostics.Type_0_is_not_an_array_type_or_a_string_type.code,
             ts.Diagnostics.Type_0_is_not_an_array_type_or_a_string_type_Use_compiler_option_downlevelIteration_to_allow_iterating_of_iterators.code,
@@ -136369,14 +140326,14 @@ var ts;
             }
             var isCompleteFix = identifiers.isCompleteFix;
             var initializers;
-            var _loop_11 = function (identifier) {
+            var _loop_12 = function (identifier) {
                 var symbol = checker.getSymbolAtLocation(identifier);
                 if (!symbol) {
                     return "continue";
                 }
                 var declaration = ts.tryCast(symbol.valueDeclaration, ts.isVariableDeclaration);
                 var variableName = declaration && ts.tryCast(declaration.name, ts.isIdentifier);
-                var variableStatement = ts.getAncestor(declaration, 232 /* VariableStatement */);
+                var variableStatement = ts.getAncestor(declaration, 233 /* VariableStatement */);
                 if (!declaration || !variableStatement ||
                     declaration.type ||
                     !declaration.initializer ||
@@ -136402,7 +140359,7 @@ var ts;
             };
             for (var _i = 0, _a = identifiers.identifiers; _i < _a.length; _i++) {
                 var identifier = _a[_i];
-                _loop_11(identifier);
+                _loop_12(identifier);
             }
             return initializers && {
                 initializers: initializers,
@@ -136454,10 +140411,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 === 251 /* FunctionDeclaration */ ||
-                        ancestor.parent.kind === 208 /* FunctionExpression */ ||
-                        ancestor.parent.kind === 209 /* ArrowFunction */ ||
-                        ancestor.parent.kind === 165 /* MethodDeclaration */);
+                    ts.isBlock(ancestor) && (ancestor.parent.kind === 252 /* FunctionDeclaration */ ||
+                        ancestor.parent.kind === 209 /* FunctionExpression */ ||
+                        ancestor.parent.kind === 210 /* ArrowFunction */ ||
+                        ancestor.parent.kind === 166 /* MethodDeclaration */);
             });
         }
         function makeChange(changeTracker, errorCode, sourceFile, checker, insertionSite, fixedDeclarations) {
@@ -136576,10 +140533,10 @@ var ts;
         function isPossiblyPartOfDestructuring(node) {
             switch (node.kind) {
                 case 78 /* Identifier */:
-                case 199 /* ArrayLiteralExpression */:
-                case 200 /* ObjectLiteralExpression */:
-                case 288 /* PropertyAssignment */:
-                case 289 /* ShorthandPropertyAssignment */:
+                case 200 /* ArrayLiteralExpression */:
+                case 201 /* ObjectLiteralExpression */:
+                case 289 /* PropertyAssignment */:
+                case 290 /* ShorthandPropertyAssignment */:
                     return true;
                 default:
                     return false;
@@ -136594,7 +140551,7 @@ var ts;
         function isPossiblyPartOfCommaSeperatedInitializer(node) {
             switch (node.kind) {
                 case 78 /* Identifier */:
-                case 216 /* BinaryExpression */:
+                case 217 /* BinaryExpression */:
                 case 27 /* CommaToken */:
                     return true;
                 default:
@@ -136643,7 +140600,7 @@ var ts;
                 return;
             }
             var declaration = token.parent;
-            if (declaration.kind === 163 /* PropertyDeclaration */ &&
+            if (declaration.kind === 164 /* PropertyDeclaration */ &&
                 (!fixedNodes || ts.tryAddToSet(fixedNodes, declaration))) {
                 changeTracker.insertModifierBefore(sourceFile, 133 /* DeclareKeyword */, declaration);
             }
@@ -136780,26 +140737,26 @@ var ts;
         }
         function isDeclarationWithType(node) {
             return ts.isFunctionLikeDeclaration(node) ||
-                node.kind === 249 /* VariableDeclaration */ ||
-                node.kind === 162 /* PropertySignature */ ||
-                node.kind === 163 /* PropertyDeclaration */;
+                node.kind === 250 /* VariableDeclaration */ ||
+                node.kind === 163 /* PropertySignature */ ||
+                node.kind === 164 /* PropertyDeclaration */;
         }
         function transformJSDocType(node) {
             switch (node.kind) {
-                case 303 /* JSDocAllType */:
-                case 304 /* JSDocUnknownType */:
+                case 304 /* JSDocAllType */:
+                case 305 /* JSDocUnknownType */:
                     return ts.factory.createTypeReferenceNode("any", ts.emptyArray);
-                case 307 /* JSDocOptionalType */:
+                case 308 /* JSDocOptionalType */:
                     return transformJSDocOptionalType(node);
-                case 306 /* JSDocNonNullableType */:
+                case 307 /* JSDocNonNullableType */:
                     return transformJSDocType(node.type);
-                case 305 /* JSDocNullableType */:
+                case 306 /* JSDocNullableType */:
                     return transformJSDocNullableType(node);
-                case 309 /* JSDocVariadicType */:
+                case 310 /* JSDocVariadicType */:
                     return transformJSDocVariadicType(node);
-                case 308 /* JSDocFunctionType */:
+                case 309 /* JSDocFunctionType */:
                     return transformJSDocFunctionType(node);
-                case 173 /* TypeReference */:
+                case 174 /* TypeReference */:
                     return transformJSDocTypeReference(node);
                 default:
                     var visited = ts.visitEachChild(node, transformJSDocType, ts.nullTransformationContext);
@@ -136824,7 +140781,7 @@ var ts;
         }
         function transformJSDocParameter(node) {
             var index = node.parent.parameters.indexOf(node);
-            var isRest = node.type.kind === 309 /* JSDocVariadicType */ && index === node.parent.parameters.length - 1; // TODO: GH#18217
+            var isRest = node.type.kind === 310 /* 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);
@@ -136895,7 +140852,7 @@ var ts;
         });
         function doChange(changes, sourceFile, position, checker, preferences, compilerOptions) {
             var ctorSymbol = checker.getSymbolAtLocation(ts.getTokenAtPosition(sourceFile, position));
-            if (!ctorSymbol || !(ctorSymbol.flags & (16 /* Function */ | 3 /* Variable */))) {
+            if (!ctorSymbol || !ctorSymbol.valueDeclaration || !(ctorSymbol.flags & (16 /* Function */ | 3 /* Variable */))) {
                 // Bad input
                 return undefined;
             }
@@ -136922,7 +140879,7 @@ var ts;
                 // all instance members are stored in the "member" array of symbol
                 if (symbol.members) {
                     symbol.members.forEach(function (member, key) {
-                        if (key === "constructor") {
+                        if (key === "constructor" && member.valueDeclaration) {
                             // fn.prototype.constructor = fn
                             changes.delete(sourceFile, member.valueDeclaration.parent);
                             return;
@@ -136936,7 +140893,7 @@ var ts;
                 // all static members are stored in the "exports" array of symbol
                 if (symbol.exports) {
                     symbol.exports.forEach(function (member) {
-                        if (member.name === "prototype") {
+                        if (member.name === "prototype" && member.declarations) {
                             var firstDeclaration = member.declarations[0];
                             // only one "x.prototype = { ... }" will pass
                             if (member.declarations.length === 1 &&
@@ -136998,7 +140955,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 === 233 /* ExpressionStatement */
+                    var nodeToDelete = assignmentBinaryExpression.parent && assignmentBinaryExpression.parent.kind === 234 /* ExpressionStatement */
                         ? assignmentBinaryExpression.parent : assignmentBinaryExpression;
                     changes.delete(sourceFile, nodeToDelete);
                     if (!assignmentExpr) {
@@ -137059,7 +141016,7 @@ var ts;
                         var arrowFunctionBody = arrowFunction.body;
                         var bodyBlock;
                         // case 1: () => { return [1,2,3] }
-                        if (arrowFunctionBody.kind === 230 /* Block */) {
+                        if (arrowFunctionBody.kind === 231 /* Block */) {
                             bodyBlock = arrowFunctionBody;
                         }
                         // case 2: () => [1,2,3]
@@ -137161,7 +141118,7 @@ var ts;
                 functionToConvert = tokenAtPosition.parent.initializer;
             }
             else {
-                functionToConvert = ts.tryCast(ts.getContainingFunction(ts.getTokenAtPosition(sourceFile, position)), ts.isFunctionLikeDeclaration);
+                functionToConvert = ts.tryCast(ts.getContainingFunction(ts.getTokenAtPosition(sourceFile, position)), ts.canBeConvertedToAsync);
             }
             if (!functionToConvert) {
                 return;
@@ -137170,6 +141127,9 @@ var ts;
             var isInJavascript = ts.isInJSFile(functionToConvert);
             var setOfExpressionsToReturn = getAllPromiseExpressionsToReturn(functionToConvert, checker);
             var functionToConvertRenamed = renameCollidingVarNames(functionToConvert, checker, synthNamesMap);
+            if (!ts.returnsPromise(functionToConvertRenamed, checker)) {
+                return;
+            }
             var returnStatements = functionToConvertRenamed.body && ts.isBlock(functionToConvertRenamed.body) ? getReturnStatementsWithPromiseHandlers(functionToConvertRenamed.body, checker) : ts.emptyArray;
             var transformer = { checker: checker, synthNamesMap: synthNamesMap, setOfExpressionsToReturn: setOfExpressionsToReturn, isInJSFile: isInJavascript };
             if (!returnStatements.length) {
@@ -137180,7 +141140,7 @@ var ts;
                     functionToConvert.getStart(sourceFile);
             var options = functionToConvert.modifiers ? { prefix: " " } : { suffix: " " };
             changes.insertModifierAt(sourceFile, pos, 129 /* AsyncKeyword */, options);
-            var _loop_12 = function (returnStatement) {
+            var _loop_13 = function (returnStatement) {
                 ts.forEachChild(returnStatement, function visit(node) {
                     if (ts.isCallExpression(node)) {
                         var newNodes = transformExpression(node, transformer);
@@ -137193,7 +141153,7 @@ var ts;
             };
             for (var _i = 0, returnStatements_1 = returnStatements; _i < returnStatements_1.length; _i++) {
                 var returnStatement = returnStatements_1[_i];
-                _loop_12(returnStatement);
+                _loop_13(returnStatement);
             }
         }
         function getReturnStatementsWithPromiseHandlers(body, checker) {
@@ -137270,7 +141230,10 @@ var ts;
                     // so we push an entry for 'response'.
                     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 ident = (firstParameter === null || firstParameter === void 0 ? void 0 : firstParameter.valueDeclaration)
+                            && ts.isParameter(firstParameter.valueDeclaration)
+                            && ts.tryCast(firstParameter.valueDeclaration.name, ts.isIdentifier)
+                            || ts.factory.createUniqueName("result", 16 /* Optimistic */);
                         var synthName = getNewNameIfConflict(ident, collidingSymbolMap);
                         synthNamesMap.set(symbolIdString, synthName);
                         collidingSymbolMap.add(ident.text, symbol);
@@ -137448,7 +141411,7 @@ var ts;
                 case 103 /* NullKeyword */:
                     // do not produce a transformed statement for a null argument
                     break;
-                case 201 /* PropertyAccessExpression */:
+                case 202 /* PropertyAccessExpression */:
                 case 78 /* Identifier */: // identifier includes undefined
                     if (!argName) {
                         // undefined was argument passed to promise handler
@@ -137470,8 +141433,8 @@ var ts;
                         prevArgName.types.push(returnType);
                     }
                     return varDeclOrAssignment;
-                case 208 /* FunctionExpression */:
-                case 209 /* ArrowFunction */: {
+                case 209 /* FunctionExpression */:
+                case 210 /* 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
@@ -137690,10 +141653,10 @@ var ts;
                 }
                 var importNode = ts.importFromModuleSpecifier(moduleSpecifier);
                 switch (importNode.kind) {
-                    case 260 /* ImportEqualsDeclaration */:
+                    case 261 /* ImportEqualsDeclaration */:
                         changes.replaceNode(importingFile, importNode, ts.makeImport(importNode.name, /*namedImports*/ undefined, moduleSpecifier, quotePreference));
                         break;
-                    case 203 /* CallExpression */:
+                    case 204 /* CallExpression */:
                         if (ts.isRequireCall(importNode, /*checkArgumentIsStringLiteralLike*/ false)) {
                             changes.replaceNode(importingFile, importNode, ts.factory.createPropertyAccessExpression(ts.getSynthesizedDeepClone(importNode), "default"));
                         }
@@ -137760,20 +141723,20 @@ var ts;
         }
         function convertStatement(sourceFile, statement, checker, changes, identifiers, target, exports, useSitesToUnqualify, quotePreference) {
             switch (statement.kind) {
-                case 232 /* VariableStatement */:
+                case 233 /* VariableStatement */:
                     convertVariableStatement(sourceFile, statement, changes, checker, identifiers, target, quotePreference);
                     return false;
-                case 233 /* ExpressionStatement */: {
+                case 234 /* ExpressionStatement */: {
                     var expression = statement.expression;
                     switch (expression.kind) {
-                        case 203 /* CallExpression */: {
+                        case 204 /* 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 216 /* BinaryExpression */: {
+                        case 217 /* BinaryExpression */: {
                             var operatorToken = expression.operatorToken;
                             return operatorToken.kind === 62 /* EqualsToken */ && convertAssignment(sourceFile, checker, expression, changes, exports, useSitesToUnqualify);
                         }
@@ -137822,8 +141785,8 @@ var ts;
         /** Converts `const name = require("moduleSpecifier").propertyName` */
         function convertPropertyAccessImport(name, propertyName, moduleSpecifier, identifiers, quotePreference) {
             switch (name.kind) {
-                case 196 /* ObjectBindingPattern */:
-                case 197 /* ArrayBindingPattern */: {
+                case 197 /* ObjectBindingPattern */:
+                case 198 /* ArrayBindingPattern */: {
                     // `const [a, b] = require("c").d` --> `import { d } from "c"; const [a, b] = d;`
                     var tmp = makeUniqueName(propertyName, identifiers);
                     return convertedImports([
@@ -137874,16 +141837,16 @@ var ts;
         function tryChangeModuleExportsObject(object, useSitesToUnqualify) {
             var statements = ts.mapAllOrFail(object.properties, function (prop) {
                 switch (prop.kind) {
-                    case 167 /* GetAccessor */:
-                    case 168 /* SetAccessor */:
+                    case 168 /* GetAccessor */:
+                    case 169 /* SetAccessor */:
                     // TODO: Maybe we should handle this? See fourslash test `refactorConvertToEs6Module_export_object_shorthand.ts`.
                     // falls through
-                    case 289 /* ShorthandPropertyAssignment */:
-                    case 290 /* SpreadAssignment */:
+                    case 290 /* ShorthandPropertyAssignment */:
+                    case 291 /* SpreadAssignment */:
                         return undefined;
-                    case 288 /* PropertyAssignment */:
+                    case 289 /* PropertyAssignment */:
                         return !ts.isIdentifier(prop.name) ? undefined : convertExportsDotXEquals_replaceNode(prop.name.text, prop.initializer, useSitesToUnqualify);
-                    case 165 /* MethodDeclaration */:
+                    case 166 /* 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);
@@ -137947,7 +141910,7 @@ var ts;
         function convertExportsDotXEquals_replaceNode(name, exported, useSitesToUnqualify) {
             var modifiers = [ts.factory.createToken(92 /* ExportKeyword */)];
             switch (exported.kind) {
-                case 208 /* FunctionExpression */: {
+                case 209 /* FunctionExpression */: {
                     var expressionName = exported.name;
                     if (expressionName && expressionName.text !== name) {
                         // `exports.f = function g() {}` -> `export const f = function g() {}`
@@ -137955,10 +141918,10 @@ var ts;
                     }
                 }
                 // falls through
-                case 209 /* ArrowFunction */:
+                case 210 /* ArrowFunction */:
                     // `exports.f = function() {}` --> `export function f() {}`
                     return functionExpressionToDeclaration(name, modifiers, exported, useSitesToUnqualify);
-                case 221 /* ClassExpression */:
+                case 222 /* ClassExpression */:
                     // `exports.C = class {}` --> `export class C {}`
                     return classExpressionToDeclaration(name, modifiers, exported, useSitesToUnqualify);
                 default:
@@ -137978,7 +141941,7 @@ var ts;
                 : 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 */) {
+                if (original.kind === 202 /* 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);
@@ -137993,7 +141956,7 @@ var ts;
          */
         function convertSingleImport(name, moduleSpecifier, checker, identifiers, target, quotePreference) {
             switch (name.kind) {
-                case 196 /* ObjectBindingPattern */: {
+                case 197 /* 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
@@ -138006,7 +141969,7 @@ var ts;
                     }
                 }
                 // falls through -- object destructuring has an interesting pattern and must be a variable declaration
-                case 197 /* ArrayBindingPattern */: {
+                case 198 /* ArrayBindingPattern */: {
                     /*
                     import x from "x";
                     const [a, b, c] = x;
@@ -138025,7 +141988,9 @@ var ts;
         }
         /**
          * Convert `import x = require("x").`
-         * Also converts uses like `x.y()` to `y()` and uses a named import.
+         * Also:
+         * - Convert `x.default()` to `x()` to handle ES6 default export
+         * - Converts uses like `x.y()` to `y()` and uses a named import.
          */
         function convertSingleIdentifierImport(name, moduleSpecifier, checker, identifiers, quotePreference) {
             var nameSymbol = checker.getSymbolAtLocation(name);
@@ -138042,14 +142007,21 @@ var ts;
                 }
                 var parent = use.parent;
                 if (ts.isPropertyAccessExpression(parent)) {
-                    var expression = parent.expression, propertyName = parent.name.text;
-                    ts.Debug.assert(expression === use, "Didn't expect expression === use"); // Else shouldn't have been in `collectIdentifiers`
-                    var idName = namedBindingsNames.get(propertyName);
-                    if (idName === undefined) {
-                        idName = makeUniqueName(propertyName, identifiers);
-                        namedBindingsNames.set(propertyName, idName);
+                    var propertyName = parent.name.text;
+                    if (propertyName === "default") {
+                        needDefaultImport = true;
+                        var importDefaultName = use.getText();
+                        (useSitesToUnqualify !== null && useSitesToUnqualify !== void 0 ? useSitesToUnqualify : (useSitesToUnqualify = new ts.Map())).set(parent, ts.factory.createIdentifier(importDefaultName));
+                    }
+                    else {
+                        ts.Debug.assert(parent.expression === use, "Didn't expect expression === use"); // Else shouldn't have been in `collectIdentifiers`
+                        var idName = namedBindingsNames.get(propertyName);
+                        if (idName === undefined) {
+                            idName = makeUniqueName(propertyName, identifiers);
+                            namedBindingsNames.set(propertyName, idName);
+                        }
+                        (useSitesToUnqualify !== null && useSitesToUnqualify !== void 0 ? useSitesToUnqualify : (useSitesToUnqualify = new ts.Map())).set(parent, ts.factory.createIdentifier(idName));
                     }
-                    (useSitesToUnqualify !== null && useSitesToUnqualify !== void 0 ? useSitesToUnqualify : (useSitesToUnqualify = new ts.Map())).set(parent, ts.factory.createIdentifier(idName));
                 }
                 else {
                     needDefaultImport = true;
@@ -138090,11 +142062,11 @@ var ts;
         function isFreeIdentifier(node) {
             var parent = node.parent;
             switch (parent.kind) {
-                case 201 /* PropertyAccessExpression */:
+                case 202 /* PropertyAccessExpression */:
                     return parent.name !== node;
-                case 198 /* BindingElement */:
+                case 199 /* BindingElement */:
                     return parent.propertyName !== node;
-                case 265 /* ImportSpecifier */:
+                case 266 /* ImportSpecifier */:
                     return parent.propertyName !== node;
                 default:
                     return true;
@@ -138571,87 +142543,138 @@ var ts;
             ImportFixKind[ImportFixKind["AddToExisting"] = 2] = "AddToExisting";
             ImportFixKind[ImportFixKind["AddNew"] = 3] = "AddNew";
         })(ImportFixKind || (ImportFixKind = {}));
-        var ImportKind;
-        (function (ImportKind) {
-            ImportKind[ImportKind["Named"] = 0] = "Named";
-            ImportKind[ImportKind["Default"] = 1] = "Default";
-            ImportKind[ImportKind["Namespace"] = 2] = "Namespace";
-            ImportKind[ImportKind["CommonJS"] = 3] = "CommonJS";
-        })(ImportKind || (ImportKind = {}));
         function getImportCompletionAction(exportedSymbol, moduleSymbol, sourceFile, symbolName, host, program, formatContext, position, preferences) {
             var compilerOptions = program.getCompilerOptions();
             var exportInfos = ts.pathIsBareSpecifier(ts.stripQuotes(moduleSymbol.name))
-                ? [getSymbolExportInfoForSymbol(exportedSymbol, moduleSymbol, sourceFile, program, host)]
+                ? [getSymbolExportInfoForSymbol(exportedSymbol, moduleSymbol, program, host)]
                 : getAllReExportingModules(sourceFile, exportedSymbol, moduleSymbol, symbolName, host, program, /*useAutoImportProvider*/ true);
             var useRequire = shouldUseRequire(sourceFile, program);
             var preferTypeOnlyImport = compilerOptions.importsNotUsedAsValues === 2 /* Error */ && !ts.isSourceFileJS(sourceFile) && ts.isValidTypeOnlyAliasUseSite(ts.getTokenAtPosition(sourceFile, position));
-            var moduleSpecifier = getBestFix(getNewImportInfos(program, sourceFile, position, preferTypeOnlyImport, useRequire, exportInfos, host, preferences), sourceFile, program, host).moduleSpecifier;
             var fix = getImportFixForSymbol(sourceFile, exportInfos, moduleSymbol, symbolName, program, position, preferTypeOnlyImport, useRequire, host, preferences);
-            return { moduleSpecifier: moduleSpecifier, codeAction: codeFixActionToCodeAction(codeActionForFix({ host: host, formatContext: formatContext, preferences: preferences }, sourceFile, symbolName, fix, ts.getQuotePreference(sourceFile, preferences))) };
+            return { moduleSpecifier: fix.moduleSpecifier, codeAction: codeFixActionToCodeAction(codeActionForFix({ host: host, formatContext: formatContext, preferences: preferences }, sourceFile, symbolName, fix, ts.getQuotePreference(sourceFile, preferences))) };
         }
         codefix.getImportCompletionAction = getImportCompletionAction;
         function getImportFixForSymbol(sourceFile, exportInfos, moduleSymbol, symbolName, program, position, preferTypeOnlyImport, useRequire, host, preferences) {
             ts.Debug.assert(exportInfos.some(function (info) { return info.moduleSymbol === moduleSymbol; }), "Some exportInfo should match the specified moduleSymbol");
-            // We sort the best codefixes first, so taking `first` is best.
-            return getBestFix(getFixForImport(exportInfos, symbolName, position, preferTypeOnlyImport, useRequire, program, sourceFile, host, preferences), sourceFile, program, host);
+            return getBestFix(getImportFixes(exportInfos, symbolName, position, preferTypeOnlyImport, useRequire, program, sourceFile, host, preferences), sourceFile, host);
         }
         function codeFixActionToCodeAction(_a) {
             var description = _a.description, changes = _a.changes, commands = _a.commands;
             return { description: description, changes: changes, commands: commands };
         }
-        function getSymbolExportInfoForSymbol(symbol, moduleSymbol, importingFile, program, host) {
+        function getSymbolExportInfoForSymbol(symbol, moduleSymbol, program, host) {
             var _a, _b;
             var compilerOptions = program.getCompilerOptions();
-            var mainProgramInfo = getInfoWithChecker(program.getTypeChecker());
+            var mainProgramInfo = getInfoWithChecker(program.getTypeChecker(), /*isFromPackageJson*/ false);
             if (mainProgramInfo) {
                 return mainProgramInfo;
             }
             var autoImportProvider = (_b = (_a = host.getPackageJsonAutoImportProvider) === null || _a === void 0 ? void 0 : _a.call(host)) === null || _b === void 0 ? void 0 : _b.getTypeChecker();
-            return ts.Debug.checkDefined(autoImportProvider && getInfoWithChecker(autoImportProvider), "Could not find symbol in specified module for code actions");
-            function getInfoWithChecker(checker) {
-                var defaultInfo = getDefaultLikeExportInfo(importingFile, moduleSymbol, checker, compilerOptions);
+            return ts.Debug.checkDefined(autoImportProvider && getInfoWithChecker(autoImportProvider, /*isFromPackageJson*/ true), "Could not find symbol in specified module for code actions");
+            function getInfoWithChecker(checker, isFromPackageJson) {
+                var defaultInfo = getDefaultLikeExportInfo(moduleSymbol, checker, compilerOptions);
                 if (defaultInfo && ts.skipAlias(defaultInfo.symbol, checker) === symbol) {
-                    return { moduleSymbol: moduleSymbol, importKind: defaultInfo.kind, exportedSymbolIsTypeOnly: isTypeOnlySymbol(symbol, checker) };
+                    return { symbol: defaultInfo.symbol, moduleSymbol: moduleSymbol, exportKind: defaultInfo.exportKind, exportedSymbolIsTypeOnly: isTypeOnlySymbol(symbol, checker), isFromPackageJson: isFromPackageJson };
                 }
                 var named = checker.tryGetMemberInModuleExportsAndProperties(symbol.name, moduleSymbol);
                 if (named && ts.skipAlias(named, checker) === symbol) {
-                    return { moduleSymbol: moduleSymbol, importKind: 0 /* Named */, exportedSymbolIsTypeOnly: isTypeOnlySymbol(symbol, checker) };
+                    return { symbol: named, moduleSymbol: moduleSymbol, exportKind: 0 /* Named */, exportedSymbolIsTypeOnly: isTypeOnlySymbol(symbol, checker), isFromPackageJson: isFromPackageJson };
                 }
             }
         }
         function getAllReExportingModules(importingFile, exportedSymbol, exportingModuleSymbol, symbolName, host, program, useAutoImportProvider) {
             var result = [];
             var compilerOptions = program.getCompilerOptions();
-            forEachExternalModuleToImportFrom(program, host, importingFile, /*filterByPackageJson*/ false, useAutoImportProvider, function (moduleSymbol, moduleFile, program) {
+            var getModuleSpecifierResolutionHost = ts.memoizeOne(function (isFromPackageJson) {
+                return ts.createModuleSpecifierResolutionHost(isFromPackageJson ? host.getPackageJsonAutoImportProvider() : program, host);
+            });
+            forEachExternalModuleToImportFrom(program, host, useAutoImportProvider, function (moduleSymbol, moduleFile, program, isFromPackageJson) {
                 var checker = program.getTypeChecker();
                 // Don't import from a re-export when looking "up" like to `./index` or `../index`.
                 if (moduleFile && moduleSymbol !== exportingModuleSymbol && ts.startsWith(importingFile.fileName, ts.getDirectoryPath(moduleFile.fileName))) {
                     return;
                 }
-                var defaultInfo = getDefaultLikeExportInfo(importingFile, moduleSymbol, checker, compilerOptions);
-                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) });
+                var defaultInfo = getDefaultLikeExportInfo(moduleSymbol, checker, compilerOptions);
+                if (defaultInfo && (defaultInfo.name === symbolName || moduleSymbolToValidIdentifier(moduleSymbol, compilerOptions.target) === symbolName) && ts.skipAlias(defaultInfo.symbol, checker) === exportedSymbol && isImportable(program, moduleFile, isFromPackageJson)) {
+                    result.push({ symbol: defaultInfo.symbol, moduleSymbol: moduleSymbol, exportKind: defaultInfo.exportKind, exportedSymbolIsTypeOnly: isTypeOnlySymbol(defaultInfo.symbol, checker), isFromPackageJson: isFromPackageJson });
                 }
                 for (var _i = 0, _a = checker.getExportsAndPropertiesOfModule(moduleSymbol); _i < _a.length; _i++) {
                     var exported = _a[_i];
-                    if (exported.name === symbolName && ts.skipAlias(exported, checker) === exportedSymbol) {
-                        result.push({ moduleSymbol: moduleSymbol, importKind: 0 /* Named */, exportedSymbolIsTypeOnly: isTypeOnlySymbol(exported, checker) });
+                    if (exported.name === symbolName && ts.skipAlias(exported, checker) === exportedSymbol && isImportable(program, moduleFile, isFromPackageJson)) {
+                        result.push({ symbol: exported, moduleSymbol: moduleSymbol, exportKind: 0 /* Named */, exportedSymbolIsTypeOnly: isTypeOnlySymbol(exported, checker), isFromPackageJson: isFromPackageJson });
                     }
                 }
             });
             return result;
+            function isImportable(program, moduleFile, isFromPackageJson) {
+                var _a;
+                return !moduleFile || ts.isImportableFile(program, importingFile, moduleFile, /*packageJsonFilter*/ undefined, getModuleSpecifierResolutionHost(isFromPackageJson), (_a = host.getModuleSpecifierCache) === null || _a === void 0 ? void 0 : _a.call(host));
+            }
         }
+        function getModuleSpecifierForBestExportInfo(exportInfo, importingFile, program, host, preferences) {
+            return getBestFix(getNewImportFixes(program, importingFile, /*position*/ undefined, /*preferTypeOnlyImport*/ false, /*useRequire*/ false, exportInfo, host, preferences), importingFile, host);
+        }
+        codefix.getModuleSpecifierForBestExportInfo = getModuleSpecifierForBestExportInfo;
+        function getSymbolToExportInfoMap(importingFile, host, program) {
+            var _a, _b, _c, _d, _e, _f, _g, _h;
+            var start = ts.timestamp();
+            // Pulling the AutoImportProvider project will trigger its updateGraph if pending,
+            // which will invalidate the export map cache if things change, so pull it before
+            // checking the cache.
+            (_a = host.getPackageJsonAutoImportProvider) === null || _a === void 0 ? void 0 : _a.call(host);
+            var cache = (_b = host.getExportMapCache) === null || _b === void 0 ? void 0 : _b.call(host);
+            if (cache) {
+                var cached = cache.get(importingFile.path, program.getTypeChecker(), (_c = host.getProjectVersion) === null || _c === void 0 ? void 0 : _c.call(host));
+                if (cached) {
+                    (_d = host.log) === null || _d === void 0 ? void 0 : _d.call(host, "getSymbolToExportInfoMap: cache hit");
+                    return cached;
+                }
+                else {
+                    (_e = host.log) === null || _e === void 0 ? void 0 : _e.call(host, "getSymbolToExportInfoMap: cache miss or empty; calculating new results");
+                }
+            }
+            var result = ts.createMultiMap();
+            var compilerOptions = program.getCompilerOptions();
+            var target = ts.getEmitScriptTarget(compilerOptions);
+            forEachExternalModuleToImportFrom(program, host, /*useAutoImportProvider*/ true, function (moduleSymbol, _moduleFile, program, isFromPackageJson) {
+                var checker = program.getTypeChecker();
+                var defaultInfo = getDefaultLikeExportInfo(moduleSymbol, checker, compilerOptions);
+                if (defaultInfo) {
+                    var name = ts.getNameForExportedSymbol(ts.getLocalSymbolForExportDefault(defaultInfo.symbol) || defaultInfo.symbol, target);
+                    result.add(key(name, defaultInfo.symbol, moduleSymbol, checker), { symbol: defaultInfo.symbol, moduleSymbol: moduleSymbol, exportKind: defaultInfo.exportKind, exportedSymbolIsTypeOnly: isTypeOnlySymbol(defaultInfo.symbol, checker), isFromPackageJson: isFromPackageJson });
+                }
+                var seenExports = new ts.Map();
+                for (var _i = 0, _a = checker.getExportsAndPropertiesOfModule(moduleSymbol); _i < _a.length; _i++) {
+                    var exported = _a[_i];
+                    if (exported !== (defaultInfo === null || defaultInfo === void 0 ? void 0 : defaultInfo.symbol) && ts.addToSeen(seenExports, exported)) {
+                        result.add(key(ts.getNameForExportedSymbol(exported, target), exported, moduleSymbol, checker), { symbol: exported, moduleSymbol: moduleSymbol, exportKind: 0 /* Named */, exportedSymbolIsTypeOnly: isTypeOnlySymbol(exported, checker), isFromPackageJson: isFromPackageJson });
+                    }
+                }
+            });
+            if (cache) {
+                (_f = host.log) === null || _f === void 0 ? void 0 : _f.call(host, "getSymbolToExportInfoMap: caching results");
+                cache.set(result, (_g = host.getProjectVersion) === null || _g === void 0 ? void 0 : _g.call(host));
+            }
+            (_h = host.log) === null || _h === void 0 ? void 0 : _h.call(host, "getSymbolToExportInfoMap: done in " + (ts.timestamp() - start) + " ms");
+            return result;
+            function key(name, alias, moduleSymbol, checker) {
+                var moduleName = ts.stripQuotes(moduleSymbol.name);
+                var moduleKey = ts.isExternalModuleNameRelative(moduleName) ? "/" : moduleName;
+                return name + "|" + ts.getSymbolId(ts.skipAlias(alias, checker)) + "|" + moduleKey;
+            }
+        }
+        codefix.getSymbolToExportInfoMap = getSymbolToExportInfoMap;
         function isTypeOnlySymbol(s, checker) {
             return !(ts.skipAlias(s, checker).flags & 111551 /* Value */);
         }
         function isTypeOnlyPosition(sourceFile, position) {
             return ts.isValidTypeOnlyAliasUseSite(ts.getTokenAtPosition(sourceFile, position));
         }
-        function getFixForImport(exportInfos, symbolName, 
+        function getImportFixes(exportInfos, symbolName, 
         /** undefined only for missing JSX namespace */
         position, preferTypeOnlyImport, useRequire, program, sourceFile, host, preferences) {
             var checker = program.getTypeChecker();
-            var existingImports = ts.flatMap(exportInfos, function (info) { return getExistingImportDeclarations(info, checker, sourceFile); });
+            var existingImports = ts.flatMap(exportInfos, function (info) { return getExistingImportDeclarations(info, checker, sourceFile, program.getCompilerOptions()); });
             var useNamespace = position === undefined ? undefined : tryUseExistingNamespaceImport(existingImports, symbolName, position, checker);
             var addToExisting = tryAddToExistingImport(existingImports, position !== undefined && isTypeOnlyPosition(sourceFile, position));
             // Don't bother providing an action to add a new import if we can add to an existing one.
@@ -138674,10 +142697,11 @@ var ts;
             return ts.firstDefined(existingImports, function (_a) {
                 var declaration = _a.declaration;
                 var namespacePrefix = getNamespaceLikeImportText(declaration);
-                if (namespacePrefix) {
+                var moduleSpecifier = ts.tryGetModuleSpecifierFromDeclaration(declaration);
+                if (namespacePrefix && moduleSpecifier) {
                     var moduleSymbol = getTargetModuleFromNamespaceLikeImport(declaration, checker);
                     if (moduleSymbol && moduleSymbol.exports.has(ts.escapeLeadingUnderscores(symbolName))) {
-                        return { kind: 0 /* UseNamespace */, namespacePrefix: namespacePrefix, position: position };
+                        return { kind: 0 /* UseNamespace */, namespacePrefix: namespacePrefix, position: position, moduleSpecifier: moduleSpecifier };
                     }
                 }
             });
@@ -138685,11 +142709,11 @@ var ts;
         function getTargetModuleFromNamespaceLikeImport(declaration, checker) {
             var _a;
             switch (declaration.kind) {
-                case 249 /* VariableDeclaration */:
+                case 250 /* VariableDeclaration */:
                     return checker.resolveExternalModuleName(declaration.initializer.arguments[0]);
-                case 260 /* ImportEqualsDeclaration */:
+                case 261 /* ImportEqualsDeclaration */:
                     return checker.getAliasedSymbol(declaration.symbol);
-                case 261 /* ImportDeclaration */:
+                case 262 /* 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:
@@ -138699,11 +142723,11 @@ var ts;
         function getNamespaceLikeImportText(declaration) {
             var _a, _b, _c;
             switch (declaration.kind) {
-                case 249 /* VariableDeclaration */:
+                case 250 /* VariableDeclaration */:
                     return (_a = ts.tryCast(declaration.name, ts.isIdentifier)) === null || _a === void 0 ? void 0 : _a.text;
-                case 260 /* ImportEqualsDeclaration */:
+                case 261 /* ImportEqualsDeclaration */:
                     return declaration.name.text;
-                case 261 /* ImportDeclaration */:
+                case 262 /* 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);
@@ -138712,31 +142736,38 @@ var ts;
         function tryAddToExistingImport(existingImports, canUseTypeOnlyImport) {
             return ts.firstDefined(existingImports, function (_a) {
                 var declaration = _a.declaration, importKind = _a.importKind;
-                if (declaration.kind === 260 /* ImportEqualsDeclaration */)
+                if (declaration.kind === 261 /* ImportEqualsDeclaration */)
                     return undefined;
-                if (declaration.kind === 249 /* VariableDeclaration */) {
-                    return (importKind === 0 /* Named */ || importKind === 1 /* Default */) && declaration.name.kind === 196 /* ObjectBindingPattern */
+                if (declaration.kind === 250 /* VariableDeclaration */) {
+                    return (importKind === 0 /* Named */ || importKind === 1 /* Default */) && declaration.name.kind === 197 /* ObjectBindingPattern */
                         ? { kind: 2 /* AddToExisting */, importClauseOrBindingPattern: declaration.name, importKind: importKind, moduleSpecifier: declaration.initializer.arguments[0].text, canUseTypeOnlyImport: false }
                         : undefined;
                 }
                 var importClause = declaration.importClause;
-                if (!importClause)
+                if (!importClause || !ts.isStringLiteralLike(declaration.moduleSpecifier))
                     return undefined;
                 var name = importClause.name, namedBindings = importClause.namedBindings;
-                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 }
+                // A type-only import may not have both a default and named imports, so the only way a name can
+                // be added to an existing type-only import is adding a named import to existing named bindings.
+                if (importClause.isTypeOnly && !(importKind === 0 /* Named */ && namedBindings))
+                    return undefined;
+                return importKind === 1 /* Default */ && !name || importKind === 0 /* Named */ && (!namedBindings || namedBindings.kind === 265 /* NamedImports */)
+                    ? { kind: 2 /* AddToExisting */, importClauseOrBindingPattern: importClause, importKind: importKind, moduleSpecifier: declaration.moduleSpecifier.text, canUseTypeOnlyImport: canUseTypeOnlyImport }
                     : undefined;
             });
         }
-        function getExistingImportDeclarations(_a, checker, sourceFile) {
-            var moduleSymbol = _a.moduleSymbol, importKind = _a.importKind, exportedSymbolIsTypeOnly = _a.exportedSymbolIsTypeOnly;
+        function getExistingImportDeclarations(_a, checker, importingFile, compilerOptions) {
+            var moduleSymbol = _a.moduleSymbol, exportKind = _a.exportKind, exportedSymbolIsTypeOnly = _a.exportedSymbolIsTypeOnly;
             // Can't use an es6 import for a type in JS.
-            return exportedSymbolIsTypeOnly && ts.isSourceFileJS(sourceFile) ? ts.emptyArray : ts.mapDefined(sourceFile.imports, function (moduleSpecifier) {
+            if (exportedSymbolIsTypeOnly && ts.isSourceFileJS(importingFile))
+                return ts.emptyArray;
+            var importKind = getImportKind(importingFile, exportKind, compilerOptions);
+            return ts.mapDefined(importingFile.imports, function (moduleSpecifier) {
                 var i = ts.importFromModuleSpecifier(moduleSpecifier);
-                if (ts.isRequireVariableDeclaration(i.parent, /*requireStringLiteralLikeArgument*/ true)) {
+                if (ts.isRequireVariableDeclaration(i.parent)) {
                     return checker.resolveExternalModuleName(moduleSpecifier) === moduleSymbol ? { declaration: i.parent, importKind: importKind } : undefined;
                 }
-                if (i.kind === 261 /* ImportDeclaration */ || i.kind === 260 /* ImportEqualsDeclaration */) {
+                if (i.kind === 262 /* ImportDeclaration */ || i.kind === 261 /* ImportEqualsDeclaration */) {
                     return checker.getSymbolAtLocation(moduleSpecifier) === moduleSymbol ? { declaration: i, importKind: importKind } : undefined;
                 }
             });
@@ -138769,32 +142800,29 @@ var ts;
             // 5. Literally nothing to go on
             return true;
         }
-        function getNewImportInfos(program, sourceFile, position, preferTypeOnlyImport, useRequire, moduleSymbols, host, preferences) {
+        function getNewImportFixes(program, sourceFile, position, preferTypeOnlyImport, useRequire, moduleSymbols, host, preferences) {
             var isJs = ts.isSourceFileJS(sourceFile);
             var compilerOptions = program.getCompilerOptions();
-            return ts.flatMap(moduleSymbols, function (_a) {
-                var moduleSymbol = _a.moduleSymbol, importKind = _a.importKind, exportedSymbolIsTypeOnly = _a.exportedSymbolIsTypeOnly;
-                return ts.moduleSpecifiers.getModuleSpecifiers(moduleSymbol, program.getTypeChecker(), compilerOptions, sourceFile, ts.createModuleSpecifierResolutionHost(program, host), preferences)
+            var moduleSpecifierResolutionHost = ts.createModuleSpecifierResolutionHost(program, host);
+            return ts.flatMap(moduleSymbols, function (exportInfo) {
+                return ts.moduleSpecifiers.getModuleSpecifiers(exportInfo.moduleSymbol, program.getTypeChecker(), compilerOptions, sourceFile, moduleSpecifierResolutionHost, preferences)
                     .map(function (moduleSpecifier) {
                     // `position` should only be undefined at a missing jsx namespace, in which case we shouldn't be looking for pure types.
-                    return exportedSymbolIsTypeOnly && isJs
-                        ? { kind: 1 /* ImportType */, moduleSpecifier: moduleSpecifier, position: ts.Debug.checkDefined(position, "position should be defined") }
-                        : { kind: 3 /* AddNew */, moduleSpecifier: moduleSpecifier, importKind: importKind, useRequire: useRequire, typeOnly: preferTypeOnlyImport };
+                    return exportInfo.exportedSymbolIsTypeOnly && isJs && position !== undefined
+                        ? { kind: 1 /* ImportType */, moduleSpecifier: moduleSpecifier, position: position, exportInfo: exportInfo }
+                        : { kind: 3 /* AddNew */, moduleSpecifier: moduleSpecifier, importKind: getImportKind(sourceFile, exportInfo.exportKind, compilerOptions), useRequire: useRequire, typeOnly: preferTypeOnlyImport, exportInfo: exportInfo };
                 });
             });
         }
         function getFixesForAddImport(exportInfos, existingImports, program, sourceFile, position, preferTypeOnlyImport, useRequire, host, preferences) {
             var existingDeclaration = ts.firstDefined(existingImports, function (info) { return newImportInfoFromExistingSpecifier(info, preferTypeOnlyImport, useRequire); });
-            return existingDeclaration ? [existingDeclaration] : getNewImportInfos(program, sourceFile, position, preferTypeOnlyImport, useRequire, exportInfos, host, preferences);
+            return existingDeclaration ? [existingDeclaration] : getNewImportFixes(program, sourceFile, position, preferTypeOnlyImport, useRequire, exportInfos, host, preferences);
         }
         function newImportInfoFromExistingSpecifier(_a, preferTypeOnlyImport, useRequire) {
             var declaration = _a.declaration, importKind = _a.importKind;
-            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 }
+            var moduleSpecifier = ts.tryGetModuleSpecifierFromDeclaration(declaration);
+            return moduleSpecifier
+                ? { kind: 3 /* AddNew */, moduleSpecifier: moduleSpecifier, importKind: importKind, typeOnly: preferTypeOnlyImport, useRequire: useRequire }
                 : undefined;
         }
         function getFixesInfo(context, errorCode, pos, useAutoImportProvider) {
@@ -138802,18 +142830,18 @@ var ts;
             var info = errorCode === ts.Diagnostics._0_refers_to_a_UMD_global_but_the_current_file_is_a_module_Consider_adding_an_import_instead.code
                 ? getFixesInfoForUMDImport(context, symbolToken)
                 : ts.isIdentifier(symbolToken) ? getFixesInfoForNonUMDImport(context, symbolToken, useAutoImportProvider) : undefined;
-            return info && __assign(__assign({}, info), { fixes: sortFixes(info.fixes, context.sourceFile, context.program, context.host) });
+            return info && __assign(__assign({}, info), { fixes: sortFixes(info.fixes, context.sourceFile, context.host) });
         }
-        function sortFixes(fixes, sourceFile, program, host) {
-            var allowsImportingSpecifier = createAutoImportFilter(sourceFile, program, host).allowsImportingSpecifier;
+        function sortFixes(fixes, sourceFile, host) {
+            var allowsImportingSpecifier = ts.createPackageJsonImportFilter(sourceFile, host).allowsImportingSpecifier;
             return ts.sort(fixes, function (a, b) { return ts.compareValues(a.kind, b.kind) || compareModuleSpecifiers(a, b, allowsImportingSpecifier); });
         }
-        function getBestFix(fixes, sourceFile, program, host) {
+        function getBestFix(fixes, sourceFile, host) {
             // These will always be placed first if available, and are better than other kinds
             if (fixes[0].kind === 0 /* UseNamespace */ || fixes[0].kind === 2 /* AddToExisting */) {
                 return fixes[0];
             }
-            var allowsImportingSpecifier = createAutoImportFilter(sourceFile, program, host).allowsImportingSpecifier;
+            var allowsImportingSpecifier = ts.createPackageJsonImportFilter(sourceFile, host).allowsImportingSpecifier;
             return fixes.reduce(function (best, fix) {
                 return compareModuleSpecifiers(fix, best, allowsImportingSpecifier) === -1 /* LessThan */ ? fix : best;
             });
@@ -138833,9 +142861,9 @@ var ts;
                 return undefined;
             var symbol = checker.getAliasedSymbol(umdSymbol);
             var symbolName = umdSymbol.name;
-            var exportInfos = [{ moduleSymbol: symbol, importKind: getUmdImportKind(sourceFile, program.getCompilerOptions()), exportedSymbolIsTypeOnly: false }];
+            var exportInfos = [{ symbol: umdSymbol, moduleSymbol: symbol, exportKind: 3 /* UMD */, exportedSymbolIsTypeOnly: false, isFromPackageJson: false }];
             var useRequire = shouldUseRequire(sourceFile, program);
-            var fixes = getFixForImport(exportInfos, symbolName, ts.isIdentifier(token) ? token.getStart(sourceFile) : undefined, /*preferTypeOnlyImport*/ false, useRequire, program, sourceFile, host, preferences);
+            var fixes = getImportFixes(exportInfos, symbolName, ts.isIdentifier(token) ? token.getStart(sourceFile) : undefined, /*preferTypeOnlyImport*/ false, useRequire, program, sourceFile, host, preferences);
             return { fixes: fixes, symbolName: symbolName };
         }
         function getUmdSymbol(token, checker) {
@@ -138849,6 +142877,16 @@ var ts;
                 ? ts.tryCast(checker.resolveName(checker.getJsxNamespace(parent), ts.isJsxOpeningLikeElement(parent) ? token : parent, 111551 /* Value */, /*excludeGlobals*/ false), ts.isUMDExportSymbol)
                 : undefined;
         }
+        function getImportKind(importingFile, exportKind, compilerOptions) {
+            switch (exportKind) {
+                case 0 /* Named */: return 0 /* Named */;
+                case 1 /* Default */: return 1 /* Default */;
+                case 2 /* ExportEquals */: return getExportEqualsImportKind(importingFile, compilerOptions);
+                case 3 /* UMD */: return getUmdImportKind(importingFile, compilerOptions);
+                default: return ts.Debug.assertNever(exportKind);
+            }
+        }
+        codefix.getImportKind = getImportKind;
         function getUmdImportKind(importingFile, compilerOptions) {
             // Import a synthetic `default` if enabled.
             if (ts.getAllowSyntheticDefaultImports(compilerOptions)) {
@@ -138878,22 +142916,22 @@ var ts;
         function getFixesInfoForNonUMDImport(_a, symbolToken, useAutoImportProvider) {
             var sourceFile = _a.sourceFile, program = _a.program, cancellationToken = _a.cancellationToken, host = _a.host, preferences = _a.preferences;
             var checker = program.getTypeChecker();
-            var symbolName = getSymbolName(sourceFile, checker, symbolToken);
+            var compilerOptions = program.getCompilerOptions();
+            var symbolName = getSymbolName(sourceFile, checker, symbolToken, compilerOptions);
             // "default" is a keyword and not a legal identifier for the import, so we don't expect it here
             ts.Debug.assert(symbolName !== "default" /* Default */, "'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, 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);
+                return getImportFixes(exportInfos, symbolName, symbolToken.getStart(sourceFile), preferTypeOnlyImport, useRequire, program, sourceFile, host, preferences);
             }));
             return { fixes: fixes, symbolName: symbolName };
         }
-        function getSymbolName(sourceFile, checker, symbolToken) {
+        function getSymbolName(sourceFile, checker, symbolToken, compilerOptions) {
             var parent = symbolToken.parent;
-            if ((ts.isJsxOpeningLikeElement(parent) || ts.isJsxClosingElement(parent)) && parent.tagName === symbolToken) {
+            if ((ts.isJsxOpeningLikeElement(parent) || ts.isJsxClosingElement(parent)) && parent.tagName === symbolToken && compilerOptions.jsx !== 4 /* ReactJSX */ && compilerOptions.jsx !== 5 /* ReactJSXDev */) {
                 var jsxNamespace = checker.getJsxNamespace(sourceFile);
                 if (ts.isIntrinsicJsxName(symbolToken.text) || !checker.resolveName(jsxNamespace, parent, 111551 /* Value */, /*excludeGlobals*/ true)) {
                     return jsxNamespace;
@@ -138902,43 +142940,55 @@ 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, program, useAutoImportProvider, host) {
+        function getExportInfos(symbolName, currentTokenMeaning, cancellationToken, fromFile, program, useAutoImportProvider, host) {
+            var _a;
             // 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, checker) {
-                originalSymbolToExportInfos.add(ts.getUniqueSymbolId(exportedSymbol, checker).toString(), { moduleSymbol: moduleSymbol, importKind: importKind, exportedSymbolIsTypeOnly: isTypeOnlySymbol(exportedSymbol, checker) });
+            var packageJsonFilter = ts.createPackageJsonImportFilter(fromFile, host);
+            var moduleSpecifierCache = (_a = host.getModuleSpecifierCache) === null || _a === void 0 ? void 0 : _a.call(host);
+            var getModuleSpecifierResolutionHost = ts.memoizeOne(function (isFromPackageJson) {
+                return ts.createModuleSpecifierResolutionHost(isFromPackageJson ? host.getPackageJsonAutoImportProvider() : program, host);
+            });
+            function addSymbol(moduleSymbol, toFile, exportedSymbol, exportKind, program, isFromPackageJson) {
+                var moduleSpecifierResolutionHost = getModuleSpecifierResolutionHost(isFromPackageJson);
+                if (toFile && ts.isImportableFile(program, fromFile, toFile, packageJsonFilter, moduleSpecifierResolutionHost, moduleSpecifierCache) ||
+                    !toFile && packageJsonFilter.allowsImportingAmbientModule(moduleSymbol, moduleSpecifierResolutionHost)) {
+                    var checker = program.getTypeChecker();
+                    originalSymbolToExportInfos.add(ts.getUniqueSymbolId(exportedSymbol, checker).toString(), { symbol: exportedSymbol, moduleSymbol: moduleSymbol, exportKind: exportKind, exportedSymbolIsTypeOnly: isTypeOnlySymbol(exportedSymbol, checker), isFromPackageJson: isFromPackageJson });
+                }
             }
-            forEachExternalModuleToImportFrom(program, host, sourceFile, /*filterByPackageJson*/ true, useAutoImportProvider, function (moduleSymbol, _, program) {
+            forEachExternalModuleToImportFrom(program, host, useAutoImportProvider, function (moduleSymbol, sourceFile, program, isFromPackageJson) {
                 var checker = program.getTypeChecker();
                 cancellationToken.throwIfCancellationRequested();
                 var compilerOptions = program.getCompilerOptions();
-                var defaultInfo = getDefaultLikeExportInfo(sourceFile, moduleSymbol, checker, compilerOptions);
+                var defaultInfo = getDefaultLikeExportInfo(moduleSymbol, checker, compilerOptions);
                 if (defaultInfo && (defaultInfo.name === symbolName || moduleSymbolToValidIdentifier(moduleSymbol, compilerOptions.target) === symbolName) && symbolHasMeaning(defaultInfo.symbolForMeaning, currentTokenMeaning)) {
-                    addSymbol(moduleSymbol, defaultInfo.symbol, defaultInfo.kind, checker);
+                    addSymbol(moduleSymbol, sourceFile, defaultInfo.symbol, defaultInfo.exportKind, program, isFromPackageJson);
                 }
                 // check exports with the same name
                 var exportSymbolWithIdenticalName = checker.tryGetMemberInModuleExportsAndProperties(symbolName, moduleSymbol);
                 if (exportSymbolWithIdenticalName && symbolHasMeaning(exportSymbolWithIdenticalName, currentTokenMeaning)) {
-                    addSymbol(moduleSymbol, exportSymbolWithIdenticalName, 0 /* Named */, checker);
+                    addSymbol(moduleSymbol, sourceFile, exportSymbolWithIdenticalName, 0 /* Named */, program, isFromPackageJson);
                 }
             });
             return originalSymbolToExportInfos;
         }
-        function getDefaultLikeExportInfo(importingFile, moduleSymbol, checker, compilerOptions) {
-            var exported = getDefaultLikeExportWorker(importingFile, moduleSymbol, checker, compilerOptions);
+        function getDefaultLikeExportInfo(moduleSymbol, checker, compilerOptions) {
+            var exported = getDefaultLikeExportWorker(moduleSymbol, checker);
             if (!exported)
                 return undefined;
-            var symbol = exported.symbol, kind = exported.kind;
+            var symbol = exported.symbol, exportKind = exported.exportKind;
             var info = getDefaultExportInfoWorker(symbol, checker, compilerOptions);
-            return info && __assign({ symbol: symbol, kind: kind }, info);
+            return info && __assign({ symbol: symbol, exportKind: exportKind }, info);
         }
-        function getDefaultLikeExportWorker(importingFile, moduleSymbol, checker, compilerOptions) {
+        function getDefaultLikeExportWorker(moduleSymbol, checker) {
+            var exportEquals = checker.resolveExternalModuleSymbol(moduleSymbol);
+            if (exportEquals !== moduleSymbol)
+                return { symbol: exportEquals, exportKind: 2 /* ExportEquals */ };
             var defaultExport = checker.tryGetMemberInModuleExports("default" /* Default */, moduleSymbol);
             if (defaultExport)
-                return { symbol: defaultExport, kind: 1 /* Default */ };
-            var exportEquals = checker.resolveExternalModuleSymbol(moduleSymbol);
-            return exportEquals === moduleSymbol ? undefined : { symbol: exportEquals, kind: getExportEqualsImportKind(importingFile, compilerOptions) };
+                return { symbol: defaultExport, exportKind: 1 /* Default */ };
         }
         function getExportEqualsImportKind(importingFile, compilerOptions) {
             var allowSyntheticDefaults = ts.getAllowSyntheticDefaultImports(compilerOptions);
@@ -138957,7 +143007,8 @@ var ts;
             //    on how to handle it.
             for (var _i = 0, _a = importingFile.statements; _i < _a.length; _i++) {
                 var statement = _a[_i];
-                if (ts.isImportEqualsDeclaration(statement)) {
+                // `import foo` parses as an ImportEqualsDeclaration even though it could be an ImportDeclaration
+                if (ts.isImportEqualsDeclaration(statement) && !ts.nodeIsMissing(statement.moduleReference)) {
                     return 3 /* CommonJS */;
                 }
             }
@@ -139035,7 +143086,7 @@ var ts;
             }
         }
         function doAddExistingFix(changes, sourceFile, clause, defaultImport, namedImports, canUseTypeOnlyImport) {
-            if (clause.kind === 196 /* ObjectBindingPattern */) {
+            if (clause.kind === 197 /* ObjectBindingPattern */) {
                 if (defaultImport) {
                     addElementToBindingPattern(clause, defaultImport, "default");
                 }
@@ -139162,48 +143213,23 @@ var ts;
             var declarations = _a.declarations;
             return ts.some(declarations, function (decl) { return !!(ts.getMeaningFromDeclaration(decl) & meaning); });
         }
-        function forEachExternalModuleToImportFrom(program, host, from, filterByPackageJson, useAutoImportProvider, cb) {
+        function forEachExternalModuleToImportFrom(program, host, useAutoImportProvider, cb) {
             var _a, _b;
-            forEachExternalModuleToImportFromInProgram(program, host, from, filterByPackageJson, function (module, file) { return cb(module, file, program, /*isFromPackageJson*/ false); });
+            forEachExternalModule(program.getTypeChecker(), program.getSourceFiles(), function (module, file) { return cb(module, file, program, /*isFromPackageJson*/ false); });
             var autoImportProvider = useAutoImportProvider && ((_a = host.getPackageJsonAutoImportProvider) === null || _a === void 0 ? void 0 : _a.call(host));
             if (autoImportProvider) {
                 var start = ts.timestamp();
-                forEachExternalModuleToImportFromInProgram(autoImportProvider, host, from, filterByPackageJson, function (module, file) { return cb(module, file, autoImportProvider, /*isFromPackageJson*/ true); });
+                forEachExternalModule(autoImportProvider.getTypeChecker(), autoImportProvider.getSourceFiles(), function (module, file) { return cb(module, file, autoImportProvider, /*isFromPackageJson*/ true); });
                 (_b = host.log) === null || _b === void 0 ? void 0 : _b.call(host, "forEachExternalModuleToImportFrom autoImportProvider: " + (ts.timestamp() - start));
             }
         }
         codefix.forEachExternalModuleToImportFrom = forEachExternalModuleToImportFrom;
-        function forEachExternalModuleToImportFromInProgram(program, host, from, filterByPackageJson, cb) {
-            var _a;
-            var filteredCount = 0;
-            var moduleSpecifierResolutionHost = ts.createModuleSpecifierResolutionHost(program, host);
-            var packageJson = filterByPackageJson && createAutoImportFilter(from, program, host, moduleSpecifierResolutionHost);
-            forEachExternalModule(program.getTypeChecker(), program.getSourceFiles(), function (module, sourceFile) {
-                if (sourceFile === undefined) {
-                    if (!packageJson || packageJson.allowsImportingAmbientModule(module)) {
-                        cb(module, sourceFile);
-                    }
-                    else if (packageJson) {
-                        filteredCount++;
-                    }
-                }
-                else if (sourceFile &&
-                    sourceFile !== from &&
-                    isImportableFile(program, from, sourceFile, moduleSpecifierResolutionHost)) {
-                    if (!packageJson || packageJson.allowsImportingSourceFile(sourceFile)) {
-                        cb(module, sourceFile);
-                    }
-                    else if (packageJson) {
-                        filteredCount++;
-                    }
-                }
-            });
-            (_a = host.log) === null || _a === void 0 ? void 0 : _a.call(host, "forEachExternalModuleToImportFrom: filtered out " + filteredCount + " modules by package.json contents");
-        }
         function forEachExternalModule(checker, allSourceFiles, cb) {
             for (var _i = 0, _a = checker.getAmbientModules(); _i < _a.length; _i++) {
                 var ambient = _a[_i];
-                cb(ambient, /*sourceFile*/ undefined);
+                if (!ts.stringContains(ambient.name, "*")) {
+                    cb(ambient, /*sourceFile*/ undefined);
+                }
             }
             for (var _b = 0, allSourceFiles_1 = allSourceFiles; _b < allSourceFiles_1.length; _b++) {
                 var sourceFile = allSourceFiles_1[_b];
@@ -139212,31 +143238,6 @@ var ts;
                 }
             }
         }
-        function isImportableFile(program, from, to, moduleSpecifierResolutionHost) {
-            var _a;
-            var getCanonicalFileName = ts.hostGetCanonicalFileName(moduleSpecifierResolutionHost);
-            var globalTypingsCache = (_a = moduleSpecifierResolutionHost.getGlobalTypingsCacheLocation) === null || _a === void 0 ? void 0 : _a.call(moduleSpecifierResolutionHost);
-            return !!ts.moduleSpecifiers.forEachFileNameOfModule(from.fileName, to.fileName, moduleSpecifierResolutionHost, 
-            /*preferSymlinks*/ false, function (toPath) {
-                var toFile = program.getSourceFile(toPath);
-                // Determine to import using toPath only if toPath is what we were looking at
-                // or there doesnt exist the file in the program by the symlink
-                return (toFile === to || !toFile) &&
-                    isImportablePath(from.fileName, toPath, getCanonicalFileName, globalTypingsCache);
-            });
-        }
-        /**
-         * Don't include something from a `node_modules` that isn't actually reachable by a global import.
-         * A relative import to node_modules is usually a bad idea.
-         */
-        function isImportablePath(fromPath, toPath, getCanonicalFileName, globalCachePath) {
-            // If it's in a `node_modules` but is not reachable from here via a global import, don't bother.
-            var toNodeModules = ts.forEachAncestorDirectory(toPath, function (ancestor) { return ts.getBaseFileName(ancestor) === "node_modules" ? ancestor : undefined; });
-            var toNodeModulesParent = toNodeModules && ts.getDirectoryPath(getCanonicalFileName(toNodeModules));
-            return toNodeModulesParent === undefined
-                || ts.startsWith(getCanonicalFileName(fromPath), toNodeModulesParent)
-                || (!!globalCachePath && ts.startsWith(getCanonicalFileName(globalCachePath), toNodeModulesParent));
-        }
         function moduleSymbolToValidIdentifier(moduleSymbol, target) {
             return moduleSpecifierToValidIdentifier(ts.removeFileExtension(ts.stripQuotes(moduleSymbol.name)), target);
         }
@@ -139268,99 +143269,122 @@ var ts;
             return !ts.isStringANonContextualKeyword(res) ? res || "_" : "_" + res;
         }
         codefix.moduleSpecifierToValidIdentifier = moduleSpecifierToValidIdentifier;
-        function createAutoImportFilter(fromFile, program, host, moduleSpecifierResolutionHost) {
-            if (moduleSpecifierResolutionHost === void 0) { moduleSpecifierResolutionHost = ts.createModuleSpecifierResolutionHost(program, host); }
-            var packageJsons = ((host.getPackageJsonsVisibleToFile && host.getPackageJsonsVisibleToFile(fromFile.fileName)) || ts.getPackageJsonsVisibleToFile(fromFile.fileName, host)).filter(function (p) { return p.parseable; });
-            var usesNodeCoreModules;
-            return { allowsImportingAmbientModule: allowsImportingAmbientModule, allowsImportingSourceFile: allowsImportingSourceFile, allowsImportingSpecifier: allowsImportingSpecifier, moduleSpecifierResolutionHost: moduleSpecifierResolutionHost };
-            function moduleSpecifierIsCoveredByPackageJson(specifier) {
-                var packageName = getNodeModuleRootSpecifier(specifier);
-                for (var _i = 0, packageJsons_1 = packageJsons; _i < packageJsons_1.length; _i++) {
-                    var packageJson = packageJsons_1[_i];
-                    if (packageJson.has(packageName) || packageJson.has(ts.getTypesPackageName(packageName))) {
-                        return true;
+    })(codefix = ts.codefix || (ts.codefix = {}));
+})(ts || (ts = {}));
+/* @internal */
+var ts;
+(function (ts) {
+    var codefix;
+    (function (codefix) {
+        var _a;
+        var fixName = "fixOverrideModifier";
+        var fixAddOverrideId = "fixAddOverrideModifier";
+        var fixRemoveOverrideId = "fixRemoveOverrideModifier";
+        var errorCodes = [
+            ts.Diagnostics.This_member_cannot_have_an_override_modifier_because_it_is_not_declared_in_the_base_class_0.code,
+            ts.Diagnostics.This_member_cannot_have_an_override_modifier_because_its_containing_class_0_does_not_extend_another_class.code,
+            ts.Diagnostics.This_member_must_have_an_override_modifier_because_it_overrides_an_abstract_method_that_is_declared_in_the_base_class_0.code,
+            ts.Diagnostics.This_member_must_have_an_override_modifier_because_it_overrides_a_member_in_the_base_class_0.code,
+            ts.Diagnostics.This_parameter_property_must_have_an_override_modifier_because_it_overrides_a_member_in_base_class_0.code
+        ];
+        var errorCodeFixIdMap = (_a = {},
+            _a[ts.Diagnostics.This_member_must_have_an_override_modifier_because_it_overrides_a_member_in_the_base_class_0.code] = [
+                ts.Diagnostics.Add_override_modifier, fixAddOverrideId, ts.Diagnostics.Add_all_missing_override_modifiers,
+            ],
+            _a[ts.Diagnostics.This_member_cannot_have_an_override_modifier_because_its_containing_class_0_does_not_extend_another_class.code] = [
+                ts.Diagnostics.Remove_override_modifier, fixRemoveOverrideId, ts.Diagnostics.Remove_all_unnecessary_override_modifiers
+            ],
+            _a[ts.Diagnostics.This_parameter_property_must_have_an_override_modifier_because_it_overrides_a_member_in_base_class_0.code] = [
+                ts.Diagnostics.Add_override_modifier, fixAddOverrideId, ts.Diagnostics.Add_all_missing_override_modifiers,
+            ],
+            _a[ts.Diagnostics.This_member_must_have_an_override_modifier_because_it_overrides_an_abstract_method_that_is_declared_in_the_base_class_0.code] = [
+                ts.Diagnostics.Add_override_modifier, fixAddOverrideId, ts.Diagnostics.Remove_all_unnecessary_override_modifiers
+            ],
+            _a[ts.Diagnostics.This_member_cannot_have_an_override_modifier_because_it_is_not_declared_in_the_base_class_0.code] = [
+                ts.Diagnostics.Remove_override_modifier, fixRemoveOverrideId, ts.Diagnostics.Remove_all_unnecessary_override_modifiers
+            ],
+            _a);
+        codefix.registerCodeFix({
+            errorCodes: errorCodes,
+            getCodeActions: function (context) {
+                var errorCode = context.errorCode, span = context.span, sourceFile = context.sourceFile;
+                var info = errorCodeFixIdMap[errorCode];
+                if (!info)
+                    return ts.emptyArray;
+                var descriptions = info[0], fixId = info[1], fixAllDescriptions = info[2];
+                if (ts.isSourceFileJS(sourceFile))
+                    return ts.emptyArray;
+                var changes = ts.textChanges.ChangeTracker.with(context, function (changes) { return dispatchChanges(changes, context, errorCode, span.start); });
+                return [
+                    codefix.createCodeFixActionMaybeFixAll(fixName, changes, descriptions, fixId, fixAllDescriptions)
+                ];
+            },
+            fixIds: [fixName, fixAddOverrideId, fixRemoveOverrideId],
+            getAllCodeActions: function (context) {
+                return codefix.codeFixAll(context, errorCodes, function (changes, diag) {
+                    var code = diag.code, start = diag.start, file = diag.file;
+                    var info = errorCodeFixIdMap[code];
+                    if (!info || info[1] !== context.fixId || ts.isSourceFileJS(file)) {
+                        return;
                     }
-                }
-                return false;
-            }
-            function allowsImportingAmbientModule(moduleSymbol) {
-                if (!packageJsons.length) {
-                    return true;
-                }
-                var declaringSourceFile = moduleSymbol.valueDeclaration.getSourceFile();
-                var declaringNodeModuleName = getNodeModulesPackageNameFromFileName(declaringSourceFile.fileName);
-                if (typeof declaringNodeModuleName === "undefined") {
-                    return true;
-                }
-                var declaredModuleSpecifier = ts.stripQuotes(moduleSymbol.getName());
-                if (isAllowedCoreNodeModulesImport(declaredModuleSpecifier)) {
-                    return true;
-                }
-                return moduleSpecifierIsCoveredByPackageJson(declaringNodeModuleName)
-                    || moduleSpecifierIsCoveredByPackageJson(declaredModuleSpecifier);
-            }
-            function allowsImportingSourceFile(sourceFile) {
-                if (!packageJsons.length) {
-                    return true;
-                }
-                var moduleSpecifier = getNodeModulesPackageNameFromFileName(sourceFile.fileName);
-                if (!moduleSpecifier) {
-                    return true;
-                }
-                return moduleSpecifierIsCoveredByPackageJson(moduleSpecifier);
+                    dispatchChanges(changes, context, code, start);
+                });
             }
-            /**
-             * Use for a specific module specifier that has already been resolved.
-             * Use `allowsImportingAmbientModule` or `allowsImportingSourceFile` to resolve
-             * the best module specifier for a given module _and_ determine if it’s importable.
-             */
-            function allowsImportingSpecifier(moduleSpecifier) {
-                if (!packageJsons.length || isAllowedCoreNodeModulesImport(moduleSpecifier)) {
-                    return true;
-                }
-                if (ts.pathIsRelative(moduleSpecifier) || ts.isRootedDiskPath(moduleSpecifier)) {
+        });
+        function dispatchChanges(changeTracker, context, errorCode, pos) {
+            switch (errorCode) {
+                case ts.Diagnostics.This_member_must_have_an_override_modifier_because_it_overrides_a_member_in_the_base_class_0.code:
+                case ts.Diagnostics.This_member_must_have_an_override_modifier_because_it_overrides_an_abstract_method_that_is_declared_in_the_base_class_0.code:
+                case ts.Diagnostics.This_parameter_property_must_have_an_override_modifier_because_it_overrides_a_member_in_base_class_0.code:
+                    return doAddOverrideModifierChange(changeTracker, context.sourceFile, pos);
+                case ts.Diagnostics.This_member_cannot_have_an_override_modifier_because_it_is_not_declared_in_the_base_class_0.code:
+                case ts.Diagnostics.This_member_cannot_have_an_override_modifier_because_its_containing_class_0_does_not_extend_another_class.code:
+                    return doRemoveOverrideModifierChange(changeTracker, context.sourceFile, pos);
+                default:
+                    ts.Debug.fail("Unexpected error code: " + errorCode);
+            }
+        }
+        function doAddOverrideModifierChange(changeTracker, sourceFile, pos) {
+            var classElement = findContainerClassElementLike(sourceFile, pos);
+            var modifiers = classElement.modifiers || ts.emptyArray;
+            var staticModifier = ts.find(modifiers, ts.isStaticModifier);
+            var accessibilityModifier = ts.find(modifiers, function (m) { return ts.isAccessibilityModifier(m.kind); });
+            var modifierPos = staticModifier ? staticModifier.end :
+                accessibilityModifier ? accessibilityModifier.end :
+                    classElement.decorators ? ts.skipTrivia(sourceFile.text, classElement.decorators.end) : classElement.getStart(sourceFile);
+            var options = accessibilityModifier || staticModifier ? { prefix: " " } : { suffix: " " };
+            changeTracker.insertModifierAt(sourceFile, modifierPos, 156 /* OverrideKeyword */, options);
+        }
+        function doRemoveOverrideModifierChange(changeTracker, sourceFile, pos) {
+            var classElement = findContainerClassElementLike(sourceFile, pos);
+            var overrideModifier = classElement.modifiers && ts.find(classElement.modifiers, function (modifier) { return modifier.kind === 156 /* OverrideKeyword */; });
+            ts.Debug.assertIsDefined(overrideModifier);
+            changeTracker.deleteModifier(sourceFile, overrideModifier);
+        }
+        function isClassElementLikeHasJSDoc(node) {
+            switch (node.kind) {
+                case 167 /* Constructor */:
+                case 164 /* PropertyDeclaration */:
+                case 166 /* MethodDeclaration */:
+                case 168 /* GetAccessor */:
+                case 169 /* SetAccessor */:
                     return true;
-                }
-                return moduleSpecifierIsCoveredByPackageJson(moduleSpecifier);
-            }
-            function isAllowedCoreNodeModulesImport(moduleSpecifier) {
-                // If we’re in JavaScript, it can be difficult to tell whether the user wants to import
-                // from Node core modules or not. We can start by seeing if the user is actually using
-                // any node core modules, as opposed to simply having @types/node accidentally as a
-                // dependency of a dependency.
-                if (ts.isSourceFileJS(fromFile) && ts.JsTyping.nodeCoreModules.has(moduleSpecifier)) {
-                    if (usesNodeCoreModules === undefined) {
-                        usesNodeCoreModules = ts.consumesNodeCoreModules(fromFile);
-                    }
-                    if (usesNodeCoreModules) {
-                        return true;
-                    }
-                }
-                return false;
-            }
-            function getNodeModulesPackageNameFromFileName(importedFileName) {
-                if (!ts.stringContains(importedFileName, "node_modules")) {
-                    return undefined;
-                }
-                var specifier = ts.moduleSpecifiers.getNodeModulesPackageName(host.getCompilationSettings(), fromFile.path, importedFileName, moduleSpecifierResolutionHost);
-                if (!specifier) {
-                    return undefined;
-                }
-                // Paths here are not node_modules, so we don’t care about them;
-                // returning anything will trigger a lookup in package.json.
-                if (!ts.pathIsRelative(specifier) && !ts.isRootedDiskPath(specifier)) {
-                    return getNodeModuleRootSpecifier(specifier);
-                }
-            }
-            function getNodeModuleRootSpecifier(fullSpecifier) {
-                var components = ts.getPathComponents(ts.getPackageNameFromTypesPackageName(fullSpecifier)).slice(1);
-                // Scoped packages
-                if (ts.startsWith(components[0], "@")) {
-                    return components[0] + "/" + components[1];
-                }
-                return components[0];
+                case 161 /* Parameter */:
+                    return ts.isParameterPropertyDeclaration(node, node.parent);
+                default:
+                    return false;
             }
         }
+        function findContainerClassElementLike(sourceFile, pos) {
+            var token = ts.getTokenAtPosition(sourceFile, pos);
+            var classElement = ts.findAncestor(token, function (node) {
+                if (ts.isClassLike(node))
+                    return "quit";
+                return isClassElementLikeHasJSDoc(node);
+            });
+            ts.Debug.assert(classElement && isClassElementLikeHasJSDoc(classElement));
+            return classElement;
+        }
     })(codefix = ts.codefix || (ts.codefix = {}));
 })(ts || (ts = {}));
 /* @internal */
@@ -139476,7 +143500,7 @@ var ts;
         });
         function getNamedTupleMember(sourceFile, pos) {
             var token = ts.getTokenAtPosition(sourceFile, pos);
-            return ts.findAncestor(token, function (t) { return t.kind === 192 /* NamedTupleMember */; });
+            return ts.findAncestor(token, function (t) { return t.kind === 193 /* NamedTupleMember */; });
         }
         function doChange(changes, sourceFile, namedTupleMember) {
             if (!namedTupleMember) {
@@ -139485,11 +143509,11 @@ var ts;
             var unwrappedType = namedTupleMember.type;
             var sawOptional = false;
             var sawRest = false;
-            while (unwrappedType.kind === 180 /* OptionalType */ || unwrappedType.kind === 181 /* RestType */ || unwrappedType.kind === 186 /* ParenthesizedType */) {
-                if (unwrappedType.kind === 180 /* OptionalType */) {
+            while (unwrappedType.kind === 181 /* OptionalType */ || unwrappedType.kind === 182 /* RestType */ || unwrappedType.kind === 187 /* ParenthesizedType */) {
+                if (unwrappedType.kind === 181 /* OptionalType */) {
                     sawOptional = true;
                 }
-                else if (unwrappedType.kind === 181 /* RestType */) {
+                else if (unwrappedType.kind === 182 /* RestType */) {
                     sawRest = true;
                 }
                 unwrappedType = unwrappedType.type;
@@ -139553,7 +143577,7 @@ var ts;
             var checker = context.program.getTypeChecker();
             var suggestedSymbol;
             if (ts.isPropertyAccessExpression(parent) && parent.name === node) {
-                ts.Debug.assert(ts.isIdentifierOrPrivateIdentifier(node), "Expected an identifier for spelling (property access)");
+                ts.Debug.assert(ts.isMemberName(node), "Expected an identifier for spelling (property access)");
                 var containingType = checker.getTypeAtLocation(parent.expression);
                 if (parent.flags & 32 /* OptionalChain */) {
                     containingType = checker.getNonNullableType(containingType);
@@ -139592,7 +143616,7 @@ var ts;
             var suggestion = ts.symbolName(suggestedSymbol);
             if (!ts.isIdentifierText(suggestion, target) && ts.isPropertyAccessExpression(node.parent)) {
                 var valDecl = suggestedSymbol.valueDeclaration;
-                if (ts.isNamedDeclaration(valDecl) && ts.isPrivateIdentifier(valDecl.name)) {
+                if (valDecl && ts.isNamedDeclaration(valDecl) && ts.isPrivateIdentifier(valDecl.name)) {
                     changes.replaceNode(sourceFile, node, ts.factory.createIdentifier(suggestion));
                 }
                 else {
@@ -139789,19 +143813,19 @@ var ts;
         }
         function getVariableLikeInitializer(declaration) {
             switch (declaration.kind) {
-                case 249 /* VariableDeclaration */:
-                case 160 /* Parameter */:
-                case 198 /* BindingElement */:
-                case 163 /* PropertyDeclaration */:
-                case 288 /* PropertyAssignment */:
+                case 250 /* VariableDeclaration */:
+                case 161 /* Parameter */:
+                case 199 /* BindingElement */:
+                case 164 /* PropertyDeclaration */:
+                case 289 /* PropertyAssignment */:
                     return declaration.initializer;
-                case 280 /* JsxAttribute */:
+                case 281 /* JsxAttribute */:
                     return declaration.initializer && (ts.isJsxExpression(declaration.initializer) ? declaration.initializer.expression : undefined);
-                case 289 /* ShorthandPropertyAssignment */:
-                case 162 /* PropertySignature */:
-                case 291 /* EnumMember */:
-                case 333 /* JSDocPropertyTag */:
-                case 326 /* JSDocParameterTag */:
+                case 290 /* ShorthandPropertyAssignment */:
+                case 163 /* PropertySignature */:
+                case 292 /* EnumMember */:
+                case 337 /* JSDocPropertyTag */:
+                case 330 /* JSDocParameterTag */:
                     return undefined;
             }
         }
@@ -139902,7 +143926,7 @@ var ts;
                     });
                     typeDeclToMembers.forEach(function (infos, classDeclaration) {
                         var supers = codefix.getAllSupers(classDeclaration, checker);
-                        var _loop_13 = function (info) {
+                        var _loop_14 = function (info) {
                             // If some superclass added this property, don't add it again.
                             if (supers.some(function (superClassOrInterface) {
                                 var superInfos = typeDeclToMembers.get(superClassOrInterface);
@@ -139927,9 +143951,9 @@ var ts;
                                 }
                             }
                         };
-                        for (var _i = 0, infos_1 = infos; _i < infos_1.length; _i++) {
-                            var info = infos_1[_i];
-                            _loop_13(info);
+                        for (var _i = 0, infos_2 = infos; _i < infos_2.length; _i++) {
+                            var info = infos_2[_i];
+                            _loop_14(info);
                         }
                     });
                 }));
@@ -140019,7 +144043,7 @@ var ts;
         function addMissingMemberInJs(changeTracker, declSourceFile, classDeclaration, token, makeStatic) {
             var tokenName = token.text;
             if (makeStatic) {
-                if (classDeclaration.kind === 221 /* ClassExpression */) {
+                if (classDeclaration.kind === 222 /* ClassExpression */) {
                     return;
                 }
                 var className = classDeclaration.name.getText();
@@ -140071,15 +144095,15 @@ var ts;
         }
         function getTypeNode(checker, classDeclaration, token) {
             var typeNode;
-            if (token.parent.parent.kind === 216 /* BinaryExpression */) {
+            if (token.parent.parent.kind === 217 /* BinaryExpression */) {
                 var binaryExpression = token.parent.parent;
                 var otherExpression = token.parent === binaryExpression.left ? binaryExpression.right : binaryExpression.left;
                 var widenedType = checker.getWidenedType(checker.getBaseTypeOfLiteralType(checker.getTypeAtLocation(otherExpression)));
-                typeNode = checker.typeToTypeNode(widenedType, classDeclaration, /*flags*/ undefined);
+                typeNode = checker.typeToTypeNode(widenedType, classDeclaration, 1 /* NoTruncation */);
             }
             else {
                 var contextualType = checker.getContextualType(token.parent);
-                typeNode = contextualType ? checker.typeToTypeNode(contextualType, /*enclosingDeclaration*/ undefined, /*flags*/ undefined) : undefined;
+                typeNode = contextualType ? checker.typeToTypeNode(contextualType, /*enclosingDeclaration*/ undefined, 1 /* NoTruncation */) : undefined;
             }
             return typeNode || ts.factory.createKeywordTypeNode(128 /* AnyKeyword */);
         }
@@ -140143,7 +144167,7 @@ var ts;
         }
         function addMethodDeclaration(context, changes, callExpression, name, modifierFlags, parentDeclaration, sourceFile) {
             var importAdder = codefix.createImportAdder(sourceFile, context.program, context.preferences, context.host);
-            var methodDeclaration = codefix.createSignatureDeclarationFromCallExpression(165 /* MethodDeclaration */, context, importAdder, callExpression, name, modifierFlags, parentDeclaration);
+            var methodDeclaration = codefix.createSignatureDeclarationFromCallExpression(166 /* MethodDeclaration */, context, importAdder, callExpression, name, modifierFlags, parentDeclaration);
             var containingMethodDeclaration = ts.findAncestor(callExpression, function (n) { return ts.isMethodDeclaration(n) || ts.isConstructorDeclaration(n); });
             if (containingMethodDeclaration && containingMethodDeclaration.parent === parentDeclaration) {
                 changes.insertNodeAfter(sourceFile, containingMethodDeclaration, methodDeclaration);
@@ -140172,7 +144196,7 @@ var ts;
         }
         function addFunctionDeclaration(changes, context, info) {
             var importAdder = codefix.createImportAdder(context.sourceFile, context.program, context.preferences, context.host);
-            var functionDeclaration = codefix.createSignatureDeclarationFromCallExpression(251 /* FunctionDeclaration */, context, importAdder, info.call, ts.idText(info.token), info.modifierFlags, info.parentDeclaration);
+            var functionDeclaration = codefix.createSignatureDeclarationFromCallExpression(252 /* FunctionDeclaration */, context, importAdder, info.call, ts.idText(info.token), info.modifierFlags, info.parentDeclaration);
             changes.insertNodeAtEndOfScope(info.sourceFile, info.parentDeclaration, functionDeclaration);
         }
     })(codefix = ts.codefix || (ts.codefix = {}));
@@ -140259,7 +144283,10 @@ var ts;
             return { type: "install package", file: fileName, packageName: packageName };
         }
         function tryGetImportedPackageName(sourceFile, pos) {
-            var moduleName = ts.cast(ts.getTokenAtPosition(sourceFile, pos), ts.isStringLiteral).text;
+            var moduleSpecifierText = ts.tryCast(ts.getTokenAtPosition(sourceFile, pos), ts.isStringLiteral);
+            if (!moduleSpecifierText)
+                return undefined;
+            var moduleName = moduleSpecifierText.text;
             var packageName = ts.parsePackageName(moduleName).packageName;
             return ts.isExternalModuleNameRelative(packageName) ? undefined : packageName;
         }
@@ -140863,7 +144890,7 @@ var ts;
         }
         function isImport(token) {
             return token.kind === 99 /* ImportKeyword */
-                || token.kind === 78 /* Identifier */ && (token.parent.kind === 265 /* ImportSpecifier */ || token.parent.kind === 262 /* ImportClause */);
+                || token.kind === 78 /* Identifier */ && (token.parent.kind === 266 /* ImportSpecifier */ || token.parent.kind === 263 /* ImportClause */);
         }
         /** Sometimes the diagnostic span is an entire ImportDeclaration, so we should remove the whole thing. */
         function tryGetFullImport(token) {
@@ -140873,7 +144900,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 === 232 /* VariableStatement */ ? node.parent : node);
+            changes.delete(sourceFile, node.parent.kind === 233 /* VariableStatement */ ? node.parent : node);
         }
         function deleteDestructuringElements(changes, sourceFile, node) {
             ts.forEach(node.elements, function (n) { return changes.delete(sourceFile, n); });
@@ -140898,14 +144925,14 @@ var ts;
         }
         function canPrefix(token) {
             switch (token.parent.kind) {
-                case 160 /* Parameter */:
-                case 159 /* TypeParameter */:
+                case 161 /* Parameter */:
+                case 160 /* TypeParameter */:
                     return true;
-                case 249 /* VariableDeclaration */: {
+                case 250 /* VariableDeclaration */: {
                     var varDecl = token.parent;
                     switch (varDecl.parent.parent.kind) {
-                        case 239 /* ForOfStatement */:
-                        case 238 /* ForInStatement */:
+                        case 240 /* ForOfStatement */:
+                        case 239 /* ForInStatement */:
                             return true;
                     }
                 }
@@ -140929,8 +144956,10 @@ var ts;
             if (ts.isParameter(parent)) {
                 tryDeleteParameter(changes, sourceFile, parent, checker, sourceFiles, program, cancellationToken, isFixAll);
             }
-            else if (!isFixAll || !(ts.isIdentifier(token) && ts.FindAllReferences.Core.isSymbolReferencedInFile(token, checker, sourceFile))) {
-                changes.delete(sourceFile, ts.isImportClause(parent) ? token : ts.isComputedPropertyName(parent) ? parent.parent : parent);
+            else if (!(isFixAll && ts.isIdentifier(token) && ts.FindAllReferences.Core.isSymbolReferencedInFile(token, checker, sourceFile))) {
+                var node = ts.isImportClause(parent) ? token : ts.isComputedPropertyName(parent) ? parent.parent : parent;
+                ts.Debug.assert(node !== sourceFile, "should not delete whole source file");
+                changes.delete(sourceFile, node);
             }
         }
         function tryDeleteParameter(changes, sourceFile, parameter, checker, sourceFiles, program, cancellationToken, isFixAll) {
@@ -140953,8 +144982,8 @@ var ts;
         function mayDeleteParameter(checker, sourceFile, parameter, sourceFiles, program, cancellationToken, isFixAll) {
             var parent = parameter.parent;
             switch (parent.kind) {
-                case 165 /* MethodDeclaration */:
-                case 166 /* Constructor */:
+                case 166 /* MethodDeclaration */:
+                case 167 /* Constructor */:
                     var index = parent.parameters.indexOf(parameter);
                     var referent = ts.isMethodDeclaration(parent) ? parent.name : parent;
                     var entries = ts.FindAllReferences.Core.getReferencedSymbolsForNode(parent.pos, referent, program, sourceFiles, cancellationToken);
@@ -140984,17 +145013,17 @@ var ts;
                         }
                     }
                     return true;
-                case 251 /* FunctionDeclaration */: {
+                case 252 /* FunctionDeclaration */: {
                     if (parent.name && isCallbackLike(checker, sourceFile, parent.name)) {
                         return isLastParameter(parent, parameter, isFixAll);
                     }
                     return true;
                 }
-                case 208 /* FunctionExpression */:
-                case 209 /* ArrowFunction */:
+                case 209 /* FunctionExpression */:
+                case 210 /* 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.
                     return isLastParameter(parent, parameter, isFixAll);
-                case 168 /* SetAccessor */:
+                case 169 /* SetAccessor */:
                     // Setter must have a parameter
                     return false;
                 default:
@@ -141052,7 +145081,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 234 /* IfStatement */:
+                    case 235 /* IfStatement */:
                         if (container.elseStatement) {
                             if (ts.isBlock(statement.parent)) {
                                 break;
@@ -141063,8 +145092,8 @@ var ts;
                             return;
                         }
                     // falls through
-                    case 236 /* WhileStatement */:
-                    case 237 /* ForStatement */:
+                    case 237 /* WhileStatement */:
+                    case 238 /* ForStatement */:
                         changes.delete(sourceFile, container);
                         return;
                 }
@@ -141137,7 +145166,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 === 305 /* JSDocNullableType */) {
+                if (typeNode.kind === 306 /* 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));
@@ -141157,7 +145186,7 @@ var ts;
                     if (!info)
                         return;
                     var typeNode = info.typeNode, type = info.type;
-                    var fixedType = typeNode.kind === 305 /* JSDocNullableType */ && fixId === fixIdNullable ? checker.getNullableType(type, 32768 /* Undefined */) : type;
+                    var fixedType = typeNode.kind === 306 /* JSDocNullableType */ && fixId === fixIdNullable ? checker.getNullableType(type, 32768 /* Undefined */) : type;
                     doChange(changes, sourceFile, typeNode, fixedType, checker);
                 });
             }
@@ -141174,22 +145203,22 @@ var ts;
             // NOTE: Some locations are not handled yet:
             // MappedTypeNode.typeParameters and SignatureDeclaration.typeParameters, as well as CallExpression.typeArguments
             switch (node.kind) {
-                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 */:
+                case 225 /* AsExpression */:
+                case 170 /* CallSignature */:
+                case 171 /* ConstructSignature */:
+                case 252 /* FunctionDeclaration */:
+                case 168 /* GetAccessor */:
+                case 172 /* IndexSignature */:
+                case 191 /* MappedType */:
+                case 166 /* MethodDeclaration */:
+                case 165 /* MethodSignature */:
+                case 161 /* Parameter */:
+                case 164 /* PropertyDeclaration */:
+                case 163 /* PropertySignature */:
+                case 169 /* SetAccessor */:
+                case 255 /* TypeAliasDeclaration */:
+                case 207 /* TypeAssertionExpression */:
+                case 250 /* VariableDeclaration */:
                     return true;
                 default:
                     return false;
@@ -141204,7 +145233,7 @@ var ts;
     (function (codefix) {
         var fixId = "fixMissingCallParentheses";
         var errorCodes = [
-            ts.Diagnostics.This_condition_will_always_return_true_since_the_function_is_always_defined_Did_you_mean_to_call_it_instead.code,
+            ts.Diagnostics.This_condition_will_always_return_true_since_this_function_is_always_defined_Did_you_mean_to_call_it_instead.code,
         ];
         codefix.registerCodeFix({
             errorCodes: errorCodes,
@@ -141291,14 +145320,14 @@ var ts;
             }
             var insertBefore;
             switch (containingFunction.kind) {
-                case 165 /* MethodDeclaration */:
+                case 166 /* MethodDeclaration */:
                     insertBefore = containingFunction.name;
                     break;
-                case 251 /* FunctionDeclaration */:
-                case 208 /* FunctionExpression */:
+                case 252 /* FunctionDeclaration */:
+                case 209 /* FunctionExpression */:
                     insertBefore = ts.findChildOfKind(containingFunction, 97 /* FunctionKeyword */, sourceFile);
                     break;
-                case 209 /* ArrowFunction */:
+                case 210 /* ArrowFunction */:
                     insertBefore = ts.findChildOfKind(containingFunction, 20 /* OpenParenToken */, sourceFile) || ts.first(containingFunction.parameters);
                     break;
                 default:
@@ -141497,7 +145526,7 @@ var ts;
                         var typeNode = ts.getTypeNodeIfAccessible(type, parent, program, host);
                         if (typeNode) {
                             // Note that the codefix will never fire with an existing `@type` tag, so there is no need to merge tags
-                            var typeTag = ts.factory.createJSDocTypeTag(/*tagName*/ undefined, ts.factory.createJSDocTypeExpression(typeNode), /*comment*/ "");
+                            var typeTag = ts.factory.createJSDocTypeTag(/*tagName*/ undefined, ts.factory.createJSDocTypeExpression(typeNode), /*comment*/ undefined);
                             addJSDocTags(changes, sourceFile, ts.cast(parent.parent.parent, ts.isExpressionStatement), [typeTag]);
                         }
                         importAdder.writeFixes(changes);
@@ -141631,13 +145660,13 @@ 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 !== 162 /* PropertySignature */) {
+                if (ts.isInJSFile(sourceFile) && declaration.kind !== 163 /* PropertySignature */) {
                     var parent = ts.isVariableDeclaration(declaration) ? ts.tryCast(declaration.parent.parent, ts.isVariableStatement) : declaration;
                     if (!parent) {
                         return;
                     }
                     var typeExpression = ts.factory.createJSDocTypeExpression(typeNode);
-                    var typeTag = ts.isGetAccessorDeclaration(declaration) ? ts.factory.createJSDocReturnTag(/*tagName*/ undefined, typeExpression, "") : ts.factory.createJSDocTypeTag(/*tagName*/ undefined, typeExpression, "");
+                    var typeTag = ts.isGetAccessorDeclaration(declaration) ? ts.factory.createJSDocReturnTag(/*tagName*/ undefined, typeExpression, /*comment*/ undefined) : ts.factory.createJSDocTypeTag(/*tagName*/ undefined, typeExpression, /*comment*/ undefined);
                     addJSDocTags(changes, sourceFile, parent, [typeTag]);
                 }
                 else if (!tryReplaceImportTypeNodeWithAutoImport(typeNode, declaration, sourceFile, changes, importAdder, ts.getEmitScriptTarget(program.getCompilerOptions()))) {
@@ -141692,13 +145721,13 @@ var ts;
             else {
                 var paramTags = ts.map(inferences, function (_a) {
                     var name = _a.name, typeNode = _a.typeNode, isOptional = _a.isOptional;
-                    return ts.factory.createJSDocParameterTag(/*tagName*/ undefined, name, /*isBracketed*/ !!isOptional, ts.factory.createJSDocTypeExpression(typeNode), /* isNameFirst */ false, "");
+                    return ts.factory.createJSDocParameterTag(/*tagName*/ undefined, name, /*isBracketed*/ !!isOptional, ts.factory.createJSDocTypeExpression(typeNode), /* isNameFirst */ false, /*comment*/ undefined);
                 });
                 addJSDocTags(changes, sourceFile, signature, paramTags);
             }
         }
         function addJSDocTags(changes, sourceFile, parent, newTags) {
-            var comments = ts.mapDefined(parent.jsDoc, function (j) { return j.comment; });
+            var comments = ts.flatMap(parent.jsDoc, function (j) { return typeof j.comment === "string" ? ts.factory.createJSDocText(j.comment) : j.comment; });
             var oldTags = ts.flatMapToMutable(parent.jsDoc, function (j) { return j.tags; });
             var unmergedNewTags = newTags.filter(function (newTag) { return !oldTags || !oldTags.some(function (tag, i) {
                 var merged = tryMergeJsdocTags(tag, newTag);
@@ -141706,15 +145735,15 @@ var ts;
                     oldTags[i] = merged;
                 return !!merged;
             }); });
-            var tag = ts.factory.createJSDocComment(comments.join("\n"), ts.factory.createNodeArray(__spreadArray(__spreadArray([], (oldTags || ts.emptyArray)), unmergedNewTags)));
-            var jsDocNode = parent.kind === 209 /* ArrowFunction */ ? getJsDocNodeForArrowFunction(parent) : parent;
+            var tag = ts.factory.createJSDocComment(ts.factory.createNodeArray(ts.intersperse(comments, ts.factory.createJSDocText("\n"))), ts.factory.createNodeArray(__spreadArray(__spreadArray([], (oldTags || ts.emptyArray)), unmergedNewTags)));
+            var jsDocNode = parent.kind === 210 /* 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 === 163 /* PropertyDeclaration */) {
+            if (signature.parent.kind === 164 /* PropertyDeclaration */) {
                 return signature.parent;
             }
             return signature.parent.parent;
@@ -141724,14 +145753,14 @@ var ts;
                 return undefined;
             }
             switch (oldTag.kind) {
-                case 326 /* JSDocParameterTag */: {
+                case 330 /* 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 327 /* JSDocReturnTag */:
+                case 331 /* JSDocReturnTag */:
                     return ts.factory.createJSDocReturnTag(/*tagName*/ undefined, newTag.typeExpression, oldTag.comment);
             }
         }
@@ -141756,19 +145785,19 @@ var ts;
         function getFunctionReferences(containingFunction, sourceFile, program, cancellationToken) {
             var searchToken;
             switch (containingFunction.kind) {
-                case 166 /* Constructor */:
+                case 167 /* Constructor */:
                     searchToken = ts.findChildOfKind(containingFunction, 132 /* ConstructorKeyword */, sourceFile);
                     break;
-                case 209 /* ArrowFunction */:
-                case 208 /* FunctionExpression */:
+                case 210 /* ArrowFunction */:
+                case 209 /* FunctionExpression */:
                     var parent = containingFunction.parent;
                     searchToken = (ts.isVariableDeclaration(parent) || ts.isPropertyDeclaration(parent)) && ts.isIdentifier(parent.name) ?
                         parent.name :
                         containingFunction.name;
                     break;
-                case 251 /* FunctionDeclaration */:
-                case 165 /* MethodDeclaration */:
-                case 164 /* MethodSignature */:
+                case 252 /* FunctionDeclaration */:
+                case 166 /* MethodDeclaration */:
+                case 165 /* MethodSignature */:
                     searchToken = containingFunction.name;
                     break;
             }
@@ -141910,24 +145939,24 @@ var ts;
                     node = node.parent;
                 }
                 switch (node.parent.kind) {
-                    case 233 /* ExpressionStatement */:
+                    case 234 /* ExpressionStatement */:
                         inferTypeFromExpressionStatement(node, usage);
                         break;
-                    case 215 /* PostfixUnaryExpression */:
+                    case 216 /* PostfixUnaryExpression */:
                         usage.isNumber = true;
                         break;
-                    case 214 /* PrefixUnaryExpression */:
+                    case 215 /* PrefixUnaryExpression */:
                         inferTypeFromPrefixUnaryExpression(node.parent, usage);
                         break;
-                    case 216 /* BinaryExpression */:
+                    case 217 /* BinaryExpression */:
                         inferTypeFromBinaryExpression(node, node.parent, usage);
                         break;
-                    case 284 /* CaseClause */:
-                    case 285 /* DefaultClause */:
+                    case 285 /* CaseClause */:
+                    case 286 /* DefaultClause */:
                         inferTypeFromSwitchStatementLabel(node.parent, usage);
                         break;
-                    case 203 /* CallExpression */:
-                    case 204 /* NewExpression */:
+                    case 204 /* CallExpression */:
+                    case 205 /* NewExpression */:
                         if (node.parent.expression === node) {
                             inferTypeFromCallExpression(node.parent, usage);
                         }
@@ -141935,20 +145964,20 @@ var ts;
                             inferTypeFromContextualType(node, usage);
                         }
                         break;
-                    case 201 /* PropertyAccessExpression */:
+                    case 202 /* PropertyAccessExpression */:
                         inferTypeFromPropertyAccessExpression(node.parent, usage);
                         break;
-                    case 202 /* ElementAccessExpression */:
+                    case 203 /* ElementAccessExpression */:
                         inferTypeFromPropertyElementExpression(node.parent, node, usage);
                         break;
-                    case 288 /* PropertyAssignment */:
-                    case 289 /* ShorthandPropertyAssignment */:
+                    case 289 /* PropertyAssignment */:
+                    case 290 /* ShorthandPropertyAssignment */:
                         inferTypeFromPropertyAssignment(node.parent, usage);
                         break;
-                    case 163 /* PropertyDeclaration */:
+                    case 164 /* PropertyDeclaration */:
                         inferTypeFromPropertyDeclaration(node.parent, usage);
                         break;
-                    case 249 /* VariableDeclaration */: {
+                    case 250 /* 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.
@@ -142070,7 +146099,7 @@ var ts;
                     case 56 /* BarBarToken */:
                     case 60 /* QuestionQuestionToken */:
                         if (node === parent.left &&
-                            (node.parent.parent.kind === 249 /* VariableDeclaration */ || ts.isAssignmentExpression(node.parent.parent, /*excludeCompoundAssignment*/ true))) {
+                            (node.parent.parent.kind === 250 /* VariableDeclaration */ || ts.isAssignmentExpression(node.parent.parent, /*excludeCompoundAssignment*/ true))) {
                             // var x = x || {};
                             // TODO: use getFalsyflagsOfType
                             addCandidateType(usage, checker.getTypeAtLocation(parent.right));
@@ -142098,7 +146127,7 @@ var ts;
                     }
                 }
                 calculateUsageOfNode(parent, call.return_);
-                if (parent.kind === 203 /* CallExpression */) {
+                if (parent.kind === 204 /* CallExpression */) {
                     (usage.calls || (usage.calls = [])).push(call);
                 }
                 else {
@@ -142201,7 +146230,7 @@ var ts;
                     var anon = anons_1[_i];
                     for (var _a = 0, _b = checker.getPropertiesOfType(anon); _a < _b.length; _a++) {
                         var p = _b[_a];
-                        props.add(p.name, checker.getTypeOfSymbolAtLocation(p, p.valueDeclaration));
+                        props.add(p.name, p.valueDeclaration ? checker.getTypeOfSymbolAtLocation(p, p.valueDeclaration) : checker.getAnyType());
                     }
                     calls.push.apply(calls, checker.getSignaturesOfType(anon, 0 /* Call */));
                     constructs.push.apply(constructs, checker.getSignaturesOfType(anon, 1 /* Construct */));
@@ -142342,12 +146371,13 @@ var ts;
                     if (!usageParam) {
                         break;
                     }
-                    var genericParamType = checker.getTypeOfSymbolAtLocation(genericParam, genericParam.valueDeclaration);
+                    var genericParamType = genericParam.valueDeclaration ? checker.getTypeOfSymbolAtLocation(genericParam, genericParam.valueDeclaration) : checker.getAnyType();
                     var elementType = isRest && checker.getElementTypeOfArrayType(genericParamType);
                     if (elementType) {
                         genericParamType = elementType;
                     }
-                    var targetType = usageParam.type || checker.getTypeOfSymbolAtLocation(usageParam, usageParam.valueDeclaration);
+                    var targetType = usageParam.type
+                        || (usageParam.valueDeclaration ? checker.getTypeOfSymbolAtLocation(usageParam, usageParam.valueDeclaration) : checker.getAnyType());
                     types.push.apply(types, inferTypeParameters(genericParamType, targetType, typeParameter));
                 }
                 var genericReturn = checker.getReturnTypeOfSignature(genericSig);
@@ -142361,7 +146391,7 @@ var ts;
             function getSignatureFromCalls(calls) {
                 var parameters = [];
                 var length = Math.max.apply(Math, calls.map(function (c) { return c.argumentTypes.length; }));
-                var _loop_14 = function (i) {
+                var _loop_15 = function (i) {
                     var symbol = checker.createSymbol(1 /* FunctionScopedVariable */, ts.escapeLeadingUnderscores("arg" + i));
                     symbol.type = combineTypes(calls.map(function (call) { return call.argumentTypes[i] || checker.getUndefinedType(); }));
                     if (calls.some(function (call) { return call.argumentTypes[i] === undefined; })) {
@@ -142370,7 +146400,7 @@ var ts;
                     parameters.push(symbol);
                 };
                 for (var i = 0; i < length; i++) {
-                    _loop_14(i);
+                    _loop_15(i);
                 }
                 var returnType = combineFromUsage(combineUsages(calls.map(function (call) { return call.return_; })));
                 // TODO: GH#18217
@@ -142541,8 +146571,8 @@ var ts;
             var ambient = !!(enclosingDeclaration.flags & 8388608 /* Ambient */);
             var quotePreference = ts.getQuotePreference(sourceFile, preferences);
             switch (declaration.kind) {
-                case 162 /* PropertySignature */:
-                case 163 /* PropertyDeclaration */:
+                case 163 /* PropertySignature */:
+                case 164 /* PropertyDeclaration */:
                     var flags = quotePreference === 0 /* Single */ ? 268435456 /* UseSingleQuotesForStringLiteralType */ : undefined;
                     var typeNode = checker.typeToTypeNode(type, enclosingDeclaration, flags, getNoopSymbolTrackerWithResolver(context));
                     if (importAdder) {
@@ -142556,8 +146586,8 @@ var ts;
                     /*decorators*/ undefined, modifiers, name, optional ? ts.factory.createToken(57 /* QuestionToken */) : undefined, typeNode, 
                     /*initializer*/ undefined));
                     break;
-                case 167 /* GetAccessor */:
-                case 168 /* SetAccessor */: {
+                case 168 /* GetAccessor */:
+                case 169 /* SetAccessor */: {
                     var typeNode_1 = checker.typeToTypeNode(type, enclosingDeclaration, /*flags*/ undefined, getNoopSymbolTrackerWithResolver(context));
                     var allAccessors = ts.getAllAccessorDeclarations(declarations, declaration);
                     var orderedAccessors = allAccessors.secondAccessor
@@ -142586,8 +146616,8 @@ var ts;
                     }
                     break;
                 }
-                case 164 /* MethodSignature */:
-                case 165 /* MethodDeclaration */:
+                case 165 /* MethodSignature */:
+                case 166 /* 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
@@ -142617,7 +146647,7 @@ var ts;
                         }
                         else {
                             ts.Debug.assert(declarations.length === signatures.length, "Declarations and signatures should match count");
-                            addClassElement(createMethodImplementingSignatures(signatures, name, optional, modifiers, quotePreference));
+                            addClassElement(createMethodImplementingSignatures(checker, context, enclosingDeclaration, signatures, name, optional, modifiers, quotePreference));
                         }
                     }
                     break;
@@ -142633,7 +146663,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, 165 /* MethodDeclaration */, enclosingDeclaration, flags, getNoopSymbolTrackerWithResolver(context));
+            var signatureDeclaration = checker.signatureToSignatureDeclaration(signature, 166 /* MethodDeclaration */, enclosingDeclaration, flags, getNoopSymbolTrackerWithResolver(context));
             if (!signatureDeclaration) {
                 return undefined;
             }
@@ -142717,7 +146747,7 @@ var ts;
             var type = isJs || contextualType === undefined
                 ? undefined
                 : checker.typeToTypeNode(contextualType, contextNode, /*flags*/ undefined, tracker);
-            if (kind === 165 /* MethodDeclaration */) {
+            if (kind === 166 /* MethodDeclaration */) {
                 return ts.factory.createMethodDeclaration(
                 /*decorators*/ undefined, modifiers, asteriskToken, name, 
                 /*questionToken*/ undefined, typeParameters, parameters, type, ts.isInterfaceDeclaration(contextNode) ? undefined : createStubbedMethodBody(quotePreference));
@@ -142753,7 +146783,7 @@ var ts;
             }
             return parameters;
         }
-        function createMethodImplementingSignatures(signatures, name, optional, modifiers, quotePreference) {
+        function createMethodImplementingSignatures(checker, context, enclosingDeclaration, signatures, name, optional, modifiers, quotePreference) {
             /** This is *a* signature with the maximal number of arguments,
              * such that if there is a "maximal" signature without rest arguments,
              * this is one of them.
@@ -142784,8 +146814,13 @@ var ts;
                 parameters.push(restParameter);
             }
             return createStubbedMethod(modifiers, name, optional, 
-            /*typeParameters*/ undefined, parameters, 
-            /*returnType*/ undefined, quotePreference);
+            /*typeParameters*/ undefined, parameters, getReturnTypeFromSignatures(signatures, checker, context, enclosingDeclaration), quotePreference);
+        }
+        function getReturnTypeFromSignatures(signatures, checker, context, enclosingDeclaration) {
+            if (ts.length(signatures)) {
+                var type = checker.getUnionType(ts.map(signatures, checker.getReturnTypeOfSignature));
+                return checker.typeToTypeNode(type, enclosingDeclaration, /*flags*/ undefined, getNoopSymbolTrackerWithResolver(context));
+            }
         }
         function createStubbedMethod(modifiers, name, optional, typeParameters, parameters, returnType, quotePreference) {
             return ts.factory.createMethodDeclaration(
@@ -142912,13 +146947,13 @@ var ts;
             if (ts.isClassLike(container)) {
                 var modifierFlags = ts.getEffectiveModifierFlags(declaration);
                 if (ts.isSourceFileJS(file)) {
-                    var modifiers = createModifiers(modifierFlags);
+                    var modifiers = ts.createModifiers(modifierFlags);
                     accessorModifiers = modifiers;
                     fieldModifiers = modifiers;
                 }
                 else {
-                    accessorModifiers = createModifiers(prepareModifierFlagsForAccessor(modifierFlags));
-                    fieldModifiers = createModifiers(prepareModifierFlagsForField(modifierFlags));
+                    accessorModifiers = ts.createModifiers(prepareModifierFlagsForAccessor(modifierFlags));
+                    fieldModifiers = ts.createModifiers(prepareModifierFlagsForField(modifierFlags));
                 }
             }
             updateFieldDeclaration(changeTracker, file, declaration, type, fieldName, fieldModifiers);
@@ -142953,9 +146988,6 @@ var ts;
             var leftHead = isStatic ? container.name : ts.factory.createThis(); // TODO: GH#18217
             return ts.isIdentifier(fieldName) ? ts.factory.createPropertyAccessExpression(leftHead, fieldName) : ts.factory.createElementAccessExpression(leftHead, ts.factory.createStringLiteralFromNode(fieldName));
         }
-        function createModifiers(modifierFlags) {
-            return modifierFlags ? ts.factory.createNodeArray(ts.factory.createModifiersFromModifierFlags(modifierFlags)) : undefined;
-        }
         function prepareModifierFlagsForAccessor(modifierFlags) {
             modifierFlags &= ~64 /* Readonly */; // avoid Readonly modifier because it will convert to get accessor
             modifierFlags &= ~8 /* Private */;
@@ -143000,7 +147032,7 @@ var ts;
                 isStatic: ts.hasStaticModifier(declaration),
                 isReadonly: ts.hasEffectiveReadonlyModifier(declaration),
                 type: getDeclarationType(declaration, program),
-                container: declaration.kind === 160 /* Parameter */ ? declaration.parent.parent : declaration.parent,
+                container: declaration.kind === 161 /* Parameter */ ? declaration.parent.parent : declaration.parent,
                 originalName: declaration.name.text,
                 declaration: declaration,
                 fieldName: fieldName,
@@ -143090,7 +147122,7 @@ var ts;
                 if (!superSymbol)
                     break;
                 var symbol = superSymbol.flags & 2097152 /* Alias */ ? checker.getAliasedSymbol(superSymbol) : superSymbol;
-                var superDecl = ts.find(symbol.declarations, ts.isClassLike);
+                var superDecl = symbol.declarations && ts.find(symbol.declarations, ts.isClassLike);
                 if (!superDecl)
                     break;
                 res.push(superDecl);
@@ -143136,7 +147168,7 @@ var ts;
         });
         function getActionsForUsageOfInvalidImport(context) {
             var sourceFile = context.sourceFile;
-            var targetKind = ts.Diagnostics.This_expression_is_not_callable.code === context.errorCode ? 203 /* CallExpression */ : 204 /* NewExpression */;
+            var targetKind = ts.Diagnostics.This_expression_is_not_callable.code === context.errorCode ? 204 /* CallExpression */ : 205 /* NewExpression */;
             var node = ts.findAncestor(ts.getTokenAtPosition(sourceFile, context.span.start), function (a) { return a.kind === targetKind; });
             if (!node) {
                 return [];
@@ -143470,7 +147502,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 === 195 /* ImportType */, "Token parent should be an ImportType");
+            ts.Debug.assert(token.parent.kind === 196 /* ImportType */, "Token parent should be an ImportType");
             return token.parent;
         }
         function doChange(changes, sourceFile, importType) {
@@ -143737,7 +147769,7 @@ var ts;
             var token = ts.getTokenAtPosition(sourceFile, pos);
             var checker = program.getTypeChecker();
             var symbol = checker.getSymbolAtLocation(token);
-            if (symbol) {
+            if (symbol === null || symbol === void 0 ? void 0 : symbol.valueDeclaration) {
                 return symbol.valueDeclaration.parent.parent;
             }
         }
@@ -143932,23 +147964,23 @@ var ts;
                 return { error: ts.getLocaleSpecificMessage(ts.Diagnostics.Could_not_find_export_statement) };
             }
             var exportingModuleSymbol = ts.isSourceFile(exportNode.parent) ? exportNode.parent.symbol : exportNode.parent.parent.symbol;
-            var flags = ts.getSyntacticModifierFlags(exportNode);
+            var flags = ts.getSyntacticModifierFlags(exportNode) || ((ts.isExportAssignment(exportNode) && !exportNode.isExportEquals) ? 513 /* ExportDefault */ : 0 /* None */);
             var wasDefault = !!(flags & 512 /* Default */);
             // If source file already has a default export, don't offer refactor.
             if (!(flags & 1 /* Export */) || !wasDefault && exportingModuleSymbol.exports.has("default" /* Default */)) {
                 return { error: ts.getLocaleSpecificMessage(ts.Diagnostics.This_file_already_has_a_default_export) };
             }
             switch (exportNode.kind) {
-                case 251 /* FunctionDeclaration */:
-                case 252 /* ClassDeclaration */:
-                case 253 /* InterfaceDeclaration */:
-                case 255 /* EnumDeclaration */:
-                case 254 /* TypeAliasDeclaration */:
-                case 256 /* ModuleDeclaration */: {
+                case 252 /* FunctionDeclaration */:
+                case 253 /* ClassDeclaration */:
+                case 254 /* InterfaceDeclaration */:
+                case 256 /* EnumDeclaration */:
+                case 255 /* TypeAliasDeclaration */:
+                case 257 /* ModuleDeclaration */: {
                     var node = exportNode;
                     return node.name && ts.isIdentifier(node.name) ? { exportNode: node, exportName: node.name, wasDefault: wasDefault, exportingModuleSymbol: exportingModuleSymbol } : undefined;
                 }
-                case 232 /* VariableStatement */: {
+                case 233 /* VariableStatement */: {
                     var vs = exportNode;
                     // Must be `export const x = something;`.
                     if (!(vs.declarationList.flags & 2 /* Const */) || vs.declarationList.declarations.length !== 1) {
@@ -143960,6 +147992,11 @@ var ts;
                     ts.Debug.assert(!wasDefault, "Can't have a default flag here");
                     return ts.isIdentifier(decl.name) ? { exportNode: vs, exportName: decl.name, wasDefault: wasDefault, exportingModuleSymbol: exportingModuleSymbol } : undefined;
                 }
+                case 267 /* ExportAssignment */: {
+                    var node = exportNode;
+                    var exp = node.expression;
+                    return node.isExportEquals ? undefined : { exportNode: node, exportName: exp, wasDefault: wasDefault, exportingModuleSymbol: exportingModuleSymbol };
+                }
                 default:
                     return undefined;
             }
@@ -143971,17 +148008,24 @@ var ts;
         function changeExport(exportingSourceFile, _a, changes, checker) {
             var wasDefault = _a.wasDefault, exportNode = _a.exportNode, exportName = _a.exportName;
             if (wasDefault) {
-                changes.delete(exportingSourceFile, ts.Debug.checkDefined(ts.findModifier(exportNode, 87 /* DefaultKeyword */), "Should find a default keyword in modifier list"));
+                if (ts.isExportAssignment(exportNode) && !exportNode.isExportEquals) {
+                    var exp = exportNode.expression;
+                    var spec = makeExportSpecifier(exp.text, exp.text);
+                    changes.replaceNode(exportingSourceFile, exportNode, ts.factory.createExportDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, /*isTypeOnly*/ false, ts.factory.createNamedExports([spec])));
+                }
+                else {
+                    changes.delete(exportingSourceFile, ts.Debug.checkDefined(ts.findModifier(exportNode, 87 /* DefaultKeyword */), "Should find a default keyword in modifier list"));
+                }
             }
             else {
                 var exportKeyword = ts.Debug.checkDefined(ts.findModifier(exportNode, 92 /* ExportKeyword */), "Should find an export keyword in modifier list");
                 switch (exportNode.kind) {
-                    case 251 /* FunctionDeclaration */:
-                    case 252 /* ClassDeclaration */:
-                    case 253 /* InterfaceDeclaration */:
+                    case 252 /* FunctionDeclaration */:
+                    case 253 /* ClassDeclaration */:
+                    case 254 /* InterfaceDeclaration */:
                         changes.insertNodeAfter(exportingSourceFile, exportKeyword, ts.factory.createToken(87 /* DefaultKeyword */));
                         break;
-                    case 232 /* VariableStatement */:
+                    case 233 /* 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) {
@@ -143990,15 +148034,15 @@ var ts;
                             break;
                         }
                     // falls through
-                    case 255 /* EnumDeclaration */:
-                    case 254 /* TypeAliasDeclaration */:
-                    case 256 /* ModuleDeclaration */:
+                    case 256 /* EnumDeclaration */:
+                    case 255 /* TypeAliasDeclaration */:
+                    case 257 /* 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)));
                         break;
                     default:
-                        ts.Debug.assertNever(exportNode, "Unexpected exportNode kind " + exportNode.kind);
+                        ts.Debug.fail("Unexpected exportNode kind " + exportNode.kind);
                 }
             }
         }
@@ -144019,18 +148063,18 @@ var ts;
         function changeDefaultToNamedImport(importingSourceFile, ref, changes, exportName) {
             var parent = ref.parent;
             switch (parent.kind) {
-                case 201 /* PropertyAccessExpression */:
+                case 202 /* PropertyAccessExpression */:
                     // `a.default` --> `a.foo`
                     changes.replaceNode(importingSourceFile, ref, ts.factory.createIdentifier(exportName));
                     break;
-                case 265 /* ImportSpecifier */:
-                case 270 /* ExportSpecifier */: {
+                case 266 /* ImportSpecifier */:
+                case 271 /* 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 262 /* ImportClause */: {
+                case 263 /* ImportClause */: {
                     var clause = parent;
                     ts.Debug.assert(clause.name === ref, "Import clause name should match provided ref");
                     var spec = makeImportSpecifier(exportName, ref.text);
@@ -144039,7 +148083,7 @@ var ts;
                         // `import foo from "./a";` --> `import { foo } from "./a";`
                         changes.replaceNode(importingSourceFile, ref, ts.factory.createNamedImports([spec]));
                     }
-                    else if (namedBindings.kind === 263 /* NamespaceImport */) {
+                    else if (namedBindings.kind === 264 /* 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 */;
@@ -144060,11 +148104,11 @@ var ts;
         function changeNamedToDefaultImport(importingSourceFile, ref, changes) {
             var parent = ref.parent;
             switch (parent.kind) {
-                case 201 /* PropertyAccessExpression */:
+                case 202 /* PropertyAccessExpression */:
                     // `a.foo` --> `a.default`
                     changes.replaceNode(importingSourceFile, ref, ts.factory.createIdentifier("default"));
                     break;
-                case 265 /* ImportSpecifier */: {
+                case 266 /* 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);
@@ -144077,7 +148121,7 @@ var ts;
                     }
                     break;
                 }
-                case 270 /* ExportSpecifier */: {
+                case 271 /* 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";`
@@ -144123,14 +148167,16 @@ var ts;
                 if (!info)
                     return ts.emptyArray;
                 if (!refactor.isRefactorErrorInfo(info)) {
-                    var namespaceImport = info.kind === 263 /* NamespaceImport */;
+                    var namespaceImport = info.kind === 264 /* NamespaceImport */;
                     var action = namespaceImport ? namespaceToNamedAction : namedToNamespaceAction;
                     return [{ name: refactorName, description: action.description, actions: [action] }];
                 }
                 if (context.preferences.provideRefactorNotApplicableReason) {
                     return [
-                        { name: refactorName, description: namespaceToNamedAction.description, actions: [__assign(__assign({}, namespaceToNamedAction), { notApplicableReason: info.error })] },
-                        { name: refactorName, description: namedToNamespaceAction.description, actions: [__assign(__assign({}, namedToNamespaceAction), { notApplicableReason: info.error })] }
+                        { name: refactorName, description: namespaceToNamedAction.description,
+                            actions: [__assign(__assign({}, namespaceToNamedAction), { notApplicableReason: info.error })] },
+                        { name: refactorName, description: namedToNamespaceAction.description,
+                            actions: [__assign(__assign({}, namedToNamespaceAction), { notApplicableReason: info.error })] }
                     ];
                 }
                 return ts.emptyArray;
@@ -144165,7 +148211,7 @@ var ts;
         }
         function doChange(sourceFile, program, changes, toConvert) {
             var checker = program.getTypeChecker();
-            if (toConvert.kind === 263 /* NamespaceImport */) {
+            if (toConvert.kind === 264 /* NamespaceImport */) {
                 doChangeNamespaceToNamed(sourceFile, checker, changes, toConvert, ts.getAllowSyntheticDefaultImports(program.getCompilerOptions()));
             }
             else {
@@ -144230,7 +148276,7 @@ var ts;
             });
             var namespaceImportName = namespaceNameConflicts ? ts.getUniqueName(preferredName, sourceFile) : preferredName;
             var neededNamedImports = [];
-            var _loop_15 = function (element) {
+            var _loop_16 = function (element) {
                 var propertyName = (element.propertyName || element.name).text;
                 ts.FindAllReferences.Core.eachSymbolReferenceInFile(element.name, checker, sourceFile, function (id) {
                     var access = ts.factory.createPropertyAccessExpression(ts.factory.createIdentifier(namespaceImportName), propertyName);
@@ -144249,7 +148295,7 @@ var ts;
             };
             for (var _i = 0, _a = toConvert.elements; _i < _a.length; _i++) {
                 var element = _a[_i];
-                _loop_15(element);
+                _loop_16(element);
             }
             changes.replaceNode(sourceFile, toConvert, ts.factory.createNamespaceImport(ts.factory.createIdentifier(namespaceImportName)));
             if (neededNamedImports.length) {
@@ -144566,27 +148612,27 @@ var ts;
                 var lastDeclaration = signatureDecls[signatureDecls.length - 1];
                 var updated = lastDeclaration;
                 switch (lastDeclaration.kind) {
-                    case 164 /* MethodSignature */: {
+                    case 165 /* MethodSignature */: {
                         updated = ts.factory.updateMethodSignature(lastDeclaration, lastDeclaration.modifiers, lastDeclaration.name, lastDeclaration.questionToken, lastDeclaration.typeParameters, getNewParametersForCombinedSignature(signatureDecls), lastDeclaration.type);
                         break;
                     }
-                    case 165 /* MethodDeclaration */: {
+                    case 166 /* 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 169 /* CallSignature */: {
+                    case 170 /* CallSignature */: {
                         updated = ts.factory.updateCallSignature(lastDeclaration, lastDeclaration.typeParameters, getNewParametersForCombinedSignature(signatureDecls), lastDeclaration.type);
                         break;
                     }
-                    case 166 /* Constructor */: {
+                    case 167 /* Constructor */: {
                         updated = ts.factory.updateConstructorDeclaration(lastDeclaration, lastDeclaration.decorators, lastDeclaration.modifiers, getNewParametersForCombinedSignature(signatureDecls), lastDeclaration.body);
                         break;
                     }
-                    case 170 /* ConstructSignature */: {
+                    case 171 /* ConstructSignature */: {
                         updated = ts.factory.updateConstructSignature(lastDeclaration, lastDeclaration.typeParameters, getNewParametersForCombinedSignature(signatureDecls), lastDeclaration.type);
                         break;
                     }
-                    case 251 /* FunctionDeclaration */: {
+                    case 252 /* FunctionDeclaration */: {
                         updated = ts.factory.updateFunctionDeclaration(lastDeclaration, lastDeclaration.decorators, lastDeclaration.modifiers, lastDeclaration.asteriskToken, lastDeclaration.name, lastDeclaration.typeParameters, getNewParametersForCombinedSignature(signatureDecls), lastDeclaration.type, lastDeclaration.body);
                         break;
                     }
@@ -144638,12 +148684,12 @@ var ts;
             }
             function isConvertableSignatureDeclaration(d) {
                 switch (d.kind) {
-                    case 164 /* MethodSignature */:
-                    case 165 /* MethodDeclaration */:
-                    case 169 /* CallSignature */:
-                    case 166 /* Constructor */:
-                    case 170 /* ConstructSignature */:
-                    case 251 /* FunctionDeclaration */:
+                    case 165 /* MethodSignature */:
+                    case 166 /* MethodDeclaration */:
+                    case 170 /* CallSignature */:
+                    case 167 /* Constructor */:
+                    case 171 /* ConstructSignature */:
+                    case 252 /* FunctionDeclaration */:
                         return true;
                 }
                 return false;
@@ -144783,7 +148829,6 @@ var ts;
                             };
                         }
                     }
-                    // Skip these since we don't have a way to report errors yet
                     if (refactor.refactorKindBeginsWith(extractConstantAction.kind, requestedRefactor)) {
                         if (constantExtraction.errors.length === 0) {
                             // Don't issue refactorings with duplicated names.
@@ -144915,24 +148960,28 @@ var ts;
             /**
              * getRangeToExtract takes a span inside a text file and returns either an expression or an array
              * of statements representing the minimum set of nodes needed to extract the entire span. This
-             * process may fail, in which case a set of errors is returned instead (these are currently
-             * not shown to the user, but can be used by us diagnostically)
+             * process may fail, in which case a set of errors is returned instead. These errors are shown to
+             * users if they have the provideRefactorNotApplicableReason option set.
              */
             // exported only for tests
-            function getRangeToExtract(sourceFile, span, considerEmptySpans) {
-                if (considerEmptySpans === void 0) { considerEmptySpans = true; }
+            function getRangeToExtract(sourceFile, span, invoked) {
+                if (invoked === void 0) { invoked = true; }
                 var length = span.length;
-                if (length === 0 && !considerEmptySpans) {
+                if (length === 0 && !invoked) {
                     return { errors: [ts.createFileDiagnostic(sourceFile, span.start, length, Messages.cannotExtractEmpty)] };
                 }
-                var cursorRequest = length === 0 && considerEmptySpans;
+                var cursorRequest = length === 0 && invoked;
+                var startToken = ts.findFirstNonJsxWhitespaceToken(sourceFile, span.start);
+                var endToken = ts.findTokenOnLeftOfPosition(sourceFile, ts.textSpanEnd(span));
+                /* If the refactoring command is invoked through a keyboard action it's safe to assume that the user is actively looking for
+                refactoring actions at the span location. As they may not know the exact range that will trigger a refactoring, we expand the
+                searched span to cover a real node range making it more likely that something useful will show up. */
+                var adjustedSpan = startToken && endToken && invoked ? getAdjustedSpanFromNodes(startToken, endToken, sourceFile) : span;
                 // Walk up starting from the the start position until we find a non-SourceFile node that subsumes the selected span.
                 // This may fail (e.g. you select two statements in the root of a source file)
-                var startToken = ts.getTokenAtPosition(sourceFile, span.start);
-                var start = cursorRequest ? getExtractableParent(startToken) : ts.getParentNodeInSpan(startToken, sourceFile, span);
+                var start = cursorRequest ? getExtractableParent(startToken) : ts.getParentNodeInSpan(startToken, sourceFile, adjustedSpan);
                 // Do the same for the ending position
-                var endToken = ts.findTokenOnLeftOfPosition(sourceFile, ts.textSpanEnd(span));
-                var end = cursorRequest ? start : ts.getParentNodeInSpan(endToken, sourceFile, span);
+                var end = cursorRequest ? start : ts.getParentNodeInSpan(endToken, sourceFile, adjustedSpan);
                 var declarations = [];
                 // We'll modify these flags as we walk the tree to collect data
                 // about what things need to be done as part of the extraction.
@@ -144941,6 +148990,9 @@ var ts;
                     // cannot find either start or end node
                     return { errors: [ts.createFileDiagnostic(sourceFile, span.start, length, Messages.cannotExtractRange)] };
                 }
+                if (ts.isJSDoc(start)) {
+                    return { errors: [ts.createFileDiagnostic(sourceFile, span.start, length, Messages.cannotExtractJSDoc)] };
+                }
                 if (start.parent !== end.parent) {
                     // start and end nodes belong to different subtrees
                     return { errors: [ts.createFileDiagnostic(sourceFile, span.start, length, Messages.cannotExtractRange)] };
@@ -144975,9 +149027,6 @@ var ts;
                     }
                     return { targetRange: { range: statements, facts: rangeFacts, declarations: declarations } };
                 }
-                if (ts.isJSDoc(start)) {
-                    return { errors: [ts.createFileDiagnostic(sourceFile, span.start, length, Messages.cannotExtractJSDoc)] };
-                }
                 if (ts.isReturnStatement(start) && !start.expression) {
                     // Makes no sense to extract an expression-less return statement.
                     return { errors: [ts.createFileDiagnostic(sourceFile, span.start, length, Messages.cannotExtractRange)] };
@@ -145030,20 +149079,20 @@ var ts;
                 function checkForStaticContext(nodeToCheck, containingClass) {
                     var current = nodeToCheck;
                     while (current !== containingClass) {
-                        if (current.kind === 163 /* PropertyDeclaration */) {
+                        if (current.kind === 164 /* PropertyDeclaration */) {
                             if (ts.hasSyntacticModifier(current, 32 /* Static */)) {
                                 rangeFacts |= RangeFacts.InStaticRegion;
                             }
                             break;
                         }
-                        else if (current.kind === 160 /* Parameter */) {
+                        else if (current.kind === 161 /* Parameter */) {
                             var ctorOrMethod = ts.getContainingFunction(current);
-                            if (ctorOrMethod.kind === 166 /* Constructor */) {
+                            if (ctorOrMethod.kind === 167 /* Constructor */) {
                                 rangeFacts |= RangeFacts.InStaticRegion;
                             }
                             break;
                         }
-                        else if (current.kind === 165 /* MethodDeclaration */) {
+                        else if (current.kind === 166 /* MethodDeclaration */) {
                             if (ts.hasSyntacticModifier(current, 32 /* Static */)) {
                                 rangeFacts |= RangeFacts.InStaticRegion;
                             }
@@ -145086,7 +149135,7 @@ var ts;
                             return true;
                         }
                         if (ts.isDeclaration(node)) {
-                            var declaringNode = (node.kind === 249 /* VariableDeclaration */) ? node.parent.parent : node;
+                            var declaringNode = (node.kind === 250 /* 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`!
@@ -145098,16 +149147,16 @@ var ts;
                         }
                         // Some things can't be extracted in certain situations
                         switch (node.kind) {
-                            case 261 /* ImportDeclaration */:
+                            case 262 /* ImportDeclaration */:
                                 (errors || (errors = [])).push(ts.createDiagnosticForNode(node, Messages.cannotExtractImport));
                                 return true;
-                            case 266 /* ExportAssignment */:
+                            case 267 /* 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 === 203 /* CallExpression */) {
+                                if (node.parent.kind === 204 /* 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)) {
@@ -145119,7 +149168,7 @@ var ts;
                                     rangeFacts |= RangeFacts.UsesThis;
                                 }
                                 break;
-                            case 209 /* ArrowFunction */:
+                            case 210 /* ArrowFunction */:
                                 // check if arrow function uses this
                                 ts.forEachChild(node, function check(n) {
                                     if (ts.isThis(n)) {
@@ -145133,39 +149182,39 @@ var ts;
                                     }
                                 });
                             // falls through
-                            case 252 /* ClassDeclaration */:
-                            case 251 /* FunctionDeclaration */:
+                            case 253 /* ClassDeclaration */:
+                            case 252 /* 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 221 /* ClassExpression */:
-                            case 208 /* FunctionExpression */:
-                            case 165 /* MethodDeclaration */:
-                            case 166 /* Constructor */:
-                            case 167 /* GetAccessor */:
-                            case 168 /* SetAccessor */:
+                            case 222 /* ClassExpression */:
+                            case 209 /* FunctionExpression */:
+                            case 166 /* MethodDeclaration */:
+                            case 167 /* Constructor */:
+                            case 168 /* GetAccessor */:
+                            case 169 /* SetAccessor */:
                                 // do not dive into functions or classes
                                 return false;
                         }
                         var savedPermittedJumps = permittedJumps;
                         switch (node.kind) {
-                            case 234 /* IfStatement */:
+                            case 235 /* IfStatement */:
                                 permittedJumps = 0 /* None */;
                                 break;
-                            case 247 /* TryStatement */:
+                            case 248 /* TryStatement */:
                                 // forbid all jumps inside try blocks
                                 permittedJumps = 0 /* None */;
                                 break;
-                            case 230 /* Block */:
-                                if (node.parent && node.parent.kind === 247 /* TryStatement */ && node.parent.finallyBlock === node) {
+                            case 231 /* Block */:
+                                if (node.parent && node.parent.kind === 248 /* TryStatement */ && node.parent.finallyBlock === node) {
                                     // allow unconditional returns from finally blocks
                                     permittedJumps = 4 /* Return */;
                                 }
                                 break;
-                            case 285 /* DefaultClause */:
-                            case 284 /* CaseClause */:
+                            case 286 /* DefaultClause */:
+                            case 285 /* CaseClause */:
                                 // allow unlabeled break inside case clauses
                                 permittedJumps |= 1 /* Break */;
                                 break;
@@ -145177,19 +149226,19 @@ var ts;
                                 break;
                         }
                         switch (node.kind) {
-                            case 187 /* ThisType */:
+                            case 188 /* ThisType */:
                             case 107 /* ThisKeyword */:
                                 rangeFacts |= RangeFacts.UsesThis;
                                 break;
-                            case 245 /* LabeledStatement */: {
+                            case 246 /* LabeledStatement */: {
                                 var label = node.label;
                                 (seenLabels || (seenLabels = [])).push(label.escapedText);
                                 ts.forEachChild(node, visit);
                                 seenLabels.pop();
                                 break;
                             }
-                            case 241 /* BreakStatement */:
-                            case 240 /* ContinueStatement */: {
+                            case 242 /* BreakStatement */:
+                            case 241 /* ContinueStatement */: {
                                 var label = node.label;
                                 if (label) {
                                     if (!ts.contains(seenLabels, label.escapedText)) {
@@ -145198,20 +149247,20 @@ var ts;
                                     }
                                 }
                                 else {
-                                    if (!(permittedJumps & (node.kind === 241 /* BreakStatement */ ? 1 /* Break */ : 2 /* Continue */))) {
+                                    if (!(permittedJumps & (node.kind === 242 /* BreakStatement */ ? 1 /* Break */ : 2 /* Continue */))) {
                                         // attempt to break or continue in a forbidden context
                                         (errors || (errors = [])).push(ts.createDiagnosticForNode(node, Messages.cannotExtractRangeContainingConditionalBreakOrContinueStatements));
                                     }
                                 }
                                 break;
                             }
-                            case 213 /* AwaitExpression */:
+                            case 214 /* AwaitExpression */:
                                 rangeFacts |= RangeFacts.IsAsyncFunction;
                                 break;
-                            case 219 /* YieldExpression */:
+                            case 220 /* YieldExpression */:
                                 rangeFacts |= RangeFacts.IsGenerator;
                                 break;
-                            case 242 /* ReturnStatement */:
+                            case 243 /* ReturnStatement */:
                                 if (permittedJumps & 4 /* Return */) {
                                     rangeFacts |= RangeFacts.HasReturn;
                                 }
@@ -145228,6 +149277,18 @@ var ts;
                 }
             }
             extractSymbol.getRangeToExtract = getRangeToExtract;
+            /**
+             * Includes the final semicolon so that the span covers statements in cases where it would otherwise
+             * only cover the declaration list.
+             */
+            function getAdjustedSpanFromNodes(startNode, endNode, sourceFile) {
+                var start = startNode.getStart(sourceFile);
+                var end = endNode.getEnd();
+                if (sourceFile.text.charCodeAt(end) === 59 /* semicolon */) {
+                    end++;
+                }
+                return { start: start, length: end - start };
+            }
             function getStatementOrExpressionRange(node) {
                 if (ts.isStatement(node)) {
                     return [node];
@@ -145265,7 +149326,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 === 160 /* Parameter */) {
+                    if (current.kind === 161 /* 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;
                     }
@@ -145276,7 +149337,7 @@ var ts;
                     //  * Module/namespace or source file
                     if (isScope(current)) {
                         scopes.push(current);
-                        if (current.kind === 297 /* SourceFile */) {
+                        if (current.kind === 298 /* SourceFile */) {
                             return scopes;
                         }
                     }
@@ -145366,32 +149427,32 @@ var ts;
             }
             function getDescriptionForFunctionLikeDeclaration(scope) {
                 switch (scope.kind) {
-                    case 166 /* Constructor */:
+                    case 167 /* Constructor */:
                         return "constructor";
-                    case 208 /* FunctionExpression */:
-                    case 251 /* FunctionDeclaration */:
+                    case 209 /* FunctionExpression */:
+                    case 252 /* FunctionDeclaration */:
                         return scope.name
                             ? "function '" + scope.name.text + "'"
                             : ts.ANONYMOUS;
-                    case 209 /* ArrowFunction */:
+                    case 210 /* ArrowFunction */:
                         return "arrow function";
-                    case 165 /* MethodDeclaration */:
+                    case 166 /* MethodDeclaration */:
                         return "method '" + scope.name.getText() + "'";
-                    case 167 /* GetAccessor */:
+                    case 168 /* GetAccessor */:
                         return "'get " + scope.name.getText() + "'";
-                    case 168 /* SetAccessor */:
+                    case 169 /* SetAccessor */:
                         return "'set " + scope.name.getText() + "'";
                     default:
                         throw ts.Debug.assertNever(scope, "Unexpected scope kind " + scope.kind);
                 }
             }
             function getDescriptionForClassLikeDeclaration(scope) {
-                return scope.kind === 252 /* ClassDeclaration */
+                return scope.kind === 253 /* 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 === 257 /* ModuleBlock */
+                return scope.kind === 258 /* ModuleBlock */
                     ? "namespace '" + scope.parent.name.getText() + "'"
                     : scope.externalModuleIndicator ? 0 /* Module */ : 1 /* Global */;
             }
@@ -145680,7 +149741,7 @@ var ts;
                         var localReference = ts.factory.createIdentifier(localNameText);
                         changeTracker.replaceNode(context.file, node, localReference);
                     }
-                    else if (node.parent.kind === 233 /* ExpressionStatement */ && scope === ts.findAncestor(node, isScope)) {
+                    else if (node.parent.kind === 234 /* 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(
@@ -145699,7 +149760,7 @@ var ts;
                             changeTracker.insertNodeBefore(context.file, nodeToInsertBefore, newVariableStatement, /*blankLineBetween*/ false);
                         }
                         // Consume
-                        if (node.parent.kind === 233 /* ExpressionStatement */) {
+                        if (node.parent.kind === 234 /* ExpressionStatement */) {
                             // If the parent is an expression statement, delete it.
                             changeTracker.delete(context.file, node.parent);
                         }
@@ -146026,7 +150087,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 !== 251 /* FunctionDeclaration */
+                    functionErrorsPerScope.push(ts.isFunctionLikeDeclaration(scope) && scope.kind !== 252 /* FunctionDeclaration */
                         ? [ts.createDiagnosticForNode(scope, Messages.cannotExtractToOtherFunctionLike)]
                         : []);
                     var constantErrors = [];
@@ -146089,7 +150150,7 @@ var ts;
                         : ts.getEnclosingBlockScopeContainer(scopes[0]);
                     ts.forEachChild(containingLexicalScopeOfExtraction, checkForUsedDeclarations);
                 }
-                var _loop_16 = function (i) {
+                var _loop_17 = function (i) {
                     var scopeUsages = usagesPerScope[i];
                     // Special case: in the innermost scope, all usages are available.
                     // (The computed value reflects the value at the top-level of the scope, but the
@@ -146129,7 +150190,7 @@ var ts;
                     }
                 };
                 for (var i = 0; i < scopes.length; i++) {
-                    _loop_16(i);
+                    _loop_17(i);
                 }
                 return { target: target, usagesPerScope: usagesPerScope, functionErrorsPerScope: functionErrorsPerScope, constantErrorsPerScope: constantErrorsPerScope, exposedVariableDeclarations: exposedVariableDeclarations };
                 function isInGenericContext(node) {
@@ -146345,30 +150406,30 @@ var ts;
             function isExtractableExpression(node) {
                 var parent = node.parent;
                 switch (parent.kind) {
-                    case 291 /* EnumMember */:
+                    case 292 /* EnumMember */:
                         return false;
                 }
                 switch (node.kind) {
                     case 10 /* StringLiteral */:
-                        return parent.kind !== 261 /* ImportDeclaration */ &&
-                            parent.kind !== 265 /* ImportSpecifier */;
-                    case 220 /* SpreadElement */:
-                    case 196 /* ObjectBindingPattern */:
-                    case 198 /* BindingElement */:
+                        return parent.kind !== 262 /* ImportDeclaration */ &&
+                            parent.kind !== 266 /* ImportSpecifier */;
+                    case 221 /* SpreadElement */:
+                    case 197 /* ObjectBindingPattern */:
+                    case 199 /* BindingElement */:
                         return false;
                     case 78 /* Identifier */:
-                        return parent.kind !== 198 /* BindingElement */ &&
-                            parent.kind !== 265 /* ImportSpecifier */ &&
-                            parent.kind !== 270 /* ExportSpecifier */;
+                        return parent.kind !== 199 /* BindingElement */ &&
+                            parent.kind !== 266 /* ImportSpecifier */ &&
+                            parent.kind !== 271 /* ExportSpecifier */;
                 }
                 return true;
             }
             function isBlockLike(node) {
                 switch (node.kind) {
-                    case 230 /* Block */:
-                    case 297 /* SourceFile */:
-                    case 257 /* ModuleBlock */:
-                    case 284 /* CaseClause */:
+                    case 231 /* Block */:
+                    case 298 /* SourceFile */:
+                    case 258 /* ModuleBlock */:
+                    case 285 /* CaseClause */:
                         return true;
                     default:
                         return false;
@@ -146510,7 +150571,7 @@ var ts;
                 if (ts.isTypeReferenceNode(node)) {
                     if (ts.isIdentifier(node.typeName)) {
                         var symbol = checker.resolveName(node.typeName.text, node.typeName, 262144 /* TypeParameter */, /* excludeGlobals */ true);
-                        if (symbol) {
+                        if (symbol === null || symbol === void 0 ? void 0 : symbol.declarations) {
                             var declaration = ts.cast(ts.first(symbol.declarations), ts.isTypeParameterDeclaration);
                             if (rangeContainsSkipTrivia(statement, declaration, file) && !rangeContainsSkipTrivia(selection, declaration, file)) {
                                 ts.pushIfUnique(result, declaration);
@@ -146533,7 +150594,7 @@ var ts;
                 else if (ts.isTypeQueryNode(node)) {
                     if (ts.isIdentifier(node.exprName)) {
                         var symbol = checker.resolveName(node.exprName.text, node.exprName, 111551 /* Value */, /* excludeGlobals */ false);
-                        if (symbol && rangeContainsSkipTrivia(statement, symbol.valueDeclaration, file) && !rangeContainsSkipTrivia(selection, symbol.valueDeclaration, file)) {
+                        if ((symbol === null || symbol === void 0 ? void 0 : symbol.valueDeclaration) && rangeContainsSkipTrivia(statement, symbol.valueDeclaration, file) && !rangeContainsSkipTrivia(selection, symbol.valueDeclaration, file)) {
                             return true;
                         }
                     }
@@ -146753,11 +150814,11 @@ var ts;
         }
         function isPureImport(node) {
             switch (node.kind) {
-                case 261 /* ImportDeclaration */:
+                case 262 /* ImportDeclaration */:
                     return true;
-                case 260 /* ImportEqualsDeclaration */:
+                case 261 /* ImportEqualsDeclaration */:
                     return !ts.hasSyntacticModifier(node, 1 /* Export */);
-                case 232 /* VariableStatement */:
+                case 233 /* VariableStatement */:
                     return node.declarationList.declarations.every(function (d) { return !!d.initializer && ts.isRequireCall(d.initializer, /*checkArgumentIsStringLiteralLike*/ true); });
                 default:
                     return false;
@@ -146818,10 +150879,10 @@ var ts;
         }
         function updateImportsInOtherFiles(changes, program, oldFile, movedSymbols, newModuleName) {
             var checker = program.getTypeChecker();
-            var _loop_17 = function (sourceFile) {
+            var _loop_18 = function (sourceFile) {
                 if (sourceFile === oldFile)
                     return "continue";
-                var _loop_18 = function (statement) {
+                var _loop_19 = function (statement) {
                     forEachImportInStatement(statement, function (importNode) {
                         if (checker.getSymbolAtLocation(moduleSpecifierFromImport(importNode)) !== oldFile.symbol)
                             return;
@@ -146843,22 +150904,22 @@ var ts;
                 };
                 for (var _b = 0, _c = sourceFile.statements; _b < _c.length; _b++) {
                     var statement = _c[_b];
-                    _loop_18(statement);
+                    _loop_19(statement);
                 }
             };
             for (var _i = 0, _a = program.getSourceFiles(); _i < _a.length; _i++) {
                 var sourceFile = _a[_i];
-                _loop_17(sourceFile);
+                _loop_18(sourceFile);
             }
         }
         function getNamespaceLikeImport(node) {
             switch (node.kind) {
-                case 261 /* ImportDeclaration */:
-                    return node.importClause && node.importClause.namedBindings && node.importClause.namedBindings.kind === 263 /* NamespaceImport */ ?
+                case 262 /* ImportDeclaration */:
+                    return node.importClause && node.importClause.namedBindings && node.importClause.namedBindings.kind === 264 /* NamespaceImport */ ?
                         node.importClause.namedBindings.name : undefined;
-                case 260 /* ImportEqualsDeclaration */:
+                case 261 /* ImportEqualsDeclaration */:
                     return node.name;
-                case 249 /* VariableDeclaration */:
+                case 250 /* VariableDeclaration */:
                     return ts.tryCast(node.name, ts.isIdentifier);
                 default:
                     return ts.Debug.assertNever(node, "Unexpected node kind " + node.kind);
@@ -146889,20 +150950,20 @@ var ts;
             var newNamespaceId = ts.factory.createIdentifier(newNamespaceName);
             var newModuleString = ts.factory.createStringLiteral(newModuleSpecifier);
             switch (node.kind) {
-                case 261 /* ImportDeclaration */:
+                case 262 /* ImportDeclaration */:
                     return ts.factory.createImportDeclaration(
                     /*decorators*/ undefined, /*modifiers*/ undefined, ts.factory.createImportClause(/*isTypeOnly*/ false, /*name*/ undefined, ts.factory.createNamespaceImport(newNamespaceId)), newModuleString);
-                case 260 /* ImportEqualsDeclaration */:
+                case 261 /* ImportEqualsDeclaration */:
                     return ts.factory.createImportEqualsDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, /*isTypeOnly*/ false, newNamespaceId, ts.factory.createExternalModuleReference(newModuleString));
-                case 249 /* VariableDeclaration */:
+                case 250 /* 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 === 261 /* ImportDeclaration */ ? i.moduleSpecifier
-                : i.kind === 260 /* ImportEqualsDeclaration */ ? i.moduleReference.expression
+            return (i.kind === 262 /* ImportDeclaration */ ? i.moduleSpecifier
+                : i.kind === 261 /* ImportEqualsDeclaration */ ? i.moduleReference.expression
                     : i.initializer.arguments[0]);
         }
         function forEachImportInStatement(statement, cb) {
@@ -146972,15 +151033,15 @@ var ts;
         }
         function deleteUnusedImports(sourceFile, importDecl, changes, isUnused) {
             switch (importDecl.kind) {
-                case 261 /* ImportDeclaration */:
+                case 262 /* ImportDeclaration */:
                     deleteUnusedImportsInDeclaration(sourceFile, importDecl, changes, isUnused);
                     break;
-                case 260 /* ImportEqualsDeclaration */:
+                case 261 /* ImportEqualsDeclaration */:
                     if (isUnused(importDecl.name)) {
                         changes.delete(sourceFile, importDecl);
                     }
                     break;
-                case 249 /* VariableDeclaration */:
+                case 250 /* VariableDeclaration */:
                     deleteUnusedImportsInVariableDeclaration(sourceFile, importDecl, changes, isUnused);
                     break;
                 default:
@@ -146993,7 +151054,7 @@ var ts;
             var _a = importDecl.importClause, name = _a.name, namedBindings = _a.namedBindings;
             var defaultUnused = !name || isUnused(name);
             var namedBindingsUnused = !namedBindings ||
-                (namedBindings.kind === 263 /* NamespaceImport */ ? isUnused(namedBindings.name) : namedBindings.elements.length !== 0 && namedBindings.elements.every(function (e) { return isUnused(e.name); }));
+                (namedBindings.kind === 264 /* NamespaceImport */ ? isUnused(namedBindings.name) : namedBindings.elements.length !== 0 && namedBindings.elements.every(function (e) { return isUnused(e.name); }));
             if (defaultUnused && namedBindingsUnused) {
                 changes.delete(sourceFile, importDecl);
             }
@@ -147005,7 +151066,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 === 264 /* NamedImports */) {
+                    else if (namedBindings.kind === 265 /* NamedImports */) {
                         for (var _i = 0, _b = namedBindings.elements; _i < _b.length; _i++) {
                             var element = _b[_i];
                             if (isUnused(element.name))
@@ -147023,9 +151084,9 @@ var ts;
                         changes.delete(sourceFile, name);
                     }
                     break;
-                case 197 /* ArrayBindingPattern */:
+                case 198 /* ArrayBindingPattern */:
                     break;
-                case 196 /* ObjectBindingPattern */:
+                case 197 /* 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);
                     }
@@ -147053,6 +151114,9 @@ var ts;
             var oldFileNamedImports = [];
             var markSeenTop = ts.nodeSeenTracker(); // Needed because multiple declarations may appear in `const x = 0, y = 1;`.
             newFileImportsFromOldFile.forEach(function (symbol) {
+                if (!symbol.declarations) {
+                    return;
+                }
                 for (var _i = 0, _a = symbol.declarations; _i < _a.length; _i++) {
                     var decl = _a[_i];
                     if (!isTopLevelDeclaration(decl))
@@ -147152,14 +151216,14 @@ var ts;
         // Below should all be utilities
         function isInImport(decl) {
             switch (decl.kind) {
-                case 260 /* ImportEqualsDeclaration */:
-                case 265 /* ImportSpecifier */:
-                case 262 /* ImportClause */:
-                case 263 /* NamespaceImport */:
+                case 261 /* ImportEqualsDeclaration */:
+                case 266 /* ImportSpecifier */:
+                case 263 /* ImportClause */:
+                case 264 /* NamespaceImport */:
                     return true;
-                case 249 /* VariableDeclaration */:
+                case 250 /* VariableDeclaration */:
                     return isVariableDeclarationInImport(decl);
-                case 198 /* BindingElement */:
+                case 199 /* BindingElement */:
                     return ts.isVariableDeclaration(decl.parent.parent) && isVariableDeclarationInImport(decl.parent.parent);
                 default:
                     return false;
@@ -147171,7 +151235,7 @@ var ts;
         }
         function filterImport(i, moduleSpecifier, keep) {
             switch (i.kind) {
-                case 261 /* ImportDeclaration */: {
+                case 262 /* ImportDeclaration */: {
                     var clause = i.importClause;
                     if (!clause)
                         return undefined;
@@ -147181,9 +151245,9 @@ var ts;
                         ? ts.factory.createImportDeclaration(/*decorators*/ undefined, /*modifiers*/ undefined, ts.factory.createImportClause(/*isTypeOnly*/ false, defaultImport, namedBindings), moduleSpecifier)
                         : undefined;
                 }
-                case 260 /* ImportEqualsDeclaration */:
+                case 261 /* ImportEqualsDeclaration */:
                     return keep(i.name) ? i : undefined;
-                case 249 /* VariableDeclaration */: {
+                case 250 /* VariableDeclaration */: {
                     var name = filterBindingName(i.name, keep);
                     return name ? makeVariableStatement(name, i.type, createRequireCall(moduleSpecifier), i.parent.flags) : undefined;
                 }
@@ -147192,7 +151256,7 @@ var ts;
             }
         }
         function filterNamedBindings(namedBindings, keep) {
-            if (namedBindings.kind === 263 /* NamespaceImport */) {
+            if (namedBindings.kind === 264 /* NamespaceImport */) {
                 return keep(namedBindings.name) ? namedBindings : undefined;
             }
             else {
@@ -147204,9 +151268,9 @@ var ts;
             switch (name.kind) {
                 case 78 /* Identifier */:
                     return keep(name) ? name : undefined;
-                case 197 /* ArrayBindingPattern */:
+                case 198 /* ArrayBindingPattern */:
                     return name;
-                case 196 /* ObjectBindingPattern */: {
+                case 197 /* 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;
@@ -147263,13 +151327,13 @@ var ts;
         }
         function isNonVariableTopLevelDeclaration(node) {
             switch (node.kind) {
-                case 251 /* FunctionDeclaration */:
-                case 252 /* ClassDeclaration */:
-                case 256 /* ModuleDeclaration */:
-                case 255 /* EnumDeclaration */:
-                case 254 /* TypeAliasDeclaration */:
-                case 253 /* InterfaceDeclaration */:
-                case 260 /* ImportEqualsDeclaration */:
+                case 252 /* FunctionDeclaration */:
+                case 253 /* ClassDeclaration */:
+                case 257 /* ModuleDeclaration */:
+                case 256 /* EnumDeclaration */:
+                case 255 /* TypeAliasDeclaration */:
+                case 254 /* InterfaceDeclaration */:
+                case 261 /* ImportEqualsDeclaration */:
                     return true;
                 default:
                     return false;
@@ -147277,17 +151341,17 @@ var ts;
         }
         function forEachTopLevelDeclaration(statement, cb) {
             switch (statement.kind) {
-                case 251 /* FunctionDeclaration */:
-                case 252 /* ClassDeclaration */:
-                case 256 /* ModuleDeclaration */:
-                case 255 /* EnumDeclaration */:
-                case 254 /* TypeAliasDeclaration */:
-                case 253 /* InterfaceDeclaration */:
-                case 260 /* ImportEqualsDeclaration */:
+                case 252 /* FunctionDeclaration */:
+                case 253 /* ClassDeclaration */:
+                case 257 /* ModuleDeclaration */:
+                case 256 /* EnumDeclaration */:
+                case 255 /* TypeAliasDeclaration */:
+                case 254 /* InterfaceDeclaration */:
+                case 261 /* ImportEqualsDeclaration */:
                     return cb(statement);
-                case 232 /* VariableStatement */:
+                case 233 /* VariableStatement */:
                     return ts.firstDefined(statement.declarationList.declarations, function (decl) { return forEachTopLevelDeclarationInBindingName(decl.name, cb); });
-                case 233 /* ExpressionStatement */: {
+                case 234 /* ExpressionStatement */: {
                     var expression = statement.expression;
                     return ts.isBinaryExpression(expression) && ts.getAssignmentDeclarationKind(expression) === 1 /* ExportsProperty */
                         ? cb(statement)
@@ -147299,8 +151363,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 197 /* ArrayBindingPattern */:
-                case 196 /* ObjectBindingPattern */:
+                case 198 /* ArrayBindingPattern */:
+                case 197 /* 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);
@@ -147311,9 +151375,9 @@ var ts;
         }
         function getTopLevelDeclarationStatement(d) {
             switch (d.kind) {
-                case 249 /* VariableDeclaration */:
+                case 250 /* VariableDeclaration */:
                     return d.parent.parent;
-                case 198 /* BindingElement */:
+                case 199 /* BindingElement */:
                     return getTopLevelDeclarationStatement(ts.cast(d.parent.parent, function (p) { return ts.isVariableDeclaration(p) || ts.isBindingElement(p); }));
                 default:
                     return d;
@@ -147346,23 +151410,23 @@ var ts;
         function addEs6Export(d) {
             var modifiers = ts.concatenate([ts.factory.createModifier(92 /* ExportKeyword */)], d.modifiers);
             switch (d.kind) {
-                case 251 /* FunctionDeclaration */:
+                case 252 /* FunctionDeclaration */:
                     return ts.factory.updateFunctionDeclaration(d, d.decorators, modifiers, d.asteriskToken, d.name, d.typeParameters, d.parameters, d.type, d.body);
-                case 252 /* ClassDeclaration */:
+                case 253 /* ClassDeclaration */:
                     return ts.factory.updateClassDeclaration(d, d.decorators, modifiers, d.name, d.typeParameters, d.heritageClauses, d.members);
-                case 232 /* VariableStatement */:
+                case 233 /* VariableStatement */:
                     return ts.factory.updateVariableStatement(d, modifiers, d.declarationList);
-                case 256 /* ModuleDeclaration */:
+                case 257 /* ModuleDeclaration */:
                     return ts.factory.updateModuleDeclaration(d, d.decorators, modifiers, d.name, d.body);
-                case 255 /* EnumDeclaration */:
+                case 256 /* EnumDeclaration */:
                     return ts.factory.updateEnumDeclaration(d, d.decorators, modifiers, d.name, d.members);
-                case 254 /* TypeAliasDeclaration */:
+                case 255 /* TypeAliasDeclaration */:
                     return ts.factory.updateTypeAliasDeclaration(d, d.decorators, modifiers, d.name, d.typeParameters, d.type);
-                case 253 /* InterfaceDeclaration */:
+                case 254 /* InterfaceDeclaration */:
                     return ts.factory.updateInterfaceDeclaration(d, d.decorators, modifiers, d.name, d.typeParameters, d.heritageClauses, d.members);
-                case 260 /* ImportEqualsDeclaration */:
+                case 261 /* ImportEqualsDeclaration */:
                     return ts.factory.updateImportEqualsDeclaration(d, d.decorators, modifiers, d.isTypeOnly, d.name, d.moduleReference);
-                case 233 /* ExpressionStatement */:
+                case 234 /* 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);
@@ -147373,18 +151437,18 @@ var ts;
         }
         function getNamesToExportInCommonJS(decl) {
             switch (decl.kind) {
-                case 251 /* FunctionDeclaration */:
-                case 252 /* ClassDeclaration */:
+                case 252 /* FunctionDeclaration */:
+                case 253 /* ClassDeclaration */:
                     return [decl.name.text]; // TODO: GH#18217
-                case 232 /* VariableStatement */:
+                case 233 /* VariableStatement */:
                     return ts.mapDefined(decl.declarationList.declarations, function (d) { return ts.isIdentifier(d.name) ? d.name.text : undefined; });
-                case 256 /* ModuleDeclaration */:
-                case 255 /* EnumDeclaration */:
-                case 254 /* TypeAliasDeclaration */:
-                case 253 /* InterfaceDeclaration */:
-                case 260 /* ImportEqualsDeclaration */:
+                case 257 /* ModuleDeclaration */:
+                case 256 /* EnumDeclaration */:
+                case 255 /* TypeAliasDeclaration */:
+                case 254 /* InterfaceDeclaration */:
+                case 261 /* ImportEqualsDeclaration */:
                     return ts.emptyArray;
-                case 233 /* ExpressionStatement */:
+                case 234 /* 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);
@@ -147727,15 +151791,15 @@ var ts;
                     var parent = functionReference.parent;
                     switch (parent.kind) {
                         // foo(...) or super(...) or new Foo(...)
-                        case 203 /* CallExpression */:
-                        case 204 /* NewExpression */:
+                        case 204 /* CallExpression */:
+                        case 205 /* NewExpression */:
                             var callOrNewExpression = ts.tryCast(parent, ts.isCallOrNewExpression);
                             if (callOrNewExpression && callOrNewExpression.expression === functionReference) {
                                 return callOrNewExpression;
                             }
                             break;
                         // x.foo(...)
-                        case 201 /* PropertyAccessExpression */:
+                        case 202 /* PropertyAccessExpression */:
                             var propertyAccessExpression = ts.tryCast(parent, ts.isPropertyAccessExpression);
                             if (propertyAccessExpression && propertyAccessExpression.parent && propertyAccessExpression.name === functionReference) {
                                 var callOrNewExpression_1 = ts.tryCast(propertyAccessExpression.parent, ts.isCallOrNewExpression);
@@ -147745,7 +151809,7 @@ var ts;
                             }
                             break;
                         // x["foo"](...)
-                        case 202 /* ElementAccessExpression */:
+                        case 203 /* ElementAccessExpression */:
                             var elementAccessExpression = ts.tryCast(parent, ts.isElementAccessExpression);
                             if (elementAccessExpression && elementAccessExpression.parent && elementAccessExpression.argumentExpression === functionReference) {
                                 var callOrNewExpression_2 = ts.tryCast(elementAccessExpression.parent, ts.isCallOrNewExpression);
@@ -147764,14 +151828,14 @@ var ts;
                     var parent = reference.parent;
                     switch (parent.kind) {
                         // `C.foo`
-                        case 201 /* PropertyAccessExpression */:
+                        case 202 /* PropertyAccessExpression */:
                             var propertyAccessExpression = ts.tryCast(parent, ts.isPropertyAccessExpression);
                             if (propertyAccessExpression && propertyAccessExpression.expression === reference) {
                                 return propertyAccessExpression;
                             }
                             break;
                         // `C["foo"]`
-                        case 202 /* ElementAccessExpression */:
+                        case 203 /* ElementAccessExpression */:
                             var elementAccessExpression = ts.tryCast(parent, ts.isElementAccessExpression);
                             if (elementAccessExpression && elementAccessExpression.expression === reference) {
                                 return elementAccessExpression;
@@ -147813,19 +151877,20 @@ var ts;
                 return ts.isMethodSignature(node) && (ts.isInterfaceDeclaration(node.parent) || ts.isTypeLiteralNode(node.parent));
             }
             function isValidFunctionDeclaration(functionDeclaration, checker) {
+                var _a;
                 if (!isValidParameterNodeArray(functionDeclaration.parameters, checker))
                     return false;
                 switch (functionDeclaration.kind) {
-                    case 251 /* FunctionDeclaration */:
+                    case 252 /* FunctionDeclaration */:
                         return hasNameOrDefault(functionDeclaration) && isSingleImplementation(functionDeclaration, checker);
-                    case 165 /* MethodDeclaration */:
+                    case 166 /* MethodDeclaration */:
                         if (ts.isObjectLiteralExpression(functionDeclaration.parent)) {
                             var contextualSymbol = getSymbolForContextualType(functionDeclaration.name, checker);
                             // don't offer the refactor when there are multiple signatures since we won't know which ones the user wants to change
-                            return (contextualSymbol === null || contextualSymbol === void 0 ? void 0 : contextualSymbol.declarations.length) === 1 && isSingleImplementation(functionDeclaration, checker);
+                            return ((_a = contextualSymbol === null || contextualSymbol === void 0 ? void 0 : contextualSymbol.declarations) === null || _a === void 0 ? void 0 : _a.length) === 1 && isSingleImplementation(functionDeclaration, checker);
                         }
                         return isSingleImplementation(functionDeclaration, checker);
-                    case 166 /* Constructor */:
+                    case 167 /* Constructor */:
                         if (ts.isClassDeclaration(functionDeclaration.parent)) {
                             return hasNameOrDefault(functionDeclaration.parent) && isSingleImplementation(functionDeclaration, checker);
                         }
@@ -147833,8 +151898,8 @@ var ts;
                             return isValidVariableDeclaration(functionDeclaration.parent.parent)
                                 && isSingleImplementation(functionDeclaration, checker);
                         }
-                    case 208 /* FunctionExpression */:
-                    case 209 /* ArrowFunction */:
+                    case 209 /* FunctionExpression */:
+                    case 210 /* ArrowFunction */:
                         return isValidVariableDeclaration(functionDeclaration.parent);
                 }
                 return false;
@@ -147984,7 +152049,7 @@ var ts;
             }
             function getClassNames(constructorDeclaration) {
                 switch (constructorDeclaration.parent.kind) {
-                    case 252 /* ClassDeclaration */:
+                    case 253 /* ClassDeclaration */:
                         var classDeclaration = constructorDeclaration.parent;
                         if (classDeclaration.name)
                             return [classDeclaration.name];
@@ -147992,7 +152057,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 221 /* ClassExpression */:
+                    case 222 /* ClassExpression */:
                         var classExpression = constructorDeclaration.parent;
                         var variableDeclaration = constructorDeclaration.parent.parent;
                         var className = classExpression.name;
@@ -148003,25 +152068,25 @@ var ts;
             }
             function getFunctionNames(functionDeclaration) {
                 switch (functionDeclaration.kind) {
-                    case 251 /* FunctionDeclaration */:
+                    case 252 /* 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 165 /* MethodDeclaration */:
+                    case 166 /* MethodDeclaration */:
                         return [functionDeclaration.name];
-                    case 166 /* Constructor */:
+                    case 167 /* Constructor */:
                         var ctrKeyword = ts.Debug.checkDefined(ts.findChildOfKind(functionDeclaration, 132 /* ConstructorKeyword */, functionDeclaration.getSourceFile()), "Constructor declaration should have constructor keyword");
-                        if (functionDeclaration.parent.kind === 221 /* ClassExpression */) {
+                        if (functionDeclaration.parent.kind === 222 /* ClassExpression */) {
                             var variableDeclaration = functionDeclaration.parent.parent;
                             return [variableDeclaration.name, ctrKeyword];
                         }
                         return [ctrKeyword];
-                    case 209 /* ArrowFunction */:
+                    case 210 /* ArrowFunction */:
                         return [functionDeclaration.parent.name];
-                    case 208 /* FunctionExpression */:
+                    case 209 /* FunctionExpression */:
                         if (functionDeclaration.name)
                             return [functionDeclaration.name, functionDeclaration.parent.name];
                         return [functionDeclaration.parent.name];
@@ -148112,11 +152177,11 @@ var ts;
             function getParentBinaryExpression(expr) {
                 var container = ts.findAncestor(expr.parent, function (n) {
                     switch (n.kind) {
-                        case 201 /* PropertyAccessExpression */:
-                        case 202 /* ElementAccessExpression */:
+                        case 202 /* PropertyAccessExpression */:
+                        case 203 /* ElementAccessExpression */:
                             return false;
-                        case 218 /* TemplateExpression */:
-                        case 216 /* BinaryExpression */:
+                        case 219 /* TemplateExpression */:
+                        case 217 /* BinaryExpression */:
                             return !(ts.isBinaryExpression(n.parent) && isNotEqualsOperator(n.parent));
                         default:
                             return "quit";
@@ -148193,7 +152258,7 @@ var ts;
                 var templateSpans = [];
                 var templateHead = ts.factory.createTemplateHead(headText);
                 copyCommentFromStringLiterals(headIndexes, templateHead);
-                var _loop_19 = function (i) {
+                var _loop_20 = function (i) {
                     var currentNode = getExpressionFromParenthesesOrExpression(nodes[i]);
                     copyOperatorComments(i, currentNode);
                     var _c = concatConsecutiveString(i + 1, nodes), newIndex = _c[0], subsequentText = _c[1], stringIndexes = _c[2];
@@ -148217,7 +152282,7 @@ var ts;
                 };
                 var out_i_1;
                 for (var i = begin; i < nodes.length; i++) {
-                    _loop_19(i);
+                    _loop_20(i);
                     i = out_i_1;
                 }
                 return ts.factory.createTemplateExpression(templateHead, templateSpans);
@@ -148417,7 +152482,9 @@ var ts;
                 var body = convertToBlock(func.body);
                 var variableDeclaration = variableInfo.variableDeclaration, variableDeclarationList = variableInfo.variableDeclarationList, statement = variableInfo.statement, name = variableInfo.name;
                 ts.suppressLeadingTrivia(statement);
-                var newNode = ts.factory.createFunctionDeclaration(func.decorators, statement.modifiers, func.asteriskToken, name, func.typeParameters, func.parameters, func.type, body);
+                var modifiersFlags = (ts.getCombinedModifierFlags(variableDeclaration) & 1 /* Export */) | ts.getEffectiveModifierFlags(func);
+                var modifiers = ts.factory.createModifiersFromModifierFlags(modifiersFlags);
+                var newNode = ts.factory.createFunctionDeclaration(func.decorators, ts.length(modifiers) ? modifiers : undefined, func.asteriskToken, name, func.typeParameters, func.parameters, func.type, body);
                 if (variableDeclarationList.declarations.length === 1) {
                     return ts.textChanges.ChangeTracker.with(context, function (t) { return t.replaceNode(file, statement, newNode); });
                 }
@@ -148475,9 +152542,7 @@ var ts;
             function getEditsForAction(context) {
                 var info = getInfo(context);
                 if (info && !refactor.isRefactorErrorInfo(info)) {
-                    var edits = ts.textChanges.ChangeTracker.with(context, function (t) {
-                        return t.tryInsertTypeAnnotation(context.file, info.declaration, info.returnTypeNode);
-                    });
+                    var edits = ts.textChanges.ChangeTracker.with(context, function (t) { return doChange(context.file, t, info.declaration, info.returnTypeNode); });
                     return { renameFilename: undefined, renameLocation: undefined, edits: edits };
                 }
                 return undefined;
@@ -148502,11 +152567,26 @@ var ts;
                 }
                 return ts.emptyArray;
             }
+            function doChange(sourceFile, changes, declaration, typeNode) {
+                var closeParen = ts.findChildOfKind(declaration, 21 /* CloseParenToken */, sourceFile);
+                var needParens = ts.isArrowFunction(declaration) && closeParen === undefined;
+                var endNode = needParens ? ts.first(declaration.parameters) : closeParen;
+                if (endNode) {
+                    if (needParens) {
+                        changes.insertNodeBefore(sourceFile, endNode, ts.factory.createToken(20 /* OpenParenToken */));
+                        changes.insertNodeAfter(sourceFile, endNode, ts.factory.createToken(21 /* CloseParenToken */));
+                    }
+                    changes.insertNodeAt(sourceFile, endNode.end, typeNode, { prefix: ": " });
+                }
+            }
             function getInfo(context) {
                 if (ts.isInJSFile(context.file) || !refactor.refactorKindBeginsWith(inferReturnTypeAction.kind, context.kind))
                     return;
                 var token = ts.getTokenAtPosition(context.file, context.startPosition);
-                var declaration = ts.findAncestor(token, isConvertibleDeclaration);
+                var declaration = ts.findAncestor(token, function (n) {
+                    return ts.isBlock(n) || n.parent && ts.isArrowFunction(n.parent) && (n.kind === 38 /* EqualsGreaterThanToken */ || n.parent.body === n) ? "quit" :
+                        isConvertibleDeclaration(n);
+                });
                 if (!declaration || !declaration.body || declaration.type) {
                     return { error: ts.getLocaleSpecificMessage(ts.Diagnostics.Return_type_must_be_inferred_from_a_function) };
                 }
@@ -148515,7 +152595,6 @@ var ts;
                 if (!returnType) {
                     return { error: ts.getLocaleSpecificMessage(ts.Diagnostics.Could_not_determine_function_return_type) };
                 }
-                ;
                 var returnTypeNode = typeChecker.typeToTypeNode(returnType, declaration, 1 /* NoTruncation */);
                 if (returnTypeNode) {
                     return { declaration: declaration, returnTypeNode: returnTypeNode };
@@ -148523,10 +152602,10 @@ var ts;
             }
             function isConvertibleDeclaration(node) {
                 switch (node.kind) {
-                    case 251 /* FunctionDeclaration */:
-                    case 208 /* FunctionExpression */:
-                    case 209 /* ArrowFunction */:
-                    case 165 /* MethodDeclaration */:
+                    case 252 /* FunctionDeclaration */:
+                    case 209 /* FunctionExpression */:
+                    case 210 /* ArrowFunction */:
+                    case 166 /* MethodDeclaration */:
                         return true;
                     default:
                         return false;
@@ -148628,8 +152707,8 @@ var ts;
             if (!children.length) {
                 return undefined;
             }
-            var child = ts.find(children, function (kid) { return kid.kind < 301 /* FirstJSDocNode */ || kid.kind > 333 /* LastJSDocNode */; });
-            return child.kind < 157 /* FirstNode */ ?
+            var child = ts.find(children, function (kid) { return kid.kind < 302 /* FirstJSDocNode */ || kid.kind > 337 /* LastJSDocNode */; });
+            return child.kind < 158 /* FirstNode */ ?
                 child :
                 child.getFirstToken(sourceFile);
         };
@@ -148640,7 +152719,7 @@ var ts;
             if (!child) {
                 return undefined;
             }
-            return child.kind < 157 /* FirstNode */ ? child : child.getLastToken(sourceFile);
+            return child.kind < 158 /* FirstNode */ ? child : child.getLastToken(sourceFile);
         };
         NodeObject.prototype.forEachChild = function (cbNode, cbNodeArray) {
             return ts.forEachChild(this, cbNode, cbNodeArray);
@@ -148698,11 +152777,11 @@ var ts;
         }
     }
     function createSyntaxList(nodes, parent) {
-        var list = createNode(334 /* SyntaxList */, nodes.pos, nodes.end, parent);
+        var list = createNode(338 /* SyntaxList */, nodes.pos, nodes.end, parent);
         list._children = [];
         var pos = nodes.pos;
-        for (var _i = 0, nodes_1 = nodes; _i < nodes_1.length; _i++) {
-            var node = nodes_1[_i];
+        for (var _i = 0, nodes_2 = nodes; _i < nodes_2.length; _i++) {
+            var node = nodes_2[_i];
             addSyntheticNodes(list._children, pos, node.pos, parent);
             list._children.push(node);
             pos = node.end;
@@ -148809,13 +152888,13 @@ var ts;
         };
         SymbolObject.prototype.getContextualDocumentationComment = function (context, checker) {
             switch (context === null || context === void 0 ? void 0 : context.kind) {
-                case 167 /* GetAccessor */:
+                case 168 /* GetAccessor */:
                     if (!this.contextualGetAccessorDocumentationComment) {
                         this.contextualGetAccessorDocumentationComment = ts.emptyArray;
                         this.contextualGetAccessorDocumentationComment = getDocumentationComment(ts.filter(this.declarations, ts.isGetAccessor), checker);
                     }
                     return this.contextualGetAccessorDocumentationComment;
-                case 168 /* SetAccessor */:
+                case 169 /* SetAccessor */:
                     if (!this.contextualSetAccessorDocumentationComment) {
                         this.contextualSetAccessorDocumentationComment = ts.emptyArray;
                         this.contextualSetAccessorDocumentationComment = getDocumentationComment(ts.filter(this.declarations, ts.isSetAccessor), checker);
@@ -148825,9 +152904,9 @@ var ts;
                     return this.getDocumentationComment(checker);
             }
         };
-        SymbolObject.prototype.getJsDocTags = function () {
+        SymbolObject.prototype.getJsDocTags = function (checker) {
             if (this.tags === undefined) {
-                this.tags = ts.JsDoc.getJsDocTagsFromDeclarations(this.declarations);
+                this.tags = ts.JsDoc.getJsDocTagsFromDeclarations(this.declarations, checker);
             }
             return this.tags;
         };
@@ -148988,7 +153067,7 @@ var ts;
         };
         SignatureObject.prototype.getJsDocTags = function () {
             if (this.jsDocTags === undefined) {
-                this.jsDocTags = this.declaration ? getJsDocTags([this.declaration], this.checker) : [];
+                this.jsDocTags = this.declaration ? getJsDocTagsOfSignature(this.declaration, this.checker) : [];
             }
             return this.jsDocTags;
         };
@@ -149002,29 +153081,34 @@ var ts;
     function hasJSDocInheritDocTag(node) {
         return ts.getJSDocTags(node).some(function (tag) { return tag.tagName.text === "inheritDoc"; });
     }
-    function getJsDocTags(declarations, checker) {
-        var tags = ts.JsDoc.getJsDocTagsFromDeclarations(declarations);
-        if (tags.length === 0 || declarations.some(hasJSDocInheritDocTag)) {
-            ts.forEachUnique(declarations, function (declaration) {
-                var inheritedTags = findBaseOfDeclaration(checker, declaration, function (symbol) { return symbol.getJsDocTags(); });
-                if (inheritedTags) {
-                    tags = __spreadArray(__spreadArray([], inheritedTags), tags);
-                }
-            });
+    function getJsDocTagsOfSignature(declaration, checker) {
+        var tags = ts.JsDoc.getJsDocTagsFromDeclarations([declaration], checker);
+        if (tags.length === 0 || hasJSDocInheritDocTag(declaration)) {
+            var inheritedTags = findBaseOfDeclaration(checker, declaration, function (symbol) { var _a; return ((_a = symbol.declarations) === null || _a === void 0 ? void 0 : _a.length) === 1 ? symbol.getJsDocTags() : undefined; });
+            if (inheritedTags) {
+                tags = __spreadArray(__spreadArray([], inheritedTags), tags);
+            }
         }
         return tags;
     }
     function getDocumentationComment(declarations, checker) {
         if (!declarations)
             return ts.emptyArray;
-        var doc = ts.JsDoc.getJsDocCommentsFromDeclarations(declarations);
+        var doc = ts.JsDoc.getJsDocCommentsFromDeclarations(declarations, checker);
         if (checker && (doc.length === 0 || declarations.some(hasJSDocInheritDocTag))) {
-            ts.forEachUnique(declarations, function (declaration) {
-                var inheritedDocs = findBaseOfDeclaration(checker, declaration, function (symbol) { return symbol.getDocumentationComment(checker); });
+            var seenSymbols_1 = new ts.Set();
+            for (var _i = 0, declarations_4 = declarations; _i < declarations_4.length; _i++) {
+                var declaration = declarations_4[_i];
+                var inheritedDocs = findBaseOfDeclaration(checker, declaration, function (symbol) {
+                    if (!seenSymbols_1.has(symbol)) {
+                        seenSymbols_1.add(symbol);
+                        return symbol.getDocumentationComment(checker);
+                    }
+                });
                 // TODO: GH#16312 Return a ReadonlyArray, avoid copying inheritedDocs
                 if (inheritedDocs)
                     doc = doc.length === 0 ? inheritedDocs.slice() : inheritedDocs.concat(ts.lineBreakPart(), doc);
-            });
+            }
         }
         return doc;
     }
@@ -149038,7 +153122,7 @@ var ts;
         __extends(SourceFileObject, _super);
         function SourceFileObject(kind, pos, end) {
             var _this = _super.call(this, kind, pos, end) || this;
-            _this.kind = 297 /* SourceFile */;
+            _this.kind = 298 /* SourceFile */;
             return _this;
         }
         SourceFileObject.prototype.update = function (newText, textChangeRange) {
@@ -149097,10 +153181,10 @@ var ts;
             }
             function visit(node) {
                 switch (node.kind) {
-                    case 251 /* FunctionDeclaration */:
-                    case 208 /* FunctionExpression */:
-                    case 165 /* MethodDeclaration */:
-                    case 164 /* MethodSignature */:
+                    case 252 /* FunctionDeclaration */:
+                    case 209 /* FunctionExpression */:
+                    case 166 /* MethodDeclaration */:
+                    case 165 /* MethodSignature */:
                         var functionDeclaration = node;
                         var declarationName = getDeclarationName(functionDeclaration);
                         if (declarationName) {
@@ -149120,31 +153204,31 @@ var ts;
                         }
                         ts.forEachChild(node, visit);
                         break;
-                    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 */:
+                    case 253 /* ClassDeclaration */:
+                    case 222 /* ClassExpression */:
+                    case 254 /* InterfaceDeclaration */:
+                    case 255 /* TypeAliasDeclaration */:
+                    case 256 /* EnumDeclaration */:
+                    case 257 /* ModuleDeclaration */:
+                    case 261 /* ImportEqualsDeclaration */:
+                    case 271 /* ExportSpecifier */:
+                    case 266 /* ImportSpecifier */:
+                    case 263 /* ImportClause */:
+                    case 264 /* NamespaceImport */:
+                    case 168 /* GetAccessor */:
+                    case 169 /* SetAccessor */:
+                    case 178 /* TypeLiteral */:
                         addDeclaration(node);
                         ts.forEachChild(node, visit);
                         break;
-                    case 160 /* Parameter */:
+                    case 161 /* Parameter */:
                         // Only consider parameter properties
-                        if (!ts.hasSyntacticModifier(node, 92 /* ParameterPropertyModifier */)) {
+                        if (!ts.hasSyntacticModifier(node, 16476 /* ParameterPropertyModifier */)) {
                             break;
                         }
                     // falls through
-                    case 249 /* VariableDeclaration */:
-                    case 198 /* BindingElement */: {
+                    case 250 /* VariableDeclaration */:
+                    case 199 /* BindingElement */: {
                         var decl = node;
                         if (ts.isBindingPattern(decl.name)) {
                             ts.forEachChild(decl.name, visit);
@@ -149155,12 +153239,12 @@ var ts;
                         }
                     }
                     // falls through
-                    case 291 /* EnumMember */:
-                    case 163 /* PropertyDeclaration */:
-                    case 162 /* PropertySignature */:
+                    case 292 /* EnumMember */:
+                    case 164 /* PropertyDeclaration */:
+                    case 163 /* PropertySignature */:
                         addDeclaration(node);
                         break;
-                    case 267 /* ExportDeclaration */:
+                    case 268 /* ExportDeclaration */:
                         // Handle named exports case e.g.:
                         //    export {a, b as B} from "mod";
                         var exportDeclaration = node;
@@ -149173,7 +153257,7 @@ var ts;
                             }
                         }
                         break;
-                    case 261 /* ImportDeclaration */:
+                    case 262 /* ImportDeclaration */:
                         var importClause = node.importClause;
                         if (importClause) {
                             // Handle default import case e.g.:
@@ -149185,7 +153269,7 @@ var ts;
                             //    import * as NS from "mod";
                             //    import {a, b as B} from "mod";
                             if (importClause.namedBindings) {
-                                if (importClause.namedBindings.kind === 263 /* NamespaceImport */) {
+                                if (importClause.namedBindings.kind === 264 /* NamespaceImport */) {
                                     addDeclaration(importClause.namedBindings);
                                 }
                                 else {
@@ -149194,7 +153278,7 @@ var ts;
                             }
                         }
                         break;
-                    case 216 /* BinaryExpression */:
+                    case 217 /* BinaryExpression */:
                         if (ts.getAssignmentDeclarationKind(node) !== 0 /* None */) {
                             addDeclaration(node);
                         }
@@ -149288,15 +153372,7 @@ var ts;
                 var fileName = rootFileNames_1[_i];
                 this.createEntry(fileName, ts.toPath(fileName, this.currentDirectory, getCanonicalFileName));
             }
-            // store the compilation settings
-            this._compilationSettings = host.getCompilationSettings() || getDefaultCompilerOptions();
         }
-        HostCache.prototype.compilationSettings = function () {
-            return this._compilationSettings;
-        };
-        HostCache.prototype.getProjectReferences = function () {
-            return this.host.getProjectReferences && this.host.getProjectReferences();
-        };
         HostCache.prototype.createEntry = function (fileName, path) {
             var entry;
             var scriptSnapshot = this.host.getScriptSnapshot(fileName);
@@ -149576,7 +153652,7 @@ var ts;
             return sourceFile;
         }
         function synchronizeHostData() {
-            var _a, _b;
+            var _a, _b, _c;
             ts.Debug.assert(languageServiceMode !== ts.LanguageServiceMode.Syntactic);
             // perform fast check if host supports it
             if (host.getProjectVersion) {
@@ -149597,11 +153673,22 @@ var ts;
             // Get a fresh cache of the host information
             var hostCache = new HostCache(host, getCanonicalFileName);
             var rootFileNames = hostCache.getRootFileNames();
+            var newSettings = host.getCompilationSettings() || getDefaultCompilerOptions();
             var hasInvalidatedResolution = host.hasInvalidatedResolution || ts.returnFalse;
             var hasChangedAutomaticTypeDirectiveNames = ts.maybeBind(host, host.hasChangedAutomaticTypeDirectiveNames);
-            var projectReferences = hostCache.getProjectReferences();
+            var projectReferences = (_b = host.getProjectReferences) === null || _b === void 0 ? void 0 : _b.call(host);
+            var parsedCommandLines;
+            var parseConfigHost = {
+                useCaseSensitiveFileNames: useCaseSensitiveFileNames,
+                fileExists: fileExists,
+                readFile: readFile,
+                readDirectory: readDirectory,
+                trace: ts.maybeBind(host, host.trace),
+                getCurrentDirectory: function () { return currentDirectory; },
+                onUnRecoverableConfigFileDiagnostic: ts.noop,
+            };
             // If the program is already up-to-date, we can reuse it
-            if (ts.isProgramUptoDate(program, rootFileNames, hostCache.compilationSettings(), function (_path, fileName) { return host.getScriptVersion(fileName); }, fileExists, hasInvalidatedResolution, hasChangedAutomaticTypeDirectiveNames, projectReferences)) {
+            if (ts.isProgramUptoDate(program, rootFileNames, newSettings, function (_path, fileName) { return host.getScriptVersion(fileName); }, fileExists, hasInvalidatedResolution, hasChangedAutomaticTypeDirectiveNames, getParsedCommandLine, projectReferences)) {
                 return;
             }
             // IMPORTANT - It is critical from this moment onward that we do not check
@@ -149609,7 +153696,6 @@ var ts;
             // instance.  If we cancel midway through, we may end up in an inconsistent state where
             // the program points to old source files that have been invalidated because of
             // incremental parsing.
-            var newSettings = hostCache.compilationSettings();
             // Now create a new compiler
             var compilerHost = {
                 getSourceFile: getOrCreateSourceFile,
@@ -149631,19 +153717,18 @@ var ts;
                 getDirectories: function (path) {
                     return host.getDirectories ? host.getDirectories(path) : [];
                 },
-                readDirectory: function (path, extensions, exclude, include, depth) {
-                    ts.Debug.checkDefined(host.readDirectory, "'LanguageServiceHost.readDirectory' must be implemented to correctly process 'projectReferences'");
-                    return host.readDirectory(path, extensions, exclude, include, depth);
-                },
+                readDirectory: readDirectory,
                 onReleaseOldSourceFile: onReleaseOldSourceFile,
+                onReleaseParsedCommandLine: onReleaseParsedCommandLine,
                 hasInvalidatedResolution: hasInvalidatedResolution,
                 hasChangedAutomaticTypeDirectiveNames: hasChangedAutomaticTypeDirectiveNames,
-                trace: ts.maybeBind(host, host.trace),
+                trace: parseConfigHost.trace,
                 resolveModuleNames: ts.maybeBind(host, host.resolveModuleNames),
                 resolveTypeReferenceDirectives: ts.maybeBind(host, host.resolveTypeReferenceDirectives),
                 useSourceOfProjectReferenceRedirect: ts.maybeBind(host, host.useSourceOfProjectReferenceRedirect),
+                getParsedCommandLine: getParsedCommandLine,
             };
-            (_b = host.setCompilerHost) === null || _b === void 0 ? void 0 : _b.call(host, compilerHost);
+            (_c = host.setCompilerHost) === null || _c === void 0 ? void 0 : _c.call(host, compilerHost);
             var documentRegistryBucketKey = documentRegistry.getKeyForCompilationSettings(newSettings);
             var options = {
                 rootNames: rootFileNames,
@@ -149656,6 +153741,7 @@ var ts;
             // hostCache is captured in the closure for 'getOrCreateSourceFile' but it should not be used past this point.
             // It needs to be cleared to allow all collected snapshots to be released
             hostCache = undefined;
+            parsedCommandLines = undefined;
             // We reset this cache on structure invalidation so we don't hold on to outdated files for long; however we can't use the `compilerHost` above,
             // Because it only functions until `hostCache` is cleared, while we'll potentially need the functionality to lazily read sourcemap files during
             // the course of whatever called `synchronizeHostData`
@@ -149664,6 +153750,36 @@ var ts;
             // pointers set property.
             program.getTypeChecker();
             return;
+            function getParsedCommandLine(fileName) {
+                var path = ts.toPath(fileName, currentDirectory, getCanonicalFileName);
+                var existing = parsedCommandLines === null || parsedCommandLines === void 0 ? void 0 : parsedCommandLines.get(path);
+                if (existing !== undefined)
+                    return existing || undefined;
+                var result = host.getParsedCommandLine ?
+                    host.getParsedCommandLine(fileName) :
+                    getParsedCommandLineOfConfigFileUsingSourceFile(fileName);
+                (parsedCommandLines || (parsedCommandLines = new ts.Map())).set(path, result || false);
+                return result;
+            }
+            function getParsedCommandLineOfConfigFileUsingSourceFile(configFileName) {
+                var result = getOrCreateSourceFile(configFileName, 100 /* JSON */);
+                if (!result)
+                    return undefined;
+                result.path = ts.toPath(configFileName, currentDirectory, getCanonicalFileName);
+                result.resolvedPath = result.path;
+                result.originalFileName = result.fileName;
+                return ts.parseJsonSourceFileConfigFileContent(result, parseConfigHost, ts.getNormalizedAbsolutePath(ts.getDirectoryPath(configFileName), currentDirectory), 
+                /*optionsToExtend*/ undefined, ts.getNormalizedAbsolutePath(configFileName, currentDirectory));
+            }
+            function onReleaseParsedCommandLine(configFileName, oldResolvedRef, oldOptions) {
+                var _a;
+                if (host.getParsedCommandLine) {
+                    (_a = host.onReleaseParsedCommandLine) === null || _a === void 0 ? void 0 : _a.call(host, configFileName, oldResolvedRef, oldOptions);
+                }
+                else if (oldResolvedRef) {
+                    onReleaseOldSourceFile(oldResolvedRef.sourceFile, oldOptions);
+                }
+            }
             function fileExists(fileName) {
                 var path = ts.toPath(fileName, currentDirectory, getCanonicalFileName);
                 var entry = hostCache && hostCache.getEntryByPath(path);
@@ -149680,11 +153796,15 @@ var ts;
                 }
                 return host.readFile && host.readFile(fileName);
             }
+            function readDirectory(path, extensions, exclude, include, depth) {
+                ts.Debug.checkDefined(host.readDirectory, "'LanguageServiceHost.readDirectory' must be implemented to correctly process 'projectReferences'");
+                return host.readDirectory(path, extensions, exclude, include, depth);
+            }
             // Release any files we have acquired in the old program but are
             // not part of the new program.
             function onReleaseOldSourceFile(oldSourceFile, oldOptions) {
                 var oldSettingsKey = documentRegistry.getKeyForCompilationSettings(oldOptions);
-                documentRegistry.releaseDocumentWithKey(oldSourceFile.resolvedPath, oldSettingsKey);
+                documentRegistry.releaseDocumentWithKey(oldSourceFile.resolvedPath, oldSettingsKey, oldSourceFile.scriptKind);
             }
             function getOrCreateSourceFile(fileName, languageVersion, onError, shouldCreateNewSourceFile) {
                 return getOrCreateSourceFileByPath(fileName, ts.toPath(fileName, currentDirectory, getCanonicalFileName), languageVersion, onError, shouldCreateNewSourceFile);
@@ -149729,8 +153849,13 @@ var ts;
                         // We do not support the scenario where a host can modify a registered
                         // file's script kind, i.e. in one project some file is treated as ".ts"
                         // and in another as ".js"
-                        ts.Debug.assertEqual(hostFileInformation.scriptKind, oldSourceFile.scriptKind, "Registered script kind should match new script kind.");
-                        return documentRegistry.updateDocumentWithKey(fileName, path, newSettings, documentRegistryBucketKey, hostFileInformation.scriptSnapshot, hostFileInformation.version, hostFileInformation.scriptKind);
+                        if (hostFileInformation.scriptKind === oldSourceFile.scriptKind) {
+                            return documentRegistry.updateDocumentWithKey(fileName, path, newSettings, documentRegistryBucketKey, hostFileInformation.scriptSnapshot, hostFileInformation.version, hostFileInformation.scriptKind);
+                        }
+                        else {
+                            // Release old source file and fall through to aquire new file with new script kind
+                            documentRegistry.releaseDocumentWithKey(oldSourceFile.resolvedPath, documentRegistry.getKeyForCompilationSettings(program.getCompilerOptions()), oldSourceFile.scriptKind);
+                        }
                     }
                     // We didn't already have the file.  Fall through and acquire it from the registry.
                 }
@@ -149759,7 +153884,7 @@ var ts;
                 // Use paths to ensure we are using correct key and paths as document registry could be created with different current directory than host
                 var key_1 = documentRegistry.getKeyForCompilationSettings(program.getCompilerOptions());
                 ts.forEach(program.getSourceFiles(), function (f) {
-                    return documentRegistry.releaseDocumentWithKey(f.resolvedPath, key_1);
+                    return documentRegistry.releaseDocumentWithKey(f.resolvedPath, key_1, f.scriptKind);
                 });
                 program = undefined; // TODO: GH#18217
             }
@@ -149802,10 +153927,10 @@ var ts;
             synchronizeHostData();
             return ts.Completions.getCompletionsAtPosition(host, program, log, getValidSourceFile(fileName), position, fullPreferences, options.triggerCharacter);
         }
-        function getCompletionEntryDetails(fileName, position, name, formattingOptions, source, preferences) {
+        function getCompletionEntryDetails(fileName, position, name, formattingOptions, source, preferences, data) {
             if (preferences === void 0) { preferences = ts.emptyOptions; }
             synchronizeHostData();
-            return ts.Completions.getCompletionEntryDetails(program, log, getValidSourceFile(fileName), position, { name: name, source: source }, host, (formattingOptions && ts.formatting.getFormatContext(formattingOptions, host)), // TODO: GH#18217
+            return ts.Completions.getCompletionEntryDetails(program, log, getValidSourceFile(fileName), position, { name: name, source: source, data: data }, host, (formattingOptions && ts.formatting.getFormatContext(formattingOptions, host)), // TODO: GH#18217
             preferences, cancellationToken);
         }
         function getCompletionEntrySymbol(fileName, position, name, source, preferences) {
@@ -149832,7 +153957,7 @@ var ts;
                     textSpan: ts.createTextSpanFromNode(nodeForQuickInfo, sourceFile),
                     displayParts: typeChecker.runWithCancellationToken(cancellationToken, function (typeChecker) { return ts.typeToDisplayParts(typeChecker, type_2, ts.getContainerNode(nodeForQuickInfo)); }),
                     documentation: type_2.symbol ? type_2.symbol.getDocumentationComment(typeChecker) : undefined,
-                    tags: type_2.symbol ? type_2.symbol.getJsDocTags() : undefined
+                    tags: type_2.symbol ? type_2.symbol.getJsDocTags(typeChecker) : undefined
                 };
             }
             var _a = typeChecker.runWithCancellationToken(cancellationToken, function (typeChecker) {
@@ -149851,19 +153976,23 @@ var ts;
             if (ts.isNewExpression(node.parent) && node.pos === node.parent.pos) {
                 return node.parent.expression;
             }
+            if (ts.isNamedTupleMember(node.parent) && node.pos === node.parent.pos) {
+                return node.parent;
+            }
             return node;
         }
         function shouldGetType(sourceFile, node, position) {
             switch (node.kind) {
                 case 78 /* Identifier */:
-                    return !ts.isLabelName(node) && !ts.isTagName(node);
-                case 201 /* PropertyAccessExpression */:
-                case 157 /* QualifiedName */:
+                    return !ts.isLabelName(node) && !ts.isTagName(node) && !ts.isConstTypeReference(node.parent);
+                case 202 /* PropertyAccessExpression */:
+                case 158 /* QualifiedName */:
                     // Don't return quickInfo if inside the comment in `a/**/.b`
                     return !ts.isInComment(sourceFile, position);
                 case 107 /* ThisKeyword */:
-                case 187 /* ThisType */:
+                case 188 /* ThisType */:
                 case 105 /* SuperKeyword */:
+                case 193 /* NamedTupleMember */:
                     return true;
                 default:
                     return false;
@@ -149968,15 +154097,15 @@ var ts;
                 return undefined;
             }
             switch (node.kind) {
-                case 201 /* PropertyAccessExpression */:
-                case 157 /* QualifiedName */:
+                case 202 /* PropertyAccessExpression */:
+                case 158 /* QualifiedName */:
                 case 10 /* StringLiteral */:
                 case 94 /* FalseKeyword */:
                 case 109 /* TrueKeyword */:
                 case 103 /* NullKeyword */:
                 case 105 /* SuperKeyword */:
                 case 107 /* ThisKeyword */:
-                case 187 /* ThisType */:
+                case 188 /* ThisType */:
                 case 78 /* Identifier */:
                     break;
                 // Cant create the text span
@@ -149993,7 +154122,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 === 256 /* ModuleDeclaration */ &&
+                    if (nodeForStartPos.parent.parent.kind === 257 /* ModuleDeclaration */ &&
                         nodeForStartPos.parent.parent.body === nodeForStartPos.parent) {
                         // Use parent module declarations name for start pos
                         nodeForStartPos = nodeForStartPos.parent.parent.name;
@@ -150021,15 +154150,7 @@ var ts;
         function getNavigationTree(fileName) {
             return ts.NavigationBar.getNavigationTree(syntaxTreeCache.getCurrentSourceFile(fileName), cancellationToken);
         }
-        function isTsOrTsxFile(fileName) {
-            var kind = ts.getScriptKind(fileName, host);
-            return kind === 3 /* TS */ || kind === 4 /* TSX */;
-        }
         function getSemanticClassifications(fileName, span, format) {
-            if (!isTsOrTsxFile(fileName)) {
-                // do not run semantic classification on non-ts-or-tsx files
-                return [];
-            }
             synchronizeHostData();
             var responseFormat = format || "original" /* Original */;
             if (responseFormat === "2020" /* TwentyTwenty */) {
@@ -150040,10 +154161,6 @@ var ts;
             }
         }
         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();
             var responseFormat = format || "original" /* Original */;
             if (responseFormat === "original" /* Original */) {
@@ -150134,13 +154251,13 @@ var ts;
             var formatContext = ts.formatting.getFormatContext(formatOptions, host);
             return ts.codefix.getAllFixes({ fixId: fixId, sourceFile: sourceFile, program: program, host: host, cancellationToken: cancellationToken, formatContext: formatContext, preferences: preferences });
         }
-        function organizeImports(scope, formatOptions, preferences) {
+        function organizeImports(args, formatOptions, preferences) {
             if (preferences === void 0) { preferences = ts.emptyOptions; }
             synchronizeHostData();
-            ts.Debug.assert(scope.type === "file");
-            var sourceFile = getValidSourceFile(scope.fileName);
+            ts.Debug.assert(args.type === "file");
+            var sourceFile = getValidSourceFile(args.fileName);
             var formatContext = ts.formatting.getFormatContext(formatOptions, host);
-            return ts.OrganizeImports.organizeImports(sourceFile, formatContext, host, program, preferences);
+            return ts.OrganizeImports.organizeImports(sourceFile, formatContext, host, program, preferences, args.skipDestructiveCodeActions);
         }
         function getEditsForFileRename(oldFilePath, newFilePath, formatOptions, preferences) {
             if (preferences === void 0) { preferences = ts.emptyOptions; }
@@ -150573,6 +154690,16 @@ var ts;
             var file = getValidSourceFile(fileName);
             return ts.refactor.getEditsForRefactor(getRefactorContext(file, positionOrRange, preferences, formatOptions), refactorName, actionName);
         }
+        function toLineColumnOffset(fileName, position) {
+            // Go to Definition supports returning a zero-length span at position 0 for
+            // non-existent files. We need to special-case the conversion of position 0
+            // to avoid a crash trying to get the text for that file, since this function
+            // otherwise assumes that 'fileName' is the name of a file that exists.
+            if (position === 0) {
+                return { line: 0, character: 0 };
+            }
+            return sourceMapper.toLineColumnOffset(fileName, position);
+        }
         function prepareCallHierarchy(fileName, position) {
             synchronizeHostData();
             var declarations = ts.CallHierarchy.resolveCallHierarchyDeclaration(program, ts.getTouchingPropertyName(getValidSourceFile(fileName), position));
@@ -150645,7 +154772,7 @@ var ts;
             getAutoImportProvider: getAutoImportProvider,
             getApplicableRefactors: getApplicableRefactors,
             getEditsForRefactor: getEditsForRefactor,
-            toLineColumnOffset: sourceMapper.toLineColumnOffset,
+            toLineColumnOffset: toLineColumnOffset,
             getSourceMapper: function () { return sourceMapper; },
             clearSourceMapperCache: function () { return sourceMapper.clearCache(); },
             prepareCallHierarchy: prepareCallHierarchy,
@@ -150716,7 +154843,7 @@ var ts;
      */
     function literalIsName(node) {
         return ts.isDeclarationName(node) ||
-            node.parent.kind === 272 /* ExternalModuleReference */ ||
+            node.parent.kind === 273 /* ExternalModuleReference */ ||
             isArgumentOfElementAccessExpression(node) ||
             ts.isLiteralComputedPropertyDeclarationName(node);
     }
@@ -150734,13 +154861,13 @@ var ts;
             case 10 /* StringLiteral */:
             case 14 /* NoSubstitutionTemplateLiteral */:
             case 8 /* NumericLiteral */:
-                if (node.parent.kind === 158 /* ComputedPropertyName */) {
+                if (node.parent.kind === 159 /* 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 === 200 /* ObjectLiteralExpression */ || node.parent.parent.kind === 281 /* JsxAttributes */) &&
+                    (node.parent.parent.kind === 201 /* ObjectLiteralExpression */ || node.parent.parent.kind === 282 /* JsxAttributes */) &&
                     node.parent.name === node ? node.parent : undefined;
         }
         return undefined;
@@ -150782,7 +154909,7 @@ var ts;
     function isArgumentOfElementAccessExpression(node) {
         return node &&
             node.parent &&
-            node.parent.kind === 202 /* ElementAccessExpression */ &&
+            node.parent.kind === 203 /* ElementAccessExpression */ &&
             node.parent.argumentExpression === node;
     }
     /**
@@ -150862,114 +154989,114 @@ var ts;
                 if (node) {
                     var parent = node.parent;
                     switch (node.kind) {
-                        case 232 /* VariableStatement */:
+                        case 233 /* VariableStatement */:
                             // Span on first variable declaration
                             return spanInVariableDeclaration(node.declarationList.declarations[0]);
-                        case 249 /* VariableDeclaration */:
-                        case 163 /* PropertyDeclaration */:
-                        case 162 /* PropertySignature */:
+                        case 250 /* VariableDeclaration */:
+                        case 164 /* PropertyDeclaration */:
+                        case 163 /* PropertySignature */:
                             return spanInVariableDeclaration(node);
-                        case 160 /* Parameter */:
+                        case 161 /* Parameter */:
                             return spanInParameterDeclaration(node);
-                        case 251 /* FunctionDeclaration */:
-                        case 165 /* MethodDeclaration */:
-                        case 164 /* MethodSignature */:
-                        case 167 /* GetAccessor */:
-                        case 168 /* SetAccessor */:
-                        case 166 /* Constructor */:
-                        case 208 /* FunctionExpression */:
-                        case 209 /* ArrowFunction */:
+                        case 252 /* FunctionDeclaration */:
+                        case 166 /* MethodDeclaration */:
+                        case 165 /* MethodSignature */:
+                        case 168 /* GetAccessor */:
+                        case 169 /* SetAccessor */:
+                        case 167 /* Constructor */:
+                        case 209 /* FunctionExpression */:
+                        case 210 /* ArrowFunction */:
                             return spanInFunctionDeclaration(node);
-                        case 230 /* Block */:
+                        case 231 /* Block */:
                             if (ts.isFunctionBlock(node)) {
                                 return spanInFunctionBlock(node);
                             }
                         // falls through
-                        case 257 /* ModuleBlock */:
+                        case 258 /* ModuleBlock */:
                             return spanInBlock(node);
-                        case 287 /* CatchClause */:
+                        case 288 /* CatchClause */:
                             return spanInBlock(node.block);
-                        case 233 /* ExpressionStatement */:
+                        case 234 /* ExpressionStatement */:
                             // span on the expression
                             return textSpan(node.expression);
-                        case 242 /* ReturnStatement */:
+                        case 243 /* ReturnStatement */:
                             // span on return keyword and expression if present
                             return textSpan(node.getChildAt(0), node.expression);
-                        case 236 /* WhileStatement */:
+                        case 237 /* WhileStatement */:
                             // Span on while(...)
                             return textSpanEndingAtNextToken(node, node.expression);
-                        case 235 /* DoStatement */:
+                        case 236 /* DoStatement */:
                             // span in statement of the do statement
                             return spanInNode(node.statement);
-                        case 248 /* DebuggerStatement */:
+                        case 249 /* DebuggerStatement */:
                             // span on debugger keyword
                             return textSpan(node.getChildAt(0));
-                        case 234 /* IfStatement */:
+                        case 235 /* IfStatement */:
                             // set on if(..) span
                             return textSpanEndingAtNextToken(node, node.expression);
-                        case 245 /* LabeledStatement */:
+                        case 246 /* LabeledStatement */:
                             // span in statement
                             return spanInNode(node.statement);
-                        case 241 /* BreakStatement */:
-                        case 240 /* ContinueStatement */:
+                        case 242 /* BreakStatement */:
+                        case 241 /* ContinueStatement */:
                             // On break or continue keyword and label if present
                             return textSpan(node.getChildAt(0), node.label);
-                        case 237 /* ForStatement */:
+                        case 238 /* ForStatement */:
                             return spanInForStatement(node);
-                        case 238 /* ForInStatement */:
+                        case 239 /* ForInStatement */:
                             // span of for (a in ...)
                             return textSpanEndingAtNextToken(node, node.expression);
-                        case 239 /* ForOfStatement */:
+                        case 240 /* ForOfStatement */:
                             // span in initializer
                             return spanInInitializerOfForLike(node);
-                        case 244 /* SwitchStatement */:
+                        case 245 /* SwitchStatement */:
                             // span on switch(...)
                             return textSpanEndingAtNextToken(node, node.expression);
-                        case 284 /* CaseClause */:
-                        case 285 /* DefaultClause */:
+                        case 285 /* CaseClause */:
+                        case 286 /* DefaultClause */:
                             // span in first statement of the clause
                             return spanInNode(node.statements[0]);
-                        case 247 /* TryStatement */:
+                        case 248 /* TryStatement */:
                             // span in try block
                             return spanInBlock(node.tryBlock);
-                        case 246 /* ThrowStatement */:
+                        case 247 /* ThrowStatement */:
                             // span in throw ...
                             return textSpan(node, node.expression);
-                        case 266 /* ExportAssignment */:
+                        case 267 /* ExportAssignment */:
                             // span on export = id
                             return textSpan(node, node.expression);
-                        case 260 /* ImportEqualsDeclaration */:
+                        case 261 /* ImportEqualsDeclaration */:
                             // import statement without including semicolon
                             return textSpan(node, node.moduleReference);
-                        case 261 /* ImportDeclaration */:
+                        case 262 /* ImportDeclaration */:
                             // import statement without including semicolon
                             return textSpan(node, node.moduleSpecifier);
-                        case 267 /* ExportDeclaration */:
+                        case 268 /* ExportDeclaration */:
                             // import statement without including semicolon
                             return textSpan(node, node.moduleSpecifier);
-                        case 256 /* ModuleDeclaration */:
+                        case 257 /* ModuleDeclaration */:
                             // span on complete module if it is instantiated
                             if (ts.getModuleInstanceState(node) !== 1 /* Instantiated */) {
                                 return undefined;
                             }
                         // falls through
-                        case 252 /* ClassDeclaration */:
-                        case 255 /* EnumDeclaration */:
-                        case 291 /* EnumMember */:
-                        case 198 /* BindingElement */:
+                        case 253 /* ClassDeclaration */:
+                        case 256 /* EnumDeclaration */:
+                        case 292 /* EnumMember */:
+                        case 199 /* BindingElement */:
                             // span on complete node
                             return textSpan(node);
-                        case 243 /* WithStatement */:
+                        case 244 /* WithStatement */:
                             // span in statement
                             return spanInNode(node.statement);
-                        case 161 /* Decorator */:
+                        case 162 /* Decorator */:
                             return spanInNodeArray(parent.decorators);
-                        case 196 /* ObjectBindingPattern */:
-                        case 197 /* ArrayBindingPattern */:
+                        case 197 /* ObjectBindingPattern */:
+                        case 198 /* ArrayBindingPattern */:
                             return spanInBindingPattern(node);
                         // No breakpoint in interface, type alias
-                        case 253 /* InterfaceDeclaration */:
-                        case 254 /* TypeAliasDeclaration */:
+                        case 254 /* InterfaceDeclaration */:
+                        case 255 /* TypeAliasDeclaration */:
                             return undefined;
                         // Tokens:
                         case 26 /* SemicolonToken */:
@@ -150999,7 +155126,7 @@ var ts;
                         case 82 /* CatchKeyword */:
                         case 95 /* FinallyKeyword */:
                             return spanInNextNode(node);
-                        case 156 /* OfKeyword */:
+                        case 157 /* OfKeyword */:
                             return spanInOfKeyword(node);
                         default:
                             // Destructuring pattern in destructuring assignment
@@ -151012,13 +155139,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 === 220 /* SpreadElement */ ||
-                                node.kind === 288 /* PropertyAssignment */ ||
-                                node.kind === 289 /* ShorthandPropertyAssignment */) &&
+                                node.kind === 221 /* SpreadElement */ ||
+                                node.kind === 289 /* PropertyAssignment */ ||
+                                node.kind === 290 /* ShorthandPropertyAssignment */) &&
                                 ts.isArrayLiteralOrObjectLiteralDestructuringPattern(parent)) {
                                 return textSpan(node);
                             }
-                            if (node.kind === 216 /* BinaryExpression */) {
+                            if (node.kind === 217 /* 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
@@ -151040,22 +155167,22 @@ var ts;
                             }
                             if (ts.isExpressionNode(node)) {
                                 switch (parent.kind) {
-                                    case 235 /* DoStatement */:
+                                    case 236 /* DoStatement */:
                                         // Set span as if on while keyword
                                         return spanInPreviousNode(node);
-                                    case 161 /* Decorator */:
+                                    case 162 /* Decorator */:
                                         // Set breakpoint on the decorator emit
                                         return spanInNode(node.parent);
-                                    case 237 /* ForStatement */:
-                                    case 239 /* ForOfStatement */:
+                                    case 238 /* ForStatement */:
+                                    case 240 /* ForOfStatement */:
                                         return textSpan(node);
-                                    case 216 /* BinaryExpression */:
+                                    case 217 /* 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 209 /* ArrowFunction */:
+                                    case 210 /* ArrowFunction */:
                                         if (node.parent.body === node) {
                                             // If this is body of arrow function, it is allowed to have the breakpoint
                                             return textSpan(node);
@@ -151064,21 +155191,21 @@ var ts;
                                 }
                             }
                             switch (node.parent.kind) {
-                                case 288 /* PropertyAssignment */:
+                                case 289 /* 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 206 /* TypeAssertionExpression */:
+                                case 207 /* TypeAssertionExpression */:
                                     // Breakpoint in type assertion goes to its operand
                                     if (node.parent.type === node) {
                                         return spanInNextNode(node.parent.type);
                                     }
                                     break;
-                                case 249 /* VariableDeclaration */:
-                                case 160 /* Parameter */: {
+                                case 250 /* VariableDeclaration */:
+                                case 161 /* 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)) {
@@ -151086,7 +155213,7 @@ var ts;
                                     }
                                     break;
                                 }
-                                case 216 /* BinaryExpression */: {
+                                case 217 /* BinaryExpression */: {
                                     var left = node.parent.left;
                                     if (ts.isArrayLiteralOrObjectLiteralDestructuringPattern(left) && node !== left) {
                                         // If initializer of destructuring assignment move to previous token
@@ -151116,7 +155243,7 @@ var ts;
                 }
                 function spanInVariableDeclaration(variableDeclaration) {
                     // If declaration of for in statement, just set the span in parent
-                    if (variableDeclaration.parent.parent.kind === 238 /* ForInStatement */) {
+                    if (variableDeclaration.parent.parent.kind === 239 /* ForInStatement */) {
                         return spanInNode(variableDeclaration.parent.parent);
                     }
                     var parent = variableDeclaration.parent;
@@ -151128,7 +155255,7 @@ var ts;
                     // or its declaration from 'for of'
                     if (variableDeclaration.initializer ||
                         ts.hasSyntacticModifier(variableDeclaration, 1 /* Export */) ||
-                        parent.parent.kind === 239 /* ForOfStatement */) {
+                        parent.parent.kind === 240 /* ForOfStatement */) {
                         return textSpanFromVariableDeclaration(variableDeclaration);
                     }
                     if (ts.isVariableDeclarationList(variableDeclaration.parent) &&
@@ -151169,7 +155296,7 @@ var ts;
                 }
                 function canFunctionHaveSpanInWholeDeclaration(functionDeclaration) {
                     return ts.hasSyntacticModifier(functionDeclaration, 1 /* Export */) ||
-                        (functionDeclaration.parent.kind === 252 /* ClassDeclaration */ && functionDeclaration.kind !== 166 /* Constructor */);
+                        (functionDeclaration.parent.kind === 253 /* ClassDeclaration */ && functionDeclaration.kind !== 167 /* Constructor */);
                 }
                 function spanInFunctionDeclaration(functionDeclaration) {
                     // No breakpoints in the function signature
@@ -151192,26 +155319,26 @@ var ts;
                 }
                 function spanInBlock(block) {
                     switch (block.parent.kind) {
-                        case 256 /* ModuleDeclaration */:
+                        case 257 /* ModuleDeclaration */:
                             if (ts.getModuleInstanceState(block.parent) !== 1 /* Instantiated */) {
                                 return undefined;
                             }
                         // Set on parent if on same line otherwise on first statement
                         // falls through
-                        case 236 /* WhileStatement */:
-                        case 234 /* IfStatement */:
-                        case 238 /* ForInStatement */:
+                        case 237 /* WhileStatement */:
+                        case 235 /* IfStatement */:
+                        case 239 /* 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 237 /* ForStatement */:
-                        case 239 /* ForOfStatement */:
+                        case 238 /* ForStatement */:
+                        case 240 /* 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 === 250 /* VariableDeclarationList */) {
+                    if (forLikeStatement.initializer.kind === 251 /* VariableDeclarationList */) {
                         // Declaration list - set breakpoint in first declaration
                         var variableDeclarationList = forLikeStatement.initializer;
                         if (variableDeclarationList.declarations.length > 0) {
@@ -151236,21 +155363,21 @@ var ts;
                 }
                 function spanInBindingPattern(bindingPattern) {
                     // Set breakpoint in first binding element
-                    var firstBindingElement = ts.forEach(bindingPattern.elements, function (element) { return element.kind !== 222 /* OmittedExpression */ ? element : undefined; });
+                    var firstBindingElement = ts.forEach(bindingPattern.elements, function (element) { return element.kind !== 223 /* OmittedExpression */ ? element : undefined; });
                     if (firstBindingElement) {
                         return spanInNode(firstBindingElement);
                     }
                     // Empty binding pattern of binding element, set breakpoint on binding element
-                    if (bindingPattern.parent.kind === 198 /* BindingElement */) {
+                    if (bindingPattern.parent.kind === 199 /* BindingElement */) {
                         return textSpan(bindingPattern.parent);
                     }
                     // Variable declaration is used as the span
                     return textSpanFromVariableDeclaration(bindingPattern.parent);
                 }
                 function spanInArrayLiteralOrObjectLiteralDestructuringPattern(node) {
-                    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; });
+                    ts.Debug.assert(node.kind !== 198 /* ArrayBindingPattern */ && node.kind !== 197 /* ObjectBindingPattern */);
+                    var elements = node.kind === 200 /* ArrayLiteralExpression */ ? node.elements : node.properties;
+                    var firstBindingElement = ts.forEach(elements, function (element) { return element.kind !== 223 /* OmittedExpression */ ? element : undefined; });
                     if (firstBindingElement) {
                         return spanInNode(firstBindingElement);
                     }
@@ -151258,18 +155385,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 === 216 /* BinaryExpression */ ? node.parent : node);
+                    return textSpan(node.parent.kind === 217 /* BinaryExpression */ ? node.parent : node);
                 }
                 // Tokens:
                 function spanInOpenBraceToken(node) {
                     switch (node.parent.kind) {
-                        case 255 /* EnumDeclaration */:
+                        case 256 /* EnumDeclaration */:
                             var enumDeclaration = node.parent;
                             return spanInNodeIfStartsOnSameLine(ts.findPrecedingToken(node.pos, sourceFile, node.parent), enumDeclaration.members.length ? enumDeclaration.members[0] : enumDeclaration.getLastToken(sourceFile));
-                        case 252 /* ClassDeclaration */:
+                        case 253 /* ClassDeclaration */:
                             var classDeclaration = node.parent;
                             return spanInNodeIfStartsOnSameLine(ts.findPrecedingToken(node.pos, sourceFile, node.parent), classDeclaration.members.length ? classDeclaration.members[0] : classDeclaration.getLastToken(sourceFile));
-                        case 258 /* CaseBlock */:
+                        case 259 /* CaseBlock */:
                             return spanInNodeIfStartsOnSameLine(node.parent.parent, node.parent.clauses[0]);
                     }
                     // Default to parent node
@@ -151277,25 +155404,25 @@ var ts;
                 }
                 function spanInCloseBraceToken(node) {
                     switch (node.parent.kind) {
-                        case 257 /* ModuleBlock */:
+                        case 258 /* 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 255 /* EnumDeclaration */:
-                        case 252 /* ClassDeclaration */:
+                        case 256 /* EnumDeclaration */:
+                        case 253 /* ClassDeclaration */:
                             // Span on close brace token
                             return textSpan(node);
-                        case 230 /* Block */:
+                        case 231 /* Block */:
                             if (ts.isFunctionBlock(node.parent)) {
                                 // Span on close brace token
                                 return textSpan(node);
                             }
                         // falls through
-                        case 287 /* CatchClause */:
+                        case 288 /* CatchClause */:
                             return spanInNode(ts.lastOrUndefined(node.parent.statements));
-                        case 258 /* CaseBlock */:
+                        case 259 /* CaseBlock */:
                             // breakpoint in last statement of the last clause
                             var caseBlock = node.parent;
                             var lastClause = ts.lastOrUndefined(caseBlock.clauses);
@@ -151303,7 +155430,7 @@ var ts;
                                 return spanInNode(ts.lastOrUndefined(lastClause.statements));
                             }
                             return undefined;
-                        case 196 /* ObjectBindingPattern */:
+                        case 197 /* 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);
@@ -151319,7 +155446,7 @@ var ts;
                 }
                 function spanInCloseBracketToken(node) {
                     switch (node.parent.kind) {
-                        case 197 /* ArrayBindingPattern */:
+                        case 198 /* 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);
@@ -151334,12 +155461,12 @@ var ts;
                     }
                 }
                 function spanInOpenParenToken(node) {
-                    if (node.parent.kind === 235 /* DoStatement */ || // Go to while keyword and do action instead
-                        node.parent.kind === 203 /* CallExpression */ ||
-                        node.parent.kind === 204 /* NewExpression */) {
+                    if (node.parent.kind === 236 /* DoStatement */ || // Go to while keyword and do action instead
+                        node.parent.kind === 204 /* CallExpression */ ||
+                        node.parent.kind === 205 /* NewExpression */) {
                         return spanInPreviousNode(node);
                     }
-                    if (node.parent.kind === 207 /* ParenthesizedExpression */) {
+                    if (node.parent.kind === 208 /* ParenthesizedExpression */) {
                         return spanInNextNode(node);
                     }
                     // Default to parent node
@@ -151348,21 +155475,21 @@ var ts;
                 function spanInCloseParenToken(node) {
                     // Is this close paren token of parameter list, set span in previous token
                     switch (node.parent.kind) {
-                        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 */:
+                        case 209 /* FunctionExpression */:
+                        case 252 /* FunctionDeclaration */:
+                        case 210 /* ArrowFunction */:
+                        case 166 /* MethodDeclaration */:
+                        case 165 /* MethodSignature */:
+                        case 168 /* GetAccessor */:
+                        case 169 /* SetAccessor */:
+                        case 167 /* Constructor */:
+                        case 237 /* WhileStatement */:
+                        case 236 /* DoStatement */:
+                        case 238 /* ForStatement */:
+                        case 240 /* ForOfStatement */:
+                        case 204 /* CallExpression */:
+                        case 205 /* NewExpression */:
+                        case 208 /* ParenthesizedExpression */:
                             return spanInPreviousNode(node);
                         // Default to parent node
                         default:
@@ -151372,20 +155499,20 @@ var ts;
                 function spanInColonToken(node) {
                     // Is this : specifying return annotation of the function declaration
                     if (ts.isFunctionLike(node.parent) ||
-                        node.parent.kind === 288 /* PropertyAssignment */ ||
-                        node.parent.kind === 160 /* Parameter */) {
+                        node.parent.kind === 289 /* PropertyAssignment */ ||
+                        node.parent.kind === 161 /* Parameter */) {
                         return spanInPreviousNode(node);
                     }
                     return spanInNode(node.parent);
                 }
                 function spanInGreaterThanOrLessThanToken(node) {
-                    if (node.parent.kind === 206 /* TypeAssertionExpression */) {
+                    if (node.parent.kind === 207 /* TypeAssertionExpression */) {
                         return spanInNextNode(node);
                     }
                     return spanInNode(node.parent);
                 }
                 function spanInWhileKeyword(node) {
-                    if (node.parent.kind === 235 /* DoStatement */) {
+                    if (node.parent.kind === 236 /* DoStatement */) {
                         // Set span on while expression
                         return textSpanEndingAtNextToken(node, node.parent.expression);
                     }
@@ -151393,7 +155520,7 @@ var ts;
                     return spanInNode(node.parent);
                 }
                 function spanInOfKeyword(node) {
-                    if (node.parent.kind === 239 /* ForOfStatement */) {
+                    if (node.parent.kind === 240 /* ForOfStatement */) {
                         // Set using next token
                         return spanInNextNode(node);
                     }
@@ -151934,11 +156061,11 @@ var ts;
             return this.forwardJSONCall("getCompletionsAtPosition('" + fileName + "', " + position + ", " + preferences + ")", function () { return _this.languageService.getCompletionsAtPosition(fileName, position, preferences); });
         };
         /** Get a string based representation of a completion list entry details */
-        LanguageServiceShimObject.prototype.getCompletionEntryDetails = function (fileName, position, entryName, formatOptions, source, preferences) {
+        LanguageServiceShimObject.prototype.getCompletionEntryDetails = function (fileName, position, entryName, formatOptions, source, preferences, data) {
             var _this = this;
             return this.forwardJSONCall("getCompletionEntryDetails('" + fileName + "', " + position + ", '" + entryName + "')", function () {
                 var localOptions = formatOptions === undefined ? undefined : JSON.parse(formatOptions);
-                return _this.languageService.getCompletionEntryDetails(fileName, position, entryName, localOptions, source, preferences);
+                return _this.languageService.getCompletionEntryDetails(fileName, position, entryName, localOptions, source, preferences, data);
             });
         };
         LanguageServiceShimObject.prototype.getFormattingEditsForRange = function (fileName, start, end, options /*Services.FormatCodeOptions*/) {
@@ -153104,7 +157231,7 @@ var ts;
     }, factoryDeprecation);
     /** @deprecated Use `factory.createJSDocParameterTag` or the factory supplied by your transformation context instead. */
     ts.createJSDocParamTag = ts.Debug.deprecate(function createJSDocParamTag(name, isBracketed, typeExpression, comment) {
-        return ts.factory.createJSDocParameterTag(/*tagName*/ undefined, name, isBracketed, typeExpression, /*isNameFirst*/ false, comment);
+        return ts.factory.createJSDocParameterTag(/*tagName*/ undefined, name, isBracketed, typeExpression, /*isNameFirst*/ false, comment ? ts.factory.createNodeArray([ts.factory.createJSDocText(comment)]) : undefined);
     }, factoryDeprecation);
     /** @deprecated Use `factory.createComma` or the factory supplied by your transformation context instead. */
     ts.createComma = ts.Debug.deprecate(function createComma(left, right) {
@@ -153154,7 +157281,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 === 297 /* SourceFile */ ? ts.parseBaseNodeFactory.createBaseSourceFileNode(kind) :
+        return ts.setTextRangePosEnd(kind === 298 /* 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) :
@@ -153183,13 +157310,30 @@ var ts;
     // #region Renamed node Tests
     /** @deprecated Use `isTypeAssertionExpression` instead. */
     ts.isTypeAssertion = ts.Debug.deprecate(function isTypeAssertion(node) {
-        return node.kind === 206 /* TypeAssertionExpression */;
+        return node.kind === 207 /* TypeAssertionExpression */;
     }, {
         since: "4.0",
         warnAfter: "4.1",
         message: "Use `isTypeAssertionExpression` instead."
     });
     // #endregion
+    // DEPRECATION: Renamed node tests
+    // DEPRECATION PLAN:
+    //     - soft: 4.2
+    //     - warn: 4.3
+    //     - error: TBD
+    // #region Renamed node Tests
+    /**
+     * @deprecated Use `isMemberName` instead.
+     */
+    ts.isIdentifierOrPrivateIdentifier = ts.Debug.deprecate(function isIdentifierOrPrivateIdentifier(node) {
+        return ts.isMemberName(node);
+    }, {
+        since: "4.2",
+        warnAfter: "4.3",
+        message: "Use `isMemberName` instead."
+    });
+    // #endregion Renamed node Tests
 })(ts || (ts = {}));
 
 
diff --git a/packages/schematics/angular/universal/index.ts b/packages/schematics/angular/universal/index.ts
index d912875184e5..7af96ced1115 100644
--- a/packages/schematics/angular/universal/index.ts
+++ b/packages/schematics/angular/universal/index.ts
@@ -1,18 +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 {
-  JsonValue,
-  Path,
-  basename,
-  join,
-  normalize,
-  strings,
-} from '@angular-devkit/core';
+
+import { JsonValue, Path, basename, join, normalize, strings } from '@angular-devkit/core';
 import {
   Rule,
   SchematicContext,
@@ -25,9 +19,7 @@ import {
   move,
   url,
 } from '@angular-devkit/schematics';
-import {
-  NodePackageInstallTask,
-} from '@angular-devkit/schematics/tasks';
+import { NodePackageInstallTask } from '@angular-devkit/schematics/tasks';
 import * as ts from '../third_party/github.com/Microsoft/TypeScript/lib/typescript';
 import { findNode, getDecoratorMetadata } from '../utility/ast-utils';
 import { InsertChange } from '../utility/change';
@@ -40,8 +32,8 @@ import { BrowserBuilderOptions, Builders } from '../utility/workspace-models';
 import { Schema as UniversalOptions } from './schema';
 
 function updateConfigFile(options: UniversalOptions, tsConfigDirectory: Path): Rule {
-  return updateWorkspace(workspace => {
-    const clientProject = workspace.projects.get(options.clientProject);
+  return updateWorkspace((workspace) => {
+    const clientProject = workspace.projects.get(options.project);
 
     if (clientProject) {
       // In case the browser builder hashes the assets
@@ -61,12 +53,13 @@ function updateConfigFile(options: UniversalOptions, tsConfigDirectory: Path): R
           i18nMissingTranslation: options?.i18nMissingTranslation,
           preserveSymlinks: options?.preserveSymlinks,
           extractLicenses: options?.extractLicenses,
+          inlineStyleLanguage: options?.inlineStyleLanguage,
         };
       };
 
       const buildTarget = clientProject.targets.get('build');
       if (buildTarget?.options) {
-        buildTarget.options.outputPath = `dist/${options.clientProject}/browser`;
+        buildTarget.options.outputPath = `dist/${options.project}/browser`;
       }
 
       const buildConfigurations = buildTarget?.configurations;
@@ -84,8 +77,12 @@ function updateConfigFile(options: UniversalOptions, tsConfigDirectory: Path): R
         builder: Builders.Server,
         defaultConfiguration: 'production',
         options: {
-          outputPath: `dist/${options.clientProject}/server`,
-          main: join(normalize(clientProject.root), 'src', mainPath.endsWith('.ts') ? mainPath : mainPath + '.ts'),
+          outputPath: `dist/${options.project}/server`,
+          main: join(
+            normalize(clientProject.root),
+            'src',
+            mainPath.endsWith('.ts') ? mainPath : mainPath + '.ts',
+          ),
           tsConfig: serverTsConfig,
           ...(buildTarget?.options ? getServerOptions(buildTarget?.options) : {}),
         },
@@ -143,9 +140,18 @@ function wrapBootstrapCall(mainFile: string): Rule {
 
     // indent contents
     const triviaWidth = bootstrapCall.getLeadingTriviaWidth();
-    const beforeText = `document.addEventListener('DOMContentLoaded', () => {\n`
-      + ' '.repeat(triviaWidth > 2 ? triviaWidth + 1 : triviaWidth);
-    const afterText = `\n${triviaWidth > 2 ? ' '.repeat(triviaWidth - 1) : ''}});`;
+    const beforeText =
+      `function bootstrap() {\n` + ' '.repeat(triviaWidth > 2 ? triviaWidth + 1 : triviaWidth);
+    const afterText =
+      `\n${triviaWidth > 2 ? ' '.repeat(triviaWidth - 1) : ''}};\n` +
+      `
+
+if (document.readyState === 'complete') {
+  bootstrap();
+} else {
+  document.addEventListener('DOMContentLoaded', bootstrap);
+}
+`;
 
     // in some cases we need to cater for a trailing semicolon such as;
     // bootstrap().catch(err => console.log(err));
@@ -164,15 +170,15 @@ function wrapBootstrapCall(mainFile: string): Rule {
 
 function findCallExpressionNode(node: ts.Node, text: string): ts.Node | null {
   if (
-    ts.isCallExpression(node)
-    && ts.isIdentifier(node.expression)
-    && node.expression.text === text
+    ts.isCallExpression(node) &&
+    ts.isIdentifier(node.expression) &&
+    node.expression.text === text
   ) {
     return node;
   }
 
   let foundNode: ts.Node | null = null;
-  ts.forEachChild(node, childNode => {
+  ts.forEachChild(node, (childNode) => {
     foundNode = findCallExpressionNode(childNode, text);
 
     if (foundNode) {
@@ -193,14 +199,14 @@ function addServerTransition(
 
     const bootstrapModuleRelativePath = findBootstrapModulePath(host, mainPath);
     const bootstrapModulePath = normalize(
-      `/${clientProjectRoot}/src/${bootstrapModuleRelativePath}.ts`);
+      `/${clientProjectRoot}/src/${bootstrapModuleRelativePath}.ts`,
+    );
 
     const browserModuleImport = findBrowserModuleImport(host, bootstrapModulePath);
     const appId = options.appId;
     const transitionCall = `.withServerTransition({ appId: '${appId}' })`;
     const position = browserModuleImport.pos + browserModuleImport.getFullText().length;
-    const transitionCallChange = new InsertChange(
-      bootstrapModulePath, position, transitionCall);
+    const transitionCallChange = new InsertChange(bootstrapModulePath, position, transitionCall);
 
     const transitionCallRecorder = host.beginUpdate(bootstrapModulePath);
     transitionCallRecorder.insertLeft(transitionCallChange.pos, transitionCallChange.toAdd);
@@ -228,7 +234,7 @@ export default function (options: UniversalOptions): Rule {
   return async (host: Tree, context: SchematicContext) => {
     const workspace = await getWorkspace(host);
 
-    const clientProject = workspace.projects.get(options.clientProject);
+    const clientProject = workspace.projects.get(options.project);
     if (!clientProject || clientProject.extensions.projectType !== 'application') {
       throw new SchematicsException(`Universal requires a project type of "application".`);
     }
@@ -238,8 +244,8 @@ export default function (options: UniversalOptions): Rule {
       throw targetBuildNotFoundError();
     }
 
-    const clientBuildOptions =
-      (clientBuildTarget.options || {}) as unknown as BrowserBuilderOptions;
+    const clientBuildOptions = (clientBuildTarget.options ||
+      {}) as unknown as BrowserBuilderOptions;
 
     const clientTsConfig = normalize(clientBuildOptions.tsConfig);
     const tsConfigExtends = basename(clientTsConfig);
@@ -255,7 +261,7 @@ export default function (options: UniversalOptions): Rule {
     const templateSource = apply(url('./files/src'), [
       applyTemplates({
         ...strings,
-        ...options as object,
+        ...(options as object),
         stripTsExtension: (s: string) => s.replace(/\.ts$/, ''),
         hasLocalizePackage: !!getPackageJsonDependency(host, '@angular/localize'),
       }),
@@ -265,7 +271,7 @@ export default function (options: UniversalOptions): Rule {
     const rootSource = apply(url('./files/root'), [
       applyTemplates({
         ...strings,
-        ...options as object,
+        ...(options as object),
         stripTsExtension: (s: string) => s.replace(/\.ts$/, ''),
         tsConfigExtends,
         relativePathToWorkspaceRoot: relativePathToWorkspaceRoot(tsConfigDirectory),
diff --git a/packages/schematics/angular/universal/index_spec.ts b/packages/schematics/angular/universal/index_spec.ts
index 13eaa686075e..178bf8e0a491 100644
--- a/packages/schematics/angular/universal/index_spec.ts
+++ b/packages/schematics/angular/universal/index_spec.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 { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
 import { parse as parseJson } from 'jsonc-parser';
 import { Schema as ApplicationOptions, Style } from '../application/schema';
@@ -12,17 +13,16 @@ import { NodeDependencyType, addPackageJsonDependency } from '../utility/depende
 import { Schema as WorkspaceOptions } from '../workspace/schema';
 import { Schema as UniversalOptions } from './schema';
 
-// tslint:disable-next-line:no-big-function
 describe('Universal Schematic', () => {
   const schematicRunner = new SchematicTestRunner(
     '@schematics/angular',
     require.resolve('../collection.json'),
   );
   const defaultOptions: UniversalOptions = {
-    clientProject: 'bar',
+    project: 'bar',
   };
   const workspaceUniversalOptions: UniversalOptions = {
-    clientProject: 'workspace',
+    project: 'workspace',
   };
 
   const workspaceOptions: WorkspaceOptions = {
@@ -56,24 +56,25 @@ describe('Universal Schematic', () => {
 
   beforeEach(async () => {
     appTree = await schematicRunner.runSchematicAsync('workspace', workspaceOptions).toPromise();
-    appTree = await schematicRunner.runSchematicAsync(
-      'application',
-      initialWorkspaceAppOptions,
-      appTree,
-    ).toPromise();
-    appTree = await schematicRunner.runSchematicAsync('application', appOptions, appTree)
+    appTree = await schematicRunner
+      .runSchematicAsync('application', initialWorkspaceAppOptions, appTree)
+      .toPromise();
+    appTree = await schematicRunner
+      .runSchematicAsync('application', appOptions, appTree)
       .toPromise();
   });
 
   it('should create a root module file', async () => {
-    const tree = await schematicRunner.runSchematicAsync('universal', defaultOptions, appTree)
+    const tree = await schematicRunner
+      .runSchematicAsync('universal', defaultOptions, appTree)
       .toPromise();
     const filePath = '/projects/bar/src/app/app.server.module.ts';
     expect(tree.exists(filePath)).toEqual(true);
   });
 
   it('should create a main file', async () => {
-    const tree = await schematicRunner.runSchematicAsync('universal', defaultOptions, appTree)
+    const tree = await schematicRunner
+      .runSchematicAsync('universal', defaultOptions, appTree)
       .toPromise();
     const filePath = '/projects/bar/src/main.server.ts';
     expect(tree.exists(filePath)).toEqual(true);
@@ -87,8 +88,7 @@ describe('Universal Schematic', () => {
       .toPromise();
     const filePath = '/tsconfig.server.json';
     expect(tree.exists(filePath)).toEqual(true);
-    // tslint:disable-next-line: no-any
-    const contents = parseJson(tree.readContent(filePath).toString()) as any;
+    const contents = parseJson(tree.readContent(filePath).toString());
     expect(contents).toEqual({
       extends: './tsconfig.app.json',
       compilerOptions: {
@@ -96,25 +96,24 @@ describe('Universal Schematic', () => {
         target: 'es2019',
         types: ['node'],
       },
-      files: [
-        'src/main.server.ts',
-      ],
+      files: ['src/main.server.ts'],
       angularCompilerOptions: {
         entryModule: './src/app/app.server.module#AppServerModule',
       },
     });
     const angularConfig = JSON.parse(tree.readContent('angular.json'));
-    expect(angularConfig.projects.workspace.architect
-      .server.options.tsConfig).toEqual('tsconfig.server.json');
+    expect(angularConfig.projects.workspace.architect.server.options.tsConfig).toEqual(
+      'tsconfig.server.json',
+    );
   });
 
   it('should create a tsconfig file for a generated application', async () => {
-    const tree = await schematicRunner.runSchematicAsync('universal', defaultOptions, appTree)
+    const tree = await schematicRunner
+      .runSchematicAsync('universal', defaultOptions, appTree)
       .toPromise();
     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()) as any;
+    const contents = parseJson(tree.readContent(filePath).toString());
     expect(contents).toEqual({
       extends: './tsconfig.app.json',
       compilerOptions: {
@@ -122,20 +121,20 @@ describe('Universal Schematic', () => {
         target: 'es2019',
         types: ['node'],
       },
-      files: [
-        'src/main.server.ts',
-      ],
+      files: ['src/main.server.ts'],
       angularCompilerOptions: {
         entryModule: './src/app/app.server.module#AppServerModule',
       },
     });
     const angularConfig = JSON.parse(tree.readContent('angular.json'));
-    expect(angularConfig.projects.bar.architect
-      .server.options.tsConfig).toEqual('projects/bar/tsconfig.server.json');
+    expect(angularConfig.projects.bar.architect.server.options.tsConfig).toEqual(
+      'projects/bar/tsconfig.server.json',
+    );
   });
 
   it('should add dependency: @angular/platform-server', async () => {
-    const tree = await schematicRunner.runSchematicAsync('universal', defaultOptions, appTree)
+    const tree = await schematicRunner
+      .runSchematicAsync('universal', defaultOptions, appTree)
       .toPromise();
     const filePath = '/package.json';
     const contents = tree.readContent(filePath);
@@ -143,7 +142,8 @@ describe('Universal Schematic', () => {
   });
 
   it('should update workspace with a server target', async () => {
-    const tree = await schematicRunner.runSchematicAsync('universal', defaultOptions, appTree)
+    const tree = await schematicRunner
+      .runSchematicAsync('universal', defaultOptions, appTree)
       .toPromise();
     const filePath = '/angular.json';
     const contents = tree.readContent(filePath);
@@ -157,12 +157,17 @@ describe('Universal Schematic', () => {
     expect(opts.tsConfig).toEqual('projects/bar/tsconfig.server.json');
     const configurations = targets.server.configurations;
     expect(configurations.production.fileReplacements.length).toEqual(1);
-    expect(configurations.production.fileReplacements[0].replace).toEqual('projects/bar/src/environments/environment.ts');
-    expect(configurations.production.fileReplacements[0].with).toEqual('projects/bar/src/environments/environment.prod.ts');
+    expect(configurations.production.fileReplacements[0].replace).toEqual(
+      'projects/bar/src/environments/environment.ts',
+    );
+    expect(configurations.production.fileReplacements[0].with).toEqual(
+      'projects/bar/src/environments/environment.prod.ts',
+    );
   });
 
   it('should update workspace with a build target outputPath', async () => {
-    const tree = await schematicRunner.runSchematicAsync('universal', defaultOptions, appTree)
+    const tree = await schematicRunner
+      .runSchematicAsync('universal', defaultOptions, appTree)
       .toPromise();
     const filePath = '/angular.json';
     const contents = tree.readContent(filePath);
@@ -172,7 +177,8 @@ describe('Universal Schematic', () => {
   });
 
   it('should add a server transition to BrowerModule import', async () => {
-    const tree = await schematicRunner.runSchematicAsync('universal', defaultOptions, appTree)
+    const tree = await schematicRunner
+      .runSchematicAsync('universal', defaultOptions, appTree)
       .toPromise();
     const filePath = '/projects/bar/src/app/app.module.ts';
     const contents = tree.readContent(filePath);
@@ -180,12 +186,12 @@ describe('Universal Schematic', () => {
   });
 
   it('should wrap the bootstrap call in a DOMContentLoaded event handler', async () => {
-    const tree = await schematicRunner.runSchematicAsync('universal', defaultOptions, appTree)
+    const tree = await schematicRunner
+      .runSchematicAsync('universal', defaultOptions, appTree)
       .toPromise();
     const filePath = '/projects/bar/src/main.ts';
     const contents = tree.readContent(filePath);
-    expect(contents)
-      .toMatch(/document.addEventListener\('DOMContentLoaded', \(\) => {/);
+    expect(contents).toContain(`document.addEventListener('DOMContentLoaded', bootstrap);`);
   });
 
   it('should wrap the bootstrap declaration in a DOMContentLoaded event handler', async () => {
@@ -211,19 +217,18 @@ describe('Universal Schematic', () => {
       `,
     );
 
-    const tree = await schematicRunner.runSchematicAsync('universal', defaultOptions, appTree)
+    const tree = await schematicRunner
+      .runSchematicAsync('universal', defaultOptions, appTree)
       .toPromise();
     const contents = tree.readContent(filePath);
-    expect(contents).toMatch(
-      /document.addEventListener\('DOMContentLoaded', \(\) => {[\n\r\s]+bootstrap\(\)/,
-    );
+    expect(contents).toContain(`document.addEventListener('DOMContentLoaded', bootstrap);`);
   });
 
   it('should install npm dependencies', async () => {
     await schematicRunner.runSchematicAsync('universal', defaultOptions, appTree).toPromise();
     expect(schematicRunner.tasks.length).toBe(1);
     expect(schematicRunner.tasks[0].name).toBe('node-package');
-    expect((schematicRunner.tasks[0].options as {command: string}).command).toBe('install');
+    expect((schematicRunner.tasks[0].options as { command: string }).command).toBe('install');
   });
 
   it(`should work when 'tsconfig.app.json' has comments`, async () => {
@@ -231,7 +236,8 @@ describe('Universal Schematic', () => {
     const appTsConfigContent = appTree.readContent(appTsConfigPath);
     appTree.overwrite(appTsConfigPath, '// comment in json file\n' + appTsConfigContent);
 
-    const tree = await schematicRunner.runSchematicAsync('universal', defaultOptions, appTree)
+    const tree = await schematicRunner
+      .runSchematicAsync('universal', defaultOptions, appTree)
       .toPromise();
 
     const filePath = '/projects/bar/tsconfig.server.json';
@@ -239,15 +245,17 @@ describe('Universal Schematic', () => {
   });
 
   it(`should add import to '@angular/platform-server/init' in main file`, async () => {
-    const tree = await schematicRunner.runSchematicAsync('universal', defaultOptions, appTree)
+    const tree = await schematicRunner
+      .runSchematicAsync('universal', defaultOptions, appTree)
       .toPromise();
     const filePath = '/projects/bar/src/main.server.ts';
     const contents = tree.readContent(filePath);
-    expect(contents).toContain('import \'@angular/platform-server/init\'');
+    expect(contents).toContain("import '@angular/platform-server/init'");
   });
 
   it(`should not add import to '@angular/localize' in main file when it's not a depedency`, async () => {
-    const tree = await schematicRunner.runSchematicAsync('universal', defaultOptions, appTree)
+    const tree = await schematicRunner
+      .runSchematicAsync('universal', defaultOptions, appTree)
       .toPromise();
     const filePath = '/projects/bar/src/main.server.ts';
     const contents = tree.readContent(filePath);
@@ -256,12 +264,13 @@ describe('Universal Schematic', () => {
 
   it(`should add import to '@angular/localize' in main file when it's a depedency`, async () => {
     addPackageJsonDependency(appTree, {
-       name: '@angular/localize',
-       type: NodeDependencyType.Default,
-       version: 'latest',
+      name: '@angular/localize',
+      type: NodeDependencyType.Default,
+      version: 'latest',
     });
 
-    const tree = await schematicRunner.runSchematicAsync('universal', defaultOptions, appTree)
+    const tree = await schematicRunner
+      .runSchematicAsync('universal', defaultOptions, appTree)
       .toPromise();
     const filePath = '/projects/bar/src/main.server.ts';
     const contents = tree.readContent(filePath);
diff --git a/packages/schematics/angular/universal/schema.json b/packages/schematics/angular/universal/schema.json
index 85642e8014a6..577c1864c77a 100644
--- a/packages/schematics/angular/universal/schema.json
+++ b/packages/schematics/angular/universal/schema.json
@@ -6,9 +6,12 @@
   "additionalProperties": false,
   "description": "Pass this schematic to the \"run\" command to set up server-side rendering for an app.",
   "properties": {
-    "clientProject": {
+    "project": {
       "type": "string",
-      "description": "The name of the related client app. Required in place of \"project\"."
+      "description": "The name of the project.",
+      "$default": {
+        "$source": "projectName"
+      }
     },
     "appId": {
       "type": "string",
@@ -45,7 +48,5 @@
       "default": false
     }
   },
-  "required": [
-    "clientProject"
-  ]
+  "required": ["project"]
 }
diff --git a/packages/schematics/angular/utility/ast-utils.ts b/packages/schematics/angular/utility/ast-utils.ts
index f77495bacdd7..cec6ab579cd6 100644
--- a/packages/schematics/angular/utility/ast-utils.ts
+++ b/packages/schematics/angular/utility/ast-utils.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 { tags } from '@angular-devkit/core';
 import * as ts from '../third_party/github.com/Microsoft/TypeScript/lib/typescript';
 import { Change, InsertChange, NoopChange } from './change';
 
-
 /**
  * Add Import `import { symbolName } from fileName` if the import doesn't exit
  * already. Assumes fileToEdit can be resolved and accessed.
@@ -19,26 +19,32 @@ import { Change, InsertChange, NoopChange } from './change';
  * @param isDefault (if true, import follows style for importing default exports)
  * @return Change
  */
-export function insertImport(source: ts.SourceFile, fileToEdit: string, symbolName: string,
-                             fileName: string, isDefault = false): Change {
+export function insertImport(
+  source: ts.SourceFile,
+  fileToEdit: string,
+  symbolName: string,
+  fileName: string,
+  isDefault = false,
+): Change {
   const rootNode = source;
   const allImports = findNodes(rootNode, ts.SyntaxKind.ImportDeclaration);
 
   // get nodes that map to import statements from the file fileName
-  const relevantImports = allImports.filter(node => {
+  const relevantImports = allImports.filter((node) => {
     // StringLiteral of the ImportDeclaration is the import file (fileName in this case).
-    const importFiles = node.getChildren()
+    const importFiles = node
+      .getChildren()
       .filter(ts.isStringLiteral)
-      .map(n => n.text);
+      .map((n) => n.text);
 
-    return importFiles.filter(file => file === fileName).length === 1;
+    return importFiles.filter((file) => file === fileName).length === 1;
   });
 
   if (relevantImports.length > 0) {
     let importsAsterisk = false;
     // imports from import file
     const imports: ts.Node[] = [];
-    relevantImports.forEach(n => {
+    relevantImports.forEach((n) => {
       Array.prototype.push.apply(imports, findNodes(n, ts.SyntaxKind.Identifier));
       if (findNodes(n, ts.SyntaxKind.AsteriskToken).length > 0) {
         importsAsterisk = true;
@@ -50,7 +56,7 @@ export function insertImport(source: ts.SourceFile, fileToEdit: string, symbolNa
       return new NoopChange();
     }
 
-    const importTextNodes = imports.filter(n => (n as ts.Identifier).text === symbolName);
+    const importTextNodes = imports.filter((n) => (n as ts.Identifier).text === symbolName);
 
     // insert import if it's not there
     if (importTextNodes.length === 0) {
@@ -65,8 +71,7 @@ export function insertImport(source: ts.SourceFile, fileToEdit: string, symbolNa
   }
 
   // no such import declaration exists
-  const useStrict = findNodes(rootNode, ts.isStringLiteral)
-    .filter((n) => n.text === 'use strict');
+  const useStrict = findNodes(rootNode, ts.isStringLiteral).filter((n) => n.text === 'use strict');
   let fallbackPos = 0;
   if (useStrict.length > 0) {
     fallbackPos = useStrict[0].end;
@@ -76,7 +81,8 @@ export function insertImport(source: ts.SourceFile, fileToEdit: string, symbolNa
   // if there are no imports or 'use strict' statement, insert import at beginning of file
   const insertAtBeginning = allImports.length === 0 && useStrict.length === 0;
   const separator = insertAtBeginning ? '' : ';\n';
-  const toInsert = `${separator}import ${open}${symbolName}${close}` +
+  const toInsert =
+    `${separator}import ${open}${symbolName}${close}` +
     ` from '${fileName}'${insertAtBeginning ? ';\n' : ''}`;
 
   return insertAfterLastOccurrence(
@@ -88,7 +94,6 @@ export function insertImport(source: ts.SourceFile, fileToEdit: string, symbolNa
   );
 }
 
-
 /**
  * Find all nodes from the AST in the subtree of node of SyntaxKind kind.
  * @param node
@@ -98,7 +103,12 @@ export function insertImport(source: ts.SourceFile, fileToEdit: string, symbolNa
  * the last child even when node of kind has been found.
  * @return all nodes of kind, or [] if none is found
  */
-export function findNodes(node: ts.Node, kind: ts.SyntaxKind, max?: number, recursive?: boolean): ts.Node[];
+export function findNodes(
+  node: ts.Node,
+  kind: ts.SyntaxKind,
+  max?: number,
+  recursive?: boolean,
+): ts.Node[];
 
 /**
  * Find all nodes from the AST in the subtree that satisfy a type guard.
@@ -109,7 +119,12 @@ export function findNodes(node: ts.Node, kind: ts.SyntaxKind, max?: number, recu
  * the last child even when node of kind has been found.
  * @return all nodes that satisfy the type guard, or [] if none is found
  */
-export function findNodes<T extends ts.Node>(node: ts.Node, guard: (node: ts.Node) => node is T, max?: number, recursive?: boolean): T[];
+export function findNodes<T extends ts.Node>(
+  node: ts.Node,
+  guard: (node: ts.Node) => node is T,
+  max?: number,
+  recursive?: boolean,
+): T[];
 
 export function findNodes<T extends ts.Node>(
   node: ts.Node,
@@ -149,7 +164,6 @@ export function findNodes<T extends ts.Node>(
   return arr;
 }
 
-
 /**
  * Get all the nodes from a source.
  * @param sourceFile The source file object.
@@ -180,14 +194,13 @@ export function findNode(node: ts.Node, kind: ts.SyntaxKind, text: string): ts.N
   }
 
   let foundNode: ts.Node | null = null;
-  ts.forEachChild(node, childNode => {
+  ts.forEachChild(node, (childNode) => {
     foundNode = foundNode || findNode(childNode, kind, text);
   });
 
   return foundNode;
 }
 
-
 /**
  * Helper for sorting nodes.
  * @return function to sort nodes in increasing order of position in sourceFile
@@ -196,7 +209,6 @@ function nodesByPosition(first: ts.Node, second: ts.Node): number {
   return first.getStart() - second.getStart();
 }
 
-
 /**
  * Insert `toInsert` after the last occurence of `ts.SyntaxKind[nodes[i].kind]`
  * or after the last of occurence of `syntaxKind` if the last occurence is a sub child
@@ -210,11 +222,13 @@ function nodesByPosition(first: ts.Node, second: ts.Node): number {
  * @return Change instance
  * @throw Error if toInsert is first occurence but fall back is not set
  */
-export function insertAfterLastOccurrence(nodes: ts.Node[],
-                                          toInsert: string,
-                                          file: string,
-                                          fallbackPos: number,
-                                          syntaxKind?: ts.SyntaxKind): Change {
+export function insertAfterLastOccurrence(
+  nodes: ts.Node[],
+  toInsert: string,
+  file: string,
+  fallbackPos: number,
+  syntaxKind?: ts.SyntaxKind,
+): Change {
   let lastItem: ts.Node | undefined;
   for (const node of nodes) {
     if (!lastItem || lastItem.getStart() < node.getStart()) {
@@ -232,8 +246,7 @@ export function insertAfterLastOccurrence(nodes: ts.Node[],
   return new InsertChange(file, lastItemPosition, toInsert);
 }
 
-function _angularImportsFromNode(node: ts.ImportDeclaration,
-                                 _sourceFile: ts.SourceFile): {[name: string]: string} {
+function _angularImportsFromNode(node: ts.ImportDeclaration): { [name: string]: string } {
   const ms = node.moduleSpecifier;
   let modulePath: string;
   switch (ms.kind) {
@@ -257,15 +270,15 @@ function _angularImportsFromNode(node: ts.ImportDeclaration,
       if (nb.kind == ts.SyntaxKind.NamespaceImport) {
         // This is of the form `import * as name from 'path'`. Return `name.`.
         return {
-          [(nb as ts.NamespaceImport).name.text + '.']: modulePath,
+          [nb.name.text + '.']: modulePath,
         };
       } else {
         // This is of the form `import {a,b,c} from 'path'`
-        const namedImports = nb as ts.NamedImports;
+        const namedImports = nb;
 
         return namedImports.elements
-          .map((is: ts.ImportSpecifier) => is.propertyName ? is.propertyName.text : is.name.text)
-          .reduce((acc: {[name: string]: string}, curr: string) => {
+          .map((is: ts.ImportSpecifier) => (is.propertyName ? is.propertyName.text : is.name.text))
+          .reduce((acc: { [name: string]: string }, curr: string) => {
             acc[curr] = modulePath;
 
             return acc;
@@ -280,11 +293,13 @@ function _angularImportsFromNode(node: ts.ImportDeclaration,
   }
 }
 
-
-export function getDecoratorMetadata(source: ts.SourceFile, identifier: string,
-                                     module: string): ts.Node[] {
+export function getDecoratorMetadata(
+  source: ts.SourceFile,
+  identifier: string,
+  module: string,
+): ts.Node[] {
   const angularImports = findNodes(source, ts.isImportDeclaration)
-    .map((node) => _angularImportsFromNode(node, source))
+    .map((node) => _angularImportsFromNode(node))
     .reduce((acc, current) => {
       for (const key of Object.keys(current)) {
         acc[key] = current[key];
@@ -294,12 +309,14 @@ export function getDecoratorMetadata(source: ts.SourceFile, identifier: string,
     }, {});
 
   return getSourceNodes(source)
-    .filter(node => {
-      return node.kind == ts.SyntaxKind.Decorator
-        && (node as ts.Decorator).expression.kind == ts.SyntaxKind.CallExpression;
+    .filter((node) => {
+      return (
+        node.kind == ts.SyntaxKind.Decorator &&
+        (node as ts.Decorator).expression.kind == ts.SyntaxKind.CallExpression
+      );
     })
-    .map(node => (node as ts.Decorator).expression as ts.CallExpression)
-    .filter(expr => {
+    .map((node) => (node as ts.Decorator).expression as ts.CallExpression)
+    .filter((expr) => {
       if (expr.expression.kind == ts.SyntaxKind.Identifier) {
         const id = expr.expression as ts.Identifier;
 
@@ -315,27 +332,31 @@ export function getDecoratorMetadata(source: ts.SourceFile, identifier: string,
         const id = paExpr.name.text;
         const moduleId = (paExpr.expression as ts.Identifier).text;
 
-        return id === identifier && (angularImports[moduleId + '.'] === module);
+        return id === identifier && angularImports[moduleId + '.'] === module;
       }
 
       return false;
     })
-    .filter(expr => expr.arguments[0]
-                 && expr.arguments[0].kind == ts.SyntaxKind.ObjectLiteralExpression)
-    .map(expr => expr.arguments[0] as ts.ObjectLiteralExpression);
+    .filter(
+      (expr) =>
+        expr.arguments[0] && expr.arguments[0].kind == ts.SyntaxKind.ObjectLiteralExpression,
+    )
+    .map((expr) => expr.arguments[0] as ts.ObjectLiteralExpression);
 }
 
 export function getMetadataField(
   node: ts.ObjectLiteralExpression,
   metadataField: string,
 ): ts.ObjectLiteralElement[] {
-  return node.properties
-    .filter(ts.isPropertyAssignment)
-    // 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.text === metadataField;
-    });
+  return (
+    node.properties
+      .filter(ts.isPropertyAssignment)
+      // 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.text === metadataField;
+      })
+  );
 }
 
 export function addSymbolToNgModuleMetadata(
@@ -346,7 +367,7 @@ export function addSymbolToNgModuleMetadata(
   importPath: string | null = null,
 ): Change[] {
   const nodes = getDecoratorMetadata(source, 'NgModule', '@angular/core');
-  let node: any = nodes[0];  // tslint:disable-line:no-any
+  let node: any = nodes[0]; // eslint-disable-line @typescript-eslint/no-explicit-any
 
   // Find the decorator declaration.
   if (!node) {
@@ -354,10 +375,7 @@ export function addSymbolToNgModuleMetadata(
   }
 
   // Get all the children property assignment of object literals.
-  const matchingProperties = getMetadataField(
-    node as ts.ObjectLiteralExpression,
-    metadataField,
-  );
+  const matchingProperties = getMetadataField(node as ts.ObjectLiteralExpression, metadataField);
 
   if (matchingProperties.length == 0) {
     // We haven't found the field in the metadata declaration. Insert a new field.
@@ -374,8 +392,9 @@ export function addSymbolToNgModuleMetadata(
       const text = node.getFullText(source);
       const matches = text.match(/^(\r?\n)(\s*)/);
       if (matches) {
-        toInsert = `,${matches[0]}${metadataField}: [${matches[1]}` +
-            `${tags.indentBy(matches[2].length + 2)`${symbolName}`}${matches[0]}]`;
+        toInsert =
+          `,${matches[0]}${metadataField}: [${matches[1]}` +
+          `${tags.indentBy(matches[2].length + 2)`${symbolName}`}${matches[0]}]`;
       } else {
         toInsert = `, ${metadataField}: [${symbolName}]`;
       }
@@ -405,8 +424,8 @@ export function addSymbolToNgModuleMetadata(
   }
 
   if (Array.isArray(node)) {
-    const nodeArray = node as {} as Array<ts.Node>;
-    const symbolsArray = nodeArray.map(node => tags.oneLine`${node.getText()}`);
+    const nodeArray = (node as {}) as Array<ts.Node>;
+    const symbolsArray = nodeArray.map((node) => tags.oneLine`${node.getText()}`);
     if (symbolsArray.includes(tags.oneLine`${symbolName}`)) {
       return [];
     }
@@ -444,56 +463,77 @@ export function addSymbolToNgModuleMetadata(
  * Custom function to insert a declaration (component, pipe, directive)
  * into NgModule declarations. It also imports the component.
  */
-export function addDeclarationToModule(source: ts.SourceFile,
-                                       modulePath: string, classifiedName: string,
-                                       importPath: string): Change[] {
+export function addDeclarationToModule(
+  source: ts.SourceFile,
+  modulePath: string,
+  classifiedName: string,
+  importPath: string,
+): Change[] {
   return addSymbolToNgModuleMetadata(
-    source, modulePath, 'declarations', classifiedName, importPath);
+    source,
+    modulePath,
+    'declarations',
+    classifiedName,
+    importPath,
+  );
 }
 
 /**
  * Custom function to insert an NgModule into NgModule imports. It also imports the module.
  */
-export function addImportToModule(source: ts.SourceFile,
-                                  modulePath: string, classifiedName: string,
-                                  importPath: string): Change[] {
-
+export function addImportToModule(
+  source: ts.SourceFile,
+  modulePath: string,
+  classifiedName: string,
+  importPath: string,
+): Change[] {
   return addSymbolToNgModuleMetadata(source, modulePath, 'imports', classifiedName, importPath);
 }
 
 /**
  * Custom function to insert a provider into NgModule. It also imports it.
  */
-export function addProviderToModule(source: ts.SourceFile,
-                                    modulePath: string, classifiedName: string,
-                                    importPath: string): Change[] {
+export function addProviderToModule(
+  source: ts.SourceFile,
+  modulePath: string,
+  classifiedName: string,
+  importPath: string,
+): Change[] {
   return addSymbolToNgModuleMetadata(source, modulePath, 'providers', classifiedName, importPath);
 }
 
 /**
  * Custom function to insert an export into NgModule. It also imports it.
  */
-export function addExportToModule(source: ts.SourceFile,
-                                  modulePath: string, classifiedName: string,
-                                  importPath: string): Change[] {
+export function addExportToModule(
+  source: ts.SourceFile,
+  modulePath: string,
+  classifiedName: string,
+  importPath: string,
+): Change[] {
   return addSymbolToNgModuleMetadata(source, modulePath, 'exports', classifiedName, importPath);
 }
 
 /**
  * Custom function to insert an export into NgModule. It also imports it.
  */
-export function addBootstrapToModule(source: ts.SourceFile,
-                                     modulePath: string, classifiedName: string,
-                                     importPath: string): Change[] {
+export function addBootstrapToModule(
+  source: ts.SourceFile,
+  modulePath: string,
+  classifiedName: string,
+  importPath: string,
+): Change[] {
   return addSymbolToNgModuleMetadata(source, modulePath, 'bootstrap', classifiedName, importPath);
 }
 
 /**
  * Determine if an import already exists.
  */
-export function isImported(source: ts.SourceFile,
-                           classifiedName: string,
-                           importPath: string): boolean {
+export function isImported(
+  source: ts.SourceFile,
+  classifiedName: string,
+  importPath: string,
+): boolean {
   const allNodes = getSourceNodes(source);
   const matchingNodes = allNodes
     .filter(ts.isImportDeclaration)
@@ -563,7 +603,7 @@ export function getEnvironmentExportName(source: ts.SourceFile): string | null {
  * Returns the RouterModule declaration from NgModule metadata, if any.
  */
 export function getRouterModuleDeclaration(source: ts.SourceFile): ts.Expression | undefined {
-  const result = getDecoratorMetadata(source, 'NgModule', '@angular/core') as ts.Node[];
+  const result = getDecoratorMetadata(source, 'NgModule', '@angular/core');
   const node = result[0] as ts.ObjectLiteralExpression;
   const matchingProperties = getMetadataField(node, 'imports');
 
@@ -580,8 +620,8 @@ export function getRouterModuleDeclaration(source: ts.SourceFile): ts.Expression
   const arrLiteral = assignment.initializer as ts.ArrayLiteralExpression;
 
   return arrLiteral.elements
-    .filter(el => el.kind === ts.SyntaxKind.CallExpression)
-    .find(el => (el as ts.Identifier).getText().startsWith('RouterModule'));
+    .filter((el) => el.kind === ts.SyntaxKind.CallExpression)
+    .find((el) => (el as ts.Identifier).getText().startsWith('RouterModule'));
 }
 
 /**
@@ -600,8 +640,7 @@ export function addRouteDeclarationToModule(
   if (!scopeConfigMethodArgs.length) {
     const { line } = source.getLineAndCharacterOfPosition(routerModuleExpr.getStart());
     throw new Error(
-      `The router module method doesn't have arguments ` +
-      `at line ${line} in ${fileToAdd}`,
+      `The router module method doesn't have arguments ` + `at line ${line} in ${fileToAdd}`,
     );
   }
 
@@ -616,22 +655,24 @@ export function addRouteDeclarationToModule(
     const routesVarName = routesArg.getText();
     let routesVar;
     if (routesArg.kind === ts.SyntaxKind.Identifier) {
-      routesVar = source.statements
-        .filter(ts.isVariableStatement)
-        .find((v) => {
-          return v.declarationList.declarations[0].name.getText() === routesVarName;
-        });
+      routesVar = source.statements.filter(ts.isVariableStatement).find((v) => {
+        return v.declarationList.declarations[0].name.getText() === routesVarName;
+      });
     }
 
     if (!routesVar) {
       const { line } = source.getLineAndCharacterOfPosition(routesArg.getStart());
       throw new Error(
         `No route declaration array was found that corresponds ` +
-        `to router module at line ${line} in ${fileToAdd}`,
+          `to router module at line ${line} in ${fileToAdd}`,
       );
     }
 
-    routesArr = findNodes(routesVar, ts.SyntaxKind.ArrayLiteralExpression, 1)[0] as ts.ArrayLiteralExpression;
+    routesArr = findNodes(
+      routesVar,
+      ts.SyntaxKind.ArrayLiteralExpression,
+      1,
+    )[0] as ts.ArrayLiteralExpression;
   }
 
   const occurrencesCount = routesArr.elements.length;
@@ -642,16 +683,16 @@ export function addRouteDeclarationToModule(
 
   if (occurrencesCount > 0) {
     const lastRouteLiteral = [...routesArr.elements].pop() as ts.Expression;
-    const lastRouteIsWildcard = ts.isObjectLiteralExpression(lastRouteLiteral)
-      && lastRouteLiteral
-        .properties
-        .some(n => (
-          ts.isPropertyAssignment(n)
-          && ts.isIdentifier(n.name)
-          && n.name.text === 'path'
-          && ts.isStringLiteral(n.initializer)
-          && n.initializer.text === '**'
-        ));
+    const lastRouteIsWildcard =
+      ts.isObjectLiteralExpression(lastRouteLiteral) &&
+      lastRouteLiteral.properties.some(
+        (n) =>
+          ts.isPropertyAssignment(n) &&
+          ts.isIdentifier(n.name) &&
+          n.name.text === 'path' &&
+          ts.isStringLiteral(n.initializer) &&
+          n.initializer.text === '**',
+      );
 
     const indentation = text.match(/\r?\n(\r?)\s*/) || [];
     const routeText = `${indentation[0] || ' '}${routeLiteral}`;
diff --git a/packages/schematics/angular/utility/ast-utils_spec.ts b/packages/schematics/angular/utility/ast-utils_spec.ts
index 286a757df47e..54ed6d6d936d 100644
--- a/packages/schematics/angular/utility/ast-utils_spec.ts
+++ b/packages/schematics/angular/utility/ast-utils_spec.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 { tags } from '@angular-devkit/core';
 import { HostTree } from '@angular-devkit/schematics';
 import * as ts from '../third_party/github.com/Microsoft/TypeScript/lib/typescript';
@@ -21,7 +21,6 @@ import {
   insertAfterLastOccurrence,
 } from './ast-utils';
 
-
 function getTsSource(path: string, content: string): ts.SourceFile {
   return ts.createSourceFile(path, content, ts.ScriptTarget.Latest, true);
 }
@@ -40,7 +39,6 @@ function applyChanges(path: string, content: string, changes: Change[]): string
   return getFileContent(tree, path);
 }
 
-// tslint:disable-next-line:no-big-function
 describe('ast utils', () => {
   let modulePath: string;
   let moduleContent: string;
@@ -70,7 +68,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: \[\n(\s*)  FooComponent\n\1\]/);
+    expect(output).toMatch(/exports: \[\n(\s*) {2}FooComponent\n\1\]/);
   });
 
   it('should add export to module if not indented', () => {
@@ -79,7 +77,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: \[\n(\s*)  FooComponent\n\1\]/);
+    expect(output).toMatch(/exports: \[\n(\s*) {2}FooComponent\n\1\]/);
   });
 
   it('should add declarations to module if not indented', () => {
@@ -120,7 +118,7 @@ describe('ast utils', () => {
     expect(changes).not.toBeNull();
 
     const output = applyChanges(modulePath, moduleContent, changes || []);
-    expect(output).toMatch(/imports: \[[^\]]+,\n(\s*)  HelloWorld\n\1\]/);
+    expect(output).toMatch(/imports: \[[^\]]+,\n(\s*) {2}HelloWorld\n\1\]/);
   });
 
   it('should add metadata (comma)', () => {
@@ -145,7 +143,7 @@ describe('ast utils', () => {
     expect(changes).not.toBeNull();
 
     const output = applyChanges(modulePath, moduleContent, changes || []);
-    expect(output).toMatch(/imports: \[[^\]]+,\n(\s*)  HelloWorld,\n\1\]/);
+    expect(output).toMatch(/imports: \[[^\]]+,\n(\s*) {2}HelloWorld,\n\1\]/);
   });
 
   it('should add metadata (missing)', () => {
@@ -167,7 +165,7 @@ describe('ast utils', () => {
     expect(changes).not.toBeNull();
 
     const output = applyChanges(modulePath, moduleContent, changes || []);
-    expect(output).toMatch(/imports: \[\n(\s*)  HelloWorld\n\1\]/);
+    expect(output).toMatch(/imports: \[\n(\s*) {2}HelloWorld\n\1\]/);
   });
 
   it('should add metadata (empty)', () => {
@@ -190,7 +188,7 @@ describe('ast utils', () => {
     expect(changes).not.toBeNull();
 
     const output = applyChanges(modulePath, moduleContent, changes || []);
-    expect(output).toMatch(/imports: \[\n(\s*)  HelloWorld\n\1\],\n/);
+    expect(output).toMatch(/imports: \[\n(\s*) {2}HelloWorld\n\1\],\n/);
   });
 
   it(`should handle NgModule with newline after '@'`, () => {
@@ -262,7 +260,7 @@ describe('ast utils', () => {
       const elements = (arrayNode.pop() as ts.ArrayLiteralExpression).elements;
 
       const change = insertAfterLastOccurrence(
-        elements as unknown as ts.Node[],
+        (elements as unknown) as ts.Node[],
         `, 'bar'`,
         filePath,
         elements.pos,
@@ -273,7 +271,6 @@ describe('ast utils', () => {
       expect(output).toMatch(/const arr = \['foo', 'bar'\];/);
     });
 
-
     it('should work without occurrences', () => {
       const fileContent = `const arr = [];`;
       const source = getTsSource(filePath, fileContent);
@@ -284,7 +281,7 @@ describe('ast utils', () => {
       const elements = (arrayNode.pop() as ts.ArrayLiteralExpression).elements;
 
       const change = insertAfterLastOccurrence(
-        elements as unknown as ts.Node[],
+        (elements as unknown) as ts.Node[],
         `'bar'`,
         filePath,
         elements.pos,
@@ -296,7 +293,6 @@ describe('ast utils', () => {
     });
   });
 
-  // tslint:disable-next-line:no-big-function
   describe('addRouteDeclarationToModule', () => {
     it('should throw an error when there is no router module', () => {
       const moduleContent = `
@@ -421,7 +417,8 @@ describe('ast utils', () => {
       const source = getTsSource(modulePath, moduleContent);
       const changes = addRouteDeclarationToModule(
         source,
-        './src/app', `{ path: 'foo', component: FooComponent }`,
+        './src/app',
+        `{ path: 'foo', component: FooComponent }`,
       );
       const output = applyChanges(modulePath, moduleContent, [changes]);
 
@@ -454,7 +451,8 @@ describe('ast utils', () => {
       const source = getTsSource(modulePath, moduleContent);
       const changes = addRouteDeclarationToModule(
         source,
-        './src/app', `{ path: 'bar', component: BarComponent }`,
+        './src/app',
+        `{ path: 'bar', component: BarComponent }`,
       );
       const output = applyChanges(modulePath, moduleContent, [changes]);
 
@@ -523,14 +521,15 @@ describe('ast utils', () => {
       const source = getTsSource(modulePath, moduleContent);
       const changes = addRouteDeclarationToModule(
         source,
-        './src/app', `{ path: 'bar', component: BarComponent }`,
+        './src/app',
+        `{ path: 'bar', component: BarComponent }`,
       );
       const output = applyChanges(modulePath, moduleContent, [changes]);
-      // tslint:disable:max-line-length
+      /* eslint-disable max-len */
       expect(output).toMatch(
         /const routes = \[\r?\n?\s*{ path: 'foo', component: FooComponent, canLoad: \[Guard\] },\r?\n?\s*{ path: 'bar', component: BarComponent }\r?\n?\s*\]/,
       );
-      // tslint:enable:max-line-length
+      /* eslint-enable max-len */
     });
 
     it('should add a route to the routes to the correct array when having nested object literal', () => {
@@ -559,11 +558,12 @@ describe('ast utils', () => {
       const source = getTsSource(modulePath, moduleContent);
       const changes = addRouteDeclarationToModule(
         source,
-        './src/app', `{ path: 'bar', component: BarComponent }`,
+        './src/app',
+        `{ path: 'bar', component: BarComponent }`,
       );
       const output = applyChanges(modulePath, moduleContent, [changes]);
       expect(output).toMatch(
-        // tslint:disable-next-line:max-line-length
+        // eslint-disable-next-line max-len
         /const routes = \[\r?\n?\s*{ path: 'foo', component: FooComponent, data: { path: 'test' }},\r?\n?\s*{ path: 'bar', component: BarComponent }\r?\n?\s*\]/,
       );
     });
@@ -590,7 +590,8 @@ describe('ast utils', () => {
       const source = getTsSource(modulePath, moduleContent);
       const changes = addRouteDeclarationToModule(
         source,
-        './src/app', `{ path: 'foo', component: FooComponent }`,
+        './src/app',
+        `{ path: 'foo', component: FooComponent }`,
       );
       const output = applyChanges(modulePath, moduleContent, [changes]);
 
@@ -599,7 +600,6 @@ describe('ast utils', () => {
       );
     });
 
-    // tslint:disable-next-line:max-line-length
     it('should add a route to the routes argument of RouterModule when there are multiple declarations', () => {
       const moduleContent = `
         import { BrowserModule } from '@angular/platform-browser';
@@ -622,12 +622,13 @@ describe('ast utils', () => {
       const source = getTsSource(modulePath, moduleContent);
       const changes = addRouteDeclarationToModule(
         source,
-        './src/app', `{ path: 'bar', component: BarComponent }`,
+        './src/app',
+        `{ path: 'bar', component: BarComponent }`,
       );
       const output = applyChanges(modulePath, moduleContent, [changes]);
 
       expect(output).toMatch(
-        // tslint:disable-next-line:max-line-length
+        // eslint-disable-next-line max-len
         /RouterModule\.forRoot\(\[\r?\n?\s*{ path: 'foo', component: FooComponent },\r?\n?\s*{ path: 'bar', component: BarComponent }\r?\n?\s*\]\)/,
       );
     });
diff --git a/packages/schematics/angular/utility/change.ts b/packages/schematics/angular/utility/change.ts
index f1ddcc964a33..08df56a6ddf8 100644
--- a/packages/schematics/angular/utility/change.ts
+++ b/packages/schematics/angular/utility/change.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 { UpdateRecorder } from '@angular-devkit/schematics';
 
 export interface Host {
@@ -12,7 +13,6 @@ export interface Host {
   read(path: string): Promise<string>;
 }
 
-
 export interface Change {
   apply(host: Host): Promise<void>;
 
@@ -28,7 +28,6 @@ export interface Change {
   readonly description: string;
 }
 
-
 /**
  * An operation that does nothing.
  */
@@ -36,15 +35,15 @@ export class NoopChange implements Change {
   description = 'No operation.';
   order = Infinity;
   path = null;
-  apply() { return Promise.resolve(); }
+  apply() {
+    return Promise.resolve();
+  }
 }
 
-
 /**
  * Will add text to the source code.
  */
 export class InsertChange implements Change {
-
   order: number;
   description: string;
 
@@ -60,7 +59,7 @@ export class InsertChange implements Change {
    * This method does not insert spaces if there is none in the original string.
    */
   apply(host: Host) {
-    return host.read(this.path).then(content => {
+    return host.read(this.path).then((content) => {
       const prefix = content.substring(0, this.pos);
       const suffix = content.substring(this.pos);
 
@@ -73,7 +72,6 @@ export class InsertChange implements Change {
  * Will remove text from the source code.
  */
 export class RemoveChange implements Change {
-
   order: number;
   description: string;
 
@@ -86,7 +84,7 @@ export class RemoveChange implements Change {
   }
 
   apply(host: Host): Promise<void> {
-    return host.read(this.path).then(content => {
+    return host.read(this.path).then((content) => {
       const prefix = content.substring(0, this.pos);
       const suffix = content.substring(this.pos + this.toRemove.length);
 
@@ -103,8 +101,12 @@ export class ReplaceChange implements Change {
   order: number;
   description: string;
 
-  constructor(public path: string, private pos: number, public oldText: string,
-              public newText: string) {
+  constructor(
+    public path: string,
+    private pos: number,
+    public oldText: string,
+    public newText: string,
+  ) {
     if (pos < 0) {
       throw new Error('Negative positions are invalid');
     }
@@ -113,7 +115,7 @@ export class ReplaceChange implements Change {
   }
 
   apply(host: Host): Promise<void> {
-    return host.read(this.path).then(content => {
+    return host.read(this.path).then((content) => {
       const prefix = content.substring(0, this.pos);
       const suffix = content.substring(this.pos + this.oldText.length);
       const text = content.substring(this.pos, this.pos + this.oldText.length);
diff --git a/packages/schematics/angular/utility/dependencies.ts b/packages/schematics/angular/utility/dependencies.ts
index 2a2a86191557..c9aa61719106 100644
--- a/packages/schematics/angular/utility/dependencies.ts
+++ b/packages/schematics/angular/utility/dependencies.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 { Tree } from '@angular-devkit/schematics';
 import { JSONFile } from './json-file';
 
@@ -30,7 +31,11 @@ const ALL_DEPENDENCY_TYPE = [
   NodeDependencyType.Peer,
 ];
 
-export function addPackageJsonDependency(tree: Tree, dependency: NodeDependency, pkgJsonPath = PKG_JSON_PATH): void {
+export function addPackageJsonDependency(
+  tree: Tree,
+  dependency: NodeDependency,
+  pkgJsonPath = PKG_JSON_PATH,
+): void {
   const json = new JSONFile(tree, pkgJsonPath);
 
   const { overwrite, type, name, version } = dependency;
@@ -40,7 +45,11 @@ export function addPackageJsonDependency(tree: Tree, dependency: NodeDependency,
   }
 }
 
-export function removePackageJsonDependency(tree: Tree, name: string, pkgJsonPath = PKG_JSON_PATH): void {
+export function removePackageJsonDependency(
+  tree: Tree,
+  name: string,
+  pkgJsonPath = PKG_JSON_PATH,
+): void {
   const json = new JSONFile(tree, pkgJsonPath);
 
   for (const depType of ALL_DEPENDENCY_TYPE) {
@@ -48,7 +57,11 @@ export function removePackageJsonDependency(tree: Tree, name: string, pkgJsonPat
   }
 }
 
-export function getPackageJsonDependency(tree: Tree, name: string, pkgJsonPath = PKG_JSON_PATH): NodeDependency | null {
+export function getPackageJsonDependency(
+  tree: Tree,
+  name: string,
+  pkgJsonPath = PKG_JSON_PATH,
+): NodeDependency | null {
   const json = new JSONFile(tree, pkgJsonPath);
 
   for (const depType of ALL_DEPENDENCY_TYPE) {
diff --git a/packages/schematics/angular/utility/dependencies_spec.ts b/packages/schematics/angular/utility/dependencies_spec.ts
index 61a95a765fc3..da1e45f6d8f5 100644
--- a/packages/schematics/angular/utility/dependencies_spec.ts
+++ b/packages/schematics/angular/utility/dependencies_spec.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 { EmptyTree } from '@angular-devkit/schematics';
 import { UnitTestTree } from '@angular-devkit/schematics/testing';
 import {
@@ -14,7 +15,6 @@ import {
   getPackageJsonDependency,
 } from './dependencies';
 
-
 describe('dependencies', () => {
   describe('addDependency', () => {
     let tree: UnitTestTree;
@@ -36,7 +36,7 @@ describe('dependencies', () => {
       { type: NodeDependencyType.Dev, key: 'devDependencies' },
       { type: NodeDependencyType.Optional, key: 'optionalDependencies' },
       { type: NodeDependencyType.Peer, key: 'peerDependencies' },
-    ].forEach(type => {
+    ].forEach((type) => {
       describe(`Type: ${type.toString()}`, () => {
         beforeEach(() => {
           dependency.type = type.type;
@@ -49,8 +49,8 @@ describe('dependencies', () => {
         });
 
         it('should handle an existing dependency (update version)', () => {
-          addPackageJsonDependency(tree, {...dependency, version: '0.0.0'});
-          addPackageJsonDependency(tree, {...dependency, overwrite: true});
+          addPackageJsonDependency(tree, { ...dependency, version: '0.0.0' });
+          addPackageJsonDependency(tree, { ...dependency, overwrite: true });
           const pkgJson = JSON.parse(tree.readContent(pkgJsonPath));
           expect(pkgJson[type.key][dependency.name]).toEqual(dependency.version);
         });
@@ -58,20 +58,23 @@ describe('dependencies', () => {
     });
 
     it('should throw when missing package.json', () => {
-      expect((() => addPackageJsonDependency(new EmptyTree(), dependency))).toThrow();
+      expect(() => addPackageJsonDependency(new EmptyTree(), dependency)).toThrow();
     });
-
   });
 
   describe('getDependency', () => {
     let tree: UnitTestTree;
     beforeEach(() => {
       const pkgJsonPath = '/package.json';
-      const pkgJsonContent = JSON.stringify({
-        dependencies: {
-          'my-pkg': '1.2.3',
+      const pkgJsonContent = JSON.stringify(
+        {
+          dependencies: {
+            'my-pkg': '1.2.3',
+          },
         },
-      }, null, 2);
+        null,
+        2,
+      );
       tree = new UnitTestTree(new EmptyTree());
       tree.create(pkgJsonPath, pkgJsonContent);
     });
diff --git a/packages/schematics/angular/utility/find-module.ts b/packages/schematics/angular/utility/find-module.ts
index 9d1866dc1ae6..3c87085f5452 100644
--- a/packages/schematics/angular/utility/find-module.ts
+++ b/packages/schematics/angular/utility/find-module.ts
@@ -1,20 +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 {
-  NormalizedRoot,
-  Path,
-  dirname,
-  join,
-  normalize,
-  relative,
-} from '@angular-devkit/core';
-import { DirEntry, Tree } from '@angular-devkit/schematics';
 
+import { NormalizedRoot, Path, dirname, join, normalize, relative } from '@angular-devkit/core';
+import { DirEntry, Tree } from '@angular-devkit/schematics';
 
 export interface ModuleOptions {
   module?: string;
@@ -33,6 +26,7 @@ export const ROUTING_MODULE_EXT = '-routing.module.ts';
  * Find the module referred by a set of options passed to the schematics.
  */
 export function findModuleFromOptions(host: Tree, options: ModuleOptions): Path | undefined {
+  // eslint-disable-next-line no-prototype-builtins
   if (options.hasOwnProperty('skipImport') && options.skipImport) {
     return undefined;
   }
@@ -49,9 +43,7 @@ export function findModuleFromOptions(host: Tree, options: ModuleOptions): Path
     const componentPath = normalize(`/${options.path}/${options.name}`);
     const moduleBaseName = normalize(modulePath).split('/').pop();
 
-    const candidateSet = new Set<Path>([
-      normalize(options.path || '/'),
-    ]);
+    const candidateSet = new Set<Path>([normalize(options.path || '/')]);
 
     for (let dir = modulePath; dir != NormalizedRoot; dir = dirname(dir)) {
       candidateSet.add(dir);
@@ -66,7 +58,7 @@ export function findModuleFromOptions(host: Tree, options: ModuleOptions): Path
         '',
         `${moduleBaseName}.ts`,
         `${moduleBaseName}${moduleExt}`,
-      ].map(x => join(c, x));
+      ].map((x) => join(c, x));
 
       for (const sc of candidateFiles) {
         if (host.exists(sc)) {
@@ -76,8 +68,8 @@ export function findModuleFromOptions(host: Tree, options: ModuleOptions): Path
     }
 
     throw new Error(
-      `Specified module '${options.module}' does not exist.\n`
-        + `Looked in the following directories:\n    ${candidatesDirs.join('\n    ')}`,
+      `Specified module '${options.module}' does not exist.\n` +
+        `Looked in the following directories:\n    ${candidatesDirs.join('\n    ')}`,
     );
   }
 }
@@ -85,15 +77,18 @@ export function findModuleFromOptions(host: Tree, options: ModuleOptions): Path
 /**
  * Function to find the "closest" module to a generated file's path.
  */
-export function findModule(host: Tree, generateDir: string,
-                           moduleExt = MODULE_EXT, routingModuleExt = ROUTING_MODULE_EXT): Path {
-
+export function findModule(
+  host: Tree,
+  generateDir: string,
+  moduleExt = MODULE_EXT,
+  routingModuleExt = ROUTING_MODULE_EXT,
+): Path {
   let dir: DirEntry | null = host.getDir('/' + generateDir);
   let foundRoutingModule = false;
 
   while (dir) {
-    const allMatches = dir.subfiles.filter(p => p.endsWith(moduleExt));
-    const filteredMatches = allMatches.filter(p => !p.endsWith(routingModuleExt));
+    const allMatches = dir.subfiles.filter((p) => p.endsWith(moduleExt));
+    const filteredMatches = allMatches.filter((p) => !p.endsWith(routingModuleExt));
 
     foundRoutingModule = foundRoutingModule || allMatches.length !== filteredMatches.length;
 
@@ -101,16 +96,18 @@ export function findModule(host: Tree, generateDir: string,
       return join(dir.path, filteredMatches[0]);
     } else if (filteredMatches.length > 1) {
       throw new Error(
-          'More than one module matches. Use the skip-import option to skip importing ' +
-          'the component into the closest module or use the module option to specify a module.');
+        'More than one module matches. Use the skip-import option to skip importing ' +
+          'the component into the closest module or use the module option to specify a module.',
+      );
     }
 
     dir = dir.parent;
   }
 
-  const errorMsg = foundRoutingModule ? 'Could not find a non Routing NgModule.'
-    + `\nModules with suffix '${routingModuleExt}' are strictly reserved for routing.`
-    + '\nUse the skip-import option to skip importing in NgModule.'
+  const errorMsg = foundRoutingModule
+    ? 'Could not find a non Routing NgModule.' +
+      `\nModules with suffix '${routingModuleExt}' are strictly reserved for routing.` +
+      '\nUse the skip-import option to skip importing in NgModule.'
     : 'Could not find an NgModule. Use the skip-import option to skip importing in NgModule.';
 
   throw new Error(errorMsg);
@@ -131,8 +128,10 @@ export function buildRelativePath(from: string, to: string): string {
   fromParts.pop();
   const toFileName = toParts.pop();
 
-  const relativePath = relative(normalize(fromParts.join('/') || '/'),
-   normalize(toParts.join('/') || '/'));
+  const relativePath = relative(
+    normalize(fromParts.join('/') || '/'),
+    normalize(toParts.join('/') || '/'),
+  );
   let pathPrefix = '';
 
   // Set the path prefix for same dir or child dir, parent dir starts with `..`
diff --git a/packages/schematics/angular/utility/find-module_spec.ts b/packages/schematics/angular/utility/find-module_spec.ts
index c7e44f594836..699d9ec10a1c 100644
--- a/packages/schematics/angular/utility/find-module_spec.ts
+++ b/packages/schematics/angular/utility/find-module_spec.ts
@@ -1,18 +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 { Path } from '@angular-devkit/core';
 import { EmptyTree, Tree } from '@angular-devkit/schematics';
 import { ModuleOptions, buildRelativePath, findModule, findModuleFromOptions } from './find-module';
 
-
 describe('find-module', () => {
   describe('findModule', () => {
-
     let host: Tree;
     const modulePath = '/foo/src/app/app.module.ts';
     beforeEach(() => {
@@ -83,15 +82,16 @@ describe('find-module', () => {
       const foundModule = findModule(host, 'foo/src/app/bar', '_module.ts');
       expect(foundModule).toBe(modulePath);
       // Should not find module if using default ext
-      expect(() => findModule(host, 'foo/src/app/bar'))
-        .toThrowError(/Could not find an NgModule/);
+      expect(() => findModule(host, 'foo/src/app/bar')).toThrowError(/Could not find an NgModule/);
     });
 
     it('should not find module if ext is invalid', () => {
-      expect(() => findModule(host, 'foo/src/app/bar', '-module.ts'))
-        .toThrowError(/Could not find an NgModule/);
-      expect(() => findModule(host, 'foo/src/app/bar', '_module.ts'))
-        .toThrowError(/Could not find an NgModule/);
+      expect(() => findModule(host, 'foo/src/app/bar', '-module.ts')).toThrowError(
+        /Could not find an NgModule/,
+      );
+      expect(() => findModule(host, 'foo/src/app/bar', '_module.ts')).toThrowError(
+        /Could not find an NgModule/,
+      );
     });
   });
 
@@ -165,11 +165,13 @@ describe('find-module', () => {
       // Should not find module if using invalid ext
       options.moduleExt = '-module.ts';
       expect(() => findModuleFromOptions(tree, options)).toThrowError(
-        /Specified module 'app' does not exist/);
+        /Specified module 'app' does not exist/,
+      );
       // Should not find module if using default ext
-      options.moduleExt = undefined;   // use default ext
+      options.moduleExt = undefined; // use default ext
       expect(() => findModuleFromOptions(tree, options)).toThrowError(
-        /Specified module 'app' does not exist/);
+        /Specified module 'app' does not exist/,
+      );
     });
 
     it('should ignore custom ext if module or ${module}.ts exists', () => {
@@ -192,14 +194,10 @@ describe('find-module', () => {
 
   describe('buildRelativePath', () => {
     it('works', () => {
-      expect(buildRelativePath('/test/module', '/test/service'))
-          .toEqual('./service');
-      expect(buildRelativePath('/test/module', '/other/service'))
-          .toEqual('../other/service');
-      expect(buildRelativePath('/module', '/test/service'))
-          .toEqual('./test/service');
-      expect(buildRelativePath('/test/service', '/module'))
-          .toEqual('../module');
+      expect(buildRelativePath('/test/module', '/test/service')).toEqual('./service');
+      expect(buildRelativePath('/test/module', '/other/service')).toEqual('../other/service');
+      expect(buildRelativePath('/module', '/test/service')).toEqual('./test/service');
+      expect(buildRelativePath('/test/service', '/module')).toEqual('../module');
     });
   });
 });
diff --git a/packages/schematics/angular/utility/generate-from-files.ts b/packages/schematics/angular/utility/generate-from-files.ts
new file mode 100644
index 000000000000..7a5446e40bca
--- /dev/null
+++ b/packages/schematics/angular/utility/generate-from-files.ts
@@ -0,0 +1,64 @@
+/**
+ * @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,
+  Tree,
+  apply,
+  applyTemplates,
+  chain,
+  filter,
+  mergeWith,
+  move,
+  noop,
+  url,
+} from '@angular-devkit/schematics';
+import { applyLintFix } from './lint-fix';
+import { parseName } from './parse-name';
+import { createDefaultPath } from './workspace';
+
+export interface GenerateFromFilesOptions {
+  flat?: boolean;
+  lintFix?: boolean;
+  name: string;
+  path?: string;
+  prefix?: string;
+  project?: string;
+  skipTests?: boolean;
+}
+
+export function generateFromFiles(
+  options: GenerateFromFilesOptions,
+  extraTemplateValues: Record<string, string | ((v: string) => string)> = {},
+): Rule {
+  return async (host: Tree) => {
+    options.path ??= await createDefaultPath(host, options.project as string);
+    options.prefix ??= '';
+    options.flat ??= true;
+
+    const parsedPath = parseName(options.path, options.name);
+    options.name = parsedPath.name;
+    options.path = parsedPath.path;
+
+    const templateSource = apply(url('./files'), [
+      options.skipTests ? filter((path) => !path.endsWith('.spec.ts.template')) : noop(),
+      applyTemplates({
+        ...strings,
+        ...options,
+        ...extraTemplateValues,
+      }),
+      move(parsedPath.path + (options.flat ? '' : '/' + strings.dasherize(options.name))),
+    ]);
+
+    return chain([
+      mergeWith(templateSource),
+      options.lintFix ? applyLintFix(options.path) : noop(),
+    ]);
+  };
+}
diff --git a/packages/schematics/angular/utility/json-file.ts b/packages/schematics/angular/utility/json-file.ts
index 8ca21030d9a1..647199ef848d 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
@@ -8,7 +8,16 @@
 
 import { JsonValue } from '@angular-devkit/core';
 import { Tree } from '@angular-devkit/schematics';
-import { Node, ParseError, applyEdits, findNodeAtLocation, getNodeValue, modify, parseTree, printParseErrorCode } from 'jsonc-parser';
+import {
+  Node,
+  ParseError,
+  applyEdits,
+  findNodeAtLocation,
+  getNodeValue,
+  modify,
+  parseTree,
+  printParseErrorCode,
+} from 'jsonc-parser';
 
 export type InsertionIndex = (properties: string[]) => number;
 export type JSONPath = (string | number)[];
@@ -17,10 +26,7 @@ export type JSONPath = (string | number)[];
 export class JSONFile {
   content: string;
 
-  constructor(
-    private readonly host: Tree,
-    private readonly path: string,
-  ) {
+  constructor(private readonly host: Tree, private readonly path: string) {
     const buffer = this.host.read(this.path);
     if (buffer) {
       this.content = buffer.toString();
@@ -39,7 +45,11 @@ export class JSONFile {
     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}.`);
+      throw new Error(
+        `Failed to parse "${this.path}" as JSON AST Object. ${printParseErrorCode(
+          error,
+        )} at location: ${offset}.`,
+      );
     }
 
     return this._jsonAst;
@@ -60,27 +70,27 @@ export class JSONFile {
     return node === undefined ? undefined : getNodeValue(node);
   }
 
-  modify(jsonPath: JSONPath, value: JsonValue | undefined, insertInOrder?: InsertionIndex | false): void {
+  modify(
+    jsonPath: JSONPath,
+    value: JsonValue | undefined,
+    insertInOrder?: InsertionIndex | false,
+  ): void {
     let getInsertionIndex: InsertionIndex | undefined;
     if (insertInOrder === undefined) {
       const property = jsonPath.slice(-1)[0];
-      getInsertionIndex = properties => [...properties, property].sort().findIndex(p => p === property);
+      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,
-        },
+    const edits = modify(this.content, jsonPath, value, {
+      getInsertionIndex,
+      formattingOptions: {
+        insertSpaces: true,
+        tabSize: 2,
       },
-    );
+    });
 
     this.content = applyEdits(this.content, edits);
     this.host.overwrite(this.path, this.content);
diff --git a/packages/schematics/angular/utility/latest-versions.ts b/packages/schematics/angular/utility/latest-versions.ts
index 9cd4dc002a8d..ea82a3420a36 100644
--- a/packages/schematics/angular/utility/latest-versions.ts
+++ b/packages/schematics/angular/utility/latest-versions.ts
@@ -1,24 +1,36 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use 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 latestVersions = {
-  // These versions should be kept up to date with latest Angular peer dependencies.
-  Angular: '~12.0.0-next.9',
-  RxJs: '~6.6.0',
-  ZoneJs: '~0.11.4',
-  TypeScript: '~4.2.3',
-  TsLib: '^2.1.0',
+/** Retrieve the minor version for the provided version string. */
+function getAngularEarliestMinorVersion(version: string): string {
+  const versionMatching = version.match(/^(\d+)\.(\d+)\.\d+(-\w+)?/);
 
-  // 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: '~12.0.0-rc.0',
+  if (versionMatching === null) {
+    throw Error('Unable to determine the minor version for the provided version');
+  }
+  const [_, major, minor, prerelease = ''] = versionMatching;
 
-  ngPackagr: '^12.0.0-next.8',
+  return `~${major}.${minor}.0${prerelease}`;
+}
+
+export const latestVersions: Record<string, string> & {
+  Angular: string;
+  DevkitBuildAngular: string;
+} = {
+  // We could have used TypeScripts' `resolveJsonModule` to make the `latestVersion` object typesafe,
+  // but ts_library doesn't support JSON inputs.
+  ...require('./latest-versions/package.json')['dependencies'],
+
+  // As Angular CLI works with same minor versions of Angular Framework, a tilde match for the current
+  Angular: getAngularEarliestMinorVersion(require('../package.json')['version']),
+
+  // Since @angular-devkit/build-angular and @schematics/angular are always
+  // published together from the same monorepo, and they are both
+  // non-experimental, they will always have the same version.
+  DevkitBuildAngular: '~' + require('../package.json')['version'],
 };
diff --git a/packages/schematics/angular/utility/latest-versions/package.json b/packages/schematics/angular/utility/latest-versions/package.json
new file mode 100644
index 000000000000..314ad86efbfd
--- /dev/null
+++ b/packages/schematics/angular/utility/latest-versions/package.json
@@ -0,0 +1,20 @@
+{
+  "description": "Package versions used by schematics in @schematics/angular.",
+  "comment": "This file is needed so that depedencies are synced by Renovate.",
+  "private": true,
+  "dependencies": {
+    "@types/jasmine": "~3.8.0",
+    "@types/node": "^12.11.1",
+    "jasmine-core": "~3.8.0",
+    "karma-chrome-launcher": "~3.1.0",
+    "karma-coverage": "~2.0.3",
+    "karma-jasmine-html-reporter": "~1.7.0",
+    "karma-jasmine": "~4.0.0",
+    "karma": "~6.3.0",
+    "ng-packagr": "^12.1.1",
+    "rxjs": "~6.6.0",
+    "tslib": "^2.3.0",
+    "typescript": "~4.3.5",
+    "zone.js": "~0.11.4"
+  }
+}
diff --git a/packages/schematics/angular/utility/lint-fix.ts b/packages/schematics/angular/utility/lint-fix.ts
index f794bf681fd2..78994b2d3706 100644
--- a/packages/schematics/angular/utility/lint-fix.ts
+++ b/packages/schematics/angular/utility/lint-fix.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 {
   DirEntry,
   Rule,
@@ -20,7 +21,7 @@ export function applyLintFix(path = '/'): Rule {
     let dir: DirEntry | null = tree.getDir(path.substr(0, path.lastIndexOf('/')));
 
     do {
-      if ((dir.subfiles as string[]).some(f => f === 'tslint.json' || f === 'tslint.yaml')) {
+      if ((dir.subfiles as string[]).some((f) => f === 'tslint.json' || f === 'tslint.yaml')) {
         break;
       }
 
@@ -29,12 +30,13 @@ export function applyLintFix(path = '/'): Rule {
 
     if (dir === null) {
       throw new SchematicsException(
-        'Asked to run lint fixes, but could not find a tslint.json or tslint.yaml config file.');
+        'Asked to run lint fixes, but could not find a tslint.json or tslint.yaml config file.',
+      );
     }
 
     // Only include files that have been touched.
     const files = tree.actions.reduce((acc: Set<string>, action) => {
-      const path = action.path.substr(1);  // Remove the starting '/'.
+      const path = action.path.substr(1); // Remove the starting '/'.
       if (path.endsWith('.ts') && dir && action.path.startsWith(dir.path)) {
         acc.add(path);
       }
@@ -42,10 +44,12 @@ export function applyLintFix(path = '/'): Rule {
       return acc;
     }, new Set<string>());
 
-    context.addTask(new TslintFixTask({
-      ignoreErrors: true,
-      tsConfigPath: 'tsconfig.json',
-      files: [...files],
-    }));
+    context.addTask(
+      new TslintFixTask({
+        ignoreErrors: true,
+        tsConfigPath: 'tsconfig.json',
+        files: [...files],
+      }),
+    );
   };
 }
diff --git a/packages/schematics/angular/utility/ng-ast-utils.ts b/packages/schematics/angular/utility/ng-ast-utils.ts
index 9462d3b8e697..d344179af4cf 100644
--- a/packages/schematics/angular/utility/ng-ast-utils.ts
+++ b/packages/schematics/angular/utility/ng-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 { normalize } from '@angular-devkit/core';
 import { SchematicsException, Tree } from '@angular-devkit/schematics';
 import { dirname } from 'path';
@@ -24,20 +25,23 @@ export function findBootstrapModuleCall(host: Tree, mainPath: string): ts.CallEx
   let bootstrapCall: ts.CallExpression | null = null;
 
   for (const node of allNodes) {
-
     let bootstrapCallNode: ts.Node | null = null;
     bootstrapCallNode = findNode(node, ts.SyntaxKind.Identifier, 'bootstrapModule');
 
     // Walk up the parent until CallExpression is found.
-    while (bootstrapCallNode && bootstrapCallNode.parent
-      && bootstrapCallNode.parent.kind !== ts.SyntaxKind.CallExpression) {
-
+    while (
+      bootstrapCallNode &&
+      bootstrapCallNode.parent &&
+      bootstrapCallNode.parent.kind !== ts.SyntaxKind.CallExpression
+    ) {
       bootstrapCallNode = bootstrapCallNode.parent;
     }
 
-    if (bootstrapCallNode !== null &&
+    if (
+      bootstrapCallNode !== null &&
       bootstrapCallNode.parent !== undefined &&
-      bootstrapCallNode.parent.kind === ts.SyntaxKind.CallExpression) {
+      bootstrapCallNode.parent.kind === ts.SyntaxKind.CallExpression
+    ) {
       bootstrapCall = bootstrapCallNode.parent as ts.CallExpression;
       break;
     }
@@ -63,10 +67,10 @@ export function findBootstrapModulePath(host: Tree, mainPath: string): string {
   const allNodes = getSourceNodes(source);
   const bootstrapModuleRelativePath = allNodes
     .filter(ts.isImportDeclaration)
-    .filter(imp => {
+    .filter((imp) => {
       return findNode(imp, ts.SyntaxKind.Identifier, bootstrapModule.getText());
     })
-    .map(imp => {
+    .map((imp) => {
       const modulePathStringLiteral = imp.moduleSpecifier as ts.StringLiteral;
 
       return modulePathStringLiteral.text;
diff --git a/packages/schematics/angular/utility/parse-name.ts b/packages/schematics/angular/utility/parse-name.ts
index cac57b08680b..231c99341a50 100644
--- a/packages/schematics/angular/utility/parse-name.ts
+++ b/packages/schematics/angular/utility/parse-name.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 { relative, Path } from "../../../angular_devkit/core/src/virtual-fs";
 import { Path, basename, dirname, join, normalize } from '@angular-devkit/core';
 
@@ -16,7 +16,7 @@ export interface Location {
 
 export function parseName(path: string, name: string): Location {
   const nameWithoutPath = basename(normalize(name));
-  const namePath = dirname(join(normalize(path), name) as Path);
+  const namePath = dirname(join(normalize(path), name));
 
   return {
     name: nameWithoutPath,
diff --git a/packages/schematics/angular/utility/parse-name_spec.ts b/packages/schematics/angular/utility/parse-name_spec.ts
index 3c969d6ca9df..e78d733edbc3 100644
--- a/packages/schematics/angular/utility/parse-name_spec.ts
+++ b/packages/schematics/angular/utility/parse-name_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 { parseName } from './parse-name';
 
+import { parseName } from './parse-name';
 
 describe('parse-name', () => {
   it('should handle just the name', () => {
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..a00f740ca3e0 100644
--- a/packages/schematics/angular/utility/test/create-app-module.ts
+++ b/packages/schematics/angular/utility/test/create-app-module.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 { UnitTestTree } from '@angular-devkit/schematics/testing';
 
+import { UnitTestTree } from '@angular-devkit/schematics/testing';
 
 export function createAppModule(tree: UnitTestTree, path?: string): UnitTestTree {
-  tree.create(path || '/src/app/app.module.ts', `
+  tree.create(
+    path || '/src/app/app.module.ts',
+    `
     import { BrowserModule } from '@angular/platform-browser';
     import { NgModule } from '@angular/core';
     import { AppComponent } from './app.component';
@@ -25,7 +27,8 @@ export function createAppModule(tree: UnitTestTree, path?: string): UnitTestTree
     bootstrap: [AppComponent]
     })
     export class AppModule { }
-  `);
+  `,
+  );
 
   return tree;
 }
diff --git a/packages/schematics/angular/utility/test/get-file-content.ts b/packages/schematics/angular/utility/test/get-file-content.ts
index 0e9dfe82c3c5..98f0b34a5c11 100644
--- a/packages/schematics/angular/utility/test/get-file-content.ts
+++ b/packages/schematics/angular/utility/test/get-file-content.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 { Tree } from '@angular-devkit/schematics';
 
+import { Tree } from '@angular-devkit/schematics';
 
 export function getFileContent(tree: Tree, path: string): string {
   const fileEntry = tree.get(path);
diff --git a/packages/schematics/angular/utility/test/index.ts b/packages/schematics/angular/utility/test/index.ts
index afb74bfa8b84..bfe027bf21d1 100644
--- a/packages/schematics/angular/utility/test/index.ts
+++ b/packages/schematics/angular/utility/test/index.ts
@@ -1,9 +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
  */
+
 export * from './create-app-module';
 export * from './get-file-content';
diff --git a/packages/schematics/angular/utility/validation.ts b/packages/schematics/angular/utility/validation.ts
index 923b819df9da..a45cca23b9c9 100644
--- a/packages/schematics/angular/utility/validation.ts
+++ b/packages/schematics/angular/utility/validation.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 { SchematicsException } from '@angular-devkit/schematics';
 
@@ -26,7 +27,6 @@ export function validateHtmlSelector(selector: string): void {
   }
 }
 
-
 export function validateProjectName(projectName: string) {
   const errorIndex = getRegExpFailPosition(projectName);
   const unsupportedProjectNames: string[] = [];
@@ -45,7 +45,8 @@ export function validateProjectName(projectName: string) {
     throw new SchematicsException(msg);
   } else if (unsupportedProjectNames.indexOf(projectName) !== -1) {
     throw new SchematicsException(
-      `Project name ${JSON.stringify(projectName)} is not a supported name.`);
+      `Project name ${JSON.stringify(projectName)} is not a supported name.`,
+    );
   } else if (!packageNameRegex.test(projectName)) {
     throw new SchematicsException(`Project name ${JSON.stringify(projectName)} is invalid.`);
   }
@@ -65,7 +66,7 @@ function getRegExpFailPosition(str: string): number | null {
 
   const projectNameRegexp = /^[a-zA-Z][.0-9a-zA-Z]*(-[.0-9a-zA-Z]*)*$/;
 
-  parts.forEach(part => {
+  parts.forEach((part) => {
     if (part.match(projectNameRegexp)) {
       matched.push(part);
     }
@@ -73,5 +74,5 @@ function getRegExpFailPosition(str: string): number | null {
 
   const compare = matched.join('-');
 
-  return (str !== compare) ? compare.length : null;
+  return str !== compare ? compare.length : null;
 }
diff --git a/packages/schematics/angular/utility/workspace-models.ts b/packages/schematics/angular/utility/workspace-models.ts
index 1113946fe162..87d698822884 100644
--- a/packages/schematics/angular/utility/workspace-models.ts
+++ b/packages/schematics/angular/utility/workspace-models.ts
@@ -1,74 +1,75 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use 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 enum ProjectType {
-    Application = 'application',
-    Library = 'library',
+  Application = 'application',
+  Library = 'library',
 }
 
 export enum Builders {
-    AppShell = '@angular-devkit/build-angular:app-shell',
-    Server = '@angular-devkit/build-angular:server',
-    Browser = '@angular-devkit/build-angular:browser',
-    Karma = '@angular-devkit/build-angular:karma',
-    TsLint = '@angular-devkit/build-angular:tslint',
-    DeprecatedNgPackagr = '@angular-devkit/build-ng-packagr:build',
-    NgPackagr = '@angular-devkit/build-angular:ng-packagr',
-    DevServer = '@angular-devkit/build-angular:dev-server',
-    ExtractI18n = '@angular-devkit/build-angular:extract-i18n',
-    Protractor = '@angular-devkit/build-angular:protractor',
+  AppShell = '@angular-devkit/build-angular:app-shell',
+  Server = '@angular-devkit/build-angular:server',
+  Browser = '@angular-devkit/build-angular:browser',
+  Karma = '@angular-devkit/build-angular:karma',
+  TsLint = '@angular-devkit/build-angular:tslint',
+  DeprecatedNgPackagr = '@angular-devkit/build-ng-packagr:build',
+  NgPackagr = '@angular-devkit/build-angular:ng-packagr',
+  DevServer = '@angular-devkit/build-angular:dev-server',
+  ExtractI18n = '@angular-devkit/build-angular:extract-i18n',
+  Protractor = '@angular-devkit/build-angular:protractor',
 }
 
 export interface FileReplacements {
-    replace: string;
-    with: string;
+  replace: string;
+  with: string;
 }
 
 export interface BrowserBuilderBaseOptions {
-    main: string;
-    tsConfig: string;
-    fileReplacements?: FileReplacements[];
-    outputPath?: string;
-    index?: string;
-    polyfills: string;
-    assets?: (object|string)[];
-    styles?: (object|string)[];
-    scripts?: (object|string)[];
-    sourceMap?: boolean;
+  main: string;
+  tsConfig: string;
+  fileReplacements?: FileReplacements[];
+  outputPath?: string;
+  index?: string;
+  polyfills: string;
+  assets?: (object | string)[];
+  styles?: (object | string)[];
+  scripts?: (object | string)[];
+  sourceMap?: boolean;
 }
 
 export type OutputHashing = 'all' | 'media' | 'none' | 'bundles';
 
 export interface BrowserBuilderOptions extends BrowserBuilderBaseOptions {
-    serviceWorker?: boolean;
-    optimization?: boolean;
-    outputHashing?: OutputHashing;
-    resourcesOutputPath?: string;
-    extractCss?: boolean;
-    namedChunks?: boolean;
-    aot?: boolean;
-    extractLicenses?: boolean;
-    vendorChunk?: boolean;
-    buildOptimizer?: boolean;
-    ngswConfigPath?: string;
-    budgets?: {
-        type: string;
-        maximumWarning?: string;
-        maximumError?: string;
-    }[];
-    webWorkerTsConfig?: string;
+  serviceWorker?: boolean;
+  optimization?: boolean;
+  outputHashing?: OutputHashing;
+  resourcesOutputPath?: string;
+  extractCss?: boolean;
+  namedChunks?: boolean;
+  aot?: boolean;
+  extractLicenses?: boolean;
+  vendorChunk?: boolean;
+  buildOptimizer?: boolean;
+  ngswConfigPath?: string;
+  budgets?: {
+    type: string;
+    maximumWarning?: string;
+    maximumError?: string;
+  }[];
+  webWorkerTsConfig?: string;
 }
 
 export interface ServeBuilderOptions {
-    browserTarget: string;
+  browserTarget: string;
 }
 export interface LibraryBuilderOptions {
-    tsConfig: string;
-    project: string;
+  tsConfig: string;
+  project: string;
 }
 
 export interface ServerBuilderOptions {
@@ -76,44 +77,48 @@ export interface ServerBuilderOptions {
   tsConfig: string;
   main: string;
   fileReplacements?: FileReplacements[];
-  optimization?: boolean | {
-    scripts?: boolean;
-    styles?: boolean;
-  };
-  sourceMap?: boolean | {
-    scripts?: boolean;
-    styles?: boolean;
-    hidden?: boolean;
-    vendor?: boolean;
-  };
+  optimization?:
+    | boolean
+    | {
+        scripts?: boolean;
+        styles?: boolean;
+      };
+  sourceMap?:
+    | boolean
+    | {
+        scripts?: boolean;
+        styles?: boolean;
+        hidden?: boolean;
+        vendor?: boolean;
+      };
 }
 
 export interface AppShellBuilderOptions {
-    browserTarget: string;
-    serverTarget: string;
-    route: string;
+  browserTarget: string;
+  serverTarget: string;
+  route: string;
 }
 
 export interface TestBuilderOptions extends Partial<BrowserBuilderBaseOptions> {
-    karmaConfig: string;
+  karmaConfig: string;
 }
 
 export interface ExtractI18nOptions {
-    browserTarget: string;
+  browserTarget: string;
 }
 
 export interface E2EOptions {
-    protractorConfig: string;
-    devServerTarget: string;
+  protractorConfig: string;
+  devServerTarget: string;
 }
 
 export interface BuilderTarget<TBuilder extends Builders, TOptions> {
-    builder: TBuilder;
-    options: TOptions;
-    configurations?: {
-        production: Partial<TOptions>;
-        [key: string]: Partial<TOptions>;
-    };
+  builder: TBuilder;
+  options: TOptions;
+  configurations?: {
+    production: Partial<TOptions>;
+    [key: string]: Partial<TOptions>;
+  };
 }
 
 export type LibraryBuilderTarget = BuilderTarget<Builders.NgPackagr, LibraryBuilderOptions>;
@@ -126,45 +131,45 @@ export type ExtractI18nBuilderTarget = BuilderTarget<Builders.ExtractI18n, Extra
 export type E2EBuilderTarget = BuilderTarget<Builders.Protractor, E2EOptions>;
 
 export interface WorkspaceSchema {
-    version: 1;
-    defaultProject?: string;
-    cli?: { warnings?: Record<string, boolean> };
-    projects: {
-        [key: string]: WorkspaceProject<ProjectType.Application | ProjectType.Library>;
-    };
+  version: 1;
+  defaultProject?: string;
+  cli?: { warnings?: Record<string, boolean> };
+  projects: {
+    [key: string]: WorkspaceProject<ProjectType.Application | ProjectType.Library>;
+  };
 }
 
 export interface WorkspaceProject<TProjectType extends ProjectType = ProjectType.Application> {
-    /**
-    * Project type.
-    */
-    projectType: ProjectType;
+  /**
+   * Project type.
+   */
+  projectType: ProjectType;
 
-    root: string;
-    sourceRoot: string;
-    prefix: string;
+  root: string;
+  sourceRoot: string;
+  prefix: string;
 
-    cli?: { warnings?: Record<string, boolean> };
+  cli?: { warnings?: Record<string, boolean> };
 
-    /**
-     * Tool options.
-     */
-    architect?: WorkspaceTargets<TProjectType>;
-    /**
-     * Tool options.
-     */
-    targets?: WorkspaceTargets<TProjectType>;
+  /**
+   * Tool options.
+   */
+  architect?: WorkspaceTargets<TProjectType>;
+  /**
+   * Tool options.
+   */
+  targets?: WorkspaceTargets<TProjectType>;
 }
 
 export interface WorkspaceTargets<TProjectType extends ProjectType = ProjectType.Application> {
-    build?: TProjectType extends ProjectType.Library ? LibraryBuilderTarget : BrowserBuilderTarget;
-    server?: ServerBuilderTarget;
-    test?: TestBuilderTarget;
-    serve?: ServeBuilderTarget;
-    e2e?: E2EBuilderTarget;
-    'app-shell'?: AppShellBuilderTarget;
-    'extract-i18n'?: ExtractI18nBuilderTarget;
-    // TODO(hans): change this any to unknown when google3 supports TypeScript 3.0.
-    // tslint:disable-next-line:no-any
-    [key: string]: any;
+  build?: TProjectType extends ProjectType.Library ? LibraryBuilderTarget : BrowserBuilderTarget;
+  server?: ServerBuilderTarget;
+  test?: TestBuilderTarget;
+  serve?: ServeBuilderTarget;
+  e2e?: E2EBuilderTarget;
+  'app-shell'?: AppShellBuilderTarget;
+  'extract-i18n'?: ExtractI18nBuilderTarget;
+  // TODO(hans): change this any to unknown when google3 supports TypeScript 3.0.
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  [key: string]: any;
 }
diff --git a/packages/schematics/angular/utility/workspace.ts b/packages/schematics/angular/utility/workspace.ts
index f916871d0e41..07bf2c9ffc64 100644
--- a/packages/schematics/angular/utility/workspace.ts
+++ b/packages/schematics/angular/utility/workspace.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 { json, virtualFs, workspaces } from '@angular-devkit/core';
 import { Rule, Tree, noop } from '@angular-devkit/schematics';
 import { ProjectType } from './workspace-models';
@@ -35,18 +36,16 @@ function createHost(tree: Tree): workspaces.WorkspaceHost {
 export function updateWorkspace(
   updater: (workspace: workspaces.WorkspaceDefinition) => void | Rule | PromiseLike<void | Rule>,
 ): Rule;
+export function updateWorkspace(workspace: workspaces.WorkspaceDefinition): Rule;
 export function updateWorkspace(
-  workspace: workspaces.WorkspaceDefinition,
-): Rule;
-export function updateWorkspace(
-  updaterOrWorkspace: workspaces.WorkspaceDefinition
+  updaterOrWorkspace:
+    | workspaces.WorkspaceDefinition
     | ((workspace: workspaces.WorkspaceDefinition) => void | Rule | PromiseLike<void | Rule>),
 ): Rule {
   return async (tree: Tree) => {
     const host = createHost(tree);
 
     if (typeof updaterOrWorkspace === 'function') {
-
       const { workspace } = await workspaces.readWorkspace('/', host);
 
       const result = await updaterOrWorkspace(workspace);
@@ -76,7 +75,8 @@ export async function getWorkspace(tree: Tree, path = '/') {
  */
 export function buildDefaultPath(project: workspaces.ProjectDefinition): string {
   const root = project.sourceRoot ? `/${project.sourceRoot}/` : `/${project.root}/src/`;
-  const projectDirName = project.extensions['projectType'] === ProjectType.Application ? 'app' : 'lib';
+  const projectDirName =
+    project.extensions['projectType'] === ProjectType.Application ? 'app' : 'lib';
 
   return `${root}${projectDirName}`;
 }
@@ -85,7 +85,7 @@ export async function createDefaultPath(tree: Tree, projectName: string): Promis
   const workspace = await getWorkspace(tree);
   const project = workspace.projects.get(projectName);
   if (!project) {
-    throw new Error('Specified project does not exist.');
+    throw new Error(`Project "${projectName}" does not exist.`);
   }
 
   return buildDefaultPath(project);
@@ -96,7 +96,7 @@ export function* allWorkspaceTargets(
 ): Iterable<[string, workspaces.TargetDefinition, string, workspaces.ProjectDefinition]> {
   for (const [projectName, project] of workspace.projects) {
     for (const [targetName, target] of project.targets) {
-      yield [targetName, target, projectName, project] ;
+      yield [targetName, target, projectName, project];
     }
   }
 }
diff --git a/packages/schematics/angular/web-worker/index.ts b/packages/schematics/angular/web-worker/index.ts
index f9916004c53b..176dc01b96cf 100644
--- a/packages/schematics/angular/web-worker/index.ts
+++ b/packages/schematics/angular/web-worker/index.ts
@@ -1,58 +1,30 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of 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, strings, tags } from '@angular-devkit/core';
 import {
-  dirname,
-  join,
-  normalize,
-  strings,
-  tags,
-} from '@angular-devkit/core';
-import {
-  Rule, SchematicContext, SchematicsException, Tree,
-  apply, applyTemplates, chain, mergeWith, move, noop, url,
+  Rule,
+  SchematicContext,
+  SchematicsException,
+  Tree,
+  apply,
+  applyTemplates,
+  chain,
+  mergeWith,
+  move,
+  noop,
+  url,
 } from '@angular-devkit/schematics';
-import { JSONFile } from '../utility/json-file';
 import { parseName } from '../utility/parse-name';
 import { relativePathToWorkspaceRoot } from '../utility/paths';
 import { buildDefaultPath, getWorkspace, updateWorkspace } from '../utility/workspace';
-import { BrowserBuilderOptions } from '../utility/workspace-models';
 import { Schema as WebWorkerOptions } from './schema';
 
-
-function addConfig(options: WebWorkerOptions, root: string, tsConfigPath: string): Rule {
-  return (host: Tree, context: SchematicContext) => {
-    context.logger.debug('updating project configuration.');
-
-    // Add worker glob exclusion to tsconfig.app.json.
-    // Projects pre version 8 should to have tsconfig.app.json inside their application
-    const isInSrc = dirname(normalize(tsConfigPath)).endsWith('src');
-    const workerGlob = `${isInSrc ? '' : 'src/'}**/*.worker.ts`;
-
-    try {
-      const json = new JSONFile(host, tsConfigPath);
-      const exclude = json.get(['exclude']);
-      if (exclude && Array.isArray(exclude) && !exclude.includes(workerGlob)) {
-        json.modify(['exclude'], [...exclude, workerGlob]);
-      }
-    } catch {}
-
-    return mergeWith(
-      apply(url('./files/worker-tsconfig'), [
-        applyTemplates({
-          ...options,
-          relativePathToWorkspaceRoot: relativePathToWorkspaceRoot(root),
-        }),
-        move(root),
-      ]),
-    );
-  };
-}
-
 function addSnippet(options: WebWorkerOptions): Rule {
   return (host: Tree, context: SchematicContext) => {
     context.logger.debug('Updating appmodule');
@@ -62,10 +34,11 @@ function addSnippet(options: WebWorkerOptions): Rule {
     }
 
     const fileRegExp = new RegExp(`^${options.name}.*\.ts`);
-    const siblingModules = host.getDir(options.path).subfiles
-      // Find all files that start with the same name, are ts files,
+    const siblingModules = host
+      .getDir(options.path)
+      .subfiles // Find all files that start with the same name, are ts files,
       // and aren't spec or module files.
-      .filter(f => fileRegExp.test(f) && !/(module|spec)\.ts$/.test(f))
+      .filter((f) => fileRegExp.test(f) && !/(module|spec)\.ts$/.test(f))
       // Sort alphabetically for consistency.
       .sort();
 
@@ -105,51 +78,60 @@ export default function (options: WebWorkerOptions): Rule {
     if (!options.project) {
       throw new SchematicsException('Option "project" is required.');
     }
-    if (!options.target) {
-      throw new SchematicsException('Option "target" is required.');
-    }
+
     const project = workspace.projects.get(options.project);
     if (!project) {
       throw new SchematicsException(`Invalid project name (${options.project})`);
     }
+
     const projectType = project.extensions['projectType'];
     if (projectType !== 'application') {
       throw new SchematicsException(`Web Worker requires a project type of "application".`);
     }
 
-    const projectTarget = project.targets.get(options.target);
-    if (!projectTarget) {
-      throw new Error(`Target is not defined for this project.`);
-    }
-    const projectTargetOptions = (projectTarget.options || {}) as unknown as BrowserBuilderOptions;
-
     if (options.path === undefined) {
       options.path = buildDefaultPath(project);
     }
     const parsedPath = parseName(options.path, options.name);
     options.name = parsedPath.name;
     options.path = parsedPath.path;
-    const root = project.root || '';
 
-    const needWebWorkerConfig = !projectTargetOptions.webWorkerTsConfig;
-    if (needWebWorkerConfig) {
-      const workerConfigPath = join(normalize(root), 'tsconfig.worker.json');
-      projectTargetOptions.webWorkerTsConfig = workerConfigPath;
-    }
-
-    const templateSource = apply(url('./files/worker'), [
+    const templateSourceWorkerCode = apply(url('./files/worker'), [
       applyTemplates({ ...options, ...strings }),
       move(parsedPath.path),
     ]);
 
+    const root = project.root || '';
+    const templateSourceWorkerConfig = apply(url('./files/worker-tsconfig'), [
+      applyTemplates({
+        ...options,
+        relativePathToWorkspaceRoot: relativePathToWorkspaceRoot(root),
+      }),
+      move(root),
+    ]);
+
     return chain([
       // Add project configuration.
-      needWebWorkerConfig ? addConfig(options, root, projectTargetOptions.tsConfig) : noop(),
-      needWebWorkerConfig ? updateWorkspace(workspace) : noop(),
+      updateWorkspace((workspace) => {
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
+        const project = workspace.projects.get(options.project)!;
+        const buildTarget = project.targets.get('build');
+        const testTarget = project.targets.get('test');
+        if (!buildTarget) {
+          throw new Error(`Build target is not defined for this project.`);
+        }
+
+        const workerConfigPath = join(normalize(root), 'tsconfig.worker.json');
+        (buildTarget.options ??= {}).webWorkerTsConfig ??= workerConfigPath;
+        if (testTarget) {
+          (testTarget.options ??= {}).webWorkerTsConfig ??= workerConfigPath;
+        }
+      }),
       // Create the worker in a sibling module.
       options.snippet ? addSnippet(options) : noop(),
       // Add the worker.
-      mergeWith(templateSource),
+      mergeWith(templateSourceWorkerCode),
+      mergeWith(templateSourceWorkerConfig),
     ]);
   };
 }
diff --git a/packages/schematics/angular/web-worker/index_spec.ts b/packages/schematics/angular/web-worker/index_spec.ts
index 4272a8d3a9af..c10c4f74b625 100644
--- a/packages/schematics/angular/web-worker/index_spec.ts
+++ b/packages/schematics/angular/web-worker/index_spec.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 { SchematicTestRunner, UnitTestTree } from '@angular-devkit/schematics/testing';
 import { parse as parseJson } from 'jsonc-parser';
 import { Schema as ApplicationOptions } from '../application/schema';
@@ -42,57 +43,43 @@ describe('Web Worker Schematic', () => {
 
   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 put the worker file in the project root', async () => {
-    const tree = await schematicRunner.runSchematicAsync('web-worker', defaultOptions, appTree)
+    const tree = await schematicRunner
+      .runSchematicAsync('web-worker', defaultOptions, appTree)
       .toPromise();
     const path = '/projects/bar/src/app/app.worker.ts';
     expect(tree.exists(path)).toEqual(true);
   });
 
   it('should put the tsconfig.worker.json file in the project root', async () => {
-    const tree = await schematicRunner.runSchematicAsync('web-worker', defaultOptions, appTree)
+    const tree = await schematicRunner
+      .runSchematicAsync('web-worker', defaultOptions, appTree)
       .toPromise();
     const path = '/projects/bar/tsconfig.worker.json';
     expect(tree.exists(path)).toEqual(true);
 
-    // tslint:disable-next-line: no-any
-    const { compilerOptions } = parseJson(tree.readContent(path).toString()) as any;
+    const { compilerOptions } = parseJson(tree.readContent(path).toString());
     expect(compilerOptions.outDir).toBe('../../out-tsc/worker');
   });
 
   it('should add the webWorkerTsConfig option to workspace', async () => {
-    const tree = await schematicRunner.runSchematicAsync('web-worker', defaultOptions, appTree)
+    const tree = await schematicRunner
+      .runSchematicAsync('web-worker', defaultOptions, appTree)
       .toPromise();
     const { projects } = JSON.parse(tree.readContent('/angular.json'));
-    expect(projects.bar.architect.build.options.webWorkerTsConfig)
-      .toBe('projects/bar/tsconfig.worker.json');
-  });
-
-  it('should add exclusions to tsconfig.app.json', async () => {
-    const oldTsConfig = {
-      extends: '../../tsconfig.json',
-      include: [
-        'src/**/*.ts',
-      ],
-      exclude: [
-        'src/test.ts',
-        'src/**/*.spec.ts',
-      ],
-    };
-    appTree.overwrite('projects/bar/tsconfig.app.json', JSON.stringify(oldTsConfig, undefined, 2));
-
-    const tree = await schematicRunner.runSchematicAsync('web-worker', defaultOptions, appTree)
-      .toPromise();
-    const { exclude } = JSON.parse(tree.readContent('/projects/bar/tsconfig.app.json'));
-    expect(exclude).toContain('src/**/*.worker.ts');
+    expect(projects.bar.architect.build.options.webWorkerTsConfig).toBe(
+      'projects/bar/tsconfig.worker.json',
+    );
   });
 
   it('should add snippet to sibling file', async () => {
-    const tree = await schematicRunner.runSchematicAsync('web-worker', defaultOptions, appTree)
+    const tree = await schematicRunner
+      .runSchematicAsync('web-worker', defaultOptions, appTree)
       .toPromise();
     const appComponent = tree.readContent('/projects/bar/src/app/app.component.ts');
     expect(appComponent).toContain(`new Worker(new URL('./${defaultOptions.name}.worker`);
@@ -103,40 +90,17 @@ describe('Web Worker Schematic', () => {
     const rootAppOptions = { ...appOptions, projectRoot: '', name: 'foo' };
     const workerOptions = { ...defaultOptions, project: 'foo' };
 
-    appTree = await schematicRunner.runSchematicAsync('application', rootAppOptions, appTree)
+    appTree = await schematicRunner
+      .runSchematicAsync('application', rootAppOptions, appTree)
       .toPromise();
-    const tree = await schematicRunner.runSchematicAsync('web-worker', workerOptions, appTree)
+    const tree = await schematicRunner
+      .runSchematicAsync('web-worker', workerOptions, appTree)
       .toPromise();
 
     const path = '/tsconfig.worker.json';
     expect(tree.exists(path)).toEqual(true);
 
-    // tslint:disable-next-line: no-any
-    const { compilerOptions } = parseJson(tree.readContent(path).toString()) as any;
+    const { compilerOptions } = parseJson(tree.readContent(path).toString());
     expect(compilerOptions.outDir).toBe('./out-tsc/worker');
   });
-
-  it('supports pre version 8 structure', async () => {
-    const workspace = JSON.parse(appTree.readContent('/angular.json'));
-    const tsConfigPath = '/projects/bar/src/tsconfig.app.json';
-    workspace.projects.bar.architect.build.options.tsConfig = tsConfigPath;
-    appTree.overwrite('/angular.json', JSON.stringify(workspace));
-
-    const oldTsConfig = {
-      extends: '../../../tsconfig.json',
-      include: [
-        '**/*.ts',
-      ],
-      exclude: [
-        'test.ts',
-        '**/*.spec.ts',
-      ],
-    };
-    appTree.create('projects/bar/src/tsconfig.app.json', JSON.stringify(oldTsConfig, undefined, 2));
-
-    const tree = await schematicRunner.runSchematicAsync('web-worker', defaultOptions, appTree)
-      .toPromise();
-    const { exclude } = JSON.parse(tree.readContent(tsConfigPath));
-    expect(exclude).toContain('**/*.worker.ts');
-  });
 });
diff --git a/packages/schematics/angular/web-worker/schema.json b/packages/schematics/angular/web-worker/schema.json
index ac1ed8f0cadb..6f4f929f0190 100644
--- a/packages/schematics/angular/web-worker/schema.json
+++ b/packages/schematics/angular/web-worker/schema.json
@@ -4,7 +4,7 @@
   "title": "Angular Web Worker Options Schema",
   "type": "object",
   "additionalProperties": false,
-  "description": "Creates a new generic web worker definition in the given or default project.",
+  "description": "Creates a new, generic web worker definition in the given or default project.",
   "properties": {
     "path": {
       "type": "string",
@@ -22,7 +22,8 @@
     "target": {
       "type": "string",
       "description": "The target to apply web worker to.",
-      "default": "build"
+      "default": "build",
+      "x-deprecated": "No longer has an effect."
     },
     "name": {
       "type": "string",
@@ -39,8 +40,5 @@
       "description": "Add a worker creation snippet in a sibling file of the same name."
     }
   },
-  "required": [
-    "name",
-    "project"
-  ]
+  "required": ["name", "project"]
 }
diff --git a/packages/schematics/angular/workspace/files/README.md.template b/packages/schematics/angular/workspace/files/README.md.template
index 25d6cf773051..961bc376ff14 100644
--- a/packages/schematics/angular/workspace/files/README.md.template
+++ b/packages/schematics/angular/workspace/files/README.md.template
@@ -12,7 +12,7 @@ Run `ng generate component component-name` to generate a new component. You can
 
 ## Build
 
-Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory. Use the `--prod` flag for a production build.
+Run `ng build` to build the project. The build artifacts will be stored in the `dist/` directory.
 
 ## Running unit tests
 
@@ -20,7 +20,7 @@ Run `ng test` to execute the unit tests via [Karma](https://karma-runner.github.
 
 ## Running end-to-end tests
 
-Run `ng e2e` to execute the end-to-end tests via [Protractor](http://www.protractortest.org/).
+Run `ng e2e` to execute the end-to-end tests via a platform of your choice. To use this command, you need to first add a package that implements end-to-end testing capabilities.
 
 ## Further help
 
diff --git a/packages/schematics/angular/workspace/files/package.json.template b/packages/schematics/angular/workspace/files/package.json.template
index c231d77881b3..490d505e58b6 100644
--- a/packages/schematics/angular/workspace/files/package.json.template
+++ b/packages/schematics/angular/workspace/files/package.json.template
@@ -6,8 +6,7 @@
     "start": "ng serve",
     "build": "ng build",
     "watch": "ng build --watch --configuration development"<% if (!minimal) { %>,
-    "test": "ng test",
-    "lint": "ng lint"<% } %>
+    "test": "ng test"<% } %>
   },
   "private": true,
   "dependencies": {
@@ -19,24 +18,21 @@
     "@angular/platform-browser": "<%= latestVersions.Angular %>",
     "@angular/platform-browser-dynamic": "<%= latestVersions.Angular %>",
     "@angular/router": "<%= latestVersions.Angular %>",
-    "rxjs": "<%= latestVersions.RxJs %>",
-    "tslib": "<%= latestVersions.TsLib %>",
-    "zone.js": "<%= latestVersions.ZoneJs %>"
+    "rxjs": "<%= latestVersions['rxjs'] %>",
+    "tslib": "<%= latestVersions['tslib'] %>",
+    "zone.js": "<%= latestVersions['zone.js'] %>"
   },
   "devDependencies": {
     "@angular/cli": "<%= '~' + version %>",
     "@angular/compiler-cli": "<%= latestVersions.Angular %>",<% if (!minimal) { %>
-    "@types/jasmine": "~3.6.0",<% } %>
-    "@types/node": "^12.11.1",<% if (!minimal) { %>
-    "jasmine-core": "~3.7.0",
-    "jasmine-spec-reporter": "~7.0.0",
-    "karma": "~6.3.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",
-    "ts-node": "~9.1.1",<% } %>
-    "typescript": "<%= latestVersions.TypeScript %>"
+    "@types/jasmine": "<%= latestVersions['@types/jasmine'] %>",<% } %>
+    "@types/node": "<%= latestVersions['@types/node'] %>",<% if (!minimal) { %>
+    "jasmine-core": "<%= latestVersions['jasmine-core'] %>",
+    "karma": "<%= latestVersions['karma'] %>",
+    "karma-chrome-launcher": "<%= latestVersions['karma-chrome-launcher'] %>",
+    "karma-coverage": "<%= latestVersions['karma-coverage'] %>",
+    "karma-jasmine": "<%= latestVersions['karma-jasmine'] %>",
+    "karma-jasmine-html-reporter": "<%= latestVersions['karma-jasmine-html-reporter'] %>",<% } %>
+    "typescript": "<%= latestVersions['typescript'] %>"
   }
 }
diff --git a/packages/schematics/angular/workspace/index.ts b/packages/schematics/angular/workspace/index.ts
index fe40febfdc03..e686b4d21886 100644
--- a/packages/schematics/angular/workspace/index.ts
+++ b/packages/schematics/angular/workspace/index.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 { strings } from '@angular-devkit/core';
 import {
   Rule,
@@ -18,15 +19,16 @@ import {
 import { latestVersions } from '../utility/latest-versions';
 import { Schema as WorkspaceOptions } from './schema';
 
-
 export default function (options: WorkspaceOptions): Rule {
-  return mergeWith(apply(url('./files'), [
-    options.minimal ? filter(path => !path.endsWith('editorconfig.template')) : noop(),
-    applyTemplates({
-      utils: strings,
-      ...options,
-      'dot': '.',
-      latestVersions,
-    }),
-  ]));
+  return mergeWith(
+    apply(url('./files'), [
+      options.minimal ? filter((path) => !path.endsWith('editorconfig.template')) : noop(),
+      applyTemplates({
+        utils: strings,
+        ...options,
+        'dot': '.',
+        latestVersions,
+      }),
+    ]),
+  );
 }
diff --git a/packages/schematics/angular/workspace/index_spec.ts b/packages/schematics/angular/workspace/index_spec.ts
index a57e9252853e..202f8906b333 100644
--- a/packages/schematics/angular/workspace/index_spec.ts
+++ b/packages/schematics/angular/workspace/index_spec.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
  */
+
 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';
 
-
 describe('Workspace Schematic', () => {
   const schematicRunner = new SchematicTestRunner(
     '@schematics/angular',
@@ -26,14 +26,16 @@ describe('Workspace Schematic', () => {
 
     const tree = await schematicRunner.runSchematicAsync('workspace', options).toPromise();
     const files = tree.files;
-    expect(files).toEqual(jasmine.arrayContaining([
-      '/.editorconfig',
-      '/angular.json',
-      '/.gitignore',
-      '/package.json',
-      '/README.md',
-      '/tsconfig.json',
-    ]));
+    expect(files).toEqual(
+      jasmine.arrayContaining([
+        '/.editorconfig',
+        '/angular.json',
+        '/.gitignore',
+        '/package.json',
+        '/README.md',
+        '/tsconfig.json',
+      ]),
+    );
   });
 
   it('should set the name in package.json', async () => {
@@ -52,47 +54,55 @@ describe('Workspace Schematic', () => {
     const tree = await schematicRunner.runSchematicAsync('workspace', defaultOptions).toPromise();
     const pkg = JSON.parse(tree.readContent('/package.json'));
     expect(pkg.dependencies['@angular/core']).toEqual(latestVersions.Angular);
-    expect(pkg.dependencies['rxjs']).toEqual(latestVersions.RxJs);
-    expect(pkg.dependencies['zone.js']).toEqual(latestVersions.ZoneJs);
-    expect(pkg.devDependencies['typescript']).toEqual(latestVersions.TypeScript);
+    expect(pkg.dependencies['rxjs']).toEqual(latestVersions['rxjs']);
+    expect(pkg.dependencies['zone.js']).toEqual(latestVersions['zone.js']);
+    expect(pkg.devDependencies['typescript']).toEqual(latestVersions['typescript']);
   });
 
   it('should create correct files when using minimal', async () => {
-    const tree = await schematicRunner.runSchematicAsync('workspace', { ...defaultOptions, minimal: true }).toPromise();
+    const tree = await schematicRunner
+      .runSchematicAsync('workspace', { ...defaultOptions, minimal: true })
+      .toPromise();
     const files = tree.files;
-    expect(files).toEqual(jasmine.arrayContaining([
-      '/angular.json',
-      '/.gitignore',
-      '/package.json',
-      '/README.md',
-      '/tsconfig.json',
-    ]));
+    expect(files).toEqual(
+      jasmine.arrayContaining([
+        '/angular.json',
+        '/.gitignore',
+        '/package.json',
+        '/README.md',
+        '/tsconfig.json',
+      ]),
+    );
 
     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;
+    const { angularCompilerOptions } = parseJson(tree.readContent('tsconfig.json').toString());
     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()) as any;
+    const tree = await schematicRunner
+      .runSchematicAsync('workspace', { ...defaultOptions, strict: false })
+      .toPromise();
+    const { compilerOptions, angularCompilerOptions } = parseJson(
+      tree.readContent('tsconfig.json').toString(),
+    );
     expect(compilerOptions.strict).toBeUndefined();
-    expect(Object.keys(angularCompilerOptions).filter(option => option.startsWith('strict'))).toEqual([]);
+    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()) as any;
+    const tree = await schematicRunner
+      .runSchematicAsync('workspace', { ...defaultOptions, strict: true })
+      .toPromise();
+    const { compilerOptions, angularCompilerOptions } = parseJson(
+      tree.readContent('tsconfig.json').toString(),
+    );
     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 0f39c1ab1973..df6ac5cc5e1e 100644
--- a/packages/schematics/angular/workspace/schema.json
+++ b/packages/schematics/angular/workspace/schema.json
@@ -2,6 +2,7 @@
   "$schema": "http://json-schema.org/draft-07/schema",
   "$id": "SchematicsAngularWorkspace",
   "title": "Angular Workspace Options Schema",
+  "description": "Initializes an empty workspace and adds the necessary dependencies required by an Angular application.",
   "type": "object",
   "additionalProperties": false,
   "properties": {
@@ -45,8 +46,5 @@
       "enum": ["npm", "yarn", "pnpm", "cnpm"]
     }
   },
-  "required": [
-    "name",
-    "version"
-  ]
+  "required": ["name", "version"]
 }
diff --git a/renovate.json b/renovate.json
index bece7922b7bf..5ec0a7cb3497 100644
--- a/renovate.json
+++ b/renovate.json
@@ -2,28 +2,16 @@
   "pinVersions": false,
   "semanticCommits": true,
   "semanticPrefix": "build",
-  "commitMessage": "{{semanticPrefix}} update {{#if groupName}}{{{groupName}}} packages{{else}}{{{depName}}} to version {{{newVersion}}}{{/if}}",
   "separateMajorMinor": false,
   "prHourlyLimit": 2,
-  "labels": [
-    "target: minor",
-    "action: merge"
-  ],
+  "labels": ["target: minor", "action: merge"],
   "timezone": "America/Tijuana",
   "lockFileMaintenance": {
     "enabled": true
   },
-  "schedule": [
-    "after 10pm every weekday",
-    "before 4am every weekday",
-    "every weekend"
-  ],
-  "baseBranches": [
-    "master"
-  ],
-  "ignoreDeps": [
-    "@types/node"
-  ],
+  "schedule": ["after 10pm every weekday", "before 4am every weekday", "every weekend"],
+  "baseBranches": ["main"],
+  "ignoreDeps": ["@types/node", "quicktype-core"],
   "packageFiles": [
     "WORKSPACE",
     "package.json",
@@ -32,43 +20,55 @@
   ],
   "packageRules": [
     {
-      "packagePatterns": [
-        "^@angular\/.*"
-      ],
+      "packagePatterns": ["^@angular/.*"],
       "groupName": "angular",
       "pinVersions": false
     },
-   {
-      "packagePatterns": [
-        "^@babel\/.*"
-      ],
-      "groupName": "Babel",
+    {
+      "packagePatterns": ["^@babel/.*"],
+      "groupName": "babel",
       "pinVersions": false
     },
     {
-      "packagePatterns": [
-        "^@bazel\/.*",
-        "^build_bazel.*",
-        "bazel_toolchains"
-      ],
+      "packagePatterns": ["^@bazel/.*", "^build_bazel.*"],
       "groupName": "bazel",
       "pinVersions": false
     },
     {
-      "packageNames": [
-        "typescript"
-      ],
+      "packageNames": ["typescript", "rxjs", "tslib"],
       "separateMinorPatch": true
     },
     {
-      "packageNames": [
-        "typescript"
+      "packageNames": ["typescript", "rxjs", "tslib"],
+      "updateTypes": ["major"],
+      "enabled": false
+    },
+    {
+      "packageNames": ["typescript"],
+      "updateTypes": ["minor"],
+      "enabled": false
+    },
+    {
+      "matchPaths": [
+        "packages/angular_devkit/schematics_cli/blank/project-files/package.json",
+        "packages/angular_devkit/schematics_cli/schematic/files/package.json",
+        "packages/schematics/angular/utility/latest-versions/package.json"
       ],
-      "updateTypes": [
-        "minor",
-        "major"
+      "matchPackagePatterns": ["*"],
+      "groupName": "schematics dependencies",
+      "groupSlug": "all-schematics-dependencies"
+    },
+    {
+      "matchPaths": [
+        "!packages/angular_devkit/schematics_cli/blank/project-files/package.json",
+        "!packages/angular_devkit/schematics_cli/schematic/files/package.json",
+        "!packages/schematics/angular/utility/latest-versions/package.json"
       ],
-      "enabled": false
+      "excludePackagePatterns": ["^@angular/.*"],
+      "matchPackagePatterns": ["*"],
+      "matchUpdateTypes": ["minor", "patch"],
+      "groupName": "all non-major dependencies",
+      "groupSlug": "all-minor-patch"
     }
   ]
 }
diff --git a/scripts/README.md b/scripts/README.md
index a2c1961df4d7..1a62545c3282 100644
--- a/scripts/README.md
+++ b/scripts/README.md
@@ -18,8 +18,8 @@ installed (the result of `npm pack` on that package), and a directory using the
 
 Flags:
 
-* `--local`. Enable building packages with dependencies to their pack files (instead of versions).
-* `--snapshot`. Enable building packages with dependencies to their snapshot repos (instead of versions).
+- `--local`. Enable building packages with dependencies to their pack files (instead of versions).
+- `--snapshot`. Enable building packages with dependencies to their snapshot repos (instead of versions).
 
 ## changelog
 
@@ -27,13 +27,13 @@ Creates a changelog draft in GitHub releases.
 
 Flags:
 
-* `--from=<git-ref>`. **[Required]** The git ref (SHA, tag or ref) to start the CHANGELOG at.
-* `--to=<tag>`. **[Required]** The git ref (tag) to end the CHANGELOG at. This will also be used to name the changelog
+- `--from=<git-ref>`. **[Required]** The git ref (SHA, tag or ref) to start the CHANGELOG at.
+- `--to=<tag>`. **[Required]** The git ref (tag) to end the CHANGELOG at. This will also be used to name the changelog
   on GitHub.
-* `--githubToken=<string>`. The github token to update the changelog with. If this is not specified, the release notes
+- `--githubToken=<string>`. The github token to update the changelog with. If this is not specified, the release notes
   will be outputted to stdout.
-* `--githubTokenFile=<path>`. Reads the githubToken from a file instead of the command line (for CI).
-* `--stdout`. Skip the whole release note process and output the markdown to stdout instead.
+- `--githubTokenFile=<path>`. Reads the githubToken from a file instead of the command line (for CI).
+- `--stdout`. Skip the whole release note process and output the markdown to stdout instead.
 
 ## packages
 
@@ -45,7 +45,7 @@ Builds and published the packages to npm.
 
 Flags:
 
-* `--tag=<name>`. Publishes under the npm dist-tag specified.
+- `--tag=<name>`. Publishes under the npm dist-tag specified.
 
 ## release
 
@@ -62,13 +62,13 @@ the repo (such as private schematics). With the `--verbose` flag will output the
 
 By adding a command, the `release` script will update the version;
 
-* `major-beta`. Set the version of packages to the next beta of the next major.
-* `major-rc`. Set the version of packages to the next RC of the next major.
-* `major`. Increment the major version of packages.
-* `minor-beta`. Set the version of packages to the next beta of the next minor.
-* `minor-rc`. Set the version of packages to the next RC of the next minor.
-* `minor`. Increment the minor version of packages.
-* `patch`. Increment the patch version of packages.
+- `major-beta`. Set the version of packages to the next beta of the next major.
+- `major-rc`. Set the version of packages to the next RC of the next major.
+- `major`. Increment the major version of packages.
+- `minor-beta`. Set the version of packages to the next beta of the next minor.
+- `minor-rc`. Set the version of packages to the next RC of the next minor.
+- `minor`. Increment the minor version of packages.
+- `patch`. Increment the patch version of packages.
 
 By default, the release script will increment versions of packages that have changed. Use the `--force` flag to change
 the version of all packages, even those who haven't changed.
@@ -85,10 +85,10 @@ Create and upload snapshots. This is used in CI.
 
 Flags:
 
-* `--force`. Force push the snapshot to github.
-* `--githubToken=<string>`. The github token to update the changelog with. Either this of `--githubTokenFile` is
+- `--force`. Force push the snapshot to github.
+- `--githubToken=<string>`. The github token to update the changelog with. Either this of `--githubTokenFile` is
   required.
-* `--githubTokenFile=<path>`. Reads the githubToken from a file instead of the command line (for CI).
+- `--githubTokenFile=<path>`. Reads the githubToken from a file instead of the command line (for CI).
 
 ## templates
 
@@ -100,4 +100,4 @@ Performs BUILD files and license validation.
 
 Flags:
 
-* `--verbose`. Ignore errors and continue showing outputs.
+- `--verbose`. Ignore errors and continue showing outputs.
diff --git a/scripts/build-schema.ts b/scripts/build-schema.ts
index 1b73eca35771..2ca6fa3085dd 100644
--- a/scripts/build-schema.ts
+++ b/scripts/build-schema.ts
@@ -1,60 +1,33 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-// tslint:disable:no-implicit-dependencies
+
 import { logging } from '@angular-devkit/core';
 import * as fs from 'fs';
-import * as glob from 'glob';
+import glob from 'glob';
 import * as path from 'path';
 
-
-function _mkdirp(p: string) {
-  // Create parent folder if necessary.
-  if (!fs.existsSync(path.dirname(p))) {
-    _mkdirp(path.dirname(p));
-  }
-  if (!fs.existsSync(p)) {
-    fs.mkdirSync(p);
-  }
-}
-
-
-function _rimraf(p: string) {
-  glob.sync(path.join(p, '**/*'), { dot: true, nodir: true })
-    .forEach(p => fs.unlinkSync(p));
-  glob.sync(path.join(p, '**/*'), { dot: true })
-    .sort((a, b) => b.length - a.length)
-    .forEach(p => fs.rmdirSync(p));
-}
-
-
-export default async function(
-  argv: {},
-  logger: logging.Logger,
-) {
+export default async function (argv: {}, logger: logging.Logger) {
   const allJsonFiles = glob.sync('packages/**/*.json', {
-    ignore: [
-      '**/node_modules/**',
-      '**/files/**',
-      '**/*-files/**',
-      '**/package.json',
-    ],
+    ignore: ['**/node_modules/**', '**/files/**', '**/*-files/**', '**/package.json'],
   });
   const dist = path.join(__dirname, '../dist-schema');
 
   const quicktypeRunner = require('../tools/quicktype_runner');
   logger.info('Removing dist-schema/...');
-  _rimraf(dist);
+  fs.rmdirSync(dist, { recursive: true, maxRetries: 3 });
 
   logger.info('Generating JSON Schema....');
 
   for (const fileName of allJsonFiles) {
-    if (fs.existsSync(fileName.replace(/\.json$/, '.ts'))
-      || fs.existsSync(fileName.replace(/\.json$/, '.d.ts'))) {
+    if (
+      fs.existsSync(fileName.replace(/\.json$/, '.ts')) ||
+      fs.existsSync(fileName.replace(/\.json$/, '.d.ts'))
+    ) {
       // Skip files that already exist.
       continue;
     }
@@ -74,7 +47,7 @@ export default async function(
     const tsContent = await quicktypeRunner.generate(fileName);
     const tsPath = path.join(dist, fileName.replace(/\.json$/, '.ts'));
 
-    _mkdirp(path.dirname(tsPath));
+    fs.mkdirSync(path.dirname(tsPath), { recursive: true });
     fs.writeFileSync(tsPath, tsContent, 'utf-8');
   }
 
diff --git a/scripts/build.ts b/scripts/build.ts
index 429bce5edd61..977759ee29ef 100644
--- a/scripts/build.ts
+++ b/scripts/build.ts
@@ -1,29 +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
  */
-// tslint:disable:no-implicit-dependencies
+
 import { JsonObject, logging } from '@angular-devkit/core';
 import * as child_process from 'child_process';
 import * as fs from 'fs';
-import * as glob from 'glob';
+import glob from 'glob';
 import * as path from 'path';
-import * as rimraf from 'rimraf';
 import { packages } from '../lib/packages';
 import buildSchema from './build-schema';
 
 const minimatch = require('minimatch');
 const tar = require('tar');
 
-const gitIgnoreFiles = fs.readFileSync(path.join(__dirname, '../.gitignore'), 'utf-8')
-  .split('\n');
+const gitIgnoreFiles = fs.readFileSync(path.join(__dirname, '../.gitignore'), 'utf-8').split('\n');
 const gitIgnore = gitIgnoreFiles
-  .map(line => line.replace(/#.*/, ''))
+  .map((line) => line.replace(/#.*/, ''))
   .filter((line) => !line.startsWith('!'))
-  .filter(line => !line.match(/^\s*$/));
+  .filter((line) => !line.match(/^\s*$/));
 const gitIgnoreExcept = gitIgnoreFiles
   .filter((line) => line.startsWith('!'))
   .map((line) => line.substr(1));
@@ -35,18 +33,7 @@ function _gitIgnoreMatch(p: string): boolean {
     return false;
   }
 
-  return gitIgnore.some(line => minimatch(p, line));
-}
-
-
-function _mkdirp(p: string) {
-  // Create parent folder if necessary.
-  if (!fs.existsSync(path.dirname(p))) {
-    _mkdirp(path.dirname(p));
-  }
-  if (!fs.existsSync(p)) {
-    fs.mkdirSync(p);
-  }
+  return gitIgnore.some((line) => minimatch(p, line));
 }
 
 function _recursiveFileList(p: string): string[] {
@@ -56,19 +43,20 @@ function _recursiveFileList(p: string): string[] {
 
   const list = fs.readdirSync(p);
 
-  return list
-    .map(subpath => {
-      const subpathList = _recursiveFileList(path.join(p, subpath));
-
-      return [ subpath, ...subpathList.map(sp => path.join(subpath, sp))];
-    })
-    // Flatten.
-    .reduce((acc, curr) => [...acc, ...curr], [])
-    // Filter out directories.
-    .filter(sp => !fs.statSync(path.join(p, sp)).isDirectory());
+  return (
+    list
+      .map((subpath) => {
+        const subpathList = _recursiveFileList(path.join(p, subpath));
+
+        return [subpath, ...subpathList.map((sp) => path.join(subpath, sp))];
+      })
+      // Flatten.
+      .reduce((acc, curr) => [...acc, ...curr], [])
+      // Filter out directories.
+      .filter((sp) => !fs.statSync(path.join(p, sp)).isDirectory())
+  );
 }
 
-
 // This method mimics how npm pack tars packages.
 function _tar(out: string, dir: string) {
   // NOTE: node-tar does some Magic Stuff depending on prefixes for files
@@ -79,25 +67,27 @@ function _tar(out: string, dir: string) {
 
   const files = _recursiveFileList(dir).map((f) => `./${f}`);
 
-  return tar.create({
-    gzip: true,
-    strict: true,
-    portable: true,
-    cwd: dir,
-    prefix: 'package/',
-    file: out,
-    sync: true,
-    // Provide a specific date in the 1980s for the benefit of zip,
-    // which is confounded by files dated at the Unix epoch 0.
-    mtime: new Date('1985-10-26T08:15:00.000Z'),
-  }, files);
+  return tar.create(
+    {
+      gzip: true,
+      strict: true,
+      portable: true,
+      cwd: dir,
+      prefix: 'package/',
+      file: out,
+      sync: true,
+      // Provide a specific date in the 1980s for the benefit of zip,
+      // which is confounded by files dated at the Unix epoch 0.
+      mtime: new Date('1985-10-26T08:15:00.000Z'),
+    },
+    files,
+  );
 }
 
-
 function _copy(from: string, to: string) {
   // Create parent folder if necessary.
   if (!fs.existsSync(path.dirname(to))) {
-    _mkdirp(path.dirname(to));
+    fs.mkdirSync(path.dirname(to), { recursive: true });
   }
 
   // Error out if destination already exists.
@@ -112,14 +102,13 @@ function _copy(from: string, to: string) {
   fs.writeFileSync(to, buffer);
 }
 
-
 function _recursiveCopy(from: string, to: string, logger: logging.Logger) {
   if (!fs.existsSync(from)) {
     logger.error(`File "${from}" does not exist.`);
     process.exit(4);
   }
   if (fs.statSync(from).isDirectory()) {
-    fs.readdirSync(from).forEach(fileName => {
+    fs.readdirSync(from).forEach((fileName) => {
       _recursiveCopy(path.join(from, fileName), path.join(to, fileName), logger);
     });
   } else {
@@ -127,7 +116,6 @@ function _recursiveCopy(from: string, to: string, logger: logging.Logger) {
   }
 }
 
-
 function _rm(p: string) {
   p = path.relative(process.cwd(), p);
   fs.unlinkSync(p);
@@ -136,10 +124,9 @@ function _rm(p: string) {
 function _clean(logger: logging.Logger) {
   logger.info('Cleaning...');
   logger.info('  Removing dist/...');
-  rimraf.sync(path.join(__dirname, '../dist'));
+  fs.rmdirSync(path.join(__dirname, '../dist'), { recursive: true, maxRetries: 3 });
 }
 
-
 function _sortPackages() {
   // Order packages in order of dependency.
   // We use bubble sort because we need a full topological sort but adding another dependency
@@ -156,8 +143,7 @@ function _sortPackages() {
 
         if (packages[a].dependencies.indexOf(b) != -1) {
           // Swap them.
-          [sortedPackages[i], sortedPackages[i + 1]]
-            = [sortedPackages[i + 1], sortedPackages[i]];
+          [sortedPackages[i], sortedPackages[i + 1]] = [sortedPackages[i + 1], sortedPackages[i]];
           swapped = true;
         }
       }
@@ -174,7 +160,7 @@ function _exec(command: string, args: string[], opts: { cwd?: string }, logger:
   });
 
   if (status != 0) {
-    logger.error(`Command failed: ${command} ${args.map(x => JSON.stringify(x)).join(', ')}`);
+    logger.error(`Command failed: ${command} ${args.map((x) => JSON.stringify(x)).join(', ')}`);
     if (error) {
       logger.error('Error: ' + (error ? error.message : 'undefined'));
     } else {
@@ -185,21 +171,14 @@ function _exec(command: string, args: string[], opts: { cwd?: string }, logger:
   }
 }
 
-
 function _build(logger: logging.Logger) {
   logger.info('Building...');
-  _exec('node', [
-    require.resolve('typescript/bin/tsc'),
-    '-p',
-    'tsconfig.json',
-  ], {}, logger);
+  _exec('node', [require.resolve('typescript/bin/tsc'), '-p', 'tsconfig.json'], {}, logger);
 }
 
-
-// tslint:disable-next-line:no-big-function
-export default async function(
-  argv: { local?: boolean, snapshot?: boolean },
-  logger: logging.Logger,
+export default async function (
+  argv: { local?: boolean; snapshot?: boolean } = {},
+  logger: logging.Logger = new logging.Logger('build-logger'),
 ) {
   _clean(logger);
 
@@ -213,7 +192,7 @@ export default async function(
     packageLogger.info(packageName);
     const pkg = packages[packageName];
     _recursiveCopy(pkg.build, pkg.dist, logger);
-    rimraf.sync(pkg.build);
+    fs.rmdirSync(pkg.build, { recursive: true, maxRetries: 3 });
   }
 
   logger.info('Merging bazel-bin/ with dist/');
@@ -225,7 +204,7 @@ export default async function(
     if (fs.existsSync(bazelBinPath)) {
       packageLogger.info(packageName);
       _recursiveCopy(bazelBinPath, pkg.dist, logger);
-      rimraf.sync(bazelBinPath);
+      fs.rmdirSync(bazelBinPath, { recursive: true, maxRetries: 3 });
     }
   }
 
@@ -240,14 +219,16 @@ export default async function(
     subSubLogger.info(`${files.length} files total...`);
     const resources = files
       .map((fileName) => path.relative(pkg.root, fileName))
-      .filter(fileName => {
+      .filter((fileName) => {
         if (/(?:^|[\/\\])node_modules[\/\\]/.test(fileName)) {
           return false;
         }
 
         // Schematics template files.
-        if (pkgJson['schematics'] &&
-         (fileName.match(/(\/|\\)files(\/|\\)/) || fileName.match(/(\/|\\)\w+-files(\/|\\)/))) {
+        if (
+          pkgJson['schematics'] &&
+          (fileName.match(/(\/|\\)files(\/|\\)/) || fileName.match(/(\/|\\)\w+-files(\/|\\)/))
+        ) {
           return true;
         }
 
@@ -299,7 +280,7 @@ export default async function(
       });
 
     subSubLogger.info(`${resources.length} resources...`);
-    resources.forEach(fileName => {
+    resources.forEach((fileName) => {
       _copy(path.join(pkg.root, fileName), path.join(pkg.dist, fileName));
     });
   }
@@ -329,7 +310,7 @@ export default async function(
 
     specLogger.info(packageName);
     specLogger.info(`  ${files.length} spec files found...`);
-    files.forEach(fileName => _rm(fileName));
+    files.forEach((fileName) => _rm(fileName));
   }
 
   logger.info('Building ejs templates...');
@@ -345,7 +326,7 @@ export default async function(
 
     templateLogger.info(packageName);
     templateLogger.info(`  ${files.length} ejs files found...`);
-    files.forEach(fileName => {
+    files.forEach((fileName) => {
       const p = path.relative(
         path.dirname(__dirname),
         path.join(pkg.root, path.relative(pkg.dist, fileName)),
@@ -398,8 +379,8 @@ export default async function(
             const pkg = packages[depName];
             if (!pkg.snapshotRepo) {
               versionLogger.error(
-                `Package ${JSON.stringify(depName)} is not published as a snapshot. `
-                + `Fixing to current version ${v}.`,
+                `Package ${JSON.stringify(depName)} is not published as a snapshot. ` +
+                  `Fixing to current version ${v}.`,
               );
               obj[depName] = v;
             } else {
@@ -415,15 +396,19 @@ export default async function(
     fs.writeFileSync(packageJsonPath, JSON.stringify(packageJson, null, 2) + '\n');
   }
 
+  const output: { name: string; outputPath: string }[] = [];
   logger.info('Tarring all packages...');
   const tarLogger = logger.createChild('license');
-  Object.keys(packages).forEach(pkgName => {
+  Object.keys(packages).forEach((pkgName) => {
     const pkg = packages[pkgName];
     if (!pkg.private) {
       tarLogger.info(`${pkgName} => ${pkg.tar}`);
       _tar(pkg.tar, pkg.dist);
+      output.push({ name: pkgName, outputPath: pkg.dist });
     }
   });
 
   logger.info(`Done.`);
+
+  return output;
 }
diff --git a/scripts/changelog.ts b/scripts/changelog.ts
index 498fc98250be..17ac5a5260cf 100644
--- a/scripts/changelog.ts
+++ b/scripts/changelog.ts
@@ -1,25 +1,23 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use of this source code is governed by an MIT-style license that can be
  * found in the LICENSE file at https://angular.io/license
  */
-// tslint:disable:no-console
-// tslint:disable:no-implicit-dependencies
+
 import { JsonObject, logging } from '@angular-devkit/core';
 import { execSync } from 'child_process';
 import * as fs from 'fs';
 import * as path from 'path';
 import * as semver from 'semver';
+import { Transform } from 'stream';
 import { packages } from '../lib/packages';
 
-const changelogTemplate = require('./templates/changelog').default;
-
 const conventionalCommitsParser = require('conventional-commits-parser');
-const gitRawCommits = require('git-raw-commits');
 const ghGot = require('gh-got');
-const through = require('through2');
+const gitRawCommits = require('git-raw-commits');
+const changelogTemplate = require('./templates/changelog').default;
 
 export interface ChangelogOptions {
   from: string;
@@ -39,7 +37,7 @@ function exec(command: string, input?: string): string {
   }).trim();
 }
 
-export default async function(args: ChangelogOptions, logger: logging.Logger) {
+export default async function (args: ChangelogOptions, logger: logging.Logger) {
   const commits: JsonObject[] = [];
   let toSha: string | null = null;
 
@@ -78,24 +76,28 @@ export default async function(args: ChangelogOptions, logger: logging.Logger) {
     }
   }
 
-  return new Promise(resolve => {
-    (gitRawCommits({
-      from: args.from,
-      to: args.to || 'HEAD',
-      format: '%B%n-hash-%n%H%n-gitTags-%n%D%n-committerDate-%n%ci%n-authorName-%n%aN%n',
-    }) as NodeJS.ReadStream)
-      .on('error', err => {
+  return new Promise((resolve) => {
+    (
+      gitRawCommits({
+        from: args.from,
+        to: args.to || 'HEAD',
+        format: '%B%n-hash-%n%H%n-gitTags-%n%D%n-committerDate-%n%ci%n-authorName-%n%aN%n',
+      }) as NodeJS.ReadStream
+    )
+      .on('error', (err) => {
         logger.fatal('An error happened: ' + err.message);
         process.exit(1);
       })
       .pipe(
-        through((chunk: Buffer, enc: string, callback: Function) => {
-          // Replace github URLs with `@XYZ#123`
-          const commit = chunk
-            .toString('utf-8')
-            .replace(/https?:\/\/github.com\/(.*?)\/issues\/(\d+)/g, '@$1#$2');
-
-          callback(undefined, Buffer.from(commit));
+        new Transform({
+          transform(chunk, encoding, callback) {
+            // Replace github URLs with `@XYZ#123`
+            const commit = chunk
+              .toString('utf-8')
+              .replace(/https?:\/\/github.com\/(.*?)\/issues\/(\d+)/g, '@$1#$2');
+
+            callback(undefined, Buffer.from(commit));
+          },
         }),
       )
       .pipe(
@@ -108,22 +110,25 @@ export default async function(args: ChangelogOptions, logger: logging.Logger) {
         }),
       )
       .pipe(
-        through.obj((chunk: JsonObject, _: string, cb: Function) => {
-          try {
-            const maybeTag = chunk.gitTags && (chunk.gitTags as string).match(/tag: (.*)/);
-            const tags = maybeTag && maybeTag[1].split(/,/g);
-            chunk['tags'] = tags;
-
-            if (tags && tags.find(x => x == args.to)) {
-              toSha = chunk.hash as string;
-            }
-            if (!cherryPicked.has(chunk.hash as string)) {
-              commits.push(chunk);
+        new Transform({
+          objectMode: true,
+          transform(chunk: JsonObject, encoding, callback) {
+            try {
+              const maybeTag = chunk.gitTags && (chunk.gitTags as string).match(/tag: (.*)/);
+              const tags = maybeTag && maybeTag[1].split(/,/g);
+              chunk['tags'] = tags;
+
+              if (tags && tags.find((x) => x == args.to)) {
+                toSha = chunk.hash as string;
+              }
+              if (!cherryPicked.has(chunk.hash as string)) {
+                commits.push(chunk);
+              }
+              callback();
+            } catch (err) {
+              callback(err);
             }
-            cb();
-          } catch (err) {
-            cb(err);
-          }
+          },
         }),
       )
       .on('finish', resolve);
diff --git a/scripts/create.ts b/scripts/create.ts
index a54a527ddc2b..2c9a50e5e52b 100644
--- a/scripts/create.ts
+++ b/scripts/create.ts
@@ -1,11 +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
  */
-// tslint:disable:no-implicit-dependencies
+
+/* eslint-disable import/no-extraneous-dependencies, no-prototype-builtins */
 import { logging } from '@angular-devkit/core';
 import cli from '@angular/cli/lib/cli';
 import * as child_process from 'child_process';
@@ -37,7 +38,7 @@ async function _exec(
   const { status, error, stderr, stdout } = child_process.spawnSync(command, args, { ...opts });
 
   if (status != 0) {
-    logger.error(`Command failed: ${command} ${args.map(x => JSON.stringify(x)).join(', ')}`);
+    logger.error(`Command failed: ${command} ${args.map((x) => JSON.stringify(x)).join(', ')}`);
     if (error) {
       logger.error('Error: ' + (error ? error.message : 'undefined'));
     } else {
@@ -49,8 +50,7 @@ async function _exec(
   return { stdout };
 }
 
-
-export default async function(
+export default async function (
   args: CreateOptions,
   logger: logging.Logger,
   cwd: string,
diff --git a/scripts/dist-tag.ts b/scripts/dist-tag.ts
index de19b977952d..ecdf7488adac 100644
--- a/scripts/dist-tag.ts
+++ b/scripts/dist-tag.ts
@@ -1,14 +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
  */
 
-// tslint:disable: no-implicit-dependencies we import @angular-devkit/core but
-// it is not in package.json, which is fine, this is just a script.
-
 import { logging } from '@angular-devkit/core';
 import { execSync } from 'child_process';
 import { packages, stableToExperimentalVersion } from '../lib/packages';
@@ -43,7 +40,7 @@ interface DistTagOptions {
 /**
  * This function adds a tag to all public packages in the CLI repo.
  */
-export default function(args: Partial<DistTagOptions>, logger: logging.Logger) {
+export default function (args: Partial<DistTagOptions>, logger: logging.Logger) {
   if (args.help) {
     logger.info(`dist-tag adds a tag to all public packages in the CLI repo.
 
@@ -56,23 +53,25 @@ Usage:
 
     return;
   }
-  const {version, tag, registry: registryArg} = args;
+  const { version, tag, registry: registryArg } = args;
   if (!version || version.startsWith('v')) {
     throw new Error('Version must be specified in format d+.d+.d+');
   }
   if (version.startsWith('0')) {
-    throw new Error(`Major version must be > 0, did you mean ${stableToExperimentalVersion(version)}?`);
+    throw new Error(
+      `Major version must be > 0, did you mean ${stableToExperimentalVersion(version)}?`,
+    );
   }
   if (!tag) {
     throw new Error('Tag must be non-empty, for example: latest, next, v10-lts, etc');
   }
   const registry = registryArg ?? wombat;
-  const publicPackages = Object.values(packages).filter(p => !p.private);
-  for (const {name, experimental} of publicPackages) {
+  const publicPackages = Object.values(packages).filter((p) => !p.private);
+  for (const { name, experimental } of publicPackages) {
     const actualVersion = experimental ? stableToExperimentalVersion(version) : version;
     // See https://docs.npmjs.com/cli/dist-tag for documentation
     const cmd = `npm dist-tag add '${name}@${actualVersion}' '${tag}' --registry '${registry}'`;
-    logger.debug(cmd);  // print debug output by specifying --verbose
+    logger.debug(cmd); // print debug output by specifying --verbose
     const output = execSync(cmd, { encoding: 'utf8' });
     logger.info(output.trim());
   }
diff --git a/scripts/packages.ts b/scripts/packages.ts
index 8dcf0e649899..19a90deee5ca 100644
--- a/scripts/packages.ts
+++ b/scripts/packages.ts
@@ -1,27 +1,32 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use 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');
 
-
-export default function(args: { json: boolean, version: boolean, releaseCheck: boolean }, logger: logging.Logger) {
-
+export default function (
+  args: { json: boolean; version: boolean; releaseCheck: boolean },
+  logger: logging.Logger,
+) {
   if (args.releaseCheck) {
-    const {version: root} = loadRootPackageJson();
+    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(
+      `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 => {
+        .filter((name) => !packages[name].private)
+        .map((name) => {
           let result = colors.red(colors.symbols.cross);
           const version = packages[name].version;
           if ([root, experimental].includes(version)) {
@@ -30,20 +35,22 @@ export default function(args: { json: boolean, version: boolean, releaseCheck: b
 
           return ` ${result}  ${name}@${packages[name].version}`;
         })
-        .join('\n'));
+        .join('\n'),
+    );
   } else if (args.json) {
     logger.info(JSON.stringify(packages, null, 2));
   } else {
     logger.info(
       Object.keys(packages)
-        .filter(name => !packages[name].private)
-        .map(name => {
+        .filter((name) => !packages[name].private)
+        .map((name) => {
           if (args.version) {
             return `${name}@${packages[name].version}`;
           } else {
             return name;
           }
         })
-        .join('\n'));
+        .join('\n'),
+    );
   }
 }
diff --git a/scripts/publish.ts b/scripts/publish.ts
index 0f6cedde9bcb..c8f72a54135a 100644
--- a/scripts/publish.ts
+++ b/scripts/publish.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
  */
-// tslint:disable:no-implicit-dependencies
+
 import { logging, tags } from '@angular-devkit/core';
 import { spawnSync } from 'child_process';
 import * as semver from 'semver';
@@ -30,7 +30,7 @@ function _exec(command: string, args: string[], opts: { cwd?: string }, logger:
   const { status, error, stderr, stdout } = spawnSync(command, args, { ...opts });
 
   if (status != 0) {
-    logger.error(`Command failed: ${command} ${args.map(x => JSON.stringify(x)).join(', ')}`);
+    logger.error(`Command failed: ${command} ${args.map((x) => JSON.stringify(x)).join(', ')}`);
     if (error) {
       logger.error('Error: ' + (error ? error.message : 'undefined'));
     } else {
@@ -60,24 +60,22 @@ function _tagCheck(tag: string) {
   `);
 }
 
-
 function _branchCheck(args: PublishArgs, logger: logging.Logger) {
   logger.info('Checking branch...');
   const ref = _exec('git', ['symbolic-ref', 'HEAD'], {}, logger);
   const branch = ref.trim().replace(/^refs\/heads\//, '');
 
   switch (branch) {
-    case 'master':
+    case 'main':
       if (args.tag !== 'next') {
         throw new Error(tags.oneLine`
-          Releasing from master requires a next tag. Use --no-branchCheck to
+          Releasing from main requires a next tag. Use --no-branchCheck to
           skip this check.
         `);
       }
   }
 }
 
-
 function _versionCheck(args: PublishArgs, logger: logging.Logger) {
   logger.info('Checking version...');
   // Find _any_ version that's beta or RC.
@@ -135,27 +133,36 @@ export default async function (args: PublishArgs, logger: logging.Logger) {
   logger.info('Building...');
   await build({}, logger.createChild('build'));
 
-  return Object.keys(packages).reduce((acc: Promise<void>, name: string) => {
-    const pkg = packages[name];
-    if (pkg.packageJson['private']) {
-      logger.debug(`${name} (private)`);
+  return Object.keys(packages)
+    .reduce((acc: Promise<void>, name: string) => {
+      const pkg = packages[name];
+      if (pkg.packageJson['private']) {
+        logger.debug(`${name} (private)`);
 
-      return acc;
-    }
+        return acc;
+      }
 
-    return acc
-      .then(() => {
-        logger.info(name);
-
-        const publishArgs = [ 'publish', '--tag', tag, '--registry', registry ];
-
-        return _exec('npm', publishArgs, {
-          cwd: pkg.dist,
-        }, logger);
-      })
-      .then((stdout: string) => {
-        logger.info(stdout);
-      });
-  }, Promise.resolve())
-  .then(() => logger.info('done'), (err: Error) => logger.fatal(err.message));
+      return acc
+        .then(() => {
+          logger.info(name);
+
+          const publishArgs = ['publish', '--tag', tag, '--registry', registry];
+
+          return _exec(
+            'npm',
+            publishArgs,
+            {
+              cwd: pkg.dist,
+            },
+            logger,
+          );
+        })
+        .then((stdout: string) => {
+          logger.info(stdout);
+        });
+    }, Promise.resolve())
+    .then(
+      () => logger.info('done'),
+      (err: Error) => logger.fatal(err.message),
+    );
 }
diff --git a/scripts/snapshots.ts b/scripts/snapshots.ts
index 2c65de4b083f..73744128e8d8 100644
--- a/scripts/snapshots.ts
+++ b/scripts/snapshots.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
  */
-// tslint:disable:no-implicit-dependencies
+
 import { logging } from '@angular-devkit/core';
 import { execSync, spawnSync } from 'child_process';
 import * as fs from 'fs';
@@ -15,7 +15,6 @@ import { PackageInfo, packages } from '../lib/packages';
 import build from './build';
 import create from './create';
 
-
 // Added to the README.md of the snapshot. This is markdown.
 const readmeHeaderFn = (pkg: PackageInfo) => `
 # Snapshot build of ${pkg.name}
@@ -35,24 +34,21 @@ npm install git+https://github.com/${pkg.snapshotRepo}.git
 ----
 `;
 
-
 function _copy(from: string, to: string) {
-  fs.readdirSync(from)
-    .forEach(name => {
-      const fromPath = path.join(from, name);
-      const toPath = path.join(to, name);
-      if (fs.statSync(fromPath).isDirectory()) {
-        if (!fs.existsSync(toPath)) {
-          fs.mkdirSync(toPath);
-        }
-        _copy(fromPath, toPath);
-      } else {
-        fs.writeFileSync(toPath, fs.readFileSync(fromPath));
+  fs.readdirSync(from).forEach((name) => {
+    const fromPath = path.join(from, name);
+    const toPath = path.join(to, name);
+    if (fs.statSync(fromPath).isDirectory()) {
+      if (!fs.existsSync(toPath)) {
+        fs.mkdirSync(toPath);
       }
-    });
+      _copy(fromPath, toPath);
+    } else {
+      fs.writeFileSync(toPath, fs.readFileSync(fromPath));
+    }
+  });
 }
 
-
 function _exec(command: string, args: string[], opts: { cwd?: string }, logger: logging.Logger) {
   const { status, error, stdout } = spawnSync(command, args, {
     stdio: ['ignore', 'pipe', 'inherit'],
@@ -60,7 +56,7 @@ function _exec(command: string, args: string[], opts: { cwd?: string }, logger:
   });
 
   if (status != 0) {
-    logger.error(`Command failed: ${command} ${args.map(x => JSON.stringify(x)).join(', ')}`);
+    logger.error(`Command failed: ${command} ${args.map((x) => JSON.stringify(x)).join(', ')}`);
     throw error;
   }
 
@@ -101,7 +97,7 @@ async function _publishSnapshot(
 
   // Clear snapshot directory before publishing to remove deleted build files.
   try {
-    _exec('git', ['rm', '-rf', './'], {cwd: destPath}, publishLogger);
+    _exec('git', ['rm', '-rf', './'], { cwd: destPath }, publishLogger);
   } catch {
     // Ignore errors on delete. :shrug:
   }
@@ -132,7 +128,6 @@ async function _publishSnapshot(
   _exec('git', ['push', '--tags', 'origin', branch], { cwd: destPath }, publishLogger);
 }
 
-
 export interface SnapshotsOptions {
   force?: boolean;
   githubTokenFile?: string;
@@ -140,7 +135,7 @@ export interface SnapshotsOptions {
   branch?: string;
 }
 
-export default async function(opts: SnapshotsOptions, logger: logging.Logger) {
+export default async function (opts: SnapshotsOptions, logger: logging.Logger) {
   // Get the SHA.
   if (execSync(`git status --porcelain`).toString() && !opts.force) {
     logger.error('You cannot run snapshots with local changes.');
@@ -149,7 +144,7 @@ export default async function(opts: SnapshotsOptions, logger: logging.Logger) {
 
   const root = fs.mkdtempSync(path.join(os.tmpdir(), 'angular-cli-publish-'));
   const message = execSync(`git log --format="%h %s" -n1`).toString().trim();
-  let branch = opts.branch || 'master';
+  let branch = opts.branch || 'main';
 
   // CIRCLE_BRANCH
   if (typeof process.env['CIRCLE_BRANCH'] == 'string') {
@@ -157,9 +152,9 @@ export default async function(opts: SnapshotsOptions, logger: logging.Logger) {
   }
 
   const githubToken = (
-    opts.githubToken
-    || (opts.githubTokenFile && fs.readFileSync(opts.githubTokenFile, 'utf-8'))
-    || ''
+    opts.githubToken ||
+    (opts.githubTokenFile && fs.readFileSync(opts.githubTokenFile, 'utf-8')) ||
+    ''
   ).trim();
 
   if (githubToken) {
diff --git a/scripts/templates.ts b/scripts/templates.ts
index e0d22c303af7..5fd28baecabf 100644
--- a/scripts/templates.ts
+++ b/scripts/templates.ts
@@ -1,16 +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
  */
-// tslint:disable:no-implicit-dependencies
+
 import { logging } from '@angular-devkit/core';
 import * as fs from 'fs';
 import * as path from 'path';
 
-
 function _runTemplate(inputPath: string, outputPath: string, logger: logging.Logger) {
   inputPath = path.resolve(__dirname, inputPath);
   outputPath = path.resolve(__dirname, outputPath);
@@ -27,7 +26,7 @@ function _runTemplate(inputPath: string, outputPath: string, logger: logging.Log
   fs.writeFileSync(outputPath, content, 'utf-8');
 }
 
-export default async function(_options: {}, logger: logging.Logger): Promise<number> {
+export default async function (_options: {}, logger: logging.Logger): Promise<number> {
   _runTemplate('./templates/readme', '../README.md', logger);
   _runTemplate('./templates/contributing', '../CONTRIBUTING.md', logger);
 
diff --git a/scripts/templates/contributing.ejs b/scripts/templates/contributing.ejs
index 913fe2112308..148b14443664 100644
--- a/scripts/templates/contributing.ejs
+++ b/scripts/templates/contributing.ejs
@@ -281,18 +281,18 @@ To test if your change effect the public API you need to run the API guardian on
 For example in case `@angular-devkit/core` package was modified you need to run:
 
 ```bash
-yarn bazel test //etc/api:angular_devkit_core_api
+yarn bazel test //goldens/public-api:angular_devkit_core_api
 ```
 
 You can also test all packages by running:
 ```bash
-yarn bazel test //etc/api ...
+yarn bazel test //goldens/public-api ...
 ```
 
 If you modified the public API, the test will fail. To update the golden files you need to run:
 
 ```bash
-yarn bazel run //etc/api:angular_devkit_core_api.accept
+yarn bazel run //goldens/public-api:angular_devkit_core_api.accept
 ```
 
 **Note**: In some cases we use aliased symbols to create namespaces.
diff --git a/scripts/templates/readme.ejs b/scripts/templates/readme.ejs
index 5ceccecf322f..fa99b54cbcb8 100644
--- a/scripts/templates/readme.ejs
+++ b/scripts/templates/readme.ejs
@@ -57,7 +57,7 @@ To get started locally, follow these instructions:
 
 1. If you haven't done it already, [make a fork of this repo](https://github.com/angular/angular-cli/fork).
 1. Clone to your local computer using `git`.
-1. Make sure that you have Node 10.13 or later installed. See instructions [here](https://nodejs.org/en/download/).
+1. Make sure that you have Node 12.14 or 14.0 installed. See instructions [here](https://nodejs.org/en/download/).
 1. Make sure that you have `yarn` installed; see instructions [here](https://yarnpkg.com/lang/en/docs/install/).
 1. Run `yarn` (no arguments) from the root of your clone of this project to install dependencies.
 
diff --git a/scripts/test.ts b/scripts/test.ts
index ece418e6e9d4..941a6e3628c1 100644
--- a/scripts/test.ts
+++ b/scripts/test.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
  */
-// tslint:disable:no-console
-// tslint:disable:no-implicit-dependencies
+
 import { logging } from '@angular-devkit/core';
 import { execSync, spawnSync } from 'child_process';
-import * as glob from 'glob';
-import 'jasmine';
+import glob from 'glob';
 import { SpecReporter as JasmineSpecReporter, StacktraceOption } from 'jasmine-spec-reporter';
 import { ParsedArgs } from 'minimist';
 import { join, normalize, relative } from 'path';
@@ -38,7 +36,7 @@ function _exec(command: string, args: string[], opts: { cwd?: string }, logger:
   });
 
   if (status != 0) {
-    logger.error(`Command failed: ${command} ${args.map(x => JSON.stringify(x)).join(', ')}`);
+    logger.error(`Command failed: ${command} ${args.map((x) => JSON.stringify(x)).join(', ')}`);
     throw error;
   }
 
@@ -81,12 +79,12 @@ runner.onComplete((success: boolean) => {
 
 glob
   .sync('packages/**/*.spec.ts')
-  .filter(p => !/\/schematics\/.*\/(other-)?files\//.test(p))
-  .forEach(path => {
+  .filter((p) => !/\/schematics\/.*\/(other-)?files\//.test(p))
+  .forEach((path) => {
     console.error(`Invalid spec file name: ${path}. You're using the old convention.`);
   });
 
-export default function(args: ParsedArgs, logger: logging.Logger) {
+export default function (args: ParsedArgs, logger: logging.Logger) {
   const specGlob = '*_spec.ts';
   const regex = args.glob ? args.glob : `packages/**/${specGlob}`;
 
@@ -103,19 +101,19 @@ export default function(args: ParsedArgs, logger: logging.Logger) {
   }
 
   // Run the tests.
-  const allTests = glob.sync(regex).map(p => relative(projectBaseDir, p));
+  const allTests = glob.sync(regex).map((p) => relative(projectBaseDir, p));
 
   const tsConfigPath = join(__dirname, '../tsconfig.json');
-  const tsConfig = ts.readConfigFile(tsConfigPath, ts.sys.readFile);
+  const tsConfig = ts.readConfigFile(tsConfigPath, ts.sys.readFile.bind(ts.sys));
   const pattern =
     '^(' +
     (tsConfig.config.exclude as string[])
       .map(
-        ex =>
+        (ex) =>
           '(' +
           ex
             .split(/[\/\\]/g)
-            .map(f =>
+            .map((f) =>
               f
                 .replace(/[\-\[\]{}()+?.^$|]/g, '\\$&')
                 .replace(/^\*\*/g, '(.+?)?')
@@ -127,40 +125,34 @@ export default function(args: ParsedArgs, logger: logging.Logger) {
       .join('|') +
     ')($|/|\\\\)';
   const excludeRe = new RegExp(pattern);
-  let tests = allTests.filter(x => !excludeRe.test(x));
+  let tests = allTests.filter((x) => !excludeRe.test(x));
 
   if (!args.full) {
     // Find the point where this branch merged with master.
     const branch = _exec('git', ['rev-parse', '--abbrev-ref', 'HEAD'], {}, logger).trim();
-    const masterRevList = _exec('git', ['rev-list', 'master'], {}, logger)
-      .trim()
-      .split('\n');
-    const branchRevList = _exec('git', ['rev-list', branch], {}, logger)
-      .trim()
-      .split('\n');
-    const sha = branchRevList.find(s => masterRevList.includes(s));
+    const masterRevList = _exec('git', ['rev-list', 'master'], {}, logger).trim().split('\n');
+    const branchRevList = _exec('git', ['rev-list', branch], {}, logger).trim().split('\n');
+    const sha = branchRevList.find((s) => masterRevList.includes(s));
 
     if (sha) {
       const diffFiles = [
         // Get diff between $SHA and HEAD.
-        ..._exec('git', ['diff', sha, 'HEAD', '--name-only'], {}, logger)
-          .trim()
-          .split('\n'),
+        ..._exec('git', ['diff', sha, 'HEAD', '--name-only'], {}, logger).trim().split('\n'),
         // And add the current status to it (so it takes the non-committed changes).
         ..._exec('git', ['status', '--short', '--show-stash'], {}, logger)
           .split('\n')
-          .map(x => x.slice(2).trim()),
+          .map((x) => x.slice(2).trim()),
       ]
-        .map(x => normalize(x))
-        .filter(x => x !== '.' && x !== ''); // Empty paths will be normalized to dot.
+        .map((x) => normalize(x))
+        .filter((x) => x !== '.' && x !== ''); // Empty paths will be normalized to dot.
 
       const diffPackages = new Set();
       for (const pkgName of Object.keys(packages)) {
         const relativeRoot = relative(projectBaseDir, packages[pkgName].root);
-        if (diffFiles.some(x => x.startsWith(relativeRoot))) {
+        if (diffFiles.some((x) => x.startsWith(relativeRoot))) {
           diffPackages.add(pkgName);
           // Add all reverse dependents too.
-          packages[pkgName].reverseDependencies.forEach(d => diffPackages.add(d));
+          packages[pkgName].reverseDependencies.forEach((d) => diffPackages.add(d));
         }
       }
 
@@ -169,8 +161,8 @@ export default function(args: ParsedArgs, logger: logging.Logger) {
       logger.info(JSON.stringify([...diffPackages], null, 2));
 
       // Remove the tests from packages that haven't changed.
-      tests = tests.filter(p =>
-        Object.keys(packages).some(name => {
+      tests = tests.filter((p) =>
+        Object.keys(packages).some((name) => {
           const relativeRoot = relative(projectBaseDir, packages[name].root);
 
           return p.startsWith(relativeRoot) && diffPackages.has(name);
@@ -187,7 +179,9 @@ export default function(args: ParsedArgs, logger: logging.Logger) {
   }
 
   // Filter in/out flakes according to the --flakey flag.
-  tests = tests.filter(test => !!args.flakey == knownFlakes.includes(test.replace(/[\/\\]/g, '/')));
+  tests = tests.filter(
+    (test) => !!args.flakey == knownFlakes.includes(test.replace(/[\/\\]/g, '/')),
+  );
 
   if (args.shard !== undefined) {
     // Remove tests that are not part of this shard.
@@ -196,7 +190,7 @@ export default function(args: ParsedArgs, logger: logging.Logger) {
     tests = tests.filter((name, i) => i % nbShards == shardId);
   }
 
-  return new Promise(resolve => {
+  return new Promise((resolve) => {
     runner.onComplete((passed: boolean) => resolve(passed ? 0 : 1));
     if (args.seed != undefined) {
       runner.seed(args.seed);
diff --git a/scripts/validate-build-files.ts b/scripts/validate-build-files.ts
index f9d1388b6175..9d0dac9f2d8d 100644
--- a/scripts/validate-build-files.ts
+++ b/scripts/validate-build-files.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
  */
-// tslint:disable:no-implicit-dependencies
+
 import { logging, tags } from '@angular-devkit/core';
 import { existsSync } from 'fs';
 import { join } from 'path';
diff --git a/scripts/validate-licenses.ts b/scripts/validate-licenses.ts
index d4af21f98cad..c6a34b544bf1 100644
--- a/scripts/validate-licenses.ts
+++ b/scripts/validate-licenses.ts
@@ -1,20 +1,21 @@
 /**
  * @license
- * Copyright Google Inc. All Rights Reserved.
+ * Copyright Google LLC All Rights Reserved.
  *
  * Use 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 { JsonObject, logging } from '@angular-devkit/core';
 import * as path from 'path';
 import { packages } from '../lib/packages';
 
+// eslint-disable-next-line import/no-unassigned-import
 require('../lib/bootstrap-local');
 
+const checker = require('license-checker');
 const spdxSatisfies = require('spdx-satisfies');
 
-
 /**
  * A general note on some black listed specific licenses:
  * - CC0
@@ -65,10 +66,9 @@ const licenseReplacements: { [key: string]: string } = {
 // Specific packages to ignore, add a reason in a comment. Format: package-name@version.
 const ignoredPackages = [
   // Us.
-  '@angular/devkit-repo@0.0.0',  // Hey, that's us!
+  '@angular/devkit-repo@0.0.0', // Hey, that's us!
   // * Development only
-  'spdx-license-ids@3.0.5',  // CC0 but it's content only (index.json, no code) and not distributed.
-  'tslint-sonarts@1.9.0', // LGPL-3.0 but only used as a tool, not linked in the build.
+  'spdx-license-ids@3.0.5', // CC0 but it's content only (index.json, no code) and not distributed.
 
   // * Broken license fields
   'pako@1.0.11', // MIT but broken license in package.json
@@ -85,8 +85,6 @@ for (const packageName of Object.keys(packages)) {
 }
 
 // Find all folders directly under a `node_modules` that have a package.json.
-const checker = require('license-checker');
-
 
 // Check if a license is accepted by an array of accepted licenses
 function _passesSpdx(licenses: string[], accepted: string[]) {
@@ -97,42 +95,44 @@ function _passesSpdx(licenses: string[], accepted: string[]) {
   }
 }
 
-
 export default function (_options: {}, logger: logging.Logger): Promise<number> {
-  return new Promise(resolve => {
-    checker.init({ start: path.join(__dirname, '..'), excludePrivatePackages: true }, (err: Error, json: JsonObject) => {
-      if (err) {
-        logger.fatal(`Something happened:\n${err.message}`);
-        resolve(1);
-      } else {
-        logger.info(`Testing ${Object.keys(json).length} packages.\n`);
-
-        // Packages with bad licenses are those that neither pass SPDX nor are ignored.
-        const badLicensePackages = Object.keys(json)
-          .map(key => ({
-            id: key,
-            licenses: ([] as string[])
-              .concat((json[key] as JsonObject).licenses as string[])
-              // `*` is used when the license is guessed.
-              .map(x => x.replace(/\*$/, ''))
-              .map(x => x in licenseReplacements ? licenseReplacements[x] : x),
-          }))
-          .filter(pkg => !_passesSpdx(pkg.licenses, allowedLicenses))
-          .filter(pkg => !ignoredPackages.find(ignored => ignored === pkg.id));
-
-        // Report packages with bad licenses
-        if (badLicensePackages.length > 0) {
-          logger.error('Invalid package licences found:');
-          badLicensePackages.forEach(pkg => {
-            logger.error(`${pkg.id}: ${JSON.stringify(pkg.licenses)}`);
-          });
-          logger.fatal(`\n${badLicensePackages.length} total packages with invalid licenses.`);
-          resolve(2);
+  return new Promise((resolve) => {
+    checker.init(
+      { start: path.join(__dirname, '..'), excludePrivatePackages: true },
+      (err: Error, json: JsonObject) => {
+        if (err) {
+          logger.fatal(`Something happened:\n${err.message}`);
+          resolve(1);
         } else {
-          logger.info('All package licenses are valid.');
-          resolve(0);
+          logger.info(`Testing ${Object.keys(json).length} packages.\n`);
+
+          // Packages with bad licenses are those that neither pass SPDX nor are ignored.
+          const badLicensePackages = Object.keys(json)
+            .map((key) => ({
+              id: key,
+              licenses: ([] as string[])
+                .concat((json[key] as JsonObject).licenses as string[])
+                // `*` is used when the license is guessed.
+                .map((x) => x.replace(/\*$/, ''))
+                .map((x) => (x in licenseReplacements ? licenseReplacements[x] : x)),
+            }))
+            .filter((pkg) => !_passesSpdx(pkg.licenses, allowedLicenses))
+            .filter((pkg) => !ignoredPackages.find((ignored) => ignored === pkg.id));
+
+          // Report packages with bad licenses
+          if (badLicensePackages.length > 0) {
+            logger.error('Invalid package licences found:');
+            badLicensePackages.forEach((pkg) => {
+              logger.error(`${pkg.id}: ${JSON.stringify(pkg.licenses)}`);
+            });
+            logger.fatal(`\n${badLicensePackages.length} total packages with invalid licenses.`);
+            resolve(2);
+          } else {
+            logger.info('All package licenses are valid.');
+            resolve(0);
+          }
         }
-      }
-    });
+      },
+    );
   });
 }
diff --git a/scripts/validate-user-analytics.ts b/scripts/validate-user-analytics.ts
index 725e2447ec81..754a1a3b13c8 100644
--- a/scripts/validate-user-analytics.ts
+++ b/scripts/validate-user-analytics.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
  */
-// tslint:disable:no-implicit-dependencies
+
 import { analytics, logging, tags } from '@angular-devkit/core';
 import { spawnSync } from 'child_process';
 import * as fs from 'fs';
@@ -30,7 +30,7 @@ function _exec(command: string, args: string[], opts: { cwd?: string }, logger:
   });
 
   if (status != 0) {
-    logger.error(`Command failed: ${command} ${args.map(x => JSON.stringify(x)).join(', ')}`);
+    logger.error(`Command failed: ${command} ${args.map((x) => JSON.stringify(x)).join(', ')}`);
     throw error;
   }
 
@@ -38,7 +38,7 @@ function _exec(command: string, args: string[], opts: { cwd?: string }, logger:
 }
 
 async function _checkDimensions(dimensionsTable: string, logger: logging.Logger) {
-  const data: { userAnalytics: number, type: string, name: string }[] = new Array(200);
+  const data: { userAnalytics: number; type: string; name: string }[] = new Array(200);
 
   function _updateData(userAnalytics: number, name: string, type: string) {
     if (data[userAnalytics]) {
@@ -59,11 +59,11 @@ async function _checkDimensions(dimensionsTable: string, logger: logging.Logger)
 
   // Create the data with dimensions missing from schema.json:
   const allFixedDimensions = Object.keys(analytics.NgCliAnalyticsDimensions)
-  // tslint:disable-next-line:no-any
-    .filter(x => typeof analytics.NgCliAnalyticsDimensions[x as any] === 'number');
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    .filter((x) => typeof analytics.NgCliAnalyticsDimensions[x as any] === 'number');
 
   for (const name of allFixedDimensions) {
-    // tslint:disable-next-line:no-any
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const userAnalytics = analytics.NgCliAnalyticsDimensions[name as any];
     if (!(name in analytics.NgCliAnalyticsDimensionsFlagInfo)) {
       throw new Error(
@@ -80,7 +80,6 @@ async function _checkDimensions(dimensionsTable: string, logger: logging.Logger)
     _updateData(userAnalytics, flagName, type);
   }
 
-
   // Creating a new project and reading the help.
   logger.info('Creating temporary project for gathering help...');
 
@@ -133,7 +132,7 @@ async function _checkDimensions(dimensionsTable: string, logger: logging.Logger)
 }
 
 async function _checkMetrics(metricsTable: string, logger: logging.Logger) {
-  const data: { userAnalytics: number, type: string, name: string }[] = new Array(200);
+  const data: { userAnalytics: number; type: string; name: string }[] = new Array(200);
 
   function _updateData(userAnalytics: number, name: string, type: string) {
     if (data[userAnalytics]) {
@@ -154,11 +153,11 @@ async function _checkMetrics(metricsTable: string, logger: logging.Logger) {
 
   // Create the data with dimensions missing from schema.json:
   const allFixedMetrics = Object.keys(analytics.NgCliAnalyticsMetrics)
-  // tslint:disable-next-line:no-any
-    .filter(x => typeof analytics.NgCliAnalyticsMetrics[x as any] === 'number');
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    .filter((x) => typeof analytics.NgCliAnalyticsMetrics[x as any] === 'number');
 
   for (const name of allFixedMetrics) {
-    // tslint:disable-next-line:no-any
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
     const userAnalytics = analytics.NgCliAnalyticsMetrics[name as any];
     if (!(name in analytics.NgCliAnalyticsMetricsFlagInfo)) {
       throw new Error(
diff --git a/scripts/validate.ts b/scripts/validate.ts
index da0b0bae1c51..552a3d25931d 100644
--- a/scripts/validate.ts
+++ b/scripts/validate.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
  */
-// tslint:disable:no-implicit-dependencies
+
 import { logging, tags } from '@angular-devkit/core';
 import { execSync } from 'child_process';
 import templates from './templates';
@@ -40,18 +40,16 @@ export default async function (options: { verbose: boolean }, logger: logging.Lo
 
   logger.info('');
   logger.info('Running license validation...');
-  error = await validateLicenses({}, logger.createChild('validate-commits')) != 0
-       || error;
+  error = (await validateLicenses({}, logger.createChild('validate-commits'))) != 0 || error;
 
   logger.info('');
   logger.info('Running BUILD files validation...');
-  error = await validateBuildFiles({}, logger.createChild('validate-build-files')) != 0
-       || error;
+  error = (await validateBuildFiles({}, logger.createChild('validate-build-files'))) != 0 || error;
 
   logger.info('');
   logger.info('Running User Analytics validation...');
-  error = await validateUserAnalytics({}, logger.createChild('validate-user-analytics')) != 0
-    || error;
+  error =
+    (await validateUserAnalytics({}, logger.createChild('validate-user-analytics'))) != 0 || error;
 
   if (error) {
     return 101;
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..5665ab79fe95 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,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
  */
+
 // tslint:disable:no-any
 import { schema } from '@angular-devkit/core';
 
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..2148dd908c9f 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,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
  */
+
 // tslint:disable:no-any
 import { schema } from '@angular-devkit/core';
 
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 84a9e6d67f34..3a22c614f601 100644
--- a/tests/angular_devkit/core/json/schema/serializers/schema_benchmark.json
+++ b/tests/angular_devkit/core/json/schema/serializers/schema_benchmark.json
@@ -176,15 +176,13 @@
                     }
                   },
                   "additionalProperties": true,
-                  "required": [
-                    "input"
-                  ]
+                  "required": ["input"]
                 }
               ]
             },
             "additionalProperties": false
           },
-          "environmentSource":{
+          "environmentSource": {
             "description": "Source file for environment config.",
             "type": "string"
           },
@@ -260,9 +258,7 @@
             "default": []
           }
         },
-        "required": [
-          "project"
-        ],
+        "required": ["project"],
         "additionalProperties": false
       }
     },
@@ -511,19 +507,16 @@
               "description": "The host the application will be served on.",
               "type": "string",
               "default": "localhost"
-
             },
             "ssl": {
               "description": "Enables ssl for the application.",
               "type": "boolean",
               "default": false
-
             },
             "sslKey": {
               "description": "The ssl key used by the server.",
               "type": "string",
               "default": "ssl/server.key"
-
             },
             "sslCert": {
               "description": "The ssl certificate used by the server.",
@@ -558,7 +551,7 @@
     },
     "packageManager": {
       "description": "Specify which package manager tool to use.",
-      "enum": [ "npm", "cnpm", "yarn", "default" ],
+      "enum": ["npm", "cnpm", "yarn", "default"],
       "default": "default",
       "type": "string"
     },
diff --git a/tests/angular_devkit/core/node/jobs/add.ts b/tests/angular_devkit/core/node/jobs/add.ts
index c271d8cfd031..1529ab48bae0 100644
--- a/tests/angular_devkit/core/node/jobs/add.ts
+++ b/tests/angular_devkit/core/node/jobs/add.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
  */
+
 // tslint:disable:no-global-tslint-disable
 // tslint:disable:no-implicit-dependencies
 import { experimental } from '@angular-devkit/core';
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..db1cd55d135c 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,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
  */
+
 // tslint:disable-next-line:no-implicit-dependencies
 import { SchematicContext, Tree } from '@angular-devkit/schematics';
 
@@ -17,4 +18,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..325837305126 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,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
  */
+
 // tslint:disable-next-line:no-implicit-dependencies
 import { SchematicContext, Tree } from '@angular-devkit/schematics';
 
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..1012977b1996 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,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
  */
-
 export default function() {
   return () => {};
 }
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 95f91bb566d9..01cdeaeb3657 100644
--- a/tests/legacy-cli/e2e/assets/webpack/test-app/package.json
+++ b/tests/legacy-cli/e2e/assets/webpack/test-app/package.json
@@ -16,10 +16,9 @@
     "zone.js": "^0.11.4"
   },
   "devDependencies": {
-    "raw-loader": "^4.0.2",
     "sass": "^1.32.8",
     "sass-loader": "^11.0.1",
-    "typescript": "~4.2.3",
+    "typescript": "~4.3.2",
     "webpack": "^5.27.0",
     "webpack-cli": "^4.5.0"
   }
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 c5188e27fe88..572defb0ff6a 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
@@ -3,25 +3,23 @@ const path = require('path');
 
 module.exports = {
   resolve: {
-    extensions: ['.ts', '.js']
+    extensions: ['.ts', '.js'],
   },
   entry: './app/main.ts',
   output: {
     path: path.resolve('./dist'),
     publicPath: 'dist/',
-    filename: 'app.main.js'
+    filename: 'app.main.js',
   },
-  plugins: [
-    new ngToolsWebpack.ivy.AngularWebpackPlugin(),
-  ],
+  plugins: [new ngToolsWebpack.AngularWebpackPlugin()],
   module: {
     rules: [
-      { test: /\.scss$/, use: ['raw-loader', 'sass-loader'] },
-      { test: /\.html$/, loader: 'raw-loader' },
-      { test: /\.ts$/, loader: ngToolsWebpack.ivy.AngularWebpackLoaderPath }
-    ]
+      { test: /\.scss$/, use: ['sass-loader'], type: 'asset/source' },
+      { test: /\.html$/, type: 'asset/source' },
+      { test: /\.ts$/, loader: ngToolsWebpack.AngularWebpackLoaderPath },
+    ],
   },
   devServer: {
-    historyApiFallback: true
-  }
+    historyApiFallback: true,
+  },
 };
diff --git a/tests/legacy-cli/e2e/ng-snapshot/package.json b/tests/legacy-cli/e2e/ng-snapshot/package.json
index 3381dea21779..0381c00d76bf 100644
--- a/tests/legacy-cli/e2e/ng-snapshot/package.json
+++ b/tests/legacy-cli/e2e/ng-snapshot/package.json
@@ -2,20 +2,21 @@
   "description": "snapshot versions of Angular for e2e testing",
   "private": true,
   "dependencies": {
-    "@angular/animations": "github:angular/animations-builds#45d6085a479bf35788c571e73e0aa764b53fbae0",
-    "@angular/cdk": "github:angular/cdk-builds#4fe40f1ab0af5cb47b79e1b0067639855d0d1f9d",
-    "@angular/common": "github:angular/common-builds#22afb6f6e0d7b20d823a4f464a0a13ca2e4bc628",
-    "@angular/compiler": "github:angular/compiler-builds#f95431d295787b91e902eb0d1d705d9589d2a16e",
-    "@angular/compiler-cli": "github:angular/compiler-cli-builds#39064bf9a1436e63dddf629405c36167560e8050",
-    "@angular/core": "github:angular/core-builds#9440baa37331bd598aa15c8656556131df8f7e0a",
-    "@angular/forms": "github:angular/forms-builds#60068dd8b558d5310fbd9ca12b588196617a5355",
-    "@angular/language-service": "github:angular/language-service-builds#fa45a9cb5d470b41c4cf3113868480e1bae8c121",
-    "@angular/localize": "github:angular/localize-builds#d125486febb9e0116969c60d59ed62f85f825900",
-    "@angular/material": "github:angular/material2-builds#94e53ad22af2c206d0dfb119539fcd4904cc69a4",
-    "@angular/material-moment-adapter": "github:angular/material-moment-adapter-builds#35e04525433fc31afeaecbaf7c534b1d634e2631",
-    "@angular/platform-browser": "github:angular/platform-browser-builds#2883e8ab2e1f0dbaca811bd8472a03ea30587aa6",
-    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#ecaf6a615401c83422b2b081456533d0912989a5",
-    "@angular/platform-server": "github:angular/platform-server-builds#9d770b87ea8b66d10d596245ba120ed3d1847273",
-    "@angular/router": "github:angular/router-builds#776ced59b6bcf492943d8adddc757408e523bfed"
+    "@angular/animations": "github:angular/animations-builds#d6e5d3594fd14058655ff19ceec0b1e28e110e28",
+    "@angular/cdk": "github:angular/cdk-builds#69cc394a1c4668f819863024dd2560698f153546",
+    "@angular/common": "github:angular/common-builds#609aad95336807590b3ae1206f54d0a2e5099ffe",
+    "@angular/compiler": "github:angular/compiler-builds#69e18b81e88647d93c96a2d43d47402f0bfb0811",
+    "@angular/compiler-cli": "github:angular/compiler-cli-builds#8448eb9dabebff133d1f828af4af1a16b0fa96e1",
+    "@angular/core": "github:angular/core-builds#4afa452d85b3259c716d660aa6bdc046e2f05fd2",
+    "@angular/forms": "github:angular/forms-builds#005b03359c96683981174e44d65a4cb524efffd4",
+    "@angular/language-service": "github:angular/language-service-builds#dbf45173da0c146111f0cb410039f8fedc90435e",
+    "@angular/localize": "github:angular/localize-builds#939846f4b0982eea0886de46ebf72e37502345c9",
+    "@angular/material": "github:angular/material2-builds#74feff3bc3cc644329ef612852b43c08c83d5019",
+    "@angular/material-moment-adapter": "github:angular/material-moment-adapter-builds#cc726e883532c36874e3ada92283462a17cb1fa1",
+    "@angular/platform-browser": "github:angular/platform-browser-builds#5ea31d22db2e775a309db1024735e1695908730a",
+    "@angular/platform-browser-dynamic": "github:angular/platform-browser-dynamic-builds#042a6caaf18be435f4331456d2e46b1a5cca6b60",
+    "@angular/platform-server": "github:angular/platform-server-builds#c13ccbe225eded0e72faa6e2504e7331a26c813e",
+    "@angular/router": "github:angular/router-builds#c3588b91fb62e149b32845c768e42acfde190209",
+    "@angular/service-worker": "github:angular/service-worker-builds#514b0c39d0537abb657d9ca45f06d40b3d692dbc"
   }
 }
diff --git a/tests/legacy-cli/e2e/setup/010-local-publish.ts b/tests/legacy-cli/e2e/setup/010-local-publish.ts
index d3de2917e378..d6a761a2b60d 100644
--- a/tests/legacy-cli/e2e/setup/010-local-publish.ts
+++ b/tests/legacy-cli/e2e/setup/010-local-publish.ts
@@ -1,11 +1,10 @@
-import { prerelease } from 'semver';
-import { packages } from '../../../../lib/packages';
 import { getGlobalVariable } from '../utils/env';
 import { npm } from '../utils/process';
+import { isPrereleaseCli } from '../utils/project';
 
-export default async function() {
+export default async function () {
   const testRegistry = getGlobalVariable('package-registry');
-  const publishArgs = [
+  await npm(
     'run',
     'admin',
     '--',
@@ -13,14 +12,7 @@ export default async function() {
     '--no-versionCheck',
     '--no-branchCheck',
     `--registry=${testRegistry}`,
-  ];
-
-  const pre = prerelease(packages['@angular/cli'].version);
-  if (pre && pre.length > 0) {
-    publishArgs.push('--tag', 'next');
-  } else {
-    publishArgs.push('--tag', 'latest');
-  }
-
-  await npm(...publishArgs);
+    '--tag',
+    isPrereleaseCli() ? 'next' : 'latest',
+  );
 }
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 e07cafd5d54f..433511947929 100644
--- a/tests/legacy-cli/e2e/tests/basic/ngcc-es2015-only.ts
+++ b/tests/legacy-cli/e2e/tests/basic/ngcc-es2015-only.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 { ng } from '../../utils/process';
 
 export default async function() {
diff --git a/tests/legacy-cli/e2e/tests/basic/rebuild.ts b/tests/legacy-cli/e2e/tests/basic/rebuild.ts
index 29a423b9deb6..261835bcc09f 100644
--- a/tests/legacy-cli/e2e/tests/basic/rebuild.ts
+++ b/tests/legacy-cli/e2e/tests/basic/rebuild.ts
@@ -4,22 +4,26 @@ import {
   execAndWaitForOutputToMatch,
   ng,
 } from '../../utils/process';
-import {writeFile, writeMultipleFiles} from '../../utils/fs';
-import {wait} from '../../utils/utils';
-import {request} from '../../utils/http';
+import { writeFile, writeMultipleFiles } from '../../utils/fs';
+import { wait } from '../../utils/utils';
+import { request } from '../../utils/http';
 
 const validBundleRegEx = / Compiled successfully./;
 
-export default function() {
-  return execAndWaitForOutputToMatch('ng', ['serve'], validBundleRegEx)
-    // Add a lazy module.
-    .then(() => ng('generate', 'module', 'lazy', '--routing'))
-    // Should trigger a rebuild with a new bundle.
-    // We need to use Promise.all to ensure we are waiting for the rebuild just before we write
-    // the file, otherwise rebuilds can be too fast and fail CI.
-    .then(() => Promise.all([
-      waitForAnyProcessOutputToMatch(validBundleRegEx, 20000),
-      writeFile('src/app/app.module.ts', `
+export default function () {
+  return (
+    execAndWaitForOutputToMatch('ng', ['serve'], validBundleRegEx)
+      // Add a lazy module.
+      .then(() => ng('generate', 'module', 'lazy', '--routing'))
+      // Should trigger a rebuild with a new bundle.
+      // We need to use Promise.all to ensure we are waiting for the rebuild just before we write
+      // the file, otherwise rebuilds can be too fast and fail CI.
+      .then(() =>
+        Promise.all([
+          waitForAnyProcessOutputToMatch(validBundleRegEx, 20000),
+          writeFile(
+            'src/app/app.module.ts',
+            `
         import { BrowserModule } from '@angular/platform-browser';
         import { NgModule } from '@angular/core';
         import { FormsModule } from '@angular/forms';
@@ -44,21 +48,23 @@ export default function() {
           bootstrap: [AppComponent]
         })
         export class AppModule { }
-      `),
-    ]))
-    // Count the bundles.
-    .then((results) => {
-      const stdout = results[0].stdout;
-      // First regexp is for Webpack 4; Second is for Webpack 5
-      if (!/(lazy-module|0)\.js/g.test(stdout) && !/lazy_module_ts\.js/g.test(stdout)) {
-        throw new Error('Expected webpack to create a new chunk, but did not.');
-      }
-    })
-    // Change multiple files and check that all of them are invalidated and recompiled.
-    .then(() => Promise.all([
-      waitForAnyProcessOutputToMatch(validBundleRegEx, 20000),
-      writeMultipleFiles({
-        'src/app/app.module.ts': `
+      `,
+          ),
+        ]),
+      )
+      // Count the bundles.
+      .then((results) => {
+        const stdout = results[0].stdout;
+        if (!/lazy_module_ts\.js/g.test(stdout)) {
+          throw new Error('Expected webpack to create a new chunk, but did not.');
+        }
+      })
+      // Change multiple files and check that all of them are invalidated and recompiled.
+      .then(() =>
+        Promise.all([
+          waitForAnyProcessOutputToMatch(validBundleRegEx, 20000),
+          writeMultipleFiles({
+            'src/app/app.module.ts': `
           import { BrowserModule } from '@angular/platform-browser';
           import { NgModule } from '@angular/core';
 
@@ -79,7 +85,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';
 
@@ -96,12 +102,14 @@ export default function() {
           console.log(m.X);
           console.log('$$_E2E_GOLDEN_VALUE_3');
         `,
-      }),
-    ]))
-    .then(() => Promise.all([
-      waitForAnyProcessOutputToMatch(validBundleRegEx, 20000),
-      writeMultipleFiles({
-        'src/app/app.module.ts': `
+          }),
+        ]),
+      )
+      .then(() =>
+        Promise.all([
+          waitForAnyProcessOutputToMatch(validBundleRegEx, 20000),
+          writeMultipleFiles({
+            'src/app/app.module.ts': `
 
           import { BrowserModule } from '@angular/platform-browser';
           import { NgModule } from '@angular/core';
@@ -124,49 +132,58 @@ export default function() {
           export let X = '$$_E2E_GOLDEN_VALUE_2';
           console.log('File changed with no import/export changes');
         `,
-      }),
-    ]))
-    .then(() => wait(2000))
-    .then(() => request('http://localhost:4200/main.js'))
-    .then((body) => {
-      if (!body.match(/\$\$_E2E_GOLDEN_VALUE_1/)) {
-        throw new Error('Expected golden value 1.');
-      }
-      if (!body.match(/\$\$_E2E_GOLDEN_VALUE_2/)) {
-        throw new Error('Expected golden value 2.');
-      }
-      if (!body.match(/\$\$_E2E_GOLDEN_VALUE_3/)) {
-        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;
-    });
+          }),
+        ]),
+      )
+      .then(() => wait(2000))
+      .then(() => request('http://localhost:4200/main.js'))
+      .then((body) => {
+        if (!body.match(/\$\$_E2E_GOLDEN_VALUE_1/)) {
+          throw new Error('Expected golden value 1.');
+        }
+        if (!body.match(/\$\$_E2E_GOLDEN_VALUE_2/)) {
+          throw new Error('Expected golden value 2.');
+        }
+        if (!body.match(/\$\$_E2E_GOLDEN_VALUE_3/)) {
+          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/styles-array.ts b/tests/legacy-cli/e2e/tests/basic/styles-array.ts
index 23016d015bce..92ce540c2fb6 100644
--- a/tests/legacy-cli/e2e/tests/basic/styles-array.ts
+++ b/tests/legacy-cli/e2e/tests/basic/styles-array.ts
@@ -3,7 +3,7 @@ import { expectFileToMatch, writeMultipleFiles } from '../../utils/fs';
 import { ng } from '../../utils/process';
 import { updateJsonFile } from '../../utils/project';
 
-export default async function() {
+export default async function () {
   await writeMultipleFiles({
     'src/string-style.css': '.string-style { color: red }',
     'src/input-style.css': '.input-style { color: red }',
@@ -12,7 +12,7 @@ export default async function() {
     'src/pre-rename-lazy-style.css': '.pre-rename-lazy-style { color: red }',
   });
 
-  await updateJsonFile('angular.json', workspaceJson => {
+  await updateJsonFile('angular.json', (workspaceJson) => {
     const appArchitect = workspaceJson.projects['test-project'].architect;
     appArchitect.build.options.styles = [
       { input: 'src/string-style.css' },
@@ -27,7 +27,7 @@ export default async function() {
     ];
   });
 
-  await ng('build', '--extract-css', '--configuration=development');
+  const { stdout } = await ng('build', '--extract-css', '--configuration=development');
 
   await expectFileToMatch('dist/test-project/styles.css', '.string-style');
   await expectFileToMatch('dist/test-project/styles.css', '.input-style');
@@ -41,4 +41,9 @@ export default async function() {
       <link rel="stylesheet" href="renamed-style.css">
     `,
   );
+
+  // Non injected styles should be listed under lazy chunk files
+  if (!/Lazy Chunk Files.*\srenamed-lazy-style\.css/m.test(stdout)) {
+    throw new Error(`Expected "renamed-lazy-style.css" to be listed under "Lazy Chunk Files".`);
+  }
 }
diff --git a/tests/legacy-cli/e2e/tests/build/build-app-shell-with-schematic.ts b/tests/legacy-cli/e2e/tests/build/build-app-shell-with-schematic.ts
index cacc9accb7ab..95ece32ea6f5 100644
--- a/tests/legacy-cli/e2e/tests/build/build-app-shell-with-schematic.ts
+++ b/tests/legacy-cli/e2e/tests/build/build-app-shell-with-schematic.ts
@@ -8,7 +8,7 @@ const snapshots = require('../../ng-snapshot/package.json');
 
 export default async function () {
   await appendToFile('src/app/app.component.html', '<router-outlet></router-outlet>');
-  await ng('generate', 'appShell', '--client-project', 'test-project');
+  await ng('generate', 'appShell', '--project', 'test-project');
 
   const isSnapshotBuild = getGlobalVariable('argv')['ng-snapshots'];
   if (isSnapshotBuild) {
diff --git a/tests/legacy-cli/e2e/tests/build/bundle-budgets.ts b/tests/legacy-cli/e2e/tests/build/bundle-budgets.ts
index f4076d470f3f..8b41f0596dcf 100644
--- a/tests/legacy-cli/e2e/tests/build/bundle-budgets.ts
+++ b/tests/legacy-cli/e2e/tests/build/bundle-budgets.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 { ng } from '../../utils/process';
 import { updateJsonFile } from '../../utils/project';
 import { expectToFail } from '../../utils/utils';
diff --git a/tests/legacy-cli/e2e/tests/build/differential-loading-sri.ts b/tests/legacy-cli/e2e/tests/build/differential-loading-sri.ts
index cc0be82b7d95..42ddfe0368cf 100644
--- a/tests/legacy-cli/e2e/tests/build/differential-loading-sri.ts
+++ b/tests/legacy-cli/e2e/tests/build/differential-loading-sri.ts
@@ -41,12 +41,7 @@ export default async function () {
 
   await ng('generate', 'module', 'lazy', '--module=app.module', '--route', 'lazy');
 
-  await ng(
-    'build',
-    '--subresource-integrity',
-    '--output-hashing=none',
-    '--output-path=dist/first',
-  );
+  await ng('build', '--subresource-integrity', '--output-hashing=none', '--output-path=dist/first');
 
   // Second build used to ensure cached files use correct integrity values
   await ng(
@@ -56,7 +51,7 @@ export default async function () {
     '--output-path=dist/second',
   );
 
-  const chunkId = '730';
+  const chunkId = '86';
   const codeHashES5 = createHash('sha384')
     .update(await readFile(`dist/first/${chunkId}-es5.js`))
     .digest('base64');
diff --git a/tests/legacy-cli/e2e/tests/build/esbuild-unsupported.ts b/tests/legacy-cli/e2e/tests/build/esbuild-unsupported.ts
new file mode 100644
index 000000000000..0a3681549d3d
--- /dev/null
+++ b/tests/legacy-cli/e2e/tests/build/esbuild-unsupported.ts
@@ -0,0 +1,11 @@
+import { join } from 'path';
+import { execWithEnv } from '../../utils/process';
+
+export default async function () {
+  // Set the esbuild native binary path to a non-existent file to simulate a spawn error.
+  // The build should still succeed by falling back to the WASM variant of esbuild.
+  await execWithEnv('ng', ['build'], {
+    ...process.env,
+    'ESBUILD_BINARY_PATH': join(__dirname, 'esbuild-bin-no-exist-xyz'),
+  });
+}
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 abc97433a7ab..ed39e98b4b6a 100644
--- a/tests/legacy-cli/e2e/tests/build/lazy-load-syntax.ts
+++ b/tests/legacy-cli/e2e/tests/build/lazy-load-syntax.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 { appendToFile, prependToFile, readFile, replaceInFile, writeFile } from '../../utils/fs';
 import { ng } from '../../utils/process';
 import { updateJsonFile } from '../../utils/project';
diff --git a/tests/legacy-cli/e2e/tests/build/material.ts b/tests/legacy-cli/e2e/tests/build/material.ts
index 5963d3411d89..724edfca5c06 100644
--- a/tests/legacy-cli/e2e/tests/build/material.ts
+++ b/tests/legacy-cli/e2e/tests/build/material.ts
@@ -1,13 +1,15 @@
+import { SemVer } from 'semver';
 import { getGlobalVariable } from '../../utils/env';
 import { replaceInFile } from '../../utils/fs';
 import { installPackage, installWorkspacePackages } from '../../utils/packages';
 import { ng } from '../../utils/process';
 import { isPrereleaseCli, updateJsonFile } from '../../utils/project';
+import { readNgVersion } from '../../utils/version';
 
 const snapshots = require('../../ng-snapshot/package.json');
 
 export default async function () {
-  const tag = await isPrereleaseCli() ?  '@next' : '';
+  const tag = (await isPrereleaseCli()) ? '@next' : `@${new SemVer(readNgVersion()).major}`;
   await ng('add', `@angular/material${tag}`, '--skip-confirmation');
 
   const isSnapshotBuild = getGlobalVariable('argv')['ng-snapshots'];
@@ -28,7 +30,7 @@ export default async function () {
 
     await installWorkspacePackages();
   } else {
-    await installPackage('@angular/material-moment-adapter');
+    await installPackage(`@angular/material-moment-adapter${tag}`);
   }
 
   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 5169ca644293..0afb776366fb 100644
--- a/tests/legacy-cli/e2e/tests/build/platform-server.ts
+++ b/tests/legacy-cli/e2e/tests/build/platform-server.ts
@@ -8,7 +8,7 @@ import { updateJsonFile } from '../../utils/project';
 const snapshots = require('../../ng-snapshot/package.json');
 
 export default async function () {
-  await ng('generate', 'universal', '--client-project', 'test-project');
+  await ng('generate', 'universal', '--project', 'test-project');
 
   const isSnapshotBuild = getGlobalVariable('argv')['ng-snapshots'];
   if (isSnapshotBuild) {
@@ -48,7 +48,10 @@ export default async function () {
 
   await ng('run', 'test-project:server', '--optimization', 'false');
 
-  await expectFileToMatch('dist/test-project/server/main.js', /exports.*AppServerModule|"AppServerModule":/);
+  await expectFileToMatch(
+    'dist/test-project/server/main.js',
+    /exports.*AppServerModule|"AppServerModule":/,
+  );
   await exec(normalize('node'), 'dist/test-project/server/main.js');
   await expectFileToMatch(
     'dist/test-project/server/index.html',
diff --git a/tests/legacy-cli/e2e/tests/build/worker.ts b/tests/legacy-cli/e2e/tests/build/worker.ts
index 69e03193aec7..426890f1d2fe 100644
--- a/tests/legacy-cli/e2e/tests/build/worker.ts
+++ b/tests/legacy-cli/e2e/tests/build/worker.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 { join } from 'path';
 import { expectFileToExist, expectFileToMatch, replaceInFile, writeFile } from '../../utils/fs';
 import { ng } from '../../utils/process';
@@ -16,11 +17,7 @@ export default async function () {
   const workerTsConfig = 'tsconfig.worker.json';
 
   // Enable Differential loading to run both size checks
-  await replaceInFile(
-    '.browserslistrc',
-    'not IE 11',
-    'IE 11',
-  );
+  await replaceInFile('.browserslistrc', 'not IE 11', 'IE 11');
 
   await ng('generate', 'web-worker', 'app');
   await expectFileToExist(workerPath);
@@ -35,7 +32,7 @@ export default async function () {
   await expectFileToMatch('dist/test-project/main-es2017.js', 'src_app_app_worker_ts');
 
   await ng('build', '--output-hashing=none');
-  const chunkId = '137';
+  const chunkId = '151';
   await expectFileToExist(`dist/test-project/${chunkId}-es5.js`);
   await expectFileToMatch('dist/test-project/main-es5.js', chunkId);
   await expectFileToExist(`dist/test-project/${chunkId}-es2017.js`);
@@ -45,7 +42,9 @@ export default async function () {
   // https://github.com/angular/protractor/issues/2207
   await replaceInFile('src/app/app.component.ts', 'console.log', 'console.warn');
 
-  await writeFile('e2e/app.e2e-spec.ts', `
+  await writeFile(
+    'e2e/app.e2e-spec.ts',
+    `
     import { AppPage } from './app.po';
     import { browser, logging } from 'protractor';
     describe('worker bundle', () => {
@@ -57,7 +56,8 @@ export default async function () {
         expect(logs[0].message).toContain('page got message: worker response to hello');
       });
     });
-  `);
+  `,
+  );
 
   await ng('e2e');
 }
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 45672d13a94d..48dd9f29bc1c 100644
--- a/tests/legacy-cli/e2e/tests/commands/add/add-pwa.ts
+++ b/tests/legacy-cli/e2e/tests/commands/add/add-pwa.ts
@@ -1,6 +1,11 @@
 import { join } from 'path';
+import { getGlobalVariable } from '../../../utils/env';
 import { expectFileToExist, readFile, rimraf } from '../../../utils/fs';
+import { installWorkspacePackages } from '../../../utils/packages';
 import { ng } from '../../../utils/process';
+import { updateJsonFile } from '../../../utils/project';
+
+const snapshots = require('../../../ng-snapshot/package.json');
 
 export default async function () {
   // forcibly remove in case another test doesn't clean itself up
@@ -9,10 +14,58 @@ export default async function () {
   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');
+  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'.`);
   }
+
+  const isSnapshotBuild = getGlobalVariable('argv')['ng-snapshots'];
+  if (isSnapshotBuild) {
+    let needInstall = false;
+    await updateJsonFile('package.json', (packageJson) => {
+      const dependencies = packageJson['dependencies'];
+      // Iterate over all of the packages to update them to the snapshot version.
+      for (const [name, version] of Object.entries(snapshots.dependencies)) {
+        if (name in dependencies && dependencies[name] !== version) {
+          dependencies[name] = version;
+          needInstall = true;
+        }
+      }
+    });
+
+    if (needInstall) {
+      await installWorkspacePackages();
+    }
+  }
+
+  // It should generate a SW configuration file (`ngsw.json`).
+  const workspaceJson = JSON.parse(await readFile('angular.json'));
+  const outputPath = workspaceJson.projects['test-project'].architect.build.options.outputPath;
+  const ngswPath = join(process.cwd(), outputPath, 'ngsw.json');
+
+  await ng('build');
+  await expectFileToExist(ngswPath);
+
+  // It should correctly generate assetGroups and include at least one URL in each group.
+  const ngswJson = JSON.parse(await readFile(ngswPath));
+  const assetGroups = ngswJson.assetGroups.map(({ name, urls }) => ({
+    name,
+    urlCount: urls.length,
+  }));
+  const emptyAssetGroups = assetGroups.filter(({ urlCount }) => urlCount === 0);
+
+  if (assetGroups.length === 0) {
+    throw new Error("Expected 'ngsw.json' to contain at least one asset-group.");
+  }
+  if (emptyAssetGroups.length > 0) {
+    throw new Error(
+      'Expected all asset-groups to contain at least one URL, but the following groups are empty: ' +
+        emptyAssetGroups.map(({ name }) => name).join(', '),
+    );
+  }
 }
diff --git a/tests/legacy-cli/e2e/tests/commands/add/npm-env-vars.ts b/tests/legacy-cli/e2e/tests/commands/add/npm-env-vars.ts
new file mode 100644
index 000000000000..d35a7e0846d6
--- /dev/null
+++ b/tests/legacy-cli/e2e/tests/commands/add/npm-env-vars.ts
@@ -0,0 +1,26 @@
+import { expectFileNotToExist, expectFileToExist } from '../../../utils/fs';
+import { git, ng } from '../../../utils/process';
+import {
+  createNpmConfigForAuthentication,
+  setNpmEnvVarsForAuthentication,
+} from '../../../utils/registry';
+
+export default async function () {
+  // Yarn also supports NPM_CONFIG env variables.
+  // https://classic.yarnpkg.com/en/docs/envvars/
+
+  const command = ['add', '@angular/pwa', '--skip-confirmation'];
+
+  // Environment variables only
+  await expectFileNotToExist('src/manifest.webmanifest');
+  setNpmEnvVarsForAuthentication();
+  await ng(...command);
+  await expectFileToExist('src/manifest.webmanifest');
+  await git('clean', '-dxf');
+
+  // Mix of config file and env vars works
+  await expectFileNotToExist('src/manifest.webmanifest');
+  await createNpmConfigForAuthentication(false, true);
+  await ng(...command);
+  await expectFileToExist('src/manifest.webmanifest');
+}
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 8a9e31dcb4d6..f5888f788b62 100644
--- a/tests/legacy-cli/e2e/tests/commands/add/registry-option.ts
+++ b/tests/legacy-cli/e2e/tests/commands/add/registry-option.ts
@@ -10,16 +10,12 @@ export default async function () {
   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;
+  delete process.env['NPM_CONFIG_REGISTRY'];
 
-  try {
-    await expectToFail(() => ng('add', '@angular/pwa', '--skip-confirmation'));
+  await expectToFail(() => ng('add', '@angular/pwa', '--skip-confirmation'));
 
-    await ng('add', `--registry=${testRegistry}`, '@angular/pwa', '--skip-confirmation');
-    await expectFileToExist('src/manifest.webmanifest');
-  } finally {
-    process.env['NPM_CONFIG_REGISTRY'] = originalRegistryVariable;
-  }
+  await ng('add', `--registry=${testRegistry}`, '@angular/pwa', '--skip-confirmation');
+  await expectFileToExist('src/manifest.webmanifest');
 }
diff --git a/tests/legacy-cli/e2e/tests/commands/add/secure-registry.ts b/tests/legacy-cli/e2e/tests/commands/add/secure-registry.ts
new file mode 100644
index 000000000000..69da8d5845b9
--- /dev/null
+++ b/tests/legacy-cli/e2e/tests/commands/add/secure-registry.ts
@@ -0,0 +1,32 @@
+import { expectFileNotToExist, expectFileToExist } from '../../../utils/fs';
+import { git, ng } from '../../../utils/process';
+import { createNpmConfigForAuthentication } from '../../../utils/registry';
+import { expectToFail } from '../../../utils/utils';
+
+export default async function () {
+  // The environment variable has priority over the .npmrc
+  delete process.env['NPM_CONFIG_REGISTRY'];
+
+  const command = ['add', '@angular/pwa', '--skip-confirmation'];
+  await expectFileNotToExist('src/manifest.webmanifest');
+
+  // Works with unscoped registry authentication details
+  await createNpmConfigForAuthentication(false);
+  await ng(...command);
+  await expectFileToExist('src/manifest.webmanifest');
+  await git('clean', '-dxf');
+
+  // Works with scoped registry authentication details
+  await expectFileNotToExist('src/manifest.webmanifest');
+
+  await createNpmConfigForAuthentication(true);
+  await ng(...command);
+  await expectFileToExist('src/manifest.webmanifest');
+
+  // Invalid authentication token
+  await createNpmConfigForAuthentication(false, true);
+  await expectToFail(() => ng(...command));
+
+  await createNpmConfigForAuthentication(true, true);
+  await expectToFail(() => ng(...command));
+}
diff --git a/tests/legacy-cli/e2e/tests/commands/add/yarn-env-vars.ts b/tests/legacy-cli/e2e/tests/commands/add/yarn-env-vars.ts
new file mode 100644
index 000000000000..67ffdbdc9b09
--- /dev/null
+++ b/tests/legacy-cli/e2e/tests/commands/add/yarn-env-vars.ts
@@ -0,0 +1,29 @@
+import { expectFileNotToExist, expectFileToExist } from '../../../utils/fs';
+import { getActivePackageManager } from '../../../utils/packages';
+import { git, ng } from '../../../utils/process';
+import {
+  createNpmConfigForAuthentication,
+  setNpmEnvVarsForAuthentication,
+} from '../../../utils/registry';
+
+export default async function () {
+  // Yarn specific test that tests YARN_ env variables.
+  // https://classic.yarnpkg.com/en/docs/envvars/
+  if (getActivePackageManager() !== 'yarn') {
+    return;
+  }
+  const command = ['add', '@angular/pwa', '--skip-confirmation'];
+
+  // Environment variables only
+  await expectFileNotToExist('src/manifest.webmanifest');
+  setNpmEnvVarsForAuthentication(false, true);
+  await ng(...command);
+  await expectFileToExist('src/manifest.webmanifest');
+  await git('clean', '-dxf');
+
+  // Mix of config file and env vars works
+  await expectFileNotToExist('src/manifest.webmanifest');
+  await createNpmConfigForAuthentication(false, true);
+  await ng(...command);
+  await expectFileToExist('src/manifest.webmanifest');
+}
diff --git a/tests/legacy-cli/e2e/tests/commands/config/config-set.ts b/tests/legacy-cli/e2e/tests/commands/config/config-set.ts
index cabf4c1373a6..5651780200e5 100644
--- a/tests/legacy-cli/e2e/tests/commands/config/config-set.ts
+++ b/tests/legacy-cli/e2e/tests/commands/config/config-set.ts
@@ -1,21 +1,40 @@
 import { ng } from '../../../utils/process';
 import { expectToFail } from '../../../utils/utils';
 
-export default function() {
-  return Promise.resolve()
-    .then(() => expectToFail(() => ng('config', 'cli.warnings.zzzz')))
-    .then(() => ng('config', 'cli.warnings.versionMismatch' , 'false'))
-    .then(() => ng('config', 'cli.warnings.versionMismatch'))
-    .then(({ stdout }) => {
-      if (!stdout.match(/false/)) {
-        throw new Error(`Expected "false", received "${JSON.stringify(stdout)}".`);
-      }
-    })
-    .then(() => ng('config', 'cli.packageManager' , 'yarn'))
-    .then(() => ng('config', 'cli.packageManager'))
-    .then(({ stdout }) => {
-      if (!stdout.match(/yarn/)) {
-        throw new Error(`Expected "yarn", received "${JSON.stringify(stdout)}".`);
-      }
-    });
+export default async function () {
+  await expectToFail(() => ng('config', 'cli.warnings.zzzz'));
+  await ng('config', 'cli.warnings.versionMismatch', 'false');
+  const { stdout } = await ng('config', 'cli.warnings.versionMismatch');
+  if (!stdout.includes('false')) {
+    throw new Error(`Expected "false", received "${JSON.stringify(stdout)}".`);
+  }
+
+  await ng('config', 'cli.packageManager', 'yarn');
+  const { stdout: stdout2 } = await ng('config', 'cli.packageManager');
+  if (!stdout2.includes('yarn')) {
+    throw new Error(`Expected "yarn", received "${JSON.stringify(stdout2)}".`);
+  }
+
+  await ng('config', 'schematics', '{"@schematics/angular:component":{"style": "scss"}}');
+  const { stdout: stdout3 } = await ng('config', 'schematics.@schematics/angular:component.style');
+  if (!stdout3.includes('scss')) {
+    throw new Error(`Expected "scss", received "${JSON.stringify(stdout3)}".`);
+  }
+
+  await ng('config', 'schematics');
+  await ng('config', 'schematics', 'undefined');
+  await expectToFail(() => ng('config', 'schematics'));
+
+  /**
+   * `ng config cli.analyticsSharing.uuid ""` should generate new random user ID.
+   * @see: https://angular.io/cli/usage-analytics-gathering#per-user-tracking
+   */
+  await ng('config', 'cli.analyticsSharing.uuid', '');
+  const { stdout: stdout4 } = await ng('config', 'cli.analyticsSharing.uuid');
+  console.log(stdout4);
+  if (!/(?:urn:uuid:)?[0-9a-f]{8}-(?:[0-9a-f]{4}-){3}[0-9a-f]{12}/i.test(stdout4)) {
+    throw new Error(
+      `Expected "cli.analyticsSharing.uuid" to be a UUID, received "${JSON.stringify(stdout4)}".`,
+    );
+  }
 }
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 f76c09abe1fc..a325b1081ba9 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
@@ -3,6 +3,12 @@ import { ng } from '../../../utils/process';
 import { expectFileToExist, rimraf } from '../../../utils/fs';
 
 export default async function () {
+  // TODO: Fix this test on the 12.2.x branch for Windows CI and re-enable.
+  //       The test fails on cleanup due to non-empty directories but should not.
+  if (process.platform === 'win32') {
+    return;
+  }
+
   const upperDirs = join('non', 'existing', 'dir');
   const rootDir = join('src', 'app', upperDirs);
 
@@ -11,7 +17,7 @@ export default async function () {
 
   try {
     // Generate a component
-    await ng('generate', 'component', `${upperDirs}/test-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'));
diff --git a/tests/legacy-cli/e2e/tests/generate/help-output-no-duplicates.ts b/tests/legacy-cli/e2e/tests/generate/help-output-no-duplicates.ts
new file mode 100644
index 000000000000..821333637079
--- /dev/null
+++ b/tests/legacy-cli/e2e/tests/generate/help-output-no-duplicates.ts
@@ -0,0 +1,17 @@
+import { ng } from '../../utils/process';
+
+export default async function() {
+    // Verify that there are no duplicate options
+  const { stdout } = await ng('generate', 'component', '--help');
+  const firstIndex = stdout.indexOf('--prefix');
+
+  if (firstIndex < 0) {
+    console.log(stdout);
+    throw new Error('--prefix was not part of the help output.');
+  }
+
+  if (firstIndex !== stdout.lastIndexOf('--prefix')) {
+    console.log(stdout);
+    throw new Error('--prefix first and last index were different. Possible duplicate output!');
+  }
+}
diff --git a/tests/legacy-cli/e2e/tests/generate/library/library-consumption-ivy-full.ts b/tests/legacy-cli/e2e/tests/generate/library/library-consumption-ivy-full.ts
index b523bbc67bb1..27443966a96c 100644
--- a/tests/legacy-cli/e2e/tests/generate/library/library-consumption-ivy-full.ts
+++ b/tests/legacy-cli/e2e/tests/generate/library/library-consumption-ivy-full.ts
@@ -1,11 +1,21 @@
-import { writeFile } from '../../../utils/fs';
+import { expectFileToMatch, writeMultipleFiles } from '../../../utils/fs';
 import { ng } from '../../../utils/process';
 import { updateJsonFile } from '../../../utils/project';
 
 export default async function () {
   await ng('generate', 'library', 'my-lib');
 
-  await writeFile('./src/app/app.module.ts', `
+  // Force an external template
+  await writeMultipleFiles({
+    'projects/my-lib/src/lib/my-lib.component.html': `<p>my-lib works!</p>`,
+    'projects/my-lib/src/lib/my-lib.component.ts': `import { Component } from '@angular/core';
+
+      @Component({
+        selector: 'lib-my-lib',
+        templateUrl: './my-lib.component.html',
+      })
+      export class MyLibComponent {}`,
+    './src/app/app.module.ts': `
       import { BrowserModule } from '@angular/platform-browser';
       import { NgModule } from '@angular/core';
       import { MyLibModule } from 'my-lib';
@@ -24,9 +34,8 @@ export default async function () {
         bootstrap: [AppComponent]
       })
       export class AppModule { }
-    `);
-
-  await writeFile('./src/app/app.component.ts', `
+    `,
+    './src/app/app.component.ts': `
       import { Component } from '@angular/core';
       import { MyLibService } from 'my-lib';
 
@@ -41,9 +50,8 @@ export default async function () {
           console.log(myLibService);
         }
       }
-    `);
-
-  await writeFile('e2e/src/app.e2e-spec.ts', `
+    `,
+    'e2e/src/app.e2e-spec.ts': `
     import { browser, logging, element, by } from 'protractor';
     import { AppPage } from './app.po';
 
@@ -67,7 +75,8 @@ export default async function () {
         }));
       });
     });
-  `);
+  `,
+  });
 
   // Build library in full mode (development)
   await ng('build', 'my-lib', '--configuration=development');
@@ -76,7 +85,7 @@ export default async function () {
   await runTests();
 
   // JIT linking
-  await updateJsonFile('angular.json', config => {
+  await updateJsonFile('angular.json', (config) => {
     const build = config.projects['test-project'].architect.build;
     build.options.aot = false;
     build.configurations.production.buildOptimizer = false;
@@ -89,4 +98,8 @@ async function runTests(): Promise<void> {
   // 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');
+
+  // Validate that sourcemaps for the library exists.
+  await ng('build', '--configuration=development');
+  await expectFileToMatch('dist/test-project/main.js.map', 'projects/my-lib/src/public-api.ts');
 }
diff --git a/tests/legacy-cli/e2e/tests/generate/library/library-consumption-ivy-partial.ts b/tests/legacy-cli/e2e/tests/generate/library/library-consumption-ivy-partial.ts
index 076ceb65cd80..4ca8f3fb3ad7 100644
--- a/tests/legacy-cli/e2e/tests/generate/library/library-consumption-ivy-partial.ts
+++ b/tests/legacy-cli/e2e/tests/generate/library/library-consumption-ivy-partial.ts
@@ -1,11 +1,21 @@
-import { writeFile } from '../../../utils/fs';
+import { expectFileToMatch, writeMultipleFiles } from '../../../utils/fs';
 import { ng } from '../../../utils/process';
 import { updateJsonFile } from '../../../utils/project';
 
 export default async function () {
   await ng('generate', 'library', 'my-lib');
 
-  await writeFile('./src/app/app.module.ts', `
+  // Force an external template
+  await writeMultipleFiles({
+    'projects/my-lib/src/lib/my-lib.component.html': `<p>my-lib works!</p>`,
+    'projects/my-lib/src/lib/my-lib.component.ts': `import { Component } from '@angular/core';
+
+      @Component({
+        selector: 'lib-my-lib',
+        templateUrl: './my-lib.component.html',
+      })
+      export class MyLibComponent {}`,
+    './src/app/app.module.ts': `
       import { BrowserModule } from '@angular/platform-browser';
       import { NgModule } from '@angular/core';
       import { MyLibModule } from 'my-lib';
@@ -24,9 +34,8 @@ export default async function () {
         bootstrap: [AppComponent]
       })
       export class AppModule { }
-    `);
-
-  await writeFile('./src/app/app.component.ts', `
+    `,
+    './src/app/app.component.ts': `
       import { Component } from '@angular/core';
       import { MyLibService } from 'my-lib';
 
@@ -41,9 +50,8 @@ export default async function () {
           console.log(myLibService);
         }
       }
-    `);
-
-  await writeFile('e2e/src/app.e2e-spec.ts', `
+    `,
+    'e2e/src/app.e2e-spec.ts': `
     import { browser, logging, element, by } from 'protractor';
     import { AppPage } from './app.po';
 
@@ -67,7 +75,8 @@ export default async function () {
         }));
       });
     });
-  `);
+  `,
+  });
 
   // Build library in partial mode (production)
   await ng('build', 'my-lib', '--configuration=production');
@@ -76,7 +85,7 @@ export default async function () {
   await runTests();
 
   // JIT linking
-  await updateJsonFile('angular.json', config => {
+  await updateJsonFile('angular.json', (config) => {
     const build = config.projects['test-project'].architect.build;
     build.options.aot = false;
     build.configurations.production.buildOptimizer = false;
@@ -89,4 +98,8 @@ async function runTests(): Promise<void> {
   // 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');
+
+  // Validate that sourcemaps for the library exists.
+  await ng('build', '--configuration=development');
+  await expectFileToMatch('dist/test-project/main.js.map', 'projects/my-lib/src/public-api.ts');
 }
diff --git a/tests/legacy-cli/e2e/tests/generate/library/library-consumption-ve.ts b/tests/legacy-cli/e2e/tests/generate/library/library-consumption-ve.ts
index 34c4114fdf8f..7341457faafa 100644
--- a/tests/legacy-cli/e2e/tests/generate/library/library-consumption-ve.ts
+++ b/tests/legacy-cli/e2e/tests/generate/library/library-consumption-ve.ts
@@ -1,11 +1,11 @@
-import { writeFile } from '../../../utils/fs';
+import { expectFileToMatch, writeMultipleFiles } from '../../../utils/fs';
 import { ng } from '../../../utils/process';
 import { updateJsonFile } from '../../../utils/project';
 
 export default async function () {
   await ng('generate', 'library', 'my-lib');
 
-  await updateJsonFile('projects/my-lib/tsconfig.lib.prod.json', config => {
+  await updateJsonFile('projects/my-lib/tsconfig.lib.prod.json', (config) => {
     const { angularCompilerOptions = {} } = config;
     angularCompilerOptions.enableIvy = false;
     angularCompilerOptions.skipTemplateCodegen = true;
@@ -13,7 +13,17 @@ export default async function () {
     config.angularCompilerOptions = angularCompilerOptions;
   });
 
-  await writeFile('./src/app/app.module.ts', `
+  // Force an external template
+  await writeMultipleFiles({
+    'projects/my-lib/src/lib/my-lib.component.html': `<p>my-lib works!</p>`,
+    'projects/my-lib/src/lib/my-lib.component.ts': `import { Component } from '@angular/core';
+
+      @Component({
+        selector: 'lib-my-lib',
+        templateUrl: './my-lib.component.html',
+      })
+      export class MyLibComponent {}`,
+    './src/app/app.module.ts': `
       import { BrowserModule } from '@angular/platform-browser';
       import { NgModule } from '@angular/core';
       import { MyLibModule } from 'my-lib';
@@ -32,9 +42,8 @@ export default async function () {
         bootstrap: [AppComponent]
       })
       export class AppModule { }
-    `);
-
-  await writeFile('./src/app/app.component.ts', `
+    `,
+    './src/app/app.component.ts': `
       import { Component } from '@angular/core';
       import { MyLibService } from 'my-lib';
 
@@ -49,9 +58,8 @@ export default async function () {
           console.log(myLibService);
         }
       }
-    `);
-
-  await writeFile('e2e/src/app.e2e-spec.ts', `
+    `,
+    'e2e/src/app.e2e-spec.ts': `
     import { browser, logging, element, by } from 'protractor';
     import { AppPage } from './app.po';
 
@@ -75,7 +83,8 @@ export default async function () {
         }));
       });
     });
-  `);
+  `,
+  });
 
   // Build library in VE mode (production)
   await ng('build', 'my-lib', '--configuration=production');
@@ -84,7 +93,7 @@ export default async function () {
   await runTests();
 
   // JIT linking
-  await updateJsonFile('angular.json', config => {
+  await updateJsonFile('angular.json', (config) => {
     const build = config.projects['test-project'].architect.build;
     build.options.aot = false;
     build.configurations.production.buildOptimizer = false;
@@ -97,4 +106,8 @@ async function runTests(): Promise<void> {
   // 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');
+
+  // Validate that sourcemaps for the library exists.
+  await ng('build', '--configuration=development');
+  await expectFileToMatch('dist/test-project/main.js.map', 'projects/my-lib/src/public-api.ts');
 }
diff --git a/tests/legacy-cli/e2e/tests/generate/schematic-defaults.ts b/tests/legacy-cli/e2e/tests/generate/schematic-defaults.ts
new file mode 100644
index 000000000000..7e015a0d6638
--- /dev/null
+++ b/tests/legacy-cli/e2e/tests/generate/schematic-defaults.ts
@@ -0,0 +1,40 @@
+import { ng } from '../../utils/process';
+import { updateJsonFile } from '../../utils/project';
+
+export default async function () {
+  await updateJsonFile('angular.json', (config) => {
+    config.projects['test-project'].schematics = {
+      '@schematics/angular:component': {
+        style: 'scss',
+      },
+    };
+  });
+
+  // Generate component in application to verify that it's minimal
+  const { stdout } = await ng('generate', 'component', 'foo');
+  if (!stdout.includes('foo.component.scss')) {
+    throw new Error('Expected "foo.component.scss" to exist.');
+  }
+
+  // Generate another project with different settings
+  await ng('generate', 'application', 'test-project-two', '--no-minimal');
+
+  await updateJsonFile('angular.json', (config) => {
+    config.projects['test-project-two'].schematics = {
+      '@schematics/angular:component': {
+        style: 'less',
+      },
+    };
+  });
+
+  const { stdout: stdout2 } = await ng(
+    'generate',
+    'component',
+    'foo',
+    '--project',
+    'test-project-two',
+  );
+  if (!stdout2.includes('foo.component.less')) {
+    throw new Error('Expected "foo.component.less" to exist.');
+  }
+}
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 c60aa1446d85..5f72c6dd7470 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
@@ -21,7 +21,7 @@ export default async function () {
 
   const isSnapshotBuild = getGlobalVariable('argv')['ng-snapshots'];
 
-  await updateJsonFile('package.json', packageJson => {
+  await updateJsonFile('package.json', (packageJson) => {
     const dependencies = packageJson['dependencies'];
     dependencies['@angular/localize'] = isSnapshotBuild
       ? snapshots.dependencies['@angular/localize']
@@ -29,10 +29,10 @@ export default async function () {
   });
 
   await appendToFile('src/app/app.component.html', '<router-outlet></router-outlet>');
-  await ng('generate', 'appShell', '--client-project', 'test-project');
+  await ng('generate', 'appShell', '--project', 'test-project');
 
   if (isSnapshotBuild) {
-    await updateJsonFile('package.json', packageJson => {
+    await updateJsonFile('package.json', (packageJson) => {
       const dependencies = packageJson['dependencies'];
       dependencies['@angular/platform-server'] = snapshots.dependencies['@angular/platform-server'];
       dependencies['@angular/router'] = snapshots.dependencies['@angular/router'];
@@ -49,7 +49,7 @@ export default async function () {
     { lang: 'fr', translation: 'Bonjour i18n!' },
   ];
 
-  await updateJsonFile('angular.json', workspaceJson => {
+  await updateJsonFile('angular.json', (workspaceJson) => {
     const appProject = workspaceJson.projects['test-project'];
     const appArchitect = appProject.architect || appProject.targets;
     const buildOptions = appArchitect['build'].options;
@@ -111,10 +111,7 @@ export default async function () {
 
   // Clean up app.component.html so that we can easily
   // find the translation text
-  await writeFile(
-    'src/app/app.component.html',
-    '<router-outlet></router-outlet>',
-  );
+  await writeFile('src/app/app.component.html', '<router-outlet></router-outlet>');
 
   for (const { lang, translation } of langTranslations) {
     if (lang != 'en-US') {
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 6e4a581f0d12..4aa4d5a3cdbb 100644
--- a/tests/legacy-cli/e2e/tests/i18n/ivy-localize-basehref.ts
+++ b/tests/legacy-cli/e2e/tests/i18n/ivy-localize-basehref.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 { expectFileToMatch } from '../../utils/fs';
 import { ng } from '../../utils/process';
 import { updateJsonFile } from '../../utils/project';
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 1f64ee4b6536..df60a124034d 100644
--- a/tests/legacy-cli/e2e/tests/i18n/ivy-localize-hashes.ts
+++ b/tests/legacy-cli/e2e/tests/i18n/ivy-localize-hashes.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 * as fs from 'fs';
 import { appendToFile } from '../../utils/fs';
 import { ng } from '../../utils/process';
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 b0221af3c382..4356a93103f6 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,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 { ng } from '../../utils/process';
 import { updateJsonFile } from '../../utils/project';
 import { setupI18nConfig } from './setup';
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 75f568b6108e..622d12d5bff8 100644
--- a/tests/legacy-cli/e2e/tests/i18n/ivy-localize-merging.ts
+++ b/tests/legacy-cli/e2e/tests/i18n/ivy-localize-merging.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 { ng } from '../../utils/process';
 import { updateJsonFile } from '../../utils/project';
 import { setupI18nConfig } from './setup';
diff --git a/tests/legacy-cli/e2e/tests/i18n/ivy-localize-server.ts b/tests/legacy-cli/e2e/tests/i18n/ivy-localize-server.ts
index c47c96fb8ed8..5a930a9dd75e 100644
--- a/tests/legacy-cli/e2e/tests/i18n/ivy-localize-server.ts
+++ b/tests/legacy-cli/e2e/tests/i18n/ivy-localize-server.ts
@@ -1,4 +1,4 @@
-import * as express from 'express';
+import express from 'express';
 import { join } from 'path';
 import { getGlobalVariable } from '../../utils/env';
 import { appendToFile, expectFileToMatch, writeFile } from '../../utils/fs';
@@ -22,7 +22,7 @@ export default async function () {
   await ng('add', '@nguniversal/express-engine@9.0.0-next.6', '--skip-install');
 
   if (isSnapshotBuild) {
-    await updateJsonFile('package.json', packageJson => {
+    await updateJsonFile('package.json', (packageJson) => {
       const dependencies = packageJson['dependencies'];
       dependencies['@angular/platform-server'] = snapshots.dependencies['@angular/platform-server'];
     });
@@ -34,7 +34,7 @@ export default async function () {
   const serverBuildArgs = ['run', 'test-project:server'];
 
   // Add server-specific config.
-  await updateJsonFile('angular.json', workspaceJson => {
+  await updateJsonFile('angular.json', (workspaceJson) => {
     const appProject = workspaceJson.projects['test-project'];
     const appArchitect = appProject.architect || appProject.targets;
     const serverOptions = appArchitect['server'].options;
@@ -110,7 +110,9 @@ export default async function () {
 
     // Run the server
     const serverBundle = join(process.cwd(), `${serverbaseDir}/${lang}/main.js`);
-    const { i18nApp } = await import(serverBundle) as { i18nApp(locale: string): express.Express };
+    const { i18nApp } = (await import(serverBundle)) as {
+      i18nApp(locale: string): express.Express;
+    };
     const server = i18nApp(lang).listen(4200, 'localhost');
     try {
       // Execute without a devserver.
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 2402d2ed90cc..dfb32d768289 100644
--- a/tests/legacy-cli/e2e/tests/i18n/ivy-localize-serviceworker.ts
+++ b/tests/legacy-cli/e2e/tests/i18n/ivy-localize-serviceworker.ts
@@ -1,4 +1,4 @@
-import * as express from 'express';
+import express from 'express';
 import { resolve } from 'path';
 import { getGlobalVariable } from '../../utils/env';
 import {
@@ -14,7 +14,7 @@ import { updateJsonFile } from '../../utils/project';
 import { expectToFail } from '../../utils/utils';
 import { readNgVersion } from '../../utils/version';
 
-export default async function() {
+export default async function () {
   // TEMP: disable pending i18n updates
   // TODO: when re-enabling, use setupI18nConfig and helpers like other i18n tests.
   return;
@@ -33,7 +33,7 @@ export default async function() {
   }
   await installPackage(serviceWorkerVersion);
 
-  await updateJsonFile('tsconfig.json', config => {
+  await updateJsonFile('tsconfig.json', (config) => {
     config.compilerOptions.target = 'es2015';
     if (!config.angularCompilerOptions) {
       config.angularCompilerOptions = {};
@@ -49,7 +49,7 @@ export default async function() {
     { lang: 'fr', translation: 'Bonjour i18n!' },
   ];
 
-  await updateJsonFile('angular.json', workspaceJson => {
+  await updateJsonFile('angular.json', (workspaceJson) => {
     const appProject = workspaceJson.projects['test-project'];
     const appArchitect = appProject.architect || appProject.targets;
     const serveConfigs = appArchitect['serve'].configurations;
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 2b3be750f672..18fa57f0fb0d 100644
--- a/tests/legacy-cli/e2e/tests/i18n/ivy-localize-sourcelocale.ts
+++ b/tests/legacy-cli/e2e/tests/i18n/ivy-localize-sourcelocale.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 { expectFileToMatch } from '../../utils/fs';
 import { ng } from '../../utils/process';
 import { updateJsonFile } from '../../utils/project';
diff --git a/tests/legacy-cli/e2e/tests/i18n/setup.ts b/tests/legacy-cli/e2e/tests/i18n/setup.ts
index efc957412df5..bca561214027 100644
--- a/tests/legacy-cli/e2e/tests/i18n/setup.ts
+++ b/tests/legacy-cli/e2e/tests/i18n/setup.ts
@@ -1,7 +1,14 @@
-import * as express from 'express';
+import express from 'express';
 import { resolve } from 'path';
 import { getGlobalVariable } from '../../utils/env';
-import { appendToFile, copyFile, expectFileToExist, expectFileToMatch, replaceInFile, writeFile } from '../../utils/fs';
+import {
+  appendToFile,
+  copyFile,
+  expectFileToExist,
+  expectFileToMatch,
+  replaceInFile,
+  writeFile,
+} from '../../utils/fs';
 import { installPackage } from '../../utils/packages';
 import { ng } from '../../utils/process';
 import { updateJsonFile } from '../../utils/project';
@@ -12,7 +19,8 @@ import { readNgVersion } from '../../utils/version';
 export const baseDir = 'dist/test-project';
 export const langTranslations = [
   {
-    lang: 'en-US', outputPath: `${baseDir}/en-US`,
+    lang: 'en-US',
+    outputPath: `${baseDir}/en-US`,
     translation: {
       helloPartial: 'Hello',
       hello: 'Hello i18n!',
@@ -21,7 +29,8 @@ export const langTranslations = [
     },
   },
   {
-    lang: 'fr', outputPath: `${baseDir}/fr`,
+    lang: 'fr',
+    outputPath: `${baseDir}/fr`,
     translation: {
       helloPartial: 'Bonjour',
       hello: 'Bonjour i18n!',
@@ -38,7 +47,8 @@ export const langTranslations = [
     ],
   },
   {
-    lang: 'de', outputPath: `${baseDir}/de`,
+    lang: 'de',
+    outputPath: `${baseDir}/de`,
     translation: {
       helloPartial: 'Hallo',
       hello: 'Hallo i18n!',
@@ -69,16 +79,12 @@ export const formats = {
   'xlf': {
     ext: 'xlf',
     sourceCheck: 'source-language="en-US"',
-    replacements: [
-      [/source/g, 'target'],
-    ],
+    replacements: [[/source/g, 'target']],
   },
   'xlf2': {
     ext: 'xlf',
     sourceCheck: 'srcLang="en-US"',
-    replacements: [
-      [/source/g, 'target'],
-    ],
+    replacements: [[/source/g, 'target']],
   },
   'xmb': {
     ext: 'xmb',
@@ -92,20 +98,20 @@ export const formats = {
   'json': {
     ext: 'json',
     sourceCheck: '"locale": "en-US"',
-    replacements: [
-    ],
+    replacements: [],
   },
   'arb': {
     ext: 'arb',
     sourceCheck: '"@@locale": "en-US"',
-    replacements: [
-    ],
+    replacements: [],
   },
 };
 
 export async function setupI18nConfig(format: keyof typeof formats = 'xlf') {
   // Add component with i18n content, both translations and localeData (plural, dates).
-  await writeFile('src/app/app.component.ts', `
+  await writeFile(
+    'src/app/app.component.ts',
+    `
     import { Component, Inject, LOCALE_ID } from '@angular/core';
     @Component({
       selector: 'app-root',
@@ -117,24 +123,33 @@ export async function setupI18nConfig(format: keyof typeof formats = 'xlf') {
       jan = new Date(2000, 0, 1);
       minutes = 3;
     }
-  `);
-  await writeFile(`src/app/app.component.html`, `
+  `,
+  );
+  await writeFile(
+    `src/app/app.component.html`,
+    `
     <p id="hello" i18n="An introduction header for this sample">Hello {{ title }}! </p>
     <p id="locale">{{ locale }}</p>
     <p id="date">{{ jan | date : 'LLLL' }}</p>
     <p id="plural" i18n>Updated {minutes, plural, =0 {just now} =1 {one minute ago} other {{{minutes}} minutes ago}}</p>
-  `);
+  `,
+  );
 
   // Add a dynamic import to ensure syntax is supported
   // ng serve support: https://github.com/angular/angular-cli/issues/16248
   await writeFile('src/app/dynamic.ts', `export const abc = 5;`);
-  await appendToFile('src/app/app.component.ts', `
+  await appendToFile(
+    'src/app/app.component.ts',
+    `
     (async () => { await import('./dynamic'); })();
-  `);
+  `,
+  );
 
   // Add e2e specs for each lang.
   for (const { lang, translation } of langTranslations) {
-    await writeFile(`./e2e/src/app.${lang}.e2e-spec.ts`, `
+    await writeFile(
+      `./e2e/src/app.${lang}.e2e-spec.ts`,
+      `
       import { browser, logging, element, by } from 'protractor';
 
       describe('workspace-project App', () => {
@@ -160,11 +175,12 @@ export async function setupI18nConfig(format: keyof typeof formats = 'xlf') {
         it('should display pluralized message', async () =>
           expect(await getParagraph('plural')).toEqual('${translation.plural}'));
       });
-    `);
+    `,
+    );
   }
 
   // Update angular.json to build, serve, and test each locale.
-  await updateJsonFile('angular.json', workspaceJson => {
+  await updateJsonFile('angular.json', (workspaceJson) => {
     const appProject = workspaceJson.projects['test-project'];
     const appArchitect = workspaceJson.projects['test-project'].architect;
     const buildConfigs = appArchitect['build'].configurations;
@@ -177,10 +193,12 @@ export async function setupI18nConfig(format: keyof typeof formats = 'xlf') {
     appArchitect['build'].options.optimization = true;
     appArchitect['build'].options.buildOptimizer = true;
     appArchitect['build'].options.aot = true;
-    appArchitect['build'].options.fileReplacements = [{
-      replace: 'src/environments/environment.ts',
-      with: 'src/environments/environment.prod.ts',
-    }];
+    appArchitect['build'].options.fileReplacements = [
+      {
+        replace: 'src/environments/environment.ts',
+        with: 'src/environments/environment.prod.ts',
+      },
+    ];
     appArchitect['build'].options.i18nMissingTranslation = 'error';
     appArchitect['build'].options.vendorChunk = true;
     appArchitect['build'].options.sourceMap = true;
@@ -209,7 +227,7 @@ export async function setupI18nConfig(format: keyof typeof formats = 'xlf') {
     }
   });
 
-// Install the localize package if using ivy
+  // Install the localize package if using ivy
   let localizeVersion = '@angular/localize@' + readNgVersion();
   if (getGlobalVariable('argv')['ng-snapshots']) {
     localizeVersion = require('../../ng-snapshot/package.json').dependencies['@angular/localize'];
@@ -217,11 +235,7 @@ export async function setupI18nConfig(format: keyof typeof formats = 'xlf') {
   await installPackage(localizeVersion);
 
   // Extract the translation messages.
-  await ng(
-    'extract-i18n',
-    '--output-path=src/locale',
-    `--format=${format}`,
-  );
+  await ng('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);
diff --git a/tests/legacy-cli/e2e/tests/misc/browsers.ts b/tests/legacy-cli/e2e/tests/misc/browsers.ts
index fd221cca8d90..440116abccad 100644
--- a/tests/legacy-cli/e2e/tests/misc/browsers.ts
+++ b/tests/legacy-cli/e2e/tests/misc/browsers.ts
@@ -1,7 +1,6 @@
-import * as express from 'express';
+import express from 'express';
 import * as path from 'path';
 import { copyProjectAsset } from '../../utils/assets';
-import { getGlobalVariable } from '../../utils/env';
 import { replaceInFile } from '../../utils/fs';
 import { ng } from '../../utils/process';
 
@@ -15,18 +14,10 @@ export default async function () {
     throw new Error('SauceLabs is not configured.');
   }
 
-  await replaceInFile(
-    '.browserslistrc',
-    'not IE 11',
-    'IE 11',
-  );
+  await replaceInFile('.browserslistrc', 'not IE 11', 'IE 11');
 
   // Workaround for https://github.com/angular/angular/issues/32192
-  await replaceInFile(
-    'src/app/app.component.html',
-    /class="material-icons"/g,
-    '',
-  );
+  await replaceInFile('src/app/app.component.html', /class="material-icons"/g, '');
 
   await ng('build');
 
diff --git a/tests/legacy-cli/e2e/tests/misc/http-headers.ts b/tests/legacy-cli/e2e/tests/misc/http-headers.ts
new file mode 100644
index 000000000000..23ebaaa2b5a0
--- /dev/null
+++ b/tests/legacy-cli/e2e/tests/misc/http-headers.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 { ng } from '../../utils/process';
+import { updateJsonFile } from '../../utils/project';
+
+export default async function () {
+  // This test ensures that ng e2e serves the HTTP headers that are configured
+  // in the 'headers' field of the serve options. We do this by serving the
+  // strictest possible CSP headers (default-src 'none') which blocks loading of
+  // any resources (including scripts, styles and images) and should cause ng
+  // e2e to fail with a CSP-related error, which is asserted below.
+
+  await updateJsonFile('angular.json', (json) => {
+    const serve = json['projects']['test-project']['architect']['serve'];
+    if (!serve['options']) serve['options'] = {};
+    serve['options']['headers'] = {
+      'Content-Security-Policy': "default-src 'none'",
+    };
+  });
+
+  let errorMessage = null;
+  try {
+    await ng('e2e');
+  } catch (error) {
+    errorMessage = error.message;
+  }
+
+  if (!errorMessage) {
+    throw new Error(
+      'Application loaded successfully, indicating that the CSP headers were not served.',
+    );
+  }
+  if (!errorMessage.match(/Refused to load/)) {
+    throw new Error('Expected to see CSP loading failure in error logs.');
+  }
+}
diff --git a/tests/legacy-cli/e2e/tests/misc/npm-7.ts b/tests/legacy-cli/e2e/tests/misc/npm-7.ts
index c2bff8ad9d34..1789210a534a 100644
--- a/tests/legacy-cli/e2e/tests/misc/npm-7.ts
+++ b/tests/legacy-cli/e2e/tests/misc/npm-7.ts
@@ -1,11 +1,12 @@
-import { rimraf, writeFile } from '../../utils/fs';
+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() {
+export default async function () {
   // Only relevant with npm as a package manager
   if (getActivePackageManager() !== 'npm') {
     return;
@@ -17,12 +18,18 @@ export default async function() {
   }
 
   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');
+    const { stderr: stderrUpdate1 } = await ng('update', ...extraArgs);
     if (stderrUpdate1.includes(warningText)) {
       throw new Error('ng update expected to not show npm version warning.');
     }
@@ -37,7 +44,7 @@ export default async function() {
     }
 
     // Ensure `ng update` shows npm warning
-    const { stderr: stderrUpdate2 } = await ng('update');
+    const { stderr: stderrUpdate2 } = await ng('update', ...extraArgs);
     if (!stderrUpdate2.includes(warningText)) {
       throw new Error('ng update expected to show npm version warning.');
     }
@@ -85,5 +92,4 @@ export default async function() {
     // Reset version back to 6.x
     await npm('install', '--global', 'npm@6');
   }
-
 }
diff --git a/tests/legacy-cli/e2e/tests/misc/proxy-config.ts b/tests/legacy-cli/e2e/tests/misc/proxy-config.ts
index ec5ce3d7101e..76896e92b055 100644
--- a/tests/legacy-cli/e2e/tests/misc/proxy-config.ts
+++ b/tests/legacy-cli/e2e/tests/misc/proxy-config.ts
@@ -1,14 +1,14 @@
-import * as express from 'express';
+import express from 'express';
 import * as http from 'http';
 
-import {writeFile} from '../../utils/fs';
-import {request} from '../../utils/http';
-import {killAllProcesses, ng} from '../../utils/process';
-import {ngServe} from '../../utils/project';
-import {updateJsonFile} from '../../utils/project';
-import {expectToFail} from "../../utils/utils";
+import { writeFile } from '../../utils/fs';
+import { request } from '../../utils/http';
+import { killAllProcesses, ng } from '../../utils/process';
+import { ngServe } from '../../utils/project';
+import { updateJsonFile } from '../../utils/project';
+import { expectToFail } from '../../utils/utils';
 
-export default function() {
+export default function () {
   // TODO(architect): Delete this test. It is now in devkit/build-angular.
 
   // Create an express app that serves as a proxy.
@@ -27,45 +27,59 @@ export default function() {
   const proxyConfigFile = 'proxy.config.json';
   const proxyConfig = {
     '/api/*': {
-      target: proxyServerUrl
-    }
+      target: proxyServerUrl,
+    },
   };
 
-  return Promise.resolve()
-    .then(() => writeFile(proxyConfigFile, JSON.stringify(proxyConfig, null, 2)))
-    .then(() => ngServe('--proxy-config', proxyConfigFile))
-    .then(() => request('http://localhost:4200/api/test'))
-    .then(body => {
-      if (!body.match(/TEST_API_RETURN/)) {
-        throw new Error('Response does not match expected value.');
-      }
-    })
-    .then(() => killAllProcesses(), (err) => { killAllProcesses(); throw err; })
+  return (
+    Promise.resolve()
+      .then(() => writeFile(proxyConfigFile, JSON.stringify(proxyConfig, null, 2)))
+      .then(() => ngServe('--proxy-config', proxyConfigFile))
+      .then(() => request('http://localhost:4200/api/test'))
+      .then((body) => {
+        if (!body.match(/TEST_API_RETURN/)) {
+          throw new Error('Response does not match expected value.');
+        }
+      })
+      .then(
+        () => killAllProcesses(),
+        (err) => {
+          killAllProcesses();
+          throw err;
+        },
+      )
 
-    // .then(() => updateJsonFile('angular.json', configJson => {
-    //   const app = configJson.defaults;
-    //   app.serve = {
-    //     proxyConfig: proxyConfigFile
-    //   };
-    // }))
-    // .then(() => ngServe())
-    // .then(() => request('http://localhost:4200/api/test'))
-    // .then(body => {
-    //   if (!body.match(/TEST_API_RETURN/)) {
-    //     throw new Error('Response does not match expected value.');
-    //   }
-    // })
-    // .then(() => killAllProcesses(), (err) => { killAllProcesses(); throw err; })
+      // .then(() => updateJsonFile('angular.json', configJson => {
+      //   const app = configJson.defaults;
+      //   app.serve = {
+      //     proxyConfig: proxyConfigFile
+      //   };
+      // }))
+      // .then(() => ngServe())
+      // .then(() => request('http://localhost:4200/api/test'))
+      // .then(body => {
+      //   if (!body.match(/TEST_API_RETURN/)) {
+      //     throw new Error('Response does not match expected value.');
+      //   }
+      // })
+      // .then(() => killAllProcesses(), (err) => { killAllProcesses(); throw err; })
 
-    .then(() => server.close(), (err) => { server.close(); throw err; })
+      .then(
+        () => server.close(),
+        (err) => {
+          server.close();
+          throw err;
+        },
+      )
+  );
 
-    // // A non-existing proxy file should error.
-    // .then(() => expectToFail(() => ng('serve', '--proxy-config', 'proxy.non-existent.json')))
-    // .then(() => updateJsonFile('angular.json', configJson => {
-    //   const app = configJson.defaults;
-    //   app.serve = {
-    //     proxyConfig: 'proxy.non-existent.json'
-    //   };
-    // }))
-    // .then(() => expectToFail(() => ng('serve')));
+  // // A non-existing proxy file should error.
+  // .then(() => expectToFail(() => ng('serve', '--proxy-config', 'proxy.non-existent.json')))
+  // .then(() => updateJsonFile('angular.json', configJson => {
+  //   const app = configJson.defaults;
+  //   app.serve = {
+  //     proxyConfig: 'proxy.non-existent.json'
+  //   };
+  // }))
+  // .then(() => expectToFail(() => ng('serve')));
 }
diff --git a/tests/legacy-cli/e2e/tests/misc/public-host.ts b/tests/legacy-cli/e2e/tests/misc/public-host.ts
index faf63bd82316..4a040475ece5 100644
--- a/tests/legacy-cli/e2e/tests/misc/public-host.ts
+++ b/tests/legacy-cli/e2e/tests/misc/public-host.ts
@@ -1,5 +1,4 @@
 import * as os from 'os';
-import * as _ from 'lodash';
 
 import { request } from '../../utils/http';
 import { killAllProcesses } from '../../utils/process';
@@ -8,56 +7,81 @@ import { ngServe } from '../../utils/project';
 export default function () {
   // TODO(architect): Delete this test. It is now in devkit/build-angular.
 
-  const firstLocalIp = _(os.networkInterfaces())
-    .values()
-    .flatten()
-    .filter({ family: 'IPv4', internal: false })
-    .map('address')
-    .first();
+  const firstLocalIp = Object.values(os.networkInterfaces())
+    .flat()
+    .filter((ni) => ni.family === 'IPv4' && !ni.internal)
+    .map((ni) => ni.address)
+    .shift();
   const publicHost = `${firstLocalIp}:4200`;
   const localAddress = `http://${publicHost}`;
 
-  return Promise.resolve()
-    // Disabling this test. Webpack Dev Server does not check the hots anymore when binding to
-    // numeric IP addresses.
-    // .then(() => ngServe('--host=0.0.0.0'))
-    // .then(() => request(localAddress))
-    // .then(body => {
-    //   if (!body.match(/Invalid Host header/)) {
-    //     throw new Error('Response does not match expected value.');
-    //   }
-    // })
-    // .then(() => killAllProcesses(), (err) => { killAllProcesses(); throw err; })
-    .then(() => ngServe('--host=0.0.0.0', `--public-host=${publicHost}`))
-    .then(() => request(localAddress))
-    .then(body => {
-      if (!body.match(/<app-root><\/app-root>/)) {
-        throw new Error('Response does not match expected value.');
-      }
-    })
-    .then(() => killAllProcesses(), (err) => { killAllProcesses(); throw err; })
-    .then(() => ngServe('--host=0.0.0.0', `--disable-host-check`))
-    .then(() => request(localAddress))
-    .then(body => {
-      if (!body.match(/<app-root><\/app-root>/)) {
-        throw new Error('Response does not match expected value.');
-      }
-    })
-    .then(() => killAllProcesses(), (err) => { killAllProcesses(); throw err; })
-    .then(() => ngServe('--host=0.0.0.0', `--public-host=${localAddress}`))
-    .then(() => request(localAddress))
-    .then(body => {
-      if (!body.match(/<app-root><\/app-root>/)) {
-        throw new Error('Response does not match expected value.');
-      }
-    })
-    .then(() => killAllProcesses(), (err) => { killAllProcesses(); throw err; })
-    .then(() => ngServe('--host=0.0.0.0', `--public-host=${firstLocalIp}`))
-    .then(() => request(localAddress))
-    .then(body => {
-      if (!body.match(/<app-root><\/app-root>/)) {
-        throw new Error('Response does not match expected value.');
-      }
-    })
-    .then(() => killAllProcesses(), (err) => { killAllProcesses(); throw err; });
+  return (
+    Promise.resolve()
+      // Disabling this test. Webpack Dev Server does not check the hots anymore when binding to
+      // numeric IP addresses.
+      // .then(() => ngServe('--host=0.0.0.0'))
+      // .then(() => request(localAddress))
+      // .then(body => {
+      //   if (!body.match(/Invalid Host header/)) {
+      //     throw new Error('Response does not match expected value.');
+      //   }
+      // })
+      // .then(() => killAllProcesses(), (err) => { killAllProcesses(); throw err; })
+      .then(() => ngServe('--host=0.0.0.0', `--public-host=${publicHost}`))
+      .then(() => request(localAddress))
+      .then((body) => {
+        if (!body.match(/<app-root><\/app-root>/)) {
+          throw new Error('Response does not match expected value.');
+        }
+      })
+      .then(
+        () => killAllProcesses(),
+        (err) => {
+          killAllProcesses();
+          throw err;
+        },
+      )
+      .then(() => ngServe('--host=0.0.0.0', `--disable-host-check`))
+      .then(() => request(localAddress))
+      .then((body) => {
+        if (!body.match(/<app-root><\/app-root>/)) {
+          throw new Error('Response does not match expected value.');
+        }
+      })
+      .then(
+        () => killAllProcesses(),
+        (err) => {
+          killAllProcesses();
+          throw err;
+        },
+      )
+      .then(() => ngServe('--host=0.0.0.0', `--public-host=${localAddress}`))
+      .then(() => request(localAddress))
+      .then((body) => {
+        if (!body.match(/<app-root><\/app-root>/)) {
+          throw new Error('Response does not match expected value.');
+        }
+      })
+      .then(
+        () => killAllProcesses(),
+        (err) => {
+          killAllProcesses();
+          throw err;
+        },
+      )
+      .then(() => ngServe('--host=0.0.0.0', `--public-host=${firstLocalIp}`))
+      .then(() => request(localAddress))
+      .then((body) => {
+        if (!body.match(/<app-root><\/app-root>/)) {
+          throw new Error('Response does not match expected value.');
+        }
+      })
+      .then(
+        () => killAllProcesses(),
+        (err) => {
+          killAllProcesses();
+          throw err;
+        },
+      )
+  );
 }
diff --git a/tests/legacy-cli/e2e/tests/misc/trusted-types.ts b/tests/legacy-cli/e2e/tests/misc/trusted-types.ts
new file mode 100644
index 000000000000..4efb8b9f70e3
--- /dev/null
+++ b/tests/legacy-cli/e2e/tests/misc/trusted-types.ts
@@ -0,0 +1,78 @@
+/**
+ * @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 { appendToFile, prependToFile, replaceInFile, writeFile } from '../../utils/fs';
+import { ng } from '../../utils/process';
+import { updateJsonFile } from '../../utils/project';
+
+export default async function () {
+  // Add app routing.
+  // This is done automatically on a new app with --routing.
+  await prependToFile('src/app/app.module.ts', `import { RouterModule } from '@angular/router';`);
+  await replaceInFile(
+    'src/app/app.module.ts',
+    `imports: [`,
+    `imports: [ RouterModule.forRoot([]),`,
+  );
+  await appendToFile('src/app/app.component.html', '<router-outlet></router-outlet>');
+
+  // Add lazy route.
+  await ng('generate', 'module', 'lazy', '--route', 'lazy', '--module', 'app.module');
+
+  // Add lazy route e2e
+  await writeFile(
+    'e2e/src/app.e2e-spec.ts',
+    `
+     import { browser, logging, element, by } from 'protractor';
+
+     describe('workspace-project App', () => {
+       it('should display lazy route', async () => {
+         await browser.get(browser.baseUrl + '/lazy');
+         expect(await element(by.css('app-lazy p')).getText()).toEqual('lazy 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,
+         }));
+       });
+     });
+   `,
+  );
+
+  const testCases = [
+    {
+      aot: false,
+      csp: `trusted-types angular angular#unsafe-bypass angular#unsafe-jit angular#bundler; require-trusted-types-for 'script';`,
+    },
+    {
+      aot: true,
+      csp: `trusted-types angular angular#unsafe-bypass angular#bundler; require-trusted-types-for 'script';`,
+    },
+  ];
+
+  for (const { aot, csp } of testCases) {
+    await updateJsonFile('angular.json', (json) => {
+      const architect = json['projects']['test-project']['architect'];
+      architect['build']['options']['aot'] = aot;
+      if (!architect['serve']['options']) architect['serve']['options'] = {};
+      architect['serve']['options']['headers'] = {
+        'Content-Security-Policy': csp,
+      };
+    });
+
+    try {
+      await ng('e2e');
+    } catch (error) {
+      console.error(`Test case AOT ${aot} with CSP header ${csp} failed.`);
+      throw error;
+    }
+  }
+}
diff --git a/tests/legacy-cli/e2e/tests/misc/version.ts b/tests/legacy-cli/e2e/tests/misc/version.ts
index 9d6858ac1362..c39c3167bf0b 100644
--- a/tests/legacy-cli/e2e/tests/misc/version.ts
+++ b/tests/legacy-cli/e2e/tests/misc/version.ts
@@ -1,7 +1,7 @@
 import { deleteFile } from '../../utils/fs';
 import { ng } from '../../utils/process';
 
-export default async function() {
+export default async function () {
   const { stdout: commandOutput } = await ng('version');
   const { stdout: optionOutput } = await ng('--version');
   if (!optionOutput.includes('Angular CLI:')) {
@@ -12,6 +12,14 @@ export default async function() {
     throw new Error('version variants have differing output');
   }
 
+  if (commandOutput.includes(process.versions.node + ' (Unsupported)')) {
+    throw new Error('Node version should not show unsupported entry');
+  }
+
+  if (commandOutput.includes('Warning: The current version of Node ')) {
+    throw new Error('Node support warning should not be shown');
+  }
+
   // doesn't fail on a project with missing angular.json
   await deleteFile('angular.json');
   await ng('version');
diff --git a/tests/legacy-cli/e2e/tests/third-party/material-icons.ts b/tests/legacy-cli/e2e/tests/third-party/material-icons.ts
deleted file mode 100644
index b8fc94763d25..000000000000
--- a/tests/legacy-cli/e2e/tests/third-party/material-icons.ts
+++ /dev/null
@@ -1,29 +0,0 @@
-import { expectFileToMatch } from '../../utils/fs';
-import { installPackage } from '../../utils/packages';
-import { ng } from '../../utils/process';
-import { updateJsonFile } from '../../utils/project';
-
-export default async function() {
-  // Install material design icons
-  await installPackage('material-design-icons@3.0.1');
-
-  // Add icon stylesheet to application
-  await updateJsonFile('angular.json', workspaceJson => {
-    const appArchitect = workspaceJson.projects['test-project'].architect;
-    appArchitect.build.options.styles = [
-      { input: 'node_modules/material-design-icons/iconfont/material-icons.css' },
-    ];
-  });
-
-  // Build dev application
-  await ng('build', '--extract-css', '--configuration=development');
-
-  // Ensure icons are included
-  await expectFileToMatch('dist/test-project/styles.css', 'Material Icons');
-
-  // Build prod application
-  await ng('build', '--extract-css', '--output-hashing=none');
-
-  // Ensure icons are included
-  await expectFileToMatch('dist/test-project/styles.css', 'Material Icons');
-}
diff --git a/tests/legacy-cli/e2e/tests/update/update-8.ts b/tests/legacy-cli/e2e/tests/update/update-8.ts
index 11c5a2ca23ec..872c4da269fd 100644
--- a/tests/legacy-cli/e2e/tests/update/update-8.ts
+++ b/tests/legacy-cli/e2e/tests/update/update-8.ts
@@ -5,8 +5,6 @@ import { ng, noSilentNg } from '../../utils/process';
 import { isPrereleaseCli, useCIChrome, useCIDefaults } from '../../utils/project';
 
 export default async function () {
-  const extraUpdateArgs = await isPrereleaseCli()  || true ? ['--next', '--force'] : [];
-
   // We need to use the public registry because in the local NPM server we don't have
   // older versions @angular/cli packages which would cause `npm install` during `ng update` to fail.
   try {
@@ -18,7 +16,7 @@ export default async function () {
     // 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\'')) {
+    if (!stdout.includes("Executing migrations of package '@angular/cli'")) {
       throw new Error('Update did not execute migrations. OUTPUT: \n' + stdout);
     }
 
@@ -32,7 +30,12 @@ export default async function () {
   }
 
   // Update Angular current build
-  await ng('update', '@angular/cli', '@angular/core', ...extraUpdateArgs);
+  const extraUpdateArgs = isPrereleaseCli() ? ['--next', '--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('./');
diff --git a/tests/legacy-cli/e2e/tests/update/update-secure-registry.ts b/tests/legacy-cli/e2e/tests/update/update-secure-registry.ts
new file mode 100644
index 000000000000..f6f7621ffc9a
--- /dev/null
+++ b/tests/legacy-cli/e2e/tests/update/update-secure-registry.ts
@@ -0,0 +1,35 @@
+import { ng } from '../../utils/process';
+import { createNpmConfigForAuthentication } from '../../utils/registry';
+import { expectToFail } from '../../utils/utils';
+import { isPrereleaseCli } from '../../utils/project';
+
+export default async function () {
+  // The environment variable has priority over the .npmrc
+  delete process.env['NPM_CONFIG_REGISTRY'];
+  const worksMessage = 'We analyzed your package.json';
+
+  const extraArgs = [];
+  if (isPrereleaseCli()) {
+    extraArgs.push('--next');
+  }
+
+  // Valid authentication token
+  await createNpmConfigForAuthentication(false);
+  const { stdout: stdout1 } = await ng('update', ...extraArgs);
+  if (!stdout1.includes(worksMessage)) {
+    throw new Error(`Expected stdout to contain "${worksMessage}"`);
+  }
+
+  await createNpmConfigForAuthentication(true);
+  const { stdout: stdout2 } = await ng('update', ...extraArgs);
+  if (!stdout2.includes(worksMessage)) {
+    throw new Error(`Expected stdout to contain "${worksMessage}"`);
+  }
+
+  // Invalid authentication token
+  await createNpmConfigForAuthentication(false, true);
+  await expectToFail(() => ng('update', ...extraArgs));
+
+  await createNpmConfigForAuthentication(true, true);
+  await expectToFail(() => ng('update', ...extraArgs));
+}
diff --git a/tests/legacy-cli/e2e/utils/assets.ts b/tests/legacy-cli/e2e/utils/assets.ts
index e2d3f2f0a969..ac0e321ddf27 100644
--- a/tests/legacy-cli/e2e/utils/assets.ts
+++ b/tests/legacy-cli/e2e/utils/assets.ts
@@ -1,5 +1,5 @@
 import { join } from 'path';
-import * as glob from 'glob';
+import glob from 'glob';
 import { getGlobalVariable } from './env';
 import { relative, resolve } from 'path';
 import { copyFile, writeFile } from './fs';
diff --git a/tests/legacy-cli/e2e/utils/fs.ts b/tests/legacy-cli/e2e/utils/fs.ts
index 6b696065b829..3123ec6f5a5d 100644
--- a/tests/legacy-cli/e2e/utils/fs.ts
+++ b/tests/legacy-cli/e2e/utils/fs.ts
@@ -1,195 +1,127 @@
-import * as fs from 'fs-extra';
-import {dirname} from 'path';
-import {stripIndents} from 'common-tags';
-
-
-export function readFile(fileName: string) {
-  return new Promise<string>((resolve, reject) => {
-    fs.readFile(fileName, 'utf-8', (err: any, data: string) => {
-      if (err) {
-        reject(err);
-      } else {
-        resolve(data);
-      }
-    });
-  });
-}
+import { promises as fs, constants } from 'fs';
+import { dirname, join } from 'path';
+import { stripIndents } from 'common-tags';
 
-export function writeFile(fileName: string, content: string, options?: any) {
-  return new Promise<void>((resolve, reject) => {
-    fs.writeFile(fileName, content, options, (err: any) => {
-      if (err) {
-        reject(err);
-      } else {
-        resolve();
-      }
-    });
-  });
+export function readFile(fileName: string): Promise<string> {
+  return fs.readFile(fileName, 'utf-8');
 }
 
-
-export function deleteFile(path: string) {
-  return new Promise<void>((resolve, reject) => {
-    fs.unlink(path, (err) => {
-      if (err) {
-        reject(err);
-      } else {
-        resolve();
-      }
-    });
-  });
+export function writeFile(fileName: string, content: string, options?: any): Promise<void> {
+  return fs.writeFile(fileName, content, options);
 }
 
-
-export function rimraf(path: string) {
-  return new Promise<void>((resolve, reject) => {
-    fs.remove(path, (err?: any) => {
-      if (err) {
-        reject(err);
-      } else {
-        resolve();
-      }
-    });
-  });
+export function deleteFile(path: string): Promise<void> {
+  return fs.unlink(path);
 }
 
-
-export function moveFile(from: string, to: string) {
-  return new Promise<void>((resolve, reject) => {
-    fs.rename(from, to, (err) => {
-      if (err) {
-        reject(err);
-      } else {
-        resolve();
-      }
-    });
-  });
+export function rimraf(path: string): Promise<void> {
+  return fs.rmdir(path, { recursive: true, maxRetries: 3 });
 }
 
-
-export function symlinkFile(from: string, to: string, type?: string) {
-  return new Promise<void>((resolve, reject) => {
-    fs.symlink(from, to, type, (err) => {
-      if (err) {
-        reject(err);
-      } else {
-        resolve();
-      }
-    });
-  });
+export function moveFile(from: string, to: string): Promise<void> {
+  return fs.rename(from, to);
 }
 
-export function createDir(path: string) {
-  return _recursiveMkDir(path);
+export function symlinkFile(from: string, to: string, type?: string): Promise<void> {
+  return fs.symlink(from, to, type);
 }
 
-
-function _recursiveMkDir(path: string): Promise<void> {
-  if (fs.existsSync(path)) {
-    return Promise.resolve();
-  } else {
-    return _recursiveMkDir(dirname(path))
-      .then(() => fs.mkdirSync(path));
-  }
+export function createDir(path: string): Promise<void> {
+  return fs.mkdir(path, { recursive: true });
 }
 
-export function copyFile(from: string, to: string) {
-  return _recursiveMkDir(dirname(to))
-    .then(() => new Promise((resolve, reject) => {
-      const rd = fs.createReadStream(from);
-      rd.on('error', (err: Error) => reject(err));
+export async function copyFile(from: string, to: string): Promise<void> {
+  await createDir(dirname(to));
 
-      const wr = fs.createWriteStream(to);
-      wr.on('error', (err: Error) => reject(err));
-      wr.on('close', () => resolve());
-
-      rd.pipe(wr);
-    }));
+  return fs.copyFile(from, to, constants.COPYFILE_FICLONE);
 }
 
-export function moveDirectory(from: string, to: string) {
-  return fs.move(from, to, { overwrite: true });
-}
+export async function moveDirectory(from: string, to: string): Promise<void> {
+  await rimraf(to);
+  await createDir(to);
 
+  for (const entry of await fs.readdir(from)) {
+    const fromEntry = join(from, entry);
+    const toEntry = join(to, entry);
+    if ((await fs.stat(fromEntry)).isFile()) {
+      await copyFile(fromEntry, toEntry);
+    } else {
+      await moveDirectory(fromEntry, toEntry);
+    }
+  }
+}
 
 export function writeMultipleFiles(fs: { [path: string]: string }) {
-  return Promise.all(Object.keys(fs).map(fileName => writeFile(fileName, fs[fileName])));
+  return Promise.all(Object.keys(fs).map((fileName) => writeFile(fileName, fs[fileName])));
 }
 
-
 export function replaceInFile(filePath: string, match: RegExp | string, replacement: string) {
-  return readFile(filePath)
-    .then((content: string) => writeFile(filePath, content.replace(match, replacement)));
+  return readFile(filePath).then((content: string) =>
+    writeFile(filePath, content.replace(match, replacement)),
+  );
 }
 
-
 export function appendToFile(filePath: string, text: string, options?: any) {
-  return readFile(filePath)
-    .then((content: string) => writeFile(filePath, content.concat(text), options));
+  return readFile(filePath).then((content: string) =>
+    writeFile(filePath, content.concat(text), options),
+  );
 }
 
-
 export function prependToFile(filePath: string, text: string, options?: any) {
-  return readFile(filePath)
-    .then((content: string) => writeFile(filePath, text.concat(content), options));
+  return readFile(filePath).then((content: string) =>
+    writeFile(filePath, text.concat(content), options),
+  );
 }
 
+export async function expectFileMatchToExist(dir: string, regex: RegExp): Promise<string> {
+  const files = await fs.readdir(dir);
+  const fileName = files.find((name) => regex.test(name));
 
-export function expectFileMatchToExist(dir: string, regex: RegExp) {
-  return new Promise((resolve, reject) => {
-    const [fileName] = fs.readdirSync(dir).filter(name => name.match(regex));
-    if (!fileName) {
-      reject(new Error(`File ${regex} was expected to exist but not found...`));
-    }
-    resolve(fileName);
-  });
+  if (!fileName) {
+    throw new Error(`File ${regex} was expected to exist but not found...`);
+  }
+
+  return fileName;
 }
 
-export function expectFileNotToExist(fileName: string) {
-  return new Promise((resolve, reject) => {
-    fs.exists(fileName, (exist) => {
-      if (exist) {
-        reject(new Error(`File ${fileName} was expected not to exist but found...`));
-      } else {
-        resolve();
-      }
-    });
-  });
+export async function expectFileNotToExist(fileName: string): Promise<void> {
+  try {
+    await fs.access(fileName, constants.F_OK);
+  } catch {
+    return;
+  }
+
+  throw new Error(`File ${fileName} was expected not to exist but found...`);
 }
 
-export function expectFileToExist(fileName: string) {
-  return new Promise((resolve, reject) => {
-    fs.exists(fileName, (exist) => {
-      if (exist) {
-        resolve();
-      } else {
-        reject(new Error(`File ${fileName} was expected to exist but not found...`));
-      }
-    });
-  });
+export async function expectFileToExist(fileName: string): Promise<void> {
+  try {
+    await fs.access(fileName, constants.F_OK);
+  } catch {
+    throw new Error(`File ${fileName} was expected to exist but not found...`);
+  }
 }
 
 export function expectFileToMatch(fileName: string, regEx: RegExp | string) {
-  return readFile(fileName)
-    .then(content => {
-      if (typeof regEx == 'string') {
-        if (content.indexOf(regEx) == -1) {
-          throw new Error(stripIndents`File "${fileName}" did not contain "${regEx}"...
+  return readFile(fileName).then((content) => {
+    if (typeof regEx == 'string') {
+      if (content.indexOf(regEx) == -1) {
+        throw new Error(stripIndents`File "${fileName}" did not contain "${regEx}"...
             Content:
             ${content}
             ------
           `);
-        }
-      } else {
-        if (!content.match(regEx)) {
-          throw new Error(stripIndents`File "${fileName}" did not contain "${regEx}"...
+      }
+    } else {
+      if (!content.match(regEx)) {
+        throw new Error(stripIndents`File "${fileName}" did not contain "${regEx}"...
             Content:
             ${content}
             ------
           `);
-        }
       }
-    });
+    }
+  });
 }
 
 export async function getFileSize(fileName: string) {
@@ -202,6 +134,8 @@ export async function expectFileSizeToBeUnder(fileName: string, sizeInBytes: num
   const fileSize = await getFileSize(fileName);
 
   if (fileSize > sizeInBytes) {
-    throw new Error(`File "${fileName}" exceeded file size of "${sizeInBytes}". Size is ${fileSize}.`);
+    throw new Error(
+      `File "${fileName}" exceeded file size of "${sizeInBytes}". Size is ${fileSize}.`,
+    );
   }
 }
diff --git a/tests/legacy-cli/e2e/utils/http.ts b/tests/legacy-cli/e2e/utils/http.ts
index fa0fbc32c3c5..b18b697a2b32 100644
--- a/tests/legacy-cli/e2e/utils/http.ts
+++ b/tests/legacy-cli/e2e/utils/http.ts
@@ -1,13 +1,12 @@
-import {IncomingMessage} from 'http';
-import * as _request from 'request';
-
+import { IncomingMessage } from 'http';
+import _request from 'request';
 
 export function request(url: string): Promise<string> {
   return new Promise((resolve, reject) => {
     let options = {
       url: url,
       headers: { 'Accept': 'text/html' },
-      agentOptions: { rejectUnauthorized: false }
+      agentOptions: { rejectUnauthorized: false },
     };
     _request(options, (error: any, response: IncomingMessage, body: string) => {
       if (error) {
diff --git a/tests/legacy-cli/e2e/utils/packages.ts b/tests/legacy-cli/e2e/utils/packages.ts
index a8416c9ae24c..2f7fdef6f271 100644
--- a/tests/legacy-cli/e2e/utils/packages.ts
+++ b/tests/legacy-cli/e2e/utils/packages.ts
@@ -53,8 +53,7 @@ export async function setRegistry(useTestRegistry: boolean): Promise<void> {
     // 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}`);
+    // Yarn supports both `NPM_CONFIG_REGISTRY` and `YARN_REGISTRY`.
     process.env['NPM_CONFIG_REGISTRY'] = url;
   }
 }
diff --git a/tests/legacy-cli/e2e/utils/project.ts b/tests/legacy-cli/e2e/utils/project.ts
index e53158b69cb2..df5317e0cb56 100644
--- a/tests/legacy-cli/e2e/utils/project.ts
+++ b/tests/legacy-cli/e2e/utils/project.ts
@@ -8,94 +8,56 @@ import { gitCommit } from './git';
 import { installWorkspacePackages } from './packages';
 import { execAndWaitForOutputToMatch, git, ng } from './process';
 
-const tsConfigPath = 'tsconfig.json';
-
-
 export function updateJsonFile(filePath: string, fn: (json: any) => any | void) {
-  return readFile(filePath)
-    .then(tsConfigJson => {
-      // Remove single and multiline comments
-      const tsConfig = JSON.parse(tsConfigJson.replace(/\/\*\s(.|\n|\r)*\s\*\/|\/\/.*/g, ''));
-      const result = fn(tsConfig) || tsConfig;
+  return readFile(filePath).then((tsConfigJson) => {
+    // Remove single and multiline comments
+    const tsConfig = JSON.parse(tsConfigJson.replace(/\/\*\s(.|\n|\r)*\s\*\/|\/\/.*/g, ''));
+    const result = fn(tsConfig) || tsConfig;
 
-      return writeFile(filePath, JSON.stringify(result, null, 2));
-    });
+    return writeFile(filePath, JSON.stringify(result, null, 2));
+  });
 }
 
-
 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./);
+  return execAndWaitForOutputToMatch('ng', ['serve', ...args], / Compiled successfully./);
 }
 
 export async function prepareProjectForE2e(name) {
   const argv: string[] = getGlobalVariable('argv');
 
-  await git(
-    'config',
-    'user.email',
-    'angular-core+e2e@google.com',
-  );
-  await git(
-    'config',
-    'user.name',
-    'Angular CLI E2e',
-  );
-  await git(
-    'config',
-    'commit.gpgSign',
-    'false',
-  );
+  await git('config', 'user.email', 'angular-core+e2e@google.com');
+  await git('config', 'user.name', 'Angular CLI E2e');
+  await git('config', 'commit.gpgSign', 'false');
 
-  await useCIChrome(
-    'e2e',
-  );
-  await useCIChrome(
-    '',
-  );
+  await ng('generate', '@schematics/angular:e2e', '--related-app-name', name);
+
+  await useCIChrome('e2e');
+  await useCIChrome('');
 
   // legacy projects
-  await useCIChrome(
-    'src',
-  );
+  await useCIChrome('src');
 
   if (argv['ng-snapshots'] || argv['ng-tag']) {
     await useSha();
   }
 
-  console.log(
-    `Project ${name} created... Installing npm.`,
-  );
+  console.log(`Project ${name} created... Installing npm.`);
   await installWorkspacePackages();
-  await useCIDefaults(
-    name,
-  );
+  await useCIDefaults(name);
   // Force sourcemaps to be from the root of the filesystem.
-  await updateJsonFile(
-    'tsconfig.json',
-    json => {
-      json[
-        'compilerOptions'
-      ][
-        'sourceRoot'
-      ] =
-        '/';
-    },
-  );
-  await gitCommit(
-    'prepare-project-for-e2e',
-  );
+  await updateJsonFile('tsconfig.json', (json) => {
+    json['compilerOptions']['sourceRoot'] = '/';
+  });
+  await gitCommit('prepare-project-for-e2e');
 }
 
 export function useBuiltPackages() {
-  return Promise.resolve()
-    .then(() => updateJsonFile('package.json', json => {
+  return Promise.resolve().then(() =>
+    updateJsonFile('package.json', (json) => {
       if (!json['dependencies']) {
         json['dependencies'] = {};
       }
@@ -104,14 +66,14 @@ export function useBuiltPackages() {
       }
 
       for (const packageName of Object.keys(packages)) {
-        if (json['dependencies'].hasOwnProperty(packageName)
-        ) {
+        if (json['dependencies'].hasOwnProperty(packageName)) {
           json['dependencies'][packageName] = packages[packageName].tar;
         } else if (json['devDependencies'].hasOwnProperty(packageName)) {
           json['devDependencies'][packageName] = packages[packageName].tar;
         }
       }
-    }));
+    }),
+  );
 }
 
 export function useSha() {
@@ -122,20 +84,19 @@ export function useSha() {
     // 6.1.6+4a8d56a
     const label = argv['ng-tag'] ? argv['ng-tag'] : '';
     const ngSnapshotVersions = require('../ng-snapshot/package.json');
-    return updateJsonFile('package.json', json => {
+    return updateJsonFile('package.json', (json) => {
       // Install over the project with snapshot builds.
       function replaceDependencies(key: string) {
         const missingSnapshots = [];
         Object.keys(json[key] || {})
-          .filter(name => name.match(/^@angular\//))
-          .forEach(name => {
+          .filter((name) => name.match(/^@angular\//))
+          .forEach((name) => {
             const pkgName = name.split(/\//)[1];
             if (pkgName == 'cli') {
               return;
             }
             if (label) {
-              json[key][`@angular/${pkgName}`]
-                = `github:angular/${pkgName}-builds${label}`;
+              json[key][`@angular/${pkgName}`] = `github:angular/${pkgName}-builds${label}`;
             } else {
               const replacement = ngSnapshotVersions.dependencies[`@angular/${pkgName}`];
               if (!replacement) {
@@ -145,8 +106,11 @@ export function useSha() {
             }
           });
         if (missingSnapshots.length > 0) {
-          throw new Error('e2e test with --ng-snapshots requires all angular packages be ' +
-            'listed in tests/legacy-cli/e2e/ng-snapshot/package.json.\nErrors:\n' + missingSnapshots.join('\n  '));
+          throw new Error(
+            'e2e test with --ng-snapshots requires all angular packages be ' +
+              'listed in tests/legacy-cli/e2e/ng-snapshot/package.json.\nErrors:\n' +
+              missingSnapshots.join('\n  '),
+          );
         }
       }
       try {
@@ -162,11 +126,11 @@ export function useSha() {
 }
 
 export function useNgVersion(version: string) {
-  return updateJsonFile('package.json', json => {
+  return updateJsonFile('package.json', (json) => {
     // Install over the project with specific versions.
     Object.keys(json['dependencies'] || {})
-      .filter(name => name.match(/^@angular\//))
-      .forEach(name => {
+      .filter((name) => name.match(/^@angular\//))
+      .forEach((name) => {
         const pkgName = name.split(/\//)[1];
         if (pkgName == 'cli') {
           return;
@@ -175,8 +139,8 @@ export function useNgVersion(version: string) {
       });
 
     Object.keys(json['devDependencies'] || {})
-      .filter(name => name.match(/^@angular\//))
-      .forEach(name => {
+      .filter((name) => name.match(/^@angular\//))
+      .forEach((name) => {
         const pkgName = name.split(/\//)[1];
         if (pkgName == 'cli') {
           return;
@@ -202,7 +166,7 @@ export function useNgVersion(version: string) {
 }
 
 export function useCIDefaults(projectName = 'test-project') {
-  return updateJsonFile('angular.json', workspaceJson => {
+  return updateJsonFile('angular.json', (workspaceJson) => {
     // Disable progress reporting on CI to reduce spam.
     const project = workspaceJson.projects[projectName];
     const appTargets = project.targets || project.architect;
@@ -261,9 +225,8 @@ export async function useCIChrome(projectDir: string = ''): Promise<void> {
   }
 }
 
-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/utils/registry.ts b/tests/legacy-cli/e2e/utils/registry.ts
new file mode 100644
index 000000000000..4395e5b1cae7
--- /dev/null
+++ b/tests/legacy-cli/e2e/utils/registry.ts
@@ -0,0 +1,78 @@
+import { ChildProcess, spawn } from 'child_process';
+import { copyFileSync, mkdtempSync, realpathSync } from 'fs';
+import { tmpdir } from 'os';
+import { join } from 'path';
+import { writeFile } from './fs';
+
+export function createNpmRegistry(withAuthentication = false): ChildProcess {
+  // Setup local package registry
+  const registryPath = mkdtempSync(join(realpathSync(tmpdir()), 'angular-cli-e2e-registry-'));
+
+  copyFileSync(
+    join(__dirname, '../../', withAuthentication ? 'verdaccio_auth.yaml' : 'verdaccio.yaml'),
+    join(registryPath, 'verdaccio.yaml'),
+  );
+
+  return spawn('node', [require.resolve('verdaccio/bin/verdaccio'), '-c', './verdaccio.yaml'], {
+    cwd: registryPath,
+    stdio: 'inherit',
+  });
+}
+
+// Token was generated using `echo -n 'testing:s3cret' | openssl base64`.
+const VALID_TOKEN = `dGVzdGluZzpzM2NyZXQ=`;
+const SECURE_REGISTRY = `//localhost:4876/`;
+
+export function createNpmConfigForAuthentication(
+  /**
+   * When true, the authentication token will be scoped to the registry URL.
+   * @example
+   * ```ini
+   * //localhost:4876/:_auth="dGVzdGluZzpzM2NyZXQ="
+   * ```
+   *
+   * When false, the authentication will be added as seperate key.
+   * @example
+   * ```ini
+   * _auth="dGVzdGluZzpzM2NyZXQ="`
+   * ```
+   */
+  scopedAuthentication: boolean,
+  /** When true, an incorrect token is used. Use this to validate authentication failures. */
+  invalidToken = false,
+): Promise<void> {
+  const token = invalidToken ? `invalid=` : VALID_TOKEN;
+  const registry = SECURE_REGISTRY;
+
+  return writeFile(
+    '.npmrc',
+    scopedAuthentication
+      ? `
+        ${registry}:_auth="${token}"
+        registry=http:${registry}
+      `
+      : `
+        _auth="${token}"
+        registry=http:${registry}
+      `,
+  );
+}
+
+export function setNpmEnvVarsForAuthentication(
+  /** When true, an incorrect token is used. Use this to validate authentication failures. */
+  invalidToken = false,
+  /** When true, `YARN_REGISTRY` is used instead of `NPM_CONFIG_REGISTRY`. */
+  useYarnEnvVariable = false,
+): void {
+  delete process.env['YARN_REGISTRY'];
+  delete process.env['NPM_CONFIG_REGISTRY'];
+
+  const registryKey = useYarnEnvVariable ? 'YARN_REGISTRY' : 'NPM_CONFIG_REGISTRY';
+  process.env[registryKey] = `http:${SECURE_REGISTRY}`;
+
+  process.env['NPM_CONFIG__AUTH'] = invalidToken ? `invalid=` : VALID_TOKEN;
+
+  // Needed for verdaccio when used with yarn
+  // https://verdaccio.org/docs/en/cli-registry#yarn
+  process.env['NPM_CONFIG_ALWAYS_AUTH'] = 'true';
+}
diff --git a/tests/legacy-cli/e2e_runner.ts b/tests/legacy-cli/e2e_runner.ts
index 182bc2edb714..6fdc31ec6bdf 100644
--- a/tests/legacy-cli/e2e_runner.ts
+++ b/tests/legacy-cli/e2e_runner.ts
@@ -3,14 +3,12 @@
 import { logging } from '@angular-devkit/core';
 import { createConsoleLogger } from '@angular-devkit/core/node';
 import * as colors from 'ansi-colors';
-import { spawn } from 'child_process';
-import * as fs from 'fs';
-import * as glob from 'glob';
-import * as minimist from 'minimist';
-import * as os from 'os';
+import glob from 'glob';
+import minimist from 'minimist';
 import * as path from 'path';
 import { setGlobalVariable } from './e2e/utils/env';
 import { gitClean } from './e2e/utils/git';
+import { createNpmRegistry } from './e2e/utils/registry';
 
 Error.stackTraceLimit = Infinity;
 
@@ -57,11 +55,11 @@ const argv = minimist(process.argv.slice(2), {
 process.exitCode = 255;
 
 const logger = createConsoleLogger(argv.verbose, process.stdout, process.stderr, {
-  info: s => s,
-  debug: s => s,
-  warn: s => colors.bold.yellow(s),
-  error: s => colors.bold.red(s),
-  fatal: s => colors.bold.red(s),
+  info: (s) => s,
+  debug: (s) => s,
+  warn: (s) => colors.bold.yellow(s),
+  error: (s) => colors.bold.red(s),
+  fatal: (s) => colors.bold.red(s),
 });
 
 const logStack = [logger];
@@ -75,25 +73,25 @@ let currentFileName = null;
 const e2eRoot = path.join(__dirname, 'e2e');
 const allSetups = glob
   .sync(path.join(e2eRoot, 'setup/**/*.ts'), { nodir: true })
-  .map(name => path.relative(e2eRoot, name))
+  .map((name) => path.relative(e2eRoot, name))
   .sort();
 const allTests = glob
   .sync(path.join(e2eRoot, testGlob), { nodir: true, ignore: argv.ignore })
-  .map(name => path.relative(e2eRoot, name))
+  .map((name) => path.relative(e2eRoot, name))
   // Replace windows slashes.
-  .map(name => name.replace(/\\/g, '/'))
+  .map((name) => name.replace(/\\/g, '/'))
   .sort()
-  .filter(name => !name.endsWith('/setup.ts'));
+  .filter((name) => !name.endsWith('/setup.ts'));
 
 const shardId = 'shard' in argv ? argv['shard'] : null;
 const nbShards = (shardId === null ? 1 : argv['nb-shards']) || 2;
-const tests = allTests.filter(name => {
+const tests = allTests.filter((name) => {
   // Check for naming tests on command line.
   if (argv._.length == 0) {
     return true;
   }
 
-  return argv._.some(argName => {
+  return argv._.some((argName) => {
     return (
       path.join(process.cwd(), argName) == path.join(__dirname, 'e2e', name) ||
       argName == name ||
@@ -127,18 +125,8 @@ setGlobalVariable('ci', process.env['CI']?.toLowerCase() === 'true' || process.e
 setGlobalVariable('package-manager', argv.yarn ? 'yarn' : 'npm');
 setGlobalVariable('package-registry', 'http://localhost:4873');
 
-// Setup local package registry
-const registryPath =
-  fs.mkdtempSync(path.join(fs.realpathSync(os.tmpdir()), 'angular-cli-e2e-registry-'));
-fs.copyFileSync(
-  path.join(__dirname, 'verdaccio.yaml'),
-  path.join(registryPath, 'verdaccio.yaml'),
-);
-const registryProcess = spawn(
-  'node',
-  [require.resolve('verdaccio/bin/verdaccio'), '-c', './verdaccio.yaml'],
-  { cwd: registryPath, stdio: 'inherit' },
-);
+const registryProcess = createNpmRegistry();
+const secureRegistryProcess = createNpmRegistry(true);
 
 testsToRun
   .reduce((previous, relativeName, testIndex) => {
@@ -153,6 +141,10 @@ testsToRun
       const start = +new Date();
 
       const module = require(absoluteName);
+      const originalEnvVariables = {
+        ...process.env,
+      };
+
       const fn: (skipClean?: () => void) => Promise<void> | void =
         typeof module == 'function'
           ? module
@@ -172,7 +164,7 @@ testsToRun
         .then(() => fn(() => (clean = false)))
         .then(
           () => logStack.pop(),
-          err => {
+          (err) => {
             logStack.pop();
             throw err;
           },
@@ -181,19 +173,22 @@ testsToRun
         .then(() => {
           // If we're not in a setup, change the directory back to where it was before the test.
           // This allows tests to chdir without worrying about keeping the original directory.
-          if (allSetups.indexOf(relativeName) == -1 && previousDir) {
+          if (!allSetups.includes(relativeName) && previousDir) {
             process.chdir(previousDir);
+
+            // Restore env variables before each test.
+            console.log('  Restoring original environment variables...');
+            process.env = originalEnvVariables;
           }
         })
         .then(() => {
           // Only clean after a real test, not a setup step. Also skip cleaning if the test
           // requested an exception.
-          if (allSetups.indexOf(relativeName) == -1 && clean) {
+          if (!allSetups.includes(relativeName) && clean) {
             logStack.push(new logging.NullLogger());
-
             return gitClean().then(
               () => logStack.pop(),
-              err => {
+              (err) => {
                 logStack.pop();
                 throw err;
               },
@@ -202,7 +197,7 @@ testsToRun
         })
         .then(
           () => printFooter(currentFileName, start),
-          err => {
+          (err) => {
             printFooter(currentFileName, start);
             console.error(err);
             throw err;
@@ -212,22 +207,20 @@ testsToRun
   }, Promise.resolve())
   .then(
     () => {
-      if (registryProcess) {
-        registryProcess.kill();
-      }
+      registryProcess.kill();
+      secureRegistryProcess.kill();
 
       console.log(colors.green('Done.'));
       process.exit(0);
     },
-    err => {
+    (err) => {
       console.log('\n');
       console.error(colors.red(`Test "${currentFileName}" failed...`));
       console.error(colors.red(err.message));
       console.error(colors.red(err.stack));
 
-      if (registryProcess) {
-        registryProcess.kill();
-      }
+      registryProcess.kill();
+      secureRegistryProcess.kill();
 
       if (argv.debug) {
         console.log(`Current Directory: ${process.cwd()}`);
@@ -251,8 +244,12 @@ function printHeader(testName: string, testIndex: number) {
       : (testIndex - allSetups.length) * nbShards + shardId + allSetups.length) + 1;
   const length = tests.length + allSetups.length;
   const shard =
-    shardId === null ? '' : colors.yellow(` [${shardId}:${nbShards}]` + colors.bold(` (${fullIndex}/${length})`));
-  console.log(colors.green(`Running "${colors.bold.blue(testName)}" (${colors.bold.white(text)}${shard})...`));
+    shardId === null
+      ? ''
+      : colors.yellow(` [${shardId}:${nbShards}]` + colors.bold(` (${fullIndex}/${length})`));
+  console.log(
+    colors.green(`Running "${colors.bold.blue(testName)}" (${colors.bold.white(text)}${shard})...`),
+  );
 }
 
 function printFooter(testName: string, startTime: number) {
diff --git a/tests/legacy-cli/verdaccio.yaml b/tests/legacy-cli/verdaccio.yaml
index f19bc9332694..fb693847e666 100644
--- a/tests/legacy-cli/verdaccio.yaml
+++ b/tests/legacy-cli/verdaccio.yaml
@@ -3,7 +3,7 @@ storage: ./storage
 auth:
   auth-memory:
     users: {}
-
+listen: localhost:4873
 uplinks:
   npmjs:
     url: https://registry.npmjs.org/
@@ -20,7 +20,7 @@ packages:
   '@angular/{cli,pwa}':
     access: $all
     publish: $all
-    
+
   '@angular-devkit/*':
     access: $all
     publish: $all
@@ -42,8 +42,10 @@ packages:
     proxy: npmjs
 
 logs:
-  - {type: stdout, format: pretty, level: warn}
+  type: stdout
+  format: pretty
+  level: warn
 
 # https://github.com/verdaccio/verdaccio/issues/301
 server:
-  keepAliveTimeout: 0
\ No newline at end of file
+  keepAliveTimeout: 0
diff --git a/tests/legacy-cli/verdaccio_auth.yaml b/tests/legacy-cli/verdaccio_auth.yaml
new file mode 100644
index 000000000000..25f510d85082
--- /dev/null
+++ b/tests/legacy-cli/verdaccio_auth.yaml
@@ -0,0 +1,33 @@
+storage: ./storage
+auth:
+  auth-memory:
+    users:
+      testing:
+        name: testing
+        password: s3cret
+listen: localhost:4876
+uplinks:
+  local:
+    url: http://localhost:4873
+    cache: false
+    maxage: 20m
+    max_fails: 32
+    timeout: 60s
+    agent_options:
+      keepAlive: true
+      maxSockets: 32
+      maxFreeSockets: 8
+
+packages:
+  '**':
+    access: $authenticated
+    proxy: local
+
+logs:
+  type: stdout
+  format: pretty
+  level: warn
+
+# https://github.com/verdaccio/verdaccio/issues/301
+server:
+  keepAliveTimeout: 0
diff --git a/tests/schematics/update/packages/update-migrations/v1_5.js b/tests/schematics/update/packages/update-migrations/v1_5.js
index 7e79eda93d49..0be7c20c1fff 100644
--- a/tests/schematics/update/packages/update-migrations/v1_5.js
+++ b/tests/schematics/update/packages/update-migrations/v1_5.js
@@ -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
  */
+
 exports.default = function() {
     return function(tree) {
         tree.create('/version1_5', '');
diff --git a/tools/BUILD.bazel b/tools/BUILD.bazel
index 379eb2e4f008..23428d243f2f 100644
--- a/tools/BUILD.bazel
+++ b/tools/BUILD.bazel
@@ -26,23 +26,11 @@ nodejs_binary(
 )
 
 platform(
-    name = "rbe_ubuntu1604-angular",
-    parents = ["@rbe_ubuntu1604_angular//config:platform"],
-    remote_execution_properties = """
-        {PARENT_REMOTE_EXECUTION_PROPERTIES}
-        properties: {
-            name: "dockerAddCapabilities"
-            value: "SYS_ADMIN"
-        }
-        properties: {
-            name: "dockerNetwork"
-            value: "standard"
-        }
-        properties: {
-            name: "Pool"
-            value: "default"
-        }
-        """,
+    name = "rbe_platform_with_network_access",
+    exec_properties = {
+        "dockerNetwork": "standard",
+    },
+    parents = ["@npm//@angular/dev-infra-private/bazel/remote-execution:platform"],
 )
 
 # @external_end
diff --git a/tools/ng_cli_schema_generator.js b/tools/ng_cli_schema_generator.js
index 8e7a309eb674..12fdf0cd8fdf 100644
--- a/tools/ng_cli_schema_generator.js
+++ b/tools/ng_cli_schema_generator.js
@@ -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
  */
+
 const { readFileSync, writeFileSync, mkdirSync } = require('fs');
 const { resolve, dirname } = require('path');
 
@@ -23,8 +24,8 @@ function generate(inPath, outPath) {
       const definitionKey = value
         .replace(/(\.json|src)/g, '')
         .split(/\\|\/|_|-|\./)
-        .filter(p => !!p)
-        .map(s => s.charAt(0).toUpperCase() + s.slice(1))
+        .filter((p) => !!p)
+        .map((s) => s.charAt(0).toUpperCase() + s.slice(1))
         .join('');
 
       const nestedSchemaPath = resolve(dirname(inPath), value);
@@ -55,12 +56,12 @@ function generate(inPath, outPath) {
 
     return key === ''
       ? {
-        ...value,
-        definitions: {
-          ...value.definitions,
-          ...nestedDefinitions,
+          ...value,
+          definitions: {
+            ...value.definitions,
+            ...nestedDefinitions,
+          },
         }
-      }
       : value;
   });
 
@@ -84,9 +85,9 @@ if (require.main === module) {
     generate(inPath, outPath);
   } catch (error) {
     console.error('An error happened:');
-    console.error(err);
+    console.error(error);
     process.exit(127);
   }
 }
 
-exports.generate = generate;
\ No newline at end of file
+exports.generate = generate;
diff --git a/tools/quicktype_runner.js b/tools/quicktype_runner.js
index d2e37b6fe48d..0b8a4749ff6f 100644
--- a/tools/quicktype_runner.js
+++ b/tools/quicktype_runner.js
@@ -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
  */
+
 const fs = require('fs');
 const path = require('path');
 const {
@@ -54,7 +55,7 @@ class FetchingJSONSchemaStore extends JSONSchemaStore {
   }
 
   async fetch(address) {
-    const URL = require("url");
+    const URL = require('url');
     const url = URL.parse(address);
     let content = null;
     if (url.protocol === 'ng-cli:') {
@@ -62,7 +63,7 @@ class FetchingJSONSchemaStore extends JSONSchemaStore {
       content = fs.readFileSync(filePath, 'utf-8').trim();
     } else if (url.hostname) {
       try {
-        const fetch = require("node-fetch");
+        const fetch = require('node-fetch');
         const response = await fetch(address);
         content = response.text();
       } catch (e) {
@@ -89,15 +90,14 @@ class FetchingJSONSchemaStore extends JSONSchemaStore {
 
     content = appendDeprecatedDescription(content);
 
-    return parseJSON(content, "JSON Schema", address);
+    return parseJSON(content, 'JSON Schema', address);
   }
 }
 
-
 /**
  * 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);
@@ -112,7 +112,6 @@ async function main(inPath, outPath) {
   fs.writeFileSync(outPath, content, 'utf-8');
 }
 
-
 async function generate(inPath) {
   // Best description of how to use the API was found at
   //   https://blog.quicktype.io/customizing-quicktype/
@@ -171,7 +170,7 @@ if (require.main === module) {
 
   main(argv[0], argv[1])
     .then(() => process.exit(0))
-    .catch(err => {
+    .catch((err) => {
       console.error('An error happened:');
       console.error(err);
       process.exit(127);
diff --git a/tools/rebase-pr.js b/tools/rebase-pr.js
index e74b6156d9c0..01e916defaad 100644
--- a/tools/rebase-pr.js
+++ b/tools/rebase-pr.js
@@ -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
  */
-
- // tslint:disable:no-console
+// tslint:disable:no-console
 // ** IMPORTANT **
 // This script cannot use external dependencies because it needs to run before they are installed.
 
@@ -21,37 +20,42 @@ function determineTargetBranch(repository, prNumber) {
   const options = { headers: { 'User-Agent': repository } };
 
   return new Promise((resolve, reject) => {
-    https.get(pullsUrl, options, (res) => {
-      const { statusCode } = res;
-      const contentType = res.headers['content-type'];
-
-      let error;
-      if (statusCode !== 200) {
-        error = new Error(`Request Failed.\nStatus Code: ${statusCode}.\nResponse: ${res}.\n' +`);
-      } else if (!/^application\/json/.test(contentType)) {
-        error = new Error('Invalid content-type.\n' +
-          `Expected application/json but received ${contentType}`);
-      }
-      if (error) {
-        reject(error);
-        res.resume();
-        return;
-      }
+    https
+      .get(pullsUrl, options, (res) => {
+        const { statusCode } = res;
+        const contentType = res.headers['content-type'];
 
-      res.setEncoding('utf8');
-      let rawData = '';
-      res.on('data', (chunk) => { rawData += chunk; });
-      res.on('end', () => {
-        try {
-          const parsedData = JSON.parse(rawData);
-          resolve(parsedData['base']['ref']);
-        } catch (e) {
-          reject(e);
+        let error;
+        if (statusCode !== 200) {
+          error = new Error(`Request Failed.\nStatus Code: ${statusCode}.\nResponse: ${res}.\n' +`);
+        } else if (!/^application\/json/.test(contentType)) {
+          error = new Error(
+            'Invalid content-type.\n' + `Expected application/json but received ${contentType}`,
+          );
+        }
+        if (error) {
+          reject(error);
+          res.resume();
+          return;
         }
+
+        res.setEncoding('utf8');
+        let rawData = '';
+        res.on('data', (chunk) => {
+          rawData += chunk;
+        });
+        res.on('end', () => {
+          try {
+            const parsedData = JSON.parse(rawData);
+            resolve(parsedData['base']['ref']);
+          } catch (e) {
+            reject(e);
+          }
+        });
+      })
+      .on('error', (e) => {
+        reject(e);
       });
-    }).on('error', (e) => {
-      reject(e);
-    });
   });
 }
 
@@ -66,13 +70,12 @@ const repository = process.argv[2];
 const prNumber = process.argv[3];
 let targetBranch;
 
-
 return Promise.resolve()
   .then(() => {
     console.log(`Determining target branch for PR ${prNumber} on ${repository}.`);
     return determineTargetBranch(repository, prNumber);
   })
-  .then(target => {
+  .then((target) => {
     targetBranch = target;
     console.log(`Target branch is ${targetBranch}.`);
   })
@@ -80,13 +83,13 @@ return Promise.resolve()
     console.log(`Fetching ${targetBranch} from origin.`);
     return exec(`git fetch origin ${targetBranch}`);
   })
-  .then(target => {
+  .then((target) => {
     console.log(`Rebasing current branch on ${targetBranch}.`);
     return exec(`git rebase origin/${targetBranch}`);
   })
   .then(() => console.log('Rebase successfull.'))
-  .catch(err => {
+  .catch((err) => {
     console.log('Failed to rebase on top or target branch.\n');
     console.error(err);
     process.exitCode = 1;
-  });
\ No newline at end of file
+  });
diff --git a/tools/yarn/check-yarn.js b/tools/yarn/check-yarn.js
deleted file mode 100644
index 2e7d66ef63c4..000000000000
--- a/tools/yarn/check-yarn.js
+++ /dev/null
@@ -1,14 +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
- */
-
-'use strict';
-
-if (process.env.npm_execpath.indexOf('yarn') === -1) {
-  throw new Error(
-      'Please use Yarn instead of NPM to install dependencies. See: https://yarnpkg.com/lang/en/docs/install/');
-}
diff --git a/tsconfig-test.json b/tsconfig-test.json
index 2744f98d1e3f..cae29f3a3cac 100644
--- a/tsconfig-test.json
+++ b/tsconfig-test.json
@@ -7,9 +7,6 @@
     // Istanbul (not Constantinople) as well, and applying both source maps to get the original
     // source in devtools.
     "inlineSources": true,
-    "types": [
-      "node",
-      "jasmine"
-    ]
-  },
+    "types": ["node", "jasmine"]
+  }
 }
diff --git a/tsconfig.json b/tsconfig.json
index 7922da9866f2..47eb178dc84a 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -1,10 +1,12 @@
 {
   "compilerOptions": {
     "declaration": true,
+    "esModuleInterop": true,
     "module": "commonjs",
     "moduleResolution": "node",
     "noEmitOnError": true,
     "noFallthroughCasesInSwitch": true,
+    "noImplicitOverride": true,
     "noUnusedParameters": false,
     "noUnusedLocals": false,
     "outDir": "./dist",
@@ -12,44 +14,35 @@
     "skipLibCheck": true,
     "strict": true,
     "target": "es2019",
-    "lib": [
-      "es2019"
-    ],
+    "lib": ["es2020"],
     "baseUrl": "",
-    "rootDirs": [
-      ".",
-      "./dist-schema/",
-      "./bazel-bin/"
-    ],
-    "typeRoots": [
-      "./node_modules/@types"
-    ],
-    "types": [
-      "node"
-    ],
+    "rootDirs": [".", "./dist-schema/", "./bazel-bin/"],
+    "typeRoots": ["./node_modules/@types"],
+    "types": ["node"],
     "paths": {
-      "@angular-devkit/core": [ "./packages/angular_devkit/core/src/index" ],
-      "@angular-devkit/core/node": [ "./packages/angular_devkit/core/node/index" ],
-      "@angular-devkit/core/node/testing": [ "./packages/angular_devkit/core/node/testing/index" ],
-      "@angular-devkit/schematics": [ "./packages/angular_devkit/schematics/src/index" ],
-      "@angular-devkit/schematics/tasks": [ "./packages/angular_devkit/schematics/tasks/index" ],
-      "@angular-devkit/schematics/tasks/node": [ "./packages/angular_devkit/schematics/tasks/node/index" ],
-      "@angular-devkit/schematics/tools": [ "./packages/angular_devkit/schematics/tools/index" ],
-      "@angular-devkit/schematics/testing": [ "./packages/angular_devkit/schematics/testing/index" ],
-      "@angular-devkit/build-optimizer": [ "./packages/angular_devkit/build_optimizer/src/index" ],
-      "@angular-devkit/architect": [ "./packages/angular_devkit/architect/src/index" ],
-      "@angular-devkit/architect/testing": [ "./packages/angular_devkit/architect/testing/index" ],
-      "@angular-devkit/build-angular": [ "./packages/angular_devkit/build_angular/src/index" ],
-      "@angular-devkit/build-webpack": [ "./packages/angular_devkit/build_webpack/src/index" ],
-      "@ngtools/webpack": [ "./packages/ngtools/webpack/src/index" ],
-      "@schematics/angular": [ "./packages/schematics/angular/index" ]
+      "@angular-devkit/core": ["./packages/angular_devkit/core/src/index"],
+      "@angular-devkit/core/node": ["./packages/angular_devkit/core/node/index"],
+      "@angular-devkit/core/node/testing": ["./packages/angular_devkit/core/node/testing/index"],
+      "@angular-devkit/schematics": ["./packages/angular_devkit/schematics/src/index"],
+      "@angular-devkit/schematics/tasks": ["./packages/angular_devkit/schematics/tasks/index"],
+      "@angular-devkit/schematics/tasks/node": [
+        "./packages/angular_devkit/schematics/tasks/node/index"
+      ],
+      "@angular-devkit/schematics/tools": ["./packages/angular_devkit/schematics/tools/index"],
+      "@angular-devkit/schematics/testing": ["./packages/angular_devkit/schematics/testing/index"],
+      "@angular-devkit/build-optimizer": ["./packages/angular_devkit/build_optimizer/src/index"],
+      "@angular-devkit/architect": ["./packages/angular_devkit/architect/src/index"],
+      "@angular-devkit/architect/testing": ["./packages/angular_devkit/architect/testing/index"],
+      "@angular-devkit/build-angular": ["./packages/angular_devkit/build_angular/src/index"],
+      "@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"
-        ]
+        // must-use-promises is handled by the eslint @typescript-eslint/no-floating-promises rule
+        "disabledRules": ["must-type-assert-json-parse", "must-use-promises"]
       }
     ]
   },
@@ -61,11 +54,11 @@
     "bazel-out/**/*",
     "dist/**/*",
     "dist-schema/**",
-    "etc/api/**/*",
-    "etc/cli.angular.io/**/*",
+    "goldens/**/*",
     "**/node_modules/**/*",
     "**/third_party/**/*",
-    "packages/angular_devkit/schematics_cli/*/files/**/*",
+    "packages/angular_devkit/schematics_cli/blank/*-files/**/*",
+    "packages/angular_devkit/schematics_cli/schematic/files/**/*",
     "packages/angular_devkit/*/test/**/*",
     "packages/schematics/*/*/*files/**/*",
     "tests/**/*",
diff --git a/tslint.json b/tslint.json
deleted file mode 100644
index 9128c2c04b24..000000000000
--- a/tslint.json
+++ /dev/null
@@ -1,158 +0,0 @@
-{
-  // Consider using no-identical-functions and disabling in faulty tests
-  // Consider using cognitive-complexity and refactor
-  // Consider using no-useless-cast but it's annoying
-  "extends": [
-    "tslint-no-circular-imports"
-  ],
-  "rulesDirectory": [
-    "node_modules/tslint-sonarts/lib/rules"
-  ],
-  "linterOptions": {
-    "format": "codeFrame",
-    "exclude": [
-      "dist-schema/**",
-      "**/third_party/**"
-    ]
-  },
-  "rules": {
-    // ==================================================================================================
-    // tslint-sonarts rules. See https://github.com/SonarSource/SonarTS
-    // These rules are part of the bug detection section of tslint-sonarts
-    "no-big-function": true,
-    "no-all-duplicated-branches": true,
-    "no-case-with-or": true,
-    "no-collection-size-mischeck": true,
-    "no-element-overwrite": true,
-    "no-empty-destructuring": true,
-    "no-identical-conditions": true,
-    "no-ignored-initial-value": true,
-    "no-ignored-return": true,
-    "no-in-misuse": true,
-    "no-misleading-array-reverse": true,
-    "no-misspelled-operator": true,
-    "no-self-assignment": true,
-    "no-unthrown-error": true,
-    "no-use-of-empty-return-value": true,
-    "no-useless-increment": true,
-    "no-invalid-await": true,
-    "prefer-promise-shorthand": true,
-
-    //These rules are part of the code smell detection section of tslint-sonarts
-    "no-dead-store": true,
-    "no-useless-intersection": true,
-    // ==================================================================================================
-    // base tslint rules
-    "arrow-return-shorthand": true,
-    "no-duplicate-imports": true,
-    "no-angle-bracket-type-assertion": true,
-    "no-conditional-assignment": true,
-    "no-non-null-assertion": true,
-    "no-unnecessary-qualifier": true,
-    "no-string-throw": true,
-    "encoding": true,
-    "no-floating-promises": true,
-    "no-implicit-dependencies": [
-      true,
-      // Specs can depend on the package they are testing.
-      // This is a workaround, we should instead have a dedicated
-      // tslint config only for specs.
-      ["@angular-devkit/build-angular"]
-    ],
-    "no-import-side-effect": [true, {"ignore-module": "^(?!rxjs\/)"}],
-    "align": [
-      true,
-      "elements",
-      "members",
-      "parameters",
-      "statements"
-    ],
-    "max-line-length": [true, 140],
-    "no-inferrable-types": true,
-    "class-name": true,
-    "comment-format": [
-      true,
-      "check-space"
-    ],
-    "indent": [
-      true,
-      "spaces"
-    ],
-    "eofline": true,
-    "import-spacing": true,
-    "newline-before-return": true,
-    "no-consecutive-blank-lines": [true, 2],
-    "no-duplicate-variable": true,
-    "no-eval": true,
-    "no-any": true,
-    "no-arg": true,
-    "no-debugger": true,
-    "no-console": true,
-    "no-internal-module": true,
-    "no-trailing-whitespace": true,
-    "no-unused-expression": true,
-    "no-var-keyword": true,
-    "one-line": [
-      true,
-      "check-catch",
-      "check-else",
-      "check-finally",
-      "check-open-brace",
-      "check-whitespace"
-    ],
-    "ordered-imports": [
-      true,
-      {
-        "import-sources-order": "lowercase-last",
-        "named-imports-order": "lowercase-last"
-      }
-    ],
-    "prefer-const": true,
-    "quotemark": [
-      true,
-      "single",
-      "avoid-escape"
-    ],
-    "semicolon": [true, "always"],
-    "trailing-comma": [
-      true,
-      {
-        "multiline": "always",
-        "singleline": "never"
-      }
-    ],
-    "typedef-whitespace": [
-      true,
-      {
-        "call-signature": "nospace",
-        "index-signature": "nospace",
-        "parameter": "nospace",
-        "property-declaration": "nospace",
-        "variable-declaration": "nospace"
-      }
-    ],
-    "curly": true,
-    "file-header": [
-      true,
-      "Copyright Google Inc\\. All Rights Reserved\\."
-    ],
-    "variable-name": [
-      true,
-      "ban-keywords",
-      "check-format",
-      "allow-leading-underscore",
-      "allow-pascal-case"
-    ],
-    "whitespace": [
-      true,
-      "check-branch",
-      "check-decl",
-      "check-module",
-      "check-preblock",
-      "check-operator",
-      "check-separator",
-      "check-type",
-      "check-typecast"
-    ]
-  }
-}
diff --git a/yarn.lock b/yarn.lock
index 2fb58a8f85c0..92957e2eecd4 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2,12 +2,51 @@
 # yarn lockfile v1
 
 
-"@angular/animations@12.0.0-next.8":
-  version "12.0.0-next.8"
-  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-12.0.0-next.8.tgz#25c5606f616e47255d8357e7758891761e487f1e"
-  integrity sha512-UGMnjPs62wwqJeU/T828Ma6g8cvL8lwouGYzy59TNQ4ouDSuEPbJtMNewlJsoA4Ex/IVq46N6eENKs6GT1IXWw==
+"@actions/core@^1.4.0":
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/@actions/core/-/core-1.4.0.tgz#cf2e6ee317e314b03886adfeb20e448d50d6e524"
+  integrity sha512-CGx2ilGq5i7zSLgiiGUtBCxhRRxibJYU6Fim0Q1Wg2aQL2LTnF27zbqZOrxfvFQ55eSBW0L8uVStgtKMpa0Qlg==
+
+"@actions/github@^5.0.0":
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/@actions/github/-/github-5.0.0.tgz#1754127976c50bd88b2e905f10d204d76d1472f8"
+  integrity sha512-QvE9eAAfEsS+yOOk0cylLBIO/d6WyWIOvsxxzdrPFaud39G6BOkUwScXZn1iBzQzHyu9SBkkLSWlohDWdsasAQ==
+  dependencies:
+    "@actions/http-client" "^1.0.11"
+    "@octokit/core" "^3.4.0"
+    "@octokit/plugin-paginate-rest" "^2.13.3"
+    "@octokit/plugin-rest-endpoint-methods" "^5.1.1"
+
+"@actions/http-client@^1.0.11":
+  version "1.0.11"
+  resolved "https://registry.yarnpkg.com/@actions/http-client/-/http-client-1.0.11.tgz#c58b12e9aa8b159ee39e7dd6cbd0e91d905633c0"
+  integrity sha512-VRYHGQV1rqnROJqdMvGUbY/Kn8vriQe/F9HR2AlYHzmKuM/p3kjNuXhmdBfcVgsvRWTz5C5XW5xvndZrVBuAYg==
+  dependencies:
+    tunnel "0.0.6"
+
+"@ampproject/remapping@1.0.1":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@ampproject/remapping/-/remapping-1.0.1.tgz#1398e73e567c2a7992df6554c15bb94a89b68ba2"
+  integrity sha512-Ta9bMA3EtUHDaZJXqUoT5cn/EecwOp+SXpKJqxDbDuMbLvEMu6YTyDDuvTWeStODfdmXyfMo7LymQyPkN3BicA==
+  dependencies:
+    "@jridgewell/resolve-uri" "1.0.0"
+    sourcemap-codec "1.4.8"
+
+"@angular-devkit/build-optimizer@^0.1202.0":
+  version "0.1202.3"
+  resolved "https://registry.yarnpkg.com/@angular-devkit/build-optimizer/-/build-optimizer-0.1202.3.tgz#e567abbd9810650c01b52ee65e76e98141777bc8"
+  integrity sha512-RdicnNqLzHZhGtDwopjOjc73gI08iYcoksn7x0LLZpOMXFZ9ypucE39m4ktOkKw+IK3IPyhCPa7OpCjiGhjWFg==
+  dependencies:
+    source-map "0.7.3"
+    tslib "2.3.0"
+    typescript "4.3.5"
+
+"@angular/animations@12.2.1":
+  version "12.2.1"
+  resolved "https://registry.yarnpkg.com/@angular/animations/-/animations-12.2.1.tgz#a5e40d93ce349309488dc5e876999f9605b77ac4"
+  integrity sha512-SDsBBQG2AifuVyo+LUiqFLqzQ8ourO60NhkYGugC934lRqox2ZXmAooDBGMh74K7yrzIxMpbrMbL+qGv4OGpjw==
   dependencies:
-    tslib "^2.1.0"
+    tslib "^2.2.0"
 
 "@angular/benchpress@0.2.1":
   version "0.2.1"
@@ -17,60 +56,60 @@
     "@angular/core" "^10.0.0-0 || ^11.0.0"
     reflect-metadata "^0.1.13"
 
-"@angular/cdk@11.2.9":
-  version "11.2.9"
-  resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-11.2.9.tgz#30ba78a323a6dd19c03972ebf091056d75ba0ade"
-  integrity sha512-3gHobkgCQIJ4kJFkqexaKramI6k4OZ0/Vw5qvabGhpwWtICvrrfZyRejJzhecYKOcw+hiJNoDqP9TVNfkLme9g==
+"@angular/cdk@12.1.4":
+  version "12.1.4"
+  resolved "https://registry.yarnpkg.com/@angular/cdk/-/cdk-12.1.4.tgz#321bbbdd79f1173b61314608927a8412576b3ac8"
+  integrity sha512-so8HP7jRNkGfdTkPmFVqyW4pj1vU0ASG1NaZMDXnin44PVjbJpaKhQsArhQ/yOmRP9XzP6TR3zHzmxszfGiaKg==
   dependencies:
-    tslib "^2.0.0"
+    tslib "^2.2.0"
   optionalDependencies:
     parse5 "^5.0.0"
 
-"@angular/common@12.0.0-next.8":
-  version "12.0.0-next.8"
-  resolved "https://registry.yarnpkg.com/@angular/common/-/common-12.0.0-next.8.tgz#9515f8c69a7391cb80f663987e36ff2aa8d354c0"
-  integrity sha512-/Bx1DXgmspybTuAJqlUSOcPmkKL0/87K71MVq36WgweGsV1N++IMyOoGAJyLcnZe71QjVL2Er0od3D56EU+Hfw==
+"@angular/common@12.2.1":
+  version "12.2.1"
+  resolved "https://registry.yarnpkg.com/@angular/common/-/common-12.2.1.tgz#d0163538db70e22c4999dd44fab8de3415de4f8c"
+  integrity sha512-LGQwDN3QKX/0LVQQa6v+/Tc4Za+XiIfJMqmr6KNWh3q6/5zibkPE9YCq/nvolUg7RZzYpG7tFPgnggYtUmKURw==
   dependencies:
-    tslib "^2.1.0"
+    tslib "^2.2.0"
 
-"@angular/compiler-cli@12.0.0-next.8":
-  version "12.0.0-next.8"
-  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-12.0.0-next.8.tgz#df7ba9d9efda5d3b8c5e9447892ba653b542ce0b"
-  integrity sha512-cwXaSg+u6A8DgVfdvranO/RQptZzZjGPANjlsC6QDi5hdPkU6fI4wQbzm6KRMlww+mTbrNRmMNRlAI5sVx3y1w==
+"@angular/compiler-cli@12.2.1":
+  version "12.2.1"
+  resolved "https://registry.yarnpkg.com/@angular/compiler-cli/-/compiler-cli-12.2.1.tgz#0912466b0870e8124629a47e820d32c143fca1a2"
+  integrity sha512-lkrUAf96WwPhIhQZPtH277MX00cbSQx+T+jFWTXXlLoCydN3MZ+x0I4nBxmVvVJHahwk1qxWdEzCcc/Y0QZuOg==
   dependencies:
     "@babel/core" "^7.8.6"
     "@babel/types" "^7.8.6"
     canonical-path "1.0.0"
     chokidar "^3.0.0"
     convert-source-map "^1.5.1"
-    dependency-graph "^0.7.2"
+    dependency-graph "^0.11.0"
     magic-string "^0.25.0"
     minimist "^1.2.0"
     reflect-metadata "^0.1.2"
-    semver "^6.3.0"
+    semver "^7.0.0"
     source-map "^0.6.1"
     sourcemap-codec "^1.4.8"
-    tslib "^2.1.0"
-    yargs "^16.2.0"
+    tslib "^2.2.0"
+    yargs "^17.0.0"
 
-"@angular/compiler@12.0.0-next.8":
-  version "12.0.0-next.8"
-  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-12.0.0-next.8.tgz#475f9fc66e8bd789200fe8ae7ba77b6ff5a32153"
-  integrity sha512-2SN8gte05JwHVd5b2ExP1lyIIND7TaJ0XipzaUOgsRwGVLWDhN6hS3XMb1BLeZlwl9YYLNVATUbhThC+ZSR4uw==
+"@angular/compiler@12.2.1":
+  version "12.2.1"
+  resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-12.2.1.tgz#963875d1cb4c8b1a1584bd5ed831e25517ff1355"
+  integrity sha512-XUszrdfjSEi3oI81rL4h4+DeN+j7OZukFZ3Zj77a4lu0BcrHFUZ408hzGnAQVnK4xxcpSjQet8yKGnR08YGxxA==
   dependencies:
-    tslib "^2.1.0"
+    tslib "^2.2.0"
 
 "@angular/compiler@9.0.0":
   version "9.0.0"
   resolved "https://registry.yarnpkg.com/@angular/compiler/-/compiler-9.0.0.tgz#87e0bef4c369b6cadae07e3a4295778fc93799d5"
   integrity sha512-ctjwuntPfZZT2mNj2NDIVu51t9cvbhl/16epc5xEwyzyDt76pX9UgwvY+MbXrf/C/FWwdtmNtfP698BKI+9leQ==
 
-"@angular/core@12.0.0-next.8":
-  version "12.0.0-next.8"
-  resolved "https://registry.yarnpkg.com/@angular/core/-/core-12.0.0-next.8.tgz#f037aa48a4aedc57742bcfc627d1a1661d6c5138"
-  integrity sha512-+LDGHKrVUekNQsohG+afEv441x4cupftigzTjKjioPYq9TAZSBHQrPSTAL0Jwmm731ghkPEAeoRni4HMmDGO3Q==
+"@angular/core@12.2.1":
+  version "12.2.1"
+  resolved "https://registry.yarnpkg.com/@angular/core/-/core-12.2.1.tgz#ad81d97bb9f6977c95d590d0878fce25afa72ca8"
+  integrity sha512-n3h2SIlTexQRhiU0YKk1qUobZBXtFisfNbV4kJLyjNsGyMt70NQLZVe5mUw7LV7aDAJEinuoCofqBl4FHCigEQ==
   dependencies:
-    tslib "^2.1.0"
+    tslib "^2.2.0"
 
 "@angular/core@9.0.0":
   version "9.0.0"
@@ -78,148 +117,169 @@
   integrity sha512-6Pxgsrf0qF9iFFqmIcWmjJGkkCaCm6V5QNnxMy2KloO3SDq6QuMVRbN9RtC8Urmo25LP+eZ6ZgYqFYpdD8Hd9w==
 
 "@angular/core@^10.0.0-0 || ^11.0.0":
-  version "11.2.0"
-  resolved "https://registry.yarnpkg.com/@angular/core/-/core-11.2.0.tgz#309ae61d55b21fca0b644a6571109741d64b2467"
-  integrity sha512-jnbnJTW2GwfkRoXG8J4zs5FMcahMZwo6jrZGe9FiXjCYG9cLEuOXy4h99Z1s/o0vc/VXyWgym7SmeEgv+urf8g==
+  version "11.2.14"
+  resolved "https://registry.yarnpkg.com/@angular/core/-/core-11.2.14.tgz#3ebe298c79d5413dc670d56b7f503bd4d788d4a8"
+  integrity sha512-vpR4XqBGitk1Faph37CSpemwIYTmJ3pdIVNoHKP6jLonpWu+0azkchf0f7oD8/2ivj2F81opcIw0tcsy/D/5Vg==
   dependencies:
     tslib "^2.0.0"
 
-"@angular/dev-infra-private@https://github.com/angular/dev-infra-private-builds.git#0d8382f30f70ab220961c2d731c782519025332e":
+"@angular/dev-infra-private@https://github.com/angular/dev-infra-private-builds.git#07a43c542704985a77ecabb4be12038e67419a65":
   version "0.0.0"
-  uid "0d8382f30f70ab220961c2d731c782519025332e"
-  resolved "https://github.com/angular/dev-infra-private-builds.git#0d8382f30f70ab220961c2d731c782519025332e"
+  resolved "https://github.com/angular/dev-infra-private-builds.git#07a43c542704985a77ecabb4be12038e67419a65"
   dependencies:
+    "@actions/core" "^1.4.0"
+    "@actions/github" "^5.0.0"
+    "@angular-devkit/build-optimizer" "^0.1202.0"
     "@angular/benchpress" "0.2.1"
+    "@bazel/bazelisk" "^1.10.1"
     "@bazel/buildifier" "^4.0.1"
+    "@bazel/esbuild" "4.0.0"
+    "@bazel/jasmine" "4.0.0"
+    "@bazel/protractor" "4.0.0"
+    "@bazel/runfiles" "4.0.0"
+    "@bazel/typescript" "4.0.0"
+    "@microsoft/api-extractor" "7.18.6"
+    "@octokit/auth-app" "^3.6.0"
+    "@octokit/core" "^3.5.1"
     "@octokit/graphql" "^4.6.1"
-    "@octokit/rest" "16.28.7"
-    "@octokit/types" "^5.5.0"
-    brotli "^1.3.2"
-    chalk "^2.3.1"
+    "@octokit/plugin-paginate-rest" "^2.13.5"
+    "@octokit/plugin-rest-endpoint-methods" "^5.3.3"
+    "@octokit/rest" "^18.7.0"
+    "@octokit/types" "^6.16.6"
+    chalk "^4.1.0"
     clang-format "^1.4.0"
     cli-progress "^3.7.0"
     conventional-commits-parser "^3.2.1"
     ejs "^3.1.6"
     git-raw-commits "^2.0.10"
-    glob "7.1.6"
+    glob "7.1.7"
+    husky "^7.0.1"
     inquirer "^8.0.0"
+    jasmine "^3.7.0"
     minimatch "^3.0.4"
     multimatch "^5.0.0"
+    nock "^13.0.3"
     node-fetch "^2.6.1"
-    node-uuid "1.4.8"
     ora "^5.0.0"
+    prettier "^2.3.2"
     protractor "^7.0.0"
+    rollup "^2.53.3"
+    rollup-plugin-commonjs "^10.1.0"
+    rollup-plugin-node-resolve "^5.2.0"
+    rollup-plugin-sourcemaps "^0.6.3"
     selenium-webdriver "3.5.0"
     semver "^7.3.5"
-    shelljs "^0.8.4"
-    ts-node "^9.1.1"
-    tslib "^2.1.0"
-    typed-graphqlify "^2.3.0"
-    typescript "~4.2.4"
+    ts-node "^10.0.0"
+    tslib "^2.3.0"
+    tslint "^6.1.3"
+    typed-graphqlify "^3.1.1"
+    typescript "~4.3.5"
+    uuid "^8.3.2"
     yaml "^1.10.0"
-    yargs "^16.2.0"
+    yargs "^17.0.0"
 
-"@angular/forms@12.0.0-next.8":
-  version "12.0.0-next.8"
-  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-12.0.0-next.8.tgz#412aecd3d38690e3c7d2a1998b53a78208b2b908"
-  integrity sha512-JR0xD2Rr6y458xYT7V6XyL/rL4rsSFraRTT/zZr1UemIaFCkHdQrrGGm41W35laPXmwqGUxfFoaXM6H9PNWqPQ==
+"@angular/forms@12.2.1":
+  version "12.2.1"
+  resolved "https://registry.yarnpkg.com/@angular/forms/-/forms-12.2.1.tgz#f101482226c63f0f1af4811f6c0baa551e72fff1"
+  integrity sha512-frYYb/4KhGJkvQ27k0voRi3ZVPvY6NXBYidPmJf7WBnVY8jgHhfUcjc9wUNaS97TyXB3WG/eY/jLC38tO0atMA==
   dependencies:
-    tslib "^2.1.0"
+    tslib "^2.2.0"
 
-"@angular/localize@12.0.0-next.8":
-  version "12.0.0-next.8"
-  resolved "https://registry.yarnpkg.com/@angular/localize/-/localize-12.0.0-next.8.tgz#7456dcf66d48e2ee4c56aca9ff91881349ae45ff"
-  integrity sha512-eVAVeZ/Xw/Xz+LyX8QGh3ynOck/+l/6fHCBRVT0qLLSUwqttNsFfxHigFnNmoIJ2nOhmtGPa1MmGNPzJp0fzbw==
+"@angular/localize@12.2.1":
+  version "12.2.1"
+  resolved "https://registry.yarnpkg.com/@angular/localize/-/localize-12.2.1.tgz#763f8b507df0fa232cf42b90fc5193de0b3a9d0f"
+  integrity sha512-3vush/iVXw7xIQyCCa+GlWQd3WIX234agie364uFIzTJR/9qIY0XnFYXLGmrq91IXo7320mFuRAFSWThjEPrZw==
   dependencies:
     "@babel/core" "7.8.3"
-    glob "7.1.2"
-    yargs "^16.2.0"
+    glob "7.1.7"
+    yargs "^17.0.0"
 
-"@angular/material@11.2.9":
-  version "11.2.9"
-  resolved "https://registry.yarnpkg.com/@angular/material/-/material-11.2.9.tgz#f74535029f5c246f33649706cda75d29ccd84cb9"
-  integrity sha512-Pe1aScSX8fMOSs5hfF/V7NCJn9pt/60rFmwYxgtFser4BcJrO0Moz4eqxhNcR0PjiCQgKJpjjPxBept2+o5N5A==
+"@angular/material@12.1.4":
+  version "12.1.4"
+  resolved "https://registry.yarnpkg.com/@angular/material/-/material-12.1.4.tgz#444a875ab42b6c158dc68b5bc2ca5e59bac11028"
+  integrity sha512-lfBuk+3fxOvyIf9PknVIIC1DxYOimru06FpXq74lNcrNZcX3qCdDe/KmNbR50Wy0aEC4cOPXxJuPqm7wT8z2vg==
   dependencies:
-    tslib "^2.0.0"
+    tslib "^2.2.0"
 
-"@angular/platform-browser-dynamic@12.0.0-next.8":
-  version "12.0.0-next.8"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-12.0.0-next.8.tgz#d76d43721fb27a967258343694e006f770683c9b"
-  integrity sha512-XO/IY+Xh1PzZtwED5uiHyKyJyB7g8OkdYhFjVXxK32Y3CiF6zN5dUgQDyCzUF7nOWydGLBogzwmmouigR999xg==
+"@angular/platform-browser-dynamic@12.2.1":
+  version "12.2.1"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser-dynamic/-/platform-browser-dynamic-12.2.1.tgz#993451555c2bea66845c3f47af2e95e38221c7cb"
+  integrity sha512-eAoLf8jdNHdBxK6yDc3ISPmrWxO46BtwTkibCT8vjVgBX2DweYB+ee0glPboIQao3d42nHRfxy4YeaIyJCvxTg==
   dependencies:
-    tslib "^2.1.0"
+    tslib "^2.2.0"
 
-"@angular/platform-browser@12.0.0-next.8":
-  version "12.0.0-next.8"
-  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-12.0.0-next.8.tgz#229302e72d7cb0b057e49b10ec069f8bc862f718"
-  integrity sha512-bgiIguM3O//afPaBgl9/epBzbf/3TVKK9lDESx18LHtnoxZrFoWGWhj4xD7x4OlEUGlXse2VYU050y6F/pXx1Q==
+"@angular/platform-browser@12.2.1":
+  version "12.2.1"
+  resolved "https://registry.yarnpkg.com/@angular/platform-browser/-/platform-browser-12.2.1.tgz#cd7e18403df17ae987705be3ced1a0fbc6e1d23d"
+  integrity sha512-14PSiuKrXe8KP0K5+WtpwdYALKRIFWp1KxIhmqrpjbW322W9d46dC7LAw8Wzof/aHmDJops63u6EDJG7UeiUOg==
   dependencies:
-    tslib "^2.1.0"
+    tslib "^2.2.0"
 
-"@angular/platform-server@12.0.0-next.8":
-  version "12.0.0-next.8"
-  resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-12.0.0-next.8.tgz#46b609209bada2e730e5b34302cde1bc828fba8c"
-  integrity sha512-2Sut7xvHa9EAeRsTEKSMEHHzT7lBJ/0iPz/wtYIEpOKQ3QstuX2GTV1GqllN++CDrXHGsWgk4AtFnAEgkOieKQ==
+"@angular/platform-server@12.2.1":
+  version "12.2.1"
+  resolved "https://registry.yarnpkg.com/@angular/platform-server/-/platform-server-12.2.1.tgz#8f6cd0e56db8ec7a1104793e232ea228d0b46589"
+  integrity sha512-7sFHXXgpT9Q5l9S1+fH43DYuhN60q5TaLU2EfLnVss+2xwJDM7ibBBwwZTG4AwZ9psUlrzNB+F4eKLJV+5AedA==
   dependencies:
     domino "^2.1.2"
-    tslib "^2.1.0"
+    tslib "^2.2.0"
     xhr2 "^0.2.0"
 
-"@angular/router@12.0.0-next.8":
-  version "12.0.0-next.8"
-  resolved "https://registry.yarnpkg.com/@angular/router/-/router-12.0.0-next.8.tgz#f77526b662403e892b1d2cb97b6796d3e623bbc4"
-  integrity sha512-EnEfziJAstdqLbajuqySPyBxsOzc2JgtxyDsk+b5MkHBfECQvaT+hBywm2bYv7CJUqHIq5LzEbeTkXEwlVX9/g==
+"@angular/router@12.2.1":
+  version "12.2.1"
+  resolved "https://registry.yarnpkg.com/@angular/router/-/router-12.2.1.tgz#38c5645b6915e6514bf1fda1447648427e28a4d5"
+  integrity sha512-dWQu+C8U8SMeWtOAl3AlfZxQYv68bisBB4uAuPXoyXiLtHgGclyzu1QZVPXTkoiyGv+odrqX8LaG/eQtbU0G8Q==
   dependencies:
-    tslib "^2.1.0"
+    tslib "^2.2.0"
 
-"@angular/service-worker@12.0.0-next.8":
-  version "12.0.0-next.8"
-  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-12.0.0-next.8.tgz#d6267d7b106fde36f2063624ff65558636dadeb7"
-  integrity sha512-oa1d7vZUN/YrUJ1x3im+ucZJD+pS/KyDP2bCAav3kpSFo9aO8I5MleqU+zTCDWpgcIT50filme1a7novKAMIQA==
+"@angular/service-worker@12.2.1":
+  version "12.2.1"
+  resolved "https://registry.yarnpkg.com/@angular/service-worker/-/service-worker-12.2.1.tgz#43eb7b612d64294abd7b83af1bc3e145ee65d2c7"
+  integrity sha512-Iha7kul7ZQ8t4eOTH0p3UMPWvcK4HTvSBNOqxmlnCWcsGKLoqc+Kv+3Up+T1q2ZXXwodrdROiGwC1PZxynXZGQ==
   dependencies:
-    tslib "^2.1.0"
+    tslib "^2.2.0"
 
-"@babel/code-frame@^7.0.0", "@babel/code-frame@^7.12.13", "@babel/code-frame@^7.8.3":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.12.13.tgz#dcfc826beef65e75c50e21d3837d7d95798dd658"
-  integrity sha512-HV1Cm0Q3ZrpCR93tkWOYiuYIgLxZXZFVG2VgK+MBWjUqZTundupbfx2aXarXuw5Ko5aMcjtJgbSs4vUGBS5v6g==
-  dependencies:
-    "@babel/highlight" "^7.12.13"
-
-"@babel/compat-data@^7.13.0":
-  version "7.13.0"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.13.0.tgz#7889eb7ee6518e2afa5d312b15fd7fd1fe9f3744"
-  integrity sha512-mKgFbYQ+23pjwNGBNPNWrBfa3g/EcmrPnwQpjWoNxq9xYf+M8wcLhMlz/wkWimLjzNzGnl3D+C2186gMzk0VuA==
-
-"@babel/compat-data@^7.13.12":
-  version "7.13.12"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.13.12.tgz#a8a5ccac19c200f9dd49624cac6e19d7be1236a1"
-  integrity sha512-3eJJ841uKxeV8dcN/2yGEUy+RfgQspPEgQat85umsE1rotuquQ2AbIub4S6j7c50a2d+4myc+zSlnXeIHrOnhQ==
-
-"@babel/compat-data@^7.13.8":
-  version "7.13.8"
-  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.13.8.tgz#5b783b9808f15cef71547f1b691f34f8ff6003a6"
-  integrity sha512-EaI33z19T4qN3xLXsGf48M2cDqa6ei9tPZlfLdb2HC+e/cFtREiRd8hdSqDbwdLB0/+gLwqJmCYASH0z2bUdog==
-
-"@babel/core@7.13.13":
-  version "7.13.13"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.13.13.tgz#bc44c4a2be2288ec4ddf56b66fc718019c76ac29"
-  integrity sha512-1xEs9jZAyKIouOoCmpsgk/I26PoKyvzQ2ixdRpRzfbcp1fL+ozw7TUgdDgwonbTovqRaTfRh50IXuw4QrWO0GA==
-  dependencies:
-    "@babel/code-frame" "^7.12.13"
-    "@babel/generator" "^7.13.9"
-    "@babel/helper-compilation-targets" "^7.13.13"
-    "@babel/helper-module-transforms" "^7.13.12"
-    "@babel/helpers" "^7.13.10"
-    "@babel/parser" "^7.13.13"
-    "@babel/template" "^7.12.13"
-    "@babel/traverse" "^7.13.13"
-    "@babel/types" "^7.13.13"
+"@assemblyscript/loader@^0.10.1":
+  version "0.10.1"
+  resolved "https://registry.yarnpkg.com/@assemblyscript/loader/-/loader-0.10.1.tgz#70e45678f06c72fa2e350e8553ec4a4d72b92e06"
+  integrity sha512-H71nDOOL8Y7kWRLqf6Sums+01Q5msqBW2KhDUTemh1tvY04eSkSXrK0uj/4mmY0Xr16/3zyZmsrxN7CKuRbNRg==
+
+"@babel/code-frame@7.12.11":
+  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/code-frame@^7.0.0", "@babel/code-frame@^7.14.5", "@babel/code-frame@^7.8.3":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/code-frame/-/code-frame-7.14.5.tgz#23b08d740e83f49c5e59945fbf1b43e80bbf4edb"
+  integrity sha512-9pzDqyc6OLDaqe+zbACgFkb6fKMNG6CObKpnYXChRsvYGyEdc7CA2BaqeOM+vOtCS5ndmJicPJhKAwYRI6UfFw==
+  dependencies:
+    "@babel/highlight" "^7.14.5"
+
+"@babel/compat-data@^7.13.11", "@babel/compat-data@^7.14.5", "@babel/compat-data@^7.14.7":
+  version "7.14.7"
+  resolved "https://registry.yarnpkg.com/@babel/compat-data/-/compat-data-7.14.7.tgz#7b047d7a3a89a67d2258dc61f604f098f1bc7e08"
+  integrity sha512-nS6dZaISCXJ3+518CWiBfEr//gHyMO02uDxBkXTKZDN5POruCnOZ1N4YBRZDCabwF8nZMWBpRxIicmXtBs+fvw==
+
+"@babel/core@7.14.8", "@babel/core@^7.7.5", "@babel/core@^7.8.6":
+  version "7.14.8"
+  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.14.8.tgz#20cdf7c84b5d86d83fac8710a8bc605a7ba3f010"
+  integrity sha512-/AtaeEhT6ErpDhInbXmjHcUQXH0L0TEgscfcxk1qbOvLuKCa5aZT0SOOtDKFY96/CLROwbLSKyFor6idgNaU4Q==
+  dependencies:
+    "@babel/code-frame" "^7.14.5"
+    "@babel/generator" "^7.14.8"
+    "@babel/helper-compilation-targets" "^7.14.5"
+    "@babel/helper-module-transforms" "^7.14.8"
+    "@babel/helpers" "^7.14.8"
+    "@babel/parser" "^7.14.8"
+    "@babel/template" "^7.14.5"
+    "@babel/traverse" "^7.14.8"
+    "@babel/types" "^7.14.8"
     convert-source-map "^1.7.0"
     debug "^4.1.0"
     gensync "^1.0.0-beta.2"
     json5 "^2.1.2"
-    lodash "^4.17.19"
     semver "^6.3.0"
     source-map "^0.5.0"
 
@@ -244,132 +304,64 @@
     semver "^5.4.1"
     source-map "^0.5.0"
 
-"@babel/core@^7.7.5", "@babel/core@^7.8.6":
-  version "7.12.16"
-  resolved "https://registry.yarnpkg.com/@babel/core/-/core-7.12.16.tgz#8c6ba456b23b680a6493ddcfcd9d3c3ad51cab7c"
-  integrity sha512-t/hHIB504wWceOeaOoONOhu+gX+hpjfeN6YRBT209X/4sibZQfSF1I0HFRRlBe97UZZosGx5XwUg1ZgNbelmNw==
-  dependencies:
-    "@babel/code-frame" "^7.12.13"
-    "@babel/generator" "^7.12.15"
-    "@babel/helper-module-transforms" "^7.12.13"
-    "@babel/helpers" "^7.12.13"
-    "@babel/parser" "^7.12.16"
-    "@babel/template" "^7.12.13"
-    "@babel/traverse" "^7.12.13"
-    "@babel/types" "^7.12.13"
-    convert-source-map "^1.7.0"
-    debug "^4.1.0"
-    gensync "^1.0.0-beta.1"
-    json5 "^2.1.2"
-    lodash "^4.17.19"
-    semver "^5.4.1"
-    source-map "^0.5.0"
-
-"@babel/generator@7.13.9", "@babel/generator@^7.13.9":
-  version "7.13.9"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.13.9.tgz#3a7aa96f9efb8e2be42d38d80e2ceb4c64d8de39"
-  integrity sha512-mHOOmY0Axl/JCTkxTU6Lf5sWOg/v8nUa+Xkt4zMTftX0wqmb6Sh7J8gvcehBw7q0AhrhAR+FDacKjCZ2X8K+Sw==
+"@babel/generator@7.14.8", "@babel/generator@^7.14.8", "@babel/generator@^7.8.3":
+  version "7.14.8"
+  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.14.8.tgz#bf86fd6af96cf3b74395a8ca409515f89423e070"
+  integrity sha512-cYDUpvIzhBVnMzRoY1fkSEhK/HmwEVwlyULYgn/tMQYd6Obag3ylCjONle3gdErfXBW61SVTlR9QR7uWlgeIkg==
   dependencies:
-    "@babel/types" "^7.13.0"
+    "@babel/types" "^7.14.8"
     jsesc "^2.5.1"
     source-map "^0.5.0"
 
-"@babel/generator@^7.12.13", "@babel/generator@^7.12.15", "@babel/generator@^7.8.3":
-  version "7.12.15"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.12.15.tgz#4617b5d0b25cc572474cc1aafee1edeaf9b5368f"
-  integrity sha512-6F2xHxBiFXWNSGb7vyCUTBF8RCLY66rS0zEPcP8t/nQyXjha5EuK4z7H5o7fWG8B4M7y6mqVWq1J+1PuwRhecQ==
-  dependencies:
-    "@babel/types" "^7.12.13"
-    jsesc "^2.5.1"
-    source-map "^0.5.0"
-
-"@babel/generator@^7.13.0":
-  version "7.13.0"
-  resolved "https://registry.yarnpkg.com/@babel/generator/-/generator-7.13.0.tgz#bd00d4394ca22f220390c56a0b5b85568ec1ec0c"
-  integrity sha512-zBZfgvBB/ywjx0Rgc2+BwoH/3H+lDtlgD4hBOpEv5LxRnYsm/753iRuLepqnYlynpjC3AdQxtxsoeHJoEEwOAw==
-  dependencies:
-    "@babel/types" "^7.13.0"
-    jsesc "^2.5.1"
-    source-map "^0.5.0"
-
-"@babel/helper-annotate-as-pure@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.12.13.tgz#0f58e86dfc4bb3b1fcd7db806570e177d439b6ab"
-  integrity sha512-7YXfX5wQ5aYM/BOlbSccHDbuXXFPxeoUmfWtz8le2yTkTZc+BxsiEnENFoi2SlmA8ewDkG2LgIMIVzzn2h8kfw==
-  dependencies:
-    "@babel/types" "^7.12.13"
-
-"@babel/helper-builder-binary-assignment-operator-visitor@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.12.13.tgz#6bc20361c88b0a74d05137a65cac8d3cbf6f61fc"
-  integrity sha512-CZOv9tGphhDRlVjVkAgm8Nhklm9RzSmWpX2my+t7Ua/KT616pEzXsQCjinzvkRvHWJ9itO4f296efroX23XCMA==
-  dependencies:
-    "@babel/helper-explode-assignable-expression" "^7.12.13"
-    "@babel/types" "^7.12.13"
-
-"@babel/helper-compilation-targets@^7.13.0":
-  version "7.13.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.0.tgz#c9cf29b82a76fd637f0faa35544c4ace60a155a1"
-  integrity sha512-SOWD0JK9+MMIhTQiUVd4ng8f3NXhPVQvTv7D3UN4wbp/6cAHnB2EmMaU1zZA2Hh1gwme+THBrVSqTFxHczTh0Q==
-  dependencies:
-    "@babel/compat-data" "^7.13.0"
-    "@babel/helper-validator-option" "^7.12.17"
-    browserslist "^4.14.5"
-    semver "7.0.0"
-
-"@babel/helper-compilation-targets@^7.13.10":
-  version "7.13.10"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.10.tgz#1310a1678cb8427c07a753750da4f8ce442bdd0c"
-  integrity sha512-/Xju7Qg1GQO4mHZ/Kcs6Au7gfafgZnwm+a7sy/ow/tV1sHeraRUHbjdat8/UvDor4Tez+siGKDk6zIKtCPKVJA==
+"@babel/helper-annotate-as-pure@7.14.5", "@babel/helper-annotate-as-pure@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-annotate-as-pure/-/helper-annotate-as-pure-7.14.5.tgz#7bf478ec3b71726d56a8ca5775b046fc29879e61"
+  integrity sha512-EivH9EgBIb+G8ij1B2jAwSH36WnGvkQSEC6CkX/6v6ZFlw5fVOHvsgGF4uiEHO2GzMvunZb6tDLQEQSdrdocrA==
   dependencies:
-    "@babel/compat-data" "^7.13.8"
-    "@babel/helper-validator-option" "^7.12.17"
-    browserslist "^4.14.5"
-    semver "^6.3.0"
+    "@babel/types" "^7.14.5"
 
-"@babel/helper-compilation-targets@^7.13.13":
-  version "7.13.13"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.13.tgz#2b2972a0926474853f41e4adbc69338f520600e5"
-  integrity sha512-q1kcdHNZehBwD9jYPh3WyXcsFERi39X4I59I3NadciWtNDyZ6x+GboOxncFK0kXlKIv6BJm5acncehXWUjWQMQ==
+"@babel/helper-builder-binary-assignment-operator-visitor@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-builder-binary-assignment-operator-visitor/-/helper-builder-binary-assignment-operator-visitor-7.14.5.tgz#b939b43f8c37765443a19ae74ad8b15978e0a191"
+  integrity sha512-YTA/Twn0vBXDVGJuAX6PwW7x5zQei1luDDo2Pl6q1qZ7hVNl0RZrhHCQG/ArGpR29Vl7ETiB8eJyrvpuRp300w==
   dependencies:
-    "@babel/compat-data" "^7.13.12"
-    "@babel/helper-validator-option" "^7.12.17"
-    browserslist "^4.14.5"
-    semver "^6.3.0"
+    "@babel/helper-explode-assignable-expression" "^7.14.5"
+    "@babel/types" "^7.14.5"
 
-"@babel/helper-compilation-targets@^7.13.8":
-  version "7.13.8"
-  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.13.8.tgz#02bdb22783439afb11b2f009814bdd88384bd468"
-  integrity sha512-pBljUGC1y3xKLn1nrx2eAhurLMA8OqBtBP/JwG4U8skN7kf8/aqwwxpV1N6T0e7r6+7uNitIa/fUxPFagSXp3A==
+"@babel/helper-compilation-targets@^7.13.0", "@babel/helper-compilation-targets@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-compilation-targets/-/helper-compilation-targets-7.14.5.tgz#7a99c5d0967911e972fe2c3411f7d5b498498ecf"
+  integrity sha512-v+QtZqXEiOnpO6EYvlImB6zCD2Lel06RzOPzmkz/D/XgQiUu3C/Jb1LOqSt/AIA34TYi/Q+KlT8vTQrgdxkbLw==
   dependencies:
-    "@babel/compat-data" "^7.13.8"
-    "@babel/helper-validator-option" "^7.12.17"
-    browserslist "^4.14.5"
+    "@babel/compat-data" "^7.14.5"
+    "@babel/helper-validator-option" "^7.14.5"
+    browserslist "^4.16.6"
     semver "^6.3.0"
 
-"@babel/helper-create-class-features-plugin@^7.13.0":
-  version "7.13.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.13.0.tgz#28d04ad9cfbd1ed1d8b988c9ea7b945263365846"
-  integrity sha512-twwzhthM4/+6o9766AW2ZBHpIHPSGrPGk1+WfHiu13u/lBnggXGNYCpeAyVfNwGDKfkhEDp+WOD/xafoJ2iLjA==
+"@babel/helper-create-class-features-plugin@^7.14.5":
+  version "7.14.8"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-class-features-plugin/-/helper-create-class-features-plugin-7.14.8.tgz#a6f8c3de208b1e5629424a9a63567f56501955fc"
+  integrity sha512-bpYvH8zJBWzeqi1o+co8qOrw+EXzQ/0c74gVmY205AWXy9nifHrOg77y+1zwxX5lXE7Icq4sPlSQ4O2kWBrteQ==
   dependencies:
-    "@babel/helper-function-name" "^7.12.13"
-    "@babel/helper-member-expression-to-functions" "^7.13.0"
-    "@babel/helper-optimise-call-expression" "^7.12.13"
-    "@babel/helper-replace-supers" "^7.13.0"
-    "@babel/helper-split-export-declaration" "^7.12.13"
+    "@babel/helper-annotate-as-pure" "^7.14.5"
+    "@babel/helper-function-name" "^7.14.5"
+    "@babel/helper-member-expression-to-functions" "^7.14.7"
+    "@babel/helper-optimise-call-expression" "^7.14.5"
+    "@babel/helper-replace-supers" "^7.14.5"
+    "@babel/helper-split-export-declaration" "^7.14.5"
 
-"@babel/helper-create-regexp-features-plugin@^7.12.13":
-  version "7.12.16"
-  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.12.16.tgz#3b31d13f39f930fad975e151163b7df7d4ffe9d3"
-  integrity sha512-jAcQ1biDYZBdaAxB4yg46/XirgX7jBDiMHDbwYQOgtViLBXGxJpZQ24jutmBqAIB/q+AwB6j+NbBXjKxEY8vqg==
+"@babel/helper-create-regexp-features-plugin@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-create-regexp-features-plugin/-/helper-create-regexp-features-plugin-7.14.5.tgz#c7d5ac5e9cf621c26057722fb7a8a4c5889358c4"
+  integrity sha512-TLawwqpOErY2HhWbGJ2nZT5wSkR192QpN+nBg1THfBfftrlvOh+WbhrxXCH4q4xJ9Gl16BGPR/48JA+Ryiho/A==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.12.13"
+    "@babel/helper-annotate-as-pure" "^7.14.5"
     regexpu-core "^4.7.1"
 
-"@babel/helper-define-polyfill-provider@^0.1.2":
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.1.2.tgz#619f01afe1deda460676c25c463b42eaefdb71a2"
-  integrity sha512-hWeolZJivTNGHXHzJjQz/NwDaG4mGXf22ZroOP8bQYgvHNzaQ5tylsVbAcAS2oDjXBwpu8qH2I/654QFS2rDpw==
+"@babel/helper-define-polyfill-provider@^0.2.2":
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/@babel/helper-define-polyfill-provider/-/helper-define-polyfill-provider-0.2.3.tgz#0525edec5094653a282688d34d846e4c75e9c0b6"
+  integrity sha512-RH3QDAfRMzj7+0Nqu5oqgO5q9mFtQEVvCRsi8qCEfzLR9p2BHfn5FzhSB2oj1fF7I2+DcTORkYaQ6aTR9Cofew==
   dependencies:
     "@babel/helper-compilation-targets" "^7.13.0"
     "@babel/helper-module-imports" "^7.12.13"
@@ -380,379 +372,295 @@
     resolve "^1.14.2"
     semver "^6.1.2"
 
-"@babel/helper-explode-assignable-expression@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.12.13.tgz#0e46990da9e271502f77507efa4c9918d3d8634a"
-  integrity sha512-5loeRNvMo9mx1dA/d6yNi+YiKziJZFylZnCo1nmFF4qPU4yJ14abhWESuSMQSlQxWdxdOFzxXjk/PpfudTtYyw==
-  dependencies:
-    "@babel/types" "^7.12.13"
-
-"@babel/helper-function-name@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.12.13.tgz#93ad656db3c3c2232559fd7b2c3dbdcbe0eb377a"
-  integrity sha512-TZvmPn0UOqmvi5G4vvw0qZTpVptGkB1GL61R6lKvrSdIxGm5Pky7Q3fpKiIkQCAtRCBUwB0PaThlx9vebCDSwA==
-  dependencies:
-    "@babel/helper-get-function-arity" "^7.12.13"
-    "@babel/template" "^7.12.13"
-    "@babel/types" "^7.12.13"
-
-"@babel/helper-get-function-arity@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.12.13.tgz#bc63451d403a3b3082b97e1d8b3fe5bd4091e583"
-  integrity sha512-DjEVzQNz5LICkzN0REdpD5prGoidvbdYk1BVgRUOINaWJP2t6avB27X1guXK1kXNrX0WMfsrm1A/ZBthYuIMQg==
-  dependencies:
-    "@babel/types" "^7.12.13"
-
-"@babel/helper-hoist-variables@^7.13.0":
-  version "7.13.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.13.0.tgz#5d5882e855b5c5eda91e0cadc26c6e7a2c8593d8"
-  integrity sha512-0kBzvXiIKfsCA0y6cFEIJf4OdzfpRuNk4+YTeHZpGGc666SATFKTz6sRncwFnQk7/ugJ4dSrCj6iJuvW4Qwr2g==
-  dependencies:
-    "@babel/traverse" "^7.13.0"
-    "@babel/types" "^7.13.0"
-
-"@babel/helper-member-expression-to-functions@^7.12.13":
-  version "7.12.16"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.12.16.tgz#41e0916b99f8d5f43da4f05d85f4930fa3d62b22"
-  integrity sha512-zYoZC1uvebBFmj1wFAlXwt35JLEgecefATtKp20xalwEK8vHAixLBXTGxNrVGEmTT+gzOThUgr8UEdgtalc1BQ==
-  dependencies:
-    "@babel/types" "^7.12.13"
-
-"@babel/helper-member-expression-to-functions@^7.13.0":
-  version "7.13.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.0.tgz#6aa4bb678e0f8c22f58cdb79451d30494461b091"
-  integrity sha512-yvRf8Ivk62JwisqV1rFRMxiSMDGnN6KH1/mDMmIrij4jztpQNRoHqqMG3U6apYbGRPJpgPalhva9Yd06HlUxJQ==
-  dependencies:
-    "@babel/types" "^7.13.0"
-
-"@babel/helper-member-expression-to-functions@^7.13.12":
-  version "7.13.12"
-  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.13.12.tgz#dfe368f26d426a07299d8d6513821768216e6d72"
-  integrity sha512-48ql1CLL59aKbU94Y88Xgb2VFy7a95ykGRbJJaaVv+LX5U8wFpLfiGXJJGUozsmA1oEh/o5Bp60Voq7ACyA/Sw==
-  dependencies:
-    "@babel/types" "^7.13.12"
-
-"@babel/helper-module-imports@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.12.13.tgz#ec67e4404f41750463e455cc3203f6a32e93fcb0"
-  integrity sha512-NGmfvRp9Rqxy0uHSSVP+SRIW1q31a7Ji10cLBcqSDUngGentY4FRiHOFZFE1CLU5eiL0oE8reH7Tg1y99TDM/g==
-  dependencies:
-    "@babel/types" "^7.12.13"
-
-"@babel/helper-module-imports@^7.13.12":
-  version "7.13.12"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.13.12.tgz#c6a369a6f3621cb25da014078684da9196b61977"
-  integrity sha512-4cVvR2/1B693IuOvSI20xqqa/+bl7lqAMR59R4iu39R9aOX8/JoYY1sFaNvUMyMBGnHdwvJgUrzNLoUZxXypxA==
-  dependencies:
-    "@babel/types" "^7.13.12"
-
-"@babel/helper-module-transforms@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.12.13.tgz#01afb052dcad2044289b7b20beb3fa8bd0265bea"
-  integrity sha512-acKF7EjqOR67ASIlDTupwkKM1eUisNAjaSduo5Cz+793ikfnpe7p4Q7B7EWU2PCoSTPWsQkR7hRUWEIZPiVLGA==
-  dependencies:
-    "@babel/helper-module-imports" "^7.12.13"
-    "@babel/helper-replace-supers" "^7.12.13"
-    "@babel/helper-simple-access" "^7.12.13"
-    "@babel/helper-split-export-declaration" "^7.12.13"
-    "@babel/helper-validator-identifier" "^7.12.11"
-    "@babel/template" "^7.12.13"
-    "@babel/traverse" "^7.12.13"
-    "@babel/types" "^7.12.13"
-    lodash "^4.17.19"
-
-"@babel/helper-module-transforms@^7.13.0":
-  version "7.13.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.13.0.tgz#42eb4bd8eea68bab46751212c357bfed8b40f6f1"
-  integrity sha512-Ls8/VBwH577+pw7Ku1QkUWIyRRNHpYlts7+qSqBBFCW3I8QteB9DxfcZ5YJpOwH6Ihe/wn8ch7fMGOP1OhEIvw==
-  dependencies:
-    "@babel/helper-module-imports" "^7.12.13"
-    "@babel/helper-replace-supers" "^7.13.0"
-    "@babel/helper-simple-access" "^7.12.13"
-    "@babel/helper-split-export-declaration" "^7.12.13"
-    "@babel/helper-validator-identifier" "^7.12.11"
-    "@babel/template" "^7.12.13"
-    "@babel/traverse" "^7.13.0"
-    "@babel/types" "^7.13.0"
-    lodash "^4.17.19"
-
-"@babel/helper-module-transforms@^7.13.12":
-  version "7.13.12"
-  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.13.12.tgz#600e58350490828d82282631a1422268e982ba96"
-  integrity sha512-7zVQqMO3V+K4JOOj40kxiCrMf6xlQAkewBB0eu2b03OO/Q21ZutOzjpfD79A5gtE/2OWi1nv625MrDlGlkbknQ==
-  dependencies:
-    "@babel/helper-module-imports" "^7.13.12"
-    "@babel/helper-replace-supers" "^7.13.12"
-    "@babel/helper-simple-access" "^7.13.12"
-    "@babel/helper-split-export-declaration" "^7.12.13"
-    "@babel/helper-validator-identifier" "^7.12.11"
-    "@babel/template" "^7.12.13"
-    "@babel/traverse" "^7.13.0"
-    "@babel/types" "^7.13.12"
-
-"@babel/helper-optimise-call-expression@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.12.13.tgz#5c02d171b4c8615b1e7163f888c1c81c30a2aaea"
-  integrity sha512-BdWQhoVJkp6nVjB7nkFWcn43dkprYauqtk++Py2eaf/GRDFm5BxRqEIZCiHlZUGAVmtwKcsVL1dC68WmzeFmiA==
-  dependencies:
-    "@babel/types" "^7.12.13"
-
-"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.12.13.tgz#174254d0f2424d8aefb4dd48057511247b0a9eeb"
-  integrity sha512-C+10MXCXJLiR6IeG9+Wiejt9jmtFpxUc3MQqCmPY8hfCjyUGl9kT+B2okzEZrtykiwrc4dbCPdDoz0A/HQbDaA==
-
-"@babel/helper-plugin-utils@^7.13.0":
-  version "7.13.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.13.0.tgz#806526ce125aed03373bc416a828321e3a6a33af"
-  integrity sha512-ZPafIPSwzUlAoWT8DKs1W2VyF2gOWthGd5NGFMsBcMMol+ZhK+EQY/e6V96poa6PA/Bh+C9plWN0hXO1uB8AfQ==
-
-"@babel/helper-remap-async-to-generator@^7.13.0":
-  version "7.13.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.13.0.tgz#376a760d9f7b4b2077a9dd05aa9c3927cadb2209"
-  integrity sha512-pUQpFBE9JvC9lrQbpX0TmeNIy5s7GnZjna2lhhcHC7DzgBs6fWn722Y5cfwgrtrqc7NAJwMvOa0mKhq6XaE4jg==
-  dependencies:
-    "@babel/helper-annotate-as-pure" "^7.12.13"
-    "@babel/helper-wrap-function" "^7.13.0"
-    "@babel/types" "^7.13.0"
-
-"@babel/helper-replace-supers@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.12.13.tgz#00ec4fb6862546bd3d0aff9aac56074277173121"
-  integrity sha512-pctAOIAMVStI2TMLhozPKbf5yTEXc0OJa0eENheb4w09SrgOWEs+P4nTOZYJQCqs8JlErGLDPDJTiGIp3ygbLg==
-  dependencies:
-    "@babel/helper-member-expression-to-functions" "^7.12.13"
-    "@babel/helper-optimise-call-expression" "^7.12.13"
-    "@babel/traverse" "^7.12.13"
-    "@babel/types" "^7.12.13"
-
-"@babel/helper-replace-supers@^7.13.0":
-  version "7.13.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.13.0.tgz#6034b7b51943094cb41627848cb219cb02be1d24"
-  integrity sha512-Segd5me1+Pz+rmN/NFBOplMbZG3SqRJOBlY+mA0SxAv6rjj7zJqr1AVr3SfzUVTLCv7ZLU5FycOM/SBGuLPbZw==
+"@babel/helper-explode-assignable-expression@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-explode-assignable-expression/-/helper-explode-assignable-expression-7.14.5.tgz#8aa72e708205c7bb643e45c73b4386cdf2a1f645"
+  integrity sha512-Htb24gnGJdIGT4vnRKMdoXiOIlqOLmdiUYpAQ0mYfgVT/GDm8GOYhgi4GL+hMKrkiPRohO4ts34ELFsGAPQLDQ==
   dependencies:
-    "@babel/helper-member-expression-to-functions" "^7.13.0"
-    "@babel/helper-optimise-call-expression" "^7.12.13"
-    "@babel/traverse" "^7.13.0"
-    "@babel/types" "^7.13.0"
-
-"@babel/helper-replace-supers@^7.13.12":
-  version "7.13.12"
-  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.13.12.tgz#6442f4c1ad912502481a564a7386de0c77ff3804"
-  integrity sha512-Gz1eiX+4yDO8mT+heB94aLVNCL+rbuT2xy4YfyNqu8F+OI6vMvJK891qGBTqL9Uc8wxEvRW92Id6G7sDen3fFw==
-  dependencies:
-    "@babel/helper-member-expression-to-functions" "^7.13.12"
-    "@babel/helper-optimise-call-expression" "^7.12.13"
-    "@babel/traverse" "^7.13.0"
-    "@babel/types" "^7.13.12"
-
-"@babel/helper-simple-access@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.12.13.tgz#8478bcc5cacf6aa1672b251c1d2dde5ccd61a6c4"
-  integrity sha512-0ski5dyYIHEfwpWGx5GPWhH35j342JaflmCeQmsPWcrOQDtCN6C1zKAVRFVbK53lPW2c9TsuLLSUDf0tIGJ5hA==
-  dependencies:
-    "@babel/types" "^7.12.13"
-
-"@babel/helper-simple-access@^7.13.12":
-  version "7.13.12"
-  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.13.12.tgz#dd6c538afb61819d205a012c31792a39c7a5eaf6"
-  integrity sha512-7FEjbrx5SL9cWvXioDbnlYTppcZGuCY6ow3/D5vMggb2Ywgu4dMrpTJX0JdQAIcRRUElOIxF3yEooa9gUb9ZbA==
-  dependencies:
-    "@babel/types" "^7.13.12"
-
-"@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.12.1"
-
-"@babel/helper-split-export-declaration@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.12.13.tgz#e9430be00baf3e88b0e13e6f9d4eaf2136372b05"
-  integrity sha512-tCJDltF83htUtXx5NLcaDqRmknv652ZWCHyoTETf1CXYJdPC7nohZohjUgieXhv0hTJdRf2FjDueFehdNucpzg==
-  dependencies:
-    "@babel/types" "^7.12.13"
-
-"@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.17":
-  version "7.12.17"
-  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.12.17.tgz#d1fbf012e1a79b7eebbfdc6d270baaf8d9eb9831"
-  integrity sha512-TopkMDmLzq8ngChwRlyjR6raKD6gMSae4JdYDB8bByKreQgG0RBTuKe9LRxW3wFtUnjxOPRKBDwEH6Mg5KeDfw==
-
-"@babel/helper-wrap-function@^7.13.0":
-  version "7.13.0"
-  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.13.0.tgz#bdb5c66fda8526ec235ab894ad53a1235c79fcc4"
-  integrity sha512-1UX9F7K3BS42fI6qd2A4BjKzgGjToscyZTdp1DjknHLCIvpgne6918io+aL5LXFcER/8QWiwpoY902pVEqgTXA==
-  dependencies:
-    "@babel/helper-function-name" "^7.12.13"
-    "@babel/template" "^7.12.13"
-    "@babel/traverse" "^7.13.0"
-    "@babel/types" "^7.13.0"
-
-"@babel/helpers@^7.12.13", "@babel/helpers@^7.8.3":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.12.13.tgz#3c75e993632e4dadc0274eae219c73eb7645ba47"
-  integrity sha512-oohVzLRZ3GQEk4Cjhfs9YkJA4TdIDTObdBEZGrd6F/T0GPSnuV6l22eMcxlvcvzVIPH3VTtxbseudM1zIE+rPQ==
+    "@babel/types" "^7.14.5"
+
+"@babel/helper-function-name@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-function-name/-/helper-function-name-7.14.5.tgz#89e2c474972f15d8e233b52ee8c480e2cfcd50c4"
+  integrity sha512-Gjna0AsXWfFvrAuX+VKcN/aNNWonizBj39yGwUzVDVTlMYJMK2Wp6xdpy72mfArFq5uK+NOuexfzZlzI1z9+AQ==
   dependencies:
-    "@babel/template" "^7.12.13"
-    "@babel/traverse" "^7.12.13"
-    "@babel/types" "^7.12.13"
+    "@babel/helper-get-function-arity" "^7.14.5"
+    "@babel/template" "^7.14.5"
+    "@babel/types" "^7.14.5"
 
-"@babel/helpers@^7.13.10":
-  version "7.13.10"
-  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.13.10.tgz#fd8e2ba7488533cdeac45cc158e9ebca5e3c7df8"
-  integrity sha512-4VO883+MWPDUVRF3PhiLBUFHoX/bsLTGFpFK/HqvvfBZz2D57u9XzPVNFVBTc0PW/CWR9BXTOKt8NF4DInUHcQ==
+"@babel/helper-get-function-arity@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-get-function-arity/-/helper-get-function-arity-7.14.5.tgz#25fbfa579b0937eee1f3b805ece4ce398c431815"
+  integrity sha512-I1Db4Shst5lewOM4V+ZKJzQ0JGGaZ6VY1jYvMghRjqs6DWgxLCIyFt30GlnKkfUeFLpJt2vzbMVEXVSXlIFYUg==
   dependencies:
-    "@babel/template" "^7.12.13"
-    "@babel/traverse" "^7.13.0"
-    "@babel/types" "^7.13.0"
+    "@babel/types" "^7.14.5"
+
+"@babel/helper-hoist-variables@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-hoist-variables/-/helper-hoist-variables-7.14.5.tgz#e0dd27c33a78e577d7c8884916a3e7ef1f7c7f8d"
+  integrity sha512-R1PXiz31Uc0Vxy4OEOm07x0oSjKAdPPCh3tPivn/Eo8cvz6gveAeuyUUPB21Hoiif0uoPQSSdhIPS3352nvdyQ==
+  dependencies:
+    "@babel/types" "^7.14.5"
 
-"@babel/highlight@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.12.13.tgz#8ab538393e00370b26271b01fa08f7f27f2e795c"
-  integrity sha512-kocDQvIbgMKlWxXe9fof3TQ+gkIPOUSEYhJjqUjvKMez3krV7vbzYCDq39Oj11UAVK7JqPVGQPlgE85dPNlQww==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.12.11"
+"@babel/helper-member-expression-to-functions@^7.14.5", "@babel/helper-member-expression-to-functions@^7.14.7":
+  version "7.14.7"
+  resolved "https://registry.yarnpkg.com/@babel/helper-member-expression-to-functions/-/helper-member-expression-to-functions-7.14.7.tgz#97e56244beb94211fe277bd818e3a329c66f7970"
+  integrity sha512-TMUt4xKxJn6ccjcOW7c4hlwyJArizskAhoSTOCkA0uZ+KghIaci0Qg9R043kUMWI9mtQfgny+NQ5QATnZ+paaA==
+  dependencies:
+    "@babel/types" "^7.14.5"
+
+"@babel/helper-module-imports@^7.12.13", "@babel/helper-module-imports@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-imports/-/helper-module-imports-7.14.5.tgz#6d1a44df6a38c957aa7c312da076429f11b422f3"
+  integrity sha512-SwrNHu5QWS84XlHwGYPDtCxcA0hrSlL2yhWYLgeOc0w7ccOl2qv4s/nARI0aYZW+bSwAL5CukeXA47B/1NKcnQ==
+  dependencies:
+    "@babel/types" "^7.14.5"
+
+"@babel/helper-module-transforms@^7.14.5", "@babel/helper-module-transforms@^7.14.8":
+  version "7.14.8"
+  resolved "https://registry.yarnpkg.com/@babel/helper-module-transforms/-/helper-module-transforms-7.14.8.tgz#d4279f7e3fd5f4d5d342d833af36d4dd87d7dc49"
+  integrity sha512-RyE+NFOjXn5A9YU1dkpeBaduagTlZ0+fccnIcAGbv1KGUlReBj7utF7oEth8IdIBQPcux0DDgW5MFBH2xu9KcA==
+  dependencies:
+    "@babel/helper-module-imports" "^7.14.5"
+    "@babel/helper-replace-supers" "^7.14.5"
+    "@babel/helper-simple-access" "^7.14.8"
+    "@babel/helper-split-export-declaration" "^7.14.5"
+    "@babel/helper-validator-identifier" "^7.14.8"
+    "@babel/template" "^7.14.5"
+    "@babel/traverse" "^7.14.8"
+    "@babel/types" "^7.14.8"
+
+"@babel/helper-optimise-call-expression@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-optimise-call-expression/-/helper-optimise-call-expression-7.14.5.tgz#f27395a8619e0665b3f0364cddb41c25d71b499c"
+  integrity sha512-IqiLIrODUOdnPU9/F8ib1Fx2ohlgDhxnIDU7OEVi+kAbEZcyiF7BLU8W6PfvPi9LzztjS7kcbzbmL7oG8kD6VA==
+  dependencies:
+    "@babel/types" "^7.14.5"
+
+"@babel/helper-plugin-utils@^7.0.0", "@babel/helper-plugin-utils@^7.10.4", "@babel/helper-plugin-utils@^7.12.13", "@babel/helper-plugin-utils@^7.13.0", "@babel/helper-plugin-utils@^7.14.5", "@babel/helper-plugin-utils@^7.8.0", "@babel/helper-plugin-utils@^7.8.3":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-plugin-utils/-/helper-plugin-utils-7.14.5.tgz#5ac822ce97eec46741ab70a517971e443a70c5a9"
+  integrity sha512-/37qQCE3K0vvZKwoK4XU/irIJQdIfCJuhU5eKnNxpFDsOkgFaUAwbv+RYw6eYgsC0E4hS7r5KqGULUogqui0fQ==
+
+"@babel/helper-remap-async-to-generator@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-remap-async-to-generator/-/helper-remap-async-to-generator-7.14.5.tgz#51439c913612958f54a987a4ffc9ee587a2045d6"
+  integrity sha512-rLQKdQU+HYlxBwQIj8dk4/0ENOUEhA/Z0l4hN8BexpvmSMN9oA9EagjnhnDpNsRdWCfjwa4mn/HyBXO9yhQP6A==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.14.5"
+    "@babel/helper-wrap-function" "^7.14.5"
+    "@babel/types" "^7.14.5"
+
+"@babel/helper-replace-supers@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-replace-supers/-/helper-replace-supers-7.14.5.tgz#0ecc0b03c41cd567b4024ea016134c28414abb94"
+  integrity sha512-3i1Qe9/8x/hCHINujn+iuHy+mMRLoc77b2nI9TB0zjH1hvn9qGlXjWlggdwUcju36PkPCy/lpM7LLUdcTyH4Ow==
+  dependencies:
+    "@babel/helper-member-expression-to-functions" "^7.14.5"
+    "@babel/helper-optimise-call-expression" "^7.14.5"
+    "@babel/traverse" "^7.14.5"
+    "@babel/types" "^7.14.5"
+
+"@babel/helper-simple-access@^7.14.5", "@babel/helper-simple-access@^7.14.8":
+  version "7.14.8"
+  resolved "https://registry.yarnpkg.com/@babel/helper-simple-access/-/helper-simple-access-7.14.8.tgz#82e1fec0644a7e775c74d305f212c39f8fe73924"
+  integrity sha512-TrFN4RHh9gnWEU+s7JloIho2T76GPwRHhdzOWLqTrMnlas8T9O7ec+oEDNsRXndOmru9ymH9DFrEOxpzPoSbdg==
+  dependencies:
+    "@babel/types" "^7.14.8"
+
+"@babel/helper-skip-transparent-expression-wrappers@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-skip-transparent-expression-wrappers/-/helper-skip-transparent-expression-wrappers-7.14.5.tgz#96f486ac050ca9f44b009fbe5b7d394cab3a0ee4"
+  integrity sha512-dmqZB7mrb94PZSAOYtr+ZN5qt5owZIAgqtoTuqiFbHFtxgEcmQlRJVI+bO++fciBunXtB6MK7HrzrfcAzIz2NQ==
+  dependencies:
+    "@babel/types" "^7.14.5"
+
+"@babel/helper-split-export-declaration@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-split-export-declaration/-/helper-split-export-declaration-7.14.5.tgz#22b23a54ef51c2b7605d851930c1976dd0bc693a"
+  integrity sha512-hprxVPu6e5Kdp2puZUmvOGjaLv9TCe58E/Fl6hRq4YiVQxIcNvuq6uTM2r1mT/oPskuS9CgR+I94sqAYv0NGKA==
+  dependencies:
+    "@babel/types" "^7.14.5"
+
+"@babel/helper-validator-identifier@^7.14.5", "@babel/helper-validator-identifier@^7.14.8":
+  version "7.14.8"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-identifier/-/helper-validator-identifier-7.14.8.tgz#32be33a756f29e278a0d644fa08a2c9e0f88a34c"
+  integrity sha512-ZGy6/XQjllhYQrNw/3zfWRwZCTVSiBLZ9DHVZxn9n2gip/7ab8mv2TWlKPIBk26RwedCBoWdjLmn+t9na2Gcow==
+
+"@babel/helper-validator-option@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-validator-option/-/helper-validator-option-7.14.5.tgz#6e72a1fff18d5dfcb878e1e62f1a021c4b72d5a3"
+  integrity sha512-OX8D5eeX4XwcroVW45NMvoYaIuFI+GQpA2a8Gi+X/U/cDUIRsV37qQfF905F0htTRCREQIB4KqPeaveRJUl3Ow==
+
+"@babel/helper-wrap-function@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/helper-wrap-function/-/helper-wrap-function-7.14.5.tgz#5919d115bf0fe328b8a5d63bcb610f51601f2bff"
+  integrity sha512-YEdjTCq+LNuNS1WfxsDCNpgXkJaIyqco6DAelTUjT4f2KIWC1nBcaCaSdHTBqQVLnTBexBcVcFhLSU1KnYuePQ==
+  dependencies:
+    "@babel/helper-function-name" "^7.14.5"
+    "@babel/template" "^7.14.5"
+    "@babel/traverse" "^7.14.5"
+    "@babel/types" "^7.14.5"
+
+"@babel/helpers@^7.14.8", "@babel/helpers@^7.8.3":
+  version "7.14.8"
+  resolved "https://registry.yarnpkg.com/@babel/helpers/-/helpers-7.14.8.tgz#839f88f463025886cff7f85a35297007e2da1b77"
+  integrity sha512-ZRDmI56pnV+p1dH6d+UN6GINGz7Krps3+270qqI9UJ4wxYThfAIcI5i7j5vXC4FJ3Wap+S9qcebxeYiqn87DZw==
+  dependencies:
+    "@babel/template" "^7.14.5"
+    "@babel/traverse" "^7.14.8"
+    "@babel/types" "^7.14.8"
+
+"@babel/highlight@^7.10.4", "@babel/highlight@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/highlight/-/highlight-7.14.5.tgz#6861a52f03966405001f6aa534a01a24d99e8cd9"
+  integrity sha512-qf9u2WFWVV0MppaL877j2dBtQIDgmidgjGk5VIMw3OadXvYaXn66U1BFlH2t4+t3i+8PhedppRv+i40ABzd+gg==
+  dependencies:
+    "@babel/helper-validator-identifier" "^7.14.5"
     chalk "^2.0.0"
     js-tokens "^4.0.0"
 
-"@babel/parser@^7.1.0", "@babel/parser@^7.12.13", "@babel/parser@^7.12.16", "@babel/parser@^7.8.3":
-  version "7.12.16"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.12.16.tgz#cc31257419d2c3189d394081635703f549fc1ed4"
-  integrity sha512-c/+u9cqV6F0+4Hpq01jnJO+GLp2DdT63ppz9Xa+6cHaajM9VFzK/iDXiKK65YtpeVwu+ctfS6iqlMqRgQRzeCw==
-
-"@babel/parser@^7.13.0":
-  version "7.13.0"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.13.0.tgz#49b9b6ee213e5634fa80361dae139effef893f78"
-  integrity sha512-w80kxEMFhE3wjMOQkfdTvv0CSdRSJZptIlLhU4eU/coNJeWjduspUFz+IRnBbAq6m5XYBFMoT1TNkk9K9yf10g==
+"@babel/parser@^7.1.0", "@babel/parser@^7.14.5", "@babel/parser@^7.14.8", "@babel/parser@^7.8.3":
+  version "7.14.8"
+  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.14.8.tgz#66fd41666b2d7b840bd5ace7f7416d5ac60208d4"
+  integrity sha512-syoCQFOoo/fzkWDeM0dLEZi5xqurb5vuyzwIMNZRNun+N/9A4cUZeQaE7dTrB8jGaKuJRBtEOajtnmw0I5hvvA==
 
-"@babel/parser@^7.13.13":
-  version "7.13.13"
-  resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.13.13.tgz#42f03862f4aed50461e543270916b47dd501f0df"
-  integrity sha512-OhsyMrqygfk5v8HmWwOzlYjJrtLaFhF34MrfG/Z73DgYCI6ojNUTUp2TYbtnjo8PegeJp12eamsNettCQjKjVw==
-
-"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.13.12":
-  version "7.13.12"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.13.12.tgz#a3484d84d0b549f3fc916b99ee4783f26fabad2a"
-  integrity sha512-d0u3zWKcoZf379fOeJdr1a5WPDny4aOFZ6hlfKivgK0LY7ZxNfoaHL2fWwdGtHyVvra38FC+HVYkO+byfSA8AQ==
+"@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining/-/plugin-bugfix-v8-spread-parameters-in-optional-chaining-7.14.5.tgz#4b467302e1548ed3b1be43beae2cc9cf45e0bb7e"
+  integrity sha512-ZoJS2XCKPBfTmL122iP6NM9dOg+d4lc9fFk3zxc8iDjvt8Pk4+TlsHSKhIPf6X+L5ORCdBzqMZDjL/WHj7WknQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.13.0"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1"
-    "@babel/plugin-proposal-optional-chaining" "^7.13.12"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.14.5"
+    "@babel/plugin-proposal-optional-chaining" "^7.14.5"
 
-"@babel/plugin-proposal-async-generator-functions@^7.13.8":
-  version "7.13.8"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.13.8.tgz#87aacb574b3bc4b5603f6fe41458d72a5a2ec4b1"
-  integrity sha512-rPBnhj+WgoSmgq+4gQUtXx/vOcU+UYtjy1AA/aeD61Hwj410fwYyqfUcRP3lR8ucgliVJL/G7sXcNUecC75IXA==
+"@babel/plugin-proposal-async-generator-functions@7.14.7", "@babel/plugin-proposal-async-generator-functions@^7.14.7":
+  version "7.14.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-async-generator-functions/-/plugin-proposal-async-generator-functions-7.14.7.tgz#784a48c3d8ed073f65adcf30b57bcbf6c8119ace"
+  integrity sha512-RK8Wj7lXLY3bqei69/cc25gwS5puEc3dknoFPFbqfy3XxYQBQFvu4ioWpafMBAB+L9NyptQK4nMOa5Xz16og8Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.13.0"
-    "@babel/helper-remap-async-to-generator" "^7.13.0"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-remap-async-to-generator" "^7.14.5"
     "@babel/plugin-syntax-async-generators" "^7.8.4"
 
-"@babel/plugin-proposal-class-properties@^7.13.0":
-  version "7.13.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.13.0.tgz#146376000b94efd001e57a40a88a525afaab9f37"
-  integrity sha512-KnTDjFNC1g+45ka0myZNvSBFLhNCLN+GeGYLDEA8Oq7MZ6yMgfLoIRh86GRT0FjtJhZw8JyUskP9uvj5pHM9Zg==
+"@babel/plugin-proposal-class-properties@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-properties/-/plugin-proposal-class-properties-7.14.5.tgz#40d1ee140c5b1e31a350f4f5eed945096559b42e"
+  integrity sha512-q/PLpv5Ko4dVc1LYMpCY7RVAAO4uk55qPwrIuJ5QJ8c6cVuAmhu7I/49JOppXL6gXf7ZHzpRVEUZdYoPLM04Gg==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.13.0"
-    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-create-class-features-plugin" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-proposal-dynamic-import@^7.13.8":
-  version "7.13.8"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.13.8.tgz#876a1f6966e1dec332e8c9451afda3bebcdf2e1d"
-  integrity sha512-ONWKj0H6+wIRCkZi9zSbZtE/r73uOhMVHh256ys0UzfM7I3d4n+spZNWjOnJv2gzopumP2Wxi186vI8N0Y2JyQ==
+"@babel/plugin-proposal-class-static-block@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-class-static-block/-/plugin-proposal-class-static-block-7.14.5.tgz#158e9e10d449c3849ef3ecde94a03d9f1841b681"
+  integrity sha512-KBAH5ksEnYHCegqseI5N9skTdxgJdmDoAOc0uXa+4QMYKeZD0w5IARh4FMlTNtaHhbB8v+KzMdTgxMMzsIy6Yg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-create-class-features-plugin" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/plugin-syntax-class-static-block" "^7.14.5"
+
+"@babel/plugin-proposal-dynamic-import@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-dynamic-import/-/plugin-proposal-dynamic-import-7.14.5.tgz#0c6617df461c0c1f8fff3b47cd59772360101d2c"
+  integrity sha512-ExjiNYc3HDN5PXJx+bwC50GIx/KKanX2HiggnIUAYedbARdImiCU4RhhHfdf0Kd7JNXGpsBBBCOm+bBVy3Gb0g==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
     "@babel/plugin-syntax-dynamic-import" "^7.8.3"
 
-"@babel/plugin-proposal-export-namespace-from@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.12.13.tgz#393be47a4acd03fa2af6e3cde9b06e33de1b446d"
-  integrity sha512-INAgtFo4OnLN3Y/j0VwAgw3HDXcDtX+C/erMvWzuV9v71r7urb6iyMXu7eM9IgLr1ElLlOkaHjJ0SbCmdOQ3Iw==
+"@babel/plugin-proposal-export-namespace-from@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-export-namespace-from/-/plugin-proposal-export-namespace-from-7.14.5.tgz#dbad244310ce6ccd083072167d8cea83a52faf76"
+  integrity sha512-g5POA32bXPMmSBu5Dx/iZGLGnKmKPc5AiY7qfZgurzrCYgIztDlHFbznSNCoQuv57YQLnQfaDi7dxCtLDIdXdA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.14.5"
     "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
 
-"@babel/plugin-proposal-json-strings@^7.13.8":
-  version "7.13.8"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.13.8.tgz#bf1fb362547075afda3634ed31571c5901afef7b"
-  integrity sha512-w4zOPKUFPX1mgvTmL/fcEqy34hrQ1CRcGxdphBc6snDnnqJ47EZDIyop6IwXzAC8G916hsIuXB2ZMBCExC5k7Q==
+"@babel/plugin-proposal-json-strings@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-json-strings/-/plugin-proposal-json-strings-7.14.5.tgz#38de60db362e83a3d8c944ac858ddf9f0c2239eb"
+  integrity sha512-NSq2fczJYKVRIsUJyNxrVUMhB27zb7N7pOFGQOhBKJrChbGcgEAqyZrmZswkPk18VMurEeJAaICbfm57vUeTbQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-plugin-utils" "^7.14.5"
     "@babel/plugin-syntax-json-strings" "^7.8.3"
 
-"@babel/plugin-proposal-logical-assignment-operators@^7.13.8":
-  version "7.13.8"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.13.8.tgz#93fa78d63857c40ce3c8c3315220fd00bfbb4e1a"
-  integrity sha512-aul6znYB4N4HGweImqKn59Su9RS8lbUIqxtXTOcAGtNIDczoEFv+l1EhmX8rUBp3G1jMjKJm8m0jXVp63ZpS4A==
+"@babel/plugin-proposal-logical-assignment-operators@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-logical-assignment-operators/-/plugin-proposal-logical-assignment-operators-7.14.5.tgz#6e6229c2a99b02ab2915f82571e0cc646a40c738"
+  integrity sha512-YGn2AvZAo9TwyhlLvCCWxD90Xq8xJ4aSgaX3G5D/8DW94L8aaT+dS5cSP+Z06+rCJERGSr9GxMBZ601xoc2taw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-plugin-utils" "^7.14.5"
     "@babel/plugin-syntax-logical-assignment-operators" "^7.10.4"
 
-"@babel/plugin-proposal-nullish-coalescing-operator@^7.13.8":
-  version "7.13.8"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.13.8.tgz#3730a31dafd3c10d8ccd10648ed80a2ac5472ef3"
-  integrity sha512-iePlDPBn//UhxExyS9KyeYU7RM9WScAG+D3Hhno0PLJebAEpDZMocbDe64eqynhNAnwz/vZoL/q/QB2T1OH39A==
+"@babel/plugin-proposal-nullish-coalescing-operator@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-nullish-coalescing-operator/-/plugin-proposal-nullish-coalescing-operator-7.14.5.tgz#ee38589ce00e2cc59b299ec3ea406fcd3a0fdaf6"
+  integrity sha512-gun/SOnMqjSb98Nkaq2rTKMwervfdAoz6NphdY0vTfuzMfryj+tDGb2n6UkDKwez+Y8PZDhE3D143v6Gepp4Hg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-plugin-utils" "^7.14.5"
     "@babel/plugin-syntax-nullish-coalescing-operator" "^7.8.3"
 
-"@babel/plugin-proposal-numeric-separator@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.12.13.tgz#bd9da3188e787b5120b4f9d465a8261ce67ed1db"
-  integrity sha512-O1jFia9R8BUCl3ZGB7eitaAPu62TXJRHn7rh+ojNERCFyqRwJMTmhz+tJ+k0CwI6CLjX/ee4qW74FSqlq9I35w==
+"@babel/plugin-proposal-numeric-separator@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-numeric-separator/-/plugin-proposal-numeric-separator-7.14.5.tgz#83631bf33d9a51df184c2102a069ac0c58c05f18"
+  integrity sha512-yiclALKe0vyZRZE0pS6RXgjUOt87GWv6FYa5zqj15PvhOGFO69R5DusPlgK/1K5dVnCtegTiWu9UaBSrLLJJBg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.14.5"
     "@babel/plugin-syntax-numeric-separator" "^7.10.4"
 
-"@babel/plugin-proposal-object-rest-spread@^7.13.8":
-  version "7.13.8"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.13.8.tgz#5d210a4d727d6ce3b18f9de82cc99a3964eed60a"
-  integrity sha512-DhB2EuB1Ih7S3/IRX5AFVgZ16k3EzfRbq97CxAVI1KSYcW+lexV8VZb7G7L8zuPVSdQMRn0kiBpf/Yzu9ZKH0g==
+"@babel/plugin-proposal-object-rest-spread@^7.14.7":
+  version "7.14.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-object-rest-spread/-/plugin-proposal-object-rest-spread-7.14.7.tgz#5920a2b3df7f7901df0205974c0641b13fd9d363"
+  integrity sha512-082hsZz+sVabfmDWo1Oct1u1AgbKbUAyVgmX4otIc7bdsRgHBXwTwb3DpDmD4Eyyx6DNiuz5UAATT655k+kL5g==
   dependencies:
-    "@babel/compat-data" "^7.13.8"
-    "@babel/helper-compilation-targets" "^7.13.8"
-    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/compat-data" "^7.14.7"
+    "@babel/helper-compilation-targets" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.14.5"
     "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
-    "@babel/plugin-transform-parameters" "^7.13.0"
+    "@babel/plugin-transform-parameters" "^7.14.5"
 
-"@babel/plugin-proposal-optional-catch-binding@^7.13.8":
-  version "7.13.8"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.13.8.tgz#3ad6bd5901506ea996fc31bdcf3ccfa2bed71107"
-  integrity sha512-0wS/4DUF1CuTmGo+NiaHfHcVSeSLj5S3e6RivPTg/2k3wOv3jO35tZ6/ZWsQhQMvdgI7CwphjQa/ccarLymHVA==
+"@babel/plugin-proposal-optional-catch-binding@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-catch-binding/-/plugin-proposal-optional-catch-binding-7.14.5.tgz#939dd6eddeff3a67fdf7b3f044b5347262598c3c"
+  integrity sha512-3Oyiixm0ur7bzO5ybNcZFlmVsygSIQgdOa7cTfOYCMY+wEPAYhZAJxi3mixKFCTCKUhQXuCTtQ1MzrpL3WT8ZQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-plugin-utils" "^7.14.5"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
 
-"@babel/plugin-proposal-optional-chaining@^7.13.12":
-  version "7.13.12"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.13.12.tgz#ba9feb601d422e0adea6760c2bd6bbb7bfec4866"
-  integrity sha512-fcEdKOkIB7Tf4IxrgEVeFC4zeJSTr78no9wTdBuZZbqF64kzllU0ybo2zrzm7gUQfxGhBgq4E39oRs8Zx/RMYQ==
+"@babel/plugin-proposal-optional-chaining@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-optional-chaining/-/plugin-proposal-optional-chaining-7.14.5.tgz#fa83651e60a360e3f13797eef00b8d519695b603"
+  integrity sha512-ycz+VOzo2UbWNI1rQXxIuMOzrDdHGrI23fRiz/Si2R4kv2XZQ1BK8ccdHwehMKBlcH/joGW/tzrUmo67gbJHlQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.13.0"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.14.5"
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
 
-"@babel/plugin-proposal-private-methods@^7.13.0":
-  version "7.13.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.13.0.tgz#04bd4c6d40f6e6bbfa2f57e2d8094bad900ef787"
-  integrity sha512-MXyyKQd9inhx1kDYPkFRVOBXQ20ES8Pto3T7UZ92xj2mY0EVD8oAVzeyYuVfy/mxAdTSIayOvg+aVzcHV2bn6Q==
+"@babel/plugin-proposal-private-methods@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-methods/-/plugin-proposal-private-methods-7.14.5.tgz#37446495996b2945f30f5be5b60d5e2aa4f5792d"
+  integrity sha512-838DkdUA1u+QTCplatfq4B7+1lnDa/+QMI89x5WZHBcnNv+47N8QEj2k9I2MUU9xIv8XJ4XvPCviM/Dj7Uwt9g==
   dependencies:
-    "@babel/helper-create-class-features-plugin" "^7.13.0"
-    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-create-class-features-plugin" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-proposal-unicode-property-regex@^7.12.13", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.12.13.tgz#bebde51339be829c17aaaaced18641deb62b39ba"
-  integrity sha512-XyJmZidNfofEkqFV5VC/bLabGmO5QzenPO/YOfGuEbgU+2sSwMmio3YLb4WtBgcmmdwZHyVyv8on77IUjQ5Gvg==
+"@babel/plugin-proposal-private-property-in-object@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-private-property-in-object/-/plugin-proposal-private-property-in-object-7.14.5.tgz#9f65a4d0493a940b4c01f8aa9d3f1894a587f636"
+  integrity sha512-62EyfyA3WA0mZiF2e2IV9mc9Ghwxcg8YTu8BS4Wss4Y3PY725OmS9M0qLORbJwLqFtGh+jiE4wAmocK2CTUK2Q==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.12.13"
-    "@babel/helper-plugin-utils" "^7.12.13"
+    "@babel/helper-annotate-as-pure" "^7.14.5"
+    "@babel/helper-create-class-features-plugin" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
+
+"@babel/plugin-proposal-unicode-property-regex@^7.14.5", "@babel/plugin-proposal-unicode-property-regex@^7.4.4":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-proposal-unicode-property-regex/-/plugin-proposal-unicode-property-regex-7.14.5.tgz#0f95ee0e757a5d647f378daa0eca7e93faa8bbe8"
+  integrity sha512-6axIeOU5LnY471KenAB9vI8I5j7NQ2d652hIYwVyRfgaZT5UpiqFKCuVXCDMSrU+3VFafnu2c5m3lrWIlr6A5Q==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
 "@babel/plugin-syntax-async-generators@^7.8.4":
   version "7.8.4"
@@ -768,6 +676,13 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.12.13"
 
+"@babel/plugin-syntax-class-static-block@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-class-static-block/-/plugin-syntax-class-static-block-7.14.5.tgz#195df89b146b4b78b3bf897fd7a257c84659d406"
+  integrity sha512-b+YyPmr6ldyNnM6sqYeMWE+bgJcJpO6yS4QD7ymxgH34GBPNDM/THBh8iunyvKIZztiwLH4CJZ0RxTk9emgpjw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
 "@babel/plugin-syntax-dynamic-import@^7.8.3":
   version "7.8.3"
   resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-dynamic-import/-/plugin-syntax-dynamic-import-7.8.3.tgz#62bf98b2da3cd21d626154fc96ee5b3cb68eacb3"
@@ -831,298 +746,308 @@
   dependencies:
     "@babel/helper-plugin-utils" "^7.8.0"
 
-"@babel/plugin-syntax-top-level-await@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.13.tgz#c5f0fa6e249f5b739727f923540cf7a806130178"
-  integrity sha512-A81F9pDwyS7yM//KwbCSDqy3Uj4NMIurtplxphWxoYtNPov7cJsDkAFNNyVlIZ3jwGycVsurZ+LtOA8gZ376iQ==
+"@babel/plugin-syntax-private-property-in-object@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-private-property-in-object/-/plugin-syntax-private-property-in-object-7.14.5.tgz#0dc6671ec0ea22b6e94a1114f857970cd39de1ad"
+  integrity sha512-0wVnp9dxJ72ZUJDV27ZfbSj6iHLoytYZmh3rFcxNnvsJF3ktkzLDZPy/mA17HGsaQT3/DQsWYX1f1QGWkCoVUg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-arrow-functions@^7.13.0":
-  version "7.13.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.13.0.tgz#10a59bebad52d637a027afa692e8d5ceff5e3dae"
-  integrity sha512-96lgJagobeVmazXFaDrbmCLQxBysKu7U6Do3mLsx27gf5Dk85ezysrs2BZUpXD703U/Su1xTBDxxar2oa4jAGg==
+"@babel/plugin-syntax-top-level-await@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.14.5.tgz#c1cfdadc35a646240001f06138247b741c34d94c"
+  integrity sha512-hx++upLv5U1rgYfwe1xBQUhRmU41NEvpUvrp8jkrSCdvGSnM5/qdRMtylJ6PG5OFkBaHkbTAKTnd3/YyESRHFw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-async-to-generator@7.13.0", "@babel/plugin-transform-async-to-generator@^7.13.0":
-  version "7.13.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.13.0.tgz#8e112bf6771b82bf1e974e5e26806c5c99aa516f"
-  integrity sha512-3j6E004Dx0K3eGmhxVJxwwI89CTJrce7lg3UrtFuDAVQ/2+SJ/h/aSFOeE6/n0WB1GsOffsJp6MnPQNQ8nmwhg==
+"@babel/plugin-transform-arrow-functions@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-arrow-functions/-/plugin-transform-arrow-functions-7.14.5.tgz#f7187d9588a768dd080bf4c9ffe117ea62f7862a"
+  integrity sha512-KOnO0l4+tD5IfOdi4x8C1XmEIRWUjNRV8wc6K2vz/3e8yAOoZZvsRXRRIF/yo/MAOFb4QjtAw9xSxMXbSMRy8A==
   dependencies:
-    "@babel/helper-module-imports" "^7.12.13"
-    "@babel/helper-plugin-utils" "^7.13.0"
-    "@babel/helper-remap-async-to-generator" "^7.13.0"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-block-scoped-functions@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.12.13.tgz#a9bf1836f2a39b4eb6cf09967739de29ea4bf4c4"
-  integrity sha512-zNyFqbc3kI/fVpqwfqkg6RvBgFpC4J18aKKMmv7KdQ/1GgREapSJAykLMVNwfRGO3BtHj3YQZl8kxCXPcVMVeg==
+"@babel/plugin-transform-async-to-generator@7.14.5", "@babel/plugin-transform-async-to-generator@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-async-to-generator/-/plugin-transform-async-to-generator-7.14.5.tgz#72c789084d8f2094acb945633943ef8443d39e67"
+  integrity sha512-szkbzQ0mNk0rpu76fzDdqSyPu0MuvpXgC+6rz5rpMb5OIRxdmHfQxrktL8CYolL2d8luMCZTR0DpIMIdL27IjA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
+    "@babel/helper-module-imports" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-remap-async-to-generator" "^7.14.5"
 
-"@babel/plugin-transform-block-scoping@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.12.13.tgz#f36e55076d06f41dfd78557ea039c1b581642e61"
-  integrity sha512-Pxwe0iqWJX4fOOM2kEZeUuAxHMWb9nK+9oh5d11bsLoB0xMg+mkDpt0eYuDZB7ETrY9bbcVlKUGTOGWy7BHsMQ==
+"@babel/plugin-transform-block-scoped-functions@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoped-functions/-/plugin-transform-block-scoped-functions-7.14.5.tgz#e48641d999d4bc157a67ef336aeb54bc44fd3ad4"
+  integrity sha512-dtqWqdWZ5NqBX3KzsVCWfQI3A53Ft5pWFCT2eCVUftWZgjc5DpDponbIF1+c+7cSGk2wN0YK7HGL/ezfRbpKBQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-classes@^7.13.0":
-  version "7.13.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.13.0.tgz#0265155075c42918bf4d3a4053134176ad9b533b"
-  integrity sha512-9BtHCPUARyVH1oXGcSJD3YpsqRLROJx5ZNP6tN5vnk17N0SVf9WCtf8Nuh1CFmgByKKAIMstitKduoCmsaDK5g==
+"@babel/plugin-transform-block-scoping@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-block-scoping/-/plugin-transform-block-scoping-7.14.5.tgz#8cc63e61e50f42e078e6f09be775a75f23ef9939"
+  integrity sha512-LBYm4ZocNgoCqyxMLoOnwpsmQ18HWTQvql64t3GvMUzLQrNoV1BDG0lNftC8QKYERkZgCCT/7J5xWGObGAyHDw==
   dependencies:
-    "@babel/helper-annotate-as-pure" "^7.12.13"
-    "@babel/helper-function-name" "^7.12.13"
-    "@babel/helper-optimise-call-expression" "^7.12.13"
-    "@babel/helper-plugin-utils" "^7.13.0"
-    "@babel/helper-replace-supers" "^7.13.0"
-    "@babel/helper-split-export-declaration" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.14.5"
+
+"@babel/plugin-transform-classes@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-classes/-/plugin-transform-classes-7.14.5.tgz#0e98e82097b38550b03b483f9b51a78de0acb2cf"
+  integrity sha512-J4VxKAMykM06K/64z9rwiL6xnBHgB1+FVspqvlgCdwD1KUbQNfszeKVVOMh59w3sztHYIZDgnhOC4WbdEfHFDA==
+  dependencies:
+    "@babel/helper-annotate-as-pure" "^7.14.5"
+    "@babel/helper-function-name" "^7.14.5"
+    "@babel/helper-optimise-call-expression" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-replace-supers" "^7.14.5"
+    "@babel/helper-split-export-declaration" "^7.14.5"
     globals "^11.1.0"
 
-"@babel/plugin-transform-computed-properties@^7.13.0":
-  version "7.13.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.13.0.tgz#845c6e8b9bb55376b1fa0b92ef0bdc8ea06644ed"
-  integrity sha512-RRqTYTeZkZAz8WbieLTvKUEUxZlUTdmL5KGMyZj7FnMfLNKV4+r5549aORG/mgojRmFlQMJDUupwAMiF2Q7OUg==
+"@babel/plugin-transform-computed-properties@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-computed-properties/-/plugin-transform-computed-properties-7.14.5.tgz#1b9d78987420d11223d41195461cc43b974b204f"
+  integrity sha512-pWM+E4283UxaVzLb8UBXv4EIxMovU4zxT1OPnpHJcmnvyY9QbPPTKZfEj31EUvG3/EQRbYAGaYEUZ4yWOBC2xg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-destructuring@^7.13.0":
-  version "7.13.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.13.0.tgz#c5dce270014d4e1ebb1d806116694c12b7028963"
-  integrity sha512-zym5em7tePoNT9s964c0/KU3JPPnuq7VhIxPRefJ4/s82cD+q1mgKfuGRDMCPL0HTyKz4dISuQlCusfgCJ86HA==
+"@babel/plugin-transform-destructuring@^7.14.7":
+  version "7.14.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-destructuring/-/plugin-transform-destructuring-7.14.7.tgz#0ad58ed37e23e22084d109f185260835e5557576"
+  integrity sha512-0mDE99nK+kVh3xlc5vKwB6wnP9ecuSj+zQCa/n0voENtP/zymdT4HH6QEb65wjjcbqr1Jb/7z9Qp7TF5FtwYGw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-dotall-regex@^7.12.13", "@babel/plugin-transform-dotall-regex@^7.4.4":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.12.13.tgz#3f1601cc29905bfcb67f53910f197aeafebb25ad"
-  integrity sha512-foDrozE65ZFdUC2OfgeOCrEPTxdB3yjqxpXh8CH+ipd9CHd4s/iq81kcUpyH8ACGNEPdFqbtzfgzbT/ZGlbDeQ==
+"@babel/plugin-transform-dotall-regex@^7.14.5", "@babel/plugin-transform-dotall-regex@^7.4.4":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-dotall-regex/-/plugin-transform-dotall-regex-7.14.5.tgz#2f6bf76e46bdf8043b4e7e16cf24532629ba0c7a"
+  integrity sha512-loGlnBdj02MDsFaHhAIJzh7euK89lBrGIdM9EAtHFo6xKygCUGuuWe07o1oZVk287amtW1n0808sQM99aZt3gw==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.12.13"
-    "@babel/helper-plugin-utils" "^7.12.13"
+    "@babel/helper-create-regexp-features-plugin" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-duplicate-keys@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.12.13.tgz#6f06b87a8b803fd928e54b81c258f0a0033904de"
-  integrity sha512-NfADJiiHdhLBW3pulJlJI2NB0t4cci4WTZ8FtdIuNc2+8pslXdPtRRAEWqUY+m9kNOk2eRYbTAOipAxlrOcwwQ==
+"@babel/plugin-transform-duplicate-keys@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-duplicate-keys/-/plugin-transform-duplicate-keys-7.14.5.tgz#365a4844881bdf1501e3a9f0270e7f0f91177954"
+  integrity sha512-iJjbI53huKbPDAsJ8EmVmvCKeeq21bAze4fu9GBQtSLqfvzj2oRuHVx4ZkDwEhg1htQ+5OBZh/Ab0XDf5iBZ7A==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-exponentiation-operator@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.12.13.tgz#4d52390b9a273e651e4aba6aee49ef40e80cd0a1"
-  integrity sha512-fbUelkM1apvqez/yYx1/oICVnGo2KM5s63mhGylrmXUxK/IAXSIf87QIxVfZldWf4QsOafY6vV3bX8aMHSvNrA==
+"@babel/plugin-transform-exponentiation-operator@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-exponentiation-operator/-/plugin-transform-exponentiation-operator-7.14.5.tgz#5154b8dd6a3dfe6d90923d61724bd3deeb90b493"
+  integrity sha512-jFazJhMBc9D27o9jDnIE5ZErI0R0m7PbKXVq77FFvqFbzvTMuv8jaAwLZ5PviOLSFttqKIW0/wxNSDbjLk0tYA==
   dependencies:
-    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.12.13"
-    "@babel/helper-plugin-utils" "^7.12.13"
+    "@babel/helper-builder-binary-assignment-operator-visitor" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-for-of@^7.13.0":
-  version "7.13.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.13.0.tgz#c799f881a8091ac26b54867a845c3e97d2696062"
-  integrity sha512-IHKT00mwUVYE0zzbkDgNRP6SRzvfGCYsOxIRz8KsiaaHCcT9BWIkO+H9QRJseHBLOGBZkHUdHiqj6r0POsdytg==
+"@babel/plugin-transform-for-of@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-for-of/-/plugin-transform-for-of-7.14.5.tgz#dae384613de8f77c196a8869cbf602a44f7fc0eb"
+  integrity sha512-CfmqxSUZzBl0rSjpoQSFoR9UEj3HzbGuGNL21/iFTmjb5gFggJp3ph0xR1YBhexmLoKRHzgxuFvty2xdSt6gTA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-function-name@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.12.13.tgz#bb024452f9aaed861d374c8e7a24252ce3a50051"
-  integrity sha512-6K7gZycG0cmIwwF7uMK/ZqeCikCGVBdyP2J5SKNCXO5EOHcqi+z7Jwf8AmyDNcBgxET8DrEtCt/mPKPyAzXyqQ==
+"@babel/plugin-transform-function-name@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-function-name/-/plugin-transform-function-name-7.14.5.tgz#e81c65ecb900746d7f31802f6bed1f52d915d6f2"
+  integrity sha512-vbO6kv0fIzZ1GpmGQuvbwwm+O4Cbm2NrPzwlup9+/3fdkuzo1YqOZcXw26+YUJB84Ja7j9yURWposEHLYwxUfQ==
   dependencies:
-    "@babel/helper-function-name" "^7.12.13"
-    "@babel/helper-plugin-utils" "^7.12.13"
+    "@babel/helper-function-name" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-literals@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.12.13.tgz#2ca45bafe4a820197cf315794a4d26560fe4bdb9"
-  integrity sha512-FW+WPjSR7hiUxMcKqyNjP05tQ2kmBCdpEpZHY1ARm96tGQCCBvXKnpjILtDplUnJ/eHZ0lALLM+d2lMFSpYJrQ==
+"@babel/plugin-transform-literals@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-literals/-/plugin-transform-literals-7.14.5.tgz#41d06c7ff5d4d09e3cf4587bd3ecf3930c730f78"
+  integrity sha512-ql33+epql2F49bi8aHXxvLURHkxJbSmMKl9J5yHqg4PLtdE6Uc48CH1GS6TQvZ86eoB/ApZXwm7jlA+B3kra7A==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-member-expression-literals@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.12.13.tgz#5ffa66cd59b9e191314c9f1f803b938e8c081e40"
-  integrity sha512-kxLkOsg8yir4YeEPHLuO2tXP9R/gTjpuTOjshqSpELUN3ZAg2jfDnKUvzzJxObun38sw3wm4Uu69sX/zA7iRvg==
+"@babel/plugin-transform-member-expression-literals@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-member-expression-literals/-/plugin-transform-member-expression-literals-7.14.5.tgz#b39cd5212a2bf235a617d320ec2b48bcc091b8a7"
+  integrity sha512-WkNXxH1VXVTKarWFqmso83xl+2V3Eo28YY5utIkbsmXoItO8Q3aZxN4BTS2k0hz9dGUloHK26mJMyQEYfkn/+Q==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-modules-amd@^7.13.0":
-  version "7.13.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.13.0.tgz#19f511d60e3d8753cc5a6d4e775d3a5184866cc3"
-  integrity sha512-EKy/E2NHhY/6Vw5d1k3rgoobftcNUmp9fGjb9XZwQLtTctsRBOTRO7RHHxfIky1ogMN5BxN7p9uMA3SzPfotMQ==
+"@babel/plugin-transform-modules-amd@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-amd/-/plugin-transform-modules-amd-7.14.5.tgz#4fd9ce7e3411cb8b83848480b7041d83004858f7"
+  integrity sha512-3lpOU8Vxmp3roC4vzFpSdEpGUWSMsHFreTWOMMLzel2gNGfHE5UWIh/LN6ghHs2xurUp4jRFYMUIZhuFbody1g==
   dependencies:
-    "@babel/helper-module-transforms" "^7.13.0"
-    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-module-transforms" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.14.5"
     babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-commonjs@^7.13.8":
-  version "7.13.8"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.13.8.tgz#7b01ad7c2dcf2275b06fa1781e00d13d420b3e1b"
-  integrity sha512-9QiOx4MEGglfYZ4XOnU79OHr6vIWUakIj9b4mioN8eQIoEh+pf5p/zEB36JpDFWA12nNMiRf7bfoRvl9Rn79Bw==
+"@babel/plugin-transform-modules-commonjs@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-commonjs/-/plugin-transform-modules-commonjs-7.14.5.tgz#7aaee0ea98283de94da98b28f8c35701429dad97"
+  integrity sha512-en8GfBtgnydoao2PS+87mKyw62k02k7kJ9ltbKe0fXTHrQmG6QZZflYuGI1VVG7sVpx4E1n7KBpNlPb8m78J+A==
   dependencies:
-    "@babel/helper-module-transforms" "^7.13.0"
-    "@babel/helper-plugin-utils" "^7.13.0"
-    "@babel/helper-simple-access" "^7.12.13"
+    "@babel/helper-module-transforms" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-simple-access" "^7.14.5"
     babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-systemjs@^7.13.8":
-  version "7.13.8"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.13.8.tgz#6d066ee2bff3c7b3d60bf28dec169ad993831ae3"
-  integrity sha512-hwqctPYjhM6cWvVIlOIe27jCIBgHCsdH2xCJVAYQm7V5yTMoilbVMi9f6wKg0rpQAOn6ZG4AOyvCqFF/hUh6+A==
+"@babel/plugin-transform-modules-systemjs@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-systemjs/-/plugin-transform-modules-systemjs-7.14.5.tgz#c75342ef8b30dcde4295d3401aae24e65638ed29"
+  integrity sha512-mNMQdvBEE5DcMQaL5LbzXFMANrQjd2W7FPzg34Y4yEz7dBgdaC+9B84dSO+/1Wba98zoDbInctCDo4JGxz1VYA==
   dependencies:
-    "@babel/helper-hoist-variables" "^7.13.0"
-    "@babel/helper-module-transforms" "^7.13.0"
-    "@babel/helper-plugin-utils" "^7.13.0"
-    "@babel/helper-validator-identifier" "^7.12.11"
+    "@babel/helper-hoist-variables" "^7.14.5"
+    "@babel/helper-module-transforms" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-validator-identifier" "^7.14.5"
     babel-plugin-dynamic-import-node "^2.3.3"
 
-"@babel/plugin-transform-modules-umd@^7.13.0":
-  version "7.13.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.13.0.tgz#8a3d96a97d199705b9fd021580082af81c06e70b"
-  integrity sha512-D/ILzAh6uyvkWjKKyFE/W0FzWwasv6vPTSqPcjxFqn6QpX3u8DjRVliq4F2BamO2Wee/om06Vyy+vPkNrd4wxw==
+"@babel/plugin-transform-modules-umd@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-modules-umd/-/plugin-transform-modules-umd-7.14.5.tgz#fb662dfee697cce274a7cda525190a79096aa6e0"
+  integrity sha512-RfPGoagSngC06LsGUYyM9QWSXZ8MysEjDJTAea1lqRjNECE3y0qIJF/qbvJxc4oA4s99HumIMdXOrd+TdKaAAA==
   dependencies:
-    "@babel/helper-module-transforms" "^7.13.0"
-    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-module-transforms" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-named-capturing-groups-regex@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.12.13.tgz#2213725a5f5bbbe364b50c3ba5998c9599c5c9d9"
-  integrity sha512-Xsm8P2hr5hAxyYblrfACXpQKdQbx4m2df9/ZZSQ8MAhsadw06+jW7s9zsSw6he+mJZXRlVMyEnVktJo4zjk1WA==
+"@babel/plugin-transform-named-capturing-groups-regex@^7.14.7":
+  version "7.14.7"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-named-capturing-groups-regex/-/plugin-transform-named-capturing-groups-regex-7.14.7.tgz#60c06892acf9df231e256c24464bfecb0908fd4e"
+  integrity sha512-DTNOTaS7TkW97xsDMrp7nycUVh6sn/eq22VaxWfEdzuEbRsiaOU0pqU7DlyUGHVsbQbSghvjKRpEl+nUCKGQSg==
   dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.12.13"
+    "@babel/helper-create-regexp-features-plugin" "^7.14.5"
 
-"@babel/plugin-transform-new-target@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.12.13.tgz#e22d8c3af24b150dd528cbd6e685e799bf1c351c"
-  integrity sha512-/KY2hbLxrG5GTQ9zzZSc3xWiOy379pIETEhbtzwZcw9rvuaVV4Fqy7BYGYOWZnaoXIQYbbJ0ziXLa/sKcGCYEQ==
+"@babel/plugin-transform-new-target@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-new-target/-/plugin-transform-new-target-7.14.5.tgz#31bdae8b925dc84076ebfcd2a9940143aed7dbf8"
+  integrity sha512-Nx054zovz6IIRWEB49RDRuXGI4Gy0GMgqG0cII9L3MxqgXz/+rgII+RU58qpo4g7tNEx1jG7rRVH4ihZoP4esQ==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-object-super@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.12.13.tgz#b4416a2d63b8f7be314f3d349bd55a9c1b5171f7"
-  integrity sha512-JzYIcj3XtYspZDV8j9ulnoMPZZnF/Cj0LUxPOjR89BdBVx+zYJI9MdMIlUZjbXDX+6YVeS6I3e8op+qQ3BYBoQ==
+"@babel/plugin-transform-object-super@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-object-super/-/plugin-transform-object-super-7.14.5.tgz#d0b5faeac9e98597a161a9cf78c527ed934cdc45"
+  integrity sha512-MKfOBWzK0pZIrav9z/hkRqIk/2bTv9qvxHzPQc12RcVkMOzpIKnFCNYJip00ssKWYkd8Sf5g0Wr7pqJ+cmtuFg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
-    "@babel/helper-replace-supers" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-replace-supers" "^7.14.5"
 
-"@babel/plugin-transform-parameters@^7.13.0":
-  version "7.13.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.13.0.tgz#8fa7603e3097f9c0b7ca1a4821bc2fb52e9e5007"
-  integrity sha512-Jt8k/h/mIwE2JFEOb3lURoY5C85ETcYPnbuAJ96zRBzh1XHtQZfs62ChZ6EP22QlC8c7Xqr9q+e1SU5qttwwjw==
+"@babel/plugin-transform-parameters@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-parameters/-/plugin-transform-parameters-7.14.5.tgz#49662e86a1f3ddccac6363a7dfb1ff0a158afeb3"
+  integrity sha512-Tl7LWdr6HUxTmzQtzuU14SqbgrSKmaR77M0OKyq4njZLQTPfOvzblNKyNkGwOfEFCEx7KeYHQHDI0P3F02IVkA==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.13.0"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-property-literals@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.12.13.tgz#4e6a9e37864d8f1b3bc0e2dce7bf8857db8b1a81"
-  integrity sha512-nqVigwVan+lR+g8Fj8Exl0UQX2kymtjcWfMOYM1vTYEKujeyv2SkMgazf2qNcK7l4SDiKyTA/nHCPqL4e2zo1A==
+"@babel/plugin-transform-property-literals@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-property-literals/-/plugin-transform-property-literals-7.14.5.tgz#0ddbaa1f83db3606f1cdf4846fa1dfb473458b34"
+  integrity sha512-r1uilDthkgXW8Z1vJz2dKYLV1tuw2xsbrp3MrZmD99Wh9vsfKoob+JTgri5VUb/JqyKRXotlOtwgu4stIYCmnw==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-regenerator@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.12.13.tgz#b628bcc9c85260ac1aeb05b45bde25210194a2f5"
-  integrity sha512-lxb2ZAvSLyJ2PEe47hoGWPmW22v7CtSl9jW8mingV4H2sEX/JOcrAj2nPuGWi56ERUm2bUpjKzONAuT6HCn2EA==
+"@babel/plugin-transform-regenerator@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-regenerator/-/plugin-transform-regenerator-7.14.5.tgz#9676fd5707ed28f522727c5b3c0aa8544440b04f"
+  integrity sha512-NVIY1W3ITDP5xQl50NgTKlZ0GrotKtLna08/uGY6ErQt6VEQZXla86x/CTddm5gZdcr+5GSsvMeTmWA5Ii6pkg==
   dependencies:
     regenerator-transform "^0.14.2"
 
-"@babel/plugin-transform-reserved-words@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.12.13.tgz#7d9988d4f06e0fe697ea1d9803188aa18b472695"
-  integrity sha512-xhUPzDXxZN1QfiOy/I5tyye+TRz6lA7z6xaT4CLOjPRMVg1ldRf0LHw0TDBpYL4vG78556WuHdyO9oi5UmzZBg==
+"@babel/plugin-transform-reserved-words@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-reserved-words/-/plugin-transform-reserved-words-7.14.5.tgz#c44589b661cfdbef8d4300dcc7469dffa92f8304"
+  integrity sha512-cv4F2rv1nD4qdexOGsRQXJrOcyb5CrgjUH9PKrrtyhSDBNWGxd0UIitjyJiWagS+EbUGjG++22mGH1Pub8D6Vg==
   dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
+    "@babel/helper-plugin-utils" "^7.14.5"
 
-"@babel/plugin-transform-runtime@7.13.10":
-  version "7.13.10"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.13.10.tgz#a1e40d22e2bf570c591c9c7e5ab42d6bf1e419e1"
-  integrity sha512-Y5k8ipgfvz5d/76tx7JYbKQTcgFSU6VgJ3kKQv4zGTKr+a9T/KBvfRvGtSFgKDQGt/DBykQixV0vNWKIdzWErA==
+"@babel/plugin-transform-runtime@7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-runtime/-/plugin-transform-runtime-7.14.5.tgz#30491dad49c6059f8f8fa5ee8896a0089e987523"
+  integrity sha512-fPMBhh1AV8ZyneiCIA+wYYUH1arzlXR1UMcApjvchDhfKxhy2r2lReJv8uHEyihi4IFIGlr1Pdx7S5fkESDQsg==
   dependencies:
-    "@babel/helper-module-imports" "^7.12.13"
-    "@babel/helper-plugin-utils" "^7.13.0"
-    babel-plugin-polyfill-corejs2 "^0.1.4"
-    babel-plugin-polyfill-corejs3 "^0.1.3"
-    babel-plugin-polyfill-regenerator "^0.1.2"
+    "@babel/helper-module-imports" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    babel-plugin-polyfill-corejs2 "^0.2.2"
+    babel-plugin-polyfill-corejs3 "^0.2.2"
+    babel-plugin-polyfill-regenerator "^0.2.2"
     semver "^6.3.0"
 
-"@babel/plugin-transform-shorthand-properties@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.12.13.tgz#db755732b70c539d504c6390d9ce90fe64aff7ad"
-  integrity sha512-xpL49pqPnLtf0tVluuqvzWIgLEhuPpZzvs2yabUHSKRNlN7ScYU7aMlmavOeyXJZKgZKQRBlh8rHbKiJDraTSw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
-
-"@babel/plugin-transform-spread@^7.13.0":
-  version "7.13.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.13.0.tgz#84887710e273c1815ace7ae459f6f42a5d31d5fd"
-  integrity sha512-V6vkiXijjzYeFmQTr3dBxPtZYLPcUfY34DebOU27jIl2M/Y8Egm52Hw82CSjjPqd54GTlJs5x+CR7HeNr24ckg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.13.0"
-    "@babel/helper-skip-transparent-expression-wrappers" "^7.12.1"
-
-"@babel/plugin-transform-sticky-regex@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.12.13.tgz#760ffd936face73f860ae646fb86ee82f3d06d1f"
-  integrity sha512-Jc3JSaaWT8+fr7GRvQP02fKDsYk4K/lYwWq38r/UGfaxo89ajud321NH28KRQ7xy1Ybc0VUE5Pz8psjNNDUglg==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
-
-"@babel/plugin-transform-template-literals@^7.13.0":
-  version "7.13.0"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.13.0.tgz#a36049127977ad94438dee7443598d1cefdf409d"
-  integrity sha512-d67umW6nlfmr1iehCcBv69eSUSySk1EsIS8aTDX4Xo9qajAh6mYtcl4kJrBkGXuxZPEgVr7RVfAvNW6YQkd4Mw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.13.0"
-
-"@babel/plugin-transform-typeof-symbol@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.12.13.tgz#785dd67a1f2ea579d9c2be722de8c84cb85f5a7f"
-  integrity sha512-eKv/LmUJpMnu4npgfvs3LiHhJua5fo/CysENxa45YCQXZwKnGCQKAg87bvoqSW1fFT+HA32l03Qxsm8ouTY3ZQ==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
-
-"@babel/plugin-transform-unicode-escapes@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.12.13.tgz#840ced3b816d3b5127dd1d12dcedc5dead1a5e74"
-  integrity sha512-0bHEkdwJ/sN/ikBHfSmOXPypN/beiGqjo+o4/5K+vxEFNPRPdImhviPakMKG4x96l85emoa0Z6cDflsdBusZbw==
-  dependencies:
-    "@babel/helper-plugin-utils" "^7.12.13"
-
-"@babel/plugin-transform-unicode-regex@^7.12.13":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.12.13.tgz#b52521685804e155b1202e83fc188d34bb70f5ac"
-  integrity sha512-mDRzSNY7/zopwisPZ5kM9XKCfhchqIYwAKRERtEnhYscZB79VRekuRSoYbN0+KVe3y8+q1h6A4svXtP7N+UoCA==
-  dependencies:
-    "@babel/helper-create-regexp-features-plugin" "^7.12.13"
-    "@babel/helper-plugin-utils" "^7.12.13"
-
-"@babel/preset-env@7.13.12":
-  version "7.13.12"
-  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.13.12.tgz#6dff470478290582ac282fb77780eadf32480237"
-  integrity sha512-JzElc6jk3Ko6zuZgBtjOd01pf9yYDEIH8BcqVuYIuOkzOwDesoa/Nz4gIo4lBG6K861KTV9TvIgmFuT6ytOaAA==
-  dependencies:
-    "@babel/compat-data" "^7.13.12"
-    "@babel/helper-compilation-targets" "^7.13.10"
-    "@babel/helper-plugin-utils" "^7.13.0"
-    "@babel/helper-validator-option" "^7.12.17"
-    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.13.12"
-    "@babel/plugin-proposal-async-generator-functions" "^7.13.8"
-    "@babel/plugin-proposal-class-properties" "^7.13.0"
-    "@babel/plugin-proposal-dynamic-import" "^7.13.8"
-    "@babel/plugin-proposal-export-namespace-from" "^7.12.13"
-    "@babel/plugin-proposal-json-strings" "^7.13.8"
-    "@babel/plugin-proposal-logical-assignment-operators" "^7.13.8"
-    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.13.8"
-    "@babel/plugin-proposal-numeric-separator" "^7.12.13"
-    "@babel/plugin-proposal-object-rest-spread" "^7.13.8"
-    "@babel/plugin-proposal-optional-catch-binding" "^7.13.8"
-    "@babel/plugin-proposal-optional-chaining" "^7.13.12"
-    "@babel/plugin-proposal-private-methods" "^7.13.0"
-    "@babel/plugin-proposal-unicode-property-regex" "^7.12.13"
+"@babel/plugin-transform-shorthand-properties@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-shorthand-properties/-/plugin-transform-shorthand-properties-7.14.5.tgz#97f13855f1409338d8cadcbaca670ad79e091a58"
+  integrity sha512-xLucks6T1VmGsTB+GWK5Pl9Jl5+nRXD1uoFdA5TSO6xtiNjtXTjKkmPdFXVLGlK5A2/or/wQMKfmQ2Y0XJfn5g==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
+"@babel/plugin-transform-spread@^7.14.6":
+  version "7.14.6"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-spread/-/plugin-transform-spread-7.14.6.tgz#6bd40e57fe7de94aa904851963b5616652f73144"
+  integrity sha512-Zr0x0YroFJku7n7+/HH3A2eIrGMjbmAIbJSVv0IZ+t3U2WUQUA64S/oeied2e+MaGSjmt4alzBCsK9E8gh+fag==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-skip-transparent-expression-wrappers" "^7.14.5"
+
+"@babel/plugin-transform-sticky-regex@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-sticky-regex/-/plugin-transform-sticky-regex-7.14.5.tgz#5b617542675e8b7761294381f3c28c633f40aeb9"
+  integrity sha512-Z7F7GyvEMzIIbwnziAZmnSNpdijdr4dWt+FJNBnBLz5mwDFkqIXU9wmBcWWad3QeJF5hMTkRe4dAq2sUZiG+8A==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
+"@babel/plugin-transform-template-literals@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-template-literals/-/plugin-transform-template-literals-7.14.5.tgz#a5f2bc233937d8453885dc736bdd8d9ffabf3d93"
+  integrity sha512-22btZeURqiepOfuy/VkFr+zStqlujWaarpMErvay7goJS6BWwdd6BY9zQyDLDa4x2S3VugxFb162IZ4m/S/+Gg==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
+"@babel/plugin-transform-typeof-symbol@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-typeof-symbol/-/plugin-transform-typeof-symbol-7.14.5.tgz#39af2739e989a2bd291bf6b53f16981423d457d4"
+  integrity sha512-lXzLD30ffCWseTbMQzrvDWqljvZlHkXU+CnseMhkMNqU1sASnCsz3tSzAaH3vCUXb9PHeUb90ZT1BdFTm1xxJw==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
+"@babel/plugin-transform-unicode-escapes@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-escapes/-/plugin-transform-unicode-escapes-7.14.5.tgz#9d4bd2a681e3c5d7acf4f57fa9e51175d91d0c6b"
+  integrity sha512-crTo4jATEOjxj7bt9lbYXcBAM3LZaUrbP2uUdxb6WIorLmjNKSpHfIybgY4B8SRpbf8tEVIWH3Vtm7ayCrKocA==
+  dependencies:
+    "@babel/helper-plugin-utils" "^7.14.5"
+
+"@babel/plugin-transform-unicode-regex@^7.14.5":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/plugin-transform-unicode-regex/-/plugin-transform-unicode-regex-7.14.5.tgz#4cd09b6c8425dd81255c7ceb3fb1836e7414382e"
+  integrity sha512-UygduJpC5kHeCiRw/xDVzC+wj8VaYSoKl5JNVmbP7MadpNinAm3SvZCxZ42H37KZBKztz46YC73i9yV34d0Tzw==
+  dependencies:
+    "@babel/helper-create-regexp-features-plugin" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.14.5"
+
+"@babel/preset-env@7.14.8":
+  version "7.14.8"
+  resolved "https://registry.yarnpkg.com/@babel/preset-env/-/preset-env-7.14.8.tgz#254942f5ca80ccabcfbb2a9f524c74bca574005b"
+  integrity sha512-a9aOppDU93oArQ51H+B8M1vH+tayZbuBqzjOhntGetZVa+4tTu5jp+XTwqHGG2lxslqomPYVSjIxQkFwXzgnxg==
+  dependencies:
+    "@babel/compat-data" "^7.14.7"
+    "@babel/helper-compilation-targets" "^7.14.5"
+    "@babel/helper-plugin-utils" "^7.14.5"
+    "@babel/helper-validator-option" "^7.14.5"
+    "@babel/plugin-bugfix-v8-spread-parameters-in-optional-chaining" "^7.14.5"
+    "@babel/plugin-proposal-async-generator-functions" "^7.14.7"
+    "@babel/plugin-proposal-class-properties" "^7.14.5"
+    "@babel/plugin-proposal-class-static-block" "^7.14.5"
+    "@babel/plugin-proposal-dynamic-import" "^7.14.5"
+    "@babel/plugin-proposal-export-namespace-from" "^7.14.5"
+    "@babel/plugin-proposal-json-strings" "^7.14.5"
+    "@babel/plugin-proposal-logical-assignment-operators" "^7.14.5"
+    "@babel/plugin-proposal-nullish-coalescing-operator" "^7.14.5"
+    "@babel/plugin-proposal-numeric-separator" "^7.14.5"
+    "@babel/plugin-proposal-object-rest-spread" "^7.14.7"
+    "@babel/plugin-proposal-optional-catch-binding" "^7.14.5"
+    "@babel/plugin-proposal-optional-chaining" "^7.14.5"
+    "@babel/plugin-proposal-private-methods" "^7.14.5"
+    "@babel/plugin-proposal-private-property-in-object" "^7.14.5"
+    "@babel/plugin-proposal-unicode-property-regex" "^7.14.5"
     "@babel/plugin-syntax-async-generators" "^7.8.4"
     "@babel/plugin-syntax-class-properties" "^7.12.13"
+    "@babel/plugin-syntax-class-static-block" "^7.14.5"
     "@babel/plugin-syntax-dynamic-import" "^7.8.3"
     "@babel/plugin-syntax-export-namespace-from" "^7.8.3"
     "@babel/plugin-syntax-json-strings" "^7.8.3"
@@ -1132,45 +1057,46 @@
     "@babel/plugin-syntax-object-rest-spread" "^7.8.3"
     "@babel/plugin-syntax-optional-catch-binding" "^7.8.3"
     "@babel/plugin-syntax-optional-chaining" "^7.8.3"
-    "@babel/plugin-syntax-top-level-await" "^7.12.13"
-    "@babel/plugin-transform-arrow-functions" "^7.13.0"
-    "@babel/plugin-transform-async-to-generator" "^7.13.0"
-    "@babel/plugin-transform-block-scoped-functions" "^7.12.13"
-    "@babel/plugin-transform-block-scoping" "^7.12.13"
-    "@babel/plugin-transform-classes" "^7.13.0"
-    "@babel/plugin-transform-computed-properties" "^7.13.0"
-    "@babel/plugin-transform-destructuring" "^7.13.0"
-    "@babel/plugin-transform-dotall-regex" "^7.12.13"
-    "@babel/plugin-transform-duplicate-keys" "^7.12.13"
-    "@babel/plugin-transform-exponentiation-operator" "^7.12.13"
-    "@babel/plugin-transform-for-of" "^7.13.0"
-    "@babel/plugin-transform-function-name" "^7.12.13"
-    "@babel/plugin-transform-literals" "^7.12.13"
-    "@babel/plugin-transform-member-expression-literals" "^7.12.13"
-    "@babel/plugin-transform-modules-amd" "^7.13.0"
-    "@babel/plugin-transform-modules-commonjs" "^7.13.8"
-    "@babel/plugin-transform-modules-systemjs" "^7.13.8"
-    "@babel/plugin-transform-modules-umd" "^7.13.0"
-    "@babel/plugin-transform-named-capturing-groups-regex" "^7.12.13"
-    "@babel/plugin-transform-new-target" "^7.12.13"
-    "@babel/plugin-transform-object-super" "^7.12.13"
-    "@babel/plugin-transform-parameters" "^7.13.0"
-    "@babel/plugin-transform-property-literals" "^7.12.13"
-    "@babel/plugin-transform-regenerator" "^7.12.13"
-    "@babel/plugin-transform-reserved-words" "^7.12.13"
-    "@babel/plugin-transform-shorthand-properties" "^7.12.13"
-    "@babel/plugin-transform-spread" "^7.13.0"
-    "@babel/plugin-transform-sticky-regex" "^7.12.13"
-    "@babel/plugin-transform-template-literals" "^7.13.0"
-    "@babel/plugin-transform-typeof-symbol" "^7.12.13"
-    "@babel/plugin-transform-unicode-escapes" "^7.12.13"
-    "@babel/plugin-transform-unicode-regex" "^7.12.13"
+    "@babel/plugin-syntax-private-property-in-object" "^7.14.5"
+    "@babel/plugin-syntax-top-level-await" "^7.14.5"
+    "@babel/plugin-transform-arrow-functions" "^7.14.5"
+    "@babel/plugin-transform-async-to-generator" "^7.14.5"
+    "@babel/plugin-transform-block-scoped-functions" "^7.14.5"
+    "@babel/plugin-transform-block-scoping" "^7.14.5"
+    "@babel/plugin-transform-classes" "^7.14.5"
+    "@babel/plugin-transform-computed-properties" "^7.14.5"
+    "@babel/plugin-transform-destructuring" "^7.14.7"
+    "@babel/plugin-transform-dotall-regex" "^7.14.5"
+    "@babel/plugin-transform-duplicate-keys" "^7.14.5"
+    "@babel/plugin-transform-exponentiation-operator" "^7.14.5"
+    "@babel/plugin-transform-for-of" "^7.14.5"
+    "@babel/plugin-transform-function-name" "^7.14.5"
+    "@babel/plugin-transform-literals" "^7.14.5"
+    "@babel/plugin-transform-member-expression-literals" "^7.14.5"
+    "@babel/plugin-transform-modules-amd" "^7.14.5"
+    "@babel/plugin-transform-modules-commonjs" "^7.14.5"
+    "@babel/plugin-transform-modules-systemjs" "^7.14.5"
+    "@babel/plugin-transform-modules-umd" "^7.14.5"
+    "@babel/plugin-transform-named-capturing-groups-regex" "^7.14.7"
+    "@babel/plugin-transform-new-target" "^7.14.5"
+    "@babel/plugin-transform-object-super" "^7.14.5"
+    "@babel/plugin-transform-parameters" "^7.14.5"
+    "@babel/plugin-transform-property-literals" "^7.14.5"
+    "@babel/plugin-transform-regenerator" "^7.14.5"
+    "@babel/plugin-transform-reserved-words" "^7.14.5"
+    "@babel/plugin-transform-shorthand-properties" "^7.14.5"
+    "@babel/plugin-transform-spread" "^7.14.6"
+    "@babel/plugin-transform-sticky-regex" "^7.14.5"
+    "@babel/plugin-transform-template-literals" "^7.14.5"
+    "@babel/plugin-transform-typeof-symbol" "^7.14.5"
+    "@babel/plugin-transform-unicode-escapes" "^7.14.5"
+    "@babel/plugin-transform-unicode-regex" "^7.14.5"
     "@babel/preset-modules" "^0.1.4"
-    "@babel/types" "^7.13.12"
-    babel-plugin-polyfill-corejs2 "^0.1.4"
-    babel-plugin-polyfill-corejs3 "^0.1.3"
-    babel-plugin-polyfill-regenerator "^0.1.2"
-    core-js-compat "^3.9.0"
+    "@babel/types" "^7.14.8"
+    babel-plugin-polyfill-corejs2 "^0.2.2"
+    babel-plugin-polyfill-corejs3 "^0.2.2"
+    babel-plugin-polyfill-regenerator "^0.2.2"
+    core-js-compat "^3.15.0"
     semver "^6.3.0"
 
 "@babel/preset-modules@^0.1.4":
@@ -1184,131 +1110,100 @@
     "@babel/types" "^7.4.4"
     esutils "^2.0.2"
 
-"@babel/runtime@7.13.10":
-  version "7.13.10"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.13.10.tgz#47d42a57b6095f4468da440388fdbad8bebf0d7d"
-  integrity sha512-4QPkjJq6Ns3V/RgpEahRk+AGfL0eO6RHHtTWoNNr5mO49G6B5+X6d6THgWEAvTrznU5xYpbAlVKRYcsCgh/Akw==
+"@babel/runtime@7.14.8", "@babel/runtime@^7.8.4":
+  version "7.14.8"
+  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.14.8.tgz#7119a56f421018852694290b9f9148097391b446"
+  integrity sha512-twj3L8Og5SaCRCErB4x4ajbvBIVV77CGeFglHpeg5WC5FF8TZzBWXtTJ4MqaD9QszLYTtr+IsaAL2rEUevb+eg==
   dependencies:
     regenerator-runtime "^0.13.4"
 
-"@babel/runtime@^7.8.4":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/runtime/-/runtime-7.12.13.tgz#0a21452352b02542db0ffb928ac2d3ca7cb6d66d"
-  integrity sha512-8+3UMPBrjFa/6TtKi/7sehPKqfAm4g6K+YQjyyFOLUTxzOngcRZTlAVY8sc2CORJYqdHQY8gRPHmn+qo15rCBw==
-  dependencies:
-    regenerator-runtime "^0.13.4"
-
-"@babel/template@7.12.13", "@babel/template@^7.12.13", "@babel/template@^7.8.3":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.12.13.tgz#530265be8a2589dbb37523844c5bcb55947fb327"
-  integrity sha512-/7xxiGA57xMo/P2GVvdEumr8ONhFOhfgq2ihK3h1e6THqzTAkHbkXgB0xI9yeTfIUoH3+oAeHhqm/I43OTbbjA==
-  dependencies:
-    "@babel/code-frame" "^7.12.13"
-    "@babel/parser" "^7.12.13"
-    "@babel/types" "^7.12.13"
-
-"@babel/traverse@^7.12.13", "@babel/traverse@^7.8.3":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.12.13.tgz#689f0e4b4c08587ad26622832632735fb8c4e0c0"
-  integrity sha512-3Zb4w7eE/OslI0fTp8c7b286/cQps3+vdLW3UcwC8VSJC6GbKn55aeVVu2QJNuCDoeKyptLOFrPq8WqZZBodyA==
-  dependencies:
-    "@babel/code-frame" "^7.12.13"
-    "@babel/generator" "^7.12.13"
-    "@babel/helper-function-name" "^7.12.13"
-    "@babel/helper-split-export-declaration" "^7.12.13"
-    "@babel/parser" "^7.12.13"
-    "@babel/types" "^7.12.13"
-    debug "^4.1.0"
-    globals "^11.1.0"
-    lodash "^4.17.19"
-
-"@babel/traverse@^7.13.0":
-  version "7.13.0"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.13.0.tgz#6d95752475f86ee7ded06536de309a65fc8966cc"
-  integrity sha512-xys5xi5JEhzC3RzEmSGrs/b3pJW/o87SypZ+G/PhaE7uqVQNv/jlmVIBXuoh5atqQ434LfXV+sf23Oxj0bchJQ==
-  dependencies:
-    "@babel/code-frame" "^7.12.13"
-    "@babel/generator" "^7.13.0"
-    "@babel/helper-function-name" "^7.12.13"
-    "@babel/helper-split-export-declaration" "^7.12.13"
-    "@babel/parser" "^7.13.0"
-    "@babel/types" "^7.13.0"
+"@babel/template@7.14.5", "@babel/template@^7.14.5", "@babel/template@^7.8.3":
+  version "7.14.5"
+  resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.14.5.tgz#a9bc9d8b33354ff6e55a9c60d1109200a68974f4"
+  integrity sha512-6Z3Po85sfxRGachLULUhOmvAaOo7xCvqGQtxINai2mEGPFm6pQ4z5QInFnUrRpfoSV60BnjyF5F3c+15fxFV1g==
+  dependencies:
+    "@babel/code-frame" "^7.14.5"
+    "@babel/parser" "^7.14.5"
+    "@babel/types" "^7.14.5"
+
+"@babel/traverse@^7.13.0", "@babel/traverse@^7.14.5", "@babel/traverse@^7.14.8", "@babel/traverse@^7.8.3":
+  version "7.14.8"
+  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.14.8.tgz#c0253f02677c5de1a8ff9df6b0aacbec7da1a8ce"
+  integrity sha512-kexHhzCljJcFNn1KYAQ6A5wxMRzq9ebYpEDV4+WdNyr3i7O44tanbDOR/xjiG2F3sllan+LgwK+7OMk0EmydHg==
+  dependencies:
+    "@babel/code-frame" "^7.14.5"
+    "@babel/generator" "^7.14.8"
+    "@babel/helper-function-name" "^7.14.5"
+    "@babel/helper-hoist-variables" "^7.14.5"
+    "@babel/helper-split-export-declaration" "^7.14.5"
+    "@babel/parser" "^7.14.8"
+    "@babel/types" "^7.14.8"
     debug "^4.1.0"
     globals "^11.1.0"
-    lodash "^4.17.19"
-
-"@babel/traverse@^7.13.13":
-  version "7.13.13"
-  resolved "https://registry.yarnpkg.com/@babel/traverse/-/traverse-7.13.13.tgz#39aa9c21aab69f74d948a486dd28a2dbdbf5114d"
-  integrity sha512-CblEcwmXKR6eP43oQGG++0QMTtCjAsa3frUuzHoiIJWpaIIi8dwMyEFUJoXRLxagGqCK+jALRwIO+o3R9p/uUg==
-  dependencies:
-    "@babel/code-frame" "^7.12.13"
-    "@babel/generator" "^7.13.9"
-    "@babel/helper-function-name" "^7.12.13"
-    "@babel/helper-split-export-declaration" "^7.12.13"
-    "@babel/parser" "^7.13.13"
-    "@babel/types" "^7.13.13"
-    debug "^4.1.0"
-    globals "^11.1.0"
-
-"@babel/types@^7.0.0", "@babel/types@^7.12.1", "@babel/types@^7.12.13", "@babel/types@^7.3.0", "@babel/types@^7.4.4", "@babel/types@^7.8.3", "@babel/types@^7.8.6":
-  version "7.12.13"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.12.13.tgz#8be1aa8f2c876da11a9cf650c0ecf656913ad611"
-  integrity sha512-oKrdZTld2im1z8bDwTOQvUbxKwE+854zc16qWZQlcTqMN00pWxHQ4ZeOq0yDMnisOpRykH2/5Qqcrk/OlbAjiQ==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.12.11"
-    lodash "^4.17.19"
-    to-fast-properties "^2.0.0"
-
-"@babel/types@^7.13.0":
-  version "7.13.0"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.13.0.tgz#74424d2816f0171b4100f0ab34e9a374efdf7f80"
-  integrity sha512-hE+HE8rnG1Z6Wzo+MhaKE5lM5eMx71T4EHJgku2E3xIfaULhDcxiiRxUYgwX8qwP1BBSlag+TdGOt6JAidIZTA==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.12.11"
-    lodash "^4.17.19"
-    to-fast-properties "^2.0.0"
 
-"@babel/types@^7.13.12":
-  version "7.13.12"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.13.12.tgz#edbf99208ef48852acdff1c8a681a1e4ade580cd"
-  integrity sha512-K4nY2xFN4QMvQwkQ+zmBDp6ANMbVNw6BbxWmYA4qNjhR9W+Lj/8ky5MEY2Me5r+B2c6/v6F53oMndG+f9s3IiA==
+"@babel/types@^7.0.0", "@babel/types@^7.14.5", "@babel/types@^7.14.8", "@babel/types@^7.3.0", "@babel/types@^7.4.4", "@babel/types@^7.8.3", "@babel/types@^7.8.6":
+  version "7.14.8"
+  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.14.8.tgz#38109de8fcadc06415fbd9b74df0065d4d41c728"
+  integrity sha512-iob4soQa7dZw8nodR/KlOQkPh9S4I8RwCxwRIFuiMRYjOzH/KJzdUfDgz6cGi5dDaclXF4P2PAhCdrBJNIg68Q==
   dependencies:
-    "@babel/helper-validator-identifier" "^7.12.11"
-    lodash "^4.17.19"
+    "@babel/helper-validator-identifier" "^7.14.8"
     to-fast-properties "^2.0.0"
 
-"@babel/types@^7.13.13":
-  version "7.13.13"
-  resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.13.13.tgz#dcd8b815b38f537a3697ce84c8e3cc62197df96f"
-  integrity sha512-kt+EpC6qDfIaqlP+DIbIJOclYy/A1YXs9dAf/ljbi+39Bcbc073H6jKVpXEr/EoIh5anGn5xq/yRVzKl+uIc9w==
-  dependencies:
-    "@babel/helper-validator-identifier" "^7.12.11"
-    lodash "^4.17.19"
-    to-fast-properties "^2.0.0"
-
-"@bazel/bazelisk@1.7.5":
-  version "1.7.5"
-  resolved "https://registry.yarnpkg.com/@bazel/bazelisk/-/bazelisk-1.7.5.tgz#dd1a52e3d23464f72de55aa3dc4777847fa85373"
-  integrity sha512-JHwP9JhfZUSoj4sku471Bjw4uE773U2Agujnx0CdPkeRk25khy1l3VyjaPaHB+z1fmMnM6ED3M7tetQUsovUQg==
+"@bazel/bazelisk@1.10.1", "@bazel/bazelisk@^1.10.1":
+  version "1.10.1"
+  resolved "https://registry.yarnpkg.com/@bazel/bazelisk/-/bazelisk-1.10.1.tgz#46236a43ad58e310c55247f866da0dc6083c3d8b"
+  integrity sha512-IHszNzBO2UrUy6YtsSAsZtnU6I6qpzXGkWdEvGoMxLgJnDsEnsIYniDCUjvjU1KAP+A03eepmCHlyFcRHMSxRA==
 
 "@bazel/buildifier@4.0.1", "@bazel/buildifier@^4.0.1":
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/@bazel/buildifier/-/buildifier-4.0.1.tgz#52cfbad5cbb86e9183a29dde2370cd465730ea0d"
   integrity sha512-BTmtvJbeeEVrqRApI1gr5hvPgYcHLpdGJ5EXNXEWO692ztMPSj5fB/dH0xUlaW45jn6LimYx8ymqTMhj3538og==
 
-"@bazel/jasmine@3.2.2":
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/@bazel/jasmine/-/jasmine-3.2.2.tgz#e4c088d8267f83c4c718ac46e5923f549d47fef6"
-  integrity sha512-fSz0fRdk9IgyN/9Ietzasdp2QAhMGz/E4LKdiu+WyZrPjwd06zQ4ypb3DzzT1g+M/7NXJqV8X6ahTGQMrm/Rpw==
+"@bazel/esbuild@4.0.0":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/@bazel/esbuild/-/esbuild-4.0.0.tgz#daa8286d72a9e6522f6f2c514aed9716a331aa25"
+  integrity sha512-SrdJexg+PNjdsTDp0voPS0SlU/yovbwrH+ObtFShHQ2X52u9mqvU2Cm7If48pWobkGK4rl7vDbzIHYWVKdGXlw==
+
+"@bazel/jasmine@3.7.0":
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/@bazel/jasmine/-/jasmine-3.7.0.tgz#9d8ed4c73abb4a927cdffecf5c4c877f969d886b"
+  integrity sha512-q6Nt1T83isYjIcxQrLkvWCzX6R9oDBwDDN9Hx/vQuvLKMRHSCuj8hkhf42waR9SzTiVHXNDv39l4IwvFhVkfvA==
   dependencies:
     c8 "~7.5.0"
-    jasmine-reporters "~2.3.2"
+    jasmine-reporters "~2.4.0"
 
-"@bazel/typescript@3.2.2":
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-3.2.2.tgz#b53ee35dee68952abd711a2d472485748c7521c1"
-  integrity sha512-fTPtX3kZAQ50fWJaBvHtHf4w0fqMCrOhK9A8c5GgbqRrIWF8GG/+Tbt4OPwsG0N3+JDYOsHATacJI0qkjIeG1g==
+"@bazel/jasmine@4.0.0":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/@bazel/jasmine/-/jasmine-4.0.0.tgz#2e95f1b3458e0d69f16e0c820fe4631a43942a90"
+  integrity sha512-vi1n+vbLwKki7aa8kXDG709nxRXAmLEvqbijSpm8d3rrW4f68Ad5xKyT2gezO84OeysUHU3cDZViXWwFcoHRng==
+  dependencies:
+    c8 "~7.5.0"
+    jasmine-reporters "~2.4.0"
+
+"@bazel/protractor@4.0.0":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/@bazel/protractor/-/protractor-4.0.0.tgz#f29ae81c22790596bfd8212952a8e370406d094f"
+  integrity sha512-YiSU2IYdiW7HoVC3gAZJs9M0CiH9qluAvA9YLfvM3pM7rI1OmXYCm3hojgOLIRslbThcpfAcmQKjeUfdQPX5bA==
+
+"@bazel/runfiles@4.0.0":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/@bazel/runfiles/-/runfiles-4.0.0.tgz#3d649d93710364515402b873add73947aaa702e8"
+  integrity sha512-1V0E1ooSw7DARfOBkr24O5GOpqODDd7RuJ2Xb+JljjdpUdJTIaVeqELBpSHAiYzqVJYWAn61sD5JP1CPCllixA==
+
+"@bazel/typescript@3.7.0":
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-3.7.0.tgz#a4d648a36f7ef4960c8a16222f853a4c285a522d"
+  integrity sha512-bkNHZaCWg4Jk+10wzhFDhB+RRZkfob/yydC4qRzUVxCDLPFICYgC0PWeLhf/ixEhVeHtS0Cmv74M+QziqKSdbw==
+  dependencies:
+    protobufjs "6.8.8"
+    semver "5.6.0"
+    source-map-support "0.5.9"
+    tsutils "2.27.2"
+
+"@bazel/typescript@4.0.0":
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/@bazel/typescript/-/typescript-4.0.0.tgz#71a6f0f5e340c6b8516b21fbc0f0853e74055d0c"
+  integrity sha512-+Le9q+5IR9gEnSH8sXyxDB5dD6NJx2kbm6AL+cijYVat2MczpGV4sI1mu0mdLzYsEX5Tjt5iHkaNb7sFESjnYA==
   dependencies:
     protobufjs "6.8.8"
     semver "5.6.0"
@@ -1325,16 +1220,90 @@
   resolved "https://registry.yarnpkg.com/@csstools/convert-colors/-/convert-colors-1.4.0.tgz#ad495dc41b12e75d588c6db8b9834f08fa131eb7"
   integrity sha512-5a6wqoJV/xEdbRNKVo6I4hO3VjyDq//8q2f9I6PBAvMesJHFauXDorcNCsr9RzvsZnaWi5NYCcfyqP1QeFHFbw==
 
-"@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==
+"@discoveryjs/json-ext@0.5.3":
+  version "0.5.3"
+  resolved "https://registry.yarnpkg.com/@discoveryjs/json-ext/-/json-ext-0.5.3.tgz#90420f9f9c6d3987f176a19a7d8e764271a2f55d"
+  integrity sha512-Fxt+AfXgjMoin2maPIYzFZnQjAXjAL0PHscM5pRTtatFqB+vZxAM9tLp2Optnuw3QOQC40jTNeGYFOMvyf7v9g==
+
+"@eslint/eslintrc@^0.4.3":
+  version "0.4.3"
+  resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.4.3.tgz#9e42981ef035beb3dd49add17acb96e8ff6f394c"
+  integrity sha512-J6KFFz5QCYUJq3pf0mjEcCJVERbzv71PUIDczuh9JkwGEzced6CO5ADLHB1rbf/+oPBtoPfMYNOpGDzCANlbXw==
+  dependencies:
+    ajv "^6.12.4"
+    debug "^4.1.1"
+    espree "^7.3.0"
+    globals "^13.9.0"
+    ignore "^4.0.6"
+    import-fresh "^3.2.1"
+    js-yaml "^3.13.1"
+    minimatch "^3.0.4"
+    strip-json-comments "^3.1.1"
+
+"@humanwhocodes/config-array@^0.5.0":
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/config-array/-/config-array-0.5.0.tgz#1407967d4c6eecd7388f83acf1eaf4d0c6e58ef9"
+  integrity sha512-FagtKFz74XrTl7y6HCzQpwDfXP0yhxe9lHLD1UZxjvZIcbyRz8zTFF/yYNfSfzU414eDwZ1SrO0Qvtyf+wFMQg==
+  dependencies:
+    "@humanwhocodes/object-schema" "^1.2.0"
+    debug "^4.1.1"
+    minimatch "^3.0.4"
+
+"@humanwhocodes/object-schema@^1.2.0":
+  version "1.2.0"
+  resolved "https://registry.yarnpkg.com/@humanwhocodes/object-schema/-/object-schema-1.2.0.tgz#87de7af9c231826fdd68ac7258f77c429e0e5fcf"
+  integrity sha512-wdppn25U8z/2yiaT6YGquE6X8sSv7hNMWSXYSSU1jGv/yd6XqjXgTDJ8KP4NgjTXfJ3GbRjeeb8RTV7a/VpM+w==
 
 "@istanbuljs/schema@^0.1.2":
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.3.tgz#e45e384e4b8ec16bce2fd903af78450f6bf7ec98"
   integrity sha512-ZXRY4jNvVgSVQ8DL3LTcakaAtXwTVUxE81hslsyD2AtoXW/wVob10HkOJ1X/pAlcI7D+2YoZKg5do8G/w6RYgA==
 
+"@jridgewell/gen-mapping@^0.3.0":
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/@jridgewell/gen-mapping/-/gen-mapping-0.3.2.tgz#c1aedc61e853f2bb9f5dfe6d4442d3b565b253b9"
+  integrity sha512-mh65xKQAzI6iBcFzwv28KVWSmCkdRBWoOh+bYQGW3+6OZvbbN3TqMGo5hqYxQniRcH9F2VZIoJCm4pa3BPDK/A==
+  dependencies:
+    "@jridgewell/set-array" "^1.0.1"
+    "@jridgewell/sourcemap-codec" "^1.4.10"
+    "@jridgewell/trace-mapping" "^0.3.9"
+
+"@jridgewell/resolve-uri@1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-1.0.0.tgz#3fdf5798f0b49e90155896f6291df186eac06c83"
+  integrity sha512-9oLAnygRMi8Q5QkYEU4XWK04B+nuoXoxjRvRxgjuChkLZFBja0YPSgdZ7dZtwhncLBcQe/I/E+fLuk5qxcYVJA==
+
+"@jridgewell/resolve-uri@^3.0.3":
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@jridgewell/resolve-uri/-/resolve-uri-3.1.0.tgz#2203b118c157721addfe69d47b70465463066d78"
+  integrity sha512-F2msla3tad+Mfht5cJq7LSXcdudKTWCVYUgw6pLFOOHSTtZlj6SWNYAp+AhuqLmWdBO2X5hPrLcu8cVP8fy28w==
+
+"@jridgewell/set-array@^1.0.1":
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/@jridgewell/set-array/-/set-array-1.1.2.tgz#7c6cf998d6d20b914c0a55a91ae928ff25965e72"
+  integrity sha512-xnkseuNADM0gt2bs+BvhO0p78Mk762YnZdsuzFV018NoG1Sj1SCQvpSqa7XUaTam5vAGasABV9qXASMKnFMwMw==
+
+"@jridgewell/source-map@^0.3.2":
+  version "0.3.2"
+  resolved "https://registry.yarnpkg.com/@jridgewell/source-map/-/source-map-0.3.2.tgz#f45351aaed4527a298512ec72f81040c998580fb"
+  integrity sha512-m7O9o2uR8k2ObDysZYzdfhb08VuEml5oWGiosa1VdaPZ/A6QyPkAJuwN0Q1lhULOf6B7MtQmHENS743hWtCrgw==
+  dependencies:
+    "@jridgewell/gen-mapping" "^0.3.0"
+    "@jridgewell/trace-mapping" "^0.3.9"
+
+"@jridgewell/sourcemap-codec@^1.4.10":
+  version "1.4.14"
+  resolved "https://registry.yarnpkg.com/@jridgewell/sourcemap-codec/-/sourcemap-codec-1.4.14.tgz#add4c98d341472a289190b424efbdb096991bb24"
+  integrity sha512-XPSJHWmi394fuUuzDnGz1wiKqWfo1yXecHQMRf2l6hztTO+nPru658AyDngaBe7isIxEkRsPR3FZh+s7iVa4Uw==
+
+"@jridgewell/trace-mapping@^0.3.9":
+  version "0.3.14"
+  resolved "https://registry.yarnpkg.com/@jridgewell/trace-mapping/-/trace-mapping-0.3.14.tgz#b231a081d8f66796e475ad588a1ef473112701ed"
+  integrity sha512-bJWEfQ9lPTvm3SneWwRFVLzrh6nhjwqw7TUFFBEMzwvg7t7PCDenf2lDwqo4NQXzdpgBXyFgDWnQA+2vkruksQ==
+  dependencies:
+    "@jridgewell/resolve-uri" "^3.0.3"
+    "@jridgewell/sourcemap-codec" "^1.4.10"
+
 "@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"
@@ -1354,45 +1323,81 @@
     brfs "^1.4.0"
     unicode-trie "^0.3.0"
 
-"@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==
+"@microsoft/api-extractor-model@7.13.5":
+  version "7.13.5"
+  resolved "https://registry.yarnpkg.com/@microsoft/api-extractor-model/-/api-extractor-model-7.13.5.tgz#7836a81ba47b9a654062ed0361e4eee69afae51e"
+  integrity sha512-il6AebNltYo5hEtqXZw4DMvrwBPn6+F58TxwqmsLY+U+sSJNxaYn2jYksArrjErXVPR3gUgRMqD6zsdIkg+WEQ==
+  dependencies:
+    "@microsoft/tsdoc" "0.13.2"
+    "@microsoft/tsdoc-config" "~0.15.2"
+    "@rushstack/node-core-library" "3.40.0"
+
+"@microsoft/api-extractor@7.18.6":
+  version "7.18.6"
+  resolved "https://registry.yarnpkg.com/@microsoft/api-extractor/-/api-extractor-7.18.6.tgz#4a0a05df51f91ed18a9cea23c7cca4063dce65e9"
+  integrity sha512-632kwS+YEozh7Xl4dz/VxHmqD31ugGTEXUr2if1+8klWiUt8qw6RmsIux5oGAEuu2L+Dzl9Y+/P02ZG3GyzjTA==
+  dependencies:
+    "@microsoft/api-extractor-model" "7.13.5"
+    "@microsoft/tsdoc" "0.13.2"
+    "@microsoft/tsdoc-config" "~0.15.2"
+    "@rushstack/node-core-library" "3.40.0"
+    "@rushstack/rig-package" "0.2.13"
+    "@rushstack/ts-command-line" "4.9.0"
+    colors "~1.2.1"
+    lodash "~4.17.15"
+    resolve "~1.17.0"
+    semver "~7.3.0"
+    source-map "~0.6.1"
+    typescript "~4.3.5"
+
+"@microsoft/tsdoc-config@~0.15.2":
+  version "0.15.2"
+  resolved "https://registry.yarnpkg.com/@microsoft/tsdoc-config/-/tsdoc-config-0.15.2.tgz#eb353c93f3b62ab74bdc9ab6f4a82bcf80140f14"
+  integrity sha512-mK19b2wJHSdNf8znXSMYVShAHktVr/ib0Ck2FA3lsVBSEhSI/TfXT7DJQkAYgcztTuwazGcg58ZjYdk0hTCVrA==
   dependencies:
-    "@nodelib/fs.stat" "2.0.4"
+    "@microsoft/tsdoc" "0.13.2"
+    ajv "~6.12.6"
+    jju "~1.4.0"
+    resolve "~1.19.0"
+
+"@microsoft/tsdoc@0.13.2":
+  version "0.13.2"
+  resolved "https://registry.yarnpkg.com/@microsoft/tsdoc/-/tsdoc-0.13.2.tgz#3b0efb6d3903bd49edb073696f60e90df08efb26"
+  integrity sha512-WrHvO8PDL8wd8T2+zBGKrMwVL5IyzR3ryWUsl0PXgEV0QHup4mTLi0QcATefGI6Gx9Anu7vthPyyyLpY0EpiQg==
+
+"@nodelib/fs.scandir@2.1.5":
+  version "2.1.5"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.scandir/-/fs.scandir-2.1.5.tgz#7619c2eb21b25483f6d167548b4cfd5a7488c3d5"
+  integrity sha512-vq24Bq3ym5HEQm2NKCr3yXDwjc7vTsEThRDnkp2DK9p1uqLR+DHurm/NOTo0KG7HYHU7eppKZj3MyqYuMBf62g==
+  dependencies:
+    "@nodelib/fs.stat" "2.0.5"
     run-parallel "^1.1.9"
 
-"@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.stat@2.0.5", "@nodelib/fs.stat@^2.0.2":
+  version "2.0.5"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.stat/-/fs.stat-2.0.5.tgz#5bd262af94e9d25bd1e71b05deed44876a222e8b"
+  integrity sha512-RkhPPp2zrqDAQA/2jNhnztcPAlv64XdhIp7a7454A5ovI7Bukxgt7MX7udwAu3zg1DcpPU0rz3VV1SeaqvY4+A==
 
 "@nodelib/fs.walk@^1.2.3":
-  version "1.2.6"
-  resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.6.tgz#cce9396b30aa5afe9e3756608f5831adcb53d063"
-  integrity sha512-8Broas6vTtW4GIXTAHDoE32hnN2M5ykgCpWGbuXHQ15vEMqr23pB76e/GZcYsZCHALv50ktd24qhEyKr6wBtow==
+  version "1.2.8"
+  resolved "https://registry.yarnpkg.com/@nodelib/fs.walk/-/fs.walk-1.2.8.tgz#e95737e8bb6746ddedf69c556953494f196fe69a"
+  integrity sha512-oGB+UxlgWcgQkgwo8GcEGwemoTFt3FIO9ababBmaGwXIoBKZ+GTy0pP185beGg7Llih/NSHSV2XAs1lnznocSg==
   dependencies:
-    "@nodelib/fs.scandir" "2.1.4"
+    "@nodelib/fs.scandir" "2.1.5"
     fastq "^1.6.0"
 
-"@npmcli/ci-detect@^1.0.0":
-  version "1.3.0"
-  resolved "https://registry.yarnpkg.com/@npmcli/ci-detect/-/ci-detect-1.3.0.tgz#6c1d2c625fb6ef1b9dea85ad0a5afcbef85ef22a"
-  integrity sha512-oN3y7FAROHhrAt7Rr7PnTSwrHrZVRTS2ZbyxeQwSSYD0ifwM3YNgQqbaRmjcWoPyq77MjchusjJDspbzMmip1Q==
-
-"@npmcli/git@^2.0.1":
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/@npmcli/git/-/git-2.0.6.tgz#47b97e96b2eede3f38379262fa3bdfa6eae57bf2"
-  integrity sha512-a1MnTfeRPBaKbFY07fd+6HugY1WAkKJzdiJvlRub/9o5xz2F/JtPacZZapx5zRJUQFIzSL677vmTSxEcDMrDbg==
+"@npmcli/git@^2.1.0":
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/@npmcli/git/-/git-2.1.0.tgz#2fbd77e147530247d37f325930d457b3ebe894f6"
+  integrity sha512-/hBFX/QG1b+N7PZBFs0bi+evgRZcK9nWBxQKZkGoXUT5hJSwl5c4d7y8/hm+NQZRPhQ67RzFaj5UM9YeyKoryw==
   dependencies:
-    "@npmcli/promise-spawn" "^1.1.0"
+    "@npmcli/promise-spawn" "^1.3.2"
     lru-cache "^6.0.0"
-    mkdirp "^1.0.3"
-    npm-pick-manifest "^6.0.0"
+    mkdirp "^1.0.4"
+    npm-pick-manifest "^6.1.1"
     promise-inflight "^1.0.1"
     promise-retry "^2.0.1"
-    semver "^7.3.2"
-    unique-filename "^1.1.1"
+    semver "^7.3.5"
     which "^2.0.2"
 
 "@npmcli/installed-package-contents@^1.0.6":
@@ -1416,119 +1421,224 @@
   resolved "https://registry.yarnpkg.com/@npmcli/node-gyp/-/node-gyp-1.0.2.tgz#3cdc1f30e9736dbc417373ed803b42b1a0a29ede"
   integrity sha512-yrJUe6reVMpktcvagumoqD9r08fH1iRo01gn1u0zoCApa9lnZGEigVKUd2hzsCId4gdtkZZIVscLhNxMECKgRg==
 
-"@npmcli/promise-spawn@^1.1.0", "@npmcli/promise-spawn@^1.2.0", "@npmcli/promise-spawn@^1.3.2":
+"@npmcli/promise-spawn@^1.2.0", "@npmcli/promise-spawn@^1.3.2":
   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.8.2":
-  version "1.8.3"
-  resolved "https://registry.yarnpkg.com/@npmcli/run-script/-/run-script-1.8.3.tgz#07f440ed492400bb1114369bc37315eeaaae2bb3"
-  integrity sha512-ELPGWAVU/xyU+A+H3pEPj0QOvYwLTX71RArXcClFzeiyJ/b/McsZ+d0QxpznvfFtZzxGN/gz/1cvlqICR4/suQ==
+"@npmcli/run-script@^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/@npmcli/run-script/-/run-script-2.0.0.tgz#9949c0cab415b17aaac279646db4f027d6f1e743"
+  integrity sha512-fSan/Pu11xS/TdaTpTB0MRn9guwGU8dye+x56mEVgBEd/QsybBbYcAL0phPXi8SGWFEChkQd6M9qL4y6VOpFig==
   dependencies:
     "@npmcli/node-gyp" "^1.0.2"
     "@npmcli/promise-spawn" "^1.3.2"
-    infer-owner "^1.0.4"
-    node-gyp "^7.1.0"
-    puka "^1.0.1"
+    node-gyp "^8.2.0"
     read-package-json-fast "^2.0.1"
 
+"@octokit/auth-app@^3.6.0":
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/@octokit/auth-app/-/auth-app-3.6.0.tgz#79fc6f652d2362ce0bd3122f6f764a87cc813dea"
+  integrity sha512-A+tLuHEMXw+Xz9dmKO7Ho9i4EmMr4tThrwYTlmMNu8y93JxvvRjKFFElpCTS+Z0NlbfuyNdaTlJnAinFbVKm7g==
+  dependencies:
+    "@octokit/auth-oauth-app" "^4.3.0"
+    "@octokit/auth-oauth-user" "^1.2.3"
+    "@octokit/request" "^5.6.0"
+    "@octokit/request-error" "^2.1.0"
+    "@octokit/types" "^6.0.3"
+    "@types/lru-cache" "^5.1.0"
+    deprecation "^2.3.1"
+    lru-cache "^6.0.0"
+    universal-github-app-jwt "^1.0.1"
+    universal-user-agent "^6.0.0"
+
+"@octokit/auth-oauth-app@^4.3.0":
+  version "4.3.0"
+  resolved "https://registry.yarnpkg.com/@octokit/auth-oauth-app/-/auth-oauth-app-4.3.0.tgz#de02f184360ffd7cfccef861053784fc4410e7ea"
+  integrity sha512-cETmhmOQRHCz6cLP7StThlJROff3A/ln67Q961GuIr9zvyFXZ4lIJy9RE6Uw5O7D8IXWPU3jhDnG47FTSGQr8Q==
+  dependencies:
+    "@octokit/auth-oauth-device" "^3.1.1"
+    "@octokit/auth-oauth-user" "^1.2.1"
+    "@octokit/request" "^5.3.0"
+    "@octokit/types" "^6.0.3"
+    "@types/btoa-lite" "^1.0.0"
+    btoa-lite "^1.0.0"
+    universal-user-agent "^6.0.0"
+
+"@octokit/auth-oauth-device@^3.1.1":
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@octokit/auth-oauth-device/-/auth-oauth-device-3.1.2.tgz#d299f51f491669f37fe7af8738f5ac921e63973c"
+  integrity sha512-w7Po4Ck6N2aAn2VQyKLuojruiyKROTBv4qs6IwE5rbwF7HhBXXp4A/NKmkpoFIZkiXQtM+N8QtkSck4ApYWdGg==
+  dependencies:
+    "@octokit/oauth-methods" "^1.1.0"
+    "@octokit/request" "^5.4.14"
+    "@octokit/types" "^6.10.0"
+    universal-user-agent "^6.0.0"
+
+"@octokit/auth-oauth-user@^1.2.1", "@octokit/auth-oauth-user@^1.2.3":
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/@octokit/auth-oauth-user/-/auth-oauth-user-1.3.0.tgz#da4e4529145181a6aa717ae858afb76ebd6e3360"
+  integrity sha512-3QC/TAdk7onnxfyZ24BnJRfZv8TRzQK7SEFUS9vLng4Vv6Hv6I64ujdk/CUkREec8lhrwU764SZ/d+yrjjqhaQ==
+  dependencies:
+    "@octokit/auth-oauth-device" "^3.1.1"
+    "@octokit/oauth-methods" "^1.1.0"
+    "@octokit/request" "^5.4.14"
+    "@octokit/types" "^6.12.2"
+    btoa-lite "^1.0.0"
+    universal-user-agent "^6.0.0"
+
+"@octokit/auth-token@^2.4.4":
+  version "2.4.5"
+  resolved "https://registry.yarnpkg.com/@octokit/auth-token/-/auth-token-2.4.5.tgz#568ccfb8cb46f36441fac094ce34f7a875b197f3"
+  integrity sha512-BpGYsPgJt05M7/L/5FoE1PiAbdxXFZkX/3kDYcsvd1v6UhlnE5e96dTDr0ezX/EFwciQxf3cNV0loipsURU+WA==
+  dependencies:
+    "@octokit/types" "^6.0.3"
+
+"@octokit/core@^3.4.0", "@octokit/core@^3.5.0", "@octokit/core@^3.5.1":
+  version "3.5.1"
+  resolved "https://registry.yarnpkg.com/@octokit/core/-/core-3.5.1.tgz#8601ceeb1ec0e1b1b8217b960a413ed8e947809b"
+  integrity sha512-omncwpLVxMP+GLpLPgeGJBF6IWJFjXDS5flY5VbppePYX9XehevbDykRH9PdCdvqt9TS5AOTiDide7h0qrkHjw==
+  dependencies:
+    "@octokit/auth-token" "^2.4.4"
+    "@octokit/graphql" "^4.5.8"
+    "@octokit/request" "^5.6.0"
+    "@octokit/request-error" "^2.0.5"
+    "@octokit/types" "^6.0.3"
+    before-after-hook "^2.2.0"
+    universal-user-agent "^6.0.0"
+
 "@octokit/endpoint@^6.0.1":
-  version "6.0.11"
-  resolved "https://registry.yarnpkg.com/@octokit/endpoint/-/endpoint-6.0.11.tgz#082adc2aebca6dcefa1fb383f5efb3ed081949d1"
-  integrity sha512-fUIPpx+pZyoLW4GCs3yMnlj2LfoXTWDUVPTC4V3MUEKZm48W+XYpeWSZCv+vYF1ZABUm2CqnDVf1sFtIYrj7KQ==
+  version "6.0.12"
+  resolved "https://registry.yarnpkg.com/@octokit/endpoint/-/endpoint-6.0.12.tgz#3b4d47a4b0e79b1027fb8d75d4221928b2d05658"
+  integrity sha512-lF3puPwkQWGfkMClXb4k/eUT/nZKQfxinRWJrdZaJO85Dqwo/G0yOC434Jr2ojwafWJMYqFGFa5ms4jJUgujdA==
   dependencies:
     "@octokit/types" "^6.0.3"
     is-plain-object "^5.0.0"
     universal-user-agent "^6.0.0"
 
-"@octokit/graphql@^4.6.1":
-  version "4.6.1"
-  resolved "https://registry.yarnpkg.com/@octokit/graphql/-/graphql-4.6.1.tgz#f975486a46c94b7dbe58a0ca751935edc7e32cc9"
-  integrity sha512-2lYlvf4YTDgZCTXTW4+OX+9WTLFtEUc6hGm4qM1nlZjzxj+arizM4aHWzBVBCxY9glh7GIs0WEuiSgbVzv8cmA==
+"@octokit/graphql@^4.5.8", "@octokit/graphql@^4.6.1":
+  version "4.6.4"
+  resolved "https://registry.yarnpkg.com/@octokit/graphql/-/graphql-4.6.4.tgz#0c3f5bed440822182e972317122acb65d311a5ed"
+  integrity sha512-SWTdXsVheRmlotWNjKzPOb6Js6tjSqA2a8z9+glDJng0Aqjzti8MEWOtuT8ZSu6wHnci7LZNuarE87+WJBG4vg==
   dependencies:
-    "@octokit/request" "^5.3.0"
+    "@octokit/request" "^5.6.0"
     "@octokit/types" "^6.0.3"
     universal-user-agent "^6.0.0"
 
-"@octokit/openapi-types@^4.0.3":
-  version "4.0.4"
-  resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-4.0.4.tgz#96fcce11e929802898646205ac567e5df592f82b"
-  integrity sha512-31zY8JIuz3h6RAFOnyA8FbOwhILILiBu1qD81RyZZWY7oMBhIdBn6MaAmnnptLhB4jk0g50nkQkUVP4kUzppcA==
+"@octokit/oauth-authorization-url@^4.3.1":
+  version "4.3.3"
+  resolved "https://registry.yarnpkg.com/@octokit/oauth-authorization-url/-/oauth-authorization-url-4.3.3.tgz#6a6ef38f243086fec882b62744f39b517528dfb9"
+  integrity sha512-lhP/t0i8EwTmayHG4dqLXgU+uPVys4WD/qUNvC+HfB1S1dyqULm5Yx9uKc1x79aP66U1Cb4OZeW8QU/RA9A4XA==
 
-"@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"
-  integrity sha512-+6yDyk1EES6WK+l3viRDElw96MvwfJxCt45GvmjDUKWjYIb3PJZQkq3i46TwGwoPD4h8NmTrENmtyA1FwbmhRA==
+"@octokit/oauth-methods@^1.1.0":
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/@octokit/oauth-methods/-/oauth-methods-1.2.4.tgz#5f2706b29f09d309233aee61c99b66aedec0511a"
+  integrity sha512-85hen2Dkpnmy2PGfVFe7Ke9rUo//nlqUcHE4GiQBHJ7D95rAm19GcRO49LlH6NOXOMdEFj7i/Ay5GVDRrAk38w==
   dependencies:
-    "@octokit/types" "^2.0.0"
-    deprecation "^2.0.0"
-    once "^1.4.0"
+    "@octokit/oauth-authorization-url" "^4.3.1"
+    "@octokit/request" "^5.4.14"
+    "@octokit/request-error" "^2.0.5"
+    "@octokit/types" "^6.12.2"
+    btoa-lite "^1.0.0"
 
-"@octokit/request-error@^2.0.0":
-  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==
+"@octokit/openapi-types@^9.1.1", "@octokit/openapi-types@^9.5.0":
+  version "9.7.0"
+  resolved "https://registry.yarnpkg.com/@octokit/openapi-types/-/openapi-types-9.7.0.tgz#9897cdefd629cd88af67b8dbe2e5fb19c63426b2"
+  integrity sha512-TUJ16DJU8mekne6+KVcMV5g6g/rJlrnIKn7aALG9QrNpnEipFc1xjoarh0PKaAWf2Hf+HwthRKYt+9mCm5RsRg==
+
+"@octokit/plugin-paginate-rest@^2.13.3", "@octokit/plugin-paginate-rest@^2.13.5":
+  version "2.15.1"
+  resolved "https://registry.yarnpkg.com/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.15.1.tgz#264189dd3ce881c6c33758824aac05a4002e056a"
+  integrity sha512-47r52KkhQDkmvUKZqXzA1lKvcyJEfYh3TKAIe5+EzMeyDM3d+/s5v11i2gTk8/n6No6DPi3k5Ind6wtDbo/AEg==
+  dependencies:
+    "@octokit/types" "^6.24.0"
+
+"@octokit/plugin-paginate-rest@^2.6.2":
+  version "2.14.0"
+  resolved "https://registry.yarnpkg.com/@octokit/plugin-paginate-rest/-/plugin-paginate-rest-2.14.0.tgz#f469cb4a908792fb44679c5973d8bba820c88b0f"
+  integrity sha512-S2uEu2uHeI7Vf+Lvj8tv3O5/5TCAa8GHS0dUQN7gdM7vKA6ZHAbR6HkAVm5yMb1mbedLEbxOuQ+Fa0SQ7tCDLA==
+  dependencies:
+    "@octokit/types" "^6.18.0"
+
+"@octokit/plugin-request-log@^1.0.2":
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/@octokit/plugin-request-log/-/plugin-request-log-1.0.4.tgz#5e50ed7083a613816b1e4a28aeec5fb7f1462e85"
+  integrity sha512-mLUsMkgP7K/cnFEw07kWqXGF5LKrOkD+lhCrKvPHXWDywAwuDUeDwWBpc69XK3pNX0uKiVt8g5z96PJ6z9xCFA==
+
+"@octokit/plugin-rest-endpoint-methods@5.7.0":
+  version "5.7.0"
+  resolved "https://registry.yarnpkg.com/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.7.0.tgz#80b69452c17597738d4692c79829b72d9e72ccec"
+  integrity sha512-G7sgccWRYQMwcHJXkDY/sDxbXeKiZkFQqUtzBCwmrzCNj2GQf3VygQ4T/BFL2crLVpIbenkE/c0ErhYOte2MPw==
+  dependencies:
+    "@octokit/types" "^6.24.0"
+    deprecation "^2.3.1"
+
+"@octokit/plugin-rest-endpoint-methods@^5.1.1", "@octokit/plugin-rest-endpoint-methods@^5.3.3":
+  version "5.8.0"
+  resolved "https://registry.yarnpkg.com/@octokit/plugin-rest-endpoint-methods/-/plugin-rest-endpoint-methods-5.8.0.tgz#33b342fe41f2603fdf8b958e6652103bb3ea3f3b"
+  integrity sha512-qeLZZLotNkoq+it6F+xahydkkbnvSK0iDjlXFo3jNTB+Ss0qIbYQb9V/soKLMkgGw8Q2sHjY5YEXiA47IVPp4A==
+  dependencies:
+    "@octokit/types" "^6.25.0"
+    deprecation "^2.3.1"
+
+"@octokit/request-error@^2.0.5", "@octokit/request-error@^2.1.0":
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/@octokit/request-error/-/request-error-2.1.0.tgz#9e150357831bfc788d13a4fd4b1913d60c74d677"
+  integrity sha512-1VIvgXxs9WHSjicsRwq8PlR2LR2x6DwsJAaFgzdi0JfJoGSO8mYI/cHJQ+9FbN21aa+DrgNLnwObmyeSC8Rmpg==
   dependencies:
     "@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.14"
-  resolved "https://registry.yarnpkg.com/@octokit/request/-/request-5.4.14.tgz#ec5f96f78333bb2af390afa5ff66f114b063bc96"
-  integrity sha512-VkmtacOIQp9daSnBmDI92xNIeLuSRDOIuplp/CJomkvzt7M18NXgG044Cx/LFKLgjKt9T2tZR6AtJayba9GTSA==
+"@octokit/request@^5.3.0", "@octokit/request@^5.4.14":
+  version "5.6.1"
+  resolved "https://registry.yarnpkg.com/@octokit/request/-/request-5.6.1.tgz#f97aff075c37ab1d427c49082fefeef0dba2d8ce"
+  integrity sha512-Ls2cfs1OfXaOKzkcxnqw5MR6drMA/zWX/LIS/p8Yjdz7QKTPQLMsB3R+OvoxE6XnXeXEE2X7xe4G4l4X0gRiKQ==
   dependencies:
     "@octokit/endpoint" "^6.0.1"
-    "@octokit/request-error" "^2.0.0"
-    "@octokit/types" "^6.7.1"
-    deprecation "^2.0.0"
+    "@octokit/request-error" "^2.1.0"
+    "@octokit/types" "^6.16.1"
     is-plain-object "^5.0.0"
     node-fetch "^2.6.1"
-    once "^1.4.0"
     universal-user-agent "^6.0.0"
 
-"@octokit/rest@16.28.7":
-  version "16.28.7"
-  resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-16.28.7.tgz#a2c2db5b318da84144beba82d19c1a9dbdb1a1fa"
-  integrity sha512-cznFSLEhh22XD3XeqJw51OLSfyL2fcFKUO+v2Ep9MTAFfFLS1cK1Zwd1yEgQJmJoDnj4/vv3+fGGZweG+xsbIA==
+"@octokit/request@^5.6.0":
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/@octokit/request/-/request-5.6.0.tgz#6084861b6e4fa21dc40c8e2a739ec5eff597e672"
+  integrity sha512-4cPp/N+NqmaGQwbh3vUsYqokQIzt7VjsgTYVXiwpUP2pxd5YiZB2XuTedbb0SPtv9XS7nzAKjAuQxmY8/aZkiA==
   dependencies:
-    "@octokit/request" "^5.0.0"
-    "@octokit/request-error" "^1.0.2"
-    atob-lite "^2.0.0"
-    before-after-hook "^2.0.0"
-    btoa-lite "^1.0.0"
-    deprecation "^2.0.0"
-    lodash.get "^4.4.2"
-    lodash.set "^4.3.2"
-    lodash.uniq "^4.5.0"
-    octokit-pagination-methods "^1.1.0"
-    once "^1.4.0"
-    universal-user-agent "^3.0.0"
-    url-template "^2.0.8"
+    "@octokit/endpoint" "^6.0.1"
+    "@octokit/request-error" "^2.1.0"
+    "@octokit/types" "^6.16.1"
+    is-plain-object "^5.0.0"
+    node-fetch "^2.6.1"
+    universal-user-agent "^6.0.0"
 
-"@octokit/types@^2.0.0":
-  version "2.16.2"
-  resolved "https://registry.yarnpkg.com/@octokit/types/-/types-2.16.2.tgz#4c5f8da3c6fecf3da1811aef678fda03edac35d2"
-  integrity sha512-O75k56TYvJ8WpAakWwYRN8Bgu60KrmX0z1KqFp1kNiFNkgW+JW+9EBKZ+S33PU6SLvbihqd+3drvPxKK68Ee8Q==
+"@octokit/rest@^18.7.0":
+  version "18.9.0"
+  resolved "https://registry.yarnpkg.com/@octokit/rest/-/rest-18.9.0.tgz#e5cc23fa199a2bdeea9efbe6096f81d7d6156fe9"
+  integrity sha512-VrmrE8gjpuOoDAGjrQq2j9ZhOE6LxaqxaQg0yMrrEnnQZy2ZcAnr5qbVfKsMF0up/48PRV/VFS/2GSMhA7nTdA==
   dependencies:
-    "@types/node" ">= 8"
+    "@octokit/core" "^3.5.0"
+    "@octokit/plugin-paginate-rest" "^2.6.2"
+    "@octokit/plugin-request-log" "^1.0.2"
+    "@octokit/plugin-rest-endpoint-methods" "5.7.0"
 
-"@octokit/types@^5.5.0":
-  version "5.5.0"
-  resolved "https://registry.yarnpkg.com/@octokit/types/-/types-5.5.0.tgz#e5f06e8db21246ca102aa28444cdb13ae17a139b"
-  integrity sha512-UZ1pErDue6bZNjYOotCNveTXArOMZQFG6hKJfOnGnulVCMcVVi7YIIuuR4WfBhjo7zgpmzn/BkPDnUXtNx+PcQ==
+"@octokit/types@^6.0.3", "@octokit/types@^6.16.1", "@octokit/types@^6.16.6", "@octokit/types@^6.18.0":
+  version "6.21.1"
+  resolved "https://registry.yarnpkg.com/@octokit/types/-/types-6.21.1.tgz#d0f2b7598c88e13d0bd87e330d975e3fb2a90180"
+  integrity sha512-PP+m3T5EWZKawru4zi/FvX8KL2vkO5f1fLthx78/7743p7RtJUevt3z7698k+7oAYRA7YuVqfXthSEHqkDvZ8g==
   dependencies:
-    "@types/node" ">= 8"
+    "@octokit/openapi-types" "^9.1.1"
 
-"@octokit/types@^6.0.3", "@octokit/types@^6.7.1":
-  version "6.8.5"
-  resolved "https://registry.yarnpkg.com/@octokit/types/-/types-6.8.5.tgz#797dfdad8c75718e97dc687d4c9fc49200ca8d17"
-  integrity sha512-ZsQawftZoi0kSF2pCsdgLURbOjtVcHnBOXiSxBKSNF56CRjARt5rb/g8WJgqB8vv4lgUEHrv06EdDKYQ22vA9Q==
+"@octokit/types@^6.10.0", "@octokit/types@^6.12.2", "@octokit/types@^6.24.0", "@octokit/types@^6.25.0":
+  version "6.25.0"
+  resolved "https://registry.yarnpkg.com/@octokit/types/-/types-6.25.0.tgz#c8e37e69dbe7ce55ed98ee63f75054e7e808bf1a"
+  integrity sha512-bNvyQKfngvAd/08COlYIN54nRgxskmejgywodizQNyiKoXmWRAjKup2/LYwm+T9V0gsKH6tuld1gM0PzmOiB4Q==
   dependencies:
-    "@octokit/openapi-types" "^4.0.3"
+    "@octokit/openapi-types" "^9.5.0"
 
 "@protobufjs/aspromise@^1.1.1", "@protobufjs/aspromise@^1.1.2":
   version "1.1.2"
@@ -1583,10 +1693,10 @@
   resolved "https://registry.yarnpkg.com/@protobufjs/utf8/-/utf8-1.1.0.tgz#a777360b5b39a1a2e5106f8e858f2fd2d060c570"
   integrity sha1-p3c2C1s5oaLlEG+OhY8v0tBgxXA=
 
-"@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==
+"@rollup/plugin-commonjs@^19.0.0":
+  version "19.0.2"
+  resolved "https://registry.yarnpkg.com/@rollup/plugin-commonjs/-/plugin-commonjs-19.0.2.tgz#1ccc3d63878d1bc9846f8969f09dd3b3e4ecc244"
+  integrity sha512-gBjarfqlC7qs0AutpRW/hrFNm+cd2/QKxhwyFa+srbg1oX7rDsEU3l+W7LAUhsAp9mPJMAkXDhLbQaVwEaE8bA==
   dependencies:
     "@rollup/pluginutils" "^3.1.0"
     commondir "^1.0.1"
@@ -1603,10 +1713,10 @@
   dependencies:
     "@rollup/pluginutils" "^3.0.8"
 
-"@rollup/plugin-node-resolve@^11.1.0":
-  version "11.2.0"
-  resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-11.2.0.tgz#a5ab88c35bb7622d115f44984dee305112b6f714"
-  integrity sha512-qHjNIKYt5pCcn+5RUBQxK8krhRvf1HnyVgUCcFFcweDS7fhkOLZeYh0mhHK6Ery8/bb9tvN/ubPzmfF0qjDCTA==
+"@rollup/plugin-node-resolve@^13.0.0":
+  version "13.0.4"
+  resolved "https://registry.yarnpkg.com/@rollup/plugin-node-resolve/-/plugin-node-resolve-13.0.4.tgz#b10222f4145a019740acb7738402130d848660c0"
+  integrity sha512-eYq4TFy40O8hjeDs+sIxEH/jc9lyuI2k9DM557WN6rO5OpnC2qXMBNj4IKH1oHrnAazL49C5p0tgP0/VpqJ+/w==
   dependencies:
     "@rollup/pluginutils" "^3.1.0"
     "@types/resolve" "1.17.1"
@@ -1624,15 +1734,48 @@
     estree-walker "^1.0.1"
     picomatch "^2.2.2"
 
+"@rushstack/node-core-library@3.40.0":
+  version "3.40.0"
+  resolved "https://registry.yarnpkg.com/@rushstack/node-core-library/-/node-core-library-3.40.0.tgz#2551915ea34e34ec2abb7172b9d7f4546144d9d4"
+  integrity sha512-P6uMPI7cqTdawLSPAG5BQrBu1MHlGRPqecp7ruIRgyukIEzkmh0QAnje4jAL/l1r3hw0qe4e+Dz5ZSnukT/Egg==
+  dependencies:
+    "@types/node" "10.17.13"
+    colors "~1.2.1"
+    fs-extra "~7.0.1"
+    import-lazy "~4.0.0"
+    jju "~1.4.0"
+    resolve "~1.17.0"
+    semver "~7.3.0"
+    timsort "~0.3.0"
+    z-schema "~3.18.3"
+
+"@rushstack/rig-package@0.2.13":
+  version "0.2.13"
+  resolved "https://registry.yarnpkg.com/@rushstack/rig-package/-/rig-package-0.2.13.tgz#418f0aeb4c9b33bd8bd2547759fc0ae91fd970c7"
+  integrity sha512-qQMAFKvfb2ooaWU9DrGIK9d8QfyHy/HiuITJbWenlKgzcDXQvQgEduk57YF4Y7LLasDJ5ZzLaaXwlfX8qCRe5Q==
+  dependencies:
+    resolve "~1.17.0"
+    strip-json-comments "~3.1.1"
+
+"@rushstack/ts-command-line@4.9.0":
+  version "4.9.0"
+  resolved "https://registry.yarnpkg.com/@rushstack/ts-command-line/-/ts-command-line-4.9.0.tgz#781ba42cff73cae097b6d5241b6441e7cc2fe6e0"
+  integrity sha512-kmT8t+JfnvphISF1C5WwY56RefjwgajhSjs9J4ckvAFXZDXR6F5cvF5/RTh7fGCzIomg8esy2PHO/b52zFoZvA==
+  dependencies:
+    "@types/argparse" "1.0.38"
+    argparse "~1.0.9"
+    colors "~1.2.1"
+    string-argv "~0.3.1"
+
 "@sindresorhus/is@^2.0.0":
   version "2.1.1"
   resolved "https://registry.yarnpkg.com/@sindresorhus/is/-/is-2.1.1.tgz#ceff6a28a5b4867c2dd4a1ba513de278ccbe8bb1"
   integrity sha512-/aPsuoj/1Dw/kzhkgz+ES6TxG0zfTMGLwuK2ZG00k/iJzYHTLCE8mVU8EPqEOp/lmxPoq1C1C9RYToRKb2KEfg==
 
 "@szmarczak/http-timer@^4.0.0":
-  version "4.0.5"
-  resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-4.0.5.tgz#bfbd50211e9dfa51ba07da58a14cdfd333205152"
-  integrity sha512-PyRA9sm1Yayuj5OIoJ1hGt2YISX45w9WcFbh6ddT0Z/0yaFxOtGLInr4jUfU1EAFVs0Yfyfev4RNwBlUaHdlDQ==
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/@szmarczak/http-timer/-/http-timer-4.0.6.tgz#b4a914bb62e7c272d4e5989fe4440f812ab1d807"
+  integrity sha512-4BAffykYOgO+5nzBWYwE3W90sBgLJoUPRWWcL8wlyiM8IB8ipJz3UMJ9KXQd1RKQXpKp8Tutn80HZtWsu2u76w==
   dependencies:
     defer-to-connect "^2.0.0"
 
@@ -1646,6 +1789,31 @@
   resolved "https://registry.yarnpkg.com/@trysound/sax/-/sax-0.1.1.tgz#3348564048e7a2d7398c935d466c0414ebb6a669"
   integrity sha512-Z6DoceYb/1xSg5+e+ZlPZ9v0N16ZvZ+wYMraFue4HYrE4ttONKtsvruIRf6t9TBR0YvSOfi1hUU0fJfBLCDYow==
 
+"@tsconfig/node10@^1.0.7":
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/@tsconfig/node10/-/node10-1.0.8.tgz#c1e4e80d6f964fbecb3359c43bd48b40f7cadad9"
+  integrity sha512-6XFfSQmMgq0CFLY1MslA/CPUfhIL919M1rMsa5lP2P097N2Wd1sSX0tx1u4olM16fLNhtHZpRhedZJphNJqmZg==
+
+"@tsconfig/node12@^1.0.7":
+  version "1.0.9"
+  resolved "https://registry.yarnpkg.com/@tsconfig/node12/-/node12-1.0.9.tgz#62c1f6dee2ebd9aead80dc3afa56810e58e1a04c"
+  integrity sha512-/yBMcem+fbvhSREH+s14YJi18sp7J9jpuhYByADT2rypfajMZZN4WQ6zBGgBKp53NKmqI36wFYDb3yaMPurITw==
+
+"@tsconfig/node14@^1.0.0":
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@tsconfig/node14/-/node14-1.0.1.tgz#95f2d167ffb9b8d2068b0b235302fafd4df711f2"
+  integrity sha512-509r2+yARFfHHE7T6Puu2jjkoycftovhXRqW328PDXTVGKihlb1P8Z9mMZH04ebyajfRY7dedfGynlrFHJUQCg==
+
+"@tsconfig/node16@^1.0.1":
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/@tsconfig/node16/-/node16-1.0.2.tgz#423c77877d0569db20e1fc80885ac4118314010e"
+  integrity sha512-eZxlbI8GZscaGS7kkc/trHTT5xgrjH3/1n2JDwusC9iahPKWMRvRjJSAN5mCXviuTGQ/lHnhvv8Q1YTpnfz9gA==
+
+"@types/argparse@1.0.38":
+  version "1.0.38"
+  resolved "https://registry.yarnpkg.com/@types/argparse/-/argparse-1.0.38.tgz#a81fd8606d481f873a3800c6ebae4f1d768a56a9"
+  integrity sha512-ebDJ9b0e702Yr7pWgB0jzm+CX4Srzz8RcXtLJDJB+BSccqMa36uyH/zUsSYao5+BD1ytv3k3rPYCq4mAE1hsXA==
+
 "@types/autoprefixer@^9.0.0":
   version "9.7.2"
   resolved "https://registry.yarnpkg.com/@types/autoprefixer/-/autoprefixer-9.7.2.tgz#64b3251c9675feef5a631b7dd34cfea50a8fdbcc"
@@ -1654,10 +1822,10 @@
     "@types/browserslist" "*"
     postcss "7.x.x"
 
-"@types/babel__core@7.1.14":
-  version "7.1.14"
-  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.14.tgz#faaeefc4185ec71c389f4501ee5ec84b170cc402"
-  integrity sha512-zGZJzzBUVDo/eV6KgbE0f0ZI7dInEYvo12Rb70uNQDshC3SkRMb67ja0GgRHZgAX3Za6rhaWlvbDO8rrGyAb1g==
+"@types/babel__core@7.1.15":
+  version "7.1.15"
+  resolved "https://registry.yarnpkg.com/@types/babel__core/-/babel__core-7.1.15.tgz#2ccfb1ad55a02c83f8e0ad327cbc332f55eb1024"
+  integrity sha512-bxlMKPDbY8x5h6HBwVzEOk2C8fb6SLfYQ5Jw3uBYuYF1lfWk/kbLd81la82vrIkBb0l+JdmrZaDikPrNxpS/Ew==
   dependencies:
     "@babel/parser" "^7.1.0"
     "@babel/types" "^7.0.0"
@@ -1666,31 +1834,31 @@
     "@types/babel__traverse" "*"
 
 "@types/babel__generator@*":
-  version "7.6.2"
-  resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.2.tgz#f3d71178e187858f7c45e30380f8f1b7415a12d8"
-  integrity sha512-MdSJnBjl+bdwkLskZ3NGFp9YcXGx5ggLpQQPqtgakVhsWK0hTtNYhjpZLlWQTviGTvF8at+Bvli3jV7faPdgeQ==
+  version "7.6.3"
+  resolved "https://registry.yarnpkg.com/@types/babel__generator/-/babel__generator-7.6.3.tgz#f456b4b2ce79137f768aa130d2423d2f0ccfaba5"
+  integrity sha512-/GWCmzJWqV7diQW54smJZzWbSFf4QYtF71WCKhcx6Ru/tFyQIY2eiiITcCAeuPbNSvT9YCGkVMqqvSk2Z0mXiA==
   dependencies:
     "@babel/types" "^7.0.0"
 
-"@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==
+"@types/babel__template@*", "@types/babel__template@7.4.1":
+  version "7.4.1"
+  resolved "https://registry.yarnpkg.com/@types/babel__template/-/babel__template-7.4.1.tgz#3d1a48fd9d6c0edfd56f2ff578daed48f36c8969"
+  integrity sha512-azBFKemX6kMg5Io+/rdGT0dkGreboUVR0Cdm3fz9QJWpaQGJRQXl7C+6hOTCZcMll7KFyEQpgbYI2lHdsS4U7g==
   dependencies:
     "@babel/parser" "^7.1.0"
     "@babel/types" "^7.0.0"
 
 "@types/babel__traverse@*":
-  version "7.11.0"
-  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.11.0.tgz#b9a1efa635201ba9bc850323a8793ee2d36c04a0"
-  integrity sha512-kSjgDMZONiIfSH1Nxcr5JIRMwUetDki63FSQfpTCz8ogF3Ulqm8+mr5f78dUYs6vMiB6gBusQqfQmBvHZj/lwg==
+  version "7.14.2"
+  resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.14.2.tgz#ffcd470bbb3f8bf30481678fb5502278ca833a43"
+  integrity sha512-K2waXdXBi2302XUdcHcR1jCeU0LL4TD9HRs/gk0N2Xvrht+G/BfJa4QObBQZfhMdxiCpV3COl5Nfq4uKTeTnJA==
   dependencies:
     "@babel/types" "^7.3.0"
 
 "@types/body-parser@*":
-  version "1.19.0"
-  resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.0.tgz#0685b3c47eb3006ffed117cdd55164b61f80538f"
-  integrity sha512-W98JrE0j2K78swW4ukqMleo8R7h/pFETjM2DQ90MF6XK2i4LO4W3gQ71Lt4w3bfm2EvVSyWHplECvB5sK22yFQ==
+  version "1.19.1"
+  resolved "https://registry.yarnpkg.com/@types/body-parser/-/body-parser-1.19.1.tgz#0c0174c42a7d017b818303d4b5d969cb0b75929c"
+  integrity sha512-a6bTJ21vFOGIkwM0kzh9Yr89ziVxq4vYH2fQ6N8AeipEzai/cFK6aGMArIkUeIdRIgpwQa+2bXiLuUJCpSf2Cg==
   dependencies:
     "@types/connect" "*"
     "@types/node" "*"
@@ -1702,17 +1870,22 @@
   dependencies:
     browserslist "*"
 
+"@types/btoa-lite@^1.0.0":
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/@types/btoa-lite/-/btoa-lite-1.0.0.tgz#e190a5a548e0b348adb0df9ac7fa5f1151c7cca4"
+  integrity sha512-wJsiX1tosQ+J5+bY5LrSahHxr2wT+uME5UDwdN1kg4frt40euqA+wzECkmq4t5QbveHiJepfdThgQrPw6KiSlg==
+
 "@types/cacache@^15.0.0":
-  version "15.0.0"
-  resolved "https://registry.yarnpkg.com/@types/cacache/-/cacache-15.0.0.tgz#b91c7f35f4aa11233cef8a69c4e24ee5996cdf40"
-  integrity sha512-SNTTXhHY+2Z1wkxUARvyswbWluo5R5M7spcMXSaOqPbNs1dWJopMa2QaaEh3kvEcOK4LCTZ25PU9LJ3EJmDUSQ==
+  version "15.0.1"
+  resolved "https://registry.yarnpkg.com/@types/cacache/-/cacache-15.0.1.tgz#3d1943cc80ade160c9ae98bd5c1ebcc538f9cd57"
+  integrity sha512-JhL2GFJuHMx4RMg4z0XfXB4ZkKdyiOaOLpjoYMXcyKfrkF3IBXNZBj6/Peo9zX/7PPHyfI63NWVD589cI2YTzg==
   dependencies:
     "@types/node" "*"
 
 "@types/cacheable-request@^6.0.1":
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/@types/cacheable-request/-/cacheable-request-6.0.1.tgz#5d22f3dded1fd3a84c0bbeb5039a7419c2c91976"
-  integrity sha512-ykFq2zmBGOCbpIXtoVbz4SKY5QriWPh3AjyU4G74RYbtt5yOc5OfaY75ftjg7mikMOla1CTGpX3lLbuJh8DTrQ==
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/@types/cacheable-request/-/cacheable-request-6.0.2.tgz#c324da0197de0a98a2312156536ae262429ff6b9"
+  integrity sha512-B3xVo+dlKM6nnKTcmm5ZtY/OL8bOAOd2Olee9M1zft65ox50OzjEHW91sDiU9j6cvW8Ejg1/Qkf4xd2kugApUA==
   dependencies:
     "@types/http-cache-semantics" "*"
     "@types/keyv" "*"
@@ -1720,9 +1893,9 @@
     "@types/responselike" "*"
 
 "@types/caniuse-lite@^1.0.0":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@types/caniuse-lite/-/caniuse-lite-1.0.0.tgz#6506ed4b3f8d19def130d19419062960e86cc3bc"
-  integrity sha512-g28510gzJpFL0xqvuGAlI+dfIr3qvUcZQVFc7f7u2VlWVqI1oBkWhGLYh3fXfoflR7HRnU4w0NRux0pPJQ7VVg==
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/@types/caniuse-lite/-/caniuse-lite-1.0.1.tgz#368292d5d28268cb7917b9178fcdd500df22d64a"
+  integrity sha512-enW8d/vdojHAhr1C/0BqsNkhz/0ik2WCuAJIp9EClP+mHkR8xXBJ2OGeXHZ6cPqDjVKvWBRe9tY/Nr9r4yQSuA==
 
 "@types/component-emitter@^1.2.10":
   version "1.2.10"
@@ -1730,69 +1903,66 @@
   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"
-  integrity sha512-7SxFCd+FLlxCfwVwbyPxbR4khL9aNikJhrorw8nUIOqeuooc9gifBuDQOJw5kzN7i6i3vLn9G8Wde/4QDihpYw==
+  version "1.3.5"
+  resolved "https://registry.yarnpkg.com/@types/connect-history-api-fallback/-/connect-history-api-fallback-1.3.5.tgz#d1f7a8a09d0ed5a57aee5ae9c18ab9b803205dae"
+  integrity sha512-h8QJa8xSb1WD4fpKBDcATDNGXghFj6/3GRWG6dhmRcu0RX1Ubasur2Uvx5aeEwlf0MwblEC2bMzzMQntxnw/Cw==
   dependencies:
     "@types/express-serve-static-core" "*"
     "@types/node" "*"
 
 "@types/connect@*":
-  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==
+  version "3.4.35"
+  resolved "https://registry.yarnpkg.com/@types/connect/-/connect-3.4.35.tgz#5fcf6ae445e4021d1fc2219a4873cc73a3bb2ad1"
+  integrity sha512-cdeYyv4KWoEgpBISTxWvqYsVy444DOqehiF3fM3ne10AmJ62RSyNkUnxMJXHQWRQQX2eR94m5y1IZyDwBjV9FQ==
   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==
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/@types/cookie/-/cookie-0.4.1.tgz#bfd02c1f2224567676c1545199f87c3a861d878d"
+  integrity sha512-XW/Aa8APYr6jSVVA1y/DEIZX0/GMKLEVekNG727R8cs56ahETkRAy/3DR7+fJyh7oUgGwNQaRfXCun0+KbWY7Q==
 
-"@types/copy-webpack-plugin@^6.0.0":
-  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==
+"@types/copy-webpack-plugin@^8.0.0":
+  version "8.0.1"
+  resolved "https://registry.yarnpkg.com/@types/copy-webpack-plugin/-/copy-webpack-plugin-8.0.1.tgz#dc0a8801eeaef3dca812df793d1afc84fb8d648f"
+  integrity sha512-TwEeGse0/wq+t3SFW0DEwroMS/cDkwVZT+vj7tMAYTp7llt/yz6NuW2n04X2M5P/kSfBQOORhrHAN2mqZdmybg==
   dependencies:
-    "@types/webpack" "*"
+    "@types/node" "*"
+    tapable "^2.0.0"
+    webpack "^5.1.0"
 
 "@types/cors@^2.8.8":
-  version "2.8.10"
-  resolved "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.10.tgz#61cc8469849e5bcdd0c7044122265c39cec10cf4"
-  integrity sha512-C7srjHiVG3Ey1nR6d511dtDkCEjxuN9W1HWAEjGq8kpcwmNM6JJkpC0xvabM7BXTG2wDq8Eu33iH9aQKa7IvLQ==
-
-"@types/cssnano@^4.0.0":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@types/cssnano/-/cssnano-4.0.0.tgz#f1bb29d6d0813861a3d87e02946b2988d0110d4e"
-  integrity sha512-BC/2ibKZfPIaBLBNzkitdW1IvvX/LKW6/QXGc4Su/tAJ7mQ3f2CKBuGCCKaqGAnoKwzfuC7G/recpkARwdOwuA==
-  dependencies:
-    postcss "5 - 7"
+  version "2.8.12"
+  resolved "https://registry.yarnpkg.com/@types/cors/-/cors-2.8.12.tgz#6b2c510a7ad7039e98e7b8d3d6598f4359e5c080"
+  integrity sha512-vt+kDhq/M2ayberEtJcIN/hxXy1Pk+59g2FV/ZQceeaTyCtCucjL2Q7FXlFjtWn4n15KCr1NE2lNNFhp0lEThw==
 
 "@types/debug@^4.1.2":
-  version "4.1.5"
-  resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.5.tgz#b14efa8852b7768d898906613c23f688713e02cd"
-  integrity sha512-Q1y515GcOdTHgagaVFhHnIFQ38ygs/kmxdNpvpou+raI9UO3YZcHDngBSYKQklcKlvA7iuQlmIKbzvmxcOE9CQ==
+  version "4.1.7"
+  resolved "https://registry.yarnpkg.com/@types/debug/-/debug-4.1.7.tgz#7cc0ea761509124709b8b2d1090d8f6c17aadb82"
+  integrity sha512-9AonUzyTjXXhEOa0DnqpzZi6VHlqKMswga9EXjpXnnqxwLtdvPPtlO8evrI5D9S6asFRCQ6v+wpiUKbw+vKqyg==
+  dependencies:
+    "@types/ms" "*"
 
 "@types/eslint-scope@^3.7.0":
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.0.tgz#4792816e31119ebd506902a482caec4951fabd86"
-  integrity sha512-O/ql2+rrCUe2W2rs7wMR+GqPRcgB6UiqN5RhrR5xruFlY7l9YLMn0ZkDzjoHLeiFkR8MCQZVudUuuvQ2BLC9Qw==
+  version "3.7.1"
+  resolved "https://registry.yarnpkg.com/@types/eslint-scope/-/eslint-scope-3.7.1.tgz#8dc390a7b4f9dd9f1284629efce982e41612116e"
+  integrity sha512-SCFeogqiptms4Fg29WpOTk5nHIzfpKCemSN63ksBQYKTcXoJEmJagV+DhVmbapZzY4/5YaOV1nZwrsU79fFm1g==
   dependencies:
     "@types/eslint" "*"
     "@types/estree" "*"
 
 "@types/eslint@*":
-  version "7.2.6"
-  resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.2.6.tgz#5e9aff555a975596c03a98b59ecd103decc70c3c"
-  integrity sha512-I+1sYH+NPQ3/tVqCeUSBwTE/0heyvtXqpIopUUArlBm0Kpocb8FbMa3AZ/ASKIFpN3rnEx932TTXDbt9OXsNDw==
+  version "7.28.0"
+  resolved "https://registry.yarnpkg.com/@types/eslint/-/eslint-7.28.0.tgz#7e41f2481d301c68e14f483fe10b017753ce8d5a"
+  integrity sha512-07XlgzX0YJUn4iG1ocY4IX9DzKSmMGUs6ESKlxWhZRaa0fatIWaHWUVapcuGa8r5HFnTqzj+4OCjd5f7EZ/i/A==
   dependencies:
     "@types/estree" "*"
     "@types/json-schema" "*"
 
-"@types/estree@*", "@types/estree@^0.0.46":
-  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@*", "@types/estree@^0.0.50":
+  version "0.0.50"
+  resolved "https://registry.yarnpkg.com/@types/estree/-/estree-0.0.50.tgz#1e0caa9364d3fccd2931c3ed96fdbeaa5d4cca83"
+  integrity sha512-C6N5s2ZFtuZRj54k2/zyRhNDjJwwcViAM3Nbm8zjBpbqAdZ00mr0CFxvSKeO8Y/e03WVFLpQMdHYVfUd6SB+Hw==
 
 "@types/estree@0.0.39":
   version "0.0.39"
@@ -1800,18 +1970,18 @@
   integrity sha512-EYNwp3bU+98cpU4lAWYYL7Zz+2gryWH1qbdDTidVd6hkiR6weksdbMadyXKXNPEkQFhXM+hVO9ZygomHXp+AIw==
 
 "@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==
+  version "4.17.24"
+  resolved "https://registry.yarnpkg.com/@types/express-serve-static-core/-/express-serve-static-core-4.17.24.tgz#ea41f93bf7e0d59cd5a76665068ed6aab6815c07"
+  integrity sha512-3UJuW+Qxhzwjq3xhwXm2onQcFHn76frIYVbTu+kn24LFxI+dEhdfISDFovPB8VpEgW8oQCTpRuCe+0zJxB7NEA==
   dependencies:
     "@types/node" "*"
     "@types/qs" "*"
     "@types/range-parser" "*"
 
 "@types/express@*", "@types/express@^4.16.0":
-  version "4.17.11"
-  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.11.tgz#debe3caa6f8e5fcda96b47bd54e2f40c4ee59545"
-  integrity sha512-no+R6rW60JEc59977wIxreQVsIEOAYwgCqldrA/vkpCnbD7MqTefO97lmoBe4WE0F156bC4uLSP1XHDOySnChg==
+  version "4.17.13"
+  resolved "https://registry.yarnpkg.com/@types/express/-/express-4.17.13.tgz#a76e2995728999bab51a33fabce1d705a3709034"
+  integrity sha512-6bSZTPaTIACxn48l50SR+axgrqm6qXFIxrdAKaG6PaJk3+zuUr35hBlgT7vOmJcum+OEaIBLtHV/qloEAFITeA==
   dependencies:
     "@types/body-parser" "*"
     "@types/express-serve-static-core" "^4.17.18"
@@ -1819,43 +1989,34 @@
     "@types/serve-static" "*"
 
 "@types/find-cache-dir@^3.0.0":
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/@types/find-cache-dir/-/find-cache-dir-3.2.0.tgz#eaaf331699dccf52c47926e4d4f8f3ed8db33f3c"
-  integrity sha512-+JeT9qb2Jwzw72WdjU+TSvD5O1QRPWCeRpDJV+guiIq+2hwR0DFGw+nZNbTFjMIVe6Bf4GgAKeB/6Ytx6+MbeQ==
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/@types/find-cache-dir/-/find-cache-dir-3.2.1.tgz#7b959a4b9643a1e6a1a5fe49032693cc36773501"
+  integrity sha512-frsJrz2t/CeGifcu/6uRo4b+SzAwT4NYCVPu1GN8IB9XTzrpPkGuV0tmh9mN+/L0PklAlsC3u5Fxt0ju00LXIw==
 
-"@types/glob@*", "@types/glob@^7.1.1":
-  version "7.1.3"
-  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.3.tgz#e6ba80f36b7daad2c685acd9266382e68985c183"
-  integrity sha512-SEYeGAIQIQX8NN6LDKprLjbrd5dARM5EXsd8GI/A5l0apYI1fGMWgPHSe4ZKL4eozlAyI+doUE9XbYS4xCkQ1w==
+"@types/glob@^7.1.1":
+  version "7.1.4"
+  resolved "https://registry.yarnpkg.com/@types/glob/-/glob-7.1.4.tgz#ea59e21d2ee5c517914cb4bc8e4153b99e566672"
+  integrity sha512-w+LsMxKyYQm347Otw+IfBXOv9UWVjpHpCDdbBMt8Kz/xbvCYNjP+0qPh91Km3iKfSRLBB0P7fAMf0KHrPu+MyA==
   dependencies:
     "@types/minimatch" "*"
     "@types/node" "*"
 
 "@types/http-cache-semantics@*":
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.0.tgz#9140779736aa2655635ee756e2467d787cfe8a2a"
-  integrity sha512-c3Xy026kOF7QOTn00hbIllV1dLR9hG9NkSrLQgCVs8NF6sBU+VGWjD3wLPhmh1TYAc7ugCFsvHYMN4VcBN1U1A==
-
-"@types/http-proxy-middleware@*":
-  version "0.19.3"
-  resolved "https://registry.yarnpkg.com/@types/http-proxy-middleware/-/http-proxy-middleware-0.19.3.tgz#b2eb96fbc0f9ac7250b5d9c4c53aade049497d03"
-  integrity sha512-lnBTx6HCOUeIJMLbI/LaL5EmdKLhczJY5oeXZpX/cXE4rRqb3RmV7VcMpiEfYkmTjipv3h7IAyIINe4plEv7cA==
-  dependencies:
-    "@types/connect" "*"
-    "@types/http-proxy" "*"
-    "@types/node" "*"
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/@types/http-cache-semantics/-/http-cache-semantics-4.0.1.tgz#0ea7b61496902b95890dc4c3a116b60cb8dae812"
+  integrity sha512-SZs7ekbP8CN0txVG2xVRH6EgKmEm31BOxA07vkFaETzZz1xh+cbt8BcI0slpymvwhx5dlFnQG2rTlPVQn+iRPQ==
 
-"@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==
+"@types/http-proxy@^1.17.4", "@types/http-proxy@^1.17.5":
+  version "1.17.7"
+  resolved "https://registry.yarnpkg.com/@types/http-proxy/-/http-proxy-1.17.7.tgz#30ea85cc2c868368352a37f0d0d3581e24834c6f"
+  integrity sha512-9hdj6iXH64tHSLTY+Vt2eYOGzSogC+JQ2H7bdPWkuh7KXP5qLllWx++t+K9Wk556c3dkDdPws/SpMRi0sdCT1w==
   dependencies:
     "@types/node" "*"
 
 "@types/inquirer@^7.3.0":
-  version "7.3.1"
-  resolved "https://registry.yarnpkg.com/@types/inquirer/-/inquirer-7.3.1.tgz#1f231224e7df11ccfaf4cf9acbcc3b935fea292d"
-  integrity sha512-osD38QVIfcdgsPCT0V3lD7eH0OFurX71Jft18bZrsVQWVRt6TuxRzlr0GJLrxoHZR2V5ph7/qP8se/dcnI7o0g==
+  version "7.3.3"
+  resolved "https://registry.yarnpkg.com/@types/inquirer/-/inquirer-7.3.3.tgz#92e6676efb67fa6925c69a2ee638f67a822952ac"
+  integrity sha512-HhxyLejTHMfohAuhRun4csWigAMjXTmRyiJTU1Y/I1xmggikFMkOUoMQRlFm+zQcPEGHSs3io/0FAmNZf8EymQ==
   dependencies:
     "@types/through" "*"
     rxjs "^6.4.0"
@@ -1870,81 +2031,98 @@
   resolved "https://registry.yarnpkg.com/@types/istanbul-lib-coverage/-/istanbul-lib-coverage-2.0.3.tgz#4ba8ddb720221f432e443bd5f9117fd22cfd4762"
   integrity sha512-sz7iLqvVUg1gIedBOvlkxPlc8/uVzyS5OwGz1cKjXzkl3FpL3al0crU8YGU1WoHkxn0Wxbw5tyi6hvzJKNzFsw==
 
-"@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/jasmine@~3.8.0":
+  version "3.8.2"
+  resolved "https://registry.yarnpkg.com/@types/jasmine/-/jasmine-3.8.2.tgz#27ab0aaac29581bcbde5774e1843f90df977078e"
+  integrity sha512-u5h7dqzy2XpXTzhOzSNQUQpKGFvROF8ElNX9P/TJvsHnTg/JvsAseVsGWQAQQldqanYaM+5kwxW909BBFAUYsg==
+
+"@types/json-schema@*", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.7", "@types/json-schema@^7.0.8":
+  version "7.0.8"
+  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.8.tgz#edf1bf1dbf4e04413ca8e5b17b3b7d7d54b59818"
+  integrity sha512-YSBPTLTVm2e2OoQIDYx8HaeWJ5tTToLH67kXR7zYNGupXMEHa2++G8k+DczX2cFVgalypqtyZIcU19AFcmOpmg==
 
-"@types/json-schema@*", "@types/json-schema@^7.0.5", "@types/json-schema@^7.0.6":
-  version "7.0.7"
-  resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.7.tgz#98a993516c859eb0d5c4c8f098317a9ea68db9ad"
-  integrity sha512-cxWFQVseBm6O9Gbw1IWb8r6OS4OhSt3hPZLkFApLjM8TEXROBuQGLAH2i2gZpcXdLBIrpXuTDhH7Vbm1iXmNGA==
+"@types/jsonwebtoken@^8.3.3":
+  version "8.5.4"
+  resolved "https://registry.yarnpkg.com/@types/jsonwebtoken/-/jsonwebtoken-8.5.4.tgz#50ccaf0aa6f5d7b9956e70fe323b76e582991913"
+  integrity sha512-4L8msWK31oXwdtC81RmRBAULd0ShnAHjBuKT9MRQpjP0piNrZdXyTRcKY9/UIfhGeKIT4PvF5amOOUbbT/9Wpg==
+  dependencies:
+    "@types/node" "*"
 
 "@types/karma@^6.3.0":
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/@types/karma/-/karma-6.3.0.tgz#535928aeee6e957464acf17d0a9e928b3aa0c27f"
-  integrity sha512-NQ6AzL/0UhFKrK69R9aPV1a88MBau7F47Tr3Qwg8IlKALDVfRk9w+8r3VfOso0vrFT/IkztjfAPar090laUMdg==
+  version "6.3.1"
+  resolved "https://registry.yarnpkg.com/@types/karma/-/karma-6.3.1.tgz#a9e05df4a5d898bffd619c4e109fff9e4f3c676a"
+  integrity sha512-t7hSJ8oWrgzrJV0nBqqMrDnQFft/W3WCPOfSi2aOq7rUPARLC8XpZfbsQ+mfYaNk18v1XqkBU12uirp1ISJVAA==
   dependencies:
     "@types/node" "*"
     log4js "^6.2.1"
 
 "@types/keyv@*", "@types/keyv@^3.1.1":
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/@types/keyv/-/keyv-3.1.1.tgz#e45a45324fca9dab716ab1230ee249c9fb52cfa7"
-  integrity sha512-MPtoySlAZQ37VoLaPcTHCu1RWJ4llDkULYZIzOYxlhxBqYPB0RsRlmMU0R6tahtFe27mIdkHV+551ZWV4PLmVw==
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/@types/keyv/-/keyv-3.1.2.tgz#5d97bb65526c20b6e0845f6b0d2ade4f28604ee5"
+  integrity sha512-/FvAK2p4jQOaJ6CGDHJTqZcUtbZe820qIeTg7o0Shg7drB4JHeL+V/dhSaly7NXx6u8eSee+r7coT+yuJEvDLg==
   dependencies:
     "@types/node" "*"
 
 "@types/loader-utils@^2.0.0":
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/@types/loader-utils/-/loader-utils-2.0.1.tgz#4073425aca25762099823f7b922e86599c2b85ec"
-  integrity sha512-X3jTNi/I2AEd2WrHdSqRppPkYzWkRMNGxJzeMwS0o3hVi8ZB6JCnf/XyQmqpUuCidld5lC/1VxVgTktEweRK+w==
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/@types/loader-utils/-/loader-utils-2.0.3.tgz#fbc2337358f8f4a7dc532ac0a3646c74275edf2d"
+  integrity sha512-sDXXzZnTLXgdso54/iOpAFSDgqhVXabCvwGAt77Agadh/Xk0QYgOk520r3tpOouI098gyqGIFywx8Op1voc3vQ==
   dependencies:
     "@types/node" "*"
-    "@types/webpack" "*"
+    "@types/webpack" "^4"
 
 "@types/long@^4.0.0":
   version "4.0.1"
   resolved "https://registry.yarnpkg.com/@types/long/-/long-4.0.1.tgz#459c65fa1867dafe6a8f322c4c51695663cc55e9"
   integrity sha512-5tXH6Bx/kNGd3MgffdmP4dy2Z+G4eaXw0SE81Tq3BNadtnMR5/ySMzX4SLEzHJzSmPNn4HIdpQsBvXMUykr58w==
 
+"@types/lru-cache@^5.1.0":
+  version "5.1.1"
+  resolved "https://registry.yarnpkg.com/@types/lru-cache/-/lru-cache-5.1.1.tgz#c48c2e27b65d2a153b19bfc1a317e30872e01eef"
+  integrity sha512-ssE3Vlrys7sdIzs5LOxCzTVMsU7i9oa/IaW92wF32JFb3CVczqOkru2xspuKczHEbG3nvmPY7IFqVmGGHdNbYw==
+
 "@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":
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.3.tgz#3dca0e3f33b200fc7d1139c0cd96c1268cadfd9d"
-  integrity sha512-tHq6qdbT9U1IRSGf14CL0pUlULksvY9OZ+5eEgl1N7t+OA3tGvNpxJCzuKQlsNgCVwbAs670L1vcVQi8j9HjnA==
-
-"@types/minimatch@3.0.4":
-  version "3.0.4"
-  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.4.tgz#f0ec25dbf2f0e4b18647313ac031134ca5b24b21"
-  integrity sha512-1z8k4wzFnNjVK/tlxvrWuK5WMt6mydWWP7+zvH5eFep4oj+UkrfiJTRtjCeBXNpwaA/FYqqtb4/QS4ianFpIRA==
+"@types/minimatch@*", "@types/minimatch@3.0.5", "@types/minimatch@^3.0.3":
+  version "3.0.5"
+  resolved "https://registry.yarnpkg.com/@types/minimatch/-/minimatch-3.0.5.tgz#1001cc5e6a3704b83c236027e77f2f58ea010f40"
+  integrity sha512-Klz949h02Gz2uZCMGwDUSDS1YBlTdDDgbWHi+81l29tQALUtvz4rAYi5uoVhE5Lagoq6DeqAUlbrHvW/mXDgdQ==
 
 "@types/minimist@^1.2.0":
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.1.tgz#283f669ff76d7b8260df8ab7a4262cc83d988256"
-  integrity sha512-fZQQafSREFyuZcdWFAExYjBiCL7AUCdgsk80iO0q4yihYYdcIiH28CcuPTGFgLOCC8RlW49GSQxdHwZP+I7CNg==
+  version "1.2.2"
+  resolved "https://registry.yarnpkg.com/@types/minimist/-/minimist-1.2.2.tgz#ee771e2ba4b3dc5b372935d549fd9617bf345b8c"
+  integrity sha512-jhuKLIRrhvCPLqwPcx6INqmKeiA5EWrsCOPhrlFSrbrmU4ZMPjj5Ul/oLCMDO98XRUIwVm78xICz4EPCektzeQ==
+
+"@types/ms@*":
+  version "0.7.31"
+  resolved "https://registry.yarnpkg.com/@types/ms/-/ms-0.7.31.tgz#31b7ca6407128a3d2bbc27fe2d21b345397f6197"
+  integrity sha512-iiUgKzV9AuaEkZqkOLDIvlQiL6ltuZd9tGcW3gwpnX8JbuiuhFlEGmmFXEXkN50Cvq7Os88IY2v0dkDqXYWVgA==
 
 "@types/node-fetch@^2.1.6":
-  version "2.5.8"
-  resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.5.8.tgz#e199c835d234c7eb0846f6618012e558544ee2fb"
-  integrity sha512-fbjI6ja0N5ZA8TV53RUqzsKNkl9fv8Oj3T7zxW7FGv1GSH7gwJaNF8dzCjrqKaxKeUpTz4yT1DaJFq/omNpGfw==
+  version "2.5.12"
+  resolved "https://registry.yarnpkg.com/@types/node-fetch/-/node-fetch-2.5.12.tgz#8a6f779b1d4e60b7a57fb6fd48d84fb545b9cc66"
+  integrity sha512-MKgC4dlq4kKNa/mYrwpKfzQMB5X3ee5U6fSprkKpToBqBmX4nFZL9cW5jl6sWn+xpRJ7ypWh2yyqqr8UUCstSw==
   dependencies:
     "@types/node" "*"
     form-data "^3.0.0"
 
-"@types/node@*", "@types/node@>= 8", "@types/node@^14.14.10":
-  version "14.14.28"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-14.14.28.tgz#cade4b64f8438f588951a6b35843ce536853f25b"
-  integrity sha512-lg55ArB+ZiHHbBBttLpzD07akz0QPrZgUODNakeC09i62dnrywr9mFErHuaPlB6I7z+sEbK+IYmplahvplCj2g==
+"@types/node@*", "@types/node@>=10.0.0":
+  version "16.4.3"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-16.4.3.tgz#c01c1a215721f6dec71b47d88b4687463601ba48"
+  integrity sha512-GKM4FLMkWDc0sfx7tXqPWkM6NBow1kge0fgQh0bOnlqo4iT1kvTvMEKE0c1RtUGnbLlGRXiAA8SumE//90uKAg==
+
+"@types/node@10.17.13":
+  version "10.17.13"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.13.tgz#ccebcdb990bd6139cd16e84c39dc2fb1023ca90c"
+  integrity sha512-pMCcqU2zT4TjqYFrWtYHKal7Sl30Ims6ulZ4UFXxI4xbtQqK/qqKwkDoBFCfooRqqmRu9vY3xaJRwxSh673aYg==
 
 "@types/node@^10.1.0":
-  version "10.17.52"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.52.tgz#dc960d4e256331b3c697b7a573ee98b882febee5"
-  integrity sha512-bKnO8Rcj03i6JTzweabq96k29uVNcXGB0bkwjVQTFagDgxxNged18281AZ0nTMHl+aFpPPWyPrk4Z3+NtW/z5w==
+  version "10.17.60"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-10.17.60.tgz#35f3d6213daed95da7f0f73e75bcc6980e90597b"
+  integrity sha512-F0KIgDJfy2nA3zMLmWGKxcH2ZVEtCZXHHdOQs2gSaQ27+lNeEfGxzkIw90aXswATX7AZ33tahPbzy6KAfUreVw==
 
 "@types/node@~12.12.6":
   version "12.12.70"
@@ -1952,14 +2130,14 @@
   integrity sha512-i5y7HTbvhonZQE+GnUM2rz1Bi8QkzxdQmEv1LKOv4nWyaQk/gdeiTApuQR3PDJHX7WomAbpx2wlWSEpxXGZ/UQ==
 
 "@types/normalize-package-data@^2.4.0":
-  version "2.4.0"
-  resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.0.tgz#e486d0d97396d79beedd0a6e33f4534ff6b4973e"
-  integrity sha512-f5j5b/Gf71L+dbqxIpQ4Z2WlmI/mPJ0fOkGGmFgtb6sAu97EPczzbS3/tJKxmcYDj55OX6ssqwDAWOHIYDRDGA==
+  version "2.4.1"
+  resolved "https://registry.yarnpkg.com/@types/normalize-package-data/-/normalize-package-data-2.4.1.tgz#d3357479a0fdfdd5907fe67e17e0a85c906e1301"
+  integrity sha512-Gj7cI7z+98M282Tqmp2K5EIsoouUEzbBJhQQzDE3jSIRk6r9gsz0oUokqIUR4u1R3dMHo0pDHM7sNOHyhulypw==
 
 "@types/npm-package-arg@^6.1.0":
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/@types/npm-package-arg/-/npm-package-arg-6.1.0.tgz#88bdfce72f6a3d5fa1053c8d44d655e7850642e4"
-  integrity sha512-vbt5fb0y1svMhu++1lwtKmZL76d0uPChFlw7kEzyUmTwfmpHRcFb8i0R8ElT69q/L+QLgK2hgECivIAvaEDwag==
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/@types/npm-package-arg/-/npm-package-arg-6.1.1.tgz#9e2d8adc04d39824a3d9f36f738010a3f7da3c1a"
+  integrity sha512-452/1Kp9IdM/oR10AyqAgZOxUt7eLbm+EMJ194L6oarMYdZNiFIFAOJ7IIr0OrZXTySgfHjJezh2oiyk2kc3ag==
 
 "@types/parse-json@^4.0.0":
   version "4.0.0"
@@ -1974,17 +2152,17 @@
     "@types/parse5-sax-parser" "*"
 
 "@types/parse5-sax-parser@*":
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/@types/parse5-sax-parser/-/parse5-sax-parser-5.0.1.tgz#f1e26e82bb09e48cb0c16ff6d1e88aea1e538fd5"
-  integrity sha512-wBEwg10aACLggnb44CwzAA27M1Jrc/8TR16zA61/rKO5XZoi7JSfLjdpXbshsm7wOlM6hpfvwygh40rzM2RsQQ==
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/@types/parse5-sax-parser/-/parse5-sax-parser-5.0.2.tgz#4cdca0f8bc0ce71b17e27b96e7ca9b5f79e861ff"
+  integrity sha512-EQtGoduLbdMmS4N27g6wcXdCCJ70dWYemfogWuumYg+JmzRqwYvTRAbGOYFortSHtS/qRzRCFwcP3ixy62RsdA==
   dependencies:
     "@types/node" "*"
     "@types/parse5" "*"
 
 "@types/parse5@*":
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/@types/parse5/-/parse5-6.0.0.tgz#38590dc2c3cf5717154064e3ee9b6947ee21b299"
-  integrity sha512-oPwPSj4a1wu9rsXTEGIJz91ISU725t0BmSnUhb57sI+M8XEmvUop84lzuiYdq0Y5M6xLY8DBPg0C2xEQKLyvBA==
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/@types/parse5/-/parse5-6.0.1.tgz#f8ae4fbcd2b9ba4ff934698e28778961f9cb22ca"
+  integrity sha512-ARATsLdrGPUnaBvxLhUlnltcMgn7pQG312S8ccdYlnyijabrX9RN/KN/iGj9Am96CoW8e/K9628BA7Bv4XHdrA==
 
 "@types/pidusage@^2.0.1":
   version "2.0.1"
@@ -1992,17 +2170,17 @@
   integrity sha512-tYYcz/+5v/EGYT83C0pIXrJGOiVBLksQvxgJboG4nGqx/gZTvq0Ro4SkAjECqMk7L4Ww58VWB4j48qeYh4/YJg==
 
 "@types/postcss-preset-env@^6.7.1":
-  version "6.7.1"
-  resolved "https://registry.yarnpkg.com/@types/postcss-preset-env/-/postcss-preset-env-6.7.1.tgz#fdc39e818893a5a035265daba76e498c530d2e3d"
-  integrity sha512-Ya5/cZSbmQ6juE7HQk0UsDNJptJzEFyCq+b0z6Rl1GKfZgIPCxecaf9uS5i2yYmSbojUKIc48XoSBgKVv/ka1g==
+  version "6.7.3"
+  resolved "https://registry.yarnpkg.com/@types/postcss-preset-env/-/postcss-preset-env-6.7.3.tgz#51f9662cce08f26ae657bab94be4471b85575b13"
+  integrity sha512-3YS66Cd7yNTOjjIPoOUaeGbcnxH+0eeP8Ih/RLpFEDazK16lOTabMqmHfL76DBNj5LreJlKRtKML07JkkuxRyw==
   dependencies:
     "@types/autoprefixer" "^9.0.0"
     postcss "^7.0.32"
 
-"@types/progress@2.0.3", "@types/progress@^2.0.3":
-  version "2.0.3"
-  resolved "https://registry.yarnpkg.com/@types/progress/-/progress-2.0.3.tgz#7ccbd9c6d4d601319126c469e73b5bb90dfc8ccc"
-  integrity sha512-bPOsfCZ4tsTlKiBjBhKnM8jpY5nmIll166IPD58D92hR7G7kZDfx5iB9wGF4NfZrdKolebjeAr3GouYkSGoJ/A==
+"@types/progress@2.0.4", "@types/progress@^2.0.3":
+  version "2.0.4"
+  resolved "https://registry.yarnpkg.com/@types/progress/-/progress-2.0.4.tgz#01f8eb06a5f6be396b81d19a20f273cea11ef9b6"
+  integrity sha512-vXGO4Hkk1QeLGRtOD9D8q2K0peciCA46Qo3n/w8joyW5BYx80C2h3b7qk5MkcRnncQRPlFm+KA73BJRfVl+yyw==
   dependencies:
     "@types/node" "*"
 
@@ -2011,20 +2189,22 @@
   resolved "https://registry.yarnpkg.com/@types/q/-/q-0.0.32.tgz#bd284e57c84f1325da702babfc82a5328190c0c5"
   integrity sha1-vShOV8hPEyXacCur/IKlMoGQwMU=
 
-"@types/q@^1.5.1":
-  version "1.5.4"
-  resolved "https://registry.yarnpkg.com/@types/q/-/q-1.5.4.tgz#15925414e0ad2cd765bfef58842f7e26a7accb24"
-  integrity sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug==
-
 "@types/qs@*":
-  version "6.9.5"
-  resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.5.tgz#434711bdd49eb5ee69d90c1d67c354a9a8ecb18b"
-  integrity sha512-/JHkVHtx/REVG0VVToGRGH2+23hsYLHdyG+GrvoUGlGAd0ErauXDyvHtRI/7H7mzLm+tBCKA7pfcpkQ1lf58iQ==
+  version "6.9.7"
+  resolved "https://registry.yarnpkg.com/@types/qs/-/qs-6.9.7.tgz#63bb7d067db107cc1e457c303bc25d511febf6cb"
+  integrity sha512-FGa1F62FT09qcrueBA6qYTrJPVDzah9a+493+o2PCXsesWHIn27G98TsSMs3WPNbZIEj4+VJf6saSFpvD+3Zsw==
 
 "@types/range-parser@*":
-  version "1.2.3"
-  resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.3.tgz#7ee330ba7caafb98090bece86a5ee44115904c2c"
-  integrity sha512-ewFXqrQHlFsgc09MK5jP5iR7vumV/BYayNC6PgJO2LPe8vrnNFyjQjSppfEngITi0qvfKtzFvgKymGheFM9UOA==
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/@types/range-parser/-/range-parser-1.2.4.tgz#cd667bcfdd025213aafb7ca5915a932590acdcdc"
+  integrity sha512-EEhsLsD6UsDM1yFhAvy0Cjr6VwmpMWqFBCb9w07wVugF7w9nfajxLuVmngTIpgS6svCnm6Vaw+MZhoDCKnOfsw==
+
+"@types/resolve@0.0.8":
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-0.0.8.tgz#f26074d238e02659e323ce1a13d041eee280e194"
+  integrity sha512-auApPaJf3NPfe18hSoJkp8EbZzer2ISk7o8mCC3M9he/a04+gbMF97NkpD2S8riMGvm4BMRI59/SZQSaLTKpsQ==
+  dependencies:
+    "@types/node" "*"
 
 "@types/resolve@1.17.1":
   version "1.17.1"
@@ -2034,11 +2214,9 @@
     "@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" "*"
+  version "1.20.1"
+  resolved "https://registry.yarnpkg.com/@types/resolve/-/resolve-1.20.1.tgz#3727e48042fda81e374f5d5cf2fa92288bf698f8"
+  integrity sha512-Ku5+GPFa12S3W26Uwtw+xyrtIpaZsGYHH6zxNbZlstmlvMYSZRzOwzwsXbxlVUbHyUucctSyuFtu6bNxwYomIw==
 
 "@types/responselike@*":
   version "1.0.0"
@@ -2047,28 +2225,27 @@
   dependencies:
     "@types/node" "*"
 
-"@types/rimraf@^3.0.0":
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/@types/rimraf/-/rimraf-3.0.0.tgz#b9d03f090ece263671898d57bb7bb007023ac19f"
-  integrity sha512-7WhJ0MdpFgYQPXlF4Dx+DhgvlPCfz/x5mHaeDQAKhcenvQP1KCpLQ18JklAqeGMYSAT2PxLpzd0g2/HE7fj7hQ==
+"@types/sass@^1.16.0":
+  version "1.16.1"
+  resolved "https://registry.yarnpkg.com/@types/sass/-/sass-1.16.1.tgz#cf465bd1fea486d0331f760db023de14daf4980d"
+  integrity sha512-iZUcRrGuz/Tbg3loODpW7vrQJkUtpY2fFSf4ELqqkApcS2TkZ1msk7ie8iZPB86lDOP8QOTTmuvWjc5S0R9OjQ==
   dependencies:
-    "@types/glob" "*"
     "@types/node" "*"
 
 "@types/selenium-webdriver@^3.0.0":
-  version "3.0.17"
-  resolved "https://registry.yarnpkg.com/@types/selenium-webdriver/-/selenium-webdriver-3.0.17.tgz#50bea0c3c2acc31c959c5b1e747798b3b3d06d4b"
-  integrity sha512-tGomyEuzSC1H28y2zlW6XPCaDaXFaD6soTdb4GNdmte2qfHtrKqhy0ZFs4r/1hpazCfEZqeTSRLvSasmEx89uw==
+  version "3.0.19"
+  resolved "https://registry.yarnpkg.com/@types/selenium-webdriver/-/selenium-webdriver-3.0.19.tgz#28ecede76f15b13553b4e86074d4cf9a0bbe49c4"
+  integrity sha512-OFUilxQg+rWL2FMxtmIgCkUDlJB6pskkpvmew7yeXfzzsOBb5rc+y2+DjHm+r3r1ZPPcJefK3DveNSYWGiy68g==
 
 "@types/semver@^7.0.0":
-  version "7.3.4"
-  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.4.tgz#43d7168fec6fa0988bb1a513a697b29296721afb"
-  integrity sha512-+nVsLKlcUCeMzD2ufHEYuJ9a2ovstb6Dp52A5VsoKxDXgvE051XgHI/33I1EymwkRGQkwnA0LkhnUzituGs4EQ==
+  version "7.3.8"
+  resolved "https://registry.yarnpkg.com/@types/semver/-/semver-7.3.8.tgz#508a27995498d7586dcecd77c25e289bfaf90c59"
+  integrity sha512-D/2EJvAlCEtYFEYmmlGwbGXuK886HzyCc3nZX/tkFTQdEU8jZDAgiv08P162yB17y4ZXZoq7yFAnW4GDBb9Now==
 
 "@types/serve-static@*":
-  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==
+  version "1.13.10"
+  resolved "https://registry.yarnpkg.com/@types/serve-static/-/serve-static-1.13.10.tgz#f5e0ce8797d2d7cc5ebeda48a52c96c4fa47a8d9"
+  integrity sha512-nCkHGI4w7ZgAdNkrEu0bv+4xNV/XDqW+DydknebMOQwkpDGx8G+HTlj7R7ABI8i8nKxVw0wtKPi1D+lPOkh4YQ==
   dependencies:
     "@types/mime" "^1"
     "@types/node" "*"
@@ -2078,10 +2255,15 @@
   resolved "https://registry.yarnpkg.com/@types/source-list-map/-/source-list-map-0.1.2.tgz#0078836063ffaf17412349bba364087e0ac02ec9"
   integrity sha512-K5K+yml8LTo9bWJI/rECfIPrGgxdpeNbj+d53lwN4QjW1MCwlkhUms+gtdzigTeUyBr09+u8BwOIY3MXvHdcsA==
 
+"@types/tapable@^1":
+  version "1.0.8"
+  resolved "https://registry.yarnpkg.com/@types/tapable/-/tapable-1.0.8.tgz#b94a4391c85666c7b73299fd3ad79d4faa435310"
+  integrity sha512-ipixuVrh2OdNmauvtT51o3d8z12p6LtFW9in7U79der/kwejjdNchQC5UMn5u/KxNoM7VHHOs/l8KS8uHxhODQ==
+
 "@types/text-table@^0.2.1":
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/@types/text-table/-/text-table-0.2.1.tgz#39c4d4a058a82f677392dfd09976e83d9b4c9264"
-  integrity sha512-dchbFCWfVgUSWEvhOkXGS7zjm+K7jCUvGrQkAHPk2Fmslfofp4HQTH2pqnQ3Pw5GPYv0zWa2AQjKtsfZThuemQ==
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/@types/text-table/-/text-table-0.2.2.tgz#774c90cfcfbc8b4b0ebb00fecbe861dc8b1e8e26"
+  integrity sha512-dGoI5Af7To0R2XE8wJuc6vwlavWARsCh3UKJPjWs1YEqGUqfgBI/j/4GX0yf19/DsDPPf0YAXWAp8psNeIehLg==
 
 "@types/through@*":
   version "0.0.30"
@@ -2090,47 +2272,135 @@
   dependencies:
     "@types/node" "*"
 
+"@types/uglify-js@*":
+  version "3.13.1"
+  resolved "https://registry.yarnpkg.com/@types/uglify-js/-/uglify-js-3.13.1.tgz#5e889e9e81e94245c75b6450600e1c5ea2878aea"
+  integrity sha512-O3MmRAk6ZuAKa9CHgg0Pr0+lUOqoMLpc9AS4R8ano2auvsg7IE8syF3Xh/NPr26TWklxYcqoEEFdzLLs1fV9PQ==
+  dependencies:
+    source-map "^0.6.1"
+
 "@types/uuid@^8.0.0":
-  version "8.3.0"
-  resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-8.3.0.tgz#215c231dff736d5ba92410e6d602050cce7e273f"
-  integrity sha512-eQ9qFW/fhfGJF8WKHGEHZEyVWfZxrT+6CLIJGBcZPfxUh/+BnEj+UCGYMlr9qZuX/2AltsvwrGqp0LhEW8D0zQ==
+  version "8.3.1"
+  resolved "https://registry.yarnpkg.com/@types/uuid/-/uuid-8.3.1.tgz#1a32969cf8f0364b3d8c8af9cc3555b7805df14f"
+  integrity sha512-Y2mHTRAbqfFkpjldbkHGY8JIzRN6XqYRliG8/24FcHm2D2PwW24fl5xMRTVGdrb7iMrwCaIEbLWerGIkXuFWVg==
 
 "@types/webpack-dev-server@^3.1.7":
-  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==
+  version "3.11.5"
+  resolved "https://registry.yarnpkg.com/@types/webpack-dev-server/-/webpack-dev-server-3.11.5.tgz#f4a254a3dd0667c8ee4af90d42afdb4ad1d607f3"
+  integrity sha512-vjsbQBW3fE5FDICkF3w3ZWFRXNwQdKt7JRPLmRy5W0KXlcuew4wgpKWXhgHS71iLNv7Z2PlY9dSSIaYg+bk+9w==
   dependencies:
     "@types/connect-history-api-fallback" "*"
     "@types/express" "*"
-    "@types/http-proxy-middleware" "*"
     "@types/serve-static" "*"
-    "@types/webpack" "*"
+    "@types/webpack" "^4"
+    http-proxy-middleware "^1.0.0"
+
+"@types/webpack-sources@*":
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/@types/webpack-sources/-/webpack-sources-2.1.1.tgz#6af17e3a3ded71eec2b98008d7c12f498a0a4506"
+  integrity sha512-MjM1R6iuw8XaVbtkCBz0N349cyqBjJHCbQiOeppe3VBeFvxqs74RKHAVt9LkxTnUWc7YLZOEsUfPUnmK6SBPKQ==
+  dependencies:
+    "@types/node" "*"
+    "@types/source-list-map" "*"
+    source-map "^0.7.3"
 
 "@types/webpack-sources@^0.1.5":
-  version "0.1.8"
-  resolved "https://registry.yarnpkg.com/@types/webpack-sources/-/webpack-sources-0.1.8.tgz#078d75410435993ec8a0a2855e88706f3f751f81"
-  integrity sha512-JHB2/xZlXOjzjBB6fMOpH1eQAfsrpqVVIbneE0Rok16WXwFaznaI5vfg75U5WgGJm7V9W1c4xeRQDjX/zwvghA==
+  version "0.1.9"
+  resolved "https://registry.yarnpkg.com/@types/webpack-sources/-/webpack-sources-0.1.9.tgz#da69b06eb34f6432e6658acb5a6893c55d983920"
+  integrity sha512-bvzMnzqoK16PQIC8AYHNdW45eREJQMd6WG/msQWX5V2+vZmODCOPb4TJcbgRljTZZTwTM4wUMcsI8FftNA7new==
   dependencies:
     "@types/node" "*"
     "@types/source-list-map" "*"
     source-map "^0.6.1"
 
-"@types/webpack@*":
-  version "5.28.0"
-  resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-5.28.0.tgz#78dde06212f038d77e54116cfe69e88ae9ed2c03"
-  integrity sha512-8cP0CzcxUiFuA9xGJkfeVpqmWTk9nx6CWwamRGCj95ph1SmlRRk9KlCZ6avhCbZd4L68LvYT6l1kpdEnQXrF8w==
+"@types/webpack@^4":
+  version "4.41.30"
+  resolved "https://registry.yarnpkg.com/@types/webpack/-/webpack-4.41.30.tgz#fd3db6d0d41e145a8eeeafcd3c4a7ccde9068ddc"
+  integrity sha512-GUHyY+pfuQ6haAfzu4S14F+R5iGRwN6b2FRNJY7U0NilmFAqbsOfK6j1HwuLBAqwRIT+pVdNDJGJ6e8rpp0KHA==
   dependencies:
     "@types/node" "*"
-    tapable "^2.2.0"
-    webpack "^5"
+    "@types/tapable" "^1"
+    "@types/uglify-js" "*"
+    "@types/webpack-sources" "*"
+    anymatch "^3.0.0"
+    source-map "^0.6.0"
 
 "@types/yauzl@^2.9.1":
-  version "2.9.1"
-  resolved "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.9.1.tgz#d10f69f9f522eef3cf98e30afb684a1e1ec923af"
-  integrity sha512-A1b8SU4D10uoPjwb0lnHmmu8wZhR9d+9o2PKBQT2jU5YPTKsxac6M2qGAdY7VcL+dHHhARVUDmeg0rOrcd9EjA==
+  version "2.9.2"
+  resolved "https://registry.yarnpkg.com/@types/yauzl/-/yauzl-2.9.2.tgz#c48e5d56aff1444409e39fa164b0b4d4552a7b7a"
+  integrity sha512-8uALY5LTvSuHgloDVUvWP3pIauILm+8/0pDMokuDYIoNsOkSwd5AiHBTSEJjKTDcZr5z8UpgOWZkxBF4iJftoA==
   dependencies:
     "@types/node" "*"
 
+"@typescript-eslint/eslint-plugin@4.28.5":
+  version "4.28.5"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.28.5.tgz#8197f1473e7da8218c6a37ff308d695707835684"
+  integrity sha512-m31cPEnbuCqXtEZQJOXAHsHvtoDi9OVaeL5wZnO2KZTnkvELk+u6J6jHg+NzvWQxk+87Zjbc4lJS4NHmgImz6Q==
+  dependencies:
+    "@typescript-eslint/experimental-utils" "4.28.5"
+    "@typescript-eslint/scope-manager" "4.28.5"
+    debug "^4.3.1"
+    functional-red-black-tree "^1.0.1"
+    regexpp "^3.1.0"
+    semver "^7.3.5"
+    tsutils "^3.21.0"
+
+"@typescript-eslint/experimental-utils@4.28.5":
+  version "4.28.5"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.28.5.tgz#66c28bef115b417cf9d80812a713e0e46bb42a64"
+  integrity sha512-bGPLCOJAa+j49hsynTaAtQIWg6uZd8VLiPcyDe4QPULsvQwLHGLSGKKcBN8/lBxIX14F74UEMK2zNDI8r0okwA==
+  dependencies:
+    "@types/json-schema" "^7.0.7"
+    "@typescript-eslint/scope-manager" "4.28.5"
+    "@typescript-eslint/types" "4.28.5"
+    "@typescript-eslint/typescript-estree" "4.28.5"
+    eslint-scope "^5.1.1"
+    eslint-utils "^3.0.0"
+
+"@typescript-eslint/parser@4.28.5":
+  version "4.28.5"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.28.5.tgz#9c971668f86d1b5c552266c47788a87488a47d1c"
+  integrity sha512-NPCOGhTnkXGMqTznqgVbA5LqVsnw+i3+XA1UKLnAb+MG1Y1rP4ZSK9GX0kJBmAZTMIktf+dTwXToT6kFwyimbw==
+  dependencies:
+    "@typescript-eslint/scope-manager" "4.28.5"
+    "@typescript-eslint/types" "4.28.5"
+    "@typescript-eslint/typescript-estree" "4.28.5"
+    debug "^4.3.1"
+
+"@typescript-eslint/scope-manager@4.28.5":
+  version "4.28.5"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.28.5.tgz#3a1b70c50c1535ac33322786ea99ebe403d3b923"
+  integrity sha512-PHLq6n9nTMrLYcVcIZ7v0VY1X7dK309NM8ya9oL/yG8syFINIMHxyr2GzGoBYUdv3NUfCOqtuqps0ZmcgnZTfQ==
+  dependencies:
+    "@typescript-eslint/types" "4.28.5"
+    "@typescript-eslint/visitor-keys" "4.28.5"
+
+"@typescript-eslint/types@4.28.5":
+  version "4.28.5"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.28.5.tgz#d33edf8e429f0c0930a7c3d44e9b010354c422e9"
+  integrity sha512-MruOu4ZaDOLOhw4f/6iudyks/obuvvZUAHBDSW80Trnc5+ovmViLT2ZMDXhUV66ozcl6z0LJfKs1Usldgi/WCA==
+
+"@typescript-eslint/typescript-estree@4.28.5":
+  version "4.28.5"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.28.5.tgz#4906d343de693cf3d8dcc301383ed638e0441cd1"
+  integrity sha512-FzJUKsBX8poCCdve7iV7ShirP8V+ys2t1fvamVeD1rWpiAnIm550a+BX/fmTHrjEpQJ7ZAn+Z7ZZwJjytk9rZw==
+  dependencies:
+    "@typescript-eslint/types" "4.28.5"
+    "@typescript-eslint/visitor-keys" "4.28.5"
+    debug "^4.3.1"
+    globby "^11.0.3"
+    is-glob "^4.0.1"
+    semver "^7.3.5"
+    tsutils "^3.21.0"
+
+"@typescript-eslint/visitor-keys@4.28.5":
+  version "4.28.5"
+  resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.28.5.tgz#ffee2c602762ed6893405ee7c1144d9cc0a29675"
+  integrity sha512-dva/7Rr+EkxNWdJWau26xU/0slnFlkh88v3TsyTgRS/IIYFi5iIfpCFM4ikw0vQTFUR9FYSSyqgK4w64gsgxhg==
+  dependencies:
+    "@typescript-eslint/types" "4.28.5"
+    eslint-visitor-keys "^2.0.0"
+
 "@verdaccio/commons-api@10.0.0", "@verdaccio/commons-api@^10.0.0":
   version "10.0.0"
   resolved "https://registry.yarnpkg.com/@verdaccio/commons-api/-/commons-api-10.0.0.tgz#2d7de8722f94181f1a71891fe91198a7c14e6dea"
@@ -2139,21 +2409,21 @@
     http-errors "1.8.0"
     http-status-codes "1.4.0"
 
-"@verdaccio/file-locking@^10.0.0":
+"@verdaccio/file-locking@10.0.0", "@verdaccio/file-locking@^10.0.0":
   version "10.0.0"
   resolved "https://registry.yarnpkg.com/@verdaccio/file-locking/-/file-locking-10.0.0.tgz#3d476a6ba28207c795d49828438e7335166c1cfc"
   integrity sha512-2tQUbJF3tQ3CY9grAlpovaF/zu8G56CBYMaeHwMBHo9rAmsJI9i7LfliHGS6Jygbs8vd0cOCPT7vl2CL9T8upw==
   dependencies:
     lockfile "1.0.4"
 
-"@verdaccio/local-storage@10.0.1":
-  version "10.0.1"
-  resolved "https://registry.yarnpkg.com/@verdaccio/local-storage/-/local-storage-10.0.1.tgz#0d30fc43b4be4a832c6b64ad94d483d30c6cc8ac"
-  integrity sha512-dnrBZeuftSFjtQhp7Y+abbWPtM1luxEhP5+6152d8dMnNmomTMZWJcr/eUwKkw6o9d39d4NA4Pimm9bXEBGrdA==
+"@verdaccio/local-storage@10.0.6":
+  version "10.0.6"
+  resolved "https://registry.yarnpkg.com/@verdaccio/local-storage/-/local-storage-10.0.6.tgz#be485a8107ad84206cf80702d325ca47b7f22f68"
+  integrity sha512-YEImOMUL56lziS/N3o1YzoOcVGZXpyZclGSonw7XQ1lKQEvEhU06V2+tIdjPgtqIOuH9ZKdPeBsBuN7ILa2qzQ==
   dependencies:
-    "@verdaccio/commons-api" "^10.0.0"
-    "@verdaccio/file-locking" "^10.0.0"
-    "@verdaccio/streams" "^10.0.0"
+    "@verdaccio/commons-api" "10.0.0"
+    "@verdaccio/file-locking" "10.0.0"
+    "@verdaccio/streams" "10.0.0"
     async "3.2.0"
     debug "4.3.1"
     lodash "4.17.21"
@@ -2169,135 +2439,135 @@
     jsdom "15.2.1"
     marked "^2.0.1"
 
-"@verdaccio/streams@10.0.0", "@verdaccio/streams@^10.0.0":
+"@verdaccio/streams@10.0.0":
   version "10.0.0"
   resolved "https://registry.yarnpkg.com/@verdaccio/streams/-/streams-10.0.0.tgz#8b06e1d6f06e906ebda0f1d4089cdb651a533541"
   integrity sha512-PqxxY11HhweN6z1lwfn9ydLCdnOkCPpthMZs+SGCDz8Rt6gOyrjJVslV7o4uobDipjD9+hUPpJHDeO33Qt24uw==
 
-"@verdaccio/ui-theme@3.0.1":
-  version "3.0.1"
-  resolved "https://registry.yarnpkg.com/@verdaccio/ui-theme/-/ui-theme-3.0.1.tgz#6c8460c46d691bc33d1dc4fbf5c0f07b85a1858a"
-  integrity sha512-5L8knU5yYYZ5nc3zOGIZArtuc8t+znbtMYMcvzweE2JsLF/gMCsRhpGUB69OBJYtJtut3phzrLxdranYExacmw==
-
-"@webassemblyjs/ast@1.11.0":
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.0.tgz#a5aa679efdc9e51707a4207139da57920555961f"
-  integrity sha512-kX2W49LWsbthrmIRMbQZuQDhGtjyqXfEmmHyEi4XWnSZtPmxY0+3anPIzsnRb45VH/J55zlOfWvZuY47aJZTJg==
-  dependencies:
-    "@webassemblyjs/helper-numbers" "1.11.0"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.0"
-
-"@webassemblyjs/floating-point-hex-parser@1.11.0":
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.0.tgz#34d62052f453cd43101d72eab4966a022587947c"
-  integrity sha512-Q/aVYs/VnPDVYvsCBL/gSgwmfjeCb4LW8+TMrO3cSzJImgv8lxxEPM2JA5jMrivE7LSz3V+PFqtMbls3m1exDA==
-
-"@webassemblyjs/helper-api-error@1.11.0":
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.0.tgz#aaea8fb3b923f4aaa9b512ff541b013ffb68d2d4"
-  integrity sha512-baT/va95eXiXb2QflSx95QGT5ClzWpGaa8L7JnJbgzoYeaA27FCvuBXU758l+KXWRndEmUXjP0Q5fibhavIn8w==
-
-"@webassemblyjs/helper-buffer@1.11.0":
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.0.tgz#d026c25d175e388a7dbda9694e91e743cbe9b642"
-  integrity sha512-u9HPBEl4DS+vA8qLQdEQ6N/eJQ7gT7aNvMIo8AAWvAl/xMrcOSiI2M0MAnMCy3jIFke7bEee/JwdX1nUpCtdyA==
-
-"@webassemblyjs/helper-numbers@1.11.0":
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.0.tgz#7ab04172d54e312cc6ea4286d7d9fa27c88cd4f9"
-  integrity sha512-DhRQKelIj01s5IgdsOJMKLppI+4zpmcMQ3XboFPLwCpSNH6Hqo1ritgHgD0nqHeSYqofA6aBN/NmXuGjM1jEfQ==
-  dependencies:
-    "@webassemblyjs/floating-point-hex-parser" "1.11.0"
-    "@webassemblyjs/helper-api-error" "1.11.0"
+"@verdaccio/ui-theme@3.1.0":
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/@verdaccio/ui-theme/-/ui-theme-3.1.0.tgz#21108f3c1b97e6db5901509d935e1f4ce475950a"
+  integrity sha512-NmJOcv25/OtF84YrmYxi31beFde7rt+/y2qlnq0wYR4ZCFRE5TsuqisTVTe1OyJ8D8JwwPMyMSMSMtlMwUfqIQ==
+
+"@webassemblyjs/ast@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ast/-/ast-1.11.1.tgz#2bfd767eae1a6996f432ff7e8d7fc75679c0b6a7"
+  integrity sha512-ukBh14qFLjxTQNTXocdyksN5QdM28S1CxHt2rdskFyL+xFV7VremuBLVbmCePj+URalXBENx/9Lm7lnhihtCSw==
+  dependencies:
+    "@webassemblyjs/helper-numbers" "1.11.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
+
+"@webassemblyjs/floating-point-hex-parser@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/floating-point-hex-parser/-/floating-point-hex-parser-1.11.1.tgz#f6c61a705f0fd7a6aecaa4e8198f23d9dc179e4f"
+  integrity sha512-iGRfyc5Bq+NnNuX8b5hwBrRjzf0ocrJPI6GWFodBFzmFnyvrQ83SHKhmilCU/8Jv67i4GJZBMhEzltxzcNagtQ==
+
+"@webassemblyjs/helper-api-error@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-api-error/-/helper-api-error-1.11.1.tgz#1a63192d8788e5c012800ba6a7a46c705288fd16"
+  integrity sha512-RlhS8CBCXfRUR/cwo2ho9bkheSXG0+NwooXcc3PAILALf2QLdFyj7KGsKRbVc95hZnhnERon4kW/D3SZpp6Tcg==
+
+"@webassemblyjs/helper-buffer@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-buffer/-/helper-buffer-1.11.1.tgz#832a900eb444884cde9a7cad467f81500f5e5ab5"
+  integrity sha512-gwikF65aDNeeXa8JxXa2BAk+REjSyhrNC9ZwdT0f8jc4dQQeDQ7G4m0f2QCLPJiMTTO6wfDmRmj/pW0PsUvIcA==
+
+"@webassemblyjs/helper-numbers@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-numbers/-/helper-numbers-1.11.1.tgz#64d81da219fbbba1e3bd1bfc74f6e8c4e10a62ae"
+  integrity sha512-vDkbxiB8zfnPdNK9Rajcey5C0w+QJugEglN0of+kmO8l7lDb77AnlKYQF7aarZuCrv+l0UvqL+68gSDr3k9LPQ==
+  dependencies:
+    "@webassemblyjs/floating-point-hex-parser" "1.11.1"
+    "@webassemblyjs/helper-api-error" "1.11.1"
     "@xtuc/long" "4.2.2"
 
-"@webassemblyjs/helper-wasm-bytecode@1.11.0":
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.0.tgz#85fdcda4129902fe86f81abf7e7236953ec5a4e1"
-  integrity sha512-MbmhvxXExm542tWREgSFnOVo07fDpsBJg3sIl6fSp9xuu75eGz5lz31q7wTLffwL3Za7XNRCMZy210+tnsUSEA==
+"@webassemblyjs/helper-wasm-bytecode@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-bytecode/-/helper-wasm-bytecode-1.11.1.tgz#f328241e41e7b199d0b20c18e88429c4433295e1"
+  integrity sha512-PvpoOGiJwXeTrSf/qfudJhwlvDQxFgelbMqtq52WWiXC6Xgg1IREdngmPN3bs4RoO83PnL/nFrxucXj1+BX62Q==
 
-"@webassemblyjs/helper-wasm-section@1.11.0":
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.0.tgz#9ce2cc89300262509c801b4af113d1ca25c1a75b"
-  integrity sha512-3Eb88hcbfY/FCukrg6i3EH8H2UsD7x8Vy47iVJrP967A9JGqgBVL9aH71SETPx1JrGsOUVLo0c7vMCN22ytJew==
+"@webassemblyjs/helper-wasm-section@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/helper-wasm-section/-/helper-wasm-section-1.11.1.tgz#21ee065a7b635f319e738f0dd73bfbda281c097a"
+  integrity sha512-10P9No29rYX1j7F3EVPX3JvGPQPae+AomuSTPiF9eBQeChHI6iqjMIwR9JmOJXwpnn/oVGDk7I5IlskuMwU/pg==
   dependencies:
-    "@webassemblyjs/ast" "1.11.0"
-    "@webassemblyjs/helper-buffer" "1.11.0"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.0"
-    "@webassemblyjs/wasm-gen" "1.11.0"
+    "@webassemblyjs/ast" "1.11.1"
+    "@webassemblyjs/helper-buffer" "1.11.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
+    "@webassemblyjs/wasm-gen" "1.11.1"
 
-"@webassemblyjs/ieee754@1.11.0":
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.0.tgz#46975d583f9828f5d094ac210e219441c4e6f5cf"
-  integrity sha512-KXzOqpcYQwAfeQ6WbF6HXo+0udBNmw0iXDmEK5sFlmQdmND+tr773Ti8/5T/M6Tl/413ArSJErATd8In3B+WBA==
+"@webassemblyjs/ieee754@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/ieee754/-/ieee754-1.11.1.tgz#963929e9bbd05709e7e12243a099180812992614"
+  integrity sha512-hJ87QIPtAMKbFq6CGTkZYJivEwZDbQUgYd3qKSadTNOhVY7p+gfP6Sr0lLRVTaG1JjFj+r3YchoqRYxNH3M0GQ==
   dependencies:
     "@xtuc/ieee754" "^1.2.0"
 
-"@webassemblyjs/leb128@1.11.0":
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.0.tgz#f7353de1df38aa201cba9fb88b43f41f75ff403b"
-  integrity sha512-aqbsHa1mSQAbeeNcl38un6qVY++hh8OpCOzxhixSYgbRfNWcxJNJQwe2rezK9XEcssJbbWIkblaJRwGMS9zp+g==
+"@webassemblyjs/leb128@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/leb128/-/leb128-1.11.1.tgz#ce814b45574e93d76bae1fb2644ab9cdd9527aa5"
+  integrity sha512-BJ2P0hNZ0u+Th1YZXJpzW6miwqQUGcIHT1G/sf72gLVD9DZ5AdYTqPNbHZh6K1M5VmKvFXwGSWZADz+qBWxeRw==
   dependencies:
     "@xtuc/long" "4.2.2"
 
-"@webassemblyjs/utf8@1.11.0":
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.0.tgz#86e48f959cf49e0e5091f069a709b862f5a2cadf"
-  integrity sha512-A/lclGxH6SpSLSyFowMzO/+aDEPU4hvEiooCMXQPcQFPPJaYcPQNKGOCLUySJsYJ4trbpr+Fs08n4jelkVTGVw==
-
-"@webassemblyjs/wasm-edit@1.11.0":
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.0.tgz#ee4a5c9f677046a210542ae63897094c2027cb78"
-  integrity sha512-JHQ0damXy0G6J9ucyKVXO2j08JVJ2ntkdJlq1UTiUrIgfGMmA7Ik5VdC/L8hBK46kVJgujkBIoMtT8yVr+yVOQ==
-  dependencies:
-    "@webassemblyjs/ast" "1.11.0"
-    "@webassemblyjs/helper-buffer" "1.11.0"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.0"
-    "@webassemblyjs/helper-wasm-section" "1.11.0"
-    "@webassemblyjs/wasm-gen" "1.11.0"
-    "@webassemblyjs/wasm-opt" "1.11.0"
-    "@webassemblyjs/wasm-parser" "1.11.0"
-    "@webassemblyjs/wast-printer" "1.11.0"
-
-"@webassemblyjs/wasm-gen@1.11.0":
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.0.tgz#3cdb35e70082d42a35166988dda64f24ceb97abe"
-  integrity sha512-BEUv1aj0WptCZ9kIS30th5ILASUnAPEvE3tVMTrItnZRT9tXCLW2LEXT8ezLw59rqPP9klh9LPmpU+WmRQmCPQ==
-  dependencies:
-    "@webassemblyjs/ast" "1.11.0"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.0"
-    "@webassemblyjs/ieee754" "1.11.0"
-    "@webassemblyjs/leb128" "1.11.0"
-    "@webassemblyjs/utf8" "1.11.0"
-
-"@webassemblyjs/wasm-opt@1.11.0":
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.0.tgz#1638ae188137f4bb031f568a413cd24d32f92978"
-  integrity sha512-tHUSP5F4ywyh3hZ0+fDQuWxKx3mJiPeFufg+9gwTpYp324mPCQgnuVKwzLTZVqj0duRDovnPaZqDwoyhIO8kYg==
-  dependencies:
-    "@webassemblyjs/ast" "1.11.0"
-    "@webassemblyjs/helper-buffer" "1.11.0"
-    "@webassemblyjs/wasm-gen" "1.11.0"
-    "@webassemblyjs/wasm-parser" "1.11.0"
-
-"@webassemblyjs/wasm-parser@1.11.0":
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.0.tgz#3e680b8830d5b13d1ec86cc42f38f3d4a7700754"
-  integrity sha512-6L285Sgu9gphrcpDXINvm0M9BskznnzJTE7gYkjDbxET28shDqp27wpruyx3C2S/dvEwiigBwLA1cz7lNUi0kw==
-  dependencies:
-    "@webassemblyjs/ast" "1.11.0"
-    "@webassemblyjs/helper-api-error" "1.11.0"
-    "@webassemblyjs/helper-wasm-bytecode" "1.11.0"
-    "@webassemblyjs/ieee754" "1.11.0"
-    "@webassemblyjs/leb128" "1.11.0"
-    "@webassemblyjs/utf8" "1.11.0"
-
-"@webassemblyjs/wast-printer@1.11.0":
-  version "1.11.0"
-  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.0.tgz#680d1f6a5365d6d401974a8e949e05474e1fab7e"
-  integrity sha512-Fg5OX46pRdTgB7rKIUojkh9vXaVN6sGYCnEiJN1GYkb0RPwShZXp6KTDqmoMdQPKhcroOXh3fEzmkWmCYaKYhQ==
-  dependencies:
-    "@webassemblyjs/ast" "1.11.0"
+"@webassemblyjs/utf8@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/utf8/-/utf8-1.11.1.tgz#d1f8b764369e7c6e6bae350e854dec9a59f0a3ff"
+  integrity sha512-9kqcxAEdMhiwQkHpkNiorZzqpGrodQQ2IGrHHxCy+Ozng0ofyMA0lTqiLkVs1uzTRejX+/O0EOT7KxqVPuXosQ==
+
+"@webassemblyjs/wasm-edit@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-edit/-/wasm-edit-1.11.1.tgz#ad206ebf4bf95a058ce9880a8c092c5dec8193d6"
+  integrity sha512-g+RsupUC1aTHfR8CDgnsVRVZFJqdkFHpsHMfJuWQzWU3tvnLC07UqHICfP+4XyL2tnr1amvl1Sdp06TnYCmVkA==
+  dependencies:
+    "@webassemblyjs/ast" "1.11.1"
+    "@webassemblyjs/helper-buffer" "1.11.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
+    "@webassemblyjs/helper-wasm-section" "1.11.1"
+    "@webassemblyjs/wasm-gen" "1.11.1"
+    "@webassemblyjs/wasm-opt" "1.11.1"
+    "@webassemblyjs/wasm-parser" "1.11.1"
+    "@webassemblyjs/wast-printer" "1.11.1"
+
+"@webassemblyjs/wasm-gen@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-gen/-/wasm-gen-1.11.1.tgz#86c5ea304849759b7d88c47a32f4f039ae3c8f76"
+  integrity sha512-F7QqKXwwNlMmsulj6+O7r4mmtAlCWfO/0HdgOxSklZfQcDu0TpLiD1mRt/zF25Bk59FIjEuGAIyn5ei4yMfLhA==
+  dependencies:
+    "@webassemblyjs/ast" "1.11.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
+    "@webassemblyjs/ieee754" "1.11.1"
+    "@webassemblyjs/leb128" "1.11.1"
+    "@webassemblyjs/utf8" "1.11.1"
+
+"@webassemblyjs/wasm-opt@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-opt/-/wasm-opt-1.11.1.tgz#657b4c2202f4cf3b345f8a4c6461c8c2418985f2"
+  integrity sha512-VqnkNqnZlU5EB64pp1l7hdm3hmQw7Vgqa0KF/KCNO9sIpI6Fk6brDEiX+iCOYrvMuBWDws0NkTOxYEb85XQHHw==
+  dependencies:
+    "@webassemblyjs/ast" "1.11.1"
+    "@webassemblyjs/helper-buffer" "1.11.1"
+    "@webassemblyjs/wasm-gen" "1.11.1"
+    "@webassemblyjs/wasm-parser" "1.11.1"
+
+"@webassemblyjs/wasm-parser@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wasm-parser/-/wasm-parser-1.11.1.tgz#86ca734534f417e9bd3c67c7a1c75d8be41fb199"
+  integrity sha512-rrBujw+dJu32gYB7/Lup6UhdkPx9S9SnobZzRVL7VcBH9Bt9bCBLEuX/YXOOtBsOZ4NQrRykKhffRWHvigQvOA==
+  dependencies:
+    "@webassemblyjs/ast" "1.11.1"
+    "@webassemblyjs/helper-api-error" "1.11.1"
+    "@webassemblyjs/helper-wasm-bytecode" "1.11.1"
+    "@webassemblyjs/ieee754" "1.11.1"
+    "@webassemblyjs/leb128" "1.11.1"
+    "@webassemblyjs/utf8" "1.11.1"
+
+"@webassemblyjs/wast-printer@1.11.1":
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/@webassemblyjs/wast-printer/-/wast-printer-1.11.1.tgz#d0c73beda8eec5426f10ae8ef55cee5e7084c2f0"
+  integrity sha512-IQboUWM4eKzWW+N/jij2sRatKMh99QEelo3Eb2q0qXkvPRISAj8Qxtmw5itwqK+TTkBuUIE45AxYPToqPtL5gg==
+  dependencies:
+    "@webassemblyjs/ast" "1.11.1"
     "@xtuc/long" "4.2.2"
 
 "@xtuc/ieee754@^1.2.0":
@@ -2349,6 +2619,16 @@ acorn-globals@^4.3.2:
     acorn "^6.0.1"
     acorn-walk "^6.0.1"
 
+acorn-import-assertions@^1.7.6:
+  version "1.7.6"
+  resolved "https://registry.yarnpkg.com/acorn-import-assertions/-/acorn-import-assertions-1.7.6.tgz#580e3ffcae6770eebeec76c3b9723201e9d01f78"
+  integrity sha512-FlVvVFA1TX6l3lp8VjDnYYq7R1nyW6x3svAt4nDgrWQ9SBaSh9CnbwgSUTasgfNfOG5HlM1ehugCvM+hjo56LA==
+
+acorn-jsx@^5.3.1:
+  version "5.3.2"
+  resolved "https://registry.yarnpkg.com/acorn-jsx/-/acorn-jsx-5.3.2.tgz#7ed5bb55908b3b2f1bc55c6af1653bada7f07937"
+  integrity sha512-rq9s+JNhf0IChjtDXxllJ7g41oZk5SlXtp0LHwyA5cejwn7vKmKp4pPri6YEePv2PU65sAsegbXtIinmDFDXgQ==
+
 acorn-walk@^6.0.1:
   version "6.2.0"
   resolved "https://registry.yarnpkg.com/acorn-walk/-/acorn-walk-6.2.0.tgz#123cb8f3b84c2171f1f7fb252615b1c78a6b1a8c"
@@ -2359,25 +2639,25 @@ acorn@^6.0.1:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.2.tgz#35866fd710528e92de10cf06016498e47e39e1e6"
   integrity sha512-XtGIhXwF8YM8bJhGxG5kXgjkEuNGLTkoYqVE+KMR+aspr4KGYmKYg7yUe3KghyQ9yheNwLnjmzh/7+gfDBmHCQ==
 
-acorn@^7.1.0, acorn@^7.1.1:
+acorn@^7.1.0, acorn@^7.1.1, acorn@^7.4.0:
   version "7.4.1"
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-7.4.1.tgz#feaed255973d2e77555b83dbc08851a6c63520fa"
   integrity sha512-nQyp0o1/mNdbTO1PO6kHkwSrmgZ0MT/jCCpNiwbUjGoRN4dlBhqJtoQuCnEOKzgTVwg0ZWiCoQy6SxMebQVh8A==
 
-acorn@^8.0.4:
-  version "8.0.5"
-  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.0.5.tgz#a3bfb872a74a6a7f661bc81b9849d9cac12601b7"
-  integrity sha512-v+DieK/HJkJOpFBETDJioequtc3PfxsWMaxIdIwujtF7FEV/MAyDQLlm6/zPvr7Mix07mLh6ccVwIsloceodlg==
+acorn@^8.4.1:
+  version "8.4.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.4.1.tgz#56c36251fc7cabc7096adc18f05afe814321a28c"
+  integrity sha512-asabaBSkEKosYKMITunzX177CXxQ4Q8BSSzMTKD+FefUhipQC70gfW5SiUDhYQ3vk8G+81HqQk7Fv9OXwwn9KA==
 
-add-stream@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/add-stream/-/add-stream-1.0.0.tgz#6a7990437ca736d5e1288db92bd3266d5f5cb2aa"
-  integrity sha1-anmQQ3ynNtXhKI25K9MmbV9csqo=
+acorn@^8.5.0:
+  version "8.7.1"
+  resolved "https://registry.yarnpkg.com/acorn/-/acorn-8.7.1.tgz#0197122c843d1bf6d0a5e83220a788f278f63c30"
+  integrity sha512-Xx54uLJQZ19lKygFXOWsscKUbsBZW0CPykPhVQdhIeIwrbPmJzqeASDInc8nKBnp/JT6igTs82qPXz069H8I/A==
 
-adjust-sourcemap-loader@3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/adjust-sourcemap-loader/-/adjust-sourcemap-loader-3.0.0.tgz#5ae12fb5b7b1c585e80bbb5a63ec163a1a45e61e"
-  integrity sha512-YBrGyT2/uVQ/c6Rr+t6ZJXniY03YtHGMJQYal368burRGYKqhx9qGTWqcBU5s1CwYY9E/ri63RYyG1IacMZtqw==
+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:
     loader-utils "^2.0.0"
     regex-parser "^2.2.11"
@@ -2387,7 +2667,7 @@ adm-zip@^0.4.9:
   resolved "https://registry.yarnpkg.com/adm-zip/-/adm-zip-0.4.16.tgz#cf4c508fdffab02c269cbc7f471a875f05570365"
   integrity sha512-TFi4HBKSGfIKsK5YCkKaaFG2m4PEDyViZmEwof3MTIgzimHLto6muaHVpbrljdIvIrFZzEq/p4nafOeLcYegrg==
 
-agent-base@6:
+agent-base@6, agent-base@^6.0.2:
   version "6.0.2"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.2.tgz#49fff58577cfee3f37176feab4c22e00f86d7f77"
   integrity sha512-RZNwNclF7+MS/8bDg70amg32dyeZGZxiDuQmZxKLAlQjr3jGyLx+4Kkk58UO7D2QdgFIQCovuSuZESne6RG6XQ==
@@ -2423,10 +2703,10 @@ ajv-errors@^1.0.0:
   resolved "https://registry.yarnpkg.com/ajv-errors/-/ajv-errors-1.0.1.tgz#f35986aceb91afadec4102fbd85014950cefa64d"
   integrity sha512-DCRfO/4nQ+89p/RK43i8Ezd41EqdGIU4ld7nGF8OQ14oc/we5rEntLCUa7+jrn3nn83BosfwZA0wb4pon2o8iQ==
 
-ajv-formats@2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.0.2.tgz#69875cb99d76c74be46e9c7a4444bc232354eba0"
-  integrity sha512-Brah4Uo5/U8v76c6euTwtjVFFaVishwnJrQBYpev1JRh4vjA1F4HY3UzQez41YUCszUCXKagG8v6eVRBHV1gkw==
+ajv-formats@2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/ajv-formats/-/ajv-formats-2.1.0.tgz#96eaf83e38d32108b66d82a9cb0cfa24886cdfeb"
+  integrity sha512-USH2jBb+C/hIpwD2iRjp0pe0k+MvzG0mlSn/FIdCgQhUb9ALPRjt2KIQdfZDS9r0ZIeUAg7gOu9KL0PFqGqr5Q==
   dependencies:
     ajv "^8.0.0"
 
@@ -2435,17 +2715,17 @@ ajv-keywords@^3.1.0, ajv-keywords@^3.5.2:
   resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d"
   integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ==
 
-ajv@8.1.0, ajv@^8.0.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.1.0.tgz#45d5d3d36c7cdd808930cc3e603cf6200dbeb736"
-  integrity sha512-B/Sk2Ix7A36fs/ZkuGLIR86EdjbgR6fsAcbx9lOP/QBSXujDNbVmIS/U4Itz5k8fPFDeVZl/zQ/gJW4Jrq6XjQ==
+ajv@8.6.2, ajv@^8.0.0, ajv@^8.0.1:
+  version "8.6.2"
+  resolved "https://registry.yarnpkg.com/ajv/-/ajv-8.6.2.tgz#2fb45e0e5fcbc0813326c1c3da535d1881bb0571"
+  integrity sha512-9807RlWAgT564wT+DjeyU5OFMPjmzxVobvDFmNAhY+5zD6A2ly3jDp6sgnfyDtlIQ+7H97oc/DGCzzfu9rjw9w==
   dependencies:
     fast-deep-equal "^3.1.1"
     json-schema-traverse "^1.0.0"
     require-from-string "^2.0.2"
     uri-js "^4.2.2"
 
-ajv@^6.1.0, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5:
+ajv@^6.1.0, ajv@^6.10.0, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5, ajv@~6.12.6:
   version "6.12.6"
   resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4"
   integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g==
@@ -2455,17 +2735,7 @@ ajv@^6.1.0, ajv@^6.12.3, ajv@^6.12.4, ajv@^6.12.5:
     json-schema-traverse "^0.4.1"
     uri-js "^4.2.2"
 
-ajv@^7.0.3:
-  version "7.2.4"
-  resolved "https://registry.yarnpkg.com/ajv/-/ajv-7.2.4.tgz#8e239d4d56cf884bccca8cca362f508446dc160f"
-  integrity sha512-nBeQgg/ZZA3u3SYxyaDvpvDtgZ/EZPF547ARgZBrG9Bhu1vKDwAIjtIf+sDtJUKa2zOcEbmRLBRSyMraS/Oy1A==
-  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:
+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=
@@ -2481,27 +2751,22 @@ ansi-colors@^3.0.0:
   integrity sha512-hHUXGagefjN2iRrID63xckIvotOXOojhQKWIPUZ4mNUZ9nLZW+7FMNoE1lOkEhNWYsx/7ysGIuJYCiMAA9FnrA==
 
 ansi-escapes@^4.2.1:
-  version "4.3.1"
-  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.1.tgz#a5c47cc43181f1f38ffd7076837700d395522a61"
-  integrity sha512-JWF7ocqNrp8u9oqpgV+wH5ftbt+cfvv+PTjOvKLT3AdYly/LmORARfEVT1iyjwN+4MqE5UmVKoAdIBqeoCHgLA==
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/ansi-escapes/-/ansi-escapes-4.3.2.tgz#6b2291d1db7d98b6521d5f1efa42d0f3a9feb65e"
+  integrity sha512-gKXj5ALrKWQLsYG9jlTRmR/xKluxHV+Z9QEwNIgCfM1/uwPMCuzVVnh5mwTd+OuBZcwSIMbqssNWRm1lE51QaQ==
   dependencies:
-    type-fest "^0.11.0"
+    type-fest "^0.21.3"
 
-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"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-2.1.1.tgz#c3b33ab5ee360d86e0e628f0468ae7ef27d654df"
   integrity sha1-w7M6te42DYbg5ijwRorn7yfWVN8=
 
-ansi-regex@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-3.0.0.tgz#ed0317c322064f79466c02966bddb605ab37d998"
-  integrity sha1-7QMXwyIGT3lGbAKWa922Bas32Zg=
-
 ansi-regex@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-4.1.0.tgz#8b9f8f08cf1acb843756a839ca8c7e3168c51997"
@@ -2512,6 +2777,11 @@ ansi-regex@^5.0.0:
   resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.0.tgz#388539f55179bf39339c81af30a654d69f87cb75"
   integrity sha512-bY6fj56OUQ0hU1KjFNDQuJFezqKdrAyFdIevADiqrWHwSlbmBNMHp5ak2f40Pm8JTFyM2mqxkG6ngkHO11f/lg==
 
+ansi-regex@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/ansi-regex/-/ansi-regex-5.0.1.tgz#082cb2c89c9fe8659a311a53bd6a4dc5301db304"
+  integrity sha512-quJQXlTSUGL2LH9SUXo8VwsY4soanhgo6LNSm84E1LBcE8s3O0wpdiRzyR9z/ZZJMlMWv37qOOb9pdJlMUEKFQ==
+
 ansi-styles@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/ansi-styles/-/ansi-styles-2.2.1.tgz#b432dd3358b634cf75e1e4664368240533c1ddbe"
@@ -2539,10 +2809,10 @@ anymatch@^2.0.0:
     micromatch "^3.1.4"
     normalize-path "^2.1.1"
 
-anymatch@~3.1.1:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.1.tgz#c55ecf02185e2469259399310c173ce31233b142"
-  integrity sha512-mM8522psRCqzV+6LhomX5wgp25YVibjh8Wj23I5RPkPppSVSjyKD2A2mBJmWGa+KN7f2D6LNh9jkBCeyLktzjg==
+anymatch@^3.0.0, anymatch@~3.1.2:
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/anymatch/-/anymatch-3.1.2.tgz#c0557c096af32f106198f4f4e2a383537e378716"
+  integrity sha512-P43ePfOAIupkguHUycrc4qJ9kz8ZiuOUijaETwX7THt0Y/GNK7v0aa8rY816xWjZ7rJdA5XdMcpVFTKMq+RvWg==
   dependencies:
     normalize-path "^3.0.0"
     picomatch "^2.0.4"
@@ -2557,25 +2827,25 @@ app-root-path@^3.0.0:
   resolved "https://registry.yarnpkg.com/app-root-path/-/app-root-path-3.0.0.tgz#210b6f43873227e18a4b810a032283311555d5ad"
   integrity sha512-qMcx+Gy2UZynHjOHOIXPNvpf+9cjvk3cWrBBK7zg4gH9+clobJRb9NGzcT7mQTcV/6Gm/1WelUtqxVXnNlrwcw==
 
-aproba@^1.0.3:
-  version "1.2.0"
-  resolved "https://registry.yarnpkg.com/aproba/-/aproba-1.2.0.tgz#6802e6264efd18c790a1b0d517f0f2627bf2c94a"
-  integrity sha512-Y9J6ZjXtoYh8RnXVCMOU/ttDmk1aBjunq9vO0ta5x85WDQiQfUF9sIPBITdbiiIVcBo03Hi3jMxigBtsddlXRw==
+"aproba@^1.0.3 || ^2.0.0":
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/aproba/-/aproba-2.0.0.tgz#52520b8ae5b569215b354efc0caa3fe1e45a8adc"
+  integrity sha512-lYe4Gx7QT+MKGbDsA+Z+he/Wtef0BiwDOlK/XkBrdfsh9J/jPPXbX0tE9x9cl27Tmu5gg3QUbUrQYa/y+KOHPQ==
 
-are-we-there-yet@~1.1.2:
-  version "1.1.5"
-  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-1.1.5.tgz#4b35c2944f062a8bfcda66410760350fe9ddfc21"
-  integrity sha512-5hYdAkZlcG8tOLujVDTgCT+uPX0VnpAH28gWsLfzpXYm7wP6mp5Q/gYyR7YQ0cKVJcXJnl3j2kpBan13PtQf6w==
+are-we-there-yet@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/are-we-there-yet/-/are-we-there-yet-2.0.0.tgz#372e0e7bd279d8e94c653aaa1f67200884bf3e1c"
+  integrity sha512-Ci/qENmwHnsYo9xKIcUJN5LeDKdJ6R1Z1j9V/J5wyq8nh/mYPEpIKJbBZXtZjG04HiK7zV/p6Vs9952MrMeUIw==
   dependencies:
     delegates "^1.0.0"
-    readable-stream "^2.0.6"
+    readable-stream "^3.6.0"
 
 arg@^4.1.0:
   version "4.1.3"
   resolved "https://registry.yarnpkg.com/arg/-/arg-4.1.3.tgz#269fc7ad5b8e42cb63c896d5666017261c144089"
   integrity sha512-58S9QDqG0Xx27YwPSt9fJxivjYl432YCwfDMfZ+71RAqUrZef7LrKQZ3LHLOwCS4FLNBplP533Zx895SeOCHvA==
 
-argparse@^1.0.7:
+argparse@^1.0.7, argparse@~1.0.9:
   version "1.0.10"
   resolved "https://registry.yarnpkg.com/argparse/-/argparse-1.0.10.tgz#bcd6791ea5ae09725e17e5ad988134cd40b3d911"
   integrity sha512-o5Roy6tNG4SL/FOkCAN6RzjiakZS25RLYFrcMttJqbdd8BWrnA+fGz57iN5Pb06pvBGvl5gQ0B48dJlslXvoTg==
@@ -2595,11 +2865,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"
@@ -2625,7 +2890,7 @@ array-equal@^1.0.0:
   resolved "https://registry.yarnpkg.com/array-equal/-/array-equal-1.0.0.tgz#8c2a5ef2472fd9ea742b04c77a75093ba2757c93"
   integrity sha1-jCpe8kcv2ep0KwTHenUJO6J1fJM=
 
-array-find-index@^1.0.1, array-find-index@^1.0.2:
+array-find-index@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/array-find-index/-/array-find-index-1.0.2.tgz#df010aa1287e164bbda6f9723b0a96a1ec4187a1"
   integrity sha1-3wEKoSh+Fku9pvlyOwqWoexBh6E=
@@ -2640,10 +2905,16 @@ array-flatten@^2.1.0:
   resolved "https://registry.yarnpkg.com/array-flatten/-/array-flatten-2.1.2.tgz#24ef80a28c1a893617e2149b0c6d0d788293b099"
   integrity sha512-hNfzcOV8W4NdualtqBFPyVO+54DSJuZGY9qT4pRroB6S9e3iiido2ISIC5h9R2sPJ8H3FHCIiEnsv1lPXO3KtQ==
 
-array-ify@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/array-ify/-/array-ify-1.0.0.tgz#9e528762b4a9066ad163a6962a364418e9626ece"
-  integrity sha1-nlKHYrSpBmrRY6aWKjZEGOlibs4=
+array-includes@^3.1.3:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/array-includes/-/array-includes-3.1.3.tgz#c7f619b382ad2afaf5326cddfdc0afc61af7690a"
+  integrity sha512-gcem1KlBU7c9rB+Rq8/3PPKsK2kjqeEBa3bD5kkQo4nYlOHQCJqIJFqBXDEfwaRuYTT4E+FxA9xez7Gf/e3Q7A==
+  dependencies:
+    call-bind "^1.0.2"
+    define-properties "^1.1.3"
+    es-abstract "^1.18.0-next.2"
+    get-intrinsic "^1.1.1"
+    is-string "^1.0.5"
 
 array-union@^1.0.1:
   version "1.0.2"
@@ -2667,6 +2938,15 @@ array-unique@^0.3.2:
   resolved "https://registry.yarnpkg.com/array-unique/-/array-unique-0.3.2.tgz#a894b75d4bc4f6cd679ef3244a9fd8f46ae2d428"
   integrity sha1-qJS3XUvE9s1nnvMkSp/Y9Gri1Cg=
 
+array.prototype.flat@^1.2.4:
+  version "1.2.4"
+  resolved "https://registry.yarnpkg.com/array.prototype.flat/-/array.prototype.flat-1.2.4.tgz#6ef638b43312bd401b4c6199fdec7e2dc9e9a123"
+  integrity sha512-4470Xi3GAPAjZqFcljX2xzckv1qeKPizoNkiS0+O4IoPR2ZNpcjE0pkhdihlDouK+x6QOast26B4Q/O9DJnwSg==
+  dependencies:
+    call-bind "^1.0.0"
+    define-properties "^1.1.3"
+    es-abstract "^1.18.0-next.1"
+
 arrify@^1.0.0, arrify@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/arrify/-/arrify-1.0.1.tgz#898508da2226f380df904728456849c1501a4b0d"
@@ -2704,6 +2984,11 @@ ast-types-flow@0.0.7:
   resolved "https://registry.yarnpkg.com/ast-types-flow/-/ast-types-flow-0.0.7.tgz#f70b735c6bca1a5c9c22d982c3e39e7feba3bdad"
   integrity sha1-9wtzXGvKGlycItmCw+Oef+ujva0=
 
+astral-regex@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/astral-regex/-/astral-regex-2.0.0.tgz#483143c567aeed4785759c0865786dc77d7d2e31"
+  integrity sha512-Z7tMw1ytTXt5jqMcOP+OQteU1VuNK9Y02uuJtKQ1Sv69jXQKKg5cibLwGJow8yzZP+eAc18EmLGPal0bp36rvQ==
+
 async-each@^1.0.1:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/async-each/-/async-each-1.0.3.tgz#b727dbf87d7651602f06f4d4ac387f47d91b0cbf"
@@ -2741,11 +3026,6 @@ asynckit@^0.4.0:
   resolved "https://registry.yarnpkg.com/asynckit/-/asynckit-0.4.0.tgz#c79ed97f7f34cb8f2ba1bc9790bcc366474b4b79"
   integrity sha1-x57Zf380y48robyXkLzDZkdLS3k=
 
-atob-lite@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/atob-lite/-/atob-lite-2.0.0.tgz#0fef5ad46f1bd7a8502c65727f0367d5ee43d696"
-  integrity sha1-D+9a1G8b16hQLGVyfwNn1e5D1pY=
-
 atob@^2.1.2:
   version "2.1.2"
   resolved "https://registry.yarnpkg.com/atob/-/atob-2.1.2.tgz#6d9517eb9e030d2436666651e86bd9f6f13533c9"
@@ -2756,18 +3036,6 @@ atomic-sleep@^1.0.0:
   resolved "https://registry.yarnpkg.com/atomic-sleep/-/atomic-sleep-1.0.0.tgz#eb85b77a601fc932cfe432c5acd364a9e2c9075b"
   integrity sha512-kNOjDqAh7px0XWNI+4QbzoiR/nTkHAWNud2uvnJquD1/x5a7EQZMJT0AczqK0Qn67oY/TTQ1LbUKajZpp3I9tQ==
 
-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.1:
   version "9.8.6"
   resolved "https://registry.yarnpkg.com/autoprefixer/-/autoprefixer-9.8.6.tgz#3b73594ca1bf9266320c5acf1588d74dea74210f"
@@ -2815,41 +3083,41 @@ babel-plugin-dynamic-import-node@^2.3.3:
   dependencies:
     object.assign "^4.1.0"
 
-babel-plugin-polyfill-corejs2@^0.1.4:
-  version "0.1.5"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.1.5.tgz#8fc4779965311393594a1b9ad3adefab3860c8fe"
-  integrity sha512-5IzdFIjYWqlOFVr/hMYUpc+5fbfuvJTAISwIY58jhH++ZtawtNlcJnxAixlk8ahVwHCz1ipW/kpXYliEBp66wg==
+babel-plugin-polyfill-corejs2@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.2.2.tgz#e9124785e6fd94f94b618a7954e5693053bf5327"
+  integrity sha512-kISrENsJ0z5dNPq5eRvcctITNHYXWOA4DUZRFYCz3jYCcvTb/A546LIddmoGNMVYg2U38OyFeNosQwI9ENTqIQ==
   dependencies:
-    "@babel/compat-data" "^7.13.0"
-    "@babel/helper-define-polyfill-provider" "^0.1.2"
+    "@babel/compat-data" "^7.13.11"
+    "@babel/helper-define-polyfill-provider" "^0.2.2"
     semver "^6.1.1"
 
-babel-plugin-polyfill-corejs3@^0.1.3:
-  version "0.1.4"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.1.4.tgz#2ae290200e953bade30907b7a3bebcb696e6c59d"
-  integrity sha512-ysSzFn/qM8bvcDAn4mC7pKk85Y5dVaoa9h4u0mHxOEpDzabsseONhUpR7kHxpUinfj1bjU7mUZqD23rMZBoeSg==
+babel-plugin-polyfill-corejs3@^0.2.2:
+  version "0.2.3"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-corejs3/-/babel-plugin-polyfill-corejs3-0.2.3.tgz#72add68cf08a8bf139ba6e6dfc0b1d504098e57b"
+  integrity sha512-rCOFzEIJpJEAU14XCcV/erIf/wZQMmMT5l5vXOpL5uoznyOGfDIjPj6FVytMvtzaKSTSVKouOCTPJ5OMUZH30g==
   dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.1.2"
-    core-js-compat "^3.8.1"
+    "@babel/helper-define-polyfill-provider" "^0.2.2"
+    core-js-compat "^3.14.0"
 
-babel-plugin-polyfill-regenerator@^0.1.2:
-  version "0.1.3"
-  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.1.3.tgz#350f857225fc640ae1ec78d1536afcbb457db841"
-  integrity sha512-hRjTJQiOYt/wBKEc+8V8p9OJ9799blAJcuKzn1JXh3pApHoWl1Emxh2BHc6MC7Qt6bbr3uDpNxaYQnATLIudEg==
+babel-plugin-polyfill-regenerator@^0.2.2:
+  version "0.2.2"
+  resolved "https://registry.yarnpkg.com/babel-plugin-polyfill-regenerator/-/babel-plugin-polyfill-regenerator-0.2.2.tgz#b310c8d642acada348c1fa3b3e6ce0e851bee077"
+  integrity sha512-Goy5ghsc21HgPDFtzRkSirpZVW35meGoTmTOb2bxqdl60ghub4xOidgNTHaZfQ2FaxQsKmwvXtOAkcIS4SMBWg==
   dependencies:
-    "@babel/helper-define-polyfill-provider" "^0.1.2"
+    "@babel/helper-define-polyfill-provider" "^0.2.2"
 
 balanced-match@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.0.tgz#89b4d199ab2bee49de164ea02b89ce462d71b767"
-  integrity sha1-ibTRmasr7kneFk6gK4nORi1xt2c=
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/balanced-match/-/balanced-match-1.0.2.tgz#e83e3a7e3f300b34cb9d87f615fa0cbf357690ee"
+  integrity sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==
 
 base64-arraybuffer@0.1.4:
   version "0.1.4"
   resolved "https://registry.yarnpkg.com/base64-arraybuffer/-/base64-arraybuffer-0.1.4.tgz#9818c79e059b1355f97e0428a017c838e90ba812"
   integrity sha1-mBjHngWbE1X5fgQooBfIOOkLqBI=
 
-base64-js@^1.1.2, base64-js@^1.3.1:
+base64-js@^1.2.0, 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==
@@ -2889,10 +3157,10 @@ bcryptjs@2.4.3:
   resolved "https://registry.yarnpkg.com/bcryptjs/-/bcryptjs-2.4.3.tgz#9ab5627b93e60621ff7cdac5da9733027df1d0cb"
   integrity sha1-mrVie5PmBiH/fNrF2pczAn3x0Ms=
 
-before-after-hook@^2.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==
+before-after-hook@^2.2.0:
+  version "2.2.2"
+  resolved "https://registry.yarnpkg.com/before-after-hook/-/before-after-hook-2.2.2.tgz#a6e8ca41028d90ee2c24222f201c90956091613e"
+  integrity sha512-3pZEU3NT5BFUo/AD5ERPWOgQOCZITni6iavr5AUw5AUwQjMlI0kzu5btnyD39AF0gUEsDPwJT+oY1ORBJijPjQ==
 
 big.js@^5.2.2:
   version "5.2.2"
@@ -2960,7 +3228,7 @@ bonjour@^3.5.0:
     multicast-dns "^6.0.1"
     multicast-dns-service-types "^1.1.0"
 
-boolbase@^1.0.0, boolbase@~1.0.0:
+boolbase@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/boolbase/-/boolbase-1.0.0.tgz#68dff5fbe60c51eb37725ea9e3ed310dcc1e776e"
   integrity sha1-aN/1++YMUes3cl6p4+0xDcwed24=
@@ -3011,13 +3279,6 @@ brfs@^1.4.0:
     static-module "^2.2.0"
     through2 "^2.0.0"
 
-brotli@^1.3.2:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/brotli/-/brotli-1.3.2.tgz#525a9cad4fcba96475d7d388f6aecb13eed52f46"
-  integrity sha1-UlqcrU/LqWR119OI9q7LE+7VL0Y=
-  dependencies:
-    base64-js "^1.1.2"
-
 browser-or-node@^1.2.1:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/browser-or-node/-/browser-or-node-1.3.0.tgz#f2a4e8568f60263050a6714b2cc236bb976647a7"
@@ -3028,16 +3289,16 @@ browser-process-hrtime@^1.0.0:
   resolved "https://registry.yarnpkg.com/browser-process-hrtime/-/browser-process-hrtime-1.0.0.tgz#3c9b4b7d782c8121e56f10106d84c0d0ffc94626"
   integrity sha512-9o5UecI3GhkpM6DrXr69PblIuWxPKk9Y0jHBRhdocZ2y7YECBFCsHm79Pr3OyR2AvjhDkabFJaDJMYRazHgsow==
 
-browserslist@*, browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.16.0, browserslist@^4.16.1, browserslist@^4.16.3, browserslist@^4.6.4, 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==
+browserslist@*, browserslist@^4.0.0, browserslist@^4.12.0, browserslist@^4.14.5, browserslist@^4.16.0, browserslist@^4.16.1, browserslist@^4.16.6, browserslist@^4.6.4, browserslist@^4.9.1:
+  version "4.16.6"
+  resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.16.6.tgz#d7901277a5a88e554ed305b183ec9b0c08f66fa2"
+  integrity sha512-Wspk/PqO+4W9qp5iUTJsa1B/QrYn1keNCcEP5OvP7WBwT4KaDly0uONYmC6Xa3Z5IqnUgS0KcgLYu1l74x0ZXQ==
   dependencies:
-    caniuse-lite "^1.0.30001181"
-    colorette "^1.2.1"
-    electron-to-chromium "^1.3.649"
+    caniuse-lite "^1.0.30001219"
+    colorette "^1.2.2"
+    electron-to-chromium "^1.3.723"
     escalade "^3.1.1"
-    node-releases "^1.1.70"
+    node-releases "^1.1.71"
 
 browserstack@^1.5.1:
   version "1.6.1"
@@ -3115,46 +3376,23 @@ c8@~7.5.0:
   integrity sha512-GSkLsbvDr+FIwjNSJ8OwzWAyuznEYGTAd1pzb/Kr0FMLuV4vqYJTyjboDTwmlUNAG6jAU3PFWzqIdKrOt1D8tw==
   dependencies:
     "@bcoe/v8-coverage" "^0.2.3"
-    "@istanbuljs/schema" "^0.1.2"
-    find-up "^5.0.0"
-    foreground-child "^2.0.0"
-    furi "^2.0.0"
-    istanbul-lib-coverage "^3.0.0"
-    istanbul-lib-report "^3.0.0"
-    istanbul-reports "^3.0.2"
-    rimraf "^3.0.0"
-    test-exclude "^6.0.0"
-    v8-to-istanbul "^7.1.0"
-    yargs "^16.0.0"
-    yargs-parser "^20.0.0"
-
-cacache@15.0.6:
-  version "15.0.6"
-  resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.0.6.tgz#65a8c580fda15b59150fb76bf3f3a8e45d583099"
-  integrity sha512-g1WYDMct/jzW+JdWEyjaX2zoBkZ6ZT9VpOyp2I/VMtDsNLffNat3kqPFfi1eDRSK9/SuKGyORDHcQMcPF8sQ/w==
-  dependencies:
-    "@npmcli/move-file" "^1.0.1"
-    chownr "^2.0.0"
-    fs-minipass "^2.0.0"
-    glob "^7.1.4"
-    infer-owner "^1.0.4"
-    lru-cache "^6.0.0"
-    minipass "^3.1.1"
-    minipass-collect "^1.0.2"
-    minipass-flush "^1.0.5"
-    minipass-pipeline "^1.2.2"
-    mkdirp "^1.0.3"
-    p-map "^4.0.0"
-    promise-inflight "^1.0.1"
-    rimraf "^3.0.2"
-    ssri "^8.0.1"
-    tar "^6.0.2"
-    unique-filename "^1.1.1"
+    "@istanbuljs/schema" "^0.1.2"
+    find-up "^5.0.0"
+    foreground-child "^2.0.0"
+    furi "^2.0.0"
+    istanbul-lib-coverage "^3.0.0"
+    istanbul-lib-report "^3.0.0"
+    istanbul-reports "^3.0.2"
+    rimraf "^3.0.0"
+    test-exclude "^6.0.0"
+    v8-to-istanbul "^7.1.0"
+    yargs "^16.0.0"
+    yargs-parser "^20.0.0"
 
-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==
+cacache@15.2.0, cacache@^15.0.5, cacache@^15.0.6, cacache@^15.2.0:
+  version "15.2.0"
+  resolved "https://registry.yarnpkg.com/cacache/-/cacache-15.2.0.tgz#73af75f77c58e72d8c630a7a2858cb18ef523389"
+  integrity sha512-uKoJSHmnrqXgthDFx/IU6ED/5xd+NNGe+Bb+kLZy7Ku4P+BaiWEUflAKPZ7eAzsYGcsAGASJZsybXp+quEcHTw==
   dependencies:
     "@npmcli/move-file" "^1.0.1"
     chownr "^2.0.0"
@@ -3170,7 +3408,7 @@ cacache@^15.0.5:
     p-map "^4.0.0"
     promise-inflight "^1.0.1"
     rimraf "^3.0.2"
-    ssri "^8.0.0"
+    ssri "^8.0.1"
     tar "^6.0.2"
     unique-filename "^1.1.1"
 
@@ -3198,16 +3436,16 @@ cacheable-lookup@^2.0.0:
     keyv "^4.0.0"
 
 cacheable-request@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-7.0.1.tgz#062031c2856232782ed694a257fa35da93942a58"
-  integrity sha512-lt0mJ6YAnsrBErpTMWeu5kl/tg9xMAWjavYTN6VQXM1A/teBITuNcccXsCxF0tDQQJf9DfAaX5O4e0zp0KlfZw==
+  version "7.0.2"
+  resolved "https://registry.yarnpkg.com/cacheable-request/-/cacheable-request-7.0.2.tgz#ea0d0b889364a25854757301ca12b2da77f91d27"
+  integrity sha512-pouW8/FmiPQbuGpkXQ9BAPv/Mo5xDGANgSNXzTzJ8DrKGuXOssM4wIQRjfanNRh3Yu5cfYPvcorqbhg2KIJtew==
   dependencies:
     clone-response "^1.0.2"
     get-stream "^5.1.0"
     http-cache-semantics "^4.0.0"
     keyv "^4.0.0"
     lowercase-keys "^2.0.0"
-    normalize-url "^4.1.0"
+    normalize-url "^6.0.1"
     responselike "^2.0.0"
 
 call-bind@^1.0.0, call-bind@^1.0.2:
@@ -3218,38 +3456,11 @@ call-bind@^1.0.0, call-bind@^1.0.2:
     function-bind "^1.1.1"
     get-intrinsic "^1.0.2"
 
-caller-callsite@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/caller-callsite/-/caller-callsite-2.0.0.tgz#847e0fce0a223750a9a027c54b33731ad3154134"
-  integrity sha1-hH4PzgoiN1CpoCfFSzNzGtMVQTQ=
-  dependencies:
-    callsites "^2.0.0"
-
-caller-path@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/caller-path/-/caller-path-2.0.0.tgz#468f83044e369ab2010fac5f06ceee15bb2cb1f4"
-  integrity sha1-Ro+DBE42mrIBD6xfBs7uFbsssfQ=
-  dependencies:
-    caller-callsite "^2.0.0"
-
-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=
-
 callsites@^3.0.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/callsites/-/callsites-3.1.0.tgz#b3630abd8943432f54b3f0519238e33cd7df2f73"
   integrity sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==
 
-camelcase-keys@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-2.1.0.tgz#308beeaffdf28119051efa1d932213c91b8f92e7"
-  integrity sha1-MIvur/3ygRkFHvodkyITyRuPkuc=
-  dependencies:
-    camelcase "^2.0.0"
-    map-obj "^1.0.0"
-
 camelcase-keys@^6.2.2:
   version "6.2.2"
   resolved "https://registry.yarnpkg.com/camelcase-keys/-/camelcase-keys-6.2.2.tgz#5e755d6ba51aa223ec7d3d52f25778210f9dc3c0"
@@ -3259,21 +3470,11 @@ camelcase-keys@^6.2.2:
     map-obj "^4.0.0"
     quick-lru "^4.0.1"
 
-camelcase@5.3.1, camelcase@^5.0.0, 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@^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"
   resolved "https://registry.yarnpkg.com/caniuse-api/-/caniuse-api-3.0.0.tgz#5e4d90e2274961d46291997df599e3ed008ee4c0"
@@ -3284,10 +3485,10 @@ caniuse-api@^3.0.0:
     lodash.memoize "^4.1.2"
     lodash.uniq "^4.5.0"
 
-caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001032, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001181:
-  version "1.0.30001187"
-  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001187.tgz#5706942631f83baa5a0218b7dfa6ced29f845438"
-  integrity sha512-w7/EP1JRZ9552CyrThUnay2RkZ1DXxKe/Q2swTC4+LElLh9RRYrL1Z+27LlakB8kzY0fSmHw9mc7XYDUKAKWMA==
+caniuse-lite@^1.0.0, caniuse-lite@^1.0.30000981, caniuse-lite@^1.0.30001032, caniuse-lite@^1.0.30001109, caniuse-lite@^1.0.30001219:
+  version "1.0.30001247"
+  resolved "https://registry.yarnpkg.com/caniuse-lite/-/caniuse-lite-1.0.30001247.tgz#105be7a8fb30cdd303275e769a9dfb87d4b3577a"
+  integrity sha512-4rS7co+7+AoOSPRPOPUt5/GdaqZc0EsUpWk66ofE3HJTAajUK2Ss2VwoNzVN69ghg8lYYlh0an0Iy4LIHHo9UQ==
 
 canonical-path@1.0.0:
   version "1.0.0"
@@ -3310,7 +3511,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.3.0, chalk@^2.3.1, chalk@^2.4.1, chalk@^2.4.2:
+chalk@^2.0.0, chalk@^2.3.0, 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==
@@ -3319,10 +3520,10 @@ chalk@^2.0.0, chalk@^2.3.0, chalk@^2.3.1, chalk@^2.4.1, chalk@^2.4.2:
     escape-string-regexp "^1.0.5"
     supports-color "^5.3.0"
 
-chalk@^4.0.0, chalk@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.0.tgz#4e14870a618d9e2edd97dd8345fd9d9dc315646a"
-  integrity sha512-qwx12AxXe2Q5xQ43Ac//I6v5aXTipYrSESdOgzrN+9XjgEpyjpKuvSGaN4qE93f7TQTlerQQ8S+EQ0EyDoVL1A==
+chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1:
+  version "4.1.2"
+  resolved "https://registry.yarnpkg.com/chalk/-/chalk-4.1.2.tgz#aac4e2b7734a740867aeb16bf02aad556a1e7a01"
+  integrity sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==
   dependencies:
     ansi-styles "^4.1.0"
     supports-color "^7.1.0"
@@ -3332,20 +3533,20 @@ 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.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==
+"chokidar@>=3.0.0 <4.0.0", chokidar@^3.0.0, chokidar@^3.5.1:
+  version "3.5.2"
+  resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.2.tgz#dba3976fcadb016f66fd365021d91600d01c1e75"
+  integrity sha512-ekGhOnNVPgT77r4K/U3GDhu+FQ2S8TnK/s2KbIGXi0SZWuwkZ2QNyfWdZW+TVfn84DpEP7rLeCt2UI6bJ8GwbQ==
   dependencies:
-    anymatch "~3.1.1"
+    anymatch "~3.1.2"
     braces "~3.0.2"
-    glob-parent "~5.1.0"
+    glob-parent "~5.1.2"
     is-binary-path "~2.1.0"
     is-glob "~4.0.1"
     normalize-path "~3.0.0"
-    readdirp "~3.5.0"
+    readdirp "~3.6.0"
   optionalDependencies:
-    fsevents "~2.3.1"
+    fsevents "~2.3.2"
 
 chokidar@^2.1.8:
   version "2.1.8"
@@ -3377,11 +3578,9 @@ chownr@^2.0.0:
   integrity sha512-bIomtDF5KGpdogkLd9VspvFzk9KfpyyGlS8YFVZl7TGPBHL5snIOnxeshwVgPteQ9b4Eydl+pVbIyE1DcvCWgQ==
 
 chrome-trace-event@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.2.tgz#234090ee97c7d4ad1a2c4beae27505deffc608a4"
-  integrity sha512-9e/zx1jw7B4CO+c/RXoCsfg/x1AfUBioy4owYH0bJprEYAx5hRFLRhWBqHAG57D0ZM4H7vxbP7bPe0VwhQRYDQ==
-  dependencies:
-    tslib "^1.9.0"
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/chrome-trace-event/-/chrome-trace-event-1.0.3.tgz#1015eced4741e15d06664a957dbbf50d041e26ac"
+  integrity sha512-p3KULyQg4S7NIHixdwbGX+nFHkoBiA4YQmyWtjb8XngSKV124nJmRysgAeujbUVb15vh+RvFUfCPqU7rXk+hZg==
 
 circular-dependency-plugin@5.2.2:
   version "5.2.2"
@@ -3428,21 +3627,21 @@ cli-progress@^3.7.0:
     string-width "^4.2.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==
+  version "2.6.0"
+  resolved "https://registry.yarnpkg.com/cli-spinners/-/cli-spinners-2.6.0.tgz#36c7dc98fb6a9a76bd6238ec3f77e2425627e939"
+  integrity sha512-t+4/y50K/+4xcCRosKkA7W4gTr1MySvLV0q+PxmG7FJ5g+66ChKurYjxBCjHggHH3HA5Hh9cy+lcUGWDqVH+4Q==
 
 cli-width@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/cli-width/-/cli-width-3.0.0.tgz#a2f48437a2caa9a22436e794bf071ec9e61cedf6"
   integrity sha512-FxqpkPPwu1HjuN93Omfm4h8uIanXofW0RxVEW3k5RKx+mJJYSthzNhp32Kzxxy3YAEZ/Dc/EWN1vZRY0+kOhbw==
 
-clipanion@3.0.0-rc.11:
-  version "3.0.0-rc.11"
-  resolved "https://registry.yarnpkg.com/clipanion/-/clipanion-3.0.0-rc.11.tgz#390f93b91b9a6e2018c1cc8670b6a3b043203897"
-  integrity sha512-e0GyZXjprnxRuls/pHH0cqAgKtpiceQy8PztEZP9fdnkMxuo05D5en9fx60Iiqqjge8pmrMfsiglueS8SWmlgg==
+clipanion@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/clipanion/-/clipanion-3.0.0.tgz#efe35d17f46d9cf71be5eb11c36e9a05caa6cf68"
+  integrity sha512-Ae2/PVkgMM/EbiGugE0p0QcjXyuh5hP+yzpJYaIElQ0g0kkuQKEHuYkLyk4K8gNkO1KKlHZ6UWgxRaTOMtmiLw==
   dependencies:
-    typanion "^3.3.0"
+    typanion "^3.3.1"
 
 cliui@^5.0.0:
   version "5.0.0"
@@ -3492,24 +3691,10 @@ clone@^1.0.2:
   resolved "https://registry.yarnpkg.com/clone/-/clone-1.0.4.tgz#da309cc263df15994c688ca902179ca3c7cd7c7e"
   integrity sha1-2jCcwmPfFZlMaIypAheco8fNfH4=
 
-coa@^2.0.2:
-  version "2.0.2"
-  resolved "https://registry.yarnpkg.com/coa/-/coa-2.0.2.tgz#43f6c21151b4ef2bf57187db0d73de229e3e7ec3"
-  integrity sha512-q5/jG+YQnSy4nRTV4F7lPepBJZ8qBNJJDBuJdoejDyLXgmL7IEo+Le2JDZudFTFt7mrCqIRaSjws4ygRCTCAXA==
-  dependencies:
-    "@types/q" "^1.5.1"
-    chalk "^2.4.1"
-    q "^1.1.2"
-
-code-point-at@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
-  integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
-
 codelyzer@^6.0.0:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/codelyzer/-/codelyzer-6.0.1.tgz#c0e9668e847255b37c759e68fb2700b11e277d0f"
-  integrity sha512-cOyGQgMdhnRYtW2xrJUNrNYDjEgwQ+BrE2y93Bwz3h4DJ6vJRLfupemU5N3pbYsUlBHJf0u1j1UGk+NLW4d97g==
+  version "6.0.2"
+  resolved "https://registry.yarnpkg.com/codelyzer/-/codelyzer-6.0.2.tgz#25d72eae641e8ff13ffd7d99b27c9c7ad5d7e135"
+  integrity sha512-v3+E0Ucu2xWJMOJ2fA/q9pDT/hlxHftHGPUay1/1cTgyPV5JTHFdO9hqo837Sx2s9vKBMTt5gO+lhF95PO6J+g==
   dependencies:
     "@angular/compiler" "9.0.0"
     "@angular/core" "9.0.0"
@@ -3539,7 +3724,7 @@ collection-visit@^1.0.0:
     map-visit "^1.0.0"
     object-visit "^1.0.0"
 
-color-convert@^1.9.0, color-convert@^1.9.1:
+color-convert@^1.9.0:
   version "1.9.3"
   resolved "https://registry.yarnpkg.com/color-convert/-/color-convert-1.9.3.tgz#bb71850690e1f136567de629d2d5471deda4c1e8"
   integrity sha512-QfAUtd+vFdAtFQcC8CCyYt1fYWxSqAiK2cSD6zDB8N3cpsEBAvRxp9zOGg6G/SHHJYAT88/az/IuDGALsNVbGg==
@@ -3558,33 +3743,22 @@ color-name@1.1.3:
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
   integrity sha1-p9BVi9icQveV3UIyj3QIMcpTvCU=
 
-color-name@^1.0.0, color-name@~1.1.4:
+color-name@~1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/color-name/-/color-name-1.1.4.tgz#c2a09a87acbde69543de6f63fa3995c826c536a2"
   integrity sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==
 
-color-string@^1.5.4:
-  version "1.5.4"
-  resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.5.4.tgz#dd51cd25cfee953d138fe4002372cc3d0e504cb6"
-  integrity sha512-57yF5yt8Xa3czSEW1jfQDE79Idk0+AkN/4KWad6tbdxUmAs3MvjxlWSWD4deYytcRfoZ9nhKyFl1kj5tBvidbw==
-  dependencies:
-    color-name "^1.0.0"
-    simple-swizzle "^0.2.2"
-
-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==
-  dependencies:
-    color-convert "^1.9.1"
-    color-string "^1.5.4"
+color-support@^1.1.2:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/color-support/-/color-support-1.1.3.tgz#93834379a1cc9a0c61f82f52f0d04322251bd5a2"
+  integrity sha512-qiBjkpbMLO/HL68y+lh4q0/O1MZFj2RX6X/KmMa3+gJD3z+WwI1ZzDHysvqHGS3mP6mznPckpXmw1nI9cJjyRg==
 
-colorette@^1.2.1:
-  version "1.2.1"
-  resolved "https://registry.yarnpkg.com/colorette/-/colorette-1.2.1.tgz#4d0b921325c14faf92633086a536db6e89564b1b"
-  integrity sha512-puCDz0CzydiSYOrnXpz/PKd69zRrribezjtE9yd4zvytoRc8+RY/KJPvtPFKZS3E3wP6neGyMe0vOTlHO5L3Pw==
+colord@^2.0.1:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/colord/-/colord-2.4.0.tgz#21a7b969ded0f7131bbf38fc64fc038c3b592de5"
+  integrity sha512-2306/NeTDOykDwvFQK0ctnP+9I5KQdqVm+IJAM6MsAr4vvy1llAdJyax4YmZoqTxdJ/lvRBwR8MqyJi/tupBAw==
 
-colorette@^1.2.2:
+colorette@^1.2.1, 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==
@@ -3594,6 +3768,11 @@ colors@1.4.0, colors@^1.1.2, colors@^1.4.0:
   resolved "https://registry.yarnpkg.com/colors/-/colors-1.4.0.tgz#c50491479d4c1bdaed2c9ced32cf7c7dc2360f78"
   integrity sha512-a+UqTh4kgZg/SlGvfbzDHpgRu7AAQOmmqRHJnxhRZICKFUT91brVhNNt58CMWU9PsBbv3PDCZUHbVxuDiH2mtA==
 
+colors@~1.2.1:
+  version "1.2.5"
+  resolved "https://registry.yarnpkg.com/colors/-/colors-1.2.5.tgz#89c7ad9a374bc030df8013241f68136ed8835afc"
+  integrity sha512-erNRLao/Y3Fv54qUa0LBB+//Uf3YwMUmdJinN20yMXm9zdKKqH9wt7R9IIVZ+K7ShzfpLV/Zg8+VyrBJYB4lpg==
+
 combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6:
   version "1.0.8"
   resolved "https://registry.yarnpkg.com/combined-stream/-/combined-stream-1.0.8.tgz#c3d45a8b34fd730631a110a8a2520682b31d5a7f"
@@ -3601,21 +3780,21 @@ combined-stream@^1.0.6, combined-stream@^1.0.8, combined-stream@~1.0.6:
   dependencies:
     delayed-stream "~1.0.0"
 
-commander@^2.11.0, commander@^2.12.1, commander@^2.20.0:
+commander@^2.11.0, commander@^2.12.1, commander@^2.20.0, commander@^2.7.1:
   version "2.20.3"
   resolved "https://registry.yarnpkg.com/commander/-/commander-2.20.3.tgz#fd485e84c03eb4881c20722ba48035e8531aeb33"
   integrity sha512-GpVkmM8vF2vQUkj2LvZmD35JxeJOLCwJ9cUkugyk2nuhbv3+mJvpLYYt+0+USMxE+oj+ey/lJEnhZw75x/OMcQ==
 
-commander@^7.0.0:
-  version "7.1.0"
-  resolved "https://registry.yarnpkg.com/commander/-/commander-7.1.0.tgz#f2eaecf131f10e36e07d894698226e36ae0eb5ff"
-  integrity sha512-pRxBna3MJe6HKnBGsDyMv8ETbptw3axEdYHoqNh7gu5oDcew8fs0xnivZGm06Ogk8zGAJ9VX+OPEr2GXEQK4dg==
-
 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==
 
+commander@^8.0.0:
+  version "8.0.0"
+  resolved "https://registry.yarnpkg.com/commander/-/commander-8.0.0.tgz#1da2139548caef59bd23e66d18908dfb54b02258"
+  integrity sha512-Xvf85aAtu6v22+E5hfVoLHqyul/jyxh91zvqk/ioJTQuJR7Z78n7H558vMPKanPSRgIEeZemT92I2g9Y8LPbSQ==
+
 common-tags@^1.8.0:
   version "1.8.0"
   resolved "https://registry.yarnpkg.com/common-tags/-/common-tags-1.8.0.tgz#8e3153e542d4a39e9b10554434afaaf98956a937"
@@ -3626,26 +3805,11 @@ commondir@^1.0.1:
   resolved "https://registry.yarnpkg.com/commondir/-/commondir-1.0.1.tgz#ddd800da0c66127393cca5950ea968a3aaf1253b"
   integrity sha1-3dgA2gxmEnOTzKWVDqloo6rxJTs=
 
-compare-func@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/compare-func/-/compare-func-2.0.0.tgz#fb65e75edbddfd2e568554e8b5b05fff7a51fcb3"
-  integrity sha512-zHig5N+tPWARooBnb0Zx1MFcdfpyJrfTJ3Y5L+IFvUm8rM74hHz66z0gw0x4tijh5CorKkKUCnW82R2vmpeCRA==
-  dependencies:
-    array-ify "^1.0.0"
-    dot-prop "^5.1.0"
-
 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==
 
-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"
@@ -3671,7 +3835,7 @@ concat-map@0.0.1:
   resolved "https://registry.yarnpkg.com/concat-map/-/concat-map-0.0.1.tgz#d8a96bd77fd68df7793a73036a3ba0d5405d477b"
   integrity sha1-2Klr13/Wjfd5OnMDajug1UBdR3s=
 
-concat-stream@^1.5.2, concat-stream@~1.6.0:
+concat-stream@~1.6.0:
   version "1.6.2"
   resolved "https://registry.yarnpkg.com/concat-stream/-/concat-stream-1.6.2.tgz#904bdf194cd3122fc675c77fc4ac3d4ff0fd1a34"
   integrity sha512-27HBghJxjiZtIk3Ycvn/4kbJk/1uZuJFfuPEns6LaEvpvG1f0hTea8lilrouyo9mVc2GWdcEZ8OLoGmSADlrCw==
@@ -3696,7 +3860,7 @@ connect@^3.7.0:
     parseurl "~1.3.3"
     utils-merge "1.0.1"
 
-console-control-strings@^1.0.0, console-control-strings@~1.1.0:
+console-control-strings@^1.0.0, console-control-strings@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/console-control-strings/-/console-control-strings-1.1.0.tgz#3d7cf4464db6446ea644bf4b39507f9851008e8e"
   integrity sha1-PXz0Rk22RG6mRL9LOVB/mFEAjo4=
@@ -3713,154 +3877,7 @@ 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.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.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.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.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.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.18"
-    conventional-commits-parser "^3.2.0"
-    dateformat "^3.0.0"
-    get-pkg-repo "^1.0.0"
-    git-raw-commits "^2.0.8"
-    git-remote-origin-url "^2.0.0"
-    git-semver-tags "^4.1.1"
-    lodash "^4.17.15"
-    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 "^4.0.0"
-
-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.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.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.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.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"
-
-conventional-changelog-preset-loader@^2.3.4:
-  version "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.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.7"
-    dateformat "^3.0.0"
-    handlebars "^4.7.6"
-    json-stringify-safe "^5.0.1"
-    lodash "^4.17.15"
-    meow "^8.0.0"
-    semver "^6.0.0"
-    split "^1.0.0"
-    through2 "^4.0.0"
-
-conventional-changelog@^3.0.0:
-  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.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.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 "^8.0.0"
-    split2 "^2.0.0"
-    through2 "^4.0.0"
-    trim-off-newlines "^1.0.0"
-
-conventional-commits-parser@^3.2.1:
+conventional-commits-parser@^3.0.0, conventional-commits-parser@^3.2.1:
   version "3.2.1"
   resolved "https://registry.yarnpkg.com/conventional-commits-parser/-/conventional-commits-parser-3.2.1.tgz#ba44f0b3b6588da2ee9fd8da508ebff50d116ce2"
   integrity sha512-OG9kQtmMZBJD/32NEw5IhN5+HnBqVjy03eC+I71I0oQRFA5rOgA4OtPOYG7mz1GkCfCNxn3gKIX8EiHJYuf1cA==
@@ -3873,18 +3890,13 @@ conventional-commits-parser@^3.2.1:
     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:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.7.0.tgz#17a2cb882d7f77d3490585e2ce6c524424a3a442"
-  integrity sha512-4FJkXzKXEDB1snCFZlLP4gpC3JILicCpGbzG9f9G7tGqGCzETQ2hWPrcinA9oU4wtf2biUaEH5065UnMeR33oA==
+convert-source-map@^1.5.1, convert-source-map@^1.6.0, convert-source-map@^1.7.0:
+  version "1.8.0"
+  resolved "https://registry.yarnpkg.com/convert-source-map/-/convert-source-map-1.8.0.tgz#f3373c32d21b4d780dd8004514684fb791ca4369"
+  integrity sha512-+OQdjP49zViI/6i7nIJpA8rAl4sV/JdPfU9nZs3VqOwGIgizICvuN2ru6fMd+4llL0tar18UYJXfZ/TWtmhUjA==
   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"
@@ -3920,31 +3932,31 @@ 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@8.1.1:
-  version "8.1.1"
-  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-8.1.1.tgz#3f697e162764925c2f0d235f380676125508fd26"
-  integrity sha512-rYM2uzRxrLRpcyPqGceRBDpxxUV8vcDqIKxAUKfcnFpcrPxT5+XvhTxv7XLjo5AvEJFPdAE3zCogG2JVahqgSQ==
+copy-webpack-plugin@9.0.1:
+  version "9.0.1"
+  resolved "https://registry.yarnpkg.com/copy-webpack-plugin/-/copy-webpack-plugin-9.0.1.tgz#b71d21991599f61a4ee00ba79087b8ba279bbb59"
+  integrity sha512-14gHKKdYIxF84jCEgPgYXCPpldbwpxxLbCmA7LReY7gvbaT555DgeBWBgBZM116tv/fO6RRJrsivBqRyRlukhw==
   dependencies:
     fast-glob "^3.2.5"
-    glob-parent "^5.1.1"
+    glob-parent "^6.0.0"
     globby "^11.0.3"
     normalize-path "^3.0.0"
     p-limit "^3.1.0"
     schema-utils "^3.0.0"
-    serialize-javascript "^5.0.1"
+    serialize-javascript "^6.0.0"
 
-core-js-compat@^3.8.1, core-js-compat@^3.9.0:
-  version "3.9.0"
-  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.9.0.tgz#29da39385f16b71e1915565aa0385c4e0963ad56"
-  integrity sha512-YK6fwFjCOKWwGnjFUR3c544YsnA/7DoLL0ysncuOJ4pwbriAtOpvM2bygdlcXbvQCQZ7bBU9CL4t7tGl7ETRpQ==
+core-js-compat@^3.14.0, core-js-compat@^3.15.0:
+  version "3.15.2"
+  resolved "https://registry.yarnpkg.com/core-js-compat/-/core-js-compat-3.15.2.tgz#47272fbb479880de14b4e6081f71f3492f5bd3cb"
+  integrity sha512-Wp+BJVvwopjI+A1EFqm2dwUmWYXrvucmtIB2LgXn/Rb+gWPKYxtmb4GKHGKG/KGF1eK9jfjzT38DITbTOCX/SQ==
   dependencies:
-    browserslist "^4.16.3"
+    browserslist "^4.16.6"
     semver "7.0.0"
 
-core-js@3.10.1:
-  version "3.10.1"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.10.1.tgz#e683963978b6806dcc6c0a4a8bd4ab0bdaf3f21a"
-  integrity sha512-pwCxEXnj27XG47mu7SXAwhLP3L5CrlvCB91ANUkIz40P27kUcvNfSdvyZJ9CLHiVoKSp+TTChMQMSKQEH/IQxA==
+core-js@3.16.0:
+  version "3.16.0"
+  resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.16.0.tgz#1d46fb33720bc1fa7f90d20431f36a5540858986"
+  integrity sha512-5+5VxRFmSf97nM8Jr2wzOwLqRo6zphH2aX+7KsAUONObyzakDNq2G/bgbhinxB4PoV9L3aXQYhiDKyIKWd2c8g==
 
 core-util-is@1.0.2, core-util-is@~1.0.0:
   version "1.0.2"
@@ -3959,16 +3971,6 @@ cors@2.8.5, 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"
@@ -3985,15 +3987,16 @@ create-require@^1.1.0:
   resolved "https://registry.yarnpkg.com/create-require/-/create-require-1.1.1.tgz#c1d7e8f1e5f6cfc9ff65f9cd352d37348756c333"
   integrity sha512-dcKFX3jn0MpIaXjisoRvexIJVEKzaq7z2rZKxf+MSr9TkdmHmsU4m2lcLojrj/FHl8mk5VxMmYA+ftRkP/3oKQ==
 
-critters@0.0.10:
-  version "0.0.10"
-  resolved "https://registry.yarnpkg.com/critters/-/critters-0.0.10.tgz#edd0e962fc5af6c4adb6dbf1a71bae2d3f917000"
-  integrity sha512-p5VKhP1803+f+0Jq5P03w1SbiHtpAKm+1EpJHkiPxQPq0Vu9QLZHviJ02GRrWi0dlcJqrmzMWInbwp4d22RsGw==
+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 "^3.0.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:
@@ -4007,7 +4010,7 @@ cross-spawn@^6.0.0:
     shebang-command "^1.2.0"
     which "^1.2.9"
 
-cross-spawn@^7.0.0:
+cross-spawn@^7.0.0, cross-spawn@^7.0.2:
   version "7.0.3"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-7.0.3.tgz#f73a85b9d5d41d045551c177e2882d4ac85728a6"
   integrity sha512-iRDPJKUPVEND7dHPO8rkbOnPpyDygcDFtWjpeWNCgy8WP2rXcxXL8TskReQl6OrB2G7+UJrags1q15Fudc7G6w==
@@ -4023,7 +4026,7 @@ css-blank-pseudo@^0.1.4:
   dependencies:
     postcss "^7.0.5"
 
-css-color-names@0.0.4, css-color-names@^0.0.4:
+css-color-names@^0.0.4:
   version "0.0.4"
   resolved "https://registry.yarnpkg.com/css-color-names/-/css-color-names-0.0.4.tgz#808adc2e79cf84738069b646cb20ec27beb629e0"
   integrity sha1-gIrcLnnPhHOAabZGyyDsJ762KeA=
@@ -4033,19 +4036,11 @@ css-color-names@^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"
-  integrity sha512-BcxQSKTSEEQUftYpBVnsH4SF05NTuBokb19/sBt6asXGKZ/6VP7PLG1CBCkFDYOnhXhPh0jMhO6xZ71oYHXHBA==
+css-declaration-sorter@^6.0.3:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/css-declaration-sorter/-/css-declaration-sorter-6.1.1.tgz#77b32b644ba374bc562c0fc6f4fdaba4dfb0b749"
+  integrity sha512-BZ1aOuif2Sb7tQYY1GeCjG7F++8ggnwUkH5Ictw0mrdpqpEd+zWmcPdstnH2TItlb74FqR0DrVEieon221T/1Q==
   dependencies:
-    postcss "^7.0.1"
     timsort "^0.3.0"
 
 css-has-pseudo@^0.10.0:
@@ -4056,23 +4051,32 @@ css-has-pseudo@^0.10.0:
     postcss "^7.0.6"
     postcss-selector-parser "^5.0.0-rc.4"
 
-css-loader@5.2.1:
-  version "5.2.1"
-  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-5.2.1.tgz#15fbd5b6ac4c1b170a098f804c5abd0722f2aa73"
-  integrity sha512-YCyRzlt/jgG1xanXZDG/DHqAueOtXFHeusP9TS478oP1J++JSKOyEgGW1GHVoCj/rkS+GWOlBwqQJBr9yajQ9w==
+css-loader@6.2.0:
+  version "6.2.0"
+  resolved "https://registry.yarnpkg.com/css-loader/-/css-loader-6.2.0.tgz#9663d9443841de957a3cb9bcea2eda65b3377071"
+  integrity sha512-/rvHfYRjIpymZblf49w8jYcRo2y9gj6rV8UroHGmBxKrIyGLokpycyKzp9OkitvqT29ZSpzJ0Ic7SpnJX3sC8g==
   dependencies:
-    camelcase "^6.2.0"
-    cssesc "^3.0.0"
     icss-utils "^5.1.0"
-    loader-utils "^2.0.0"
-    postcss "^8.2.8"
+    postcss "^8.2.15"
     postcss-modules-extract-imports "^3.0.0"
     postcss-modules-local-by-default "^4.0.0"
     postcss-modules-scope "^3.0.0"
     postcss-modules-values "^4.0.0"
     postcss-value-parser "^4.1.0"
+    semver "^7.3.5"
+
+css-minimizer-webpack-plugin@3.0.2:
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/css-minimizer-webpack-plugin/-/css-minimizer-webpack-plugin-3.0.2.tgz#8fadbdf10128cb40227bff275a4bb47412534245"
+  integrity sha512-B3I5e17RwvKPJwsxjjWcdgpU/zqylzK1bPVghcmpFHRL48DXiBgrtqz1BJsn68+t/zzaLp9kYAaEDvQ7GyanFQ==
+  dependencies:
+    cssnano "^5.0.6"
+    jest-worker "^27.0.2"
+    p-limit "^3.0.2"
+    postcss "^8.3.5"
     schema-utils "^3.0.0"
-    semver "^7.3.4"
+    serialize-javascript "^6.0.0"
+    source-map "^0.6.1"
 
 css-parse@~2.0.0:
   version "2.0.0"
@@ -4088,30 +4092,15 @@ css-prefers-color-scheme@^3.1.1:
   dependencies:
     postcss "^7.0.5"
 
-css-select-base-adapter@^0.1.1:
-  version "0.1.1"
-  resolved "https://registry.yarnpkg.com/css-select-base-adapter/-/css-select-base-adapter-0.1.1.tgz#3b2ff4972cc362ab88561507a95408a1432135d7"
-  integrity sha512-jQVeeRG70QI08vSTwf1jHxp74JoZsr2XSgETae8/xC8ovSnL2WF87GTLO86Sbwdt2lK4Umg4HnnwMO4YF3Ce7w==
-
-css-select@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/css-select/-/css-select-2.1.0.tgz#6a34653356635934a81baca68d0255432105dbef"
-  integrity sha512-Dqk7LQKpwLoH3VovzZnkzegqNSuAziQyNZUcrdDM401iY+R5NkGBXGmtO05/yaXQziALuPogeG0b7UAgjnTJTQ==
-  dependencies:
-    boolbase "^1.0.0"
-    css-what "^3.2.1"
-    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==
+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 "^4.0.0"
-    domhandler "^4.0.0"
-    domutils "^2.4.3"
+    css-what "^5.0.0"
+    domhandler "^4.2.0"
+    domutils "^2.6.0"
     nth-check "^2.0.0"
 
 css-selector-tokenizer@^0.7.1:
@@ -4122,31 +4111,18 @@ css-selector-tokenizer@^0.7.1:
     cssesc "^3.0.0"
     fastparse "^1.1.2"
 
-css-tree@1.0.0-alpha.37:
-  version "1.0.0-alpha.37"
-  resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.0.0-alpha.37.tgz#98bebd62c4c1d9f960ec340cf9f7522e30709a22"
-  integrity sha512-DMxWJg0rnz7UgxKT0Q1HU/L9BeJI0M6ksor0OgqOnF+aRCDWg/N2641HmVyU9KVIu0OVVWOb2IpC9A+BJRnejg==
-  dependencies:
-    mdn-data "2.0.4"
-    source-map "^0.6.1"
-
 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==
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/css-tree/-/css-tree-1.1.3.tgz#eb4870fb6fd7707327ec95c2ff2ab09b5e8db91d"
+  integrity sha512-tRpdppF7TRazZrjJ6v3stzv93qxRcSsFmW6cX0Zm2NVKpxE1WV1HblnghVv9TreireHkqI/VDEsfolRF1p6y7Q==
   dependencies:
     mdn-data "2.0.14"
     source-map "^0.6.1"
 
-css-what@^3.2.1:
-  version "3.4.2"
-  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.0.1"
+  resolved "https://registry.yarnpkg.com/css-what/-/css-what-5.0.1.tgz#3efa820131f4669a8ac2408f9c32e7c7de9f4cad"
+  integrity sha512-FYDTSHb/7KXsWICVsxdmiExPjCfRC4qRFBdVwv7Ax9hMnvMmEjP9RfxTEZ3qPZGmADDn2vAKSo9UcN1jKVYscg==
 
 css@^2.0.0:
   version "2.2.4"
@@ -4158,15 +4134,6 @@ css@^2.0.0:
     source-map-resolve "^0.5.2"
     urix "^0.1.0"
 
-css@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/css/-/css-3.0.0.tgz#4447a4d58fdd03367c516ca9f64ae365cee4aa5d"
-  integrity sha512-DG9pFfwOrzc+hawpmqX/dHYHJG+Bsdb0klhyi1sDneOgGOXy9wQIC8hzyVp1e4NRYDBdxcylvywPkkXCHAzTyQ==
-  dependencies:
-    inherits "^2.0.4"
-    source-map "^0.6.1"
-    source-map-resolve "^0.6.0"
-
 cssauron@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/cssauron/-/cssauron-1.4.0.tgz#a6602dff7e04a8306dc0db9a551e92e8b5662ad8"
@@ -4189,124 +4156,57 @@ cssesc@^3.0.0:
   resolved "https://registry.yarnpkg.com/cssesc/-/cssesc-3.0.0.tgz#37741919903b868565e1c09ea747445cd18983ee"
   integrity sha512-/Tb/JcjK111nNScGob5MNtsntNM1aCNUDipB/TkwZFhyDrrE47SOx/18wF2bbjgc3ZzCSKW1T5nt5EbFoAz/Vg==
 
-cssnano-preset-default@^4.0.7:
-  version "4.0.7"
-  resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-4.0.7.tgz#51ec662ccfca0f88b396dcd9679cdb931be17f76"
-  integrity sha512-x0YHHx2h6p0fCl1zY9L9roD7rnlltugGu7zXSKQx6k2rYw0Hi3IqxcoAGF7u9Q5w1nt7vK0ulxV8Lo+EvllGsA==
-  dependencies:
-    css-declaration-sorter "^4.0.1"
-    cssnano-util-raw-cache "^4.0.1"
-    postcss "^7.0.0"
-    postcss-calc "^7.0.1"
-    postcss-colormin "^4.0.3"
-    postcss-convert-values "^4.0.1"
-    postcss-discard-comments "^4.0.2"
-    postcss-discard-duplicates "^4.0.2"
-    postcss-discard-empty "^4.0.1"
-    postcss-discard-overridden "^4.0.1"
-    postcss-merge-longhand "^4.0.11"
-    postcss-merge-rules "^4.0.3"
-    postcss-minify-font-values "^4.0.2"
-    postcss-minify-gradients "^4.0.2"
-    postcss-minify-params "^4.0.2"
-    postcss-minify-selectors "^4.0.2"
-    postcss-normalize-charset "^4.0.1"
-    postcss-normalize-display-values "^4.0.2"
-    postcss-normalize-positions "^4.0.2"
-    postcss-normalize-repeat-style "^4.0.2"
-    postcss-normalize-string "^4.0.2"
-    postcss-normalize-timing-functions "^4.0.2"
-    postcss-normalize-unicode "^4.0.1"
-    postcss-normalize-url "^4.0.1"
-    postcss-normalize-whitespace "^4.0.2"
-    postcss-ordered-values "^4.1.2"
-    postcss-reduce-initial "^4.0.3"
-    postcss-reduce-transforms "^4.0.2"
-    postcss-svgo "^4.0.2"
-    postcss-unique-selectors "^4.0.1"
-
-cssnano-preset-default@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-5.0.0.tgz#94c03ecc1cb47ecdc23c0aea3ca05170ebbb7e33"
-  integrity sha512-zsLppqF7PxY6Tk+ghVx8djf4o1jIOu2GNufqy9lMxldt7gGpSy3FQ6jn7FCd5DZWCaBa7A/1/HVh8CK3BdFSJg==
+cssnano-preset-default@^5.1.3:
+  version "5.1.3"
+  resolved "https://registry.yarnpkg.com/cssnano-preset-default/-/cssnano-preset-default-5.1.3.tgz#caa54183a8c8df03124a9e23f374ab89df5a9a99"
+  integrity sha512-qo9tX+t4yAAZ/yagVV3b+QBKeLklQbmgR3wI7mccrDcR+bEk9iHgZN1E7doX68y9ThznLya3RDmR+nc7l6/2WQ==
   dependencies:
-    css-declaration-sorter "6.0.0"
-    cssnano-utils "^2.0.0"
+    css-declaration-sorter "^6.0.3"
+    cssnano-utils "^2.0.1"
     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.0"
-    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"
-  integrity sha1-7ToIKZ8h11dBsg87gfGU7UnMFQ8=
-
-cssnano-util-get-match@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/cssnano-util-get-match/-/cssnano-util-get-match-4.0.0.tgz#c0e4ca07f5386bb17ec5e52250b4f5961365156d"
-  integrity sha1-wOTKB/U4a7F+xeUiULT1lhNlFW0=
-
-cssnano-util-raw-cache@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/cssnano-util-raw-cache/-/cssnano-util-raw-cache-4.0.1.tgz#b26d5fd5f72a11dfe7a7846fb4c67260f96bf282"
-  integrity sha512-qLuYtWK2b2Dy55I8ZX3ky1Z16WYsx544Q0UWViebptpwn/xDBmog2TLg4f+DBMg1rJ6JDWtn96WHbOKDWt1WQA==
-  dependencies:
-    postcss "^7.0.0"
-
-cssnano-util-same-parent@^4.0.0:
-  version "4.0.1"
-  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-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==
+    postcss-colormin "^5.2.0"
+    postcss-convert-values "^5.0.1"
+    postcss-discard-comments "^5.0.1"
+    postcss-discard-duplicates "^5.0.1"
+    postcss-discard-empty "^5.0.1"
+    postcss-discard-overridden "^5.0.1"
+    postcss-merge-longhand "^5.0.2"
+    postcss-merge-rules "^5.0.2"
+    postcss-minify-font-values "^5.0.1"
+    postcss-minify-gradients "^5.0.1"
+    postcss-minify-params "^5.0.1"
+    postcss-minify-selectors "^5.1.0"
+    postcss-normalize-charset "^5.0.1"
+    postcss-normalize-display-values "^5.0.1"
+    postcss-normalize-positions "^5.0.1"
+    postcss-normalize-repeat-style "^5.0.1"
+    postcss-normalize-string "^5.0.1"
+    postcss-normalize-timing-functions "^5.0.1"
+    postcss-normalize-unicode "^5.0.1"
+    postcss-normalize-url "^5.0.2"
+    postcss-normalize-whitespace "^5.0.1"
+    postcss-ordered-values "^5.0.2"
+    postcss-reduce-initial "^5.0.1"
+    postcss-reduce-transforms "^5.0.1"
+    postcss-svgo "^5.0.2"
+    postcss-unique-selectors "^5.0.1"
+
+cssnano-utils@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/cssnano-utils/-/cssnano-utils-2.0.1.tgz#8660aa2b37ed869d2e2f22918196a9a8b6498ce2"
+  integrity sha512-i8vLRZTnEH9ubIyfdZCAdIdgnHAUeQeByEeQ2I7oTilvP9oHO6RScpeq3GsFUVqeB8uZgOQ9pw8utofNn32hhQ==
 
-cssnano@5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-5.0.1.tgz#ed4822c4a9212f22f6820717859c52a6b7f9cf5c"
-  integrity sha512-5WubEmKcK2cqw43DUAayRBiIlTdX7iX3ZowrWDVxSVcW3hyohVnbJ4K4mbnWtJp5rfJnUwHg5H4mDAGzmuCM3g==
+cssnano@^5.0.0, cssnano@^5.0.6:
+  version "5.0.7"
+  resolved "https://registry.yarnpkg.com/cssnano/-/cssnano-5.0.7.tgz#e81894bdf31aa01a0ca3d1d0eee47be18f7f3012"
+  integrity sha512-7C0tbb298hef3rq+TtBbMuezBQ9VrFtrQEsPNuBKNVgWny/67vdRsnq8EoNu7TRjAHURgYvWlRIpCUmcMZkRzw==
   dependencies:
-    cosmiconfig "^7.0.0"
-    cssnano-preset-default "^5.0.0"
+    cssnano-preset-default "^5.1.3"
     is-resolvable "^1.1.0"
+    lilconfig "^2.0.3"
+    yaml "^1.10.2"
 
-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==
-  dependencies:
-    cosmiconfig "^5.0.0"
-    cssnano-preset-default "^4.0.7"
-    is-resolvable "^1.0.0"
-    postcss "^7.0.0"
-
-csso@^4.0.2, csso@^4.2.0:
+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==
@@ -4335,13 +4235,6 @@ cuint@^0.2.2:
   resolved "https://registry.yarnpkg.com/cuint/-/cuint-0.2.2.tgz#408086d409550c2631155619e9fa7bcadc3b991b"
   integrity sha1-QICG1AlVDCYxFVYZ6fp7ytw7mRs=
 
-currently-unhandled@^0.4.1:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/currently-unhandled/-/currently-unhandled-0.4.1.tgz#988df33feab191ef799a61369dd76c17adf957ea"
-  integrity sha1-mI3zP+qxke95mmE2nddsF635V+o=
-  dependencies:
-    array-find-index "^1.0.1"
-
 custom-event@~1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/custom-event/-/custom-event-1.0.1.tgz#5d02a46850adf1b4a317946a3928fccb5bfd0425"
@@ -4356,9 +4249,9 @@ d@1, d@^1.0.1:
     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==
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/damerau-levenshtein/-/damerau-levenshtein-1.0.7.tgz#64368003512a1a6992593741a09a9d31a836f55d"
+  integrity sha512-VvdQIPGdWP0SqFXghj79Wf/5LArmreyMsGLa6FG6iC4t3j7j5s71TrwWmT/4akbDQIqjfACkLZmjXhA7g2oUZw==
 
 dargs@^7.0.0:
   version "7.0.0"
@@ -4391,31 +4284,33 @@ date-format@^3.0.0:
   resolved "https://registry.yarnpkg.com/date-format/-/date-format-3.0.0.tgz#eb8780365c7d2b1511078fb491e6479780f3ad95"
   integrity sha512-eyTcpKOcamdhWJXj56DpQMo1ylSQpcGtGKXcU0Tb97+K56/CF5amAqqqNj0+KvA0iw2ynxtHWFsPDSClCxe48w==
 
-dateformat@^3.0.0:
-  version "3.0.3"
-  resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-3.0.3.tgz#a6e37499a4d9a9cf85ef5872044d62901c9889ae"
-  integrity sha512-jyCETtSl3VMZMWeRo7iY1FL19ges1t55hMo5yaam4Jrsm5EPL89UQkoQRyiI+Yf4k8r2ZpdngkV8hr1lIdjb3Q==
-
-dayjs@1.10.4:
-  version "1.10.4"
-  resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.4.tgz#8e544a9b8683f61783f570980a8a80eaf54ab1e2"
-  integrity sha512-RI/Hh4kqRc1UKLOAf/T5zdMMX5DQIlDxwUe3wSyMMnEbGunnpENCdbUgM+dW7kXidZqCttBrmw7BhN4TMddkCw==
+dayjs@1.10.6:
+  version "1.10.6"
+  resolved "https://registry.yarnpkg.com/dayjs/-/dayjs-1.10.6.tgz#288b2aa82f2d8418a6c9d4df5898c0737ad02a63"
+  integrity sha512-AztC/IOW4L1Q41A86phW5Thhcrco3xuAA+YX/BLpLWWjRcTj5TOt/QImBLmCKlrF7u7k47arTnOyL6GnbG8Hvw==
 
-debug@2.6.9, debug@^2.2.0, debug@^2.3.3:
+debug@2.6.9, debug@^2.2.0, debug@^2.3.3, debug@^2.6.9:
   version "2.6.9"
   resolved "https://registry.yarnpkg.com/debug/-/debug-2.6.9.tgz#5d128515df134ff327e90a4c93f4e077a536341f"
   integrity sha512-bC7ElrdJaJnPbAP+1EotYvqZsb3ecl5wi6Bfi6BJTUcNowp6cvspg0jXznRTKDjm/E7AdgFBVeAPVMNcKGsHMA==
   dependencies:
     ms "2.0.0"
 
-debug@4, debug@4.3.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@~4.3.1:
+debug@4, debug@4.3.2, debug@^4.0.1, debug@^4.1.0, debug@^4.1.1, debug@^4.3.1, debug@^4.3.2, debug@~4.3.1:
+  version "4.3.2"
+  resolved "https://registry.yarnpkg.com/debug/-/debug-4.3.2.tgz#f0a49c18ac8779e31d4a0c6029dfb76873c7428b"
+  integrity sha512-mOp8wKcvj7XxC78zLgw/ZA+6TSgkoE2C/ienthhRD298T7UNwAg9diBpLRxC0mOezLl4B0xV7M0cCO6P/O0Xhw==
+  dependencies:
+    ms "2.1.2"
+
+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.6:
+debug@^3.1.0, debug@^3.1.1, debug@^3.2.6, debug@^3.2.7:
   version "3.2.7"
   resolved "https://registry.yarnpkg.com/debug/-/debug-3.2.7.tgz#72580b7e9145fb39b6676f9c5e5fb100b934179a"
   integrity sha512-CFjzYYAi4ThfiQvizrFQevTTXHtnCqWfe7x1AhgEscTz6ZbLbfoLRLPugTQyBth6f8ZERVUSyWHFD/7Wu4t1XQ==
@@ -4442,7 +4337,7 @@ decamelize-keys@^1.1.0:
     decamelize "^1.1.0"
     map-obj "^1.0.0"
 
-decamelize@^1.1.0, decamelize@^1.1.2, decamelize@^1.2.0:
+decamelize@^1.1.0, decamelize@^1.2.0:
   version "1.2.0"
   resolved "https://registry.yarnpkg.com/decamelize/-/decamelize-1.2.0.tgz#f6534d15148269b20352e7bee26f501f9a191290"
   integrity sha1-9lNNFRSCabIDUue+4m9QH5oZEpA=
@@ -4471,7 +4366,7 @@ deep-equal@^1.0.1:
     object-keys "^1.1.1"
     regexp.prototype.flags "^1.2.0"
 
-deep-is@~0.1.3:
+deep-is@^0.1.3, deep-is@~0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/deep-is/-/deep-is-0.1.3.tgz#b369d6fb5dbc13eecf524f91b070feedc357cf34"
   integrity sha1-s2nW+128E+7PUk+RsHD+7cNXzzQ=
@@ -4497,9 +4392,9 @@ defaults@^1.0.3:
     clone "^1.0.2"
 
 defer-to-connect@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-2.0.0.tgz#83d6b199db041593ac84d781b5222308ccf4c2c1"
-  integrity sha512-bYL2d05vOSf1JEZNx5vSAtPuBMkX8K9EUutg7zlKvTqKXHt7RhWJFbmd7qakVuf13i+IkGmp6FwSsONOf6VYIg==
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/defer-to-connect/-/defer-to-connect-2.0.1.tgz#8016bdb4143e4632b77a3449c6236277de520587"
+  integrity sha512-4tvttepXG1VaYGrRibk5EwJd1t4udunSOVMdLSAL6mId1ix438oPwPZMALY41FCijukO1L0twNcGsdzS7dHgDg==
 
 define-lazy-prop@^2.0.0:
   version "2.0.0"
@@ -4581,12 +4476,12 @@ depd@~2.0.0:
   resolved "https://registry.yarnpkg.com/depd/-/depd-2.0.0.tgz#b696163cc757560d09cf22cc8fad1571b79e76df"
   integrity sha512-g7nH6P6dyDioJogAAGprGpCtVImJhpPk/roCzdb3fIh61/s/nPsfR6onyMwkCAR/OlC3yBC0lESvUoQEAssIrw==
 
-dependency-graph@^0.7.2:
-  version "0.7.2"
-  resolved "https://registry.yarnpkg.com/dependency-graph/-/dependency-graph-0.7.2.tgz#91db9de6eb72699209d88aea4c1fd5221cac1c49"
-  integrity sha512-KqtH4/EZdtdfWX0p6MGP9jljvxSY6msy/pRUD4jgNwVpv3v1QmNLlsB3LDSSUg79BRVSn7jI1QPRtArGABovAQ==
+dependency-graph@^0.11.0:
+  version "0.11.0"
+  resolved "https://registry.yarnpkg.com/dependency-graph/-/dependency-graph-0.11.0.tgz#ac0ce7ed68a54da22165a85e97a01d53f5eb2e27"
+  integrity sha512-JeMq7fEshyepOWDfcfHK06N3MhyPhz++vtqWhMT5O9A3K42rdsEDpfdVqjaqaAhsw6a+ZqeDvQVtD0hFHQWrzg==
 
-deprecation@^2.0.0:
+deprecation@^2.0.0, deprecation@^2.3.1:
   version "2.3.1"
   resolved "https://registry.yarnpkg.com/deprecation/-/deprecation-2.3.1.tgz#6368cbdb40abf3373b525ac87e4a260c3a700919"
   integrity sha512-xmHIy4F3scKVwMsQ4WnVaS8bHOx0DmVwRywosKhaILI0ywMDWPtBSku2HNxRvF7jtwDRsoEwYQSfbxj8b7RlJQ==
@@ -4597,14 +4492,14 @@ destroy@~1.0.4:
   integrity sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=
 
 detect-node@^2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.0.4.tgz#014ee8f8f669c5c58023da64b8179c083a28c46c"
-  integrity sha512-ZIzRpLJrOj7jjP2miAtgqIfmzbxa4ZOr5jJc601zklsfEx9oTzmmj2nVpIPRpNlRTIh8lc1kyViIY7BWSGNmKw==
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/detect-node/-/detect-node-2.1.0.tgz#c9c70775a49c3d03bc2c06d9a73be550f978f8b1"
+  integrity sha512-T0NIuQpnTvFDATNuHN5roPwSBG83rFsuO+MXXH9/3N1eFbn4wcPjttvjMLEPWJ0RGUYgQE7cGgS3tNxbqCGM7g==
 
-devtools-protocol@0.0.854822:
-  version "0.0.854822"
-  resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.854822.tgz#eac3a5260a6b3b4e729a09fdc0c77b0d322e777b"
-  integrity sha512-xd4D8kHQtB0KtWW0c9xBZD5LVtm9chkMOfs/3Yn01RhT/sFIsVtzTtypfKoFfWBaL+7xCYLxjOLkhwPXaX/Kcg==
+devtools-protocol@0.0.883894:
+  version "0.0.883894"
+  resolved "https://registry.yarnpkg.com/devtools-protocol/-/devtools-protocol-0.0.883894.tgz#d403f2c75cd6d71c916aee8dde9258da988a4da9"
+  integrity sha512-33idhm54QJzf3Q7QofMgCvIVSd2o9H3kQPWaKT/fhoZh+digc+WSiMhbkeG3iN79WY4Hwr9G05NpbhEVrsOYAg==
 
 dezalgo@^1.0.0:
   version "1.0.3"
@@ -4619,11 +4514,6 @@ di@^0.0.1:
   resolved "https://registry.yarnpkg.com/di/-/di-0.0.1.tgz#806649326ceaa7caa3306d75d985ea2748ba913c"
   integrity sha1-gGZJMmzqp8qjMG112YXqJ0i6kTw=
 
-diff@^3.5.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/diff/-/diff-3.5.0.tgz#800c0dd1e0a8bfbc95835c202ad220fe317e5a12"
-  integrity sha512-A46qtFgd+g7pDZinpnwiRJtxbC1hpgf0uzP3iG89scHk0AUC7A1TGxf5OiiOUv/JMZR8GOt8hL900hV0bOy5xA==
-
 diff@^4.0.1:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/diff/-/diff-4.0.2.tgz#60f3aecb89d5fae520c11aa19efc2bb982aade7d"
@@ -4642,9 +4532,9 @@ dns-equal@^1.0.0:
   integrity sha1-s55/HabrCnW6nBcySzR1PEfgZU0=
 
 dns-packet@^1.3.1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.1.tgz#12aa426981075be500b910eedcd0b47dd7deda5a"
-  integrity sha512-0UxfQkMhYAUaZI+xrNZOz/as5KgDU0M/fQ9b6SpkyLbk3GEswDi6PADJVaYJradtRVsRIlF1zLyOodbcTCDzUg==
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/dns-packet/-/dns-packet-1.3.4.tgz#e3455065824a2507ba886c55a89963bb107dec6f"
+  integrity sha512-BQ6F4vycLXBvdrJZ6S3gZewt6rcrks9KBgM9vrhW+knGRqc8uEdT7fuCwloc7nny5xNoMJ17HGH0R/6fpo8ECA==
   dependencies:
     ip "^1.1.0"
     safe-buffer "^5.0.1"
@@ -4656,6 +4546,20 @@ dns-txt@^2.0.2:
   dependencies:
     buffer-indexof "^1.0.0"
 
+doctrine@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-2.1.0.tgz#5cd01fc101621b42c4cd7f5d1a66243716d3f39d"
+  integrity sha512-35mSku4ZXK0vfCuHEDAwt55dg2jNajHZ1odvF+8SSr82EsZY4QmXfuWso8oEd8zRhVObSN18aM0CjSdoBX7zIw==
+  dependencies:
+    esutils "^2.0.2"
+
+doctrine@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/doctrine/-/doctrine-3.0.0.tgz#addebead72a6574db783639dc87a121773973961"
+  integrity sha512-yS+Q5i3hBf7GBkd4KG8a7eBNNWNGLTaEwwYWUijIYM7zrlYDM0BFXHjjPWlWZ1Rg7UaddZeIDmi9jF3HmqiQ2w==
+  dependencies:
+    esutils "^2.0.2"
+
 dom-serialize@^2.2.1:
   version "2.2.1"
   resolved "https://registry.yarnpkg.com/dom-serialize/-/dom-serialize-2.2.1.tgz#562ae8999f44be5ea3076f5419dcd59eb43ac95b"
@@ -4666,34 +4570,16 @@ dom-serialize@^2.2.1:
     extend "^3.0.0"
     void-elements "^2.0.0"
 
-dom-serializer@0:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.2.2.tgz#1afb81f533717175d478655debc5e332d9f9bb51"
-  integrity sha512-2/xPb3ORsQ42nHYiSunXkDjPLBaEj/xTwUO4B7XCZQTRk7EBtTOPaygh10YAAh2OI1Qrp6NWfpAhzswj0ydt9g==
-  dependencies:
-    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==
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.3.2.tgz#6206437d32ceefaec7161803230c7a20bc1b4d91"
+  integrity sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig==
   dependencies:
     domelementtype "^2.0.1"
-    domhandler "^4.0.0"
+    domhandler "^4.2.0"
     entities "^2.0.0"
 
-domelementtype@1:
-  version "1.3.1"
-  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-1.3.1.tgz#d048c44b37b0d10a7f2a3d5fee3f4333d790481f"
-  integrity sha512-BSKB+TSpMpFI/HOxCNr1O8aMOTZ8hT3pM3GQ0w/mWRmkhEDSFJkkyzz4XQsBV44BChwGkrDfMyjVD0eA2aFV3w==
-
-domelementtype@^2.0.1:
-  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:
+domelementtype@^2.0.1, domelementtype@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.2.0.tgz#9a0b6c2782ed6a1c7323d42267183df9bd8b1d57"
   integrity sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==
@@ -4705,10 +4591,10 @@ domexception@^1.0.1:
   dependencies:
     webidl-conversions "^4.0.2"
 
-domhandler@^4.0.0, domhandler@^4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.1.0.tgz#c1d8d494d5ec6db22de99e46a149c2a4d23ddd43"
-  integrity sha512-/6/kmsGlMY4Tup/nGVutdrK9yQi4YjWVcVeoQmixpzjOUK1U7pQkvAPHBJeUxOgxF0J8f8lwCJSlCfD0V4CMGQ==
+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"
 
@@ -4718,33 +4604,18 @@ domino@^2.1.2:
   integrity sha512-3VdM/SXBZX2omc9JF9nOPCtDaYQ67BGp5CoLpIQlO2KCAPETs8TcDHacF26jXadGbvUteZzRTeos2fhID5+ucQ==
 
 dompurify@^2.2.6:
-  version "2.2.6"
-  resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.2.6.tgz#54945dc5c0b45ce5ae228705777e8e59d7b2edc4"
-  integrity sha512-7b7ZArhhH0SP6W2R9cqK6RjaU82FZ2UPM7RO8qN1b1wyvC/NY1FNWcX1Pu00fFOAnzEORtwXe4bPaClg6pUybQ==
-
-domutils@^1.7.0:
-  version "1.7.0"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.7.0.tgz#56ea341e834e06e6748af7a1cb25da67ea9f8c2a"
-  integrity sha512-Lgd2XcJ/NjEw+7tFvfKxOzCYKZsdct5lczQ2ZaQY8Djz7pfAD3Gbp8ySJWtreII/vDlMVmxwa6pHmdxIYgttDg==
-  dependencies:
-    dom-serializer "0"
-    domelementtype "1"
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/dompurify/-/dompurify-2.3.0.tgz#07bb39515e491588e5756b1d3e8375b5964814e2"
+  integrity sha512-VV5C6Kr53YVHGOBKO/F86OYX6/iLTw2yVSI721gKetxpHCK/V5TaLEf9ODjRgl1KLSWRMY6cUhAbv/c+IUnwQw==
 
-domutils@^2.4.3:
-  version "2.5.2"
-  resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.5.2.tgz#37ef8ba087dff1a17175e7092e8a042e4b050e6c"
-  integrity sha512-MHTthCb1zj8f1GVfRpeZUbohQf/HdBos0oX5gZcQFepOZPLLRyj6Wn7XS7EMnY7CVpwv8863u2vyE83Hfu28HQ==
+domutils@^2.6.0:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.7.0.tgz#8ebaf0c41ebafcf55b0b72ec31c56323712c5442"
+  integrity sha512-8eaHa17IwJUPAiB+SoTYBo5mCdeMgdcAoXJ59m6DT1vw+5iLS3gNoqYaRowaBKtGVrOF1Jz4yDTgYKLK2kvfJg==
   dependencies:
     dom-serializer "^1.0.1"
     domelementtype "^2.2.0"
-    domhandler "^4.1.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"
-  integrity sha512-QM8q3zDe58hqUqjraQOmzZ1LIH9SWQJTlEKCH4kJ2oQvLZk7RbQXvtDM2XEq3fwkV9CCvvH4LA0AV+ogFsBM2Q==
-  dependencies:
-    is-obj "^2.0.0"
+    domhandler "^4.2.0"
 
 duplexer2@~0.1.4:
   version "0.1.4"
@@ -4785,10 +4656,10 @@ ejs@^3.1.6:
   dependencies:
     jake "^10.6.1"
 
-electron-to-chromium@^1.3.649:
-  version "1.3.665"
-  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.665.tgz#6d0937376f6a919c0f289202c4be77790a6175e5"
-  integrity sha512-LIjx1JheOz7LM8DMEQ2tPnbBzJ4nVG1MKutsbEMLnJfwfVdPIsyagqfLp56bOWhdBrYGXWHaTayYkllIU2TauA==
+electron-to-chromium@^1.3.723:
+  version "1.3.786"
+  resolved "https://registry.yarnpkg.com/electron-to-chromium/-/electron-to-chromium-1.3.786.tgz#1fc572abc77e2f474725f8a61acf7e25ced9fbe2"
+  integrity sha512-AmvbLBj3hepRk8v/DHrFF8gINxOFfDbrn6Ts3PcK46/FBdQb5OMmpamSpZQXSkfi77FfBzYtQtAk+00LCLYMVw==
 
 emoji-regex@^7.0.1:
   version "7.0.3"
@@ -4800,11 +4671,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"
@@ -4849,14 +4715,21 @@ engine.io@~4.1.0:
     engine.io-parser "~4.0.0"
     ws "~7.4.2"
 
-enhanced-resolve@5.7.0, 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==
+enhanced-resolve@^5.8.0:
+  version "5.8.2"
+  resolved "https://registry.yarnpkg.com/enhanced-resolve/-/enhanced-resolve-5.8.2.tgz#15ddc779345cbb73e97c611cd00c01c1e7bf4d8b"
+  integrity sha512-F27oB3WuHDzvR2DOGNTaYy0D5o0cnrv8TeI482VM4kYgQd/FT9lUQwuNsJ0oOHtBUq7eiW5ytqzp7nBFknL+GA==
   dependencies:
     graceful-fs "^4.2.4"
     tapable "^2.2.0"
 
+enquirer@^2.3.5:
+  version "2.3.6"
+  resolved "https://registry.yarnpkg.com/enquirer/-/enquirer-2.3.6.tgz#2a7fe5dd634a1e4125a975ec994ff5456dc3734d"
+  integrity sha512-yjNnPr315/FjS4zIsUxYguYUPP2e1NK4d7E7ZOLiyYCcbFBiTMyID+2wvm2w6+pZ/odMA7cRkjhsPbltwBOrLg==
+  dependencies:
+    ansi-colors "^4.1.1"
+
 ent@~2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/ent/-/ent-2.2.0.tgz#e964219325a21d05f44466a2f686ed6ce5f5dd1d"
@@ -4868,14 +4741,14 @@ entities@^2.0.0:
   integrity sha512-p92if5Nz619I0w+akJrLZH0MX0Pb5DX39XOwQTtXSdQQOaYH03S1uIQp4mhOZtAXrxq4ViO67YTiLBo2638o9A==
 
 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==
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/env-paths/-/env-paths-2.2.1.tgz#420399d416ce1fbe9bc0a07c62fa68d67fd0f8f2"
+  integrity sha512-+h1lkLKhZMTYjog1VEpJNG7NZJWcuc2DDk/qsqSTRRCOXiLjeQ1d1/udrUGhqMxUgAlwKNZ0cf2uqan5GLuS2A==
 
-envinfo@7.7.4:
-  version "7.7.4"
-  resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.7.4.tgz#c6311cdd38a0e86808c1c9343f667e4267c4a320"
-  integrity sha512-TQXTYFVVwwluWSFis6K2XKxgrD22jEv0FTuLCQI+OjH7rn93+iY0fSSFM5lrSxFY+H1+B0/cvvlamr3UsBivdQ==
+envinfo@7.8.1:
+  version "7.8.1"
+  resolved "https://registry.yarnpkg.com/envinfo/-/envinfo-7.8.1.tgz#06377e3e5f4d379fea7ac592d5ad8927e0c4d475"
+  integrity sha512-/o+BXHmB7ocbHEAs6F2EnG0ogybVVUdkRunTT2glZU9XAaGmhqskrvKwqXuDfNjEO0LZKWdejEEpnq8aM0tOaw==
 
 err-code@^2.0.2:
   version "2.0.3"
@@ -4889,54 +4762,39 @@ errno@^0.1.1, errno@^0.1.3:
   dependencies:
     prr "~1.0.1"
 
-error-ex@^1.2.0, error-ex@^1.3.1:
+error-ex@^1.3.1:
   version "1.3.2"
   resolved "https://registry.yarnpkg.com/error-ex/-/error-ex-1.3.2.tgz#b4ac40648107fdcdcfae242f428bea8a14d4f1bf"
   integrity sha512-7dFHNmqeFSEt2ZBsCriorKnn3Z2pj+fd9kmI6QoWw4//DL+icEBfc0U7qJCisqrTsKTjw4fNFy2pW9OqStD84g==
   dependencies:
     is-arrayish "^0.2.1"
 
-es-abstract@^1.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==
-  dependencies:
-    es-to-primitive "^1.2.1"
-    function-bind "^1.1.1"
-    has "^1.0.3"
-    has-symbols "^1.0.1"
-    is-callable "^1.2.2"
-    is-regex "^1.1.1"
-    object-inspect "^1.8.0"
-    object-keys "^1.1.1"
-    object.assign "^4.1.1"
-    string.prototype.trimend "^1.0.1"
-    string.prototype.trimstart "^1.0.1"
-
-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==
+es-abstract@^1.18.0-next.1, es-abstract@^1.18.0-next.2, es-abstract@^1.18.2:
+  version "1.18.3"
+  resolved "https://registry.yarnpkg.com/es-abstract/-/es-abstract-1.18.3.tgz#25c4c3380a27aa203c44b2b685bba94da31b63e0"
+  integrity sha512-nQIr12dxV7SSxE6r6f1l3DtAeEYdsGpps13dR0TwJg1S8gyp4ZPgy3FZcHBgbiQqnoqSTb+oC+kO4UQ0C/J8vw==
   dependencies:
     call-bind "^1.0.2"
     es-to-primitive "^1.2.1"
     function-bind "^1.1.1"
-    get-intrinsic "^1.0.2"
+    get-intrinsic "^1.1.1"
     has "^1.0.3"
-    has-symbols "^1.0.1"
-    is-callable "^1.2.2"
+    has-symbols "^1.0.2"
+    is-callable "^1.2.3"
     is-negative-zero "^2.0.1"
-    is-regex "^1.1.1"
-    object-inspect "^1.9.0"
+    is-regex "^1.1.3"
+    is-string "^1.0.6"
+    object-inspect "^1.10.3"
     object-keys "^1.1.1"
     object.assign "^4.1.2"
-    string.prototype.trimend "^1.0.3"
-    string.prototype.trimstart "^1.0.3"
+    string.prototype.trimend "^1.0.4"
+    string.prototype.trimstart "^1.0.4"
+    unbox-primitive "^1.0.1"
 
-es-module-lexer@^0.4.0:
-  version "0.4.1"
-  resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.4.1.tgz#dda8c6a14d8f340a24e34331e0fab0cb50438e0e"
-  integrity sha512-ooYciCUtfw6/d2w56UVeqHPcoCFAiJdz5XOkYpv/Txl1HMUozpXjz/2RIQgqwKdXNDPSF1W7mJCFse3G+HDyAA==
+es-module-lexer@^0.7.1:
+  version "0.7.1"
+  resolved "https://registry.yarnpkg.com/es-module-lexer/-/es-module-lexer-0.7.1.tgz#c2c8e0f46f2df06274cdaf0dd3f3b33e0a0b267d"
+  integrity sha512-MgtWFl5No+4S3TmhDmCz2ObFGm6lEpTnzbQi+Dd+pw4mlTIZTmM2iAs5gRlmx5zS9luzobCSBSI90JM/1/JgOw==
 
 es-to-primitive@^1.2.1:
   version "1.2.1"
@@ -4956,7 +4814,7 @@ es5-ext@^0.10.35, es5-ext@^0.10.46, es5-ext@^0.10.50, es5-ext@^0.10.53, es5-ext@
     es6-symbol "~3.1.3"
     next-tick "~1.0.0"
 
-es6-iterator@2.0.3, es6-iterator@^2.0.3, es6-iterator@~2.0.3:
+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=
@@ -4995,6 +4853,119 @@ es6-weak-map@^2.0.3:
     es6-iterator "^2.0.3"
     es6-symbol "^3.1.1"
 
+esbuild-android-arm64@0.13.8:
+  version "0.13.8"
+  resolved "https://registry.yarnpkg.com/esbuild-android-arm64/-/esbuild-android-arm64-0.13.8.tgz#c20e875c3c98164b1ffba9b28637bdf96f5e9e7c"
+  integrity sha512-AilbChndywpk7CdKkNSZ9klxl+9MboLctXd9LwLo3b0dawmOF/i/t2U5d8LM6SbT1Xw36F8yngSUPrd8yPs2RA==
+
+esbuild-darwin-64@0.13.8:
+  version "0.13.8"
+  resolved "https://registry.yarnpkg.com/esbuild-darwin-64/-/esbuild-darwin-64-0.13.8.tgz#f46e6b471ddbf62265234808a6a1aa91df18a417"
+  integrity sha512-b6sdiT84zV5LVaoF+UoMVGJzR/iE2vNUfUDfFQGrm4LBwM/PWXweKpuu6RD9mcyCq18cLxkP6w/LD/w9DtX3ng==
+
+esbuild-darwin-arm64@0.13.8:
+  version "0.13.8"
+  resolved "https://registry.yarnpkg.com/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.13.8.tgz#a991157a6013facd4f2e14159b7da52626c90154"
+  integrity sha512-R8YuPiiJayuJJRUBG4H0VwkEKo6AvhJs2m7Tl0JaIer3u1FHHXwGhMxjJDmK+kXwTFPriSysPvcobXC/UrrZCQ==
+
+esbuild-freebsd-64@0.13.8:
+  version "0.13.8"
+  resolved "https://registry.yarnpkg.com/esbuild-freebsd-64/-/esbuild-freebsd-64-0.13.8.tgz#301601d2e443ad458960e359b402a17d9500be9d"
+  integrity sha512-zBn6urrn8FnKC+YSgDxdof9jhPCeU8kR/qaamlV4gI8R3KUaUK162WYM7UyFVAlj9N0MyD3AtB+hltzu4cysTw==
+
+esbuild-freebsd-arm64@0.13.8:
+  version "0.13.8"
+  resolved "https://registry.yarnpkg.com/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.13.8.tgz#039a63acc12ec0892006c147ea221e55f9125a9f"
+  integrity sha512-pWW2slN7lGlkx0MOEBoUGwRX5UgSCLq3dy2c8RIOpiHtA87xAUpDBvZK10MykbT+aMfXc0NI2lu1X+6kI34xng==
+
+esbuild-linux-32@0.13.8:
+  version "0.13.8"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-32/-/esbuild-linux-32-0.13.8.tgz#c537b67d7e694b60bfa2786581412838c6ba0284"
+  integrity sha512-T0I0ueeKVO/Is0CAeSEOG9s2jeNNb8jrrMwG9QBIm3UU18MRB60ERgkS2uV3fZ1vP2F8i3Z2e3Zju4lg9dhVmw==
+
+esbuild-linux-64@0.13.8:
+  version "0.13.8"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-64/-/esbuild-linux-64-0.13.8.tgz#0092fc8a064001a777bfa0e3b425bb8be8f96e6a"
+  integrity sha512-Bm8SYmFtvfDCIu9sjKppFXzRXn2BVpuCinU1ChTuMtdKI/7aPpXIrkqBNOgPTOQO9AylJJc1Zw6EvtKORhn64w==
+
+esbuild-linux-arm64@0.13.8:
+  version "0.13.8"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-arm64/-/esbuild-linux-arm64-0.13.8.tgz#5cd3f2bb924212971482e8dbc25c4afd09b28110"
+  integrity sha512-X4pWZ+SL+FJ09chWFgRNO3F+YtvAQRcWh0uxKqZSWKiWodAB20flsW/OWFYLXBKiVCTeoGMvENZS/GeVac7+tQ==
+
+esbuild-linux-arm@0.13.8:
+  version "0.13.8"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-arm/-/esbuild-linux-arm-0.13.8.tgz#ad634f96bf2975536907aeb9fdb75a3194f4ddce"
+  integrity sha512-4/HfcC40LJ4GPyboHA+db0jpFarTB628D1ifU+/5bunIgY+t6mHkJWyxWxAAE8wl/ZIuRYB9RJFdYpu1AXGPdg==
+
+esbuild-linux-mips64le@0.13.8:
+  version "0.13.8"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.13.8.tgz#57857edfebf9bf65766dc8be1637f2179c990572"
+  integrity sha512-o7e0D+sqHKT31v+mwFircJFjwSKVd2nbkHEn4l9xQ1hLR+Bv8rnt3HqlblY3+sBdlrOTGSwz0ReROlKUMJyldA==
+
+esbuild-linux-ppc64le@0.13.8:
+  version "0.13.8"
+  resolved "https://registry.yarnpkg.com/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.13.8.tgz#fdb82a059a5b86bb10fb42091b4ebcf488b9cd46"
+  integrity sha512-eZSQ0ERsWkukJp2px/UWJHVNuy0lMoz/HZcRWAbB6reoaBw7S9vMzYNUnflfL3XA6WDs+dZn3ekHE4Y2uWLGig==
+
+esbuild-netbsd-64@0.13.8:
+  version "0.13.8"
+  resolved "https://registry.yarnpkg.com/esbuild-netbsd-64/-/esbuild-netbsd-64-0.13.8.tgz#d7879e7123d3b2c04754ece8bd061aa6866deeff"
+  integrity sha512-gZX4kP7gVvOrvX0ZwgHmbuHczQUwqYppxqtoyC7VNd80t5nBHOFXVhWo2Ad/Lms0E8b+wwgI/WjZFTCpUHOg9Q==
+
+esbuild-openbsd-64@0.13.8:
+  version "0.13.8"
+  resolved "https://registry.yarnpkg.com/esbuild-openbsd-64/-/esbuild-openbsd-64-0.13.8.tgz#88b280b6cb0a3f6adb60abf27fc506c506a35cf0"
+  integrity sha512-afzza308X4WmcebexbTzAgfEWt9MUkdTvwIa8xOu4CM2qGbl2LanqEl8/LUs8jh6Gqw6WsicEK52GPrS9wvkcw==
+
+esbuild-sunos-64@0.13.8:
+  version "0.13.8"
+  resolved "https://registry.yarnpkg.com/esbuild-sunos-64/-/esbuild-sunos-64-0.13.8.tgz#229ae7c7703196a58acd0f0291ad9bebda815d63"
+  integrity sha512-mWPZibmBbuMKD+LDN23LGcOZ2EawMYBONMXXHmbuxeT0XxCNwadbCVwUQ/2p5Dp5Kvf6mhrlIffcnWOiCBpiVw==
+
+esbuild-wasm@0.13.8:
+  version "0.13.8"
+  resolved "https://registry.yarnpkg.com/esbuild-wasm/-/esbuild-wasm-0.13.8.tgz#f34134c187ffcfc22d476e925917f70bab40f8b0"
+  integrity sha512-UbD+3nloiSpJWXTCInZQrqPe8Y+RLfDkY/5kEHiXsw/lmaEvibe69qTzQu16m5R9je/0bF7VYQ5jaEOq0z9lLA==
+
+esbuild-windows-32@0.13.8:
+  version "0.13.8"
+  resolved "https://registry.yarnpkg.com/esbuild-windows-32/-/esbuild-windows-32-0.13.8.tgz#892d093e32a21c0c9135e5a0ffdc380aeb70e763"
+  integrity sha512-QsZ1HnWIcnIEApETZWw8HlOhDSWqdZX2SylU7IzGxOYyVcX7QI06ety/aDcn437mwyO7Ph4RrbhB+2ntM8kX8A==
+
+esbuild-windows-64@0.13.8:
+  version "0.13.8"
+  resolved "https://registry.yarnpkg.com/esbuild-windows-64/-/esbuild-windows-64-0.13.8.tgz#7defd8d79ae3bb7e6f53b65a7190be7daf901686"
+  integrity sha512-76Fb57B9eE/JmJi1QmUW0tRLQZfGo0it+JeYoCDTSlbTn7LV44ecOHIMJSSgZADUtRMWT9z0Kz186bnaB3amSg==
+
+esbuild-windows-arm64@0.13.8:
+  version "0.13.8"
+  resolved "https://registry.yarnpkg.com/esbuild-windows-arm64/-/esbuild-windows-arm64-0.13.8.tgz#e59ae004496fd8a5ab67bfc7945a2e47480d6fb9"
+  integrity sha512-HW6Mtq5eTudllxY2YgT62MrVcn7oq2o8TAoAvDUhyiEmRmDY8tPwAhb1vxw5/cdkbukM3KdMYtksnUhF/ekWeg==
+
+esbuild@0.13.8:
+  version "0.13.8"
+  resolved "https://registry.yarnpkg.com/esbuild/-/esbuild-0.13.8.tgz#bd7cc51b881ab067789f88e17baca74724c1ec4f"
+  integrity sha512-A4af7G7YZLfG5OnARJRMtlpEsCkq/zHZQXewgPA864l9D6VjjbH1SuFYK/OSV6BtHwDGkdwyRrX0qQFLnMfUcw==
+  optionalDependencies:
+    esbuild-android-arm64 "0.13.8"
+    esbuild-darwin-64 "0.13.8"
+    esbuild-darwin-arm64 "0.13.8"
+    esbuild-freebsd-64 "0.13.8"
+    esbuild-freebsd-arm64 "0.13.8"
+    esbuild-linux-32 "0.13.8"
+    esbuild-linux-64 "0.13.8"
+    esbuild-linux-arm "0.13.8"
+    esbuild-linux-arm64 "0.13.8"
+    esbuild-linux-mips64le "0.13.8"
+    esbuild-linux-ppc64le "0.13.8"
+    esbuild-netbsd-64 "0.13.8"
+    esbuild-openbsd-64 "0.13.8"
+    esbuild-sunos-64 "0.13.8"
+    esbuild-windows-32 "0.13.8"
+    esbuild-windows-64 "0.13.8"
+    esbuild-windows-arm64 "0.13.8"
+
 escalade@^3.1.1:
   version "3.1.1"
   resolved "https://registry.yarnpkg.com/escalade/-/escalade-3.1.1.tgz#d8cfdc7000965c5a0174b4a82eaa5c0552742e40"
@@ -5010,6 +4981,11 @@ escape-string-regexp@^1.0.2, escape-string-regexp@^1.0.5:
   resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-1.0.5.tgz#1b61c0562190a8dff6ae3bb2cf0200ca130b86d4"
   integrity sha1-G2HAViGQqN/2rjuyzwIAyhMLhtQ=
 
+escape-string-regexp@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz#14ba83a5d373e3d311e5afca29cf5bfad965bf34"
+  integrity sha512-TtpcNJ3XAzx3Gq8sWRzJaVajRs0uVxA2YAkdb1jm2YkPz4G6egUFAyA3n5vtEIZefPk5Wa4UXbKuS5fKkJWdgA==
+
 escodegen@^1.11.1:
   version "1.14.3"
   resolved "https://registry.yarnpkg.com/escodegen/-/escodegen-1.14.3.tgz#4e7b81fba61581dc97582ed78cab7f0e8d63f503"
@@ -5034,7 +5010,62 @@ escodegen@~1.9.0:
   optionalDependencies:
     source-map "~0.6.1"
 
-eslint-scope@^5.1.1:
+eslint-config-prettier@8.3.0:
+  version "8.3.0"
+  resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-8.3.0.tgz#f7471b20b6fe8a9a9254cc684454202886a2dd7a"
+  integrity sha512-BgZuLUSeKzvlL/VUjx/Yb787VQ26RU3gGjA3iiFvdsp/2bMfVIWUVP7tjxtjS0e+HP409cPlPvNkQloz8C91ew==
+
+eslint-import-resolver-node@0.3.4:
+  version "0.3.4"
+  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz#85ffa81942c25012d8231096ddf679c03042c717"
+  integrity sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA==
+  dependencies:
+    debug "^2.6.9"
+    resolve "^1.13.1"
+
+eslint-import-resolver-node@^0.3.4:
+  version "0.3.5"
+  resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.5.tgz#939bbb0f74e179e757ca87f7a4a890dabed18ac4"
+  integrity sha512-XMoPKjSpXbkeJ7ZZ9icLnJMTY5Mc1kZbCakHquaFsXPpyWOwK0TK6CODO+0ca54UoM9LKOxyUNnoVZRl8TeaAg==
+  dependencies:
+    debug "^3.2.7"
+    resolve "^1.20.0"
+
+eslint-module-utils@^2.6.1:
+  version "2.6.2"
+  resolved "https://registry.yarnpkg.com/eslint-module-utils/-/eslint-module-utils-2.6.2.tgz#94e5540dd15fe1522e8ffa3ec8db3b7fa7e7a534"
+  integrity sha512-QG8pcgThYOuqxupd06oYTZoNOGaUdTY1PqK+oS6ElF6vs4pBdk/aYxFVQQXzcrAqp9m7cl7lb2ubazX+g16k2Q==
+  dependencies:
+    debug "^3.2.7"
+    pkg-dir "^2.0.0"
+
+eslint-plugin-header@3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-header/-/eslint-plugin-header-3.1.1.tgz#6ce512432d57675265fac47292b50d1eff11acd6"
+  integrity sha512-9vlKxuJ4qf793CmeeSrZUvVClw6amtpghq3CuWcB5cUNnWHQhgcqy5eF8oVKFk1G3Y/CbchGfEaw3wiIJaNmVg==
+
+eslint-plugin-import@2.23.4:
+  version "2.23.4"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.23.4.tgz#8dceb1ed6b73e46e50ec9a5bb2411b645e7d3d97"
+  integrity sha512-6/wP8zZRsnQFiR3iaPFgh5ImVRM1WN5NUWfTIRqwOdeiGJlBcSk82o1FEVq8yXmy4lkIzTo7YhHCIxlU/2HyEQ==
+  dependencies:
+    array-includes "^3.1.3"
+    array.prototype.flat "^1.2.4"
+    debug "^2.6.9"
+    doctrine "^2.1.0"
+    eslint-import-resolver-node "^0.3.4"
+    eslint-module-utils "^2.6.1"
+    find-up "^2.0.0"
+    has "^1.0.3"
+    is-core-module "^2.4.0"
+    minimatch "^3.0.4"
+    object.values "^1.1.3"
+    pkg-up "^2.0.0"
+    read-pkg-up "^3.0.0"
+    resolve "^1.20.0"
+    tsconfig-paths "^3.9.0"
+
+eslint-scope@5.1.1, eslint-scope@^5.1.1:
   version "5.1.1"
   resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c"
   integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw==
@@ -5042,6 +5073,85 @@ eslint-scope@^5.1.1:
     esrecurse "^4.3.0"
     estraverse "^4.1.1"
 
+eslint-utils@^2.1.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27"
+  integrity sha512-w94dQYoauyvlDc43XnGB8lU3Zt713vNChgt4EWwhXAP2XkBvndfxF0AgIqKOOasjPIPzj9JqgwkwbCYD0/V3Zg==
+  dependencies:
+    eslint-visitor-keys "^1.1.0"
+
+eslint-utils@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-3.0.0.tgz#8aebaface7345bb33559db0a1f13a1d2d48c3672"
+  integrity sha512-uuQC43IGctw68pJA1RgbQS8/NP7rch6Cwd4j3ZBtgo4/8Flj4eGE7ZYSZRN3iq5pVUv6GPdW5Z1RFleo84uLDA==
+  dependencies:
+    eslint-visitor-keys "^2.0.0"
+
+eslint-visitor-keys@^1.1.0, eslint-visitor-keys@^1.3.0:
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-1.3.0.tgz#30ebd1ef7c2fdff01c3a4f151044af25fab0523e"
+  integrity sha512-6J72N8UNa462wa/KFODt/PJ3IU60SDpC3QXC1Hjc1BXXpfL2C9R5+AU7jhe0F6GREqVMh4Juu+NY7xn+6dipUQ==
+
+eslint-visitor-keys@^2.0.0:
+  version "2.1.0"
+  resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.1.0.tgz#f65328259305927392c938ed44eb0a5c9b2bd303"
+  integrity sha512-0rSmRBzXgDzIsD6mGdJgevzgezI534Cer5L/vyMX0kHzT/jiB43jRhd9YUlMGYLQy2zprNmoT8qasCGtY+QaKw==
+
+eslint@7.31.0:
+  version "7.31.0"
+  resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.31.0.tgz#f972b539424bf2604907a970860732c5d99d3aca"
+  integrity sha512-vafgJpSh2ia8tnTkNUkwxGmnumgckLh5aAbLa1xRmIn9+owi8qBNGKL+B881kNKNTy7FFqTEkpNkUvmw0n6PkA==
+  dependencies:
+    "@babel/code-frame" "7.12.11"
+    "@eslint/eslintrc" "^0.4.3"
+    "@humanwhocodes/config-array" "^0.5.0"
+    ajv "^6.10.0"
+    chalk "^4.0.0"
+    cross-spawn "^7.0.2"
+    debug "^4.0.1"
+    doctrine "^3.0.0"
+    enquirer "^2.3.5"
+    escape-string-regexp "^4.0.0"
+    eslint-scope "^5.1.1"
+    eslint-utils "^2.1.0"
+    eslint-visitor-keys "^2.0.0"
+    espree "^7.3.1"
+    esquery "^1.4.0"
+    esutils "^2.0.2"
+    fast-deep-equal "^3.1.3"
+    file-entry-cache "^6.0.1"
+    functional-red-black-tree "^1.0.1"
+    glob-parent "^5.1.2"
+    globals "^13.6.0"
+    ignore "^4.0.6"
+    import-fresh "^3.0.0"
+    imurmurhash "^0.1.4"
+    is-glob "^4.0.0"
+    js-yaml "^3.13.1"
+    json-stable-stringify-without-jsonify "^1.0.1"
+    levn "^0.4.1"
+    lodash.merge "^4.6.2"
+    minimatch "^3.0.4"
+    natural-compare "^1.4.0"
+    optionator "^0.9.1"
+    progress "^2.0.0"
+    regexpp "^3.1.0"
+    semver "^7.2.1"
+    strip-ansi "^6.0.0"
+    strip-json-comments "^3.1.0"
+    table "^6.0.9"
+    text-table "^0.2.0"
+    v8-compile-cache "^2.0.3"
+
+espree@^7.3.0, espree@^7.3.1:
+  version "7.3.1"
+  resolved "https://registry.yarnpkg.com/espree/-/espree-7.3.1.tgz#f2df330b752c6f55019f8bd89b7660039c1bbbb6"
+  integrity sha512-v3JCNCE64umkFpmkFGqzVKsOT0tN1Zr+ueqLZfpV1Ob8e+CEgPWa+OxCoGH3tnhimMKIaBm4m/vaRpJ/krRz2g==
+  dependencies:
+    acorn "^7.4.0"
+    acorn-jsx "^5.3.1"
+    eslint-visitor-keys "^1.3.0"
+
 esprima@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-3.1.3.tgz#fdca51cee6133895e3c88d535ce49dbff62a4633"
@@ -5052,6 +5162,13 @@ esprima@^4.0.0, esprima@^4.0.1:
   resolved "https://registry.yarnpkg.com/esprima/-/esprima-4.0.1.tgz#13b04cdb3e6c5d19df91ab6987a8695619b0aa71"
   integrity sha512-eGuFFw7Upda+g4p+QHvnW0RyTX/SVeJBDM/gCtMARO0cLuT2HcEKnTPvhjV6aGeqrCB/sbNop0Kszm0jsaWU4A==
 
+esquery@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/esquery/-/esquery-1.4.0.tgz#2148ffc38b82e8c7057dfed48425b3e61f0f24a5"
+  integrity sha512-cCDispWt5vHHtwMY2YrAQ4ibFkAL8RbH5YGBnZBc90MolvvfkkQcJro/aZiAQUlQ3qgrYS6D6v8Gc5G5CQsc9w==
+  dependencies:
+    estraverse "^5.1.0"
+
 esrecurse@^4.3.0:
   version "4.3.0"
   resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921"
@@ -5064,11 +5181,16 @@ estraverse@^4.1.1, estraverse@^4.2.0:
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d"
   integrity sha512-39nnKffWz8xN1BU/2c79n9nB9HDzo0niYUqx6xyqUnyoAnQyyWpOTdZEeiCch8BBu515t4wp9ZmgVfVhn9EBpw==
 
-estraverse@^5.2.0:
+estraverse@^5.1.0, estraverse@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880"
   integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ==
 
+estree-walker@^0.6.1:
+  version "0.6.1"
+  resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-0.6.1.tgz#53049143f40c6eb918b23671d1fe3219f3a1b362"
+  integrity sha512-SqmZANLWS0mnatqbSfRP5g8OXZC12Fgg1IwNtLsyHDzJizORW4khDfjPqJZsemPWBB2uqykUah5YpQ6epsqC/w==
+
 estree-walker@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/estree-walker/-/estree-walker-1.0.1.tgz#31bc5d612c96b704106b477e6dd5d8aa138cb700"
@@ -5097,20 +5219,25 @@ event-emitter@^0.3.5:
     d "1"
     es5-ext "~0.10.14"
 
+eventemitter-asyncresource@^1.0.0:
+  version "1.0.0"
+  resolved "https://registry.yarnpkg.com/eventemitter-asyncresource/-/eventemitter-asyncresource-1.0.0.tgz#734ff2e44bf448e627f7748f905d6bdd57bdb65b"
+  integrity sha512-39F7TBIV0G7gTelxwbEqnwhp90eqCPON1k0NwNfwhgKn4Co4ybUbj2pECcXT0B3ztRKZ7Pw1JujUUgmQJHcVAQ==
+
 eventemitter3@^4.0.0:
   version "4.0.7"
   resolved "https://registry.yarnpkg.com/eventemitter3/-/eventemitter3-4.0.7.tgz#2de9b68f6528d5644ef5c59526a1b4a07306169f"
   integrity sha512-8guHBZCwKnFhYdHr2ysuRWErTwhoN2X8XELRlrRwpmfeY2jjuUN4taQMsULKUVo1K4DvZl+0pgfyoysHxvmvEw==
 
 events@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/events/-/events-3.2.0.tgz#93b87c18f8efcd4202a461aec4dfc0556b639379"
-  integrity sha512-/46HWwbfCX2xTawVfkKLGxMifJYQBWMwY1mjywRtb4c9x8l5NP3KoJtnIOiL1hfdRkIuYhETxQlo62IF8tcnlg==
+  version "3.3.0"
+  resolved "https://registry.yarnpkg.com/events/-/events-3.3.0.tgz#31a95ad0a924e2d2c419a813aeb2c4e878ea7400"
+  integrity sha512-mQw+2fkQbALzQ7V0MY0IqdnXNOeTtP4r0lN9z7AAawCXgqea7bDii20AYrIBrFd/Hx0M2Ocz6S111CaFkUcb0Q==
 
 eventsource@^1.0.7:
-  version "1.0.7"
-  resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-1.0.7.tgz#8fbc72c93fcd34088090bc0a4e64f4b5cee6d8d0"
-  integrity sha512-4Ln17+vVT0k8aWq+t/bF5arcS3EpT9gYtW66EPacdj/mAFevznsnyoHLPy2BA8gbIQeIHoPsvwmfBftfcG//BQ==
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/eventsource/-/eventsource-1.1.0.tgz#00e8ca7c92109e94b0ddf32dac677d841028cfaf"
+  integrity sha512-VSJjT5oCNrFvCS6igjzPAt5hBzQ2qPBFIbJ03zLI9SE0mxwZpMw6BfJrbFHm1a141AavMEB8JHmBhWAd66PfCg==
   dependencies:
     original "^1.0.0"
 
@@ -5231,7 +5358,7 @@ extglob@^2.0.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
-extract-zip@^2.0.0:
+extract-zip@2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/extract-zip/-/extract-zip-2.0.1.tgz#663dca56fe46df890d5f131ef4a06d22bb8ba13a"
   integrity sha512-GDhU9ntwuKyGXdZBUgTIe+vXnWj0fppUEtMDL0+idd5Sta8TGpHssn/eusA9mrPr9qNDym6SxAYZjNvCn/9RBg==
@@ -5262,42 +5389,41 @@ falafel@^2.1.0:
     isarray "^2.0.1"
     object-keys "^1.0.6"
 
-fast-deep-equal@^3.1.1:
+fast-deep-equal@^3.1.1, fast-deep-equal@^3.1.3:
   version "3.1.3"
   resolved "https://registry.yarnpkg.com/fast-deep-equal/-/fast-deep-equal-3.1.3.tgz#3a7d56b559d6cbc3eb512325244e619a65c6c525"
   integrity sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==
 
-fast-glob@^3.1.1, fast-glob@^3.2.4, fast-glob@^3.2.5:
-  version "3.2.5"
-  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.5.tgz#7939af2a656de79a4f1901903ee8adcaa7cb9661"
-  integrity sha512-2DtFcgT68wiTTiwZ2hNdJfcHNke9XOfnwmBRWXhmeKM8rF0TGwmC/Qto3S7RoZKp5cilZbxzO5iTNTQsJ+EeDg==
+fast-glob@^3.1.1, fast-glob@^3.2.5:
+  version "3.2.7"
+  resolved "https://registry.yarnpkg.com/fast-glob/-/fast-glob-3.2.7.tgz#fd6cb7a2d7e9aa7a7846111e85a196d6b2f766a1"
+  integrity sha512-rYGMRwip6lUMvYD3BTScMwT1HtAs2d71SMv66Vrxs0IekGZEjhM0pcMfjQPnknBt2zeCwQMEupiN02ZP4DiT1Q==
   dependencies:
     "@nodelib/fs.stat" "^2.0.2"
     "@nodelib/fs.walk" "^1.2.3"
-    glob-parent "^5.1.0"
+    glob-parent "^5.1.2"
     merge2 "^1.3.0"
-    micromatch "^4.0.2"
-    picomatch "^2.2.1"
+    micromatch "^4.0.4"
 
 fast-json-stable-stringify@2.1.0, fast-json-stable-stringify@^2.0.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/fast-json-stable-stringify/-/fast-json-stable-stringify-2.1.0.tgz#874bf69c6f404c2b5d99c481341399fd55892633"
   integrity sha512-lhd/wF+Lk98HZoTCtlVraHtfh5XYijIjalXck7saUtuanSDyLMxnHhSXEDJqHxD7msR8D0uCmqlkwjCV8xvwHw==
 
-fast-levenshtein@~2.0.6:
+fast-levenshtein@^2.0.6, fast-levenshtein@~2.0.6:
   version "2.0.6"
   resolved "https://registry.yarnpkg.com/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
   integrity sha1-PYpcZog6FqMMqGQ+hR8Zuqd5eRc=
 
 fast-redact@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/fast-redact/-/fast-redact-3.0.0.tgz#ac2f9e36c9f4976f5db9fb18c6ffbaf308cf316d"
-  integrity sha512-a/S/Hp6aoIjx7EmugtzLqXmcNsyFszqbt6qQ99BdG61QjBZF6shNis0BYR6TsZOQ1twYc0FN2Xdhwwbv6+KD0w==
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/fast-redact/-/fast-redact-3.0.1.tgz#d6015b971e933d03529b01333ba7f22c29961e92"
+  integrity sha512-kYpn4Y/valC9MdrISg47tZOpYBNoTXKgT9GYXFpHN/jYFs+lFkPoisY+LcBODdKVMY96ATzvzsWv+ES/4Kmufw==
 
-fast-safe-stringify@^2.0.7:
-  version "2.0.7"
-  resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.0.7.tgz#124aa885899261f68aedb42a7c080de9da608743"
-  integrity sha512-Utm6CdzT+6xsDk2m8S6uL8VHxNwI6Jub+e9NYTcAms28T84pTa25GJQV9j0CY0N1rM8hK4x6grpF2BQf+2qwVA==
+fast-safe-stringify@^2.0.8:
+  version "2.0.8"
+  resolved "https://registry.yarnpkg.com/fast-safe-stringify/-/fast-safe-stringify-2.0.8.tgz#dc2af48c46cf712b683e849b2bbd446b32de936f"
+  integrity sha512-lXatBjf3WPjmWD6DpIZxkeSsCOwqI0maYMpgDlx8g4U2qi4lbjA9oH/HD2a87G+KfsUmo5WbJFmqBZlPxtptag==
 
 fastparse@^1.1.2:
   version "1.1.2"
@@ -5305,16 +5431,16 @@ fastparse@^1.1.2:
   integrity sha512-483XLLxTVIwWK3QTrMGRqUfUpoOs/0hbQrl2oz4J0pAcm3A3bu84wxTFqGqkJzewCLdME38xJLJAxBABfQT8sQ==
 
 fastq@^1.6.0:
-  version "1.10.1"
-  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.10.1.tgz#8b8f2ac8bf3632d67afcd65dac248d5fdc45385e"
-  integrity sha512-AWuv6Ery3pM+dY7LYS8YIaCiQvUaos9OB1RyNgaOWnaX+Tik7Onvcsf8x8c+YtDeT0maYLniBip2hox5KtEXXA==
+  version "1.11.1"
+  resolved "https://registry.yarnpkg.com/fastq/-/fastq-1.11.1.tgz#5d8175aae17db61947f8b162cfc7f63264d22807"
+  integrity sha512-HOnr8Mc60eNYl1gzwp6r5RoUyAn5/glBolUzP/Ez6IFVPMPirxn/9phgL6zhOtaTy7ISwPvQ+wT+hfcRZh/bzw==
   dependencies:
     reusify "^1.0.4"
 
 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==
+  version "0.11.4"
+  resolved "https://registry.yarnpkg.com/faye-websocket/-/faye-websocket-0.11.4.tgz#7f0d9275cfdd86a1c963dc8b65fcc451edcbb1da"
+  integrity sha512-CzbClwlXAuiRQAlUyfqPgvPoNKTckTPGfwZV4ZdAhVcP2lh9KUxJg2b5GkE7XbjKQ3YJnQ9z6D9ntLAlB+tP8g==
   dependencies:
     websocket-driver ">=0.5.1"
 
@@ -5332,6 +5458,13 @@ figures@^3.0.0:
   dependencies:
     escape-string-regexp "^1.0.5"
 
+file-entry-cache@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/file-entry-cache/-/file-entry-cache-6.0.1.tgz#211b2dd9659cb0394b073e7323ac3c933d522027"
+  integrity sha512-7Gps/XWymbLk2QLYK4NzpMOrYjMhdIxXuIvy2QBsLE6ljuodKvdkWs/cpyJJ3CVIVpH0Oi1Hvg1ovbMzLdFBBg==
+  dependencies:
+    flat-cache "^3.0.4"
+
 file-uri-to-path@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/file-uri-to-path/-/file-uri-to-path-1.0.0.tgz#553a7b8446ff6f684359c445f1e37a05dacc33dd"
@@ -5384,19 +5517,11 @@ find-cache-dir@3.3.1, find-cache-dir@^3.3.1:
     pkg-dir "^4.1.0"
 
 find-parent-dir@^0.3.0:
-  version "0.3.0"
-  resolved "https://registry.yarnpkg.com/find-parent-dir/-/find-parent-dir-0.3.0.tgz#33c44b429ab2b2f0646299c5f9f718f376ff8d54"
-  integrity sha1-M8RLQpqysvBkYpnF+fcY83b/jVQ=
-
-find-up@^1.0.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/find-up/-/find-up-1.1.2.tgz#6b2e9822b1a2ce0a60ab64d610eccad53cb24d0f"
-  integrity sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=
-  dependencies:
-    path-exists "^2.0.0"
-    pinkie-promise "^2.0.0"
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/find-parent-dir/-/find-parent-dir-0.3.1.tgz#c5c385b96858c3351f95d446cab866cbf9f11125"
+  integrity sha512-o4UcykWV/XN9wm+jMEtWLPlV8RXCZnMhQI6F6OdHeSez7iiJWePw8ijOlskJZMsaQoGR/b7dH6lO02HhaTN7+A==
 
-find-up@^2.0.0:
+find-up@^2.0.0, find-up@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/find-up/-/find-up-2.1.0.tgz#45d1b7e506c717ddd482775a2b77920a3c0c57a7"
   integrity sha1-RdG35QbHF93UgndaK3eSCjwMV6c=
@@ -5426,6 +5551,14 @@ find-up@^5.0.0:
     locate-path "^6.0.0"
     path-exists "^4.0.0"
 
+flat-cache@^3.0.4:
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/flat-cache/-/flat-cache-3.0.4.tgz#61b0338302b2fe9f957dcc32fc2a87f1c3048b11"
+  integrity sha512-dm9s5Pw7Jc0GvMYbshN6zchCA9RgQlzzEZX3vylR9IqFfS8XciblUXOKfW6SiuJ0e13eDYZoZV5wdrev7P3Nwg==
+  dependencies:
+    flatted "^3.1.0"
+    rimraf "^3.0.2"
+
 flatstr@^1.0.12:
   version "1.0.12"
   resolved "https://registry.yarnpkg.com/flatstr/-/flatstr-1.0.12.tgz#c2ba6a08173edbb6c9640e3055b95e287ceb5931"
@@ -5436,15 +5569,20 @@ flatted@^2.0.1:
   resolved "https://registry.yarnpkg.com/flatted/-/flatted-2.0.2.tgz#4575b21e2bcee7434aa9be662f4b7b5f9c2b5138"
   integrity sha512-r5wGx7YeOwNWNlCA0wQ86zKyDLMQr+/RB8xy74M4hTphfmjlijTSSXGuH8rnvKZnfT9i+75zmd8jcKdMR4O6jA==
 
+flatted@^3.1.0:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/flatted/-/flatted-3.2.1.tgz#bbef080d95fca6709362c73044a1634f7c6e7d05"
+  integrity sha512-OMQjaErSFHmHqZe+PSidH5n8j3O0F2DdnVh8JB4j4eUQ2k6KvB0qGfrKIhapvez5JerBbmWkaLYUYWISaESoXg==
+
 flatten@^1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/flatten/-/flatten-1.0.3.tgz#c1283ac9f27b368abc1e36d1ff7b04501a30356b"
   integrity sha512-dVsPA/UwQ8+2uoFe5GHtiBMu48dWLTdsuEd7CKGlZlD78r1TTWBvDuFaFGKCo/ZfEr95Uk56vZoX86OsHkUeIg==
 
 follow-redirects@^1.0.0:
-  version "1.13.2"
-  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.13.2.tgz#dd73c8effc12728ba5cf4259d760ea5fb83e3147"
-  integrity sha512-6mPTgLxYm3r6Bkkg0vNM0HTjfGrOEtsfbhagQvbxDEsEkpNhw582upBaoRZylzen6krEmxXJgt9Ju6HiI4O7BA==
+  version "1.14.1"
+  resolved "https://registry.yarnpkg.com/follow-redirects/-/follow-redirects-1.14.1.tgz#d9114ded0a1cfdd334e164e6662ad02bfd91ff43"
+  integrity sha512-HWqDgT7ZEkqRzBvc2s64vSZ/hfOceEol3ac/7tKwzuvEyWx3/4UegXh5oBOIotkGsObyk3xznnSRVADBgWSQVg==
 
 font-awesome@^4.7.0:
   version "4.7.0"
@@ -5492,15 +5630,10 @@ form-data@~2.3.2:
     combined-stream "^1.0.6"
     mime-types "^2.1.12"
 
-forwarded@~0.1.2:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.1.2.tgz#98c23dab1175657b8c0573e8ceccd91b0ff18c84"
-  integrity sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=
-
-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==
+forwarded@0.2.0:
+  version "0.2.0"
+  resolved "https://registry.yarnpkg.com/forwarded/-/forwarded-0.2.0.tgz#2269936428aad4c15c7ebe9779a84bf0b2a81811"
+  integrity sha512-buRG0fpBtRHSTCOASe6hD258tEubFoRLb4ZNA6NxMVHNw2gOcwHo9wyablzMzOA5z9xA9L1KNjk/Nt6MT9aYow==
 
 fragment-cache@^0.2.1:
   version "0.2.1"
@@ -5528,6 +5661,15 @@ fs-extra@^8.1.0:
     jsonfile "^4.0.0"
     universalify "^0.1.0"
 
+fs-extra@~7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9"
+  integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==
+  dependencies:
+    graceful-fs "^4.1.2"
+    jsonfile "^4.0.0"
+    universalify "^0.1.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"
@@ -5535,10 +5677,10 @@ fs-minipass@^2.0.0, fs-minipass@^2.1.0:
   dependencies:
     minipass "^3.0.0"
 
-fs-monkey@1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/fs-monkey/-/fs-monkey-1.0.1.tgz#4a82f36944365e619f4454d9fff106553067b781"
-  integrity sha512-fcSa+wyTqZa46iWweI7/ZiUfegOZl0SG8+dltIwFXo7+zYU9J9kpS3NB6pZcSlJdhvIwp81Adx2XhZorncxiaA==
+fs-monkey@1.0.3:
+  version "1.0.3"
+  resolved "https://registry.yarnpkg.com/fs-monkey/-/fs-monkey-1.0.3.tgz#ae3ac92d53bb328efe0e9a1d9541f6ad8d48e2d3"
+  integrity sha512-cybjIfiiE+pTWicSCLFHSrXZ6EilF30oh91FDP9S2B051prEa7QWfrVTQm10/dDpswBDXZugPa1Ogu8Yh+HV0Q==
 
 fs.realpath@^1.0.0:
   version "1.0.0"
@@ -5553,7 +5695,7 @@ fsevents@^1.2.7:
     bindings "^1.5.0"
     nan "^2.12.1"
 
-fsevents@~2.3.1:
+fsevents@~2.3.2:
   version "2.3.2"
   resolved "https://registry.yarnpkg.com/fsevents/-/fsevents-2.3.2.tgz#8a526f78b8fdf4623b709e0b975c52c24c02fd1a"
   integrity sha512-xiqMQR4xAeHTuB9uWm+fFRcIOgKBMiOBP+eXiyT7jsgVCq1bkVygt00oASowB7EdtpOHaaPgKt812P9ab+DDKA==
@@ -5563,6 +5705,11 @@ function-bind@^1.1.1:
   resolved "https://registry.yarnpkg.com/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
   integrity sha512-yIovAzMX49sF8Yl58fSCWJ5svSLuaibPxXQJFLmBObTuCr0Mf1KiPopGM9NiFjiYBCbfaa2Fh6breQ6ANVTI0A==
 
+functional-red-black-tree@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/functional-red-black-tree/-/functional-red-black-tree-1.0.1.tgz#1b0ab3bd553b2a0d6399d29c0e3ea0b252078327"
+  integrity sha1-GwqzvVU7Kg1jmdKcDj6gslIHgyc=
+
 furi@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/furi/-/furi-2.0.0.tgz#13d85826a1af21acc691da6254b3888fc39f0b4a"
@@ -5571,19 +5718,20 @@ furi@^2.0.0:
     "@types/is-windows" "^1.0.0"
     is-windows "^1.0.2"
 
-gauge@~2.7.3:
-  version "2.7.4"
-  resolved "https://registry.yarnpkg.com/gauge/-/gauge-2.7.4.tgz#2c03405c7538c39d7eb37b317022e325fb018bf7"
-  integrity sha1-LANAXHU4w51+s3sxcCLjJfsBi/c=
+gauge@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/gauge/-/gauge-4.0.0.tgz#afba07aa0374a93c6219603b1fb83eaa2264d8f8"
+  integrity sha512-F8sU45yQpjQjxKkm1UOAhf0U/O0aFt//Fl7hsrNVto+patMHjs7dPI9mFOGUKbhrgKm0S3EjW3scMFuQmWSROw==
   dependencies:
-    aproba "^1.0.3"
+    ansi-regex "^5.0.1"
+    aproba "^1.0.3 || ^2.0.0"
+    color-support "^1.1.2"
     console-control-strings "^1.0.0"
-    has-unicode "^2.0.0"
-    object-assign "^4.1.0"
+    has-unicode "^2.0.1"
     signal-exit "^3.0.0"
-    string-width "^1.0.1"
-    strip-ansi "^3.0.1"
-    wide-align "^1.1.0"
+    string-width "^4.2.3"
+    strip-ansi "^6.0.1"
+    wide-align "^1.1.2"
 
 gensync@^1.0.0-beta.1, gensync@^1.0.0-beta.2:
   version "1.0.0-beta.2"
@@ -5595,7 +5743,7 @@ get-caller-file@^2.0.1, get-caller-file@^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:
+get-intrinsic@^1.0.2, get-intrinsic@^1.1.1:
   version "1.1.1"
   resolved "https://registry.yarnpkg.com/get-intrinsic/-/get-intrinsic-1.1.1.tgz#15f59f376f855c446963948f0d24cd3637b4abc6"
   integrity sha512-kWZrnVM42QCiEA2Ig1bG8zjoIMOgxWwYCEeNdwY6Tv/cOSeGpcoX4pXHfKUxNKVoArnrEr2e9srnAxxGIraS9Q==
@@ -5604,27 +5752,6 @@ get-intrinsic@^1.0.2:
     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"
-  integrity sha1-xztInAbYDMVTbCyFP54FIyBWly0=
-  dependencies:
-    hosted-git-info "^2.1.4"
-    meow "^3.3.0"
-    normalize-package-data "^2.3.0"
-    parse-github-repo-url "^1.3.0"
-    through2 "^2.0.0"
-
-get-port@^3.1.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/get-port/-/get-port-3.2.0.tgz#dd7ce7de187c06c8bf353796ac71e099f0980ebc"
-  integrity sha1-3Xzn3hh8Bsi/NTeWrHHgmfCYDrw=
-
-get-stdin@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/get-stdin/-/get-stdin-4.0.1.tgz#b968c6b0a04384324902e8bf1a5df32579a450fe"
-  integrity sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=
-
 get-stream@^4.0.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/get-stream/-/get-stream-4.1.0.tgz#c1b255575f3dc21d59bfc79cd3d2b46b1c3a54b5"
@@ -5658,7 +5785,7 @@ gh-got@^9.0.0:
   dependencies:
     got "^10.5.7"
 
-git-raw-commits@^2.0.0, git-raw-commits@^2.0.10, git-raw-commits@^2.0.8:
+git-raw-commits@^2.0.0, git-raw-commits@^2.0.10:
   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==
@@ -5669,29 +5796,6 @@ git-raw-commits@^2.0.0, git-raw-commits@^2.0.10, git-raw-commits@^2.0.8:
     split2 "^3.0.0"
     through2 "^4.0.0"
 
-git-remote-origin-url@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/git-remote-origin-url/-/git-remote-origin-url-2.0.0.tgz#5282659dae2107145a11126112ad3216ec5fa65f"
-  integrity sha1-UoJlna4hBxRaERJhEq0yFuxfpl8=
-  dependencies:
-    gitconfiglocal "^1.0.0"
-    pify "^2.3.0"
-
-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 "^8.0.0"
-    semver "^6.0.0"
-
-gitconfiglocal@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/gitconfiglocal/-/gitconfiglocal-1.0.0.tgz#41d045f3851a5ea88f03f24ca1c6178114464b9b"
-  integrity sha1-QdBF84UaXqiPA/JMocYXgRRGS5s=
-  dependencies:
-    ini "^1.3.2"
-
 glob-parent@^3.1.0:
   version "3.1.0"
   resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-3.1.0.tgz#9e6af6299d8d3bd2bd40430832bd113df906c5ae"
@@ -5700,10 +5804,17 @@ glob-parent@^3.1.0:
     is-glob "^3.1.0"
     path-dirname "^1.0.0"
 
-glob-parent@^5.1.0, glob-parent@^5.1.1, glob-parent@~5.1.0:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.1.tgz#b6c1ef417c4e5663ea498f1c45afac6916bbc229"
-  integrity sha512-FnI+VGOpnlGHWZxthPGR+QhR78fuiK0sNLkHQv+bL9fQi57lNNdquIbna/WrfROrolq8GK5Ek6BiMwqL/voRYQ==
+glob-parent@^5.1.2, glob-parent@~5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-5.1.2.tgz#869832c58034fe68a4093c17dc15e8340d8401c4"
+  integrity sha512-AOIgSQCepiJYwP3ARnGx+5VnTu2HBYdzbGP45eLw1vr3zB3vZLeyed1sC9hnbcOc9/SrMyM5RPQrkGz4aS9Zow==
+  dependencies:
+    is-glob "^4.0.1"
+
+glob-parent@^6.0.0:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/glob-parent/-/glob-parent-6.0.1.tgz#42054f685eb6a44e7a7d189a96efa40a54971aa7"
+  integrity sha512-kEVjS71mQazDBHKcsq4E9u/vUzaLcw1A8EtUeydawvIWQCJM0qQ08G1H7/XTjFUulla6XQiDOG6MXSaG0HDKog==
   dependencies:
     is-glob "^4.0.1"
 
@@ -5712,22 +5823,10 @@ glob-to-regexp@^0.4.1:
   resolved "https://registry.yarnpkg.com/glob-to-regexp/-/glob-to-regexp-0.4.1.tgz#c75297087c851b9a578bd217dd59a92f59fe546e"
   integrity sha512-lkX1HJXwyMcprw/5YUZc2s7DrpAiHB21/V+E1rHUrVNokkvB6bqMzT0VfV6/86ZNabt1k14YOIaT7nDvOX3Iiw==
 
-glob@7.1.2:
-  version "7.1.2"
-  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.2.tgz#c19c9df9a028702d678612384a6552404c636d15"
-  integrity sha512-MJTUg1kjuLeQCJ+ccE4Vpa6kKVXkPYJ2mOCQyUuKLcLQsdrMCpBPUi8qVE6+YuaJkozeA9NusTAw3hLr8Xe5EQ==
-  dependencies:
-    fs.realpath "^1.0.0"
-    inflight "^1.0.4"
-    inherits "2"
-    minimatch "^3.0.4"
-    once "^1.3.0"
-    path-is-absolute "^1.0.0"
-
-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==
+glob@7.1.7, 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, glob@^7.1.7:
+  version "7.1.7"
+  resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.7.tgz#3b193e9233f01d42d0b3f78294bbeeb418f94a90"
+  integrity sha512-OvD9ENzPLbegENnYP5UUfJIirTg4+XwMWGaQfQTY0JenxNvvIKP3U3/tAQSPIu/lHxXYSZmpXlUHeqAIdKzBLQ==
   dependencies:
     fs.realpath "^1.0.0"
     inflight "^1.0.4"
@@ -5752,10 +5851,17 @@ globals@^11.1.0:
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
+globals@^13.6.0, globals@^13.9.0:
+  version "13.10.0"
+  resolved "https://registry.yarnpkg.com/globals/-/globals-13.10.0.tgz#60ba56c3ac2ca845cfbf4faeca727ad9dd204676"
+  integrity sha512-piHC3blgLGFjvOuMmWZX60f+na1lXFDhQXBf1UYp2fXPXqvEUbOhNwi6BsQ0bQishwedgnjkwv1d9zKf+MWw3g==
+  dependencies:
+    type-fest "^0.20.2"
+
 globby@^11.0.3:
-  version "11.0.3"
-  resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.3.tgz#9b1f0cb523e171dd1ad8c7b2a9fb4b644b9593cb"
-  integrity sha512-ffdmosjA807y7+lA1NM0jELARVmYul/715xiILEjo3hBLPTcirgQNnXECn5g3mtR8TOLCVbkfua1Hpen25/Xcg==
+  version "11.0.4"
+  resolved "https://registry.yarnpkg.com/globby/-/globby-11.0.4.tgz#2cbaff77c2f2a62e71e9b2813a67b97a3a3001a5"
+  integrity sha512-9O4MVG9ioZJ08ffbcyVYyLOJLk5JQ688pJ4eMGLpdWLHq/Wr1D9BlriLQyL0E+jbkuePVZXYFj47QM/v093wHg==
   dependencies:
     array-union "^2.1.0"
     dir-glob "^3.0.1"
@@ -5808,7 +5914,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.2, graceful-fs@^4.1.3, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.3, graceful-fs@^4.2.4:
+graceful-fs@^4.1.11, graceful-fs@^4.1.2, graceful-fs@^4.1.3, graceful-fs@^4.1.6, graceful-fs@^4.2.0, graceful-fs@^4.2.4, graceful-fs@^4.2.6:
   version "4.2.6"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.6.tgz#ff040b2b0853b23c3d31027523706f1885d76bee"
   integrity sha512-nTnJ528pbqxYanhpDYsi4Rd8MAeaBA67+RZ10CM1m3bTAVFEDcd5AuA4a6W5YkGZ1iNXHzZz8T6TBKLeBuNriQ==
@@ -5818,7 +5924,7 @@ handle-thing@^2.0.0:
   resolved "https://registry.yarnpkg.com/handle-thing/-/handle-thing-2.0.1.tgz#857f79ce359580c340d43081cc648970d0bb234e"
   integrity sha512-9Qn4yBxelxoh2Ow62nP+Ka/kMnOXRi8BXnRaUwezLNhqelnN49xKz4F/dPP8OYLxLxq6JDtZb2i9XznUQbNPTg==
 
-handlebars@4.7.7, handlebars@^4.7.6:
+handlebars@4.7.7:
   version "4.7.7"
   resolved "https://registry.yarnpkg.com/handlebars/-/handlebars-4.7.7.tgz#9ce33416aad02dbd6c8fafa8240d5d98004945a1"
   integrity sha512-aAcXm5OAfE/8IXkcZvCepKU3VzW1/39Fb5ZuqMtgI/hT8X2YgoMvBY5dLhq/cpOvw7Lk1nK/UF71aLG/ZnVYRA==
@@ -5855,6 +5961,11 @@ has-ansi@^2.0.0:
   dependencies:
     ansi-regex "^2.0.0"
 
+has-bigints@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/has-bigints/-/has-bigints-1.0.1.tgz#64fe6acb020673e3b78db035a5af69aa9d07b113"
+  integrity sha512-LSBS2LjbNBTf6287JEbEzvJgftkF5qFkmCo9hDRpAzKhUOlJ+hx8dd4USs00SgsUNwc4617J9ki5YtEClM2ffA==
+
 has-flag@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
@@ -5865,12 +5976,12 @@ has-flag@^4.0.0:
   resolved "https://registry.yarnpkg.com/has-flag/-/has-flag-4.0.0.tgz#944771fd9c81c81265c4d6941860da06bb59479b"
   integrity sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==
 
-has-symbols@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.1.tgz#9f5214758a44196c406d9bd76cebf81ec2dd31e8"
-  integrity sha512-PLcsoqu++dmEIZB+6totNFKq/7Do+Z0u4oT0zKOJNl3lYK6vGwwu2hjHs+68OEZbTjiUE9bgOABXbP/GvrS0Kg==
+has-symbols@^1.0.1, has-symbols@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/has-symbols/-/has-symbols-1.0.2.tgz#165d3070c00309752a1236a479331e3ac56f1423"
+  integrity sha512-chXa79rL/UC2KlX17jo3vRGz0azaWEx5tGqZg5pO3NUyEJVB17dMruQlzCCOfUvElghKcm5194+BCRvi2Rv/Gw==
 
-has-unicode@^2.0.0:
+has-unicode@^2.0.1:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/has-unicode/-/has-unicode-2.0.1.tgz#e0e6fe6a28cf51138855e086d1691e771de2a8b9"
   integrity sha1-4Ob+aijPUROIVeCG0Wkedx3iqLk=
@@ -5906,34 +6017,41 @@ has-values@^1.0.0:
     is-number "^3.0.0"
     kind-of "^4.0.0"
 
-has@^1.0.0, has@^1.0.1, has@^1.0.3:
+has@^1.0.1, has@^1.0.3:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
   integrity sha512-f2dvO0VU6Oej7RkWJGrehjbzMAjFp5/VKPp5tTpWIV4JHHZK1/BxbFRtf/siA2SWTe09caDmVtYYzWEIbBS4zw==
   dependencies:
     function-bind "^1.1.1"
 
+hdr-histogram-js@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/hdr-histogram-js/-/hdr-histogram-js-2.0.1.tgz#ecb1ff2bcb6181c3e93ff4af9472c28c7e97284e"
+  integrity sha512-uPZxl1dAFnjUFHWLZmt93vUUvtHeaBay9nVNHu38SdOjMSF/4KqJUqa1Seuj08ptU1rEb6AHvB41X8n/zFZ74Q==
+  dependencies:
+    "@assemblyscript/loader" "^0.10.1"
+    base64-js "^1.2.0"
+    pako "^1.0.3"
+
+hdr-histogram-percentiles-obj@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/hdr-histogram-percentiles-obj/-/hdr-histogram-percentiles-obj-3.0.0.tgz#9409f4de0c2dda78e61de2d9d78b1e9f3cba283c"
+  integrity sha512-7kIufnBqdsBGcSZLPJwqHT3yhk1QTsSlFsVD3kx5ixH/AlgBs9yM1q6DPhXZ8f8gtdqgh7N7/5btRLpQsS2gHw==
+
 hex-color-regex@^1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/hex-color-regex/-/hex-color-regex-1.1.0.tgz#4c06fccb4602fe2602b3c93df82d7e7dbf1a8a8e"
   integrity sha512-l9sfDFsuqtOqKDsQdqrMRk0U85RZc0RtOR9yPI7mRVOa4FsR/BVnZ0shmQRM96Ji99kYZP/7hn1cedc1+ApsTQ==
 
-hosted-git-info@^2.1.4, hosted-git-info@^2.7.1:
-  version "2.8.8"
-  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.6:
-  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"
+hosted-git-info@^2.1.4:
+  version "2.8.9"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-2.8.9.tgz#dffc0bf9a21c02209090f2aa69429e1414daf3f9"
+  integrity sha512-mxIDAb9Lsm6DoOJ7xH+5+X4y1LU/4Hi50L9C5sIswK3JzULS4bwk1FvjdBgvYR4bzT4tuUQiC15FE2f5HbLvYw==
 
 hosted-git-info@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.0.1.tgz#710ef5452ea429a844abc33c981056e7371edab7"
-  integrity sha512-eT7NrxAsppPRQEBSwKSosReE+v8OzABwEScQYk5d4uxaEPlzxTIku7LINXtBGalthkLhJnq5lBI89PfK43zAKg==
+  version "4.0.2"
+  resolved "https://registry.yarnpkg.com/hosted-git-info/-/hosted-git-info-4.0.2.tgz#5e425507eede4fea846b7262f0838456c4209961"
+  integrity sha512-c9OGXbZ3guC/xOlCg1Ci/VgWlwsqDv1yMQL1CWqXDL0hDjXuNcq0zuR4xqPSuasI3kqFDhqSyTjREz5gzq0fXg==
   dependencies:
     lru-cache "^6.0.0"
 
@@ -5957,11 +6075,6 @@ hsla-regex@^1.0.0:
   resolved "https://registry.yarnpkg.com/hsla-regex/-/hsla-regex-1.0.0.tgz#c1ce7a3168c8c6614033a4b5f7877f3b225f9c38"
   integrity sha1-wc56MWjIxmFAM6S194d/OyJfnDg=
 
-html-comment-regex@^1.1.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/html-comment-regex/-/html-comment-regex-1.1.2.tgz#97d4688aeb5c81886a364faa0cad1dda14d433a7"
-  integrity sha512-P+M65QY2JQ5Y0G9KKdlDpo0zK+/OHptU5AaBwUfAIDJZk1MYf32Frm84EcOytfJE0t5JvkAnKlmjsXDnWzCJmQ==
-
 html-encoding-sniffer@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/html-encoding-sniffer/-/html-encoding-sniffer-1.0.2.tgz#e70d84b94da53aa375e11fe3a351be6642ca46f8"
@@ -6056,6 +6169,17 @@ http-proxy-middleware@0.19.1:
     lodash "^4.17.11"
     micromatch "^3.1.10"
 
+http-proxy-middleware@^1.0.0:
+  version "1.3.1"
+  resolved "https://registry.yarnpkg.com/http-proxy-middleware/-/http-proxy-middleware-1.3.1.tgz#43700d6d9eecb7419bf086a128d0f7205d9eb665"
+  integrity sha512-13eVVDYS4z79w7f1+NPllJtOQFx/FdUW4btIvVRMaRlUY9VGstAbo5MOhLEuUgZFRHn3x50ufn25zkj/boZnEg==
+  dependencies:
+    "@types/http-proxy" "^1.17.5"
+    http-proxy "^1.18.1"
+    is-glob "^4.0.1"
+    is-plain-obj "^3.0.0"
+    micromatch "^4.0.2"
+
 http-proxy@^1.17.0, http-proxy@^1.18.1:
   version "1.18.1"
   resolved "https://registry.yarnpkg.com/http-proxy/-/http-proxy-1.18.1.tgz#401541f0534884bbf95260334e72f88ee3976549"
@@ -6102,10 +6226,10 @@ humanize-ms@^1.2.1:
   dependencies:
     ms "^2.0.0"
 
-husky@6.0.0:
-  version "6.0.0"
-  resolved "https://registry.yarnpkg.com/husky/-/husky-6.0.0.tgz#810f11869adf51604c32ea577edbc377d7f9319e"
-  integrity sha512-SQS2gDTB7tBN486QSoKPKQItZw97BMOd+Kdb6ghfpBc0yXyzrddI0oDV5MkDAbuB4X2mO3/nj60TRMcYxwzZeQ==
+husky@7.0.1, husky@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/husky/-/husky-7.0.1.tgz#579f4180b5da4520263e8713cc832942b48e1f1c"
+  integrity sha512-gceRaITVZ+cJH9sNHqx5tFwbzlLCVxtVZcusME8JYQ8Edy5mpGDOqD8QBCdMhpyo9a+JXddnujQ4rpY2Ff9SJA==
 
 iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4:
   version "0.4.24"
@@ -6115,9 +6239,9 @@ iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@^0.4.4:
     safer-buffer ">= 2.1.2 < 3"
 
 iconv-lite@^0.6.2:
-  version "0.6.2"
-  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.2.tgz#ce13d1875b0c3a674bd6a04b7f76b01b1b6ded01"
-  integrity sha512-2y91h5OpQlolefMPmUlivelittSWy0rP+oYVpn6A7GwVHNE8AWzoYOBNmlwks3LobaJxgHCYZAnyNo2GgpNRNQ==
+  version "0.6.3"
+  resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.3.tgz#a52f80bf38da1952eb5c681790719871a1a72501"
+  integrity sha512-4fCk79wshMdzMp2rH06qWrJE4iolqLhCUH+OiuIgU++RB0+94NlDL81atO7GX55uUKueo0txHNtvEyI6D7WdMw==
   dependencies:
     safer-buffer ">= 2.1.2 < 3.0.0"
 
@@ -6131,13 +6255,18 @@ ieee754@^1.1.13:
   resolved "https://registry.yarnpkg.com/ieee754/-/ieee754-1.2.1.tgz#8eb7a10a63fff25d15a57b001586d177d1b0d352"
   integrity sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==
 
-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==
+ignore-walk@^4.0.1:
+  version "4.0.1"
+  resolved "https://registry.yarnpkg.com/ignore-walk/-/ignore-walk-4.0.1.tgz#fc840e8346cf88a3a9380c5b17933cd8f4d39fa3"
+  integrity sha512-rzDQLaW4jQbh2YrOFlJdCtX8qgJTehFRYiUB2r1osqTeDzV/3+Jh8fz1oAPzUThf3iku8Ds4IDqawI5d8mUiQw==
   dependencies:
     minimatch "^3.0.4"
 
+ignore@^4.0.6:
+  version "4.0.6"
+  resolved "https://registry.yarnpkg.com/ignore/-/ignore-4.0.6.tgz#750e3db5862087b4737ebac8207ffd1ef27b25fc"
+  integrity sha512-cyFDKrqc/YdcWFniJhzI42+AzS+gNwmUzOSFcRCQYwySuBBBy/KjuxWLZ/FHEH6Moq1NizMOBWyTcv8O4OZIMg==
+
 ignore@^5.1.4:
   version "5.1.8"
   resolved "https://registry.yarnpkg.com/ignore/-/ignore-5.1.8.tgz#f150a8b50a34289b33e22f5889abd4d8016f0e57"
@@ -6153,20 +6282,7 @@ immediate@~3.0.5:
   resolved "https://registry.yarnpkg.com/immediate/-/immediate-3.0.6.tgz#9db1dbd0faf8de6fbe0f5dd5e56bb606280de69b"
   integrity sha1-nbHb0Pr43m++D13V5Wu2BigN5ps=
 
-immutable@^3.8.2:
-  version "3.8.2"
-  resolved "https://registry.yarnpkg.com/immutable/-/immutable-3.8.2.tgz#c2439951455bb39913daf281376f1530e104adf3"
-  integrity sha1-wkOZUUVbs5kT2vKBN28VMOEErfM=
-
-import-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:
+import-fresh@^3.0.0, import-fresh@^3.2.1:
   version "3.3.0"
   resolved "https://registry.yarnpkg.com/import-fresh/-/import-fresh-3.3.0.tgz#37162c25fcb9ebaa2e6e53d5b4d88ce17d9e0c2b"
   integrity sha512-veYYhQa+D1QBKznvhUHxb8faxlrwUnxseDAbAp457E0wLNio2bOSKnjYDhMj+YiAq61xrMGhQk9iXVk5FzgQMw==
@@ -6174,6 +6290,11 @@ import-fresh@^3.2.1:
     parent-module "^1.0.0"
     resolve-from "^4.0.0"
 
+import-lazy@~4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/import-lazy/-/import-lazy-4.0.0.tgz#e8eb627483a0a43da3c03f3e35548be5cb0cc153"
+  integrity sha512-rKtvo6a868b5Hu3heneU+L4yEQ4jYKLtjpnPeUdK7h0yzXGmyBTypknlkCvHFBqfX9YlorEiMM6Dnq/5atfHkw==
+
 import-local@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/import-local/-/import-local-2.0.0.tgz#55070be38a5993cf18ef6db7e961f5bee5c5a09d"
@@ -6187,13 +6308,6 @@ imurmurhash@^0.1.4:
   resolved "https://registry.yarnpkg.com/imurmurhash/-/imurmurhash-0.1.4.tgz#9218b9b2b928a238b13dc4fb6b6d576f231453ea"
   integrity sha1-khi5srkoojixPcT7a21XbyMUU+o=
 
-indent-string@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-2.1.0.tgz#8e2d48348742121b4a8218b7a137e9a52049dc80"
-  integrity sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=
-  dependencies:
-    repeating "^2.0.0"
-
 indent-string@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/indent-string/-/indent-string-4.0.0.tgz#624f8f4497d619b2d9768531d58f4122854d7251"
@@ -6232,7 +6346,7 @@ ini@2.0.0:
   resolved "https://registry.yarnpkg.com/ini/-/ini-2.0.0.tgz#e5fd556ecdd5726be978fa1001862eacb0a94bc5"
   integrity sha512-7PnF4oN3CvZF23ADhA5wRaYEQpJ8qygSkbtTXWBeXWXmEVRXK+1ITciHWwHhsjv1TmW0MgacIv6hEi5pX5NQdA==
 
-ini@^1.3.2, ini@^1.3.4:
+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==
@@ -6244,21 +6358,22 @@ injection-js@^2.4.0:
   dependencies:
     tslib "^2.0.0"
 
-inquirer@8.0.0, inquirer@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-8.0.0.tgz#957a46db1abcf0fdd2ab82deb7470e90afc7d0ac"
-  integrity sha512-ON8pEJPPCdyjxj+cxsYRe6XfCJepTxANdNnTebsTuQgXpRyZRRT9t4dJwjRubgmvn20CLSEnozRUayXyM9VTXA==
+inquirer@8.1.2, inquirer@^8.0.0:
+  version "8.1.2"
+  resolved "https://registry.yarnpkg.com/inquirer/-/inquirer-8.1.2.tgz#65b204d2cd7fb63400edd925dfe428bafd422e3d"
+  integrity sha512-DHLKJwLPNgkfwNmsuEUKSejJFbkv0FMO9SMiQbjI3n5NQuCrSIBqP66ggqyz2a6t2qEolKrMjhQ3+W/xXgUQ+Q==
   dependencies:
     ansi-escapes "^4.2.1"
-    chalk "^4.1.0"
+    chalk "^4.1.1"
     cli-cursor "^3.1.0"
     cli-width "^3.0.0"
     external-editor "^3.0.3"
     figures "^3.0.0"
     lodash "^4.17.21"
     mute-stream "0.0.8"
+    ora "^5.3.0"
     run-async "^2.4.0"
-    rxjs "^6.6.6"
+    rxjs "^7.2.0"
     string-width "^4.1.0"
     strip-ansi "^6.0.0"
     through "^2.3.6"
@@ -6271,11 +6386,6 @@ internal-ip@^4.3.0:
     default-gateway "^4.2.0"
     ipaddr.js "^1.9.0"
 
-interpret@^1.0.0:
-  version "1.4.0"
-  resolved "https://registry.yarnpkg.com/interpret/-/interpret-1.4.0.tgz#665ab8bc4da27a774a40584e812e3e0fa45b1a1e"
-  integrity sha512-agE4QfB2Lkp9uICn7BAqoscw4SZP9kTE2hxiFI3jBPmXJfdqiahTbUuKGsMoN2GtqL9AxhYioAcVvgsb1HvRbA==
-
 ip-regex@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/ip-regex/-/ip-regex-2.1.0.tgz#fa78bf5d2e6913c911ce9f819ee5146bb6d844e9"
@@ -6291,11 +6401,6 @@ ipaddr.js@1.9.1, ipaddr.js@^1.9.0:
   resolved "https://registry.yarnpkg.com/ipaddr.js/-/ipaddr.js-1.9.1.tgz#bff38543eeb8984825079ff3a2a8e6cbd46781b3"
   integrity sha512-0KI/607xoxSToH7GjN1FfSbLoU0+btTicjsQSWQlh/hZykN8KpmMf7uYwPW3R+akZ6R/w18ZlXSHBYXiYUPO3g==
 
-is-absolute-url@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-2.1.0.tgz#50530dfb84fcc9aa7dbe7852e83a37b93b9f2aa6"
-  integrity sha1-UFMN+4T8yap9vnhS6Do3uTufKqY=
-
 is-absolute-url@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/is-absolute-url/-/is-absolute-url-3.0.3.tgz#96c6a22b6a23929b11ea0afb1836c36ad4a5d698"
@@ -6327,10 +6432,10 @@ is-arrayish@^0.2.1:
   resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.2.1.tgz#77c99840527aa8ecb1a8ba697b80645a7a926a9d"
   integrity sha1-d8mYQFJ6qOyxqLppe4BkWnqSap0=
 
-is-arrayish@^0.3.1:
-  version "0.3.2"
-  resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.2.tgz#4574a2ae56f7ab206896fb431eaeed066fdf8f03"
-  integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ==
+is-bigint@^1.0.1:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/is-bigint/-/is-bigint-1.0.2.tgz#ffb381442503235ad245ea89e45b3dbff040ee5a"
+  integrity sha512-0JV5+SOCQkIdzjBK9buARcV804Ddu7A0Qet6sHi3FimE9ne6m4BGQZfRn+NZiXbBk4F4XmHfDZIipLj9pX8dSA==
 
 is-binary-path@^1.0.0:
   version "1.0.1"
@@ -6346,17 +6451,24 @@ is-binary-path@~2.1.0:
   dependencies:
     binary-extensions "^2.0.0"
 
+is-boolean-object@^1.1.0:
+  version "1.1.1"
+  resolved "https://registry.yarnpkg.com/is-boolean-object/-/is-boolean-object-1.1.1.tgz#3c0878f035cb821228d350d2e1e36719716a3de8"
+  integrity sha512-bXdQWkECBUIAcCkeH1unwJLIpZYaa5VvuygSyS/c2lf719mTKZDU5UdDRlpd01UjADgmW8RfqaP+mRaVPdr/Ng==
+  dependencies:
+    call-bind "^1.0.2"
+
 is-buffer@^1.1.5:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/is-buffer/-/is-buffer-1.1.6.tgz#efaa2ea9daa0d7ab2ea13a97b2b8ad51fefbe8be"
   integrity sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==
 
-is-callable@^1.1.4, is-callable@^1.2.2:
+is-callable@^1.1.4, is-callable@^1.2.3:
   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.1.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=
@@ -6368,10 +6480,10 @@ is-color-stop@^1.0.0, is-color-stop@^1.1.0:
     rgb-regex "^1.0.1"
     rgba-regex "^1.0.0"
 
-is-core-module@^2.2.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==
+is-core-module@^2.1.0, is-core-module@^2.2.0, is-core-module@^2.4.0:
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.5.0.tgz#f754843617c70bfd29b7bd87327400cda5c18491"
+  integrity sha512-TXCMSDsEHMEEZ6eCA8rwRDbLu55MRGmrctljsBX/2v1d9/GzqHOxW5c5oPSgrUt2vBFXebu9rGqckXGPWOlYpg==
   dependencies:
     has "^1.0.3"
 
@@ -6390,9 +6502,9 @@ is-data-descriptor@^1.0.0:
     kind-of "^6.0.0"
 
 is-date-object@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.2.tgz#bda736f2cd8fd06d32844e7743bfa7494c3bfd7e"
-  integrity sha512-USlDT524woQ08aoZFzh3/Z6ch9Y/EWXEHQ/AaRN0SkKq4t2Jw2R2339tSXmwuVoY7LLlBCbOIlx2myP/L5zk0g==
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-date-object/-/is-date-object-1.0.4.tgz#550cfcc03afada05eea3dd30981c7b09551f73e5"
+  integrity sha512-/b4ZVsG7Z5XVtIxs/h9W8nvfLgSAyKYdtGWQLbqy6jA1icmgjf8WCoTKgeS4wy5tYaPePouzFMANbnj94c2Z+A==
 
 is-descriptor@^0.1.0:
   version "0.1.6"
@@ -6412,15 +6524,10 @@ 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, is-docker@^2.1.1:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.1.1.tgz#4125a88e44e450d384e09047ede71adc2d144156"
-  integrity sha512-ZOoqiXfEwtGknTiuDEy8pN2CfE3TxMHprvNer1mXiqwkOT77Rw3YVrUQ52EqAOU3QAWDQ+bQdx7HJzrv7LS2Hw==
+  version "2.2.1"
+  resolved "https://registry.yarnpkg.com/is-docker/-/is-docker-2.2.1.tgz#33eeabe23cfe86f14bde4408a02c0cfb853acdaa"
+  integrity sha512-F+i2BKsFrH66iaUFc0woD8sLy8getkwTwtOBjvs56Cx4CgJDeKQeqfz8wAYiSb8JOprWhHH5p77PbmYCvvUuXQ==
 
 is-extendable@^0.1.0, is-extendable@^0.1.1:
   version "0.1.1"
@@ -6439,18 +6546,6 @@ is-extglob@^2.1.0, is-extglob@^2.1.1:
   resolved "https://registry.yarnpkg.com/is-extglob/-/is-extglob-2.1.1.tgz#a88c02535791f02ed37c76a1b9ea9773c833f8c2"
   integrity sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=
 
-is-finite@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/is-finite/-/is-finite-1.1.0.tgz#904135c77fb42c0641d6aa1bcdbc4daa8da082f3"
-  integrity sha512-cdyMtqX/BOqqNBBiKlIVkytNHm49MtMlYyn1zxzvJKWmFMlGzm+ry5BBfYyeY9YmNKbRSo/o7OX9w9ale0wg3w==
-
-is-fullwidth-code-point@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-1.0.0.tgz#ef9e31386f031a7f0d643af82fde50c457ef00cb"
-  integrity sha1-754xOG8DGn8NZDr4L95QxFfvAMs=
-  dependencies:
-    number-is-nan "^1.0.0"
-
 is-fullwidth-code-point@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz#a3b30a5c4f199183167aaab93beefae3ddfb654f"
@@ -6495,6 +6590,11 @@ is-negative-zero@^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-object@^1.0.4:
+  version "1.0.5"
+  resolved "https://registry.yarnpkg.com/is-number-object/-/is-number-object-1.0.5.tgz#6edfaeed7950cff19afedce9fbfca9ee6dd289eb"
+  integrity sha512-RU0lI/n95pMoUKu9v1BZP5MBcZuNSVJkMkAG2dJqC4z2GlkGUNeH68SuHuBKBD/XFe+LHZ+f9BKkLET60Niedw==
+
 is-number@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-3.0.0.tgz#24fd6201a4782cf50561c810276afc7d12d71195"
@@ -6507,11 +6607,6 @@ is-number@^7.0.0:
   resolved "https://registry.yarnpkg.com/is-number/-/is-number-7.0.0.tgz#7535345b896734d5f80c4d06c50955527a14f12b"
   integrity sha512-41Cifkg6e8TylSpdtTpeLVMqvSBEVzTttHvERD741+pnZ8ANv0004MRL43QKPDlK9cGvNp6NZWZUBlbGXYxxng==
 
-is-obj@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/is-obj/-/is-obj-2.0.0.tgz#473fb05d973705e3fd9620545018ca8e22ef4982"
-  integrity sha512-drqDG3cbczxxEJRoOXcOjtdp1J/lyp1mNn0xaznRs8+muBhgQcrnbspox5X5fOw0HnMnbfDzvnEMEtqDEJEo8w==
-
 is-path-cwd@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/is-path-cwd/-/is-path-cwd-1.0.0.tgz#d225ec23132e89edd38fda767472e62e65f1106d"
@@ -6555,6 +6650,11 @@ is-plain-obj@^1.1.0:
   resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-1.1.0.tgz#71a50c8429dfca773c92a390a4a03b39fcd51d3e"
   integrity sha1-caUMhCnfync8kqOQpKA7OfzVHT4=
 
+is-plain-obj@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/is-plain-obj/-/is-plain-obj-3.0.0.tgz#af6f2ea14ac5a646183a5bbdb5baabbc156ad9d7"
+  integrity sha512-gwsOE28k+23GP1B6vFl1oVh/WOzmawBrKwo5Ev6wMKzPkaXaCDIQKzLnvsA42DRlbVTWorkgTKIviAKCWkfUwA==
+
 is-plain-object@^2.0.3, is-plain-object@^2.0.4:
   version "2.0.4"
   resolved "https://registry.yarnpkg.com/is-plain-object/-/is-plain-object-2.0.4.tgz#2c163b3fafb1b606d9d17928f05c2a1c38e07677"
@@ -6572,22 +6672,22 @@ is-promise@^2.1.0, is-promise@^2.2.2:
   resolved "https://registry.yarnpkg.com/is-promise/-/is-promise-2.2.2.tgz#39ab959ccbf9a774cf079f7b40c7a26f763135f1"
   integrity sha512-+lP4/6lKUBfQjZ2pdxThZvLUAafmZb8OAxFb8XXtiQmS35INgr85hdOGoEs124ez1FCnZJt6jau/T+alh58QFQ==
 
-is-reference@^1.2.1:
+is-reference@^1.1.2, is-reference@^1.2.1:
   version "1.2.1"
   resolved "https://registry.yarnpkg.com/is-reference/-/is-reference-1.2.1.tgz#8b2dac0b371f4bc994fdeaba9eb542d03002d0b7"
   integrity sha512-U82MsXXiFIrjCK4otLT+o2NA2Cd2g5MLoOVXUZjIOhLurrRxpEXzI8O0KZHr3IjLvlAH1kTPYSuqer5T9ZVBKQ==
   dependencies:
     "@types/estree" "*"
 
-is-regex@^1.0.4, is-regex@^1.1.1:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.2.tgz#81c8ebde4db142f2cf1c53fc86d6a45788266251"
-  integrity sha512-axvdhb5pdhEVThqJzYXwMlVuZwC+FF2DpcOhTS+y/8jVq4trxyPgfcwIxIKiyeuLlSQYKkmUaPQJ8ZE4yNKXDg==
+is-regex@^1.0.4, is-regex@^1.1.3:
+  version "1.1.3"
+  resolved "https://registry.yarnpkg.com/is-regex/-/is-regex-1.1.3.tgz#d029f9aff6448b93ebbe3f33dac71511fdcbef9f"
+  integrity sha512-qSVXFz28HM7y+IWX6vLCsexdlvzT1PJNFSBuaQLQ5o0IEw8UDYW6/2+eCMVyIsbM8CNLX2a/QWmSpyxYEHY7CQ==
   dependencies:
     call-bind "^1.0.2"
-    has-symbols "^1.0.1"
+    has-symbols "^1.0.2"
 
-is-resolvable@^1.0.0, is-resolvable@^1.1.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==
@@ -6597,19 +6697,17 @@ is-stream@^1.0.1, is-stream@^1.1.0:
   resolved "https://registry.yarnpkg.com/is-stream/-/is-stream-1.1.0.tgz#12d4a3dd4e68e0b79ceb8dbc84173ae80d91ca44"
   integrity sha1-EtSj3U5o4Lec6428hBc66A2RykQ=
 
-is-svg@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/is-svg/-/is-svg-3.0.0.tgz#9321dbd29c212e5ca99c4fa9794c714bcafa2f75"
-  integrity sha512-gi4iHK53LR2ujhLVVj+37Ykh9GLqYHX6JOVXbLAucaG/Cqw9xwdFOjDM2qeifLs1sF1npXXFvDu0r5HNgCMrzQ==
-  dependencies:
-    html-comment-regex "^1.1.0"
+is-string@^1.0.5, is-string@^1.0.6:
+  version "1.0.6"
+  resolved "https://registry.yarnpkg.com/is-string/-/is-string-1.0.6.tgz#3fe5d5992fb0d93404f32584d4b0179a71b54a5f"
+  integrity sha512-2gdzbKUuqtQ3lYNrUTQYoClPhm7oQu4UdpSZMp1/DGgkHBT8E2Z1l0yMdb6D4zNAxwDiMv8MdulKROJGNl0Q0w==
 
-is-symbol@^1.0.2:
-  version "1.0.3"
-  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.3.tgz#38e1014b9e6329be0de9d24a414fd7441ec61937"
-  integrity sha512-OwijhaRSgqvhm/0ZdAcXNZt9lYdKFpcRDT5ULUuYXPoT794UNOdU+gpT6Rzo7b4V2HUl/op6GqY894AZwv9faQ==
+is-symbol@^1.0.2, is-symbol@^1.0.3:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/is-symbol/-/is-symbol-1.0.4.tgz#a6dac93b635b063ca6872236de88910a57af139c"
+  integrity sha512-C/CPBqKWnvdcxqIARxyOh4v1UUEOCHpgDa0WYgpKDFMszcrPcffg5uhwSgPCLD2WWxmq6isisz87tzT01tuGhg==
   dependencies:
-    has-symbols "^1.0.1"
+    has-symbols "^1.0.2"
 
 is-text-path@^1.0.1:
   version "1.0.1"
@@ -6633,15 +6731,10 @@ is-url@^1.2.4:
   resolved "https://registry.yarnpkg.com/is-url/-/is-url-1.2.4.tgz#04a4df46d28c4cff3d73d01ff06abeb318a1aa52"
   integrity sha512-ITvGim8FhRiYe4IQ5uHSkj7pVaPDrCTkNd3yq3cV7iZAcJdHTUMPMEHcqSOy9xZ9qFenQCvi+2wjH9a1nXqHww==
 
-is-utf8@^0.2.0:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/is-utf8/-/is-utf8-0.2.1.tgz#4b0da1442104d1b336340e80797e865cf39f7d72"
-  integrity sha1-Sw2hRCEE0bM2NA6AeX6GXPOffXI=
-
 is-what@^3.12.0:
-  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==
+  version "3.14.1"
+  resolved "https://registry.yarnpkg.com/is-what/-/is-what-3.14.1.tgz#e1222f46ddda85dead0fd1c9df131760e77755c1"
+  integrity sha512-sNxgpk9793nzSs7bA6JQJGeIuRBQhAaNGG77kzYQgMkrID+lS6SlK07K5LaptscDlSaIgH+GPFzf+d75FVxozA==
 
 is-windows@^1.0.2:
   version "1.0.2"
@@ -6670,10 +6763,10 @@ isarray@^2.0.1:
   resolved "https://registry.yarnpkg.com/isarray/-/isarray-2.0.5.tgz#8af1e4c1221244cc62459faf38940d4e644a5723"
   integrity sha512-xHjhDr3cNBK0BzdUJSPXZntQUx/mwMS5Rw4A7lPJ90XGAO6ISP/ePDNuo0vhqOZU+UD5JoodwCAAoZQd3FeAKw==
 
-isbinaryfile@^4.0.6:
-  version "4.0.6"
-  resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.6.tgz#edcb62b224e2b4710830b67498c8e4e5a4d2610b"
-  integrity sha512-ORrEy+SNVqUhrCaal4hA4fBzhggQQ+BaLntyPOdoEiwlKZW9BZiJXjg3RMiruE4tPEI3pyVPpySHQF/dKWperg==
+isbinaryfile@^4.0.8:
+  version "4.0.8"
+  resolved "https://registry.yarnpkg.com/isbinaryfile/-/isbinaryfile-4.0.8.tgz#5d34b94865bd4946633ecc78a026fc76c5b11fcf"
+  integrity sha512-53h6XFniq77YdW+spoRrebh0mnmTxRPTlcuIArO57lmMdq4uBKFKaeTjnb92oYWrSn/LVL+LT+Hap2tFQj8V+w==
 
 isexe@^2.0.0:
   version "2.0.0"
@@ -6756,28 +6849,23 @@ jake@^10.6.1:
     filelist "^1.0.1"
     minimatch "^3.0.4"
 
-jasmine-core@^3.6.0, jasmine-core@~3.6.0:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.6.0.tgz#491f3bb23941799c353ceb7a45b38a950ebc5a20"
-  integrity sha512-8uQYa7zJN8hq9z+g8z1bqCfdC8eoDAeVnM5sfqs7KHv9/ifoJ500m018fpFc7RDaO6SWCLCXwo/wPSNcdYTgcw==
+jasmine-core@^3.6.0, jasmine-core@~3.8.0:
+  version "3.8.0"
+  resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.8.0.tgz#815399aae5aa5d9beeb1262805f981b99ffc9bf0"
+  integrity sha512-zl0nZWDrmbCiKns0NcjkFGYkVTGCPUgoHypTaj+G2AzaWus7QGoXARSlYsSle2VRpSdfJmM+hzmFKzQNhF2kHg==
 
 jasmine-core@~2.8.0:
   version "2.8.0"
   resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-2.8.0.tgz#bcc979ae1f9fd05701e45e52e65d3a5d63f1a24e"
   integrity sha1-vMl5rh+f0FcB5F5S5l06XWPxok4=
 
-jasmine-core@~3.7.0:
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/jasmine-core/-/jasmine-core-3.7.0.tgz#33da871fef5595e9aa43d0f50e009b5fe35f7ef2"
-  integrity sha512-jmeRIgxS/abz8afk9NKJ1yP7n93aZdRaHDWtTHJBlYu6fhbzvErjiO3mMlSSrJefVk1a+26JlABrHS2iBH8Azw==
-
-jasmine-reporters@~2.3.2:
-  version "2.3.2"
-  resolved "https://registry.yarnpkg.com/jasmine-reporters/-/jasmine-reporters-2.3.2.tgz#898818ffc234eb8b3f635d693de4586f95548d43"
-  integrity sha512-u/7AT9SkuZsUfFBLLzbErohTGNsEUCKaQbsVYnLFW1gEuL2DzmBL4n8v90uZsqIqlWvWUgian8J6yOt5Fyk/+A==
+jasmine-reporters@~2.4.0:
+  version "2.4.0"
+  resolved "https://registry.yarnpkg.com/jasmine-reporters/-/jasmine-reporters-2.4.0.tgz#708c17ae70ba6671e3a930bb1b202aab80a31409"
+  integrity sha512-jxONSrBLN1vz/8zCx5YNWQSS8iyDAlXQ5yk1LuqITe4C6iXCDx5u6Q0jfNtkKhL4qLZPe69fL+AWvXFt9/x38w==
   dependencies:
     mkdirp "^0.5.1"
-    xmldom "^0.1.22"
+    xmldom "^0.5.0"
 
 jasmine-spec-reporter@~7.0.0:
   version "7.0.0"
@@ -6795,32 +6883,37 @@ jasmine@2.8.0:
     glob "^7.0.6"
     jasmine-core "~2.8.0"
 
-jasmine@^3.3.1:
-  version "3.6.4"
-  resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-3.6.4.tgz#1f8e4a0d5028a2dc66942b73b9fef4c32be97ad5"
-  integrity sha512-hIeOou6y0BgCOKYgXYveQvlY+PTHgDPajFf+vLCYbMTQ+VjAP9+EQv0nuC9+gyCAAWISRFauB1XUb9kFuOKtcQ==
+jasmine@^3.3.1, jasmine@^3.7.0:
+  version "3.8.0"
+  resolved "https://registry.yarnpkg.com/jasmine/-/jasmine-3.8.0.tgz#4497bc797eede7ca9de18179aedd4cf50245d8dc"
+  integrity sha512-kdQ3SfcNpMbbMdgJPLyFe9IksixdnrgYaCJapP9sS0aLgdWdIZADNXEr+11Zafxm1VDfRSC5ZL4fzXT0bexzXw==
   dependencies:
     glob "^7.1.6"
-    jasmine-core "~3.6.0"
+    jasmine-core "~3.8.0"
 
 jasminewd2@^2.1.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/jasminewd2/-/jasminewd2-2.2.0.tgz#e37cf0b17f199cce23bea71b2039395246b4ec4e"
   integrity sha1-43zwsX8ZnM4jvqcbIDk5Uka07E4=
 
-jest-worker@26.6.2, jest-worker@^26.5.0, jest-worker@^26.6.2:
-  version "26.6.2"
-  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz#7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed"
-  integrity sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ==
+jest-worker@^27.0.2:
+  version "27.0.6"
+  resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-27.0.6.tgz#a5fdb1e14ad34eb228cfe162d9f729cdbfa28aed"
+  integrity sha512-qupxcj/dRuA3xHPMUd40gr2EaAurFbkwzOh7wfPaeE9id7hyjURRQoqNfHifHK3XjJU6YJJUQKILGUnwGPEOCA==
   dependencies:
     "@types/node" "*"
     merge-stream "^2.0.0"
-    supports-color "^7.0.0"
+    supports-color "^8.0.0"
+
+jju@~1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/jju/-/jju-1.4.0.tgz#a3abe2718af241a2b2904f84a625970f389ae32a"
+  integrity sha1-o6vicYryQaKykE+EpiWXDzia4yo=
 
 jquery@^3.3.1:
-  version "3.5.1"
-  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.5.1.tgz#d7b4d08e1bfdb86ad2f1a3d039ea17304717abb5"
-  integrity sha512-XwIBPqcMn57FxfT+Go5pzySnm4KWkT1Tv7gjrpT1srtf8Weynl6R273VJ5GjkRb51IzMp5nbaPjJXMWeju2MKg==
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.6.0.tgz#c72a09f15c1bdce142f49dbf1170bdf8adac2470"
+  integrity sha512-JVzAR/AjBvVt2BmYhxRCSYysDsPcssdmTFnzyLEts9qNwmjmu4JTAMYubEfwVOSwpQ1I1sKKFcxhZCI2buerfw==
 
 js-base64@^2.4.3:
   version "2.6.4"
@@ -6832,10 +6925,10 @@ js-tokens@^4.0.0:
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
-js-yaml@4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.0.0.tgz#f426bc0ff4b4051926cd588c71113183409a121f"
-  integrity sha512-pqon0s+4ScYUvX30wxQi3PogGFAlUyH0awepWvwkj4jD4v+ova3RiYw8bmA6x2rDrEaj8i/oWKoRxpVNW+Re8Q==
+js-yaml@4.1.0:
+  version "4.1.0"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-4.1.0.tgz#c1fb65f8f5017901cdd2c951864ba18458a10602"
+  integrity sha512-wpxZs9NoxZaJESJGIZTyDEaYpl0FKSA+FB9aJiyemKhMwkxQg63h4T1KJgUGHpTqPDNRcmmYLugrRjJlBtWvRA==
   dependencies:
     argparse "^2.0.1"
 
@@ -6924,6 +7017,11 @@ json-schema@0.2.3:
   resolved "https://registry.yarnpkg.com/json-schema/-/json-schema-0.2.3.tgz#b480c892e59a2f05954ce727bd3f2a4e882f9e13"
   integrity sha1-tIDIkuWaLwWVTOcnvT8qTogvnhM=
 
+json-stable-stringify-without-jsonify@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
+  integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
+
 json-stringify-safe@^5.0.1, json-stringify-safe@~5.0.1:
   version "5.0.1"
   resolved "https://registry.yarnpkg.com/json-stringify-safe/-/json-stringify-safe-5.0.1.tgz#1296a2d58fd45f19a0f6ce01d65701e2c735b6eb"
@@ -6941,14 +7039,14 @@ json5@^1.0.1:
   dependencies:
     minimist "^1.2.0"
 
-json5@^2.1.0, json5@^2.1.2:
+json5@^2.1.0, json5@^2.1.2, json5@^2.2.0:
   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@3.0.0:
+jsonc-parser@3.0.0, 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==
@@ -6965,7 +7063,7 @@ jsonparse@^1.2.0, jsonparse@^1.3.1:
   resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
   integrity sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=
 
-jsonwebtoken@8.5.1:
+jsonwebtoken@8.5.1, jsonwebtoken@^8.5.1:
   version "8.5.1"
   resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz#00e71e0b8df54c2121a1f26137df2280673bcc0d"
   integrity sha512-XjwVfRS6jTMsqYs0EsuJ4LGxXV14zQybNd4L2r0UvbVnSF9Af8x7p5MzbJ90Ioz/9TI41/hTCvznF/loiSzn8w==
@@ -6992,9 +7090,9 @@ jsprim@^1.2.2:
     verror "1.10.0"
 
 jszip@^3.1.3:
-  version "3.6.0"
-  resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.6.0.tgz#839b72812e3f97819cc13ac4134ffced95dd6af9"
-  integrity sha512-jgnQoG9LKnWO3mnVNBnfhkh0QknICd1FGSrXcgrl67zioyJ4wgx25o9ZqwNtrROSflGBCGYnJfjrIyRIby1OoQ==
+  version "3.7.0"
+  resolved "https://registry.yarnpkg.com/jszip/-/jszip-3.7.0.tgz#9b8b995a4e7c9024653ce743e902076a82fdf4e6"
+  integrity sha512-Y2OlFIzrDOPWUnpU0LORIcDn2xN7rC9yKffFM/7pGhQuhO+SUhfm2trkJ/S5amjFvem0Y+1EALz/MEPkvHXVNw==
   dependencies:
     lie "~3.3.0"
     pako "~1.0.2"
@@ -7037,10 +7135,10 @@ karma-coverage@~2.0.3:
     istanbul-reports "^3.0.0"
     minimatch "^3.0.4"
 
-karma-jasmine-html-reporter@^1.5.0:
-  version "1.5.4"
-  resolved "https://registry.yarnpkg.com/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-1.5.4.tgz#669f33d694d88fce1b0ccfda57111de716cb0192"
-  integrity sha512-PtilRLno5O6wH3lDihRnz0Ba8oSn0YUJqKjjux1peoYGwo0AQqrWRbdWk/RLzcGlb+onTyXAnHl6M+Hu3UxG/Q==
+karma-jasmine-html-reporter@~1.7.0:
+  version "1.7.0"
+  resolved "https://registry.yarnpkg.com/karma-jasmine-html-reporter/-/karma-jasmine-html-reporter-1.7.0.tgz#52c489a74d760934a1089bfa5ea4a8fcb84cc28b"
+  integrity sha512-pzum1TL7j90DTE86eFt48/s12hqwQuiD+e5aXx2Dc9wDEn2LfGq6RoAxEZZjFiN0RDSCOnosEKRZWxbQ+iMpQQ==
 
 karma-jasmine@~4.0.0:
   version "4.0.1"
@@ -7057,32 +7155,32 @@ karma-source-map-support@1.4.0:
     source-map-support "^0.5.5"
 
 karma@~6.3.0:
-  version "6.3.0"
-  resolved "https://registry.yarnpkg.com/karma/-/karma-6.3.0.tgz#8291d1ba329a1f57c160b0bd256fb42ae16bfd8b"
-  integrity sha512-Or+x8T4/TWe7ChBaAkdQARjETSbvxsipp5Y+0UMSu4z0YYzy06OA2UdHAmMIx5gLs4a76X916pY1bzGgYuN7BQ==
+  version "6.3.4"
+  resolved "https://registry.yarnpkg.com/karma/-/karma-6.3.4.tgz#359899d3aab3d6b918ea0f57046fd2a6b68565e6"
+  integrity sha512-hbhRogUYIulfkBTZT7xoPrCYhRBnBoqbbL4fszWD0ReFGUxU+LYBr3dwKdAluaDQ/ynT9/7C+Lf7pPNW4gSx4Q==
   dependencies:
     body-parser "^1.19.0"
     braces "^3.0.2"
-    chokidar "^3.4.2"
+    chokidar "^3.5.1"
     colors "^1.4.0"
     connect "^3.7.0"
     di "^0.0.1"
     dom-serialize "^2.2.1"
-    glob "^7.1.6"
-    graceful-fs "^4.2.4"
+    glob "^7.1.7"
+    graceful-fs "^4.2.6"
     http-proxy "^1.18.1"
-    isbinaryfile "^4.0.6"
-    lodash "^4.17.19"
-    log4js "^6.2.1"
-    mime "^2.4.5"
+    isbinaryfile "^4.0.8"
+    lodash "^4.17.21"
+    log4js "^6.3.0"
+    mime "^2.5.2"
     minimatch "^3.0.4"
     qjobs "^1.2.0"
     range-parser "^1.2.1"
     rimraf "^3.0.2"
     socket.io "^3.1.0"
     source-map "^0.6.1"
-    tmp "0.2.1"
-    ua-parser-js "^0.7.23"
+    tmp "^0.2.1"
+    ua-parser-js "^0.7.28"
     yargs "^16.1.1"
 
 keygrip@~1.1.0:
@@ -7138,10 +7236,10 @@ klona@^2.0.4:
   resolved "https://registry.yarnpkg.com/klona/-/klona-2.0.4.tgz#7bb1e3affb0cb8624547ef7e8f6708ea2e39dfc0"
   integrity sha512-ZRbnvdg/NxqzC7L9Uyqzf4psi1OM4Cuc+sJAkQPjO6XkQIJTNbfK2Rsmbw8fx1p2mkZdp2FZYo2+LwXYY/uwIA==
 
-less-loader@8.1.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-8.1.0.tgz#8276adc16bf6576dd80b71563685a2cfe93b0a50"
-  integrity sha512-IE73O5LY5WHA71EDwszM2PIEGDF30xz45GplpRhYuxMXhAvXoMudu/ItjllNR/ht7XLh5N7JegzRg11HYu+xxg==
+less-loader@10.0.1:
+  version "10.0.1"
+  resolved "https://registry.yarnpkg.com/less-loader/-/less-loader-10.0.1.tgz#c05aaba68d00400820275f21c2ad87cb9fa9923f"
+  integrity sha512-Crln//HpW9M5CbtdfWm3IO66Cvx1WhZQvNybXgfB2dD/6Sav9ppw+IWqs/FQKPBFO4B6X0X28Z0WNznshgwUzA==
   dependencies:
     klona "^2.0.4"
 
@@ -7162,6 +7260,14 @@ less@4.1.1, less@^4.1.0:
     needle "^2.5.2"
     source-map "~0.6.0"
 
+levn@^0.4.1:
+  version "0.4.1"
+  resolved "https://registry.yarnpkg.com/levn/-/levn-0.4.1.tgz#ae4562c007473b932a6200d403268dd2fffc6ade"
+  integrity sha512-+bT2uH4E5LGE7h/n3evcS/sQlJXCpIp6ym8OWJ5eV6+67Dsql/LaaT7qJBAt2rzfoa/5QBGBhxDix1dMt2kQKQ==
+  dependencies:
+    prelude-ls "^1.2.1"
+    type-check "~0.4.0"
+
 levn@~0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/levn/-/levn-0.3.0.tgz#3b09924edf9f083c0490fdd4c0bc4421e04764ee"
@@ -7186,10 +7292,10 @@ license-checker@^25.0.0:
     spdx-satisfies "^4.0.0"
     treeify "^1.1.0"
 
-license-webpack-plugin@2.3.17:
-  version "2.3.17"
-  resolved "https://registry.yarnpkg.com/license-webpack-plugin/-/license-webpack-plugin-2.3.17.tgz#75d05d8b2c3f223be8988d144e9739df8f502319"
-  integrity sha512-4jJ5/oIkhylMw2EjXh9sxPP8KC3FYBjTcxOCoTIaC2J/zVbJhfw992UEpSsov8VTt97XtU+xJyE4cJn4gHB2PA==
+license-webpack-plugin@2.3.20:
+  version "2.3.20"
+  resolved "https://registry.yarnpkg.com/license-webpack-plugin/-/license-webpack-plugin-2.3.20.tgz#f51fb674ca31519dbedbe1c7aabc036e5a7f2858"
+  integrity sha512-AHVueg9clOKACSHkhmEI+PCC9x8+qsQVuKECZD3ETxETK5h/PCv5/MUzyG1gm8OMcip/s1tcNxqo9Qb7WhjGsg==
   dependencies:
     "@types/webpack-sources" "^0.1.5"
     webpack-sources "^1.2.0"
@@ -7201,22 +7307,16 @@ lie@~3.3.0:
   dependencies:
     immediate "~3.0.5"
 
+lilconfig@^2.0.3:
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/lilconfig/-/lilconfig-2.0.3.tgz#68f3005e921dafbd2a2afb48379986aa6d2579fd"
+  integrity sha512-EHKqr/+ZvdKCifpNrJCKxBTgk5XupZA3y/aCPY9mxfgBzmgh93Mt/WqjjQ38oMxXuvDokaKiM3lAgvSH2sjtHg==
+
 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"
   integrity sha1-HADHQ7QzzQpOgHWPe2SldEDZ/wA=
 
-load-json-file@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-1.1.0.tgz#956905708d58b4bab4c2261b04f59f31c99374c0"
-  integrity sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=
-  dependencies:
-    graceful-fs "^4.1.2"
-    parse-json "^2.2.0"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-    strip-bom "^2.0.0"
-
 load-json-file@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/load-json-file/-/load-json-file-4.0.0.tgz#2f5f45ab91e33216234fd53adab668eb4ec0993b"
@@ -7232,15 +7332,6 @@ loader-runner@^4.2.0:
   resolved "https://registry.yarnpkg.com/loader-runner/-/loader-runner-4.2.0.tgz#d7022380d66d14c5fb1d496b89864ebcfd478384"
   integrity sha512-92+huvxMvYlMzMt0iIOukcwYBFpkYJdpl2xsZ7LrlayO7E8SOv+JJUEK17B/dJIHAOLMfh2dZZ/Y18WgmGtYNw==
 
-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"
@@ -7296,17 +7387,17 @@ lockfile@1.0.4:
   dependencies:
     signal-exit "^3.0.2"
 
-lodash._reinterpolate@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/lodash._reinterpolate/-/lodash._reinterpolate-3.0.0.tgz#0ccf2d89166af03b3663c796538b75ac6e114d9d"
-  integrity sha1-DM8tiRZq8Ds2Y8eWU4t1rG4RTZ0=
+lodash.clonedeep@^4.5.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.clonedeep/-/lodash.clonedeep-4.5.0.tgz#e23f3f9c4f8fbdde872529c1071857a086e5ccef"
+  integrity sha1-4j8/nE+Pvd6HJSnBBxhXoIblzO8=
 
 lodash.debounce@^4.0.8:
   version "4.0.8"
   resolved "https://registry.yarnpkg.com/lodash.debounce/-/lodash.debounce-4.0.8.tgz#82d79bff30a67c4005ffd5e2515300ad9ca4d7af"
   integrity sha1-gteb/zCmfEAF/9XiUVMArZyk168=
 
-lodash.get@^4.4.2:
+lodash.get@^4.0.0:
   version "4.4.2"
   resolved "https://registry.yarnpkg.com/lodash.get/-/lodash.get-4.4.2.tgz#2d177f652fa31e939b4438d5341499dfa3825e99"
   integrity sha1-LRd/ZS+jHpObRDjVNBSZ36OCXpk=
@@ -7321,16 +7412,16 @@ lodash.isboolean@^3.0.3:
   resolved "https://registry.yarnpkg.com/lodash.isboolean/-/lodash.isboolean-3.0.3.tgz#6c2e171db2a257cd96802fd43b01b20d5f5870f6"
   integrity sha1-bC4XHbKiV82WgC/UOwGyDV9YcPY=
 
+lodash.isequal@^4.0.0:
+  version "4.5.0"
+  resolved "https://registry.yarnpkg.com/lodash.isequal/-/lodash.isequal-4.5.0.tgz#415c4478f2bcc30120c22ce10ed3226f7d3e18e0"
+  integrity sha1-QVxEePK8wwEgwizhDtMib30+GOA=
+
 lodash.isinteger@^4.0.4:
   version "4.0.4"
   resolved "https://registry.yarnpkg.com/lodash.isinteger/-/lodash.isinteger-4.0.4.tgz#619c0af3d03f8b04c31f5882840b77b11cd68343"
   integrity sha1-YZwK89A/iwTDH1iChAt3sRzWg0M=
 
-lodash.ismatch@^4.4.0:
-  version "4.4.0"
-  resolved "https://registry.yarnpkg.com/lodash.ismatch/-/lodash.ismatch-4.4.0.tgz#756cb5150ca3ba6f11085a78849645f188f85f37"
-  integrity sha1-dWy1FQyjum8RCFp4hJZF8Yj4Xzc=
-
 lodash.isnumber@^3.0.3:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/lodash.isnumber/-/lodash.isnumber-3.0.3.tgz#3ce76810c5928d03352301ac287317f11c0b1ffc"
@@ -7351,6 +7442,11 @@ lodash.memoize@^4.1.2:
   resolved "https://registry.yarnpkg.com/lodash.memoize/-/lodash.memoize-4.1.2.tgz#bcc6c49a42a2840ed997f323eada5ecd182e0bfe"
   integrity sha1-vMbEmkKihA7Zl/Mj6tpezRguC/4=
 
+lodash.merge@^4.6.2:
+  version "4.6.2"
+  resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
+  integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
+
 lodash.once@^4.0.0:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/lodash.once/-/lodash.once-4.1.1.tgz#0dd3971213c7c56df880977d504c88fb471a97ac"
@@ -7366,43 +7462,21 @@ 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.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==
-  dependencies:
-    lodash._reinterpolate "^3.0.0"
-    lodash.templatesettings "^4.0.0"
-
-lodash.templatesettings@^4.0.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/lodash.templatesettings/-/lodash.templatesettings-4.2.0.tgz#e481310f049d3cf6d47e912ad09313b154f0fb33"
-  integrity sha512-stgLz+i3Aa9mZgnjr/O+v9ruKZsPsndy7qPZOchbqk2cnTU1ZaldKK+v7m54WoKIyxiuMZTKT2H81F8BeAc3ZQ==
-  dependencies:
-    lodash._reinterpolate "^3.0.0"
+lodash.truncate@^4.4.2:
+  version "4.4.2"
+  resolved "https://registry.yarnpkg.com/lodash.truncate/-/lodash.truncate-4.4.2.tgz#5a350da0b1113b837ecfffd5812cbe58d6eae193"
+  integrity sha1-WjUNoLERO4N+z//VgSy+WNbq4ZM=
 
 lodash.uniq@^4.5.0:
   version "4.5.0"
   resolved "https://registry.yarnpkg.com/lodash.uniq/-/lodash.uniq-4.5.0.tgz#d0225373aeb652adc1bc82e4945339a842754773"
   integrity sha1-0CJTc662Uq3BvILklFM5qEJ1R3M=
 
-lodash@4, lodash@4.17.21, lodash@^4.17.21:
+lodash@4, lodash@4.17.21, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.19, lodash@^4.17.21, lodash@~4.17.15:
   version "4.17.21"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.21.tgz#679591c564c3bffaae8454cf0b3df370c3d6911c"
   integrity sha512-v2kDEe57lecTulaDIuNTPy3Ry4gLGJ6Z1O3vE1krgXZNrsQ+LFTGHVxVjcXPs17LhbZVGedAJv8XZ1tvj5FvSg==
 
-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==
-
-log-symbols@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.0.0.tgz#69b3cc46d20f448eccdb75ea1fa733d9e821c920"
-  integrity sha512-FN8JBzLx6CzeMrB0tg6pqlGU1wCrXW+ZXGH481kfsBqer0hToTIiHdjH4Mq8xJUbvATujKCvaREGWpGUionraA==
-  dependencies:
-    chalk "^4.0.0"
-
 log-symbols@^4.1.0:
   version "4.1.0"
   resolved "https://registry.yarnpkg.com/log-symbols/-/log-symbols-4.1.0.tgz#3fbdbb95b4683ac9fc785111e792e558d4abd503"
@@ -7411,7 +7485,7 @@ log-symbols@^4.1.0:
     chalk "^4.1.0"
     is-unicode-supported "^0.1.0"
 
-log4js@^6.2.1:
+log4js@^6.2.1, log4js@^6.3.0:
   version "6.3.0"
   resolved "https://registry.yarnpkg.com/log4js/-/log4js-6.3.0.tgz#10dfafbb434351a3e30277a00b9879446f715bcb"
   integrity sha512-Mc8jNuSFImQUIateBFwdOQcmC6Q5maU0VVvdC2R6XMb66/VnT+7WS4D/0EeNMZu1YODmJe5NIn2XftCzEocUgw==
@@ -7432,14 +7506,6 @@ long@^4.0.0:
   resolved "https://registry.yarnpkg.com/long/-/long-4.0.0.tgz#9a7b71cfb7d361a194ea555241c92f7468d5bf28"
   integrity sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA==
 
-loud-rejection@^1.0.0:
-  version "1.6.0"
-  resolved "https://registry.yarnpkg.com/loud-rejection/-/loud-rejection-1.6.0.tgz#5b46f80147edee578870f086d04821cf998e551f"
-  integrity sha1-W0b4AUft7leIcPCG0Eghz5mOVR8=
-  dependencies:
-    currently-unhandled "^0.4.1"
-    signal-exit "^3.0.0"
-
 lowdb@1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/lowdb/-/lowdb-1.0.0.tgz#5243be6b22786ccce30e50c9a33eac36b20c8064"
@@ -7482,12 +7548,7 @@ lunr-mutable-indexes@2.3.2:
   resolved "https://registry.yarnpkg.com/lunr/-/lunr-2.3.9.tgz#18b123142832337dd6e964df1a5a7707b25d35e1"
   integrity sha512-zTU3DaZaF3Rt9rhN3uBMGQD3dD2/vFQqnvZCDv4dl5iOzq2IZQqTxu90r4E5J+nP70J3ilqVCrbho2eWaeW8Ow==
 
-macos-release@^2.2.0:
-  version "2.4.1"
-  resolved "https://registry.yarnpkg.com/macos-release/-/macos-release-2.4.1.tgz#64033d0ec6a5e6375155a74b1a1eba8e509820ac"
-  integrity sha512-H/QHeBIN1fIGJX517pvK8IEK53yQOW7YcEI55oYtgjDdoCQQz7eJS94qt5kNrscReEyuD/JcdFCm2XBEcGOITg==
-
-magic-string@0.25.7, magic-string@^0.25.0, magic-string@^0.25.7:
+magic-string@0.25.7, magic-string@^0.25.0, magic-string@^0.25.2, magic-string@^0.25.7:
   version "0.25.7"
   resolved "https://registry.yarnpkg.com/magic-string/-/magic-string-0.25.7.tgz#3f497d6fd34c669c6798dcb821f2ef31f5445051"
   integrity sha512-4CrMT5DOHTDk4HYDlzmwu4FVCcIYI8gauveasrdCu2IKIFOJ3f0v/8MDGJCDL9oD2ppz/Av1b0Nj345H9M+XIA==
@@ -7501,13 +7562,6 @@ magic-string@^0.22.4:
   dependencies:
     vlq "^0.2.2"
 
-make-dir@3.1.0, 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==
-  dependencies:
-    semver "^6.0.0"
-
 make-dir@^2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/make-dir/-/make-dir-2.1.0.tgz#5f0310e18b8be898cc07009295a30ae41e91e6f5"
@@ -7516,18 +7570,25 @@ 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.1.0, 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==
+  dependencies:
+    semver "^6.0.0"
+
 make-error@^1.1.1:
   version "1.3.6"
   resolved "https://registry.yarnpkg.com/make-error/-/make-error-1.3.6.tgz#2eb2e37ea9b67c4891f684a1394799af484cf7a2"
   integrity sha512-s8UhlNe7vPKomQhC1qFelMokr/Sc3AgNbso3n74mVPA5LTZwkB9NlXf4XPamLxJE8h0gh73rM94xvwRT2CVInw==
 
-make-fetch-happen@^8.0.9:
-  version "8.0.14"
-  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-8.0.14.tgz#aaba73ae0ab5586ad8eaa68bd83332669393e222"
-  integrity sha512-EsS89h6l4vbfJEtBZnENTOFk8mCRpY5ru36Xe5bcX1KYIli2mkSHqoFsp5O1wMDvTJJzxe/4THpCTtygjeeGWQ==
+make-fetch-happen@^9.0.1:
+  version "9.0.4"
+  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-9.0.4.tgz#ceaa100e60e0ef9e8d1ede94614bb2ba83c8bb24"
+  integrity sha512-sQWNKMYqSmbAGXqJg2jZ+PmHh5JAybvwu0xM8mZR/bsTjGiTASj3ldXJV7KFHy1k/IJIBkjxQFoWIVsv9+PQMg==
   dependencies:
     agentkeepalive "^4.1.3"
-    cacache "^15.0.5"
+    cacache "^15.2.0"
     http-cache-semantics "^4.1.0"
     http-proxy-agent "^4.0.1"
     https-proxy-agent "^5.0.0"
@@ -7538,10 +7599,33 @@ make-fetch-happen@^8.0.9:
     minipass-fetch "^1.3.2"
     minipass-flush "^1.0.5"
     minipass-pipeline "^1.2.4"
+    negotiator "^0.6.2"
     promise-retry "^2.0.1"
     socks-proxy-agent "^5.0.0"
     ssri "^8.0.0"
 
+make-fetch-happen@^9.1.0:
+  version "9.1.0"
+  resolved "https://registry.yarnpkg.com/make-fetch-happen/-/make-fetch-happen-9.1.0.tgz#53085a09e7971433e6765f7971bf63f4e05cb968"
+  integrity sha512-+zopwDy7DNknmwPQplem5lAZX/eCOzSvSNNcSKm5eVwTkOBzoktEfXsa9L23J/GIRhxRsaxzkPEhrJEpE2F4Gg==
+  dependencies:
+    agentkeepalive "^4.1.3"
+    cacache "^15.2.0"
+    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.2"
+    minipass-flush "^1.0.5"
+    minipass-pipeline "^1.2.4"
+    negotiator "^0.6.2"
+    promise-retry "^2.0.1"
+    socks-proxy-agent "^6.0.0"
+    ssri "^8.0.0"
+
 map-age-cleaner@^0.1.3:
   version "0.1.3"
   resolved "https://registry.yarnpkg.com/map-age-cleaner/-/map-age-cleaner-0.1.3.tgz#7d583a7306434c055fe474b0f45078e6e1b4b92a"
@@ -7554,15 +7638,15 @@ map-cache@^0.2.2:
   resolved "https://registry.yarnpkg.com/map-cache/-/map-cache-0.2.2.tgz#c32abd0bd6525d9b051645bb4f26ac5dc98a0dbf"
   integrity sha1-wyq9C9ZSXZsFFkW7TyasXcmKDb8=
 
-map-obj@^1.0.0, map-obj@^1.0.1:
+map-obj@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-1.0.1.tgz#d933ceb9205d82bdcf4886f6742bdc2b4dea146d"
   integrity sha1-2TPOuSBdgr3PSIb2dCvcK03qFG0=
 
 map-obj@^4.0.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-4.1.0.tgz#b91221b542734b9f14256c0132c897c5d7256fd5"
-  integrity sha512-glc9y00wgtwcDmp7GaE/0b0OnxpNJsVf3ael/An6Fe2Q51LLwN1er6sdomLRzz5h0+yMpiYLhWYF5R7HeqVd4g==
+  version "4.2.1"
+  resolved "https://registry.yarnpkg.com/map-obj/-/map-obj-4.2.1.tgz#e4ea399dbc979ae735c83c863dd31bdf364277b7"
+  integrity sha512-+WA2/1sPmDj1dlvvJmB5G6JKfY9dpn7EVBUL06+y6PoljPkh+6V1QihwxNkbcGxCRjt2b0F9K0taiCuo7MbdFQ==
 
 map-visit@^1.0.0:
   version "1.0.0"
@@ -7571,40 +7655,35 @@ map-visit@^1.0.0:
   dependencies:
     object-visit "^1.0.0"
 
-marked@2.0.1, marked@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/marked/-/marked-2.0.1.tgz#5e7ed7009bfa5c95182e4eb696f85e948cefcee3"
-  integrity sha512-5+/fKgMv2hARmMW7DOpykr2iLhl0NgjyELk5yn92iE7z8Se1IS9n3UsFm86hFXIkvMBmVxki8+ckcpjBeyo/hw==
+marked@2.1.3, marked@^2.0.1:
+  version "2.1.3"
+  resolved "https://registry.yarnpkg.com/marked/-/marked-2.1.3.tgz#bd017cef6431724fd4b27e0657f5ceb14bff3753"
+  integrity sha512-/Q+7MGzaETqifOMWYEA7HVMaZb4XbcRfaOzcSsHZEith83KGlvaSG33u0SKu89Mj5h+T8V2hM+8O45Qc5XTgwA==
 
 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==
-
 media-typer@0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/media-typer/-/media-typer-0.3.0.tgz#8710d7af0aa626f8fffa1ce00168545263255748"
   integrity sha1-hxDXrwqmJvj/+hzgAWhUUmMlV0g=
 
-mem@^8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/mem/-/mem-8.0.0.tgz#b5e4b6d2d241c6296da05436173b4d0c7ae1f9ac"
-  integrity sha512-qrcJOe6uD+EW8Wrci1Vdiua/15Xw3n/QnaNXE7varnB6InxSk7nu3/i5jfy3S6kWxr8WYJ6R1o0afMUtvorTsA==
+mem@^8.1.1:
+  version "8.1.1"
+  resolved "https://registry.yarnpkg.com/mem/-/mem-8.1.1.tgz#cf118b357c65ab7b7e0817bdf00c8062297c0122"
+  integrity sha512-qFCFUDs7U3b8mBDPyz5EToEKoAkgCzqquIgi9nkkR9bixxOVOre+09lbuH7+9Kn2NFpm56M3GUWVbU2hQgdACA==
   dependencies:
     map-age-cleaner "^0.1.3"
     mimic-fn "^3.1.0"
 
-memfs@^3.2.0:
-  version "3.2.0"
-  resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.2.0.tgz#f9438e622b5acd1daa8a4ae160c496fdd1325b26"
-  integrity sha512-f/xxz2TpdKv6uDn6GtHee8ivFyxwxmPuXatBb1FBwxYNuVpbM3k/Y1Z+vC0mH/dIXXrukYfe3qe5J32Dfjg93A==
+memfs@^3.2.2:
+  version "3.2.2"
+  resolved "https://registry.yarnpkg.com/memfs/-/memfs-3.2.2.tgz#5de461389d596e3f23d48bb7c2afb6161f4df40e"
+  integrity sha512-RE0CwmIM3CEvpcdK3rZ19BC4E6hv9kADkMN5rPduRak58cNArWLi/9jFLsa4rhsjfVxMP3v0jO7FHXq7SvFY5Q==
   dependencies:
-    fs-monkey "1.0.1"
+    fs-monkey "1.0.3"
 
 memoizee@0.4.15:
   version "0.4.15"
@@ -7628,22 +7707,6 @@ memory-fs@^0.4.1:
     errno "^0.1.3"
     readable-stream "^2.0.1"
 
-meow@^3.3.0:
-  version "3.7.0"
-  resolved "https://registry.yarnpkg.com/meow/-/meow-3.7.0.tgz#72cb668b425228290abbfa856892587308a801fb"
-  integrity sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=
-  dependencies:
-    camelcase-keys "^2.0.0"
-    decamelize "^1.1.2"
-    loud-rejection "^1.0.0"
-    map-obj "^1.0.1"
-    minimist "^1.1.3"
-    normalize-package-data "^2.3.4"
-    object-assign "^4.0.1"
-    read-pkg-up "^1.0.1"
-    redent "^1.0.0"
-    trim-newlines "^1.0.0"
-
 meow@^8.0.0:
   version "8.1.2"
   resolved "https://registry.yarnpkg.com/meow/-/meow-8.1.2.tgz#bcbe45bda0ee1729d350c03cffc8395a36c4e897"
@@ -7714,51 +7777,36 @@ micromatch@^3.1.10, micromatch@^3.1.4:
     snapdragon "^0.8.1"
     to-regex "^3.0.2"
 
-micromatch@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.2.tgz#4fcb0999bf9fbc2fcbdd212f6d629b9a56c39259"
-  integrity sha512-y7FpHSbMUMoyPbYUSzO6PaZ6FyRnQOpHuKwbo1G+Knck95XVU4QAiKdGEnj5wwoS7PlOgthX/09u5iFJ+aYf5Q==
+micromatch@^4.0.2, micromatch@^4.0.4:
+  version "4.0.4"
+  resolved "https://registry.yarnpkg.com/micromatch/-/micromatch-4.0.4.tgz#896d519dfe9db25fce94ceb7a500919bf881ebf9"
+  integrity sha512-pRmzw/XUcwXGpD9aI9q/0XOwLNygjETJ8y0ao0wdqprrzDa4YnxLcz7fQRZr8voh8V10kGhABbNcHVk5wHgWwg==
   dependencies:
     braces "^3.0.1"
-    picomatch "^2.0.5"
+    picomatch "^2.2.3"
 
-mime-db@1.45.0:
-  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-db@1.48.0, "mime-db@>= 1.43.0 < 2":
+  version "1.48.0"
+  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.48.0.tgz#e35b31045dd7eada3aaad537ed88a33afbef2d1d"
+  integrity sha512-FM3QwxV+TnZYQ2aRqhlKBMHxk10lTbMt3bBkMAp54ddrNeVSfcQYOOKuGuy3Ddrm38I04If834fOUSq1yzslJQ==
 
-"mime-db@>= 1.43.0 < 2":
-  version "1.46.0"
-  resolved "https://registry.yarnpkg.com/mime-db/-/mime-db-1.46.0.tgz#6267748a7f799594de3cbc8cde91def349661cee"
-  integrity sha512-svXaP8UQRZ5K7or+ZmfNhg2xX3yKDMUzqadsSqi4NCH/KomcH75MAMYAGVlvXn4+b/xOPhS3I2uHKRUzvjY7BQ==
-
-mime-types@^2.1.12, mime-types@^2.1.27, mime-types@^2.1.28, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24:
-  version "2.1.28"
-  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.28.tgz#1160c4757eab2c5363888e005273ecf79d2a0ecd"
-  integrity sha512-0TO2yJ5YHYr7M2zzT7gDU1tbwHxEUWBCLt0lscSNpcdAfFyJOVEpRYNS7EXVcTLNj/25QO8gulHC5JtTzSE2UQ==
+mime-types@^2.1.12, mime-types@^2.1.27, mime-types@^2.1.31, mime-types@~2.1.17, mime-types@~2.1.19, mime-types@~2.1.24:
+  version "2.1.31"
+  resolved "https://registry.yarnpkg.com/mime-types/-/mime-types-2.1.31.tgz#a00d76b74317c61f9c2db2218b8e9f8e9c5c9e6b"
+  integrity sha512-XGZnNzm3QvgKxa8dpzyhFTHmpP3l5YNusmne07VUOXxou9CqUqYa/HBy124RqtVh/O2pECas/MOcsDgpilPOPg==
   dependencies:
-    mime-db "1.45.0"
+    mime-db "1.48.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:
-  version "2.4.6"
-  resolved "https://registry.yarnpkg.com/mime/-/mime-2.4.6.tgz#e5b407c90db442f2beb5b162373d07b69affa4d1"
-  integrity sha512-RZKhC3EmpBchfTGBVb8fb+RL2cWyw/32lshnsETttkBAyAUXSGHxbEJWWRXc751DrIxG1q04b8QwMbAwkRPpUA==
-
-mime@2.5.2:
+mime@2.5.2, mime@^2.4.4, mime@^2.5.2, mime@~2.5.2:
   version "2.5.2"
   resolved "https://registry.yarnpkg.com/mime/-/mime-2.5.2.tgz#6e3dc6cc2b9510643830e5f19d5cb753da5eeabe"
   integrity sha512-tqkh47FzKeCPD2PUiPB6pkbMzsCasjxAfC62/Wap5qrUWcb+sFasXUC5I3gYM5iBM8v/Qpn4UK0x+j0iHyFPDg==
 
-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.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/mimic-fn/-/mimic-fn-2.1.0.tgz#7ed2c2ccccaf84d3ffcb7a69b57711fc2083401b"
@@ -7784,21 +7832,19 @@ 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.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-1.4.1.tgz#975e27c1d0bd8e052972415f47c79cea5ed37548"
-  integrity sha512-COAGbpAsU0ioFzj+/RRfO5Qv177L1Z/XAx2EmCF33b8GDDqKygMffBTws2lit8iaPdrbKEY5P+zsseBUCREZWQ==
+mini-css-extract-plugin@2.4.2:
+  version "2.4.2"
+  resolved "https://registry.yarnpkg.com/mini-css-extract-plugin/-/mini-css-extract-plugin-2.4.2.tgz#b3508191ea479388a4715018c99dd3e6dd40d2d2"
+  integrity sha512-ZmqShkn79D36uerdED+9qdo1ZYG8C1YsWvXu0UMJxurZnSdgz7gQKO2EGv8T55MhDqG3DYmGtizZNpM/UbTlcA==
   dependencies:
-    loader-utils "^2.0.0"
-    schema-utils "^3.0.0"
-    webpack-sources "^1.1.0"
+    schema-utils "^3.1.0"
 
 minimalistic-assert@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz#2e194de044626d4a10e7f7fbc00ce73e83e4d5c7"
   integrity sha512-UtJcAD4yEaGtjPezWuO9wC4nwUnVH/8/Im3yEHQP4b67cXlD/Qr9hdITCU1xDbSEXg2XKNaP8jsReV7vQd00/A==
 
-"minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.4:
+"minimatch@2 || 3", minimatch@3.0.4, minimatch@^3.0.4, minimatch@~3.0.4:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-3.0.4.tgz#5166e286457f03306064be5497e8dbb0c3d32083"
   integrity sha512-yJHVQEhyqPLUTgt9B83PXu6W3rx4MvvHvSUvToogpwoGDOUQ+yDrR0HRot+yOCdCO7u4hX3pWft6kWBBcqh0UA==
@@ -7814,10 +7860,10 @@ minimist-options@4.1.0:
     is-plain-obj "^1.1.0"
     kind-of "^6.0.3"
 
-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"
@@ -7827,9 +7873,9 @@ minipass-collect@^1.0.2:
     minipass "^3.0.0"
 
 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==
+  version "1.3.4"
+  resolved "https://registry.yarnpkg.com/minipass-fetch/-/minipass-fetch-1.3.4.tgz#63f5af868a38746ca7b33b03393ddf8c291244fe"
+  integrity sha512-TielGogIzbUEtd1LsjZFs47RWuHHfhl6TiCx1InVxApBAmQ8bL0dL5ilkLGcRvuyW/A9nE+Lvn855Ewz8S0PnQ==
   dependencies:
     minipass "^3.1.0"
     minipass-sized "^1.0.3"
@@ -7889,11 +7935,6 @@ mixin-deep@^1.2.0:
     for-in "^1.0.2"
     is-extendable "^1.0.1"
 
-mkdirp-classic@^0.5.2:
-  version "0.5.3"
-  resolved "https://registry.yarnpkg.com/mkdirp-classic/-/mkdirp-classic-0.5.3.tgz#fa10c9115cc6d8865be221ba47ee9bed78601113"
-  integrity sha512-gKLcREMhtuZRwRAfqP3RFW+TK4JqApVBtOIftVgjuABpAtpxhPGaDcfvbhNvD0B8iD1oUr/txX35NjcaY6Ns/A==
-
 mkdirp@1.0.4, mkdirp@^1.0.3, mkdirp@^1.0.4, mkdirp@~1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/mkdirp/-/mkdirp-1.0.4.tgz#3eb5ed62622756d79a5f0e2a221dfebad75c2f7e"
@@ -7906,11 +7947,6 @@ mkdirp@^0.5.1, mkdirp@^0.5.3, mkdirp@^0.5.5, mkdirp@~0.5.1:
   dependencies:
     minimist "^1.2.5"
 
-modify-values@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/modify-values/-/modify-values-1.0.1.tgz#b3939fa605546474e3e3e3c63d64bd43b4ee6022"
-  integrity sha512-xV2bxeN6F7oYjZWTe/YPAy6MN2M+sL4u/Rlm2AHCIVGfo2p1yGmBHQ6vHehl4bRTZBdHu3TSkWdYgkwpYzAGSw==
-
 ms@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/ms/-/ms-2.0.0.tgz#5608aeadfc00be6c2901df5f9861788de0d597c8"
@@ -7974,15 +8010,15 @@ nan@^2.12.1:
   resolved "https://registry.yarnpkg.com/nan/-/nan-2.14.2.tgz#f5376400695168f4cc694ac9393d0c9585eeea19"
   integrity sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ==
 
-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.22:
-  version "3.1.22"
-  resolved "https://registry.yarnpkg.com/nanoid/-/nanoid-3.1.22.tgz#b35f8fb7d151990a8aebd5aa5015c03cf726f844"
-  integrity sha512-/2ZUaJX2ANuLtTvqTlgqBQNJoQO398KyJgZloL0PZkC0dpysjncRUPsFe3DUPzz/y3h+u7C46np8RMuvF3jsSQ==
+nanoid@^3.1.28:
+  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"
@@ -8001,21 +8037,26 @@ nanomatch@^1.2.9:
     snapdragon "^0.8.1"
     to-regex "^3.0.1"
 
+natural-compare@^1.4.0:
+  version "1.4.0"
+  resolved "https://registry.yarnpkg.com/natural-compare/-/natural-compare-1.4.0.tgz#4abebfeed7541f2c27acfb29bdbbd15c8d5ba4f7"
+  integrity sha1-Sr6/7tdUHywnrPspvbvRXI1bpPc=
+
 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==
+  version "2.8.0"
+  resolved "https://registry.yarnpkg.com/needle/-/needle-2.8.0.tgz#1c8ef9c1a2c29dcc1e83d73809d7bc681c80a048"
+  integrity sha512-ZTq6WYkN/3782H1393me3utVYdq2XyqNUFBsprEE3VMAT0+hP/cItpnITpqsY6ep2yeFE4Tqtqwc74VqUlUYtw==
   dependencies:
     debug "^3.2.6"
     iconv-lite "^0.4.4"
     sax "^1.2.4"
 
-negotiator@0.6.2:
+negotiator@0.6.2, negotiator@^0.6.2:
   version "0.6.2"
   resolved "https://registry.yarnpkg.com/negotiator/-/negotiator-0.6.2.tgz#feacf7ccf525a77ae9634436a64883ffeca346fb"
   integrity sha512-hZXc7K2e+PgeI1eDBe/10Ard4ekbfrrqG8Ep+8Jmf4JID2bNg7NvCPOZN+kfF574pFQI7mum2AUqDidoKqcTOw==
@@ -8035,42 +8076,66 @@ next-tick@~1.0.0:
   resolved "https://registry.yarnpkg.com/next-tick/-/next-tick-1.0.0.tgz#ca86d1fe8828169b0120208e3dc8424b9db8342c"
   integrity sha1-yobR/ogoFpsBICCOPchCS524NCw=
 
-ng-packagr@~12.0.0-next.0:
-  version "12.0.0-next.1"
-  resolved "https://registry.yarnpkg.com/ng-packagr/-/ng-packagr-12.0.0-next.1.tgz#ce5e20113f589822c3d2c4cdf9bf062a8cd91847"
-  integrity sha512-z6rlmsrZaLsMhkXyA5EM2SFvsxw0sS1ASunRkdv3yNLcisu5UOJpZ4u5AKWk5V3Z1jgUx4+RQDZ68RwfzBK82A==
+ng-packagr@~12.1.2:
+  version "12.1.2"
+  resolved "https://registry.yarnpkg.com/ng-packagr/-/ng-packagr-12.1.2.tgz#602e204e62e84a6273565cf053ad078a11049ea9"
+  integrity sha512-LXBHauu2LIft7RvzvI0/O+O5xeKvNgoJR3AVkCH5yNtxHTlGNzx5tJMvFqHbcxleXwT59QCRx+WhZXP8xonwew==
   dependencies:
-    "@rollup/plugin-commonjs" "^17.0.0"
+    "@rollup/plugin-commonjs" "^19.0.0"
     "@rollup/plugin-json" "^4.1.0"
-    "@rollup/plugin-node-resolve" "^11.1.0"
-    ajv "^7.0.3"
+    "@rollup/plugin-node-resolve" "^13.0.0"
+    ajv "^8.0.0"
     ansi-colors "^4.1.1"
-    autoprefixer "^10.2.4"
     browserslist "^4.16.1"
+    cacache "^15.0.6"
     chokidar "^3.5.1"
-    commander "^7.0.0"
-    cssnano "^4.1.10"
+    commander "^8.0.0"
+    cssnano "^5.0.0"
+    dependency-graph "^0.11.0"
+    find-cache-dir "^3.3.1"
     glob "^7.1.6"
     injection-js "^2.4.0"
+    jsonc-parser "^3.0.0"
     less "^4.1.0"
     node-sass-tilde-importer "^1.0.2"
     ora "^5.1.0"
     postcss "^8.2.4"
+    postcss-preset-env "^6.7.0"
     postcss-url "^10.1.1"
-    rimraf "^3.0.0"
-    rollup "^2.37.0"
+    rollup "^2.45.1"
     rollup-plugin-sourcemaps "^0.6.3"
     rxjs "^6.5.0"
-    sass "^1.32.5"
+    sass "^1.32.8"
     stylus "^0.54.8"
-    sync-rpc "^1.3.6"
-    terser "^5.5.1"
+
+nice-napi@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/nice-napi/-/nice-napi-1.0.2.tgz#dc0ab5a1eac20ce548802fc5686eaa6bc654927b"
+  integrity sha512-px/KnJAJZf5RuBGcfD+Sp2pAKq0ytz8j+1NehvgIGFkvtvFrDM3T8E4x/JJODXK9WZow8RRGrbA9QQ3hs+pDhA==
+  dependencies:
+    node-addon-api "^3.0.0"
+    node-gyp-build "^4.2.2"
 
 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==
 
+nock@^13.0.3:
+  version "13.1.1"
+  resolved "https://registry.yarnpkg.com/nock/-/nock-13.1.1.tgz#3c830129d4560957f59b6f480a41ddbaf9cf57af"
+  integrity sha512-YKTR9MjfK3kS9/l4nuTxyYm30cgOExRHzkLNhL8nhEUyU4f8Za/dRxOqjhVT1vGs0svWo3dDnJTUX1qxYeWy5w==
+  dependencies:
+    debug "^4.1.0"
+    json-stringify-safe "^5.0.1"
+    lodash.set "^4.3.2"
+    propagate "^2.0.0"
+
+node-addon-api@^3.0.0:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/node-addon-api/-/node-addon-api-3.2.1.tgz#81325e0a2117789c0128dab65e7e38f07ceba161"
+  integrity sha512-mmcei9JghVNDYydghQmeDX8KoAm0FAiYyIcUt/N4nhyAipB17pllZQDOJD2fotxABnt4Mdz+dKTO7eftLg4d0A==
+
 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"
@@ -8089,26 +8154,31 @@ node-forge@^0.10.0:
   resolved "https://registry.yarnpkg.com/node-forge/-/node-forge-0.10.0.tgz#32dea2afb3e9926f02ee5ce8794902691a676bf3"
   integrity sha512-PPmu8eEeG9saEUvI97fm4OYxXVB6bFvyNTyiUOBichBpFG8A1Ljw3bY62+5oOjDEMHRnd0Y7HQ+x7uzxOzC6JA==
 
-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==
+node-gyp-build@^4.2.2:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/node-gyp-build/-/node-gyp-build-4.2.3.tgz#ce6277f853835f718829efb47db20f3e4d9c4739"
+  integrity sha512-MN6ZpzmfNCRM+3t57PTJHgHyw/h4OWnZ6mR8P5j/uZtqQr46RRuDE/P+g3n0YR/AiYXeWixZZzaip77gdICfRg==
+
+node-gyp@^8.2.0:
+  version "8.4.1"
+  resolved "https://registry.yarnpkg.com/node-gyp/-/node-gyp-8.4.1.tgz#3d49308fc31f768180957d6b5746845fbd429937"
+  integrity sha512-olTJRgUtAb/hOXG0E93wZDs5YiJlgbXxTwQAFHyNlRsXQnYzUaF2aGgujZbw+hR8aF4ZG/rST57bWMWD16jr9w==
   dependencies:
     env-paths "^2.2.0"
     glob "^7.1.4"
-    graceful-fs "^4.2.3"
+    graceful-fs "^4.2.6"
+    make-fetch-happen "^9.1.0"
     nopt "^5.0.0"
-    npmlog "^4.1.2"
-    request "^2.88.2"
+    npmlog "^6.0.0"
     rimraf "^3.0.2"
-    semver "^7.3.2"
-    tar "^6.0.2"
+    semver "^7.3.5"
+    tar "^6.1.2"
     which "^2.0.2"
 
-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-releases@^1.1.71:
+  version "1.1.73"
+  resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.73.tgz#dd4e81ddd5277ff846b80b52bb40c49edf7a7b20"
+  integrity sha512-uW7fodD6pyW2FZNZnp/Z3hvWKeEW1Y8R1+1CnErE8cXFXzl5blBOoVB41CvMer6P6Q0S5FXDwcHgFd1Wj0U9zg==
 
 node-sass-tilde-importer@^1.0.2:
   version "1.0.2"
@@ -8117,11 +8187,6 @@ node-sass-tilde-importer@^1.0.2:
   dependencies:
     find-parent-dir "^0.3.0"
 
-node-uuid@1.4.8:
-  version "1.4.8"
-  resolved "https://registry.yarnpkg.com/node-uuid/-/node-uuid-1.4.8.tgz#b040eb0923968afabf8d32fb1f17f1167fdab907"
-  integrity sha1-sEDrCSOWivq/jTL7HxfxFn/auQc=
-
 nopt@^4.0.1:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/nopt/-/nopt-4.0.3.tgz#a375cad9d02fd921278d954c2254d5aa57e15e48"
@@ -8137,7 +8202,7 @@ nopt@^5.0.0:
   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":
+normalize-package-data@^2.0.0, normalize-package-data@^2.3.2, normalize-package-data@^2.5.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==
@@ -8148,13 +8213,13 @@ normalize-package-data@^2.0.0, normalize-package-data@^2.3.0, normalize-package-
     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==
+  version "3.0.2"
+  resolved "https://registry.yarnpkg.com/normalize-package-data/-/normalize-package-data-3.0.2.tgz#cae5c410ae2434f9a6c1baa65d5bc3b9366c8699"
+  integrity sha512-6CdZocmfGaKnIHPVFhJJZ3GuR8SsLKvDANFp47Jmy51aKIr8akjAWTSxtpI+MBgBFdSMRyo4hMpDlT6dTffgZg==
   dependencies:
-    hosted-git-info "^3.0.6"
-    resolve "^1.17.0"
-    semver "^7.3.2"
+    hosted-git-info "^4.0.1"
+    resolve "^1.20.0"
+    semver "^7.3.4"
     validate-npm-package-license "^3.0.1"
 
 normalize-path@^2.1.1:
@@ -8174,20 +8239,15 @@ normalize-range@^0.1.2:
   resolved "https://registry.yarnpkg.com/normalize-range/-/normalize-range-0.1.2.tgz#2d10c06bdfd312ea9777695a4d28439456b75942"
   integrity sha1-LRDAa9/TEuqXd2laTShDlFa3WUI=
 
-normalize-url@^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.5.0:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-4.5.0.tgz#453354087e6ca96957bd8f5baf753f5982142129"
-  integrity sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==
+normalize-url@^6.0.1:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/normalize-url/-/normalize-url-6.1.0.tgz#40d0885b535deffe3f3147bec877d05fe4c5668a"
+  integrity sha512-DlL+XwOy3NxAQ8xuC0okPgK46iuVNAK01YN7RueYBqqFeGsBjV9XmCAzAdgt+667bCl5kPh9EqKKDwnaPG1I7A==
 
 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==
+  version "1.1.2"
+  resolved "https://registry.yarnpkg.com/npm-bundled/-/npm-bundled-1.1.2.tgz#944c78789bd739035b70baa2ca5cc32b8d860bc1"
+  integrity sha512-x5DHup0SuyQcmL3s7Rx/YQ8sbw/Hzg0rj48eN0dV7hf5cmQq5PXIeioroH3raV1QC1yh3uTYuMThvEQF3iKgGQ==
   dependencies:
     npm-normalize-package-bin "^1.0.1"
 
@@ -8203,45 +8263,26 @@ 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.2, npm-package-arg@^8.1.2:
-  version "8.1.2"
-  resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-8.1.2.tgz#b868016ae7de5619e729993fbd8d11dc3c52ab62"
-  integrity sha512-6Eem455JsSMJY6Kpd3EyWE+n5hC+g9bSyHr9K9U2zqZb7+02+hObQ2c0+8iDk/mNF+8r1MhY44WypKJAkySIYA==
+npm-package-arg@8.1.5, npm-package-arg@^8.0.0, npm-package-arg@^8.0.1, npm-package-arg@^8.1.2:
+  version "8.1.5"
+  resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-8.1.5.tgz#3369b2d5fe8fdc674baa7f1786514ddc15466e44"
+  integrity sha512-LhgZrg0n0VgvzVdSm1oiZworPbTxYHUJCgtsJW8mGvlDpxTM1vSJc3m5QZeUkhAHIzbz3VCHd/R4osi1L1Tg/Q==
   dependencies:
     hosted-git-info "^4.0.1"
     semver "^7.3.4"
     validate-npm-package-name "^3.0.0"
 
-"npm-package-arg@^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0":
-  version "6.1.1"
-  resolved "https://registry.yarnpkg.com/npm-package-arg/-/npm-package-arg-6.1.1.tgz#02168cb0a49a2b75bf988a28698de7b529df5cb7"
-  integrity sha512-qBpssaL3IOZWi5vEKUKW0cO7kzLeT+EQO9W8RsLOZf76KF9E/K9+wH0C7t06HXPpaH8WH5xF1MExLuCwbTqRUg==
-  dependencies:
-    hosted-git-info "^2.7.1"
-    osenv "^0.1.5"
-    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.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==
-  dependencies:
-    hosted-git-info "^3.0.6"
-    semver "^7.0.0"
-    validate-npm-package-name "^3.0.0"
-
-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==
+npm-packlist@^3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/npm-packlist/-/npm-packlist-3.0.0.tgz#0370df5cfc2fcc8f79b8f42b37798dd9ee32c2a9"
+  integrity sha512-L/cbzmutAwII5glUcf2DBRNY/d0TFd4e/FnaZigJV6JD85RHZXJFGwCndjMWiiViiWSsWt3tiOLpI3ByTnIdFQ==
   dependencies:
     glob "^7.1.6"
-    ignore-walk "^3.0.3"
+    ignore-walk "^4.0.1"
     npm-bundled "^1.1.1"
     npm-normalize-package-bin "^1.0.1"
 
-npm-pick-manifest@6.1.1:
+npm-pick-manifest@6.1.1, npm-pick-manifest@^6.0.0, npm-pick-manifest@^6.1.1:
   version "6.1.1"
   resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-6.1.1.tgz#7b5484ca2c908565f43b7f27644f36bb816f5148"
   integrity sha512-dBsdBtORT84S8V8UTad1WlUyKIY9iMsAmqxHbLdeEeBNMLQDlDWWra3wYUx9EBEIiG/YwAy0XyNHDd2goAsfuA==
@@ -8251,42 +8292,12 @@ npm-pick-manifest@6.1.1:
     npm-package-arg "^8.1.2"
     semver "^7.3.4"
 
-npm-pick-manifest@^6.0.0:
-  version "6.1.0"
-  resolved "https://registry.yarnpkg.com/npm-pick-manifest/-/npm-pick-manifest-6.1.0.tgz#2befed87b0fce956790f62d32afb56d7539c022a"
-  integrity sha512-ygs4k6f54ZxJXrzT0x34NybRlLeZ4+6nECAIbr2i0foTnijtS1TJiyzpqtuUAJOps/hO0tNDr8fRV5g+BtRlTw==
-  dependencies:
-    npm-install-checks "^4.0.0"
-    npm-package-arg "^8.0.0"
-    semver "^7.0.0"
-
-npm-registry-client@8.6.0:
-  version "8.6.0"
-  resolved "https://registry.yarnpkg.com/npm-registry-client/-/npm-registry-client-8.6.0.tgz#7f1529f91450732e89f8518e0f21459deea3e4c4"
-  integrity sha512-Qs6P6nnopig+Y8gbzpeN/dkt+n7IyVd8f45NTMotGk6Qo7GfBmzwYx6jRLoOOgKiMnaQfYxsuyQlD8Mc3guBhg==
-  dependencies:
-    concat-stream "^1.5.2"
-    graceful-fs "^4.1.6"
-    normalize-package-data "~1.0.1 || ^2.0.0"
-    npm-package-arg "^3.0.0 || ^4.0.0 || ^5.0.0 || ^6.0.0"
-    once "^1.3.3"
-    request "^2.74.0"
-    retry "^0.10.0"
-    safe-buffer "^5.1.1"
-    semver "2 >=2.2.1 || 3.x || 4 || 5"
-    slide "^1.1.3"
-    ssri "^5.2.4"
-  optionalDependencies:
-    npmlog "2 || ^3.1.0 || ^4.0.0"
-
-npm-registry-fetch@^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==
+npm-registry-fetch@^11.0.0:
+  version "11.0.0"
+  resolved "https://registry.yarnpkg.com/npm-registry-fetch/-/npm-registry-fetch-11.0.0.tgz#68c1bb810c46542760d62a6a965f85a702d43a76"
+  integrity sha512-jmlgSxoDNuhAtxUIG6pVwwtz840i994dL14FoNVZisrmZW5kWd63IUTNv1m/hyRSGSqWjCUp/YZlS1BJyNp9XA==
   dependencies:
-    "@npmcli/ci-detect" "^1.0.0"
-    lru-cache "^6.0.0"
-    make-fetch-happen "^8.0.9"
+    make-fetch-happen "^9.0.1"
     minipass "^3.1.3"
     minipass-fetch "^1.3.0"
     minipass-json-stream "^1.0.1"
@@ -8300,22 +8311,15 @@ npm-run-path@^2.0.0:
   dependencies:
     path-key "^2.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==
-  dependencies:
-    are-we-there-yet "~1.1.2"
-    console-control-strings "~1.1.0"
-    gauge "~2.7.3"
-    set-blocking "~2.0.0"
-
-nth-check@^1.0.2:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/nth-check/-/nth-check-1.0.2.tgz#b2bd295c37e3dd58a3bf0700376663ba4d9cf05c"
-  integrity sha512-WeBOdju8SnzPN5vTUJYxYUxLeXpCaVP5i5e0LF8fg7WORF2Wd7wFX/pk0tYZk7s8T+J7VLy0Da6J1+wCT0AtHg==
+npmlog@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/npmlog/-/npmlog-6.0.0.tgz#ba9ef39413c3d936ea91553db7be49c34ad0520c"
+  integrity sha512-03ppFRGlsyUaQFbGC2C8QWJN/C/K7PsfyD9aQdhVKAQIH4sQBc8WASqFBP7O+Ut4d2oo5LoeoboB3cGdBZSp6Q==
   dependencies:
-    boolbase "~1.0.0"
+    are-we-there-yet "^2.0.0"
+    console-control-strings "^1.1.0"
+    gauge "^4.0.0"
+    set-blocking "^2.0.0"
 
 nth-check@^2.0.0:
   version "2.0.0"
@@ -8329,11 +8333,6 @@ num2fraction@^1.2.2:
   resolved "https://registry.yarnpkg.com/num2fraction/-/num2fraction-1.2.2.tgz#6f682b6a027a4e9ddfa4564cd2589d1d4e669ede"
   integrity sha1-b2gragJ6Tp3fpFZM0lidHU5mnt4=
 
-number-is-nan@^1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
-  integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
-
 nwsapi@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/nwsapi/-/nwsapi-2.2.0.tgz#204879a9e3d068ff2a55139c2c772780681a38b7"
@@ -8344,7 +8343,7 @@ oauth-sign@~0.9.0:
   resolved "https://registry.yarnpkg.com/oauth-sign/-/oauth-sign-0.9.0.tgz#47a7b016baa68b5fa0ecf3dee08a85c679ac6455"
   integrity sha512-fexhUFFPTGV8ybAtSIGbV6gOkSv8UtRbDBnAyLQw4QPKkgNlsH2ByPGtMUqdWkos6YCRmAqViwgZrJc/mRDzZQ==
 
-object-assign@^4, object-assign@^4.0.1, object-assign@^4.1.0:
+object-assign@^4, object-assign@^4.0.1:
   version "4.1.1"
   resolved "https://registry.yarnpkg.com/object-assign/-/object-assign-4.1.1.tgz#2109adc7965887cfc05cbbd442cac8bfbb360863"
   integrity sha1-IQmtx5ZYh8/AXLvUQsrIv7s2CGM=
@@ -8358,10 +8357,10 @@ object-copy@^0.1.0:
     define-property "^0.2.5"
     kind-of "^3.0.3"
 
-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.10.3:
+  version "1.11.0"
+  resolved "https://registry.yarnpkg.com/object-inspect/-/object-inspect-1.11.0.tgz#9dceb146cedd4148a0d9e51ab88d34cf509922b1"
+  integrity sha512-jp7ikS6Sd3GxQfZJPyH3cjcbJF6GZPClgdV+EFygjFLQ5FmW/dRUnTd9PQ9k0JhoNDabWFbpF1yCdSWCC6gexg==
 
 object-inspect@~1.4.0:
   version "1.4.1"
@@ -8369,11 +8368,11 @@ object-inspect@~1.4.0:
   integrity sha512-wqdhLpfCUbEsoEwl3FXwGyv8ief1k/1aUdIPCqVnupM6e8l63BEJdiF/0swtn04/8p05tG/T0FrpTlfwvljOdw==
 
 object-is@^1.0.1:
-  version "1.1.4"
-  resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.4.tgz#63d6c83c00a43f4cbc9434eb9757c8a5b8565068"
-  integrity sha512-1ZvAZ4wlF7IyPVOcE1Omikt7UpaFlOQq0HlSti+ZvDH3UiD2brwGMwDbyV43jao2bKJ+4+WdPJHSd7kgzKYVqg==
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/object-is/-/object-is-1.1.5.tgz#b9deeaa5fc7f1846a0faecdceec138e5778f53ac"
+  integrity sha512-3cyDsyHgtmi7I7DfSSI2LDp6SK2lwvtbg0p0R1e0RvTqF5ceGx+K2dfSjm1bKDMVCFEDAQvy+o8c6a7VujOddw==
   dependencies:
-    call-bind "^1.0.0"
+    call-bind "^1.0.2"
     define-properties "^1.1.3"
 
 object-keys@^1.0.12, object-keys@^1.0.6, object-keys@^1.1.1:
@@ -8388,7 +8387,7 @@ object-visit@^1.0.0:
   dependencies:
     isobject "^3.0.0"
 
-object.assign@^4.1.0, object.assign@^4.1.1, object.assign@^4.1.2:
+object.assign@^4.1.0, 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==
@@ -8398,15 +8397,6 @@ object.assign@^4.1.0, object.assign@^4.1.1, object.assign@^4.1.2:
     has-symbols "^1.0.1"
     object-keys "^1.1.1"
 
-object.getownpropertydescriptors@^2.1.0:
-  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.18.0-next.1"
-
 object.pick@^1.3.0:
   version "1.3.0"
   resolved "https://registry.yarnpkg.com/object.pick/-/object.pick-1.3.0.tgz#87a10ac4c1694bd2e1cbf53591a66141fb5dd747"
@@ -8414,26 +8404,20 @@ object.pick@^1.3.0:
   dependencies:
     isobject "^3.0.1"
 
-object.values@^1.1.0:
-  version "1.1.2"
-  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.2.tgz#7a2015e06fcb0f546bd652486ce8583a4731c731"
-  integrity sha512-MYC0jvJopr8EK6dPBiO8Nb9mvjdypOachO5REGk6MXzujbBrAisKo3HmdEI6kZDL6fC31Mwee/5YbtMebixeag==
+object.values@^1.1.3:
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/object.values/-/object.values-1.1.4.tgz#0d273762833e816b693a637d30073e7051535b30"
+  integrity sha512-TnGo7j4XSnKQoK3MfvkzqKCi0nVe/D9I9IjwTNYdb/fxYHpjrluHVOgw0AF6jrRFGMPHdfuidR09tIDiIvnaSg==
   dependencies:
-    call-bind "^1.0.0"
+    call-bind "^1.0.2"
     define-properties "^1.1.3"
-    es-abstract "^1.18.0-next.1"
-    has "^1.0.3"
+    es-abstract "^1.18.2"
 
 obuf@^1.0.0, obuf@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/obuf/-/obuf-1.1.2.tgz#09bea3343d41859ebd446292d11c9d4db619084e"
   integrity sha512-PX1wu0AmAdPqOL1mWhqmlOd8kOIZQwGZw6rh7uby9fTc5lhaOWFLX3I6R1hrF9k3zUY40e6igsLGkDXK92LJNg==
 
-octokit-pagination-methods@^1.1.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/octokit-pagination-methods/-/octokit-pagination-methods-1.1.0.tgz#cf472edc9d551055f9ef73f6e42b4dbb4c80bea4"
-  integrity sha512-fZ4qZdQ2nxJvtcasX7Ghl+WlWS/d9IgnBIwFZXVNNZUmzpno91SX5bc5vuxiuKoCtK78XxGGNuSCrDC7xYB3OQ==
-
 on-finished@~2.3.0:
   version "2.3.0"
   resolved "https://registry.yarnpkg.com/on-finished/-/on-finished-2.3.0.tgz#20f1336481b083cd75337992a16971aa2d906947"
@@ -8446,7 +8430,7 @@ on-headers@~1.0.2:
   resolved "https://registry.yarnpkg.com/on-headers/-/on-headers-1.0.2.tgz#772b0ae6aaa525c399e489adfad90c403eb3c28f"
   integrity sha512-pZAE+FJLoyITytdqK0U5s+FIpjN0JP3OzFi/u8Rx+EV5/W+JTWGXG8xFzevE7AjBfDqHv/8vL8qQsIhHnqRkrA==
 
-once@^1.3.0, once@^1.3.1, once@^1.3.3, once@^1.4.0:
+once@^1.3.0, once@^1.3.1, once@^1.4.0:
   version "1.4.0"
   resolved "https://registry.yarnpkg.com/once/-/once-1.4.0.tgz#583b1aa775961d4b113ac17d9c50baef9dd76bd1"
   integrity sha1-WDsap3WWHUsROsF9nFC6753Xa9E=
@@ -8460,10 +8444,10 @@ onetime@^5.1.0:
   dependencies:
     mimic-fn "^2.1.0"
 
-open@8.0.5:
-  version "8.0.5"
-  resolved "https://registry.yarnpkg.com/open/-/open-8.0.5.tgz#92ee3faafef4ddbe78006f7881572f3e81430b8f"
-  integrity sha512-hkPXCz7gijWp2GoWqsQ4O/5p7F6d5pIQ/+9NyeWG1nABJ4zvLi9kJRv1a44kVf5p13wK0WMoiRA+Xey68yOytA==
+open@8.2.1:
+  version "8.2.1"
+  resolved "https://registry.yarnpkg.com/open/-/open-8.2.1.tgz#82de42da0ccbf429bc12d099dad2e0975e14e8af"
+  integrity sha512-rXILpcQlkF/QuFez2BJDf3GsqpjGKbkUUToAIGo9A0Q6ZkoSGogZJulrUdwRkrAsoQvoZsrjCYt8+zblOk7JQQ==
   dependencies:
     define-lazy-prop "^2.0.0"
     is-docker "^2.1.1"
@@ -8488,10 +8472,22 @@ optionator@^0.8.1:
     type-check "~0.3.2"
     word-wrap "~1.2.3"
 
-ora@5.4.0:
-  version "5.4.0"
-  resolved "https://registry.yarnpkg.com/ora/-/ora-5.4.0.tgz#42eda4855835b9cd14d33864c97a3c95a3f56bf4"
-  integrity sha512-1StwyXQGoU6gdjYkyVcqOLnVlbKj+6yPNNOxJVgpt9t4eksKjiriiHuxktLYkgllwk+D6MbC4ihH84L1udRXPg==
+optionator@^0.9.1:
+  version "0.9.1"
+  resolved "https://registry.yarnpkg.com/optionator/-/optionator-0.9.1.tgz#4f236a6373dae0566a6d43e1326674f50c291499"
+  integrity sha512-74RlY5FCnhq4jRxVUPKDaRwrVNXMqsGsiW6AJw4XK8hmtm10wC0ypZBLw5IIp85NZMr91+qd1RvvENwg7jjRFw==
+  dependencies:
+    deep-is "^0.1.3"
+    fast-levenshtein "^2.0.6"
+    levn "^0.4.1"
+    prelude-ls "^1.2.1"
+    type-check "^0.4.0"
+    word-wrap "^1.2.3"
+
+ora@5.4.1, ora@^5.0.0, ora@^5.1.0, ora@^5.3.0:
+  version "5.4.1"
+  resolved "https://registry.yarnpkg.com/ora/-/ora-5.4.1.tgz#1b2678426af4ac4a509008e5e4ac9e9959db9e18"
+  integrity sha512-5b6Y85tPxZZ7QytO+BQzysW31HJku27cRIlkbAXaNx+BdcVi+LlRFmVXzeF6a7JCwJpyw5c4b+YSVImQIrBpuQ==
   dependencies:
     bl "^4.1.0"
     chalk "^4.1.0"
@@ -8503,20 +8499,6 @@ ora@5.4.0:
     strip-ansi "^6.0.0"
     wcwidth "^1.0.1"
 
-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.5.0"
-    is-interactive "^1.0.0"
-    log-symbols "^4.0.0"
-    strip-ansi "^6.0.0"
-    wcwidth "^1.0.1"
-
 original@^1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/original/-/original-1.0.2.tgz#e442a61cffe1c5fd20a65f3261c26663b303f25f"
@@ -8529,20 +8511,12 @@ os-homedir@^1.0.0:
   resolved "https://registry.yarnpkg.com/os-homedir/-/os-homedir-1.0.2.tgz#ffbc4988336e0e833de0c168c7ef152121aa7fb3"
   integrity sha1-/7xJiDNuDoM94MFox+8VISGqf7M=
 
-os-name@^3.0.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/os-name/-/os-name-3.1.0.tgz#dec19d966296e1cd62d701a5a66ee1ddeae70801"
-  integrity sha512-h8L+8aNjNcMpo/mAIBPn5PXCM16iyPGjHNWo6U1YO8sJTMHtEtyczI6QJnLoplswm6goopQkqc7OAnjhWcugVg==
-  dependencies:
-    macos-release "^2.2.0"
-    windows-release "^3.1.0"
-
 os-tmpdir@^1.0.0, os-tmpdir@~1.0.1, os-tmpdir@~1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
   integrity sha1-u+Z0BseaqFxc/sdm/lc0VV36EnQ=
 
-osenv@^0.1.4, osenv@^0.1.5:
+osenv@^0.1.4:
   version "0.1.5"
   resolved "https://registry.yarnpkg.com/osenv/-/osenv-0.1.5.tgz#85cdfafaeb28e8677f416e287592b5f3f49ea410"
   integrity sha512-0CWcCECdMVc2Rw3U5w9ZjqX6ga6ubk1xDVKxtBQPK7wis/0F2r9T6k4ydGYhecl7YUBxBVxhL5oisPsNxAPe2g==
@@ -8551,9 +8525,9 @@ osenv@^0.1.4, osenv@^0.1.5:
     os-tmpdir "^1.0.0"
 
 p-cancelable@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-2.0.0.tgz#4a3740f5bdaf5ed5d7c3e34882c6fb5d6b266a6e"
-  integrity sha512-wvPXDmbMmu2ksjkB4Z3nZWTSkJEb9lqVdMaCKpZUGJG9TMiNp9XcbG3fn9fPKjem04fJMJnXoyFPk2FmgiaiNg==
+  version "2.1.1"
+  resolved "https://registry.yarnpkg.com/p-cancelable/-/p-cancelable-2.1.1.tgz#aab7fbd416582fa32a3db49859c122487c5ed2cf"
+  integrity sha512-BZOr3nRQHOntUjTrH8+Lh54smKHoHyur8We1V8DSMVrl5A2malOOwuJRnKRDjSnkoeBh4at6BwEnb5I7Jl31wg==
 
 p-defer@^1.0.0:
   version "1.0.0"
@@ -8657,15 +8631,15 @@ 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.3.1:
-  version "11.3.1"
-  resolved "https://registry.yarnpkg.com/pacote/-/pacote-11.3.1.tgz#6ce95dd230db475cbd8789fd1f986bec51b4bf7c"
-  integrity sha512-TymtwoAG12cczsJIrwI/euOQKtjrQHlD0k0oyt9QSmZGpqa+KdlxKdWR/YUjYizkixaVyztxt/Wsfo8bL3A6Fg==
+pacote@12.0.2:
+  version "12.0.2"
+  resolved "https://registry.yarnpkg.com/pacote/-/pacote-12.0.2.tgz#14ae30a81fe62ec4fc18c071150e6763e932527c"
+  integrity sha512-Ar3mhjcxhMzk+OVZ8pbnXdb0l8+pimvlsqBGRNkble2NVgyqOGE3yrCGi/lAYq7E7NRDMz89R1Wx5HIMCGgeYg==
   dependencies:
-    "@npmcli/git" "^2.0.1"
+    "@npmcli/git" "^2.1.0"
     "@npmcli/installed-package-contents" "^1.0.6"
     "@npmcli/promise-spawn" "^1.2.0"
-    "@npmcli/run-script" "^1.8.2"
+    "@npmcli/run-script" "^2.0.0"
     cacache "^15.0.5"
     chownr "^2.0.0"
     fs-minipass "^2.1.0"
@@ -8673,9 +8647,9 @@ pacote@11.3.1:
     minipass "^3.1.3"
     mkdirp "^1.0.3"
     npm-package-arg "^8.0.1"
-    npm-packlist "^2.1.4"
+    npm-packlist "^3.0.0"
     npm-pick-manifest "^6.0.0"
-    npm-registry-fetch "^9.0.0"
+    npm-registry-fetch "^11.0.0"
     promise-retry "^2.0.1"
     read-package-json-fast "^2.0.1"
     rimraf "^3.0.2"
@@ -8687,7 +8661,7 @@ pako@^0.2.5:
   resolved "https://registry.yarnpkg.com/pako/-/pako-0.2.9.tgz#f3f7522f4ef782348da8161bad9ecfd51bf83a75"
   integrity sha1-8/dSL073gjSNqBYbrZ7P1Rv4OnU=
 
-pako@^1.0.6, pako@~1.0.2:
+pako@^1.0.3, pako@^1.0.6, pako@~1.0.2:
   version "1.0.11"
   resolved "https://registry.yarnpkg.com/pako/-/pako-1.0.11.tgz#6c9599d340d54dfd3946380252a35705a6b992bf"
   integrity sha512-4hLB8Py4zZce5s4yd9XzopqwVv/yGNhV1Bl8NTmCq1763HeK2+EwVTv+leGeL13Dnh2wfbqowVPXCIO0z4taYw==
@@ -8699,18 +8673,6 @@ parent-module@^1.0.0:
   dependencies:
     callsites "^3.0.0"
 
-parse-github-repo-url@^1.3.0:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/parse-github-repo-url/-/parse-github-repo-url-1.4.1.tgz#9e7d8bb252a6cb6ba42595060b7bf6df3dbc1f50"
-  integrity sha1-nn2LslKmy2ukJZUGC3v23z28H1A=
-
-parse-json@^2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-2.2.0.tgz#f480f40434ef80741f8469099f8dea18f55a4dc9"
-  integrity sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=
-  dependencies:
-    error-ex "^1.2.0"
-
 parse-json@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/parse-json/-/parse-json-4.0.0.tgz#be35f5425be1f7f6c747184f98a788cb99477ee0"
@@ -8791,13 +8753,6 @@ path-dirname@^1.0.0:
   resolved "https://registry.yarnpkg.com/path-dirname/-/path-dirname-1.0.2.tgz#cc33d24d525e099a5388c0336c6e32b9160609e0"
   integrity sha1-zDPSTVJeCZpTiMAzbG4yuRYGCeA=
 
-path-exists@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-2.1.0.tgz#0feb6c64f0fc518d9a754dd5efb62c7022761f4b"
-  integrity sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=
-  dependencies:
-    pinkie-promise "^2.0.0"
-
 path-exists@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-exists/-/path-exists-3.0.0.tgz#ce0ebeaa5f78cb18925ea7d810d7b59b010fd515"
@@ -8829,24 +8784,15 @@ path-key@^3.1.0:
   integrity sha512-ojmeN0qd+y0jszEtoY48r0Peq5dwMEkIlCOu6Q5f41lfkswXuKtYrhgoTpLnyIcHm24Uhqx+5Tqm2InSwLhE6Q==
 
 path-parse@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.6.tgz#d62dbb5679405d72c4737ec58600e9ddcf06d24c"
-  integrity sha512-GSmOT2EbHrINBf9SR7CDELwlJ8AENk3Qn7OikK4nFYAu3Ote2+JYNVvkpAEQm3/TLNEJFD/xZJjzyxg3KBWOzw==
+  version "1.0.7"
+  resolved "https://registry.yarnpkg.com/path-parse/-/path-parse-1.0.7.tgz#fbc114b60ca42b30d9daf5858e4bd68bbedb6735"
+  integrity sha512-LDJzPVEEEPR+y48z93A0Ed0yXb8pAByGWo/k5YYdYgpY2/2EsOsksJrq7lOHxryrVOn1ejG6oAp8ahvOIQD8sw==
 
 path-to-regexp@0.1.7:
   version "0.1.7"
   resolved "https://registry.yarnpkg.com/path-to-regexp/-/path-to-regexp-0.1.7.tgz#df604178005f522f15eb4490e7247a1bfaa67f8c"
   integrity sha1-32BBeABfUi8V60SQ5yR6G/qmf4w=
 
-path-type@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/path-type/-/path-type-1.1.0.tgz#59c44f7ee491da704da415da5a4070ba4f8fe441"
-  integrity sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=
-  dependencies:
-    graceful-fs "^4.1.2"
-    pify "^2.0.0"
-    pinkie-promise "^2.0.0"
-
 path-type@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/path-type/-/path-type-3.0.0.tgz#cef31dc8e0a1a3bb0d105c0cd97cf3bf47f4e36f"
@@ -8869,10 +8815,15 @@ performance-now@^2.1.0:
   resolved "https://registry.yarnpkg.com/performance-now/-/performance-now-2.1.0.tgz#6309f4e0e5fa913ec1c69307ae364b4b377c9e7b"
   integrity sha1-Ywn04OX6kT7BxpMHrjZLSzd8nns=
 
-picomatch@^2.0.4, 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"
-  integrity sha512-q0M/9eZHzmr0AulXyPwNfZjtwZ/RBZlbN3K3CErVrk50T2ASYI7Bye0EvekFY3IP1Nt2DHu0re+V2ZHIpMkuWg==
+picocolors@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/picocolors/-/picocolors-0.2.1.tgz#570670f793646851d1ba135996962abad587859f"
+  integrity sha512-cMlDqaLEqfSaW8Z7N5Jw+lyIW869EzT73/F5lhtY9cLGoVxSXznfgfXMO0Z5K0o0Q2TkTXq+0KFsdnSe3jDViA==
+
+picomatch@^2.0.4, picomatch@^2.2.1, picomatch@^2.2.2, picomatch@^2.2.3:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/picomatch/-/picomatch-2.3.0.tgz#f1f061de8f6a4bf022892e2d128234fb98302972"
+  integrity sha512-lY1Q/PiJGC2zOv/z391WOTD+Z02bCgsFfvxoXXf6h7kv9o+WmsmzYqrAwY63sNgOxE4xEdq0WyUnXfKeBrSvYw==
 
 pidtree@0.5.0, pidtree@^0.5.0:
   version "0.5.0"
@@ -8918,18 +8869,43 @@ pino-std-serializers@^3.1.0:
   resolved "https://registry.yarnpkg.com/pino-std-serializers/-/pino-std-serializers-3.2.0.tgz#b56487c402d882eb96cd67c257868016b61ad671"
   integrity sha512-EqX4pwDPrt3MuOAAUBMU0Tk5kR/YcCM5fNPEzgCO2zJ5HfX0vbiH9HbJglnyeQsN96Kznae6MWD47pZB5avTrg==
 
-pino@6.11.2:
-  version "6.11.2"
-  resolved "https://registry.yarnpkg.com/pino/-/pino-6.11.2.tgz#2f3d119c526651aab4ec3d280844785d52d0b690"
-  integrity sha512-bmzxwbrIPxQUlAuMkF4PWVErUGERU4z37HazlhflKFg08crsNE3fACGN6gPwg5xtKOK47Ux5cZm8YCuLV4wWJg==
+pino@6.12.0:
+  version "6.12.0"
+  resolved "https://registry.yarnpkg.com/pino/-/pino-6.12.0.tgz#2281521620d70eeff519039467352d656f46735e"
+  integrity sha512-5NGopOcUusGuklGHVVv9az0Hv/Dj3urHhD3G+zhl5pBGIRYAeGCi/Ej6YCl16Q2ko28cmYiJz+/qRoJiwy62Rw==
   dependencies:
     fast-redact "^3.0.0"
-    fast-safe-stringify "^2.0.7"
+    fast-safe-stringify "^2.0.8"
     flatstr "^1.0.12"
     pino-std-serializers "^3.1.0"
-    quick-format-unescaped "4.0.1"
+    quick-format-unescaped "^4.0.3"
     sonic-boom "^1.0.2"
 
+piscina@3.1.0:
+  version "3.1.0"
+  resolved "https://registry.yarnpkg.com/piscina/-/piscina-3.1.0.tgz#2333636865b6cb69c5a370bbc499a98cabcf3e04"
+  integrity sha512-KTW4sjsCD34MHrUbx9eAAbuUSpVj407hQSgk/6Epkg0pbRBmv4a3UX7Sr8wxm9xYqQLnsN4mFOjqGDzHAdgKQg==
+  dependencies:
+    eventemitter-asyncresource "^1.0.0"
+    hdr-histogram-js "^2.0.1"
+    hdr-histogram-percentiles-obj "^3.0.0"
+  optionalDependencies:
+    nice-napi "^1.0.2"
+
+pkg-dir@4.2.0, pkg-dir@^4.1.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3"
+  integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==
+  dependencies:
+    find-up "^4.0.0"
+
+pkg-dir@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-2.0.0.tgz#f6d5d1109e19d63edf428e0bd57e12777615334b"
+  integrity sha1-9tXREJ4Z1j7fQo4L1X4Sd3YVM0s=
+  dependencies:
+    find-up "^2.1.0"
+
 pkg-dir@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-3.0.0.tgz#2749020f239ed990881b1f71210d51eb6523bea3"
@@ -8937,12 +8913,12 @@ pkg-dir@^3.0.0:
   dependencies:
     find-up "^3.0.0"
 
-pkg-dir@^4.1.0, pkg-dir@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/pkg-dir/-/pkg-dir-4.2.0.tgz#f099133df7ede422e81d1d8448270eeb3e4261f3"
-  integrity sha512-HRDzbaKjC+AOWVXxAU/x54COGeIv9eb+6CkDSQoNTt4XyWoIJvuPsXizxu/Fr23EiekbtZwmh1IcIG/l/a10GQ==
+pkg-up@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/pkg-up/-/pkg-up-2.0.0.tgz#c819ac728059a461cab1c3889a2be3c49a004d7f"
+  integrity sha1-yBmscoBZpGHKscOImivjxJoATX8=
   dependencies:
-    find-up "^4.0.0"
+    find-up "^2.1.0"
 
 pkginfo@0.4.1:
   version "0.4.1"
@@ -8986,15 +8962,6 @@ postcss-attribute-case-insensitive@^4.0.1:
     postcss "^7.0.2"
     postcss-selector-parser "^6.0.2"
 
-postcss-calc@^7.0.1:
-  version "7.0.5"
-  resolved "https://registry.yarnpkg.com/postcss-calc/-/postcss-calc-7.0.5.tgz#f8a6e99f12e619c2ebc23cf6c486fdc15860933e"
-  integrity sha512-1tKHutbGtLtEZF6PT4JSihCHfIVldU72mZ8SdZHIYriIZ9fh9k9aWSppaT8rHsyI3dX+KSR+W+Ix9BMY3AODrg==
-  dependencies:
-    postcss "^7.0.27"
-    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"
@@ -9045,38 +9012,20 @@ postcss-color-rebeccapurple@^4.0.1:
     postcss "^7.0.2"
     postcss-values-parser "^2.0.0"
 
-postcss-colormin@^4.0.3:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-4.0.3.tgz#ae060bce93ed794ac71264f08132d550956bd381"
-  integrity sha512-WyQFAdDZpExQh32j0U0feWisZ0dmOtPl44qYmJKkq9xFWY3p+4qnRzCHeNrkeRhwPHz9bQ3mo0/yVkaply0MNw==
-  dependencies:
-    browserslist "^4.0.0"
-    color "^3.0.0"
-    has "^1.0.0"
-    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==
+postcss-colormin@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/postcss-colormin/-/postcss-colormin-5.2.0.tgz#2b620b88c0ff19683f3349f4cf9e24ebdafb2c88"
+  integrity sha512-+HC6GfWU3upe5/mqmxuqYZ9B2Wl4lcoUUNkoaX59nEWV4EtADCMiBqui111Bu8R8IvaZTmqmxrqOAqjbHIwXPw==
   dependencies:
-    browserslist "^4.16.0"
-    color "^3.1.1"
+    browserslist "^4.16.6"
+    caniuse-api "^3.0.0"
+    colord "^2.0.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"
-  integrity sha512-Kisdo1y77KUC0Jmn0OXU/COOJbzM8cImvw1ZFsBgBgMgb1iL23Zs/LXRe3r+EZqM3vGYKdQ2YJVQ5VkJI+zEJQ==
-  dependencies:
-    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==
+postcss-convert-values@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-convert-values/-/postcss-convert-values-5.0.1.tgz#4ec19d6016534e30e3102fdf414e753398645232"
+  integrity sha512-C3zR1Do2BkKkCgC0g3sF8TS0koF2G+mN8xxayZx3f10cIRmTaAnpgpRQZjNekTZxM2ciSPoh2IWJm0VZx8NoQg==
   dependencies:
     postcss-value-parser "^4.1.0"
 
@@ -9111,53 +9060,25 @@ postcss-dir-pseudo-class@^5.0.0:
     postcss "^7.0.2"
     postcss-selector-parser "^5.0.0-rc.3"
 
-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"
-  integrity sha512-RJutN259iuRf3IW7GZyLM5Sw4GLTOH8FmsXBnv8Ab/Tc2k4SR4qbV4DNbyyY4+Sjo362SyDmW2DQ7lBSChrpkg==
-  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"
-  integrity sha512-ZNQfR1gPNAiXZhgENFfEglF93pciw0WxMkJeVmw8eF+JZBbMD7jp6C67GqJAXVZP2BWbOztKfbsdmMp/k8c6oQ==
-  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"
-  integrity sha512-B9miTzbznhDjTfjvipfHoqbWKwd0Mj+/fL5s1QOz06wufguil+Xheo4XpOnc4NqKYBCNqqEzgPv2aPBIJLox0w==
-  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-comments@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-discard-comments/-/postcss-discard-comments-5.0.1.tgz#9eae4b747cf760d31f2447c27f0619d5718901fe"
+  integrity sha512-lgZBPTDvWrbAYY1v5GYEv8fEO/WhKOu/hmZqmCYfrpD6eyDWWzAOsl2rF29lpvziKO02Gc5GJQtlpkTmakwOWg==
 
-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"
-  integrity sha512-IYY2bEDD7g1XM1IDEsUT4//iEYCxAmP5oDSFMVU/JVvT7gh+l4fmjciLqGgwjdWpQIdb0Che2VX00QObS5+cTg==
-  dependencies:
-    postcss "^7.0.0"
+postcss-discard-duplicates@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-discard-duplicates/-/postcss-discard-duplicates-5.0.1.tgz#68f7cc6458fe6bab2e46c9f55ae52869f680e66d"
+  integrity sha512-svx747PWHKOGpAXXQkCc4k/DsWo+6bc5LsVrAsw+OU+Ibi7klFZCyX54gjYzX4TH+f2uzXjRviLARxkMurA2bA==
 
-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-discard-empty@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-discard-empty/-/postcss-discard-empty-5.0.1.tgz#ee136c39e27d5d2ed4da0ee5ed02bc8a9f8bf6d8"
+  integrity sha512-vfU8CxAQ6YpMxV2SvMcMIyF2LX1ZzWpy0lqHDsOdaKKLQVQGVP1pzhrI9JlsO65s66uQTfkQBKBD/A5gp9STFw==
+
+postcss-discard-overridden@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-discard-overridden/-/postcss-discard-overridden-5.0.1.tgz#454b41f707300b98109a75005ca4ab0ff2743ac6"
+  integrity sha512-Y28H7y93L2BpJhrdUR2SR2fnSsT+3TVx1NmVQLbcnZWwIUpJ7mfcTC6Za9M2PG6w8j7UQRfzxqn8jU2VwFxo3Q==
 
 postcss-double-position-gradients@^1.0.0:
   version "1.0.0"
@@ -9211,21 +9132,20 @@ postcss-image-set-function@^3.0.1:
     postcss "^7.0.2"
     postcss-values-parser "^2.0.0"
 
-postcss-import@14.0.1:
-  version "14.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-14.0.1.tgz#6a3f8f2ce74a95fc7c72ecfe3eddfa0e9124e677"
-  integrity sha512-Xn2+z++vWObbEPhiiKO1a78JiyhqipyrXHBb3AHpv0ks7Cdg+GxQQJ24ODNMTanldf7197gSP3axppO9yaG0lA==
+postcss-import@14.0.2:
+  version "14.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-import/-/postcss-import-14.0.2.tgz#60eff77e6be92e7b67fe469ec797d9424cae1aa1"
+  integrity sha512-BJ2pVK4KhUyMcqjuKs9RijV5tatNzNa73e/32aBVE/ejYPe37iH+6vAu9WvqUkB5OAYgLHzbSvzHnorybJCm9g==
   dependencies:
     postcss-value-parser "^4.0.0"
     read-cache "^1.0.0"
     resolve "^1.1.7"
 
 postcss-initial@^3.0.0:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-initial/-/postcss-initial-3.0.2.tgz#f018563694b3c16ae8eaabe3c585ac6319637b2d"
-  integrity sha512-ugA2wKonC0xeNHgirR4D3VWHs2JcU08WAi1KFLVcnb7IN89phID6Qtg2RIctWbnvp1TM2BOmDtX8GGLCKdR8YA==
+  version "3.0.4"
+  resolved "https://registry.yarnpkg.com/postcss-initial/-/postcss-initial-3.0.4.tgz#9d32069a10531fe2ecafa0b6ac750ee0bc7efc53"
+  integrity sha512-3RLn6DIpMsK1l5UUy9jxQvoDeUN4gP939tDcKUHD/kM8SGSKbFAnvkpFpj3Bhtz3HGk1jWY5ZNWX6mPta5M9fg==
   dependencies:
-    lodash.template "^4.5.0"
     postcss "^7.0.2"
 
 postcss-lab-function@^2.0.1:
@@ -9237,14 +9157,14 @@ postcss-lab-function@^2.0.1:
     postcss "^7.0.2"
     postcss-values-parser "^2.0.0"
 
-postcss-loader@5.2.0:
-  version "5.2.0"
-  resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-5.2.0.tgz#ccd6668a778902d653602289c765a8bc481986dc"
-  integrity sha512-uSuCkENFeUaOYsKrXm0eNNgVIxc71z8RcckLMbVw473rGojFnrUeqEz6zBgXsH2q1EIzXnO/4pEz9RhALjlITA==
+postcss-loader@6.1.1:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/postcss-loader/-/postcss-loader-6.1.1.tgz#58dd0a3accd9bc87cc52eff75244db578d11301a"
+  integrity sha512-lBmJMvRh1D40dqpWKr9Rpygwxn8M74U9uaCSeYGNKLGInbk9mXBt1ultHf2dH9Ghk6Ue4UXlXWwGMH9QdUJ5ug==
   dependencies:
     cosmiconfig "^7.0.0"
     klona "^2.0.4"
-    semver "^7.3.4"
+    semver "^7.3.5"
 
 postcss-logical@^3.0.0:
   version "3.0.0"
@@ -9260,122 +9180,60 @@ postcss-media-minmax@^4.0.0:
   dependencies:
     postcss "^7.0.2"
 
-postcss-merge-longhand@^4.0.11:
-  version "4.0.11"
-  resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-4.0.11.tgz#62f49a13e4a0ee04e7b98f42bb16062ca2549e24"
-  integrity sha512-alx/zmoeXvJjp7L4mxEMjh8lxVlDFX1gqWHzaaQewwMZiVhLo42TEClKaeHbRf6J7j82ZOdTJ808RtN0ZOZwvw==
-  dependencies:
-    css-color-names "0.0.4"
-    postcss "^7.0.0"
-    postcss-value-parser "^3.0.0"
-    stylehacks "^4.0.0"
-
-postcss-merge-longhand@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-5.0.0.tgz#103dee28c55491df727f17d7b8e91e93e7a472ee"
-  integrity sha512-VZNFA40K8BYHzJNA6jHPdg1Nofsz/nK5Dkszrcb5IgWcLroSBZOD6I/iNQzpejSU/3XwpOiZNaYAdBV4KcvxWA==
+postcss-merge-longhand@^5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-merge-longhand/-/postcss-merge-longhand-5.0.2.tgz#277ada51d9a7958e8ef8cf263103c9384b322a41"
+  integrity sha512-BMlg9AXSI5G9TBT0Lo/H3PfUy63P84rVz3BjCFE9e9Y9RXQZD3+h3YO1kgTNsNJy7bBc1YQp8DmSnwLIW5VPcw==
   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"
-  integrity sha512-U7e3r1SbvYzO0Jr3UT/zKBVgYYyhAz0aitvGIYOYK5CPmkNih+WDSsS5tvPrJ8YMQYlEMvsZIiqmn7HdFUaeEQ==
-  dependencies:
-    browserslist "^4.0.0"
-    caniuse-api "^3.0.0"
-    cssnano-util-same-parent "^4.0.0"
-    postcss "^7.0.0"
-    postcss-selector-parser "^3.0.0"
-    vendors "^1.0.0"
+    stylehacks "^5.0.1"
 
-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==
+postcss-merge-rules@^5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-merge-rules/-/postcss-merge-rules-5.0.2.tgz#d6e4d65018badbdb7dcc789c4f39b941305d410a"
+  integrity sha512-5K+Md7S3GwBewfB4rjDeol6V/RZ8S+v4B66Zk2gChRqLTCC8yjnHQ601omj9TKftS19OPGqZ/XzoqpzNQQLwbg==
   dependencies:
-    browserslist "^4.16.0"
+    browserslist "^4.16.6"
     caniuse-api "^3.0.0"
-    cssnano-utils "^2.0.0"
-    postcss-selector-parser "^6.0.4"
+    cssnano-utils "^2.0.1"
+    postcss-selector-parser "^6.0.5"
     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"
-  integrity sha512-j85oO6OnRU9zPf04+PZv1LYIYOprWm6IA6zkXkrJXyRveDEuQggG6tvoy8ir8ZwjLxLuGfNkCZEQG7zan+Hbtg==
-  dependencies:
-    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==
+postcss-minify-font-values@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-minify-font-values/-/postcss-minify-font-values-5.0.1.tgz#a90cefbfdaa075bd3dbaa1b33588bb4dc268addf"
+  integrity sha512-7JS4qIsnqaxk+FXY1E8dHBDmraYFWmuL6cgt0T1SWGRO5bzJf8sUoelwa4P88LEWJZweHevAiDKxHlofuvtIoA==
   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"
-  integrity sha512-qKPfwlONdcf/AndP1U8SJ/uzIJtowHlMaSioKzebAXSG4iJthlWC9iSWznQcX4f66gIWX44RSA841HTHj3wK+Q==
-  dependencies:
-    cssnano-util-get-arguments "^4.0.0"
-    is-color-stop "^1.0.0"
-    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==
+postcss-minify-gradients@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-minify-gradients/-/postcss-minify-gradients-5.0.1.tgz#2dc79fd1a1afcb72a9e727bc549ce860f93565d2"
+  integrity sha512-odOwBFAIn2wIv+XYRpoN2hUV3pPQlgbJ10XeXPq8UY2N+9ZG42xu45lTn/g9zZ+d70NKSQD6EOi6UiCMu3FN7g==
   dependencies:
-    cssnano-utils "^2.0.0"
+    cssnano-utils "^2.0.1"
     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"
-  integrity sha512-G7eWyzEx0xL4/wiBBJxJOz48zAKV2WG3iZOqVhPet/9geefm/Px5uo1fzlHu+DOjT+m0Mmiz3jkQzVHe6wxAWg==
-  dependencies:
-    alphanum-sort "^1.0.0"
-    browserslist "^4.0.0"
-    cssnano-util-get-arguments "^4.0.0"
-    postcss "^7.0.0"
-    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==
+postcss-minify-params@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-minify-params/-/postcss-minify-params-5.0.1.tgz#371153ba164b9d8562842fdcd929c98abd9e5b6c"
+  integrity sha512-4RUC4k2A/Q9mGco1Z8ODc7h+A0z7L7X2ypO1B6V8057eVK6mZ6xwz6QN64nHuHLbqbclkX1wyzRnIrdZehTEHw==
   dependencies:
     alphanum-sort "^1.0.2"
     browserslist "^4.16.0"
-    cssnano-utils "^2.0.0"
+    cssnano-utils "^2.0.1"
     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"
-  integrity sha512-D5S1iViljXBj9kflQo4YutWnJmwm8VvIsU1GeXJGiG9j8CIg9zs4voPMdQDUmIxetUOh60VilsNzCiAFTOqu3g==
-  dependencies:
-    alphanum-sort "^1.0.0"
-    has "^1.0.0"
-    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==
+postcss-minify-selectors@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/postcss-minify-selectors/-/postcss-minify-selectors-5.1.0.tgz#4385c845d3979ff160291774523ffa54eafd5a54"
+  integrity sha512-NzGBXDa7aPsAcijXZeagnJBKBPMYLaJJzB8CQh6ncvyl2sIndLVWfbcDi0SBjRWk5VqEjXvf8tYwzoKf4Z07og==
   dependencies:
     alphanum-sort "^1.0.2"
-    postcss-selector-parser "^3.1.2"
+    postcss-selector-parser "^6.0.5"
 
 postcss-modules-extract-imports@^3.0.0:
   version "3.0.0"
@@ -9412,169 +9270,79 @@ postcss-nesting@^7.0.0:
   dependencies:
     postcss "^7.0.2"
 
-postcss-normalize-charset@^4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-4.0.1.tgz#8b35add3aee83a136b0471e0d59be58a50285dd4"
-  integrity sha512-gMXCrrlWh6G27U0hF3vNvR3w8I1s2wOBILvA87iNXaPvSNo5uZAMYsZG7XjCUf1eVxuPfyL4TJ7++SGZLc9A3g==
-  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"
-  integrity sha512-3F2jcsaMW7+VtRMAqf/3m4cPFhPD3EFRgNs18u+k3lTJJlVe7d0YPO+bnwqo2xg8YiRpDXJI2u8A0wqJxMsQuQ==
-  dependencies:
-    cssnano-util-get-match "^4.0.0"
-    postcss "^7.0.0"
-    postcss-value-parser "^3.0.0"
+postcss-normalize-charset@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-charset/-/postcss-normalize-charset-5.0.1.tgz#121559d1bebc55ac8d24af37f67bd4da9efd91d0"
+  integrity sha512-6J40l6LNYnBdPSk+BHZ8SF+HAkS4q2twe5jnocgd+xWpz/mx/5Sa32m3W1AA8uE8XaXN+eg8trIlfu8V9x61eg==
 
-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==
+postcss-normalize-display-values@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-display-values/-/postcss-normalize-display-values-5.0.1.tgz#62650b965981a955dffee83363453db82f6ad1fd"
+  integrity sha512-uupdvWk88kLDXi5HEyI9IaAJTE3/Djbcrqq8YgjvAVuzgVuqIk3SuJWUisT2gaJbZm1H9g5k2w1xXilM3x8DjQ==
   dependencies:
-    cssnano-utils "^2.0.0"
+    cssnano-utils "^2.0.1"
     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"
-  integrity sha512-Dlf3/9AxpxE+NF1fJxYDeggi5WwV35MXGFnnoccP/9qDtFrTArZ0D0R+iKcg5WsUd8nUYMIl8yXDCtcrT8JrdA==
-  dependencies:
-    cssnano-util-get-arguments "^4.0.0"
-    has "^1.0.0"
-    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==
+postcss-normalize-positions@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-positions/-/postcss-normalize-positions-5.0.1.tgz#868f6af1795fdfa86fbbe960dceb47e5f9492fe5"
+  integrity sha512-rvzWAJai5xej9yWqlCb1OWLd9JjW2Ex2BCPzUJrbaXmtKtgfL8dBMOOMTX6TnvQMtjk3ei1Lswcs78qKO1Skrg==
   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"
-  integrity sha512-qvigdYYMpSuoFs3Is/f5nHdRLJN/ITA7huIoCyqqENJe9PvPmLhNLMu7QTjPdtnVf6OcYYO5SHonx4+fbJE1+Q==
-  dependencies:
-    cssnano-util-get-arguments "^4.0.0"
-    cssnano-util-get-match "^4.0.0"
-    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==
+postcss-normalize-repeat-style@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-repeat-style/-/postcss-normalize-repeat-style-5.0.1.tgz#cbc0de1383b57f5bb61ddd6a84653b5e8665b2b5"
+  integrity sha512-syZ2itq0HTQjj4QtXZOeefomckiV5TaUO6ReIEabCh3wgDs4Mr01pkif0MeVwKyU/LHEkPJnpwFKRxqWA/7O3w==
   dependencies:
-    cssnano-utils "^2.0.0"
+    cssnano-utils "^2.0.1"
     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"
-  integrity sha512-RrERod97Dnwqq49WNz8qo66ps0swYZDSb6rM57kN2J+aoyEAJfZ6bMx0sx/F9TIEX0xthPGCmeyiam/jXif0eA==
-  dependencies:
-    has "^1.0.0"
-    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==
+postcss-normalize-string@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-string/-/postcss-normalize-string-5.0.1.tgz#d9eafaa4df78c7a3b973ae346ef0e47c554985b0"
+  integrity sha512-Ic8GaQ3jPMVl1OEn2U//2pm93AXUcF3wz+OriskdZ1AOuYV25OdgS7w9Xu2LO5cGyhHCgn8dMXh9bO7vi3i9pA==
   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"
-  integrity sha512-acwJY95edP762e++00Ehq9L4sZCEcOPyaHwoaFOhIwWCDfik6YvqsYNxckee65JHLKzuNSSmAdxwD2Cud1Z54A==
-  dependencies:
-    cssnano-util-get-match "^4.0.0"
-    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==
+postcss-normalize-timing-functions@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-timing-functions/-/postcss-normalize-timing-functions-5.0.1.tgz#8ee41103b9130429c6cbba736932b75c5e2cb08c"
+  integrity sha512-cPcBdVN5OsWCNEo5hiXfLUnXfTGtSFiBU9SK8k7ii8UD7OLuznzgNRYkLZow11BkQiiqMcgPyh4ZqXEEUrtQ1Q==
   dependencies:
-    cssnano-utils "^2.0.0"
+    cssnano-utils "^2.0.1"
     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"
-  integrity sha512-od18Uq2wCYn+vZ/qCOeutvHjB5jm57ToxRaMeNuf0nWVHaP9Hua56QyMF6fs/4FSUnVIw0CBPsU0K4LnBPwYwg==
-  dependencies:
-    browserslist "^4.0.0"
-    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==
+postcss-normalize-unicode@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-unicode/-/postcss-normalize-unicode-5.0.1.tgz#82d672d648a411814aa5bf3ae565379ccd9f5e37"
+  integrity sha512-kAtYD6V3pK0beqrU90gpCQB7g6AOfP/2KIPCVBKJM2EheVsBQmx/Iof+9zR9NFKLAx4Pr9mDhogB27pmn354nA==
   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"
-  integrity sha512-p5oVaF4+IHwu7VpMan/SSpmpYxcJMtkGppYf0VbdH5B6hN8YNmVyJLuY9FmLQTzY3fag5ESUUHDqM+heid0UVA==
-  dependencies:
-    is-absolute-url "^2.0.0"
-    normalize-url "^3.0.0"
-    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==
+postcss-normalize-url@^5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-url/-/postcss-normalize-url-5.0.2.tgz#ddcdfb7cede1270740cf3e4dfc6008bd96abc763"
+  integrity sha512-k4jLTPUxREQ5bpajFQZpx8bCF2UrlqOTzP9kEqcEnOfwsRshWs2+oAFIHfDQB8GO2PaUaSE0NlTAYtbluZTlHQ==
   dependencies:
     is-absolute-url "^3.0.3"
-    normalize-url "^4.5.0"
+    normalize-url "^6.0.1"
     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"
-  integrity sha512-tO8QIgrsI3p95r8fyqKV+ufKlSHh9hMJqACqbv2XknufqEDhDvbguXGBBqxw9nsQoXWf0qOqppziKJKHMD4GtA==
-  dependencies:
-    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==
+postcss-normalize-whitespace@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-normalize-whitespace/-/postcss-normalize-whitespace-5.0.1.tgz#b0b40b5bcac83585ff07ead2daf2dcfbeeef8e9a"
+  integrity sha512-iPklmI5SBnRvwceb/XH568yyzK0qRVuAG+a1HFUsFRf11lEJTiQQa03a4RSCQvLKdcpX7XsI1Gen9LuLoqwiqA==
   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"
-  integrity sha512-2fCObh5UanxvSxeXrtLtlwVThBvHn6MQcu4ksNT2tsaV2Fg76R2CV98W7wNSlX+5/pFwEyaDwKLLoEV7uRybAw==
-  dependencies:
-    cssnano-util-get-arguments "^4.0.0"
-    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==
+postcss-ordered-values@^5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-ordered-values/-/postcss-ordered-values-5.0.2.tgz#1f351426977be00e0f765b3164ad753dac8ed044"
+  integrity sha512-8AFYDSOYWebJYLyJi3fyjl6CqMEG/UVworjiyK1r573I56kb3e879sCJLGvR3merj+fAdPpVplXKQZv+ey6CgQ==
   dependencies:
-    cssnano-utils "^2.0.0"
+    cssnano-utils "^2.0.1"
     postcss-value-parser "^4.1.0"
 
 postcss-overflow-shorthand@^2.0.0:
@@ -9599,7 +9367,7 @@ postcss-place@^4.0.1:
     postcss "^7.0.2"
     postcss-values-parser "^2.0.0"
 
-postcss-preset-env@6.7.0:
+postcss-preset-env@6.7.0, postcss-preset-env@^6.7.0:
   version "6.7.0"
   resolved "https://registry.yarnpkg.com/postcss-preset-env/-/postcss-preset-env-6.7.0.tgz#c34ddacf8f902383b35ad1e030f178f4cdf118a5"
   integrity sha512-eU4/K5xzSFwUFJ8hTdTQzo2RBLbDVt83QZrAvI07TULOkmyQlnYlpwep+2yIK+K+0KlZO4BvFcleOCCcUtwchg==
@@ -9650,40 +9418,20 @@ postcss-pseudo-class-any-link@^6.0.0:
     postcss "^7.0.2"
     postcss-selector-parser "^5.0.0-rc.3"
 
-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"
-  integrity sha512-gKWmR5aUulSjbzOfD9AlJiHCGH6AEVLaM0AV+aSioxUDd16qXP1PCh8d1/BGVvpdWn8k/HiK7n6TjeoXN1F7DA==
-  dependencies:
-    browserslist "^4.0.0"
-    caniuse-api "^3.0.0"
-    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==
+postcss-reduce-initial@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-reduce-initial/-/postcss-reduce-initial-5.0.1.tgz#9d6369865b0f6f6f6b165a0ef5dc1a4856c7e946"
+  integrity sha512-zlCZPKLLTMAqA3ZWH57HlbCjkD55LX9dsRyxlls+wfuRfqCi5mSlZVan0heX5cHr154Dq9AfbH70LyhrSAezJw==
   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"
-  integrity sha512-EEVig1Q2QJ4ELpJXMZR8Vt5DQx8/mo+dGWSR7vWXqcob2gQLyQGsionYcGKATXvQzMPn6DSN1vTN7yFximdIAg==
-  dependencies:
-    cssnano-util-get-match "^4.0.0"
-    has "^1.0.0"
-    postcss "^7.0.0"
-    postcss-value-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==
+postcss-reduce-transforms@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-reduce-transforms/-/postcss-reduce-transforms-5.0.1.tgz#93c12f6a159474aa711d5269923e2383cedcf640"
+  integrity sha512-a//FjoPeFkRuAguPscTVmRQUODP+f3ke2HqFNgGPwdYnpeC29RZdCBvGRGTsKpMURb/I3p6jdKoBQ2zI+9Q7kA==
   dependencies:
-    cssnano-utils "^2.0.0"
+    cssnano-utils "^2.0.1"
     postcss-value-parser "^4.1.0"
 
 postcss-replace-overflow-wrap@^3.0.0:
@@ -9709,15 +9457,6 @@ postcss-selector-not@^4.0.0:
     balanced-match "^1.0.0"
     postcss "^7.0.2"
 
-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==
-  dependencies:
-    dot-prop "^5.2.0"
-    indexes-of "^1.0.1"
-    uniq "^1.0.1"
-
 postcss-selector-parser@^5.0.0-rc.3, postcss-selector-parser@^5.0.0-rc.4:
   version "5.0.0"
   resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-5.0.0.tgz#249044356697b33b64f1a8f7c80922dddee7195c"
@@ -9727,66 +9466,40 @@ postcss-selector-parser@^5.0.0-rc.3, postcss-selector-parser@^5.0.0-rc.4:
     indexes-of "^1.0.1"
     uniq "^1.0.1"
 
-postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4:
-  version "6.0.4"
-  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.4.tgz#56075a1380a04604c38b063ea7767a129af5c2b3"
-  integrity sha512-gjMeXBempyInaBqpp8gODmwZ52WaYsVOsfr4L4lDQ7n3ncD6mEyySiDtgzCT+NYC0mmeOLvtsF8iaEf0YT6dBw==
+postcss-selector-parser@^6.0.2, postcss-selector-parser@^6.0.4, postcss-selector-parser@^6.0.5:
+  version "6.0.6"
+  resolved "https://registry.yarnpkg.com/postcss-selector-parser/-/postcss-selector-parser-6.0.6.tgz#2c5bba8174ac2f6981ab631a42ab0ee54af332ea"
+  integrity sha512-9LXrvaaX3+mcv5xkg5kFwqSzSH1JIObIx51PrndZwlmznwXRfxMddDvo9gve3gVR8ZTKgoFDdWkbRFmEhT4PMg==
   dependencies:
     cssesc "^3.0.0"
-    indexes-of "^1.0.1"
-    uniq "^1.0.1"
     util-deprecate "^1.0.2"
 
-postcss-svgo@^4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-4.0.2.tgz#17b997bc711b333bab143aaed3b8d3d6e3d38258"
-  integrity sha512-C6wyjo3VwFm0QgBy+Fu7gCYOkCmgmClghO+pjcxvrcBKtiKt0uCF+hvbMO1fyv5BMImRK90SMb+dwUnfbGd+jw==
-  dependencies:
-    is-svg "^3.0.0"
-    postcss "^7.0.0"
-    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==
+postcss-svgo@^5.0.2:
+  version "5.0.2"
+  resolved "https://registry.yarnpkg.com/postcss-svgo/-/postcss-svgo-5.0.2.tgz#bc73c4ea4c5a80fbd4b45e29042c34ceffb9257f"
+  integrity sha512-YzQuFLZu3U3aheizD+B1joQ94vzPfE6BNUcSYuceNxlVnKKsOtdo6hL9/zyC168Q8EwfLSgaDSalsUGa9f2C0A==
   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"
-  integrity sha512-+JanVaryLo9QwZjKrmJgkI4Fn8SBgRO6WXQBJi7KiAVPlmxikB5Jzc4EvXMT2H0/m0RjrVVm9rGNhZddm/8Spg==
-  dependencies:
-    alphanum-sort "^1.0.0"
-    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==
+postcss-unique-selectors@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/postcss-unique-selectors/-/postcss-unique-selectors-5.0.1.tgz#3be5c1d7363352eff838bd62b0b07a0abad43bfc"
+  integrity sha512-gwi1NhHV4FMmPn+qwBNuot1sG1t2OmacLQ/AX29lzyggnjd+MnVD5uqQmpXO3J17KGL2WAxQruj1qTd3H0gG/w==
   dependencies:
     alphanum-sort "^1.0.2"
-    postcss-selector-parser "^6.0.2"
+    postcss-selector-parser "^6.0.5"
     uniqs "^2.0.0"
 
 postcss-url@^10.1.1:
-  version "10.1.1"
-  resolved "https://registry.yarnpkg.com/postcss-url/-/postcss-url-10.1.1.tgz#f58b4ec684a7b662c170357150eddcbc04cefa24"
-  integrity sha512-cYeRNcXUMiM1sr3UgHkY+zMuqhSmJaLeP3VOZWWqShBDMB10DlrK5KfciLK0LGr7xKDPP5nH7Q2odvDHQSrP9A==
+  version "10.1.3"
+  resolved "https://registry.yarnpkg.com/postcss-url/-/postcss-url-10.1.3.tgz#54120cc910309e2475ec05c2cfa8f8a2deafdf1e"
+  integrity sha512-FUzyxfI5l2tKmXdYc6VTu3TWZsInayEKPbiyW+P6vmmIrrb4I6CGX0BFoewgYHLK+oIL5FECEK02REYRpBvUCw==
   dependencies:
-    make-dir "3.1.0"
-    mime "2.4.6"
-    minimatch "3.0.4"
-    xxhashjs "0.2.2"
-
-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==
+    make-dir "~3.1.0"
+    mime "~2.5.2"
+    minimatch "~3.0.4"
+    xxhashjs "~0.2.2"
 
 postcss-value-parser@^4.0.0, postcss-value-parser@^4.0.2, postcss-value-parser@^4.1.0:
   version "4.1.0"
@@ -9802,75 +9515,62 @@ postcss-values-parser@^2.0.0, postcss-values-parser@^2.0.1:
     indexes-of "^1.0.1"
     uniq "^1.0.1"
 
-"postcss@5 - 7", postcss@7.x.x, postcss@^7.0.0, postcss@^7.0.1, postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.27, postcss@^7.0.32, postcss@^7.0.5, postcss@^7.0.6:
-  version "7.0.35"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.35.tgz#d2be00b998f7f211d8a276974079f2e92b970e24"
-  integrity sha512-3QT8bBJeX/S5zKTTjTCIjRF3If4avAT6kqxcASlTWEtAFCb9NH0OUxNDfgZSWdP5fJnBYCMEWkIFfWeugjzYMg==
-  dependencies:
-    chalk "^2.4.2"
-    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@7.x.x, postcss@^7.0.14, postcss@^7.0.17, postcss@^7.0.2, postcss@^7.0.32, postcss@^7.0.35, postcss@^7.0.5, postcss@^7.0.6:
+  version "7.0.36"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-7.0.36.tgz#056f8cffa939662a8f5905950c07d5285644dfcb"
+  integrity sha512-BebJSIUMwJHRH0HAQoxN4u1CN86glsrwsW0q7T+/m44eXOUAxSNdHRkNZPYz5vVUbg17hFgOQDE7fZk7li3pZw==
   dependencies:
     chalk "^2.4.2"
     source-map "^0.6.1"
     supports-color "^6.1.0"
 
-postcss@8.2.10:
-  version "8.2.10"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.2.10.tgz#ca7a042aa8aff494b334d0ff3e9e77079f6f702b"
-  integrity sha512-b/h7CPV7QEdrqIxtAf2j31U5ef05uBDuvoXv6L51Q4rcS1jdlXAVKJv+atCFdUXYl9dyTHGyoMzIepwowRJjFw==
+postcss@8.3.6, postcss@^8.2.15, postcss@^8.2.4, postcss@^8.3.5:
+  version "8.3.6"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.3.6.tgz#2730dd76a97969f37f53b9a6096197be311cc4ea"
+  integrity sha512-wG1cc/JhRgdqB6WHEuyLTedf3KIRuD0hG6ldkFEZNCjRxiC+3i6kkWUUbiJQayP28iwG35cEmAbe98585BYV0A==
   dependencies:
     colorette "^1.2.2"
-    nanoid "^3.1.22"
-    source-map "^0.6.1"
+    nanoid "^3.1.23"
+    source-map-js "^0.6.2"
 
-postcss@^8.2.4:
-  version "8.2.6"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.2.6.tgz#5d69a974543b45f87e464bc4c3e392a97d6be9fe"
-  integrity sha512-xpB8qYxgPuly166AGlpRjUdEYtmOWx2iCwGmrv4vqZL9YPVviDVPZPRXxnXr6xPZOdxQ9lp3ZBFCRgWJ7LE3Sg==
+postcss@^8.3.7:
+  version "8.3.9"
+  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.3.9.tgz#98754caa06c4ee9eb59cc48bd073bb6bd3437c31"
+  integrity sha512-f/ZFyAKh9Dnqytx5X62jgjhhzttjZS7hMsohcI7HEI5tjELX/HxCy3EFhsRxyzGvrzFF+82XPvCS8T9TFleVJw==
   dependencies:
-    colorette "^1.2.1"
-    nanoid "^3.1.20"
-    source-map "^0.6.1"
+    nanoid "^3.1.28"
+    picocolors "^0.2.1"
+    source-map-js "^0.6.2"
 
-postcss@^8.2.8:
-  version "8.2.9"
-  resolved "https://registry.yarnpkg.com/postcss/-/postcss-8.2.9.tgz#fd95ff37b5cee55c409b3fdd237296ab4096fba3"
-  integrity sha512-b+TmuIL4jGtCHtoLi+G/PisuIl9avxs8IZMSmlABRwNz5RLUUACrC+ws81dcomz1nRezm5YPdXiMEzBEKgYn+Q==
-  dependencies:
-    colorette "^1.2.2"
-    nanoid "^3.1.22"
-    source-map "^0.6.1"
+prelude-ls@^1.2.1:
+  version "1.2.1"
+  resolved "https://registry.yarnpkg.com/prelude-ls/-/prelude-ls-1.2.1.tgz#debc6489d7a6e6b0e7611888cec880337d316396"
+  integrity sha512-vkcDPrRZo1QZLbn5RLGPpg/WmIQ65qoWWhcGKf/b5eplkkarX0m9z8ppCat4mlOqUsWpyNuYgO3VRyrYHSzX5g==
 
 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=
 
-prettier-bytes@^1.0.3:
+prettier-bytes@^1.0.4:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/prettier-bytes/-/prettier-bytes-1.0.4.tgz#994b02aa46f699c50b6257b5faaa7fe2557e62d6"
   integrity sha1-mUsCqkb2mcULYle1+qp/4lV+YtY=
 
-prettier@^2.0.0:
-  version "2.2.1"
-  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.2.1.tgz#795a1a78dd52f073da0cd42b21f9c91381923ff5"
-  integrity sha512-PqyhM2yCjg/oKkFPtTGUojv7gnZAoG80ttl45O6x2Ug/rMJw4wcc9k6aaf2hibP7BGVCCM33gZoGjyvt9mm16Q==
+prettier@^2.0.0, prettier@^2.3.2:
+  version "2.3.2"
+  resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.3.2.tgz#ef280a05ec253712e486233db5c6f23441e7342d"
+  integrity sha512-lnJzDfJ66zkMy58OL5/NY5zp70S7Nz6KqcKkXYzn2tMVrNxvbqaBpg7H3qHaLxCJ5lNMsGuM8+ohS7cZrthdLQ==
 
 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==
+  version "5.6.0"
+  resolved "https://registry.yarnpkg.com/pretty-bytes/-/pretty-bytes-5.6.0.tgz#356256f643804773c82f64723fe78c92c62beaeb"
+  integrity sha512-FFw039TmrBqFK8ma/7OL3sDz/VytdtJr044/QUJtH0wK9lb9jLq9tJyIxUwtQJHwar2BqtiA4iCWSwo9JLkzFg==
 
-pretty-ms@^5.0.0:
-  version "5.1.0"
-  resolved "https://registry.yarnpkg.com/pretty-ms/-/pretty-ms-5.1.0.tgz#b906bdd1ec9e9799995c372e2b1c34f073f95384"
-  integrity sha512-4gaK1skD2gwscCfkswYQRmddUb2GJZtzDGRjHWadVHtK/DIKFufa12MvES6/xu1tVbUYeia5bmLcwJtZJQUqnw==
+pretty-ms@^7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/pretty-ms/-/pretty-ms-7.0.1.tgz#7d903eaab281f7d8e03c66f867e239dc32fb73e8"
+  integrity sha512-973driJZvxiGOQ5ONsFhOF/DtzPMOMtgC11kCpUrPGMTgqp2q/1gwzCquocrN33is0VZ5GFHXZYMM9l6h67v2Q==
   dependencies:
     parse-ms "^2.1.0"
 
@@ -9884,7 +9584,12 @@ process-nextick-args@~2.0.0:
   resolved "https://registry.yarnpkg.com/process-nextick-args/-/process-nextick-args-2.0.1.tgz#7820d9b16120cc55ca9ae7792680ae7dba6d7fe2"
   integrity sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==
 
-progress@2.0.3, progress@^2.0.1:
+progress@2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.1.tgz#c9242169342b1c29d275889c95734621b1952e31"
+  integrity sha512-OE+a6vzqazc+K6LxJrX5UPyKFvGnL5CYmq2jFGNIBWHpc4QyE49/YOumcrpQFJpfejmvRtbJzgO1zPmMCqlbBg==
+
+progress@2.0.3, progress@^2.0.0:
   version "2.0.3"
   resolved "https://registry.yarnpkg.com/progress/-/progress-2.0.3.tgz#7e8cf8d8f5b8f239c1bc68beb4eb78567d572ef8"
   integrity sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==
@@ -9902,6 +9607,11 @@ promise-retry@^2.0.1:
     err-code "^2.0.2"
     retry "^0.12.0"
 
+propagate@^2.0.0:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/propagate/-/propagate-2.0.1.tgz#40cdedab18085c792334e64f0ac17256d38f9a45"
+  integrity sha512-vGrhOavPSTz4QVNuBNdcNXePNdNMaO1xj9yBeH1ScQPjk/rhg9sSlCXPhMkFuaNNW/syTvYqsnbIJxMBfRbbag==
+
 protobufjs@6.8.8:
   version "6.8.8"
   resolved "https://registry.yarnpkg.com/protobufjs/-/protobufjs-6.8.8.tgz#c8b4f1282fd7a90e6f5b109ed11c84af82908e7c"
@@ -9943,14 +9653,14 @@ protractor@^7.0.0, protractor@~7.0.0:
     yargs "^15.3.1"
 
 proxy-addr@~2.0.5:
-  version "2.0.6"
-  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.6.tgz#fdc2336505447d3f2f2c638ed272caf614bbb2bf"
-  integrity sha512-dh/frvCBVmSsDYzw6n926jv974gddhkFPfiN8hPOi30Wax25QZyZEGveluCgliBnqmuM+UJmBErbAUFIoDbjOw==
+  version "2.0.7"
+  resolved "https://registry.yarnpkg.com/proxy-addr/-/proxy-addr-2.0.7.tgz#f19fe69ceab311eeb94b42e70e8c2070f9ba1025"
+  integrity sha512-llQsMLSUDUPT44jdrU/O37qlnifitDP+ZwrmmZcoSKyLKvtZxpyV0n2/bD/N4tBAAZ/gJEdZU7KMraoK1+XYAg==
   dependencies:
-    forwarded "~0.1.2"
+    forwarded "0.2.0"
     ipaddr.js "1.9.1"
 
-proxy-from-env@^1.1.0:
+proxy-from-env@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/proxy-from-env/-/proxy-from-env-1.1.0.tgz#e102f16ca355424865755d2c9e8ea4f24d58c3e2"
   integrity sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==
@@ -9965,11 +9675,6 @@ psl@^1.1.24, psl@^1.1.28:
   resolved "https://registry.yarnpkg.com/psl/-/psl-1.8.0.tgz#9326f8bcfb013adcc005fdff056acce020e51c24"
   integrity sha512-RIdOzyoavK+hA18OGGWDqUTsCLhtA7IcZ/6NCs4fFJaHBDab+pDDmDIByWFRQJq2Cd7r1OoQxBGKOaztq+hjIQ==
 
-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@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/pump/-/pump-3.0.0.tgz#b4a2116815bde2f4e1ea602354e8c75565107a64"
@@ -9993,30 +9698,30 @@ 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@8.0.0:
-  version "8.0.0"
-  resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-8.0.0.tgz#a236669118aa795331c2d0ca19877159e7664705"
-  integrity sha512-D0RzSWlepeWkxPPdK3xhTcefj8rjah1791GE82Pdjsri49sy11ci/JQsAO8K2NRukqvwEtcI+ImP5F4ZiMvtIQ==
+puppeteer@10.1.0:
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/puppeteer/-/puppeteer-10.1.0.tgz#6ee1d7e30401a967f4403bd42ace9e51e399504f"
+  integrity sha512-bsyDHbFBvbofZ63xqF7hMhuKBX1h4WsqFIAoh1GuHr/Y9cewh+EFNAOdqWSkQRHLiBU/MY6M+8PUnXXjAPtuSg==
   dependencies:
-    debug "^4.1.0"
-    devtools-protocol "0.0.854822"
-    extract-zip "^2.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.1.0"
-    rimraf "^3.0.2"
-    tar-fs "^2.0.0"
-    unbzip2-stream "^1.3.3"
-    ws "^7.2.3"
+    debug "4.3.1"
+    devtools-protocol "0.0.883894"
+    extract-zip "2.0.1"
+    https-proxy-agent "5.0.0"
+    node-fetch "2.6.1"
+    pkg-dir "4.2.0"
+    progress "2.0.1"
+    proxy-from-env "1.1.0"
+    rimraf "3.0.2"
+    tar-fs "2.0.0"
+    unbzip2-stream "1.3.3"
+    ws "7.4.6"
 
 q@1.4.1:
   version "1.4.1"
   resolved "https://registry.yarnpkg.com/q/-/q-1.4.1.tgz#55705bcd93c5f3673530c2c2cbc0c2b3addc286e"
   integrity sha1-VXBbzZPF82c1MMLCy8DCs63cKG4=
 
-q@^1.1.2, q@^1.4.1, q@^1.5.1:
+q@^1.4.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/q/-/q-1.5.1.tgz#7e32f75b41381291d04611f1bf14109ac00651d7"
   integrity sha1-fjL3W0E4EpHQRhHxvxQQmsAGUdc=
@@ -10047,21 +9752,21 @@ querystringify@^2.1.1:
   integrity sha512-FIqgj2EUvTa7R50u0rGsyTftzjYmv/a3hO345bZNrqabNqjtgiDMgmo4mkUjd+nzU5oF3dClKqFIPUKybUyqoQ==
 
 queue-microtask@^1.2.2:
-  version "1.2.2"
-  resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.2.tgz#abf64491e6ecf0f38a6502403d4cda04f372dfd3"
-  integrity sha512-dB15eXv3p2jDlbOiNLyMabYg1/sXvppd8DP2J3EOCQ0AkuSXCW2tP7mnVouVLJKgUMY6yP0kcQDVpLCN13h4Xg==
+  version "1.2.3"
+  resolved "https://registry.yarnpkg.com/queue-microtask/-/queue-microtask-1.2.3.tgz#4929228bbc724dfac43e0efb058caf7b6cfb6243"
+  integrity sha512-NuaNSa6flKT5JaSYQzJok04JzTL1CA6aGhv5rfLW3PgqA+M2ChpZQnAC8h8i4ZFkBS8X5RqkDBHA7r4hej3K9A==
 
-quick-format-unescaped@4.0.1:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/quick-format-unescaped/-/quick-format-unescaped-4.0.1.tgz#437a5ea1a0b61deb7605f8ab6a8fd3858dbeb701"
-  integrity sha512-RyYpQ6Q5/drsJyOhrWHYMWTedvjTIat+FTwv0K4yoUxzvekw2aRHMQJLlnvt8UantkZg2++bEzD9EdxXqkWf4A==
+quick-format-unescaped@^4.0.3:
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/quick-format-unescaped/-/quick-format-unescaped-4.0.3.tgz#6d6b66b8207aa2b35eef12be1421bb24c428f652"
+  integrity sha512-MaL/oqh02mhEo5m5J2rwsVL23Iw2PEaGVHgT2vFt8AAsr0lfvQA5dpXo9TPu0rz7tSBdUPgkbam0j/fj5ZM8yg==
 
 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.69:
+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==
@@ -10110,14 +9815,6 @@ raw-body@2.4.0:
     iconv-lite "0.4.24"
     unpipe "1.0.0"
 
-raw-loader@4.0.2:
-  version "4.0.2"
-  resolved "https://registry.yarnpkg.com/raw-loader/-/raw-loader-4.0.2.tgz#1aac6b7d1ad1501e66efdac1522c73e59a584eb6"
-  integrity sha512-ZnScIV3ag9A4wPX/ZayxL/jZH+euYb6FcUinPcgiQW0+UBtEv0O6Q3lGd3cqJ+GHH+rksEv3Pj99oxJ3u3VIKA==
-  dependencies:
-    loader-utils "^2.0.0"
-    schema-utils "^3.0.0"
-
 read-cache@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/read-cache/-/read-cache-1.0.0.tgz#e664ef31161166c9751cdbe8dbcf86b5fb58f774"
@@ -10140,9 +9837,9 @@ read-installed@~4.0.3:
     graceful-fs "^4.1.2"
 
 read-package-json-fast@^2.0.1:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/read-package-json-fast/-/read-package-json-fast-2.0.1.tgz#c767f6c634873ffb6bb73788191b65559734f555"
-  integrity sha512-bp6z0tdgLy9KzdfENDIw/53HWAolOVoQTRWXv7PUiqAo3YvvoUVeLr7RWPWq+mu7KUOu9kiT4DvxhUgNUBsvug==
+  version "2.0.3"
+  resolved "https://registry.yarnpkg.com/read-package-json-fast/-/read-package-json-fast-2.0.3.tgz#323ca529630da82cb34b36cc0b996693c98c2b83"
+  integrity sha512-W/BKtbL+dUjTuRL2vziuYhp76s5HZ9qQhd/dKfWIZveD0O40453QNyZhC0e63lqZrAQ4jiOapVoeJ7JrszenQQ==
   dependencies:
     json-parse-even-better-errors "^2.3.0"
     npm-normalize-package-bin "^1.0.1"
@@ -10157,14 +9854,6 @@ read-package-json@^2.0.0:
     normalize-package-data "^2.0.0"
     npm-normalize-package-bin "^1.0.0"
 
-read-pkg-up@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02"
-  integrity sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=
-  dependencies:
-    find-up "^1.0.0"
-    read-pkg "^1.0.0"
-
 read-pkg-up@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-3.0.0.tgz#3ed496685dba0f8fe118d0691dc51f4a1ff96f07"
@@ -10182,15 +9871,6 @@ read-pkg-up@^7.0.1:
     read-pkg "^5.2.0"
     type-fest "^0.8.1"
 
-read-pkg@^1.0.0:
-  version "1.1.0"
-  resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-1.1.0.tgz#f5ffaa5ecd29cb31c0474bca7d756b6bb29e3f28"
-  integrity sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=
-  dependencies:
-    load-json-file "^1.0.0"
-    normalize-package-data "^2.3.2"
-    path-type "^1.0.0"
-
 read-pkg@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/read-pkg/-/read-pkg-3.0.0.tgz#9cbc686978fee65d16c00e2b19c237fcf6e38389"
@@ -10223,7 +9903,7 @@ 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, 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==
@@ -10232,7 +9912,7 @@ readable-stream@3, readable-stream@^3.0.0, readable-stream@^3.0.6, readable-stre
     string_decoder "^1.1.1"
     util-deprecate "^1.0.1"
 
-readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.0.6, readable-stream@^2.2.2, readable-stream@~2.3.3, readable-stream@~2.3.6:
+readable-stream@^2.0.1, readable-stream@^2.0.2, readable-stream@^2.2.2, readable-stream@~2.3.3, readable-stream@~2.3.6:
   version "2.3.7"
   resolved "https://registry.yarnpkg.com/readable-stream/-/readable-stream-2.3.7.tgz#1eca1cf711aef814c04f62252a36a62f6cb23b57"
   integrity sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==
@@ -10264,28 +9944,13 @@ readdirp@^2.2.1:
     micromatch "^3.1.10"
     readable-stream "^2.0.2"
 
-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==
+readdirp@~3.6.0:
+  version "3.6.0"
+  resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.6.0.tgz#74a370bd857116e245b29cc97340cd431a02a6c7"
+  integrity sha512-hOS089on8RduqdbhvQ5Z37A0ESjsqz6qnRcffsMU3495FuTdqSm+7bhJ29JvIOsBDEEnan5DPu9t3To9VRlMzA==
   dependencies:
     picomatch "^2.2.1"
 
-rechoir@^0.6.2:
-  version "0.6.2"
-  resolved "https://registry.yarnpkg.com/rechoir/-/rechoir-0.6.2.tgz#85204b54dba82d5742e28c96756ef43af50e3384"
-  integrity sha1-hSBLVNuoLVdC4oyWdW70OvUOM4Q=
-  dependencies:
-    resolve "^1.1.6"
-
-redent@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/redent/-/redent-1.0.0.tgz#cf916ab1fd5f1f16dfb20822dd6ec7f730c2afde"
-  integrity sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=
-  dependencies:
-    indent-string "^2.1.0"
-    strip-indent "^1.0.1"
-
 redent@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/redent/-/redent-3.0.0.tgz#e557b7998316bb53c9f1f56fa626352c6963059f"
@@ -10311,10 +9976,10 @@ regenerate@^1.4.0:
   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"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.7.tgz#cac2dacc8a1ea675feaabaeb8ae833898ae46f55"
-  integrity sha512-a54FxoJDIr27pgf7IgeQGxmqUNYrcV338lf/6gH456HZ/PhX+5BcwHXG9ajESmwe6WRO0tAzRUrRmNONWgkrew==
+regenerator-runtime@0.13.9, regenerator-runtime@^0.13.4:
+  version "0.13.9"
+  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz#8925742a98ffd90814988d7566ad30ca3b263b52"
+  integrity sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==
 
 regenerator-transform@^0.14.2:
   version "0.14.5"
@@ -10344,6 +10009,11 @@ regexp.prototype.flags@^1.2.0:
     call-bind "^1.0.2"
     define-properties "^1.1.3"
 
+regexpp@^3.1.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/regexpp/-/regexpp-3.2.0.tgz#0425a2768d8f23bad70ca4b90461fa2f1213e1b2"
+  integrity sha512-pq2bWo9mVD43nbts2wGv17XLiNLya+GklZ8kaDLV2Z08gDCsGpnKn9BFMepvWuHCbyVvY7J5o5+BVvoQbmlJLg==
+
 regexpu-core@^4.7.1:
   version "4.7.1"
   resolved "https://registry.yarnpkg.com/regexpu-core/-/regexpu-core-4.7.1.tgz#2dea5a9a07233298fbf0db91fa9abc4c6e0f8ad6"
@@ -10362,9 +10032,9 @@ regjsgen@^0.5.1:
   integrity sha512-OFFT3MfrH90xIW8OOSyUrk6QHD5E9JOTeGodiJeBS3J6IwlgzJMNE/1bZklWz5oTg+9dCMyEetclvCVXOPoN3A==
 
 regjsparser@^0.6.4:
-  version "0.6.7"
-  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.7.tgz#c00164e1e6713c2e3ee641f1701c4b7aa0a7f86c"
-  integrity sha512-ib77G0uxsA2ovgiYbCVGx4Pv3PSttAx2vIwidqQzbL2U5S4Q+j00HdSAneSBuyVcMvEnTXMjiGgB+DlXozVhpQ==
+  version "0.6.9"
+  resolved "https://registry.yarnpkg.com/regjsparser/-/regjsparser-0.6.9.tgz#b489eef7c9a2ce43727627011429cf833a7183e6"
+  integrity sha512-ZqbNRz1SNjLAiYuwY0zoXW8Ne675IX5q+YHioAGbCw4X96Mjl2+dcX9B2ciaeyYjViDAfvIjFpQjJgLttTEERQ==
   dependencies:
     jsesc "~0.5.0"
 
@@ -10374,22 +10044,15 @@ remove-trailing-separator@^1.0.1:
   integrity sha1-wkvOKig62tW8P1jg1IJJuSN52O8=
 
 repeat-element@^1.1.2:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.3.tgz#782e0d825c0c5a3bb39731f84efee6b742e6b1ce"
-  integrity sha512-ahGq0ZnV5m5XtZLMb+vP76kcAM5nkLqk0lpqAuojSKGgQtn4eRi4ZZGm2olo2zKFH+sMsWaqOCW1dqAnOru72g==
+  version "1.1.4"
+  resolved "https://registry.yarnpkg.com/repeat-element/-/repeat-element-1.1.4.tgz#be681520847ab58c7568ac75fbfad28ed42d39e9"
+  integrity sha512-LFiNfRcSu7KK3evMyYOuCzv3L10TW7yC1G2/+StMjK8Y6Vqd2MG7r/Qjw4ghtuCOjFvlnms/iMmLqpvW/ES/WQ==
 
 repeat-string@^1.6.1:
   version "1.6.1"
   resolved "https://registry.yarnpkg.com/repeat-string/-/repeat-string-1.6.1.tgz#8dcae470e1c88abc2d600fff4a776286da75e637"
   integrity sha1-jcrkcOHIirwtYA//Sndihtp15jc=
 
-repeating@^2.0.0:
-  version "2.0.1"
-  resolved "https://registry.yarnpkg.com/repeating/-/repeating-2.0.1.tgz#5214c53a926d3552707527fbab415dbc08d06dda"
-  integrity sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=
-  dependencies:
-    is-finite "^1.0.0"
-
 request-promise-core@1.1.4:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/request-promise-core/-/request-promise-core-1.1.4.tgz#3eedd4223208d419867b78ce815167d10593a22f"
@@ -10432,7 +10095,7 @@ request@2.88.0:
     tunnel-agent "^0.6.0"
     uuid "^3.3.2"
 
-request@2.88.2, request@^2.74.0, request@^2.87.0, request@^2.88.0, request@^2.88.2:
+request@2.88.2, request@^2.87.0, request@^2.88.0:
   version "2.88.2"
   resolved "https://registry.yarnpkg.com/request/-/request-2.88.2.tgz#d73c918731cb5a87da047e207234146f664d12b3"
   integrity sha512-MsvtOrfG9ZcrOwAW+Qi+F6HbD0CWXEh9ou77uOb7FM2WPhwT7smM833PzanhJLsgXjN89Ir6V2PczXNnMpwKhw==
@@ -10495,20 +10158,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.2:
-  version "3.1.2"
-  resolved "https://registry.yarnpkg.com/resolve-url-loader/-/resolve-url-loader-3.1.2.tgz#235e2c28e22e3e432ba7a5d4e305c59a58edfc08"
-  integrity sha512-QEb4A76c8Mi7I3xNKXlRKQSlLBwjUV/ULFMP+G7n3/7tJZ8MG5wsZ3ucxP1Jz8Vevn6fnJsxDx9cIls+utGzPQ==
-  dependencies:
-    adjust-sourcemap-loader "3.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:
@@ -10516,7 +10174,7 @@ 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.20.0, resolve@^1.1.5, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.19.0, resolve@^1.3.2:
+resolve@1.20.0, resolve@^1.1.5, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0, resolve@^1.11.0, resolve@^1.11.1, resolve@^1.13.1, resolve@^1.14.2, resolve@^1.17.0, resolve@^1.19.0, resolve@^1.20.0, resolve@^1.3.2:
   version "1.20.0"
   resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.20.0.tgz#629a013fb3f70755d6f0b7935cc1c2c5378b1975"
   integrity sha512-wENBPt4ySzg4ybFQW2TT1zMQucPK95HSh/nq2CFTZVOGut2+pQvSsgtda4d26YrYcr067wjbmzOG8byDPBX63A==
@@ -10524,6 +10182,21 @@ resolve@1.20.0, resolve@^1.1.5, resolve@^1.1.6, resolve@^1.1.7, resolve@^1.10.0,
     is-core-module "^2.2.0"
     path-parse "^1.0.6"
 
+resolve@~1.17.0:
+  version "1.17.0"
+  resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.17.0.tgz#b25941b54968231cc2d1bb76a79cb7f2c0bf8444"
+  integrity sha512-ic+7JYiV8Vi2yzQGFWOkiZD5Z9z7O2Zhm9XMaTxdJExKasieFCr+yXZ/WmXsckHiKl12ar0y6XiXDx3m4RHn1w==
+  dependencies:
+    path-parse "^1.0.6"
+
+resolve@~1.19.0:
+  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:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/responselike/-/responselike-2.0.0.tgz#26391bcc3174f750f9a79eacc40a12a5c42d7723"
@@ -10544,11 +10217,6 @@ ret@~0.1.10:
   resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc"
   integrity sha512-TTlYpa+OL+vMMNG24xSlQGEJ3B/RzEfUlLct7b5G/ytav+wPrplCpVMFuwzXbkecJrb6IYo1iFb0S9v37754mg==
 
-retry@^0.10.0:
-  version "0.10.1"
-  resolved "https://registry.yarnpkg.com/retry/-/retry-0.10.1.tgz#e76388d217992c252750241d3d3956fed98d8ff4"
-  integrity sha1-52OI0heZLCUnUCQdPTlW/tmNj/Q=
-
 retry@^0.12.0:
   version "0.12.0"
   resolved "https://registry.yarnpkg.com/retry/-/retry-0.12.0.tgz#1b42a6266a21f07421d1b0b54b7dc167b01c013b"
@@ -10559,23 +10227,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.2.0"
-  resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.2.0.tgz#9e9894258f48f284b43c3143c68070a4f373b949"
-  integrity sha512-ijLyszTMmUrXvjSooucVQwimGUk84eRcmCuLV8Xghe3UO85mjUtRAHRyoMM6XtyqbECaXuBWx18La3523sXINA==
+  version "1.3.0"
+  resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.3.0.tgz#d0b7c441ab2720d05dc4cf26e01c89631d9da08b"
+  integrity sha512-V2hovdzFbOi77/WajaSMXk2OLm+xNIeQdMMuB7icj7bk6zi2F8GGAxigcnDFpJHbNyNcgyJDiP+8nOrY5cZGrA==
 
 rgb-regex@^1.0.1:
   version "1.0.1"
@@ -10615,6 +10270,28 @@ rimraf@~2.6.2:
   dependencies:
     glob "^7.1.3"
 
+rollup-plugin-commonjs@^10.1.0:
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-commonjs/-/rollup-plugin-commonjs-10.1.0.tgz#417af3b54503878e084d127adf4d1caf8beb86fb"
+  integrity sha512-jlXbjZSQg8EIeAAvepNwhJj++qJWNJw1Cl0YnOqKtP5Djx+fFGkp3WRh+W0ASCaFG5w1jhmzDxgu3SJuVxPF4Q==
+  dependencies:
+    estree-walker "^0.6.1"
+    is-reference "^1.1.2"
+    magic-string "^0.25.2"
+    resolve "^1.11.0"
+    rollup-pluginutils "^2.8.1"
+
+rollup-plugin-node-resolve@^5.2.0:
+  version "5.2.0"
+  resolved "https://registry.yarnpkg.com/rollup-plugin-node-resolve/-/rollup-plugin-node-resolve-5.2.0.tgz#730f93d10ed202473b1fb54a5997a7db8c6d8523"
+  integrity sha512-jUlyaDXts7TW2CqQ4GaO5VJ4PwwaV8VUGA7+km3n6k6xtOEacf61u0VXwN80phY/evMcaS+9eIeJ9MOyDxt5Zw==
+  dependencies:
+    "@types/resolve" "0.0.8"
+    builtin-modules "^3.1.0"
+    is-module "^1.0.0"
+    resolve "^1.11.1"
+    rollup-pluginutils "^2.8.1"
+
 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"
@@ -10623,12 +10300,26 @@ rollup-plugin-sourcemaps@^0.6.3:
     "@rollup/pluginutils" "^3.0.9"
     source-map-resolve "^0.6.0"
 
-rollup@^2.37.0:
-  version "2.39.0"
-  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.39.0.tgz#be4f98c9e421793a8fec82c854fb567c35e22ab6"
-  integrity sha512-+WR3bttcq7zE+BntH09UxaW3bQo3vItuYeLsyk4dL2tuwbeSKJuvwiawyhEnvRdRgrII0Uzk00FpctHO/zB1kw==
+rollup-pluginutils@^2.8.1:
+  version "2.8.2"
+  resolved "https://registry.yarnpkg.com/rollup-pluginutils/-/rollup-pluginutils-2.8.2.tgz#72f2af0748b592364dbd3389e600e5a9444a351e"
+  integrity sha512-EEp9NhnUkwY8aif6bxgovPHMoMoNr2FulJziTndpt5H9RdwC47GSGuII9XxpSdzVGM0GWrNPHV6ie1LTNJPaLQ==
+  dependencies:
+    estree-walker "^0.6.1"
+
+rollup@^2.45.1:
+  version "2.54.0"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.54.0.tgz#99ea816e8e9b1c6af3ab957a4e7a8f78dbd87773"
+  integrity sha512-RHzvstAVwm9A751NxWIbGPFXs3zL4qe/eYg+N7WwGtIXVLy1cK64MiU37+hXeFm1jqipK6DGgMi6Z2hhPuCC3A==
   optionalDependencies:
-    fsevents "~2.3.1"
+    fsevents "~2.3.2"
+
+rollup@^2.53.3:
+  version "2.56.2"
+  resolved "https://registry.yarnpkg.com/rollup/-/rollup-2.56.2.tgz#a045ff3f6af53ee009b5f5016ca3da0329e5470f"
+  integrity sha512-s8H00ZsRi29M2/lGdm1u8DJpJ9ML8SUOpVVBd33XNeEeL3NVaTiUcSBHzBdF3eAyR0l7VSpsuoVUGrRHq7aPwQ==
+  optionalDependencies:
+    fsevents "~2.3.2"
 
 run-async@^2.4.0:
   version "2.4.1"
@@ -10642,33 +10333,33 @@ run-parallel@^1.1.9:
   dependencies:
     queue-microtask "^1.2.2"
 
-rxjs@6.6.7:
+"rxjs-7@npm:rxjs@7.4.0":
+  version "7.4.0"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.4.0.tgz#a12a44d7eebf016f5ff2441b87f28c9a51cebc68"
+  integrity sha512-7SQDi7xeTMCJpqViXh8gL/lebcwlp3d831F05+9B44A4B0WfsEwUQHR64gsH1kvJ+Ep/J9K2+n1hVl1CsGN23w==
+  dependencies:
+    tslib "~2.1.0"
+
+rxjs@6.6.7, rxjs@^6.4.0, rxjs@^6.5.0, rxjs@^6.5.3:
   version "6.6.7"
   resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9"
   integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==
   dependencies:
     tslib "^1.9.0"
 
-rxjs@^6.4.0, rxjs@^6.5.0, rxjs@^6.5.3:
-  version "6.6.3"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.3.tgz#8ca84635c4daa900c0d3967a6ee7ac60271ee552"
-  integrity sha512-trsQc+xYYXZ3urjOiJOuCOa5N3jAZ3eiSpQB5hIT8zGlL2QfnHLJ2r7GMkBGuIausdJN1OneaI6gQlsqNHHmZQ==
-  dependencies:
-    tslib "^1.9.0"
-
-rxjs@^6.6.6:
-  version "6.6.6"
-  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.6.tgz#14d8417aa5a07c5e633995b525e1e3c0dec03b70"
-  integrity sha512-/oTwee4N4iWzAMAL9xdGKjkEHmIwupR3oXbQjCKywF1BeFohswF3vZdogbmEF6pZkOsXTzWkrZszrWpQTByYVg==
+rxjs@^7.2.0:
+  version "7.2.0"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-7.2.0.tgz#5cd12409639e9514a71c9f5f9192b2c4ae94de31"
+  integrity sha512-aX8w9OpKrQmiPKfT1bqETtUr9JygIz6GZ+gql8v7CijClsP0laoFUdKzxFAoWuRdSlOdU2+crss+cMf+cqMTnw==
   dependencies:
-    tslib "^1.9.0"
+    tslib "~2.1.0"
 
 safe-buffer@5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
   integrity sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==
 
-safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@^5.2.1, safe-buffer@~5.2.0:
+safe-buffer@>=5.1.0, safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.2, safe-buffer@^5.2.1, safe-buffer@~5.2.0:
   version "5.2.1"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.2.1.tgz#1eaf9fa9bdb1fdd4ec75f58f9cdb4e6b7827eec6"
   integrity sha512-rp3So07KcdmmKbGvgaNxQSJr7bGVSVk5S9Eq1F+ppbRo70+YeaDxkw5Dd8NPN+GD6bjnYm2VuPuCXmpuYvmCXQ==
@@ -10685,27 +10376,20 @@ safe-regex@^1.1.0:
   resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a"
   integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg==
 
-sass-loader@11.0.1:
-  version "11.0.1"
-  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-11.0.1.tgz#8672f896593466573b904f47693e0695368e38c9"
-  integrity sha512-Vp1LcP4slTsTNLEiDkTcm8zGN/XYYrZz2BZybQbliWA8eXveqA/AxsEjllQTpJbg2MzCsx/qNO48sHdZtOaxTw==
+sass-loader@12.1.0:
+  version "12.1.0"
+  resolved "https://registry.yarnpkg.com/sass-loader/-/sass-loader-12.1.0.tgz#b73324622231009da6fba61ab76013256380d201"
+  integrity sha512-FVJZ9kxVRYNZTIe2xhw93n3xJNYZADr+q69/s98l9nTCrWASo+DR2Ot0s5xTKQDDEosUkatsGeHxcH4QBp5bSg==
   dependencies:
     klona "^2.0.4"
     neo-async "^2.6.2"
 
-sass@1.32.8:
-  version "1.32.8"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.32.8.tgz#f16a9abd8dc530add8834e506878a2808c037bdc"
-  integrity sha512-Sl6mIeGpzjIUZqvKnKETfMf0iDAswD9TNlv13A7aAF3XZlRPMq4VvJWBC2N2DXbp94MQVdNSFG6LfF/iOXrPHQ==
-  dependencies:
-    chokidar ">=2.0.0 <4.0.0"
-
-sass@^1.32.5:
-  version "1.32.7"
-  resolved "https://registry.yarnpkg.com/sass/-/sass-1.32.7.tgz#632a9df2b85dc4b346977fcaf2d5e6f2b7039fd8"
-  integrity sha512-C8Z4bjqGWnsYa11o8hpKAuoyFdRhrSHcYjCr+XAWVPSIQqC8mp2f5Dx4em0dKYehPzg5XSekmCjqJnEZbIls9A==
+sass@1.36.0, sass@^1.32.8:
+  version "1.36.0"
+  resolved "https://registry.yarnpkg.com/sass/-/sass-1.36.0.tgz#5912ef9d5d16714171ba11cb17edb274c4bbc07e"
+  integrity sha512-fQzEjipfOv5kh930nu3Imzq3ie/sGDc/4KtQMJlt7RRdrkQSfe37Bwi/Rf/gfuYHsIuE1fIlDMvpyMcEwjnPvg==
   dependencies:
-    chokidar ">=2.0.0 <4.0.0"
+    chokidar ">=3.0.0 <4.0.0"
 
 "sauce-connect-proxy@https://saucelabs.com/downloads/sc-4.6.4-linux.tar.gz":
   version "0.0.0"
@@ -10748,12 +10432,12 @@ schema-utils@^2.6.5, schema-utils@^2.7.0:
     ajv "^6.12.4"
     ajv-keywords "^3.5.2"
 
-schema-utils@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.0.0.tgz#67502f6aa2b66a2d4032b4279a2944978a0913ef"
-  integrity sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA==
+schema-utils@^3.0.0, schema-utils@^3.1.0:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.1.1.tgz#bc74c4b6b6995c1d88f76a8b77bea7219e0c8281"
+  integrity sha512-Y5PQxS4ITlC+EahLuXaY86TXfR7Dc5lw294alXOq86JAHCihAIZfqv8nNCWvaEJvaC51uN9hbLGeV0cFBdH+Fw==
   dependencies:
-    "@types/json-schema" "^7.0.6"
+    "@types/json-schema" "^7.0.8"
     ajv "^6.12.5"
     ajv-keywords "^3.5.2"
 
@@ -10788,9 +10472,9 @@ selenium-webdriver@3.6.0, selenium-webdriver@^3.0.1:
     xml2js "^0.4.17"
 
 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==
+  version "1.10.11"
+  resolved "https://registry.yarnpkg.com/selfsigned/-/selfsigned-1.10.11.tgz#24929cd906fe0f44b6d01fb23999a739537acbe9"
+  integrity sha512-aVmbPOfViZqOZPgRBT0+3u4yZFHpmnIghLMlAcb5/xhp5ZtB/RVnKhz5vl2M32CLXAqR4kha9zfhNg0Lf/sxKA==
   dependencies:
     node-forge "^0.10.0"
 
@@ -10801,7 +10485,7 @@ semver-dsl@^1.0.1:
   dependencies:
     semver "^5.3.0"
 
-"semver@2 >=2.2.1 || 3.x || 4 || 5", "semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.6.0:
+"semver@2 || 3 || 4 || 5", semver@^5.3.0, semver@^5.4.1, semver@^5.5.0, semver@^5.6.0:
   version "5.7.1"
   resolved "https://registry.yarnpkg.com/semver/-/semver-5.7.1.tgz#a954f931aeba508d307bbf069eff0c01c96116f7"
   integrity sha512-sauaDf/PZdVgrLTNYHRtpXa1iRiKcaebiKQ1BJdpQlWH2lCvexQdX55snPFyK7QzpudqbCI0qXFfOasHdyNDGQ==
@@ -10816,14 +10500,7 @@ semver@7.0.0:
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.0.0.tgz#5f3ca35761e47e05b206c6daff2cf814f0316b8e"
   integrity sha512-+GB6zVA9LWh6zovYQLALHwv5rb2PHGlJi3lfiqIHxR0uuwCgefcOJc59v9fv1w8GbStwxuuqqAjI9NMAOOgq1A==
 
-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@7.3.5, semver@^7.3.5:
+semver@7.3.5, semver@^7.0.0, semver@^7.1.1, semver@^7.2.1, semver@^7.3.4, semver@^7.3.5, semver@~7.3.0:
   version "7.3.5"
   resolved "https://registry.yarnpkg.com/semver/-/semver-7.3.5.tgz#0b621c879348d8998e4b0e4be94b3f12e6018ef7"
   integrity sha512-PoeGJYh8HK4BTO/a9Tf6ZG3veo/A7ZVsYrSA6J8ny9nb3B1VrpkuN+z9OE5wfE5p6H4LchYZsegiQgbJD94ZFQ==
@@ -10854,10 +10531,10 @@ send@0.17.1:
     range-parser "~1.2.1"
     statuses "~1.5.0"
 
-serialize-javascript@^5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-5.0.1.tgz#7886ec848049a462467a97d3d918ebb2aaf934f4"
-  integrity sha512-SaaNal9imEO737H2c05Og0/8LUXG7EnsZyMa8MzkmuHoELfT6txuj0cMqRj6zfPKnmQ1yasR4PCJc8x+M4JSPA==
+serialize-javascript@^6.0.0:
+  version "6.0.0"
+  resolved "https://registry.yarnpkg.com/serialize-javascript/-/serialize-javascript-6.0.0.tgz#efae5d88f45d7924141da8b5c3a7a7e663fefeb8"
+  integrity sha512-Qr3TosvguFt8ePWqsvRfrKyQXIiW+nGbYpy8XK24NQHE83caxWt+mIymTT19DGFbNWNLfEwsrkSmN64lVWB9ag==
   dependencies:
     randombytes "^2.1.0"
 
@@ -10884,7 +10561,7 @@ serve-static@1.14.1:
     parseurl "~1.3.3"
     send "0.17.1"
 
-set-blocking@^2.0.0, set-blocking@~2.0.0:
+set-blocking@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/set-blocking/-/set-blocking-2.0.0.tgz#045f9782d011ae9a6803ddd382b24392b3d890f7"
   integrity sha1-BF+XgtARrppoA93TgrJDkrPYkPc=
@@ -10955,33 +10632,26 @@ 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.4:
-  version "0.8.4"
-  resolved "https://registry.yarnpkg.com/shelljs/-/shelljs-0.8.4.tgz#de7684feeb767f8716b326078a8a00875890e3c2"
-  integrity sha512-7gk3UZ9kOfPLIAbslLzyWeGiEqx9e3rxwZM0KE6EL8GlGwjym9Mrlx5/p33bWTu9YG6vcS4MBxYZDHYr5lr8BQ==
-  dependencies:
-    glob "^7.0.0"
-    interpret "^1.0.0"
-    rechoir "^0.6.2"
-
 signal-exit@^3.0.0, signal-exit@^3.0.2:
   version "3.0.3"
   resolved "https://registry.yarnpkg.com/signal-exit/-/signal-exit-3.0.3.tgz#a1410c2edd8f077b08b4e253c8eacfcaf057461c"
   integrity sha512-VUJ49FC8U1OxwZLxIbTTrDvLnf/6TDgxZcK8wxR8zs13xpx7xbG60ndBlhNrFi2EMuFRoeDoJO7wthSLq42EjA==
 
-simple-swizzle@^0.2.2:
-  version "0.2.2"
-  resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a"
-  integrity sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo=
-  dependencies:
-    is-arrayish "^0.3.1"
-
 slash@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/slash/-/slash-3.0.0.tgz#6539be870c165adbd5240220dbe361f1bc4d4634"
   integrity sha512-g9Q1haeby36OSStwb4ntCGGGaKsaVSjQ68fBxoQcutl5fS1vuY18H3wSt3jFyFtrkx+Kz0V1G85A4MyAdDMi2Q==
 
-slide@^1.1.3, slide@~1.1.3:
+slice-ansi@^4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/slice-ansi/-/slice-ansi-4.0.0.tgz#500e8dd0fd55b05815086255b3195adf2a45fe6b"
+  integrity sha512-qMCMfhY040cVHT43K9BFygqYbUPFZKHOg7K73mtTWJRb8pyP3fzf4Ixd5SzdEJQ6MRUg/WBnOLxghZtKKurENQ==
+  dependencies:
+    ansi-styles "^4.0.0"
+    astral-regex "^2.0.0"
+    is-fullwidth-code-point "^3.0.0"
+
+slide@~1.1.3:
   version "1.1.6"
   resolved "https://registry.yarnpkg.com/slide/-/slide-1.1.6.tgz#56eb027d65b4d2dce6cb2e2d32c4d4afc9e1d707"
   integrity sha1-VusCfWW00tzmyy4tMsTUr8nh1wc=
@@ -11036,13 +10706,13 @@ socket.io-parser@~4.0.3:
     debug "~4.3.1"
 
 socket.io@^3.1.0:
-  version "3.1.1"
-  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-3.1.1.tgz#905e3d4a3b37d8e7970e67a4a6eb81110a5778ba"
-  integrity sha512-7cBWdsDC7bbyEF6WbBqffjizc/H4YF1wLdZoOzuYfo2uMNSFjJKuQ36t0H40o9B20DO6p+mSytEd92oP4S15bA==
+  version "3.1.2"
+  resolved "https://registry.yarnpkg.com/socket.io/-/socket.io-3.1.2.tgz#06e27caa1c4fc9617547acfbb5da9bc1747da39a"
+  integrity sha512-JubKZnTQ4Z8G4IZWtaAZSiRP3I/inpy8c/Bsx2jrwGrTbKeVU5xd6qkKMHpChYeM3dWZSO0QACiGK+obhBNwYw==
   dependencies:
     "@types/cookie" "^0.4.0"
     "@types/cors" "^2.8.8"
-    "@types/node" "^14.14.10"
+    "@types/node" ">=10.0.0"
     accepts "~1.3.4"
     base64id "~2.0.0"
     debug "~4.3.1"
@@ -11051,16 +10721,16 @@ socket.io@^3.1.0:
     socket.io-parser "~4.0.3"
 
 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==
+  version "1.5.1"
+  resolved "https://registry.yarnpkg.com/sockjs-client/-/sockjs-client-1.5.1.tgz#256908f6d5adfb94dabbdbd02c66362cca0f9ea6"
+  integrity sha512-VnVAb663fosipI/m6pqRXakEOw7nvd7TUgdr3PlR/8V2I95QIdwT8L4nMxhyU8SmDBHYXU1TOElaKOmKLfYzeQ==
   dependencies:
     debug "^3.2.6"
     eventsource "^1.0.7"
     faye-websocket "^0.11.3"
     inherits "^2.0.4"
     json3 "^3.3.3"
-    url-parse "^1.4.7"
+    url-parse "^1.5.1"
 
 sockjs@^0.3.21:
   version "0.3.21"
@@ -11072,18 +10742,27 @@ sockjs@^0.3.21:
     websocket-driver "^0.7.4"
 
 socks-proxy-agent@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-5.0.0.tgz#7c0f364e7b1cf4a7a437e71253bed72e9004be60"
-  integrity sha512-lEpa1zsWCChxiynk+lCycKuC502RxDWLKJZoIhnxrWNjLSDGYRFflHA1/228VkRcnv9TIb8w98derGbpKxJRgA==
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-5.0.1.tgz#032fb583048a29ebffec2e6a73fca0761f48177e"
+  integrity sha512-vZdmnjb9a2Tz6WEQVIurybSwElwPxMZaIc7PzqbJTrezcKNznv6giT7J7tZDZ1BojVaa1jvO/UiUdhDVB0ACoQ==
   dependencies:
-    agent-base "6"
+    agent-base "^6.0.2"
     debug "4"
     socks "^2.3.3"
 
-socks@^2.3.3:
-  version "2.5.1"
-  resolved "https://registry.yarnpkg.com/socks/-/socks-2.5.1.tgz#7720640b6b5ec9a07d556419203baa3f0596df5f"
-  integrity sha512-oZCsJJxapULAYJaEYBSzMcz8m3jqgGrHaGhkmU/o/PQfFWYWxkAaA0UMGImb6s6tEXfKi959X6VJjMMQ3P6TTQ==
+socks-proxy-agent@^6.0.0:
+  version "6.1.1"
+  resolved "https://registry.yarnpkg.com/socks-proxy-agent/-/socks-proxy-agent-6.1.1.tgz#e664e8f1aaf4e1fb3df945f09e3d94f911137f87"
+  integrity sha512-t8J0kG3csjA4g6FTbsMOWws+7R7vuRC8aQ/wy3/1OWmsgwA68zs/+cExQ0koSitUDXqhufF/YJr9wtNMZHw5Ew==
+  dependencies:
+    agent-base "^6.0.2"
+    debug "^4.3.1"
+    socks "^2.6.1"
+
+socks@^2.3.3, socks@^2.6.1:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/socks/-/socks-2.6.1.tgz#989e6534a07cf337deb1b1c94aaa44296520d30e"
+  integrity sha512-kLQ9N5ucj8uIcxrDwjm0Jsqk06xdpBjGNQtpXy4Q8/QY2k+fY7nZH8CARy+hkbG+SGAovmzzuauCpBlb8FrnBA==
   dependencies:
     ip "^1.1.5"
     smart-buffer "^4.1.0"
@@ -11096,22 +10775,24 @@ sonic-boom@^1.0.2:
     atomic-sleep "^1.0.0"
     flatstr "^1.0.12"
 
-source-list-map@^2.0.0, source-list-map@^2.0.1:
+source-list-map@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34"
   integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw==
 
-source-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==
+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@3.0.0:
+  version "3.0.0"
+  resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-3.0.0.tgz#f2a04ee2808ad01c774dea6b7d2639839f3b3049"
+  integrity sha512-GKGWqWvYr04M7tn8dryIWvb0s8YM41z82iQv01yBtIylgxax0CwvSy6gc2Y02iuXwEfGWRlMicH0nvms9UZphw==
   dependencies:
     abab "^2.0.5"
     iconv-lite "^0.6.2"
-    loader-utils "^2.0.0"
-    schema-utils "^3.0.0"
-    source-map "^0.6.1"
-    whatwg-mimetype "^2.3.0"
+    source-map-js "^0.6.2"
 
 source-map-resolve@^0.5.0, source-map-resolve@^0.5.2:
   version "0.5.3"
@@ -11155,6 +10836,14 @@ source-map-support@~0.4.0:
   dependencies:
     source-map "^0.5.6"
 
+source-map-support@~0.5.20:
+  version "0.5.21"
+  resolved "https://registry.yarnpkg.com/source-map-support/-/source-map-support-0.5.21.tgz#04fe7c7f9e1ed2d662233c28cb2b35b9f63f6e4f"
+  integrity sha512-uBHU3L3czsIyYXKX88fdrGovxdSCoTGDRZ6SYXtSRxLZUzHg5P/66Ht6uoUlHu9EZod+inXhKo3qQgwXUT/y1w==
+  dependencies:
+    buffer-from "^1.0.0"
+    source-map "^0.6.0"
+
 source-map-url@^0.4.0:
   version "0.4.1"
   resolved "https://registry.yarnpkg.com/source-map-url/-/source-map-url-0.4.1.tgz#0af66605a745a5a2f91cf1bbf8a7afbc283dec56"
@@ -11175,7 +10864,7 @@ source-map@^0.5.0, source-map@^0.5.6, source-map@^0.5.7:
   resolved "https://registry.yarnpkg.com/source-map/-/source-map-0.5.7.tgz#8a039d2d1021d22d1ea14c80d8ea468ba2ef3fcc"
   integrity sha1-igOdLRAh0i0eoUyA2OpGi6LvP8w=
 
-sourcemap-codec@^1.4.4, sourcemap-codec@^1.4.8:
+sourcemap-codec@1.4.8, sourcemap-codec@^1.4.4, sourcemap-codec@^1.4.8:
   version "1.4.8"
   resolved "https://registry.yarnpkg.com/sourcemap-codec/-/sourcemap-codec-1.4.8.tgz#ea804bd94857402e6992d05a38ef1ae35a9ab4c4"
   integrity sha512-9NykojV5Uih4lgo5So5dtw+f0JgJX30KCNI8gwhz2J9A15wD0Ml6tjHKwf6fTSa6fAdVBdZeNOs9eJ71qCk8vA==
@@ -11211,9 +10900,9 @@ spdx-expression-parse@^3.0.0:
     spdx-license-ids "^3.0.0"
 
 spdx-license-ids@^3.0.0:
-  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==
+  version "3.0.9"
+  resolved "https://registry.yarnpkg.com/spdx-license-ids/-/spdx-license-ids-3.0.9.tgz#8a595135def9592bda69709474f1cbeea7c2467f"
+  integrity sha512-Ki212dKK4ogX+xDo4CtOZBVIwhsKBEfsEEcwmJfLQzirgc2jIWdzg40Unxz/HzEUqM1WFzVlQSMF9kZZ2HboLQ==
 
 spdx-ranges@^2.0.0:
   version "2.1.1"
@@ -11230,9 +10919,9 @@ spdx-satisfies@^4.0.0:
     spdx-ranges "^2.0.0"
 
 spdx-satisfies@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/spdx-satisfies/-/spdx-satisfies-5.0.0.tgz#d740b8f14caeada36fb307629dee87146970a256"
-  integrity sha512-/hGhwh20BeGmkA+P/lm06RvXD94JduwNxtx/oX3B5ClPt1/u/m5MCaDNo1tV3Y9laLkQr/NRde63b9lLMhlNfw==
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/spdx-satisfies/-/spdx-satisfies-5.0.1.tgz#9feeb2524686c08e5f7933c16248d4fdf07ed6a6"
+  integrity sha512-Nwor6W6gzFp8XX4neaKQ7ChV4wmpSh2sSDemMFSzHxpTw460jxFYeOn+jq4ybnSSw/5sc3pjka9MQPouksQNpw==
   dependencies:
     spdx-compare "^1.0.0"
     spdx-expression-parse "^3.0.0"
@@ -11268,13 +10957,6 @@ split-string@^3.0.1, split-string@^3.0.2:
   dependencies:
     extend-shallow "^3.0.0"
 
-split2@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/split2/-/split2-2.2.0.tgz#186b2575bcf83e85b7d18465756238ee4ee42493"
-  integrity sha512-RAb22TG39LhI31MbreBgIuKiIKhVsawfTgEGqKHTK87aG+ul/PB8Sqoi3I7kVdRWiCfrKxK3uo4/YUkpNvhPbw==
-  dependencies:
-    through2 "^2.0.2"
-
 split2@^3.0.0:
   version "3.2.2"
   resolved "https://registry.yarnpkg.com/split2/-/split2-3.2.2.tgz#bf2cf2a37d838312c249c89206fd7a17dd12365f"
@@ -11282,13 +10964,6 @@ split2@^3.0.0:
   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"
-  integrity sha512-mTyOoPbrivtXnwnIxZRFYRrPNtEFKlpB2fvjSnCQUiAA6qAZzqwna5envK4uk6OIeP17CsdF3rSBGYVBsU0Tkg==
-  dependencies:
-    through "2"
-
 sprintf-js@^1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673"
@@ -11314,13 +10989,6 @@ sshpk@^1.7.0:
     safer-buffer "^2.0.2"
     tweetnacl "~0.14.0"
 
-ssri@^5.2.4:
-  version "5.3.0"
-  resolved "https://registry.yarnpkg.com/ssri/-/ssri-5.3.0.tgz#ba3872c9c6d33a0704a7d71ff045e5ec48999d06"
-  integrity sha512-XRSIPqLij52MtgoQavH/x/dU1qVKtWUAAZeOHsR9c2Ddi4XerFy3mc1alf+dLJKl9EUIm/Ht+EowFkTUOA6GAQ==
-  dependencies:
-    safe-buffer "^5.1.1"
-
 ssri@^8.0.0, ssri@^8.0.1:
   version "8.0.1"
   resolved "https://registry.yarnpkg.com/ssri/-/ssri-8.0.1.tgz#638e4e439e2ffbd2cd289776d5ca457c4f51a2af"
@@ -11394,22 +11062,19 @@ streamroller@^2.2.4:
     debug "^4.1.1"
     fs-extra "^8.1.0"
 
-string-width@^1.0.1:
-  version "1.0.2"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"
-  integrity sha1-EYvfW4zcUaKn5w0hHgfisLmxB9M=
-  dependencies:
-    code-point-at "^1.0.0"
-    is-fullwidth-code-point "^1.0.0"
-    strip-ansi "^3.0.0"
+string-argv@~0.3.1:
+  version "0.3.1"
+  resolved "https://registry.yarnpkg.com/string-argv/-/string-argv-0.3.1.tgz#95e2fbec0427ae19184935f816d74aaa4c5c19da"
+  integrity sha512-a1uQGz7IyVy9YwhqjZIZu1c8JO8dNIe20xBmSS6qu9kv++k3JGzCVmprbNN5Kn+BgzD5E7YYwg1CcjuJMRNsvg==
 
-"string-width@^1.0.2 || 2":
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-2.1.1.tgz#ab93f27a8dc13d28cac815c462143a6d9012ae9e"
-  integrity sha512-nOqH59deCq9SRHlxq1Aw85Jnt4w6KvLKqWVik6oA9ZklXLNIOlqg4F2yrT1MVaTjAqvVwdfeZ7w7aCvJD7ugkw==
+"string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.2.3:
+  version "4.2.3"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
+  integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
   dependencies:
-    is-fullwidth-code-point "^2.0.0"
-    strip-ansi "^4.0.0"
+    emoji-regex "^8.0.0"
+    is-fullwidth-code-point "^3.0.0"
+    strip-ansi "^6.0.1"
 
 string-width@^3.0.0, string-width@^3.1.0:
   version "3.1.0"
@@ -11421,28 +11086,28 @@ string-width@^3.0.0, string-width@^3.1.0:
     strip-ansi "^5.1.0"
 
 string-width@^4.1.0, string-width@^4.2.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.0.tgz#952182c46cc7b2c313d1596e623992bd163b72b5"
-  integrity sha512-zUz5JD+tgqtuDjMhwIg5uFVV3dtqZ9yQJlZVfq4I01/K5Paj5UHj7VyrQOJvzawSVlKpObApbfD0Ed6yJc+1eg==
+  version "4.2.2"
+  resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.2.tgz#dafd4f9559a7585cfba529c6a0a4f73488ebd4c5"
+  integrity sha512-XBJbT3N4JhVumXE0eoLU9DCjcaF92KLNqTmFCnG1pf8duUxFGwtP6AD6nkjw9a3IdiRtL3E2w3JDiE/xi3vOeA==
   dependencies:
     emoji-regex "^8.0.0"
     is-fullwidth-code-point "^3.0.0"
     strip-ansi "^6.0.0"
 
-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==
+string.prototype.trimend@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimend/-/string.prototype.trimend-1.0.4.tgz#e75ae90c2942c63504686c18b287b4a0b1a45f80"
+  integrity sha512-y9xCjw1P23Awk8EvTpcyL2NIr1j7wJ39f+k6lvRnSMz+mz9CGz9NYPelDk42kOz6+ql8xjfK8oYzy3jAP5QU5A==
   dependencies:
-    call-bind "^1.0.0"
+    call-bind "^1.0.2"
     define-properties "^1.1.3"
 
-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==
+string.prototype.trimstart@^1.0.4:
+  version "1.0.4"
+  resolved "https://registry.yarnpkg.com/string.prototype.trimstart/-/string.prototype.trimstart-1.0.4.tgz#b36399af4ab2999b4c9c648bd7a3fb2bb26feeed"
+  integrity sha512-jh6e984OBfvxS50tdY2nRZnoC5/mLFKOREQfw8t5yytkoUsJRNxvI/E39qu1sD0OtWI3OC0XgKSmcWwziwYuZw==
   dependencies:
-    call-bind "^1.0.0"
+    call-bind "^1.0.2"
     define-properties "^1.1.3"
 
 string_decoder@^1.1.1:
@@ -11473,13 +11138,6 @@ strip-ansi@^3.0.0, strip-ansi@^3.0.1:
   dependencies:
     ansi-regex "^2.0.0"
 
-strip-ansi@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-4.0.0.tgz#a8479022eb1ac368a871389b635262c505ee368f"
-  integrity sha1-qEeQIusaw2iocTibY1JixQXuNo8=
-  dependencies:
-    ansi-regex "^3.0.0"
-
 strip-ansi@^5.0.0, strip-ansi@^5.1.0, strip-ansi@^5.2.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-5.2.0.tgz#8c9a536feb6afc962bdfa5b104a5091c1ad9c0ae"
@@ -11494,12 +11152,12 @@ strip-ansi@^6.0.0:
   dependencies:
     ansi-regex "^5.0.0"
 
-strip-bom@^2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/strip-bom/-/strip-bom-2.0.0.tgz#6219a85616520491f35788bdbf1447a99c7e6b0e"
-  integrity sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=
+strip-ansi@^6.0.1:
+  version "6.0.1"
+  resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
+  integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
   dependencies:
-    is-utf8 "^0.2.0"
+    ansi-regex "^5.0.1"
 
 strip-bom@^3.0.0:
   version "3.0.0"
@@ -11511,13 +11169,6 @@ strip-eof@^1.0.0:
   resolved "https://registry.yarnpkg.com/strip-eof/-/strip-eof-1.0.0.tgz#bb43ff5598a6eb05d89b59fcd129c983313606bf"
   integrity sha1-u0P/VZim6wXYm1n80SnJgzE2Br8=
 
-strip-indent@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-1.0.1.tgz#0c7962a6adefa7bbd4ac366460a638552ae1a0a2"
-  integrity sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=
-  dependencies:
-    get-stdin "^4.0.1"
-
 strip-indent@^3.0.0:
   version "3.0.0"
   resolved "https://registry.yarnpkg.com/strip-indent/-/strip-indent-3.0.0.tgz#c32e1cee940b6b3432c771bc2c54bcce73cd3001"
@@ -11525,41 +11176,32 @@ strip-indent@^3.0.0:
   dependencies:
     min-indent "^1.0.0"
 
-style-loader@2.0.0:
-  version "2.0.0"
-  resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-2.0.0.tgz#9669602fd4690740eaaec137799a03addbbc393c"
-  integrity sha512-Z0gYUJmzZ6ZdRUqpg1r8GsaFKypE+3xAzuFeMuoHgjc9KZv3wMyCRjQIWEbhoFSq7+7yoHXySDJyyWQaPajeiQ==
-  dependencies:
-    loader-utils "^2.0.0"
-    schema-utils "^3.0.0"
+strip-json-comments@^3.1.0, strip-json-comments@^3.1.1, strip-json-comments@~3.1.1:
+  version "3.1.1"
+  resolved "https://registry.yarnpkg.com/strip-json-comments/-/strip-json-comments-3.1.1.tgz#31f1281b3832630434831c310c01cccda8cbe006"
+  integrity sha512-6fPc+R4ihwqP6N/aIv2f1gMH8lOVtWQHoqC4yK6oSDVVocumAsfCqjkXnqiYMhmMwS/mEHLp7Vehlt3ql6lEig==
 
-stylehacks@^4.0.0:
-  version "4.0.3"
-  resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-4.0.3.tgz#6718fcaf4d1e07d8a1318690881e8d96726a71d5"
-  integrity sha512-7GlLk9JwlElY4Y6a/rmbH2MhVlTyVmiJd1PfTCqFaIBEGMYNsrO/v3SeGTdhBThLg4Z+NbOk/qFMwCa+J+3p/g==
-  dependencies:
-    browserslist "^4.0.0"
-    postcss "^7.0.0"
-    postcss-selector-parser "^3.0.0"
+style-loader@3.2.1:
+  version "3.2.1"
+  resolved "https://registry.yarnpkg.com/style-loader/-/style-loader-3.2.1.tgz#63cb920ec145c8669e9a50e92961452a1ef5dcde"
+  integrity sha512-1k9ZosJCRFaRbY6hH49JFlRB0fVSbmnyq1iTPjNxUmGVjBNEmwrrHPenhlp+Lgo51BojHSf6pl2FcqYaN3PfVg==
 
-stylehacks@^5.0.0:
-  version "5.0.0"
-  resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-5.0.0.tgz#c49b0b2cf9917fe37dc030b96a4c34698b932933"
-  integrity sha512-QOWm6XivDLb+fqffTZP8jrmPmPITVChl2KCY2R05nsCWwLi3VGhCdVc3IVGNwd1zzTt1jPd67zIKjpQfxzQZeA==
+stylehacks@^5.0.1:
+  version "5.0.1"
+  resolved "https://registry.yarnpkg.com/stylehacks/-/stylehacks-5.0.1.tgz#323ec554198520986806388c7fdaebc38d2c06fb"
+  integrity sha512-Es0rVnHIqbWzveU1b24kbw92HsebBepxfcqe5iix7t9j0PQqhs0IxXVXv0pY2Bxa08CgMkzD6OWql7kbGOuEdA==
   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==
+stylus-loader@6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/stylus-loader/-/stylus-loader-6.1.0.tgz#7a3a719a27cb2b9617896d6da28fda94c3ed9762"
+  integrity sha512-qKO34QCsOtSJrXxQQmXsPeaVHh6hMumBAFIoJTcsSr2VzrA6o/CW9HCGR8spCjzJhN8oKQHdj/Ytx0wwXyElkw==
   dependencies:
-    fast-glob "^3.2.4"
+    fast-glob "^3.2.5"
     klona "^2.0.4"
-    loader-utils "^2.0.0"
     normalize-path "^3.0.0"
-    schema-utils "^3.0.0"
 
 stylus@0.54.8, stylus@^0.54.8:
   version "0.54.8"
@@ -11594,78 +11236,71 @@ supports-color@^6.1.0:
   dependencies:
     has-flag "^3.0.0"
 
-supports-color@^7.0.0, supports-color@^7.1.0:
+supports-color@^7.1.0:
   version "7.2.0"
   resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-7.2.0.tgz#1b7dcdcb32b8138801b3e478ba6a51caa89648da"
   integrity sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==
   dependencies:
     has-flag "^4.0.0"
 
-svgo@^1.0.0:
-  version "1.3.2"
-  resolved "https://registry.yarnpkg.com/svgo/-/svgo-1.3.2.tgz#b6dc511c063346c9e415b81e43401145b96d4167"
-  integrity sha512-yhy/sQYxR5BkC98CY7o31VGsg014AKLEPxdfhora76l36hD9Rdy5NZA/Ocn6yayNPgSamYdtX2rFJdcv07AYVw==
+supports-color@^8.0.0:
+  version "8.1.1"
+  resolved "https://registry.yarnpkg.com/supports-color/-/supports-color-8.1.1.tgz#cd6fc17e28500cff56c1b86c0a7fd4a54a73005c"
+  integrity sha512-MpUEN2OodtUzxvKQl72cUF7RQ5EiHsGvSsVG0ia9c5RbWGL2CI4C7EpPS8UTBIplnlzZiNuV56w+FuNxy3ty2Q==
   dependencies:
-    chalk "^2.4.1"
-    coa "^2.0.2"
-    css-select "^2.0.0"
-    css-select-base-adapter "^0.1.1"
-    css-tree "1.0.0-alpha.37"
-    csso "^4.0.2"
-    js-yaml "^3.13.1"
-    mkdirp "~0.5.1"
-    object.values "^1.1.0"
-    sax "~1.2.4"
-    stable "^0.1.8"
-    unquote "~1.1.1"
-    util.promisify "~1.0.0"
+    has-flag "^4.0.0"
 
 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==
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/svgo/-/svgo-2.3.1.tgz#603a69ce50311c0e36791528f549644ec1b3f4bc"
+  integrity sha512-riDDIQgXpEnn0BEl9Gvhh1LNLIyiusSpt64IR8upJu7MwxnzetmF/Y57pXQD2NMX2lVyMRzXt5f2M5rO4wG7Dw==
   dependencies:
     "@trysound/sax" "0.1.1"
     chalk "^4.1.0"
     commander "^7.1.0"
-    css-select "^3.1.2"
+    css-select "^4.1.3"
     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-observable@4.0.0:
+  version "4.0.0"
+  resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-4.0.0.tgz#5b425f192279e87f2f9b937ac8540d1984b39205"
+  integrity sha512-b19dMThMV4HVFynSAM1++gBHAbk2Tc/osgLIBZMKsyqh34jb2e8Os7T6ZW/Bt3pJFdBTd2JwAnAAEQV7rSNvcQ==
 
 symbol-tree@^3.2.2:
   version "3.2.4"
   resolved "https://registry.yarnpkg.com/symbol-tree/-/symbol-tree-3.2.4.tgz#430637d248ba77e078883951fb9aa0eed7c63fa2"
   integrity sha512-9QNk5KwDF+Bvz+PyObkmSYjI5ksVUYtjW7AU22r2NKcfLJcXp96hkDWU3+XndOsUb+AQ9QhfzfCT2O+CNWT5Tw==
 
-sync-rpc@^1.3.6:
-  version "1.3.6"
-  resolved "https://registry.yarnpkg.com/sync-rpc/-/sync-rpc-1.3.6.tgz#b2e8b2550a12ccbc71df8644810529deb68665a7"
-  integrity sha512-J8jTXuZzRlvU7HemDgHi3pGnh/rkoqR/OZSjhTyyZrEkkYQbk7Z33AXp37mkPfPpfdOuj7Ex3H/TJM1z48uPQw==
+table@^6.0.9:
+  version "6.7.1"
+  resolved "https://registry.yarnpkg.com/table/-/table-6.7.1.tgz#ee05592b7143831a8c94f3cee6aae4c1ccef33e2"
+  integrity sha512-ZGum47Yi6KOOFDE8m223td53ath2enHcYLgOCjGr5ngu8bdIARQk6mN/wRMv4yMRcHnCSnHbCEha4sobQx5yWg==
   dependencies:
-    get-port "^3.1.0"
+    ajv "^8.0.1"
+    lodash.clonedeep "^4.5.0"
+    lodash.truncate "^4.4.2"
+    slice-ansi "^4.0.0"
+    string-width "^4.2.0"
+    strip-ansi "^6.0.0"
 
-tapable@^2.1.1, tapable@^2.2.0:
+tapable@^2.0.0, tapable@^2.1.1, 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.1"
-  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.1.1.tgz#489a15ab85f1f0befabb370b7de4f9eb5cbe8784"
-  integrity sha512-V0r2Y9scmbDRLCNex/+hYzvp/zyYjvFbHPNgVTKfQvVrb6guiE/fxP+XblDNR011utopbkex2nM4dHNV6GDsng==
+tar-fs@2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/tar-fs/-/tar-fs-2.0.0.tgz#677700fc0c8b337a78bee3623fdc235f21d7afad"
+  integrity sha512-vaY0obB6Om/fso8a8vakQBzwholQ7v5+uy+tF3Ozvxv1KNezmVQAiWtcNmMHFSFPqL3dJA8ha6gdtFbfX9mcxA==
   dependencies:
     chownr "^1.1.1"
-    mkdirp-classic "^0.5.2"
+    mkdirp "^0.5.1"
     pump "^3.0.0"
-    tar-stream "^2.1.4"
+    tar-stream "^2.0.0"
 
-tar-stream@^2.1.4:
+tar-stream@^2.0.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/tar-stream/-/tar-stream-2.2.0.tgz#acad84c284136b060dc3faa64474aa9aebd77287"
   integrity sha512-ujeqbceABgwMZxEJnk2HDY2DlnUZ+9oEcb1KzTVfYHio0UE6dG71n60d8D2I4qNvleWrrXpmjpt7vZeF1LnMZQ==
@@ -11676,10 +11311,22 @@ tar-stream@^2.1.4:
     inherits "^2.0.3"
     readable-stream "^3.1.1"
 
-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==
+tar@^6.0.2, tar@^6.1.0, tar@^6.1.6:
+  version "6.1.6"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.6.tgz#c23d797b0a1efe5d479b1490805c5443f3560c5d"
+  integrity sha512-oaWyu5dQbHaYcyZCTfyPpC+VmI62/OM2RTUYavTk1MDr1cwW5Boi3baeYQKiZbY2uSQJGr+iMOzb/JFxLrft+g==
+  dependencies:
+    chownr "^2.0.0"
+    fs-minipass "^2.0.0"
+    minipass "^3.0.0"
+    minizlib "^2.1.1"
+    mkdirp "^1.0.3"
+    yallist "^4.0.0"
+
+tar@^6.1.2:
+  version "6.1.11"
+  resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621"
+  integrity sha512-an/KZQzQUkZCkuoAA64hM92X0Urb6VpRhAFllDzz44U2mcD5scmT3zBc4VgVpkugF580+DQn8eAFSyoQt0tznA==
   dependencies:
     chownr "^2.0.0"
     fs-minipass "^2.0.0"
@@ -11696,46 +11343,32 @@ temp@^0.9.0:
     mkdirp "^0.5.1"
     rimraf "~2.6.2"
 
-terser-webpack-plugin@4.2.3:
-  version "4.2.3"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-4.2.3.tgz#28daef4a83bd17c1db0297070adc07fc8cfc6a9a"
-  integrity sha512-jTgXh40RnvOrLQNgIkwEKnQ8rmHjHK4u+6UBEi+W+FPmvb+uo+chJXntKe7/3lW5mNysgSWD60KyesnhW8D6MQ==
-  dependencies:
-    cacache "^15.0.5"
-    find-cache-dir "^3.3.1"
-    jest-worker "^26.5.0"
-    p-limit "^3.0.2"
-    schema-utils "^3.0.0"
-    serialize-javascript "^5.0.1"
-    source-map "^0.6.1"
-    terser "^5.3.4"
-    webpack-sources "^1.4.3"
-
-terser-webpack-plugin@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.1.1.tgz#7effadee06f7ecfa093dbbd3e9ab23f5f3ed8673"
-  integrity sha512-5XNNXZiR8YO6X6KhSGXfY0QrGrCRlSwAEjIIrlRQR4W8nP69TaJUlh3bkuac6zzgspiGPfKEHcY295MMVExl5Q==
+terser-webpack-plugin@5.1.4, terser-webpack-plugin@^5.1.3:
+  version "5.1.4"
+  resolved "https://registry.yarnpkg.com/terser-webpack-plugin/-/terser-webpack-plugin-5.1.4.tgz#c369cf8a47aa9922bd0d8a94fe3d3da11a7678a1"
+  integrity sha512-C2WkFwstHDhVEmsmlCxrXUtVklS+Ir1A7twrYzrDrQQOIMOaVAYykaoo/Aq1K0QRkMoY2hhvDQY1cm4jnIMFwA==
   dependencies:
-    jest-worker "^26.6.2"
+    jest-worker "^27.0.2"
     p-limit "^3.1.0"
     schema-utils "^3.0.0"
-    serialize-javascript "^5.0.1"
+    serialize-javascript "^6.0.0"
     source-map "^0.6.1"
-    terser "^5.5.1"
+    terser "^5.7.0"
 
-terser@5.6.1:
-  version "5.6.1"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.6.1.tgz#a48eeac5300c0a09b36854bf90d9c26fb201973c"
-  integrity sha512-yv9YLFQQ+3ZqgWCUk+pvNJwgUTdlIxUk1WTN+RnaFJe2L7ipG2csPT0ra2XRm7Cs8cxN7QXmK1rFzEwYEQkzXw==
+terser@5.14.2:
+  version "5.14.2"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.14.2.tgz#9ac9f22b06994d736174f4091aa368db896f1c10"
+  integrity sha512-oL0rGeM/WFQCUd0y2QrWxYnq7tfSuKBiqTjRPWrRgB46WD/kiwHwF8T23z78H6Q6kGCuuHcPB+KULHRdxvVGQA==
   dependencies:
+    "@jridgewell/source-map" "^0.3.2"
+    acorn "^8.5.0"
     commander "^2.20.0"
-    source-map "~0.7.2"
-    source-map-support "~0.5.19"
+    source-map-support "~0.5.20"
 
-terser@^5.3.4, terser@^5.5.1:
-  version "5.6.0"
-  resolved "https://registry.yarnpkg.com/terser/-/terser-5.6.0.tgz#138cdf21c5e3100b1b3ddfddf720962f88badcd2"
-  integrity sha512-vyqLMoqadC1uR0vywqOZzriDYzgEkNJFK4q9GeyOBHIbiECHiWLKcWfbQWAUaPfxkjDhapSlZB9f7fkMrvkVjA==
+terser@^5.7.0:
+  version "5.7.1"
+  resolved "https://registry.yarnpkg.com/terser/-/terser-5.7.1.tgz#2dc7a61009b66bb638305cb2a824763b116bf784"
+  integrity sha512-b3e+d5JbHAe/JSjwsC3Zn55wsBIM7AsHLjKxT31kGCldgbpFePaFo+PiddtO6uwRZWRw7sPXmAN8dTW61xmnSg==
   dependencies:
     commander "^2.20.0"
     source-map "~0.7.2"
@@ -11755,12 +11388,12 @@ text-extensions@^1.0.0:
   resolved "https://registry.yarnpkg.com/text-extensions/-/text-extensions-1.9.0.tgz#1853e45fee39c945ce6f6c36b2d659b5aabc2a26"
   integrity sha512-wiBrwC1EhBelW12Zy26JeOUkQ5mRu+5o8rpsJk5+2t+Y5vE7e842qtZDQ2g1NpX/29HdyFeJ4nSIhI47ENSxlQ==
 
-text-table@0.2.0:
+text-table@0.2.0, text-table@^0.2.0:
   version "0.2.0"
   resolved "https://registry.yarnpkg.com/text-table/-/text-table-0.2.0.tgz#7f5ee823ae805207c00af2df4a84ec3fcfa570b4"
   integrity sha1-f17oI66AUgfACvLfSoTsP8+lcLQ=
 
-through2@^2.0.0, through2@^2.0.2, through2@~2.0.3:
+through2@^2.0.0, through2@~2.0.3:
   version "2.0.5"
   resolved "https://registry.yarnpkg.com/through2/-/through2-2.0.5.tgz#01c1e39eb31d07cb7d03a96a70823260b23132cd"
   integrity sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==
@@ -11775,7 +11408,7 @@ through2@^4.0.0:
   dependencies:
     readable-stream "3"
 
-through@2, "through@>=2.2.7 <3", through@X.X.X, through@^2.3.6, through@^2.3.8:
+"through@>=2.2.7 <3", through@X.X.X, through@^2.3.6, through@^2.3.8:
   version "2.3.8"
   resolved "https://registry.yarnpkg.com/through/-/through-2.3.8.tgz#0dd4c9ffaabc357960b1b724115d7e0e86a2e1f5"
   integrity sha1-DdTJ/6q8NXlgsbckEV1+Doai4fU=
@@ -11793,7 +11426,7 @@ timers-ext@^0.1.7:
     es5-ext "~0.10.46"
     next-tick "1"
 
-timsort@^0.3.0:
+timsort@^0.3.0, timsort@~0.3.0:
   version "0.3.0"
   resolved "https://registry.yarnpkg.com/timsort/-/timsort-0.3.0.tgz#405411a8e7e6339fe64db9a234de11dc31e02bd4"
   integrity sha1-QFQRqOfmM5/mTbmiNN4R3DHgK9Q=
@@ -11810,13 +11443,6 @@ tmp@0.0.30:
   dependencies:
     os-tmpdir "~1.0.1"
 
-tmp@0.2.1:
-  version "0.2.1"
-  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14"
-  integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==
-  dependencies:
-    rimraf "^3.0.0"
-
 tmp@^0.0.33:
   version "0.0.33"
   resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.0.33.tgz#6d34335889768d21b2bcda0aa277ced3b1bfadf9"
@@ -11824,6 +11450,13 @@ tmp@^0.0.33:
   dependencies:
     os-tmpdir "~1.0.2"
 
+tmp@^0.2.1:
+  version "0.2.1"
+  resolved "https://registry.yarnpkg.com/tmp/-/tmp-0.2.1.tgz#8457fc3037dcf4719c251367a1af6500ee1ccf14"
+  integrity sha512-76SUhtfqR2Ijn+xllcI5P1oyannHNHByD80W1q447gU3mp9G9PSpGdWmjUOHRDPiHYacIk66W7ubDTuPF3BEtQ==
+  dependencies:
+    rimraf "^3.0.0"
+
 to-fast-properties@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/to-fast-properties/-/to-fast-properties-2.0.0.tgz#dc5e698cbd079265bc73e0377681a4e4e83f616e"
@@ -11913,35 +11546,25 @@ treeify@^1.1.0:
   resolved "https://registry.yarnpkg.com/treeify/-/treeify-1.1.0.tgz#4e31c6a463accd0943879f30667c4fdaff411bb8"
   integrity sha512-1m4RA7xVAJrSGrrXGs0L3YTwyvBs2S8PbRHaLZAkFw7JR8oIFwYtysxlBZhYIa7xSyiYJKZ3iGrrk55cGA3i9A==
 
-trim-newlines@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-1.0.0.tgz#5887966bb582a4503a41eb524f7d35011815a613"
-  integrity sha1-WIeWa7WCpFA6QetST301ARgVphM=
-
 trim-newlines@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.0.tgz#79726304a6a898aa8373427298d54c2ee8b1cb30"
-  integrity sha512-C4+gOpvmxaSMKuEf9Qc134F1ZuOHVXKRbtEflf4NTtuuJDEIJ9p5PXsalL8SkeRw+qit1Mo+yuvMPAKwWg/1hA==
+  version "3.0.1"
+  resolved "https://registry.yarnpkg.com/trim-newlines/-/trim-newlines-3.0.1.tgz#260a5d962d8b752425b32f3a7db0dcacd176c144"
+  integrity sha512-c1PTsA3tYrIsLGkJkzHF+w9F2EyxfXGo4UyJc4pFL++FMjnq0HJS69T3M7d//gKrFKwy429bouPescbjecU+Zw==
 
 trim-off-newlines@^1.0.0:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/trim-off-newlines/-/trim-off-newlines-1.0.1.tgz#9f9ba9d9efa8764c387698bcbfeb2c848f11adb3"
   integrity sha1-n5up2e+odkw4dpi8v+sshI8RrbM=
 
-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"
-    minimist "^1.2.0"
-
-ts-node@^9.0.0, ts-node@^9.1.1:
-  version "9.1.1"
-  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-9.1.1.tgz#51a9a450a3e959401bda5f004a72d54b936d376d"
-  integrity sha512-hPlt7ZACERQGf03M253ytLY3dHbGNGrAq9qIHWUY9XHYl1z7wYngSr3OQ5xmui8o2AaxsONxIzjafLUiWBo1Fg==
+ts-node@^10.0.0:
+  version "10.1.0"
+  resolved "https://registry.yarnpkg.com/ts-node/-/ts-node-10.1.0.tgz#e656d8ad3b61106938a867f69c39a8ba6efc966e"
+  integrity sha512-6szn3+J9WyG2hE+5W8e0ruZrzyk1uFLYye6IGMBadnOzDh8aP7t8CbFpsfCiEx2+wMixAhjFt7lOZC4+l+WbEA==
   dependencies:
+    "@tsconfig/node10" "^1.0.7"
+    "@tsconfig/node12" "^1.0.7"
+    "@tsconfig/node14" "^1.0.0"
+    "@tsconfig/node16" "^1.0.1"
     arg "^4.1.0"
     create-require "^1.1.0"
     diff "^4.0.1"
@@ -11949,33 +11572,35 @@ ts-node@^9.0.0, ts-node@^9.1.1:
     source-map-support "^0.5.17"
     yn "3.1.1"
 
-tslib@2.2.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.2.0.tgz#fb2c475977e35e241311ede2693cee1ec6698f5c"
-  integrity sha512-gS9GVHRU+RGn5KQM2rllAlR3dU6m7AcpJKdtH8gFvQiC4Otgk98XnmMU+nZenHt/+VhnBPWwgrJsyrdcw6i23w==
+tsconfig-paths@^3.9.0:
+  version "3.10.1"
+  resolved "https://registry.yarnpkg.com/tsconfig-paths/-/tsconfig-paths-3.10.1.tgz#79ae67a68c15289fdf5c51cb74f397522d795ed7"
+  integrity sha512-rETidPDgCpltxF7MjBZlAFPUHv5aHH2MymyPvh+vEyWAED4Eb/WeMbsnD/JDr4OKPOA1TssDHgIcpTN5Kh0p6Q==
+  dependencies:
+    json5 "^2.2.0"
+    minimist "^1.2.0"
+    strip-bom "^3.0.0"
+
+tslib@2.3.0, tslib@^2.0.0, tslib@^2.2.0:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.0.tgz#803b8cdab3e12ba581a4ca41c8839bbb0dacb09e"
+  integrity sha512-N82ooyxVNm6h1riLCoyS9e3fuJ3AMG2zIZs2Gd1ATcSFjSA23Q0fzjjZeh0jbJvWVDZ0cJT8yaNNaaXHzueNjg==
 
 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.0.0, tslib@^2.1.0:
+tslib@^2.3.0:
+  version "2.3.1"
+  resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.3.1.tgz#e8a335add5ceae51aa261d32a490158ef042ef01"
+  integrity sha512-77EbyPPpMz+FRFRuAFlWMtmgUWGe9UOG2Z25NqCwiIjRhOf5iKGuzSe5P2w1laq+FkRy4p+PCuVkJSGkzTEKVw==
+
+tslib@~2.1.0:
   version "2.1.0"
   resolved "https://registry.yarnpkg.com/tslib/-/tslib-2.1.0.tgz#da60860f1c2ecaa5703ab7d39bc05b6bf988b97a"
   integrity sha512-hcVC3wYEziELGGmEEXue7D75zbwIIVUMWAVbHItGPx0ziyXxrOMQx4rQEVEV45Ut/1IotuEvwqPopzIOkDMf0A==
 
-tslint-no-circular-imports@^0.7.0:
-  version "0.7.0"
-  resolved "https://registry.yarnpkg.com/tslint-no-circular-imports/-/tslint-no-circular-imports-0.7.0.tgz#9df0a15654d66b172e0b7843eed073fa5ae99b5f"
-  integrity sha512-k3wxpeMC4ef40UbpfBVHEHIzKfNZq5/SCtAO1YjGsaNTklo+K53/TWLrym+poA65RJFDiYgYNWvkeIIkJNA0Vw==
-
-tslint-sonarts@1.9.0:
-  version "1.9.0"
-  resolved "https://registry.yarnpkg.com/tslint-sonarts/-/tslint-sonarts-1.9.0.tgz#feb593e92db328c0328b430b838adbe65d504de9"
-  integrity sha512-CJWt+IiYI8qggb2O/JPkS6CkC5DY1IcqRsm9EHJ+AxoWK70lvtP7jguochyNDMP2vIz/giGdWCfEM39x/I/Vnw==
-  dependencies:
-    immutable "^3.8.2"
-
 tslint@^6.1.3:
   version "6.1.3"
   resolved "https://registry.yarnpkg.com/tslint/-/tslint-6.1.3.tgz#5c23b2eccc32487d5523bd3a470e9aa31789d904"
@@ -12014,6 +11639,13 @@ tsutils@^2.29.0:
   dependencies:
     tslib "^1.8.1"
 
+tsutils@^3.21.0:
+  version "3.21.0"
+  resolved "https://registry.yarnpkg.com/tsutils/-/tsutils-3.21.0.tgz#b48717d394cea6c1e096983eed58e9d61715b623"
+  integrity sha512-mHKK3iUXL+3UF6xL5k0PEhKRUBKPBCv/+RkEOpjRWxxx27KKRBmmA60A9pgOUvMi8GKhRMPEmjBRPzs2W7O1OA==
+  dependencies:
+    tslib "^1.8.1"
+
 tunnel-agent@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/tunnel-agent/-/tunnel-agent-0.6.0.tgz#27a5dea06b36b04a0a9966774b290868f0fc40fd"
@@ -12021,15 +11653,27 @@ tunnel-agent@^0.6.0:
   dependencies:
     safe-buffer "^5.0.1"
 
+tunnel@0.0.6:
+  version "0.0.6"
+  resolved "https://registry.yarnpkg.com/tunnel/-/tunnel-0.0.6.tgz#72f1314b34a5b192db012324df2cc587ca47f92c"
+  integrity sha512-1h/Lnq9yajKY2PEbBadPXj3VxsDDu844OnaAo52UVmIzIvwwtBPIuNvkjuzBlTWpfJyUbG3ez0KSBibQkj4ojg==
+
 tweetnacl@^0.14.3, tweetnacl@~0.14.0:
   version "0.14.5"
   resolved "https://registry.yarnpkg.com/tweetnacl/-/tweetnacl-0.14.5.tgz#5ae68177f192d4456269d108afa93ff8743f4f64"
   integrity sha1-WuaBd/GS1EViadEIr6k/+HQ/T2Q=
 
-typanion@^3.3.0:
-  version "3.3.0"
-  resolved "https://registry.yarnpkg.com/typanion/-/typanion-3.3.0.tgz#92d949d8fb90ba90a152b97909255e5420bfc81d"
-  integrity sha512-e+54C4+ozFsTorFe50JNQlXlt4HVGQUvqul7VS0GbDfKlxh3aXbJY87Yu9IdtzvJWCyTgDX7q1PeMd3FH9zZqA==
+typanion@^3.3.1:
+  version "3.3.2"
+  resolved "https://registry.yarnpkg.com/typanion/-/typanion-3.3.2.tgz#c31f3b2afb6e8ae74dbd3f96d5b1d8f9745e483e"
+  integrity sha512-m3v3wtFc6R0wtl0RpEn11bKXIOjS1zch5gmx0zg2G5qfGQ3A9TVZRMSL43O5eFuGXsrgzyvDcGRmSXGP5UqpDQ==
+
+type-check@^0.4.0, type-check@~0.4.0:
+  version "0.4.0"
+  resolved "https://registry.yarnpkg.com/type-check/-/type-check-0.4.0.tgz#07b8203bfa7056c0657050e3ccd2c37730bab8f1"
+  integrity sha512-XleUoc9uwGXqjWwXaUTZAmzMcFZ5858QA2vvx1Ur5xIcixXIP+8LnFDgRplU30us6teqdlskFfu+ae4K79Ooew==
+  dependencies:
+    prelude-ls "^1.2.1"
 
 type-check@~0.3.2:
   version "0.3.2"
@@ -12043,16 +11687,21 @@ type-fest@^0.10.0:
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.10.0.tgz#7f06b2b9fbfc581068d1341ffabd0349ceafc642"
   integrity sha512-EUV9jo4sffrwlg8s0zDhP0T2WD3pru5Xi0+HTE3zTUmBaZNhfkite9PdSJwdXLwPVW0jnAHT56pZHIOYckPEiw==
 
-type-fest@^0.11.0:
-  version "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.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.20.2:
+  version "0.20.2"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.20.2.tgz#1bf207f4b28f91583666cb5fbd327887301cd5f4"
+  integrity sha512-Ne+eE4r0/iWnpAxD852z3A+N0Bt5RN//NjJwRd2VFHEmrywxf5vsZlh4R6lixl6B+wz/8d+maTSAkN1FIkI3LQ==
+
+type-fest@^0.21.3:
+  version "0.21.3"
+  resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.21.3.tgz#d260a24b0198436e133fa26a524a6d65fa3b2e37"
+  integrity sha512-t0rzBq87m3fVcduHDUFhKmyyX+9eo6WQjZvf51Ea/M0Q7+T374Jp1aUiyUl0GKxp8M/OETVHSDvmkyPgvX+X2w==
+
 type-fest@^0.6.0:
   version "0.6.0"
   resolved "https://registry.yarnpkg.com/type-fest/-/type-fest-0.6.0.tgz#8d2a2370d3df886eb5c90ada1c5bf6188acf838b"
@@ -12077,39 +11726,49 @@ type@^1.0.1:
   integrity sha512-+5nt5AAniqsCnu2cEQQdpzCAh33kVx8n0VoFidKpB1dVVLAN/F+bgVOqOJqOnEnrhp222clB5p3vUlD+1QAnfg==
 
 type@^2.0.0:
-  version "2.2.0"
-  resolved "https://registry.yarnpkg.com/type/-/type-2.2.0.tgz#3edd448793f517d8b9dd108b486a043f5befd91f"
-  integrity sha512-M/u37b4oSGlusaU8ZB96BfFPWQ8MbsZYXB+kXGMiDj6IKinkcNaQvmirBuWj8mAXqP6LYn1rQvbTYum3yPhaOA==
+  version "2.5.0"
+  resolved "https://registry.yarnpkg.com/type/-/type-2.5.0.tgz#0a2e78c2e77907b252abe5f298c1b01c63f0db3d"
+  integrity sha512-180WMDQaIMm3+7hGXWf12GtdniDEy7nYcyFMKJn/eZz/6tSLXrUN9V0wKSbMjej0I1WHWbpREDEKHtqPQa9NNw==
 
-typed-graphqlify@^2.3.0:
-  version "2.4.5"
-  resolved "https://registry.yarnpkg.com/typed-graphqlify/-/typed-graphqlify-2.4.5.tgz#e881f8a90911c32aec76a112e8e5077ead36e151"
-  integrity sha512-0iD2WkYmdxsTS2TGchnrY+vuSZHrTkj2i/Pa3UKTNPdrig5bV2f8UpGEfQ4Gq8pp3Vd9esqGIVgjC7hYR6OsOg==
+typed-graphqlify@^3.1.1:
+  version "3.1.3"
+  resolved "https://registry.yarnpkg.com/typed-graphqlify/-/typed-graphqlify-3.1.3.tgz#6a8aea57d277a88e7d1934fc2120536c3bb18435"
+  integrity sha512-xLUvbyJf5qIPYj0hNijOVhKuBjXJ4apjOVGWGW33Sjj20MApp6EBImPNz+uuHukduHrdtawt1/6XJdb4oixZVQ==
 
 typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
   integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c=
 
-typescript@4.2.4, typescript@~4.2.4:
-  version "4.2.4"
-  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.2.4.tgz#8610b59747de028fda898a8aef0e103f156d0961"
-  integrity sha512-V+evlYHZnQkaz8TRBuxTA92yZBPotr5H+WhQ7bD3hZUndx5tGOa1fuCgeSjxAzM1RiN5IzvadIXTVefuuwZCRg==
+typescript@4.3.5, typescript@~4.3.5:
+  version "4.3.5"
+  resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.3.5.tgz#4d1c37cc16e893973c45a06886b7113234f119f4"
+  integrity sha512-DqQgihaQ9cUrskJo9kIyW/+g0Vxsk8cDtZ52a3NGh0YNTfpUSArXSohyUGnvbPazEPLu398C0UxmKSOrPumUzA==
 
-ua-parser-js@^0.7.23:
-  version "0.7.24"
-  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.24.tgz#8d3ecea46ed4f1f1d63ec25f17d8568105dc027c"
-  integrity sha512-yo+miGzQx5gakzVK3QFfN0/L9uVhosXBBO7qmnk7c2iw1IhL212wfA3zbnI54B0obGwC/5NWub/iT9sReMx+Fw==
+ua-parser-js@^0.7.28:
+  version "0.7.28"
+  resolved "https://registry.yarnpkg.com/ua-parser-js/-/ua-parser-js-0.7.28.tgz#8ba04e653f35ce210239c64661685bf9121dec31"
+  integrity sha512-6Gurc1n//gjp9eQNXjD9O3M/sMwVtN5S8Lv9bvOYBfKfDNiIIhqiyi01vMBO45u4zkDE420w/e0se7Vs+sIg+g==
 
 uglify-js@^3.1.4:
-  version "3.12.8"
-  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.12.8.tgz#a82e6e53c9be14f7382de3d068ef1e26e7d4aaf8"
-  integrity sha512-fvBeuXOsvqjecUtF/l1dwsrrf5y2BCUk9AOJGzGcm6tE7vegku5u/YvqjyDaAGr422PLoLnrxg3EnRvTqsdC1w==
+  version "3.14.0"
+  resolved "https://registry.yarnpkg.com/uglify-js/-/uglify-js-3.14.0.tgz#2d723a0afee81e0d08db9354a9c277006e942386"
+  integrity sha512-R/tiGB1ZXp2BC+TkRGLwj8xUZgdfT2f4UZEgX6aVjJ5uttPrr4fYmwTWDGqVnBCLbOXRMY6nr/BTbwCtVfps0g==
 
-unbzip2-stream@^1.3.3:
-  version "1.4.3"
-  resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.4.3.tgz#b0da04c4371311df771cdc215e87f2130991ace7"
-  integrity sha512-mlExGW4w71ebDJviH16lQLtZS32VKqsSfk80GCfUlwT/4/hNRFsoscrF/c++9xinkMzECL1uL9DDwXqFWkruPg==
+unbox-primitive@^1.0.1:
+  version "1.0.1"
+  resolved "https://registry.yarnpkg.com/unbox-primitive/-/unbox-primitive-1.0.1.tgz#085e215625ec3162574dc8859abee78a59b14471"
+  integrity sha512-tZU/3NqK3dA5gpE1KtyiJUrEB0lxnGkMFHptJ7q6ewdZ8s12QrODwNbhIJStmJkd1QDXa1NRA8aF2A1zk/Ypyw==
+  dependencies:
+    function-bind "^1.1.1"
+    has-bigints "^1.0.1"
+    has-symbols "^1.0.2"
+    which-boxed-primitive "^1.0.2"
+
+unbzip2-stream@1.3.3:
+  version "1.3.3"
+  resolved "https://registry.yarnpkg.com/unbzip2-stream/-/unbzip2-stream-1.3.3.tgz#d156d205e670d8d8c393e1c02ebd506422873f6a"
+  integrity sha512-fUlAF7U9Ah1Q6EieQ4x4zLNejrRvDWUYmxXUpN3uziFYCHapjWFaCAnreY9bGgxzaMCFAPPpYNng57CypwJVhg==
   dependencies:
     buffer "^5.2.1"
     through "^2.3.8"
@@ -12179,12 +11838,13 @@ unique-slug@^2.0.0:
   dependencies:
     imurmurhash "^0.1.4"
 
-universal-user-agent@^3.0.0:
-  version "3.0.0"
-  resolved "https://registry.yarnpkg.com/universal-user-agent/-/universal-user-agent-3.0.0.tgz#4cc88d68097bffd7ac42e3b7c903e7481424b4b9"
-  integrity sha512-T3siHThqoj5X0benA5H0qcDnrKGXzU8TKoX15x/tQHw1hQBvIEBHjxQ2klizYsqBOO/Q+WuxoQUihadeeqDnoA==
+universal-github-app-jwt@^1.0.1:
+  version "1.1.0"
+  resolved "https://registry.yarnpkg.com/universal-github-app-jwt/-/universal-github-app-jwt-1.1.0.tgz#0abaa876101cdf1d3e4c546be2768841c0c1b514"
+  integrity sha512-3b+ocAjjz4JTyqaOT+NNBd5BtTuvJTxWElIoeHSVelUV9J3Jp7avmQTdLKCaoqi/5Ox2o/q+VK19TJ233rVXVQ==
   dependencies:
-    os-name "^3.0.0"
+    "@types/jsonwebtoken" "^8.3.3"
+    jsonwebtoken "^8.5.1"
 
 universal-user-agent@^6.0.0:
   version "6.0.0"
@@ -12206,11 +11866,6 @@ unpipe@1.0.0, unpipe@~1.0.0:
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"
   integrity sha1-sr9O6FFKrmFltIF4KdIbLvSZBOw=
 
-unquote@~1.1.1:
-  version "1.1.1"
-  resolved "https://registry.yarnpkg.com/unquote/-/unquote-1.1.1.tgz#8fded7324ec6e88a0ff8b905e7c098cdc086d544"
-  integrity sha1-j97XMk7G6IoP+LkF58CYzcCG1UQ=
-
 unset-value@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unset-value/-/unset-value-1.0.0.tgz#8376873f7d2335179ffb1e6fc3a8ed0dfc8ab559"
@@ -12232,28 +11887,23 @@ uri-js@^4.2.2:
     punycode "^2.1.0"
 
 urijs@^1.19.1:
-  version "1.19.6"
-  resolved "https://registry.yarnpkg.com/urijs/-/urijs-1.19.6.tgz#51f8cb17ca16faefb20b9a31ac60f84aa2b7c870"
-  integrity sha512-eSXsXZ2jLvGWeLYlQA3Gh36BcjF+0amo92+wHPyN1mdR8Nxf75fuEuYTd9c0a+m/vhCjRK0ESlE9YNLW+E1VEw==
+  version "1.19.7"
+  resolved "https://registry.yarnpkg.com/urijs/-/urijs-1.19.7.tgz#4f594e59113928fea63c00ce688fb395b1168ab9"
+  integrity sha512-Id+IKjdU0Hx+7Zx717jwLPsPeUqz7rAtuVBRLLs+qn+J2nf9NGITWVCxcijgYxBqe83C7sqsQPs6H1pyz3x9gA==
 
 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.7:
-  version "1.4.7"
-  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.4.7.tgz#a8a83535e8c00a316e403a5db4ac1b9b853ae278"
-  integrity sha512-d3uaVyzDB9tQoSXFvuSUNFibTd9zxd2bkVrDRvF5TmvWWQwqE4lgYJ5m+x1DbecWkw+LK4RNl2CU1hHuOKPVlg==
+url-parse@^1.4.3, url-parse@^1.5.1:
+  version "1.5.3"
+  resolved "https://registry.yarnpkg.com/url-parse/-/url-parse-1.5.3.tgz#71c1303d38fb6639ade183c2992c8cc0686df862"
+  integrity sha512-IIORyIQD9rvj0A4CLWsHkBBJuNqWpFQe224b6j9t/ABmquIS0qDU2pY6kl6AuOrL5OkCXHMCFNe1jBcuAggjvQ==
   dependencies:
     querystringify "^2.1.1"
     requires-port "^1.0.0"
 
-url-template@^2.0.8:
-  version "2.0.8"
-  resolved "https://registry.yarnpkg.com/url-template/-/url-template-2.0.8.tgz#fc565a3cccbff7730c775f5641f9555791439f21"
-  integrity sha1-/FZaPMy/93MMd19WQflVV5FDnyE=
-
 url@^0.11.0:
   version "0.11.0"
   resolved "https://registry.yarnpkg.com/url/-/url-0.11.0.tgz#3838e97cfc60521eb73c525a8e55bfdd9e2e28f1"
@@ -12277,22 +11927,12 @@ util-extend@^1.0.1:
   resolved "https://registry.yarnpkg.com/util-extend/-/util-extend-1.0.3.tgz#a7c216d267545169637b3b6edc6ca9119e2ff93f"
   integrity sha1-p8IW0mdUUWljeztu3GypEZ4v+T8=
 
-util.promisify@~1.0.0:
-  version "1.0.1"
-  resolved "https://registry.yarnpkg.com/util.promisify/-/util.promisify-1.0.1.tgz#6baf7774b80eeb0f7520d8b81d07982a59abbaee"
-  integrity sha512-g9JpC/3He3bm38zsLupWryXHoEcS22YHthuPQSJdMy6KNrzIRzWqcsHzD/WUnqe45whVou4VIsPew37DoXWNrA==
-  dependencies:
-    define-properties "^1.1.3"
-    es-abstract "^1.17.2"
-    has-symbols "^1.0.1"
-    object.getownpropertydescriptors "^2.1.0"
-
 utils-merge@1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/utils-merge/-/utils-merge-1.0.1.tgz#9f95710f50a267947b2ccc124741c1028427e713"
   integrity sha1-n5VxD1CiZ5R7LMwSR0HBAoQn5xM=
 
-uuid@8.3.2:
+uuid@8.3.2, 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==
@@ -12302,10 +11942,15 @@ uuid@^3.3.2, uuid@^3.4.0:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
   integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
 
+v8-compile-cache@^2.0.3:
+  version "2.3.0"
+  resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.3.0.tgz#2de19618c66dc247dcfb6f99338035d8245a2cee"
+  integrity sha512-l8lCEmLcLYZh4nbunNZvQCJc5pv7+RCwa8q/LdUx8u7lsWvPDKmpodJAJNwkAhJC//dFY48KuIEmjtd4RViDrA==
+
 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==
+  version "7.1.2"
+  resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-7.1.2.tgz#30898d1a7fa0c84d225a2c1434fb958f290883c1"
+  integrity sha512-TxNb7YEUwkLXCQYeudi6lgQ/SZrzNO4kMdlqVxaZPUIUjCv6iSSypUQX70kNBSERpQ8fk48+d61FXk+tgqcWow==
   dependencies:
     "@types/istanbul-lib-coverage" "^2.0.1"
     convert-source-map "^1.6.0"
@@ -12326,17 +11971,22 @@ validate-npm-package-name@^3.0.0:
   dependencies:
     builtins "^1.0.3"
 
-validator@13.5.2:
-  version "13.5.2"
-  resolved "https://registry.yarnpkg.com/validator/-/validator-13.5.2.tgz#c97ae63ed4224999fb6f42c91eaca9567fe69a46"
-  integrity sha512-mD45p0rvHVBlY2Zuy3F3ESIe1h5X58GPfAtslBjY7EtTqGquZTj+VX/J4RnHWN8FKq0C9WRVt1oWAcytWRuYLQ==
+validator@13.6.0:
+  version "13.6.0"
+  resolved "https://registry.yarnpkg.com/validator/-/validator-13.6.0.tgz#1e71899c14cdc7b2068463cb24c1cc16f6ec7059"
+  integrity sha512-gVgKbdbHgtxpRyR8K0O6oFZPhhB5tT1jeEHZR0Znr9Svg03U0+r9DXWMrnRAB+HtCStDQKlaIZm42tVsVjqtjg==
+
+validator@^8.0.0:
+  version "8.2.0"
+  resolved "https://registry.yarnpkg.com/validator/-/validator-8.2.0.tgz#3c1237290e37092355344fef78c231249dab77b9"
+  integrity sha512-Yw5wW34fSv5spzTXNkokD6S6/Oq92d8q/t14TqsS3fAiA1RYnxSFSIZ+CY3n6PGGRCq5HhJTSepQvFUS2QUDxA==
 
 vary@^1, vary@~1.1.2:
   version "1.1.2"
   resolved "https://registry.yarnpkg.com/vary/-/vary-1.1.2.tgz#2299f02c6ded30d4a5961b0b9f74524a18f634fc"
   integrity sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=
 
-vendors@^1.0.0, vendors@^1.0.3:
+vendors@^1.0.3:
   version "1.0.4"
   resolved "https://registry.yarnpkg.com/vendors/-/vendors-1.0.4.tgz#e2b800a53e7a29b93506c3cf41100d16c4c4ad8e"
   integrity sha512-/juG65kTL4Cy2su4P8HjtkTxk6VmJDiOPBufWniqQ6wknac6jNiXS9vU+hO3wgusiyqWlzTbVHi0dyJqRONg3w==
@@ -12367,49 +12017,50 @@ verdaccio-htpasswd@10.0.0:
     http-errors "1.8.0"
     unix-crypt-td-js "1.1.4"
 
-verdaccio@5.0.1:
-  version "5.0.1"
-  resolved "https://registry.yarnpkg.com/verdaccio/-/verdaccio-5.0.1.tgz#d9d598fa7a1256e2cc1b2be8b417716d75771870"
-  integrity sha512-Qn5PZhXi4JBHUQZZgNS5s1V7CtmORkFIyZ8kLqccoxOwLObYAv3k4LthpTosoRBEC1FGqbg+HTHR0OnUDj26Fw==
+verdaccio@5.1.2:
+  version "5.1.2"
+  resolved "https://registry.yarnpkg.com/verdaccio/-/verdaccio-5.1.2.tgz#d8bc0792302cd08af16184828ad71f51e2a8b7bd"
+  integrity sha512-Cyi1frVJEzl75q34CrYHOo0bT7KwUSoV/b17J8NnJo47CbF5SUF/Y+qX46ZFhf4eQzipVYBkgMfI6khjvjpWSg==
   dependencies:
     "@verdaccio/commons-api" "10.0.0"
-    "@verdaccio/local-storage" "10.0.1"
+    "@verdaccio/local-storage" "10.0.6"
     "@verdaccio/readme" "10.0.0"
     "@verdaccio/streams" "10.0.0"
-    "@verdaccio/ui-theme" "3.0.1"
+    "@verdaccio/ui-theme" "3.1.0"
     JSONStream "1.3.5"
     async "3.2.0"
     body-parser "1.19.0"
-    clipanion "3.0.0-rc.11"
+    clipanion "3.0.0"
     compression "1.7.4"
     cookies "0.8.0"
     cors "2.8.5"
-    dayjs "1.10.4"
-    debug "^4.3.1"
-    envinfo "7.7.4"
+    dayjs "1.10.6"
+    debug "^4.3.2"
+    envinfo "7.8.1"
+    eslint-import-resolver-node "0.3.4"
     express "4.17.1"
-    fast-safe-stringify "^2.0.7"
+    fast-safe-stringify "^2.0.8"
     handlebars "4.7.7"
     http-errors "1.8.0"
-    js-yaml "4.0.0"
+    js-yaml "4.1.0"
     jsonwebtoken "8.5.1"
     kleur "4.1.4"
     lodash "4.17.21"
     lru-cache "6.0.0"
     lunr-mutable-indexes "2.3.2"
-    marked "2.0.1"
+    marked "2.1.3"
     memoizee "0.4.15"
     mime "2.5.2"
     minimatch "3.0.4"
     mkdirp "1.0.4"
     mv "2.1.1"
-    pino "6.11.2"
+    pino "6.12.0"
     pkginfo "0.4.1"
-    prettier-bytes "^1.0.3"
-    pretty-ms "^5.0.0"
+    prettier-bytes "^1.0.4"
+    pretty-ms "^7.0.1"
     request "2.88.0"
-    semver "7.3.4"
-    validator "13.5.2"
+    semver "7.3.5"
+    validator "13.6.0"
     verdaccio-audit "10.0.0"
     verdaccio-htpasswd "10.0.0"
 
@@ -12448,10 +12099,10 @@ w3c-xmlserializer@^1.1.2:
     webidl-conversions "^4.0.2"
     xml-name-validator "^3.0.0"
 
-watchpack@^2.0.0:
-  version "2.1.1"
-  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.1.1.tgz#e99630550fca07df9f90a06056987baa40a689c7"
-  integrity sha512-Oo7LXCmc1eE1AjyuSBmtC3+Wy4HcV8PxWh2kP6fOl8yTlNS7r0K9l1ao2lrrUza7V39Y3D/BbJgY8VeSlc5JKw==
+watchpack@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/watchpack/-/watchpack-2.2.0.tgz#47d78f5415fe550ecd740f99fe2882323a58b1ce"
+  integrity sha512-up4YAn/XHgZHIxFBVCdlMiWDj6WaLKpwVeGQk2I5thdYxF/KmF0aaz6TfJZ/hfl1h/XlcDr7k1KH7ThDagpFaA==
   dependencies:
     glob-to-regexp "^0.4.1"
     graceful-fs "^4.1.2"
@@ -12500,15 +12151,15 @@ 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@4.1.0:
-  version "4.1.0"
-  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-4.1.0.tgz#f0c1f12ff4cd855b3b5eec89ee0f69bcc5336364"
-  integrity sha512-mpa/FY+DiBu5+r5JUIyTCYWRfkWgyA3/OOE9lwfzV9S70A4vJYLsVRKj5rMFEsezBroy2FmPyQ8oBRVW8QmK1A==
+webpack-dev-middleware@5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/webpack-dev-middleware/-/webpack-dev-middleware-5.0.0.tgz#0abe825275720e0a339978aea5f0b03b140c1584"
+  integrity sha512-9zng2Z60pm6A98YoRcA0wSxw1EYn7B7y5owX/Tckyt9KGyULTkLtiavjaXlWqOMkM0YtqGgL3PvMOFgyFLq8vw==
   dependencies:
-    colorette "^1.2.1"
-    mem "^8.0.0"
-    memfs "^3.2.0"
-    mime-types "^2.1.28"
+    colorette "^1.2.2"
+    mem "^8.1.1"
+    memfs "^3.2.2"
+    mime-types "^2.1.31"
     range-parser "^1.2.1"
     schema-utils "^3.0.0"
 
@@ -12523,12 +12174,12 @@ webpack-dev-middleware@^3.7.2:
     range-parser "^1.2.1"
     webpack-log "^2.0.0"
 
-webpack-dev-server@3.11.2:
-  version "3.11.2"
-  resolved "https://registry.yarnpkg.com/webpack-dev-server/-/webpack-dev-server-3.11.2.tgz#695ebced76a4929f0d5de7fd73fafe185fe33708"
-  integrity sha512-A80BkuHRQfCiNtGBS1EMf2ChTUs0x+B3wGDFmOeT4rmJOHhHTCH2naNxIHhmkr0/UillP4U3yeIyv1pNp+QDLQ==
+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"
@@ -12570,15 +12221,15 @@ webpack-log@^2.0.0:
     ansi-colors "^3.0.0"
     uuid "^3.3.2"
 
-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==
+webpack-merge@5.8.0:
+  version "5.8.0"
+  resolved "https://registry.yarnpkg.com/webpack-merge/-/webpack-merge-5.8.0.tgz#2b39dbf22af87776ad744c390223731d30a68f61"
+  integrity sha512-/SaI7xY0831XwP6kzuwhKWVKDP9t1QY1h65lAFLbZqMPIuYcD9QAW4u9STIbU9kaJbPBB/geU/gLr1wDjOhQ+Q==
   dependencies:
     clone-deep "^4.0.1"
     wildcard "^2.0.0"
 
-webpack-sources@^1.1.0, webpack-sources@^1.2.0, webpack-sources@^1.3.0, webpack-sources@^1.4.3:
+webpack-sources@^1.2.0, webpack-sources@^1.3.0:
   version "1.4.3"
   resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-1.4.3.tgz#eedd8ec0b928fbf1cbfe994e22d2d890f330a933"
   integrity sha512-lgTS3Xhv1lCOKo7SA5TjKXMjpSM4sBjNV5+q2bqesbSPs5FjGmU6jjtBSkX9b4qW87vDIsCIlUPOEhbZrMdjeQ==
@@ -12586,13 +12237,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-sources@^2.1.1:
-  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"
+webpack-sources@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/webpack-sources/-/webpack-sources-3.2.0.tgz#b16973bcf844ebcdb3afde32eda1c04d0b90f89d"
+  integrity sha512-fahN08Et7P9trej8xz/Z7eRu8ltyiygEo/hnRi9KqBUs80KeDcnf96ZJo++ewWd84fEf3xSX9bp4ZS9hbw0OBw==
 
 webpack-subresource-integrity@1.5.2:
   version "1.5.2"
@@ -12601,51 +12249,23 @@ webpack-subresource-integrity@1.5.2:
   dependencies:
     webpack-sources "^1.3.0"
 
-webpack@5.32.0:
-  version "5.32.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.32.0.tgz#f013932d778dad81bd51292d0ea00865056dc22c"
-  integrity sha512-jB9PrNMFnPRiZGnm/j3qfNqJmP3ViRzkuQMIf8za0dgOYvSLi/cgA+UEEGvik9EQHX1KYyGng5PgBTTzGrH9xg==
-  dependencies:
-    "@types/eslint-scope" "^3.7.0"
-    "@types/estree" "^0.0.46"
-    "@webassemblyjs/ast" "1.11.0"
-    "@webassemblyjs/wasm-edit" "1.11.0"
-    "@webassemblyjs/wasm-parser" "1.11.0"
-    acorn "^8.0.4"
-    browserslist "^4.14.5"
-    chrome-trace-event "^1.0.2"
-    enhanced-resolve "^5.7.0"
-    es-module-lexer "^0.4.0"
-    eslint-scope "^5.1.1"
-    events "^3.2.0"
-    glob-to-regexp "^0.4.1"
-    graceful-fs "^4.2.4"
-    json-parse-better-errors "^1.0.2"
-    loader-runner "^4.2.0"
-    mime-types "^2.1.27"
-    neo-async "^2.6.2"
-    schema-utils "^3.0.0"
-    tapable "^2.1.1"
-    terser-webpack-plugin "^5.1.1"
-    watchpack "^2.0.0"
-    webpack-sources "^2.1.1"
-
-webpack@^5:
-  version "5.31.0"
-  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.31.0.tgz#fab61d0be896feca4af87bdad5c18815c0d63455"
-  integrity sha512-3fUfZT/FUuThWSSyL32Fsh7weUUfYP/Fjc/cGSbla5KiSo0GtI1JMssCRUopJTvmLjrw05R2q7rlLtiKdSzkzQ==
+webpack@5.50.0, webpack@^5.1.0:
+  version "5.50.0"
+  resolved "https://registry.yarnpkg.com/webpack/-/webpack-5.50.0.tgz#5562d75902a749eb4d75131f5627eac3a3192527"
+  integrity sha512-hqxI7t/KVygs0WRv/kTgUW8Kl3YC81uyWQSo/7WUs5LsuRw0htH/fCwbVBGCuiX/t4s7qzjXFcf41O8Reiypag==
   dependencies:
     "@types/eslint-scope" "^3.7.0"
-    "@types/estree" "^0.0.46"
-    "@webassemblyjs/ast" "1.11.0"
-    "@webassemblyjs/wasm-edit" "1.11.0"
-    "@webassemblyjs/wasm-parser" "1.11.0"
-    acorn "^8.0.4"
+    "@types/estree" "^0.0.50"
+    "@webassemblyjs/ast" "1.11.1"
+    "@webassemblyjs/wasm-edit" "1.11.1"
+    "@webassemblyjs/wasm-parser" "1.11.1"
+    acorn "^8.4.1"
+    acorn-import-assertions "^1.7.6"
     browserslist "^4.14.5"
     chrome-trace-event "^1.0.2"
-    enhanced-resolve "^5.7.0"
-    es-module-lexer "^0.4.0"
-    eslint-scope "^5.1.1"
+    enhanced-resolve "^5.8.0"
+    es-module-lexer "^0.7.1"
+    eslint-scope "5.1.1"
     events "^3.2.0"
     glob-to-regexp "^0.4.1"
     graceful-fs "^4.2.4"
@@ -12653,11 +12273,11 @@ webpack@^5:
     loader-runner "^4.2.0"
     mime-types "^2.1.27"
     neo-async "^2.6.2"
-    schema-utils "^3.0.0"
+    schema-utils "^3.1.0"
     tapable "^2.1.1"
-    terser-webpack-plugin "^5.1.1"
-    watchpack "^2.0.0"
-    webpack-sources "^2.1.1"
+    terser-webpack-plugin "^5.1.3"
+    watchpack "^2.2.0"
+    webpack-sources "^3.2.0"
 
 websocket-driver@>=0.5.1, websocket-driver@^0.7.4:
   version "0.7.4"
@@ -12681,9 +12301,9 @@ whatwg-encoding@^1.0.1, whatwg-encoding@^1.0.5:
     iconv-lite "0.4.24"
 
 whatwg-fetch@>=0.10.0:
-  version "3.5.0"
-  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.5.0.tgz#605a2cd0a7146e5db141e29d1c62ab84c0c4c868"
-  integrity sha512-jXkLtsR42xhXg7akoDKvKWE40eJeI+2KZqcp2h3NsOrRnDvtWX36KcKl30dy+hxECivdk2BVUHVNrPtoMBUx6A==
+  version "3.6.2"
+  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-3.6.2.tgz#dced24f37f2624ed0281725d51d0e2e3fe677f8c"
+  integrity sha512-bJlen0FcuU/0EMLrdbJ7zOnW6ITZLrZMIarMUVmdKtsGvZna8vxKYaexICWPfZ8qwf9fzNq+UEIZrnSaApt6RA==
 
 whatwg-mimetype@^2.2.0, whatwg-mimetype@^2.3.0:
   version "2.3.0"
@@ -12699,6 +12319,17 @@ whatwg-url@^7.0.0:
     tr46 "^1.0.1"
     webidl-conversions "^4.0.2"
 
+which-boxed-primitive@^1.0.2:
+  version "1.0.2"
+  resolved "https://registry.yarnpkg.com/which-boxed-primitive/-/which-boxed-primitive-1.0.2.tgz#13757bc89b209b049fe5d86430e21cf40a89a8e6"
+  integrity sha512-bwZdv0AKLpplFY2KZRX6TvyuN7ojjr7lwkg6ml0roIy9YeuSr7JS372qlNW18UQYzgYK9ziGcerWqZOmEn9VNg==
+  dependencies:
+    is-bigint "^1.0.1"
+    is-boolean-object "^1.1.0"
+    is-number-object "^1.0.4"
+    is-string "^1.0.5"
+    is-symbol "^1.0.3"
+
 which-module@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/which-module/-/which-module-2.0.0.tgz#d9ef07dce77b9902b8a3a8fa4b31c3e3f7e6e87a"
@@ -12718,26 +12349,19 @@ which@^2.0.1, which@^2.0.2:
   dependencies:
     isexe "^2.0.0"
 
-wide-align@^1.1.0:
-  version "1.1.3"
-  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.3.tgz#ae074e6bdc0c14a431e804e624549c633b000457"
-  integrity sha512-QGkOQc8XL6Bt5PwnsExKBPuMKBxnGxWWW3fU55Xt4feHozMUhdUMaBCk290qpm/wG5u/RSKzwdAC4i51YigihA==
+wide-align@^1.1.2:
+  version "1.1.5"
+  resolved "https://registry.yarnpkg.com/wide-align/-/wide-align-1.1.5.tgz#df1d4c206854369ecf3c9a4898f1b23fbd9d15d3"
+  integrity sha512-eDMORYaPNZ4sQIuuYPDHdQvf4gyCF9rEEV/yPxGfwPkRodwEgiMUUXTx/dex+Me0wxx53S+NgUHaP7y3MGlDmg==
   dependencies:
-    string-width "^1.0.2 || 2"
+    string-width "^1.0.2 || 2 || 3 || 4"
 
 wildcard@^2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/wildcard/-/wildcard-2.0.0.tgz#a77d20e5200c6faaac979e4b3aadc7b3dd7f8fec"
   integrity sha512-JcKqAHLPxcdb9KM49dufGXn2x3ssnfjbcaQdLlfZsL9rH9wgDQjUtDxbo8NE0F6SFvydeu1VhZe7hZuHsB2/pw==
 
-windows-release@^3.1.0:
-  version "3.3.3"
-  resolved "https://registry.yarnpkg.com/windows-release/-/windows-release-3.3.3.tgz#1c10027c7225743eec6b89df160d64c2e0293999"
-  integrity sha512-OSOGH1QYiW5yVor9TtmXKQvt2vjQqbYS+DqmsZw+r7xDwLXEeT3JGW0ZppFmHx4diyXmxt238KFR3N9jzevBRg==
-  dependencies:
-    execa "^1.0.0"
-
-word-wrap@~1.2.3:
+word-wrap@^1.2.3, word-wrap@~1.2.3:
   version "1.2.3"
   resolved "https://registry.yarnpkg.com/word-wrap/-/word-wrap-1.2.3.tgz#610636f6b1f703891bd34771ccb17fb93b47079c"
   integrity sha512-Hz/mrNwitNRh/HUAtM/VT/5VH+ygD6DV7mYKZAtHOrbs8U7lvPS6xf7EJKMF0uW1KJCl0H701g3ZGus+muE5vQ==
@@ -12779,17 +12403,22 @@ wrappy@1:
   resolved "https://registry.yarnpkg.com/wrappy/-/wrappy-1.0.2.tgz#b5243d8f3ec1aa35f1364605bc0d1036e30ab69f"
   integrity sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=
 
+ws@7.4.6, ws@~7.4.2:
+  version "7.4.6"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.6.tgz#5654ca8ecdeee47c33a9a4bf6d28e2be2980377c"
+  integrity sha512-YmhHDO4MzaDLB+M9ym/mDA5z0naX8j7SIlT8f8z+I0VtzsRbekxEutHSme7NPS2qE8StCYQNUnfWdXta/Yu85A==
+
 ws@^6.2.1:
-  version "6.2.1"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.1.tgz#442fdf0a47ed64f59b6a5d8ff130f4748ed524fb"
-  integrity sha512-GIyAXC2cB7LjvpgMt9EKS2ldqr0MTrORaleiOno6TweZ6r3TKtoFQWay/2PceJ3RuBasOHzXNn5Lrw1X0bEjqA==
+  version "6.2.2"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-6.2.2.tgz#dd5cdbd57a9979916097652d78f1cc5faea0c32e"
+  integrity sha512-zmhltoSR8u1cnDsD43TX59mzoMZsLKqUweyYBAIvTngR3shc0W6aOZylZmq/7hqyVxPdi+5Ud2QInblgyE72fw==
   dependencies:
     async-limiter "~1.0.0"
 
-ws@^7.0.0, ws@^7.2.3, ws@~7.4.2:
-  version "7.4.3"
-  resolved "https://registry.yarnpkg.com/ws/-/ws-7.4.3.tgz#1f9643de34a543b8edb124bdcbc457ae55a6e5cd"
-  integrity sha512-hr6vCR76GsossIRsr8OLR9acVVm1jyfEWvhbNjtgPOrfvAlKzvyeg/P6r8RuDjRyrcQoPQT7K0DGEPc7Ae6jzA==
+ws@^7.0.0:
+  version "7.5.3"
+  resolved "https://registry.yarnpkg.com/ws/-/ws-7.5.3.tgz#160835b63c7d97bfab418fc1b8a9fced2ac01a74"
+  integrity sha512-kQ/dHIzuLrS6Je9+uv81ueZomEwH0qVYstcAQ4/Z93K8zeko9gtAbttJWzoC5ukqXY1PpoouV3+VSOqEAFt5wg==
 
 xhr2@^0.2.0:
   version "0.2.1"
@@ -12819,17 +12448,17 @@ xmlchars@^2.1.1:
   resolved "https://registry.yarnpkg.com/xmlchars/-/xmlchars-2.2.0.tgz#060fe1bcb7f9c76fe2a17db86a9bc3ab894210cb"
   integrity sha512-JZnDKK8B0RCDw84FNdDAIpZK+JuJw+s7Lz8nksI7SIuU3UXJJslUthsi+uWBUYOwPFwW7W7PRLRfUKpxjtjFCw==
 
-xmldom@^0.1.22:
-  version "0.1.31"
-  resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.1.31.tgz#b76c9a1bd9f0a9737e5a72dc37231cf38375e2ff"
-  integrity sha512-yS2uJflVQs6n+CyjHoaBmVSqIDevTAWrzMmjG1Gc7h1qQ7uVozNhEPJAwZXWyGQ/Gafo3fCwrcaokezLPupVyQ==
+xmldom@^0.5.0:
+  version "0.5.0"
+  resolved "https://registry.yarnpkg.com/xmldom/-/xmldom-0.5.0.tgz#193cb96b84aa3486127ea6272c4596354cb4962e"
+  integrity sha512-Foaj5FXVzgn7xFzsKeNIde9g6aFBxTPi37iwsno8QvApmtg7KYrr+OPyRHcJF7dud2a5nGRBXK3n0dL62Gf7PA==
 
 xtend@~4.0.1:
   version "4.0.2"
   resolved "https://registry.yarnpkg.com/xtend/-/xtend-4.0.2.tgz#bb72779f5fa465186b1f438f674fa347fdb5db54"
   integrity sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==
 
-xxhashjs@0.2.2:
+xxhashjs@~0.2.2:
   version "0.2.2"
   resolved "https://registry.yarnpkg.com/xxhashjs/-/xxhashjs-0.2.2.tgz#8a6251567621a1c46a5ae204da0249c7f8caa9d8"
   integrity sha512-AkTuIuVTET12tpsVIQo+ZU6f/qDmKuRUcjaqR+OIvm+aCBsZ95i7UVY5WJ9TMsSaZ0DA2WxoZ4acu0sPH+OKAw==
@@ -12837,24 +12466,24 @@ xxhashjs@0.2.2:
     cuint "^0.2.2"
 
 y18n@^4.0.0:
-  version "4.0.1"
-  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.1.tgz#8db2b83c31c5d75099bb890b23f3094891e247d4"
-  integrity sha512-wNcy4NvjMYL8gogWWYAO7ZFWFfHcbdbE57tZO8e4cbpj8tfUcwrwqSl3ad8HxpYWCdXcJUCeKKZS62Av1affwQ==
+  version "4.0.3"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-4.0.3.tgz#b5f259c82cd6e336921efd7bfd8bf560de9eeedf"
+  integrity sha512-JKhqTOwSrqNA1NY5lSztJ1GrBiUodLMmIZuLiDaMRJ+itFd+ABVE8XBjOvIWL+rSqNDC74LCSFmlb/U4UZ4hJQ==
 
 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==
+  version "5.0.8"
+  resolved "https://registry.yarnpkg.com/y18n/-/y18n-5.0.8.tgz#7f4934d0f7ca8c56f95314939ddcd2dd91ce1d55"
+  integrity sha512-0pfFzegeDWJHJIAmTLRP2DwHjdF5s7jo9tuztdQxAhINCdvS+3nGINqPd00AphqJR/0LhANUS6/+7SCb98YOfA==
 
 yallist@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/yallist/-/yallist-4.0.0.tgz#9bb92790d9c0effec63be73519e11a35019a3a72"
   integrity sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==
 
-yaml@^1.10.0, yaml@^1.5.0:
-  version "1.10.0"
-  resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.0.tgz#3b593add944876077d4d683fee01081bd9fff31e"
-  integrity sha512-yr2icI4glYaNG+KWONODapy2/jDdMSDnrONSjblABjD9B4Z5LgiircSt8m8sRZFNi08kG9Sm0uSHtEmP3zaEGg==
+yaml@^1.10.0, yaml@^1.10.2, yaml@^1.5.0:
+  version "1.10.2"
+  resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.2.tgz#2301c5ffbf12b467de8da2333a459e29e7920e4b"
+  integrity sha512-r3vXyErRCYJ7wg28yvBY5VSoAF8ZvlcW9/BwUzEtUsjvX/DKs24dIkuwjtuprwJJHsbyUbLApepYTR1BN4uHrg==
 
 yargs-parser@^13.1.2:
   version "13.1.2"
@@ -12872,15 +12501,10 @@ yargs-parser@^18.1.2:
     camelcase "^5.0.0"
     decamelize "^1.2.0"
 
-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.5"
-  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.5.tgz#5d37729146d3f894f39fc94b6796f5b239513186"
-  integrity sha512-jYRGS3zWy20NtDtK2kBgo/TlAoy5YUuhD9/LZ7z7W4j1Fdw2cqD0xEEclf8fxc8xjD6X5Qr+qQQwCEsP8iRiYg==
+yargs-parser@^20.0.0, yargs-parser@^20.2.2, yargs-parser@^20.2.3:
+  version "20.2.9"
+  resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.9.tgz#2eb7dc3b0289718fc295f362753845c41a0c94ee"
+  integrity sha512-y11nGElTIV+CT3Zv9t7VKl+Q3hTQoT9a1Qzezhhl6Rp21gJ/IVTW7Z3y9EWXhuUBC2Shnf+DX0antecpAwSP8w==
 
 yargs@^13.3.2:
   version "13.3.2"
@@ -12915,7 +12539,7 @@ yargs@^15.3.1:
     y18n "^4.0.0"
     yargs-parser "^18.1.2"
 
-yargs@^16.0.0, yargs@^16.1.1, yargs@^16.2.0:
+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==
@@ -12928,6 +12552,19 @@ yargs@^16.0.0, yargs@^16.1.1, yargs@^16.2.0:
     y18n "^5.0.5"
     yargs-parser "^20.2.2"
 
+yargs@^17.0.0:
+  version "17.0.1"
+  resolved "https://registry.yarnpkg.com/yargs/-/yargs-17.0.1.tgz#6a1ced4ed5ee0b388010ba9fd67af83b9362e0bb"
+  integrity sha512-xBBulfCc8Y6gLFcrPvtqKz9hz8SO0l1Ni8GgDekvBX2ro0HRQImDGnikfc33cgzcYUSncapnNcZDjVFIH3f6KQ==
+  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"
@@ -12946,10 +12583,21 @@ yocto-queue@^0.1.0:
   resolved "https://registry.yarnpkg.com/yocto-queue/-/yocto-queue-0.1.0.tgz#0294eb3dee05028d31ee1a5fa2c556a6aaf10a1b"
   integrity sha512-rVksvsnNCdJ/ohGc6xgPwyN8eheCxsiLM8mxuE/t/mOVqJewPuO1miLpTHQiRgTKCLexL4MeAFVagts7HmNZ2Q==
 
+z-schema@~3.18.3:
+  version "3.18.4"
+  resolved "https://registry.yarnpkg.com/z-schema/-/z-schema-3.18.4.tgz#ea8132b279533ee60be2485a02f7e3e42541a9a2"
+  integrity sha512-DUOKC/IhbkdLKKiV89gw9DUauTV8U/8yJl1sjf6MtDmzevLKOF2duNJ495S3MFVjqZarr+qNGCPbkg4mu4PpLw==
+  dependencies:
+    lodash.get "^4.0.0"
+    lodash.isequal "^4.0.0"
+    validator "^8.0.0"
+  optionalDependencies:
+    commander "^2.7.1"
+
 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==
+  version "0.11.4"
+  resolved "https://registry.yarnpkg.com/zone.js/-/zone.js-0.11.4.tgz#0f70dcf6aba80f698af5735cbb257969396e8025"
+  integrity sha512-DDh2Ab+A/B+9mJyajPjHFPWfYU1H+pdun4wnnk0OcQTNjem1XQSZ2CDW+rfZEUDjv5M19SBqAkjZi0x5wuB5Qw==
   dependencies:
     tslib "^2.0.0"